flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-16 02:06:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #452 changes because of the 452 branch, but only possible after merge with master

Browse Source 
Fixed a gcc (Jenkins) warning along with that
This commit is contained in:
Klaus Basan
2015-09-26 00:38:16 +02:00
committed by Mathew Sutcliffe
parent c84bc457df
commit 3923336da8
6 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/blackcore/context_application.cpp
View File

@@ -53,6 +53,7 @@ namespace BlackCore
{
this->changeSettings(settings, {});
});
connect(this, &IContextApplication::settingsChanged, [](const CVariantMap &settings, const CIdentifier &origin)
{
// Intentionally don't check for round trip here
@@ -63,24 +64,32 @@ namespace BlackCore
{
this->registerHotkeyActions(actions, {});
});
Q_ASSERT(s);
Q_ASSERT_X(s, Q_FUNC_INFO, "Connect hotkey action failed");
Q_UNUSED(s);
s = connect(this, &IContextApplication::hotkeyActionsRegistered, [this](const QStringList &actions, const CIdentifier &origin)
{
if(origin.isFromSameProcess()) { return; }
CInputManager::instance()->registerRemoteActions(actions);
});
Q_ASSERT(s);
Q_ASSERT_X(s, Q_FUNC_INFO, "Connect hotkey actions failed");
Q_UNUSED(s);
connect(CInputManager::instance(), &CInputManager::remoteActionFromLocal, [this](const QString &action, bool argument)
s = connect(CInputManager::instance(), &CInputManager::remoteActionFromLocal, [this](const QString &action, bool argument)
{
this->callHotkeyAction(action, argument, {});
});
connect(this, &IContextApplication::remoteHotkeyAction, [this](const QString &action, bool argument, const CIdentifier &origin)
Q_ASSERT_X(s, Q_FUNC_INFO, "Connect remote action failed");
Q_UNUSED(s);
s = connect(this, &IContextApplication::remoteHotkeyAction, [this](const QString &action, bool argument, const CIdentifier &origin)
{
if(origin.isFromLocalMachine()) { return; }
CInputManager::instance()->callFunctionsBy(action, argument);
CLogMessage(this, CLogCategory::contextSlot()).debug() << "Calling function" << action << "from origin" << origin.getMachineName();
});
Q_ASSERT_X(s, Q_FUNC_INFO, "Connect remote hotkey action failed");
Q_UNUSED(s);
// Enable event forwarding from GUI process to core
CInputManager::instance()->setForwarding(true);