diff options
| author | Timothy Pearson <[email protected]> | 2013-02-01 23:19:22 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-01 23:19:22 -0600 |
| commit | a5430e4b98efd05937bd3bfe78c56eb826f145fa (patch) | |
| tree | 1af88f74a9d800399de58491b215fb303cbfb1f3 /khotkeys/kcontrol | |
| parent | eba183d4de47093c6e44a99c8d7fe313aa2834c9 (diff) | |
| download | tdebase-a5430e4b98efd05937bd3bfe78c56eb826f145fa.tar.gz tdebase-a5430e4b98efd05937bd3bfe78c56eb826f145fa.zip | |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'khotkeys/kcontrol')
| -rw-r--r-- | khotkeys/kcontrol/kcmkhotkeys.h | 2 | ||||
| -rw-r--r-- | khotkeys/kcontrol/menuedit.cpp | 2 | ||||
| -rw-r--r-- | khotkeys/kcontrol/menuedit.h | 2 | ||||
| -rw-r--r-- | khotkeys/kcontrol/triggers_tab.cpp | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/khotkeys/kcontrol/kcmkhotkeys.h b/khotkeys/kcontrol/kcmkhotkeys.h index 58751599d..2fffc2b16 100644 --- a/khotkeys/kcontrol/kcmkhotkeys.h +++ b/khotkeys/kcontrol/kcmkhotkeys.h @@ -12,7 +12,7 @@ #define _KCMKHOTKEYS_H_ #include <tdecmodule.h> -#include <kshortcut.h> +#include <tdeshortcut.h> #include <actions.h> #include <settings.h> diff --git a/khotkeys/kcontrol/menuedit.cpp b/khotkeys/kcontrol/menuedit.cpp index 97e372821..56909b0a1 100644 --- a/khotkeys/kcontrol/menuedit.cpp +++ b/khotkeys/kcontrol/menuedit.cpp @@ -20,7 +20,7 @@ #include <kglobal.h> #include <klocale.h> -#include <kaccel.h> +#include <tdeaccel.h> #include <kapplication.h> #include <dcopclient.h> #include <tqlabel.h> diff --git a/khotkeys/kcontrol/menuedit.h b/khotkeys/kcontrol/menuedit.h index 56a870797..f7aa43436 100644 --- a/khotkeys/kcontrol/menuedit.h +++ b/khotkeys/kcontrol/menuedit.h @@ -13,7 +13,7 @@ #include <tqstring.h> #include <kdialogbase.h> -#include <kaccel.h> +#include <tdeaccel.h> #include <kservice.h> // see also tdebase/kmenuedit/khotkeys.h diff --git a/khotkeys/kcontrol/triggers_tab.cpp b/khotkeys/kcontrol/triggers_tab.cpp index 258c6cfd5..cbd16edc0 100644 --- a/khotkeys/kcontrol/triggers_tab.cpp +++ b/khotkeys/kcontrol/triggers_tab.cpp @@ -27,9 +27,9 @@ #include <kdebug.h> #include <klocale.h> #include <kapplication.h> -#include <kshortcut.h> +#include <tdeshortcut.h> #include <tdeconfig.h> -#include <kshortcutlist.h> +#include <tdeshortcutlist.h> #include <kkeybutton.h> #include <kkeydialog.h> |