diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:55:37 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:55:37 -0600 |
| commit | 77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8 (patch) | |
| tree | a1cce95474892add7cb970b8e9fbdb16e12bc2d7 /khotkeys/shared | |
| parent | 9286b9ebcc5c6b73a1061763cf5e3d9dd8eea3c0 (diff) | |
| download | tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.tar.gz tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'khotkeys/shared')
| -rw-r--r-- | khotkeys/shared/actions.cpp | 4 | ||||
| -rw-r--r-- | khotkeys/shared/conditions.cpp | 2 | ||||
| -rw-r--r-- | khotkeys/shared/khotkeysglobal.h | 2 | ||||
| -rw-r--r-- | khotkeys/shared/settings.cpp | 6 | ||||
| -rw-r--r-- | khotkeys/shared/soundrecorder.cpp | 2 | ||||
| -rw-r--r-- | khotkeys/shared/triggers.cpp | 2 | ||||
| -rw-r--r-- | khotkeys/shared/windows.cpp | 2 |
7 files changed, 10 insertions, 10 deletions
diff --git a/khotkeys/shared/actions.cpp b/khotkeys/shared/actions.cpp index e95734b73..3174b1dcf 100644 --- a/khotkeys/shared/actions.cpp +++ b/khotkeys/shared/actions.cpp @@ -20,12 +20,12 @@ #include <tdeconfig.h> #include <kdebug.h> #include <kurifilter.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kstandarddirs.h> #include <tdeapplication.h> #include <dcopclient.h> #include <kdesktopfile.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaccel.h> #include <kservice.h> #include <kprocess.h> diff --git a/khotkeys/shared/conditions.cpp b/khotkeys/shared/conditions.cpp index 6120ca875..b09284b44 100644 --- a/khotkeys/shared/conditions.cpp +++ b/khotkeys/shared/conditions.cpp @@ -22,7 +22,7 @@ #include <tdeconfig.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <assert.h> #include <X11/Xlib.h> diff --git a/khotkeys/shared/khotkeysglobal.h b/khotkeys/shared/khotkeysglobal.h index 92dba09b6..c97ef1dea 100644 --- a/khotkeys/shared/khotkeysglobal.h +++ b/khotkeys/shared/khotkeysglobal.h @@ -20,7 +20,7 @@ #include <tqstring.h> -#include <klocale.h> +#include <tdelocale.h> class TDEConfig; class TQObject; diff --git a/khotkeys/shared/settings.cpp b/khotkeys/shared/settings.cpp index 43f9ad7c8..76adac6b9 100644 --- a/khotkeys/shared/settings.cpp +++ b/khotkeys/shared/settings.cpp @@ -18,10 +18,10 @@ #include <tdeconfig.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaccel.h> -#include <kglobal.h> -#include <kmessagebox.h> +#include <tdeglobal.h> +#include <tdemessagebox.h> #include "triggers.h" #include "conditions.h" diff --git a/khotkeys/shared/soundrecorder.cpp b/khotkeys/shared/soundrecorder.cpp index 266bbc7ce..b5759542a 100644 --- a/khotkeys/shared/soundrecorder.cpp +++ b/khotkeys/shared/soundrecorder.cpp @@ -26,7 +26,7 @@ #include "soundrecorder.h" #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqtimer.h> #include <klibloader.h> diff --git a/khotkeys/shared/triggers.cpp b/khotkeys/shared/triggers.cpp index 1f8838278..115bc6687 100644 --- a/khotkeys/shared/triggers.cpp +++ b/khotkeys/shared/triggers.cpp @@ -20,7 +20,7 @@ #include <tdeconfig.h> #include <kdebug.h> #include <twinmodule.h> -#include <klocale.h> +#include <tdelocale.h> #include <netwm_def.h> #include <tdeaccel.h> diff --git a/khotkeys/shared/windows.cpp b/khotkeys/shared/windows.cpp index b27fa3a08..077bf7b1d 100644 --- a/khotkeys/shared/windows.cpp +++ b/khotkeys/shared/windows.cpp @@ -23,7 +23,7 @@ #include <kdebug.h> #include <twinmodule.h> #include <twin.h> -#include <klocale.h> +#include <tdelocale.h> #include "khotkeysglobal.h" |