From 53de0d56b9af9a79601e510e562ca97bf01d4f86 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Fri, 1 Nov 2019 20:07:48 +0100 Subject: [PATCH] Style --- src/blackcore/afv/clients/afvclient.cpp | 4 ++-- src/blackcore/afv/clients/afvclient.h | 2 +- src/blackcore/context/contextaudioproxy.h | 3 ++- src/blackcore/fsd/fsdclient.cpp | 4 ++-- src/blackcore/fsd/fsdclient.h | 2 +- src/blackgui/dockwidget.cpp | 2 +- src/blackgui/guiapplication.cpp | 6 +++--- src/blackgui/managedstatusbar.cpp | 2 +- src/blackgui/managedstatusbar.h | 2 +- 9 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/blackcore/afv/clients/afvclient.cpp b/src/blackcore/afv/clients/afvclient.cpp index 038e1930f..8cd29797a 100644 --- a/src/blackcore/afv/clients/afvclient.cpp +++ b/src/blackcore/afv/clients/afvclient.cpp @@ -461,7 +461,7 @@ namespace BlackCore // threadsafe copies const auto transceivers = this->getTransceivers(); const auto enabledTransceivers = this->getEnabledTransceivers(); - const QString callsign = this->getCallsign(); + const QString callsign = this->getCallsign(); // threadsafe // transceivers QVector newEnabledTransceivers; @@ -963,7 +963,7 @@ namespace BlackCore } // in connection and soundcard only use the enabled tarnsceivers - const QString callsign = this->getCallsign(); + const QString callsign = this->getCallsign(); // threadsafe { { QMutexLocker lock(&m_mutexConnection); diff --git a/src/blackcore/afv/clients/afvclient.h b/src/blackcore/afv/clients/afvclient.h index 2ec954443..352ab88c4 100644 --- a/src/blackcore/afv/clients/afvclient.h +++ b/src/blackcore/afv/clients/afvclient.h @@ -89,7 +89,7 @@ namespace BlackCore //! Connect to network //! \threadsafe //! \remark runs in thread of CAfvClient object and is ASYNC when called from another thread - Q_INVOKABLE void connectTo(const QString &cid, const QString &password, const QString &getCallsign, const QString &client); + Q_INVOKABLE void connectTo(const QString &cid, const QString &password, const QString &callsign, const QString &client); //! Disconnect from network //! \threadsafe diff --git a/src/blackcore/context/contextaudioproxy.h b/src/blackcore/context/contextaudioproxy.h index f0aa233d6..53c32942f 100644 --- a/src/blackcore/context/contextaudioproxy.h +++ b/src/blackcore/context/contextaudioproxy.h @@ -32,7 +32,7 @@ class QDBusConnection; namespace BlackMisc { class CGenericDBusInterface; - namespace Audio { class CAudioDeviceInfo; } + namespace Audio { class CAudioDeviceInfo; } namespace Aviation { class CCallsign; } } @@ -84,4 +84,5 @@ namespace BlackCore }; } // ns } // ns + #endif // guard diff --git a/src/blackcore/fsd/fsdclient.cpp b/src/blackcore/fsd/fsdclient.cpp index ada7db77f..5dbe0328a 100644 --- a/src/blackcore/fsd/fsdclient.cpp +++ b/src/blackcore/fsd/fsdclient.cpp @@ -485,7 +485,7 @@ namespace BlackCore freqkHz = freqkHz / 10 * 10; } frequencies.push_back(freqkHz); - sendRadioMessage(frequencies, message.getMessage()); + this->sendRadioMessage(frequencies, message.getMessage()); emit this->textMessageSent(message); } } @@ -523,7 +523,7 @@ namespace BlackCore } const TextMessage radioMessage(m_ownCallsign.asString(), receivers.join('&'), message); - sendMessage(radioMessage); + this->sendMessage(radioMessage); this->increaseStatisticsValue(QStringLiteral("sendTextMessages")); } diff --git a/src/blackcore/fsd/fsdclient.h b/src/blackcore/fsd/fsdclient.h index 58bcde0fa..026c68380 100644 --- a/src/blackcore/fsd/fsdclient.h +++ b/src/blackcore/fsd/fsdclient.h @@ -251,7 +251,7 @@ namespace BlackCore const QByteArray bufferEncoded = m_fsdTextCodec->fromUnicode(buffer); emitRawFsdMessage(buffer.trimmed(), true); if (m_printToConsole) { qDebug() << "FSD Sent=>" << bufferEncoded; } - if (!m_unitTestMode) { m_socket.write(bufferEncoded); } + if (!m_unitTestMode) { m_socket.write(bufferEncoded); } } //! Default model string diff --git a/src/blackgui/dockwidget.cpp b/src/blackgui/dockwidget.cpp index 2c347ff75..0de2b6960 100644 --- a/src/blackgui/dockwidget.cpp +++ b/src/blackgui/dockwidget.cpp @@ -562,7 +562,7 @@ namespace BlackGui QScopedPointer contextMenu(new QMenu(this)); this->addToContextMenu(contextMenu.data()); QAction *selectedItem = contextMenu.data()->exec(globalPos); - Q_UNUSED(selectedItem); + Q_UNUSED(selectedItem) } void CDockWidget::onVisibilityChanged(bool visible) diff --git a/src/blackgui/guiapplication.cpp b/src/blackgui/guiapplication.cpp index ef8d9a912..0be2eadd9 100644 --- a/src/blackgui/guiapplication.cpp +++ b/src/blackgui/guiapplication.cpp @@ -1178,9 +1178,9 @@ namespace BlackGui QMainWindow *w = sGui->mainApplicationWindow(); if (!w) { return; } m_frontBack = true; - w->showNormal(); //bring window to top on OSX - w->raise(); //bring window from minimized state on OSX - w->activateWindow(); //bring window to front/unminimize on windows + w->showNormal(); // bring window to top on OSX + w->raise(); // bring window from minimized state on OSX + w->activateWindow(); // bring window to front/unminimize on windows } void CGuiApplication::windowToBack() diff --git a/src/blackgui/managedstatusbar.cpp b/src/blackgui/managedstatusbar.cpp index 33e423401..a5dc250ea 100644 --- a/src/blackgui/managedstatusbar.cpp +++ b/src/blackgui/managedstatusbar.cpp @@ -55,7 +55,7 @@ namespace BlackGui // use insert to insert from left to right // this keeps any grip on the right size - m_statusBar->insertPermanentWidget(0, m_statusBarIcon, 0); // status icon + m_statusBar->insertPermanentWidget(0, m_statusBarIcon, 0); // status icon m_statusBar->insertPermanentWidget(1, m_statusBarLabel, 1); // status text // timer diff --git a/src/blackgui/managedstatusbar.h b/src/blackgui/managedstatusbar.h index 7a75a49f7..db669739c 100644 --- a/src/blackgui/managedstatusbar.h +++ b/src/blackgui/managedstatusbar.h @@ -32,7 +32,7 @@ namespace BlackGui explicit CManagedStatusBar(QObject *parent = nullptr); //! Destructor - virtual ~CManagedStatusBar(); + virtual ~CManagedStatusBar() override; //! Get the status bar QStatusBar *getStatusBar() const { return m_statusBar; }