diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2013-02-11 12:11:48 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2013-02-11 12:11:48 +0000 |
| commit | bfa4ea1b72c633ec1ec9c361e1ad67d611c1a101 (patch) | |
| tree | fc28ddacd1ab4dfe9088d07680cc208889ab9870 /src/plugins/General/hotkey/settingsdialog.cpp | |
| parent | 7801fde7f7d8cf280e0229df807505abea194a86 (diff) | |
| download | qmmp-bfa4ea1b72c633ec1ec9c361e1ad67d611c1a101.tar.gz qmmp-bfa4ea1b72c633ec1ec9c361e1ad67d611c1a101.tar.bz2 qmmp-bfa4ea1b72c633ec1ec9c361e1ad67d611c1a101.zip | |
global hotkey manager: prepare for windows support
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@3227 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins/General/hotkey/settingsdialog.cpp')
| -rw-r--r-- | src/plugins/General/hotkey/settingsdialog.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/plugins/General/hotkey/settingsdialog.cpp b/src/plugins/General/hotkey/settingsdialog.cpp index f858d13aa..1faa503d6 100644 --- a/src/plugins/General/hotkey/settingsdialog.cpp +++ b/src/plugins/General/hotkey/settingsdialog.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009-2012 by Ilya Kotov * + * Copyright (C) 2009-2013 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -20,12 +20,6 @@ #include <QSettings> #include <QHeaderView> - -extern "C" -{ -#include <X11/keysym.h> -} - #include <qmmp/qmmp.h> #include "hotkeydialog.h" #include "settingsdialog.h" @@ -61,7 +55,7 @@ SettingsDialog::SettingsDialog(QWidget *parent) hotkey->key = settings.value(QString("key_%1").arg(i), hotkey->defaultKey()).toUInt(); hotkey->mod = settings.value(QString("modifiers_%1").arg(i), 0).toUInt(); ui.tableWidget->setItem(j,1, new QTableWidgetItem(HotkeyManager::getKeyString(hotkey->key, - hotkey->mod), i)); + hotkey->mod), i)); m_hotkeys << hotkey; } settings.endGroup(); |