From bfa4ea1b72c633ec1ec9c361e1ad67d611c1a101 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Mon, 11 Feb 2013 12:11:48 +0000 Subject: 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 --- src/plugins/General/hotkey/settingsdialog.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'src/plugins/General/hotkey/settingsdialog.cpp') 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 #include - -extern "C" -{ -#include -} - #include #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(); -- cgit v1.2.3-13-gbd6f