This commit is contained in:
Klaus Basan
2018-08-22 19:25:07 +02:00
parent d010f6f15a
commit 956ffd949d
7 changed files with 12 additions and 13 deletions

View File

@@ -377,7 +377,7 @@ namespace BlackCore
void CAirspaceMonitor::onCapabilitiesReplyReceived(const CCallsign &callsign, int clientCaps)
{
if (!this->isConnectedAndNotShuttingDown() || callsign.isEmpty()) { return; }
CClient::Capabilities caps = static_cast<CClient::Capabilities>(clientCaps);
const CClient::Capabilities caps = static_cast<CClient::Capabilities>(clientCaps);
const CVoiceCapabilities voiceCaps = sApp->getWebDataServices()->getVoiceCapabilityForCallsign(callsign);
CPropertyIndexVariantMap vm(CClient::IndexCapabilities, CVariant::from(clientCaps));
vm.addValue({CClient::IndexVoiceCapabilities}, voiceCaps);
@@ -511,7 +511,7 @@ namespace BlackCore
}
else
{
const CStatusMessage m = CMatchingUtils::logMessage(callsign, "Ignoring this aircraft, not found in range list, disconnected, or no callsign", CAirspaceMonitor::getLogCategories());
const CStatusMessage m = CMatchingUtils::logMessage(callsign, "Ignoring this aircraft, not found in range list, disconnected, or no callsign", CAirspaceMonitor::getLogCategories(), CStatusMessage::SeverityWarning);
this->addReverseLookupMessage(callsign, m);
}
}
@@ -924,14 +924,16 @@ namespace BlackCore
Q_UNUSED(oldStatus);
switch (newStatus)
{
case INetwork::Connected: break;
case INetwork::Connected:
break;
case INetwork::Disconnected:
case INetwork::DisconnectedError:
case INetwork::DisconnectedLost:
case INetwork::DisconnectedFailed:
this->clear();
break;
default: break;
default:
break;
}
}

View File

@@ -83,7 +83,7 @@ namespace BlackCore
static IContextAudio *create(CCoreFacade *runtime, CCoreFacadeConfig::ContextMode mode, BlackMisc::CDBusServer *server, QDBusConnection &connection);
//! Destructor
virtual ~IContextAudio() {}
virtual ~IContextAudio() override {}
signals:
//! Voice rooms changed

View File

@@ -78,7 +78,7 @@ namespace BlackCore
CLivery CModelDataReader::smartLiverySelector(const CLivery &liveryPattern) const
{
const CLiveryList liveries(getLiveries()); // thread safe copy
const CLiveryList liveries(this->getLiveries()); // thread safe copy
return liveries.smartLiverySelector(liveryPattern);
}

View File

@@ -127,8 +127,8 @@ namespace BlackCore
else { invalidLines++; }
}
CLogMessage(this).debug() << "METAR statistic: " << metars.size() << "Metars ( invalid:" << invalidLines << ")";
static const QString ms("METAR statistic: %1 Metars (invalid %2)");
CLogMessage(this).debug() << ms.arg(metars.size()).arg(invalidLines);
{
QWriteLocker l(&m_lock);
m_metars = metars;

View File

@@ -27,7 +27,6 @@ class QDragEnterEvent;
class QDragLeaveEvent;
class QDragMoveEvent;
class QDropEvent;
class QWidget;
namespace Ui { class CDbAircraftIcaoSelectorComponent; }
namespace BlackGui
@@ -39,7 +38,7 @@ namespace BlackGui
*/
class BLACKGUI_EXPORT CDbAircraftIcaoSelectorComponent :
public QFrame,
public BlackGui::CDropBase
public CDropBase
{
Q_OBJECT

View File

@@ -25,8 +25,6 @@ namespace BlackGui
class BLACKGUI_EXPORT CDbMappingComponentAware
{
public:
//! Set the corresponding component
virtual void setMappingComponent(CDbMappingComponent *component);

View File

@@ -76,7 +76,7 @@ namespace BlackMisc
CRegularThread(QObject *parent = nullptr) : QThread(parent) {}
//! Destructor
virtual ~CRegularThread();
virtual ~CRegularThread() override;
protected:
//! \copydoc QThread::run