* check if parent is null
* comments
* icon in column
* nullptr check in runtime based component
This commit is contained in:
Klaus Basan
2014-06-28 02:09:20 +02:00
parent 25122fad10
commit 2a9f3d6039
4 changed files with 5 additions and 4 deletions

View File

@@ -35,6 +35,7 @@ namespace BlackCore
this->connect(this->m_network, &INetwork::fsipirCustomPacketReceived, this, &CAirspaceMonitor::fsipirCustomPacketReceived); this->connect(this->m_network, &INetwork::fsipirCustomPacketReceived, this, &CAirspaceMonitor::fsipirCustomPacketReceived);
this->connect(this->m_network, &INetwork::serverReplyReceived, this, &CAirspaceMonitor::serverReplyReceived); this->connect(this->m_network, &INetwork::serverReplyReceived, this, &CAirspaceMonitor::serverReplyReceived);
// AutoConnection: this should also avoid race conditions by updating the bookings
this->connect(this->m_vatsimBookingReader, &CVatsimBookingReader::dataRead, this, &CAirspaceMonitor::receivedBookings); this->connect(this->m_vatsimBookingReader, &CVatsimBookingReader::dataRead, this, &CAirspaceMonitor::receivedBookings);
} }

View File

@@ -34,13 +34,13 @@ namespace BlackGui
void CRuntimeBasedComponent::sendStatusMessage(const BlackMisc::CStatusMessage &statusMessage) void CRuntimeBasedComponent::sendStatusMessage(const BlackMisc::CStatusMessage &statusMessage)
{ {
Q_ASSERT(this->getIContextApplication()); if (!this->getIContextApplication()) return;
this->getIContextApplication()->sendStatusMessage(statusMessage); this->getIContextApplication()->sendStatusMessage(statusMessage);
} }
void CRuntimeBasedComponent::sendStatusMessages(const BlackMisc::CStatusMessageList &statusMessages) void CRuntimeBasedComponent::sendStatusMessages(const BlackMisc::CStatusMessageList &statusMessages)
{ {
Q_ASSERT(this->getIContextApplication()); if (!this->getIContextApplication()) return;
this->getIContextApplication()->sendStatusMessages(statusMessages); this->getIContextApplication()->sendStatusMessages(statusMessages);
} }

View File

@@ -13,7 +13,7 @@ namespace BlackGui
CTimerBasedComponent::~CTimerBasedComponent() CTimerBasedComponent::~CTimerBasedComponent()
{ {
this->m_timer->stop(); this->m_timer->stop();
this->disconnect(this->parent()); if (this->parent()) this->disconnect(this->parent());
} }
void CTimerBasedComponent::setUpdateInterval(int milliSeconds) void CTimerBasedComponent::setUpdateInterval(int milliSeconds)

View File

@@ -41,7 +41,7 @@ namespace BlackGui
break; break;
case UserShort: case UserShort:
this->m_columns.addColumn(CColumn("", CUser::IndexCallsignIcon)); this->m_columns.addColumn(CColumn(CUser::IndexCallsignIcon, true));
this->m_columns.addColumn(CColumn("realname", CUser::IndexRealName)); this->m_columns.addColumn(CColumn("realname", CUser::IndexRealName));
this->m_columns.addColumn(CColumn("callsign", CUser::IndexCallsign)); this->m_columns.addColumn(CColumn("callsign", CUser::IndexCallsign));
break; break;