diff options
Diffstat (limited to 'src/plugins/General/hotkey')
| -rw-r--r-- | src/plugins/General/hotkey/hotkeyfactory.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/General/hotkey/hotkeyfactory.h | 6 | ||||
| -rw-r--r-- | src/plugins/General/hotkey/hotkeymanager.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/General/hotkey/hotkeymanager.h | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/src/plugins/General/hotkey/hotkeyfactory.cpp b/src/plugins/General/hotkey/hotkeyfactory.cpp index 423437892..34922d739 100644 --- a/src/plugins/General/hotkey/hotkeyfactory.cpp +++ b/src/plugins/General/hotkey/hotkeyfactory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009 by Ilya Kotov * + * Copyright (C) 2009-2011 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -35,7 +35,7 @@ const GeneralProperties HotkeyFactory::properties() const return properties; } -General *HotkeyFactory::create(QObject *parent) +QObject *HotkeyFactory::create(QObject *parent) { return new HotkeyManager(parent); } diff --git a/src/plugins/General/hotkey/hotkeyfactory.h b/src/plugins/General/hotkey/hotkeyfactory.h index f1ca46d1f..e00aa7f30 100644 --- a/src/plugins/General/hotkey/hotkeyfactory.h +++ b/src/plugins/General/hotkey/hotkeyfactory.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009 by Ilya Kotov * + * Copyright (C) 2009-2011 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -32,10 +32,10 @@ class HotkeyFactory : public QObject, public GeneralFactory { Q_OBJECT -Q_INTERFACES(GeneralFactory); +Q_INTERFACES(GeneralFactory) public: const GeneralProperties properties() const; - General *create(QObject *parent); + QObject *create(QObject *parent); QDialog *createConfigDialog(QWidget *parent); void showAbout(QWidget *parent); QTranslator *createTranslator(QObject *parent); diff --git a/src/plugins/General/hotkey/hotkeymanager.cpp b/src/plugins/General/hotkey/hotkeymanager.cpp index 6a6b3b685..212601a7b 100644 --- a/src/plugins/General/hotkey/hotkeymanager.cpp +++ b/src/plugins/General/hotkey/hotkeymanager.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009 by Ilya Kotov * + * Copyright (C) 2009-2011 by Ilya Kotov * * forkotov02@hotmail.ru * * * * Copyright (C) 2003-2007 by Justin Karneges and Michail Pishchagin * @@ -69,7 +69,7 @@ quint32 Hotkey::defaultKey(int act) return keyMap[act]; } -HotkeyManager::HotkeyManager(QObject *parent) : General(parent) +HotkeyManager::HotkeyManager(QObject *parent) : QObject(parent) { QCoreApplication::instance()->installEventFilter(this); WId rootWindow = QX11Info::appRootWindow(); diff --git a/src/plugins/General/hotkey/hotkeymanager.h b/src/plugins/General/hotkey/hotkeymanager.h index dddb10a9e..793bb74d9 100644 --- a/src/plugins/General/hotkey/hotkeymanager.h +++ b/src/plugins/General/hotkey/hotkeymanager.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009 by Ilya Kotov * + * Copyright (C) 2009-2011 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -63,7 +63,7 @@ public: static quint32 defaultKey(int act); }; -class HotkeyManager : public General +class HotkeyManager : public QObject { Q_OBJECT public: |