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

refs #485, removal of CEnableForRuntime

Browse Source
This commit is contained in:
Klaus Basan
2016-02-14 11:28:27 +01:00
committed by Mathew Sutcliffe
parent 158efe819a
commit 3829aaeae8
61 changed files with 490 additions and 984 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/blackgui/components/settingshotkeycomponent.cpp
View File

@@ -10,6 +10,7 @@
#include "settingshotkeycomponent.h"
#include "ui_settingshotkeycomponent.h"
#include "blackgui/hotkeydialog.h"
#include "blackgui/guiapplication.h"
#include "blackcore/contextapplication.h"
#include <QMessageBox>
@@ -43,7 +44,7 @@ namespace BlackGui
void CSettingsHotkeyComponent::ps_addEntry()
{
BlackMisc::CIdentifierList registeredApps;
if (getIContextApplication()) registeredApps = getIContextApplication()->getRegisteredApplications();
if (sGui->getIContextApplication()) registeredApps = sGui->getIContextApplication()->getRegisteredApplications();
// add local application
registeredApps.push_back(CIdentifier());
auto selectedActionHotkey = CHotkeyDialog::getActionHotkey(CActionHotkey(), registeredApps, this);
@@ -67,7 +68,7 @@ namespace BlackGui
Q_ASSERT(indexHotkey.data(CActionHotkeyListModel::ActionHotkeyRole).canConvert<CActionHotkey>());
CActionHotkey actionHotkey = indexHotkey.data(CActionHotkeyListModel::ActionHotkeyRole).value<CActionHotkey>();
BlackMisc::CIdentifierList registeredApps;
if (getIContextApplication()) registeredApps = getIContextApplication()->getRegisteredApplications();
if (sGui->getIContextApplication()) registeredApps = sGui->getIContextApplication()->getRegisteredApplications();
// add local application
registeredApps.push_back(CIdentifier());
auto selectedActionHotkey = CHotkeyDialog::getActionHotkey(actionHotkey, registeredApps, this);