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/shared | |
| 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/shared')
| -rw-r--r-- | khotkeys/shared/actions.cpp | 2 | ||||
| -rw-r--r-- | khotkeys/shared/input.h | 2 | ||||
| -rw-r--r-- | khotkeys/shared/khlistbox.h | 2 | ||||
| -rw-r--r-- | khotkeys/shared/khlistview.h | 2 | ||||
| -rw-r--r-- | khotkeys/shared/settings.cpp | 2 | ||||
| -rw-r--r-- | khotkeys/shared/settings.h | 2 | ||||
| -rw-r--r-- | khotkeys/shared/triggers.cpp | 2 | ||||
| -rw-r--r-- | khotkeys/shared/voices.h | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/khotkeys/shared/actions.cpp b/khotkeys/shared/actions.cpp index bc383b926..6f87fee19 100644 --- a/khotkeys/shared/actions.cpp +++ b/khotkeys/shared/actions.cpp @@ -26,7 +26,7 @@ #include <dcopclient.h> #include <kdesktopfile.h> #include <klocale.h> -#include <kaccel.h> +#include <tdeaccel.h> #include <kservice.h> #include <kprocess.h> diff --git a/khotkeys/shared/input.h b/khotkeys/shared/input.h index ac1f70f65..c6bbdf1e5 100644 --- a/khotkeys/shared/input.h +++ b/khotkeys/shared/input.h @@ -16,7 +16,7 @@ #include <tqmap.h> #include <tqwidget.h> #include <tqvaluelist.h> -#include <kshortcut.h> +#include <tdeshortcut.h> #include <X11/X.h> #include <fixx11h.h> diff --git a/khotkeys/shared/khlistbox.h b/khotkeys/shared/khlistbox.h index 9ffe9d42e..d0f9b51ae 100644 --- a/khotkeys/shared/khlistbox.h +++ b/khotkeys/shared/khlistbox.h @@ -13,7 +13,7 @@ #include <tqtimer.h> -#include <klistbox.h> +#include <tdelistbox.h> namespace KHotKeys { diff --git a/khotkeys/shared/khlistview.h b/khotkeys/shared/khlistview.h index 619fbb1e7..2cee34617 100644 --- a/khotkeys/shared/khlistview.h +++ b/khotkeys/shared/khlistview.h @@ -13,7 +13,7 @@ #include <tqtimer.h> -#include <klistview.h> +#include <tdelistview.h> #include <kdemacros.h> namespace KHotKeys diff --git a/khotkeys/shared/settings.cpp b/khotkeys/shared/settings.cpp index 2820c2c5d..43f9ad7c8 100644 --- a/khotkeys/shared/settings.cpp +++ b/khotkeys/shared/settings.cpp @@ -19,7 +19,7 @@ #include <tdeconfig.h> #include <kdebug.h> #include <klocale.h> -#include <kaccel.h> +#include <tdeaccel.h> #include <kglobal.h> #include <kmessagebox.h> diff --git a/khotkeys/shared/settings.h b/khotkeys/shared/settings.h index c7b16287f..e28502cfe 100644 --- a/khotkeys/shared/settings.h +++ b/khotkeys/shared/settings.h @@ -12,7 +12,7 @@ #define _SETTINGS_H_ #include "actions.h" -#include <kshortcut.h> +#include <tdeshortcut.h> class TDEConfig; diff --git a/khotkeys/shared/triggers.cpp b/khotkeys/shared/triggers.cpp index 29cd1025e..1f8838278 100644 --- a/khotkeys/shared/triggers.cpp +++ b/khotkeys/shared/triggers.cpp @@ -22,7 +22,7 @@ #include <twinmodule.h> #include <klocale.h> #include <netwm_def.h> -#include <kaccel.h> +#include <tdeaccel.h> #include <X11/Xlib.h> #include <X11/keysym.h> diff --git a/khotkeys/shared/voices.h b/khotkeys/shared/voices.h index 145652a9b..ccd07563f 100644 --- a/khotkeys/shared/voices.h +++ b/khotkeys/shared/voices.h @@ -12,7 +12,7 @@ #define VOICES_H_ #include <tqwidget.h> -#include <kshortcut.h> +#include <tdeshortcut.h> class Sound; class TQTimer; |