This commit is contained in:
Klaus Basan
2019-11-01 20:07:48 +01:00
committed by Mat Sutcliffe
parent 8194726857
commit 53de0d56b9
9 changed files with 14 additions and 13 deletions

View File

@@ -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<TransceiverDto> 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);

View File

@@ -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

View File

@@ -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

View File

@@ -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"));
}

View File

@@ -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

View File

@@ -562,7 +562,7 @@ namespace BlackGui
QScopedPointer<QMenu> 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)

View File

@@ -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()

View File

@@ -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

View File

@@ -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; }