diff options
| author | Timothy Pearson <[email protected]> | 2013-02-15 21:55:37 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-15 21:55:37 -0600 |
| commit | 77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8 (patch) | |
| tree | a1cce95474892add7cb970b8e9fbdb16e12bc2d7 /kpersonalizer | |
| parent | 9286b9ebcc5c6b73a1061763cf5e3d9dd8eea3c0 (diff) | |
| download | tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.tar.gz tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kpersonalizer')
| -rw-r--r-- | kpersonalizer/kcountrypage.cpp | 2 | ||||
| -rw-r--r-- | kpersonalizer/keyecandypage.cpp | 8 | ||||
| -rw-r--r-- | kpersonalizer/kfindlanguage.cpp | 4 | ||||
| -rw-r--r-- | kpersonalizer/kospage.cpp | 2 | ||||
| -rw-r--r-- | kpersonalizer/kpersonalizer.cpp | 8 | ||||
| -rw-r--r-- | kpersonalizer/krefinepage.cpp | 2 | ||||
| -rw-r--r-- | kpersonalizer/kstylepage.cpp | 4 | ||||
| -rw-r--r-- | kpersonalizer/main.cpp | 4 |
8 files changed, 17 insertions, 17 deletions
diff --git a/kpersonalizer/kcountrypage.cpp b/kpersonalizer/kcountrypage.cpp index 61be286c1..36276eca6 100644 --- a/kpersonalizer/kcountrypage.cpp +++ b/kpersonalizer/kcountrypage.cpp @@ -21,7 +21,7 @@ #include <tdeapplication.h> #include <ksimpleconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kstandarddirs.h> #include <kiconloader.h> diff --git a/kpersonalizer/keyecandypage.cpp b/kpersonalizer/keyecandypage.cpp index f2445e5b5..9b5da3fd2 100644 --- a/kpersonalizer/keyecandypage.cpp +++ b/kpersonalizer/keyecandypage.cpp @@ -25,18 +25,18 @@ #include <tqfont.h> #include <ksimpleconfig.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include <dcopclient.h> #include <kipc.h> #include <tdeapplication.h> #include <tdelistview.h> #include <krun.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kiconloader.h> #include <ktrader.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <stdlib.h> diff --git a/kpersonalizer/kfindlanguage.cpp b/kpersonalizer/kfindlanguage.cpp index 83d1c1614..150c67b28 100644 --- a/kpersonalizer/kfindlanguage.cpp +++ b/kpersonalizer/kfindlanguage.cpp @@ -22,9 +22,9 @@ #include <tqmap.h> #include <ksimpleconfig.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include "kfindlanguage.h" diff --git a/kpersonalizer/kospage.cpp b/kpersonalizer/kospage.cpp index ab97a3ffd..017b95fe7 100644 --- a/kpersonalizer/kospage.cpp +++ b/kpersonalizer/kospage.cpp @@ -24,7 +24,7 @@ #include <ksimpleconfig.h> #include <kstandarddirs.h> #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <dcopclient.h> #include <kipc.h> #include <krun.h> diff --git a/kpersonalizer/kpersonalizer.cpp b/kpersonalizer/kpersonalizer.cpp index f06a84b16..c3611baf3 100644 --- a/kpersonalizer/kpersonalizer.cpp +++ b/kpersonalizer/kpersonalizer.cpp @@ -26,14 +26,14 @@ #include <tqcursor.h> #include <ksimpleconfig.h> -#include <kglobal.h> -#include <kglobalsettings.h> +#include <tdeglobal.h> +#include <tdeglobalsettings.h> #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <tdelistview.h> #include <krun.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeconfig.h> #include <stdlib.h> diff --git a/kpersonalizer/krefinepage.cpp b/kpersonalizer/krefinepage.cpp index 19b9e0a16..568967690 100644 --- a/kpersonalizer/krefinepage.cpp +++ b/kpersonalizer/krefinepage.cpp @@ -20,7 +20,7 @@ #include <krun.h> #include <tdeconfig.h> #include <tdeapplication.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include "krefinepage.h" #include "kpersonalizer.h" diff --git a/kpersonalizer/kstylepage.cpp b/kpersonalizer/kstylepage.cpp index de2643bbc..296131ee0 100644 --- a/kpersonalizer/kstylepage.cpp +++ b/kpersonalizer/kstylepage.cpp @@ -28,10 +28,10 @@ #include <tdeconfig.h> #include <kstandarddirs.h> #include <tdeapplication.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kdebug.h> #include <kdesktopfile.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdelistview.h> #include <kipc.h> #include <ksimpleconfig.h> diff --git a/kpersonalizer/main.cpp b/kpersonalizer/main.cpp index 79449a015..e03c19038 100644 --- a/kpersonalizer/main.cpp +++ b/kpersonalizer/main.cpp @@ -17,9 +17,9 @@ #include <tdecmdlineargs.h> #include <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> #include <dcopclient.h> -#include <kglobal.h> +#include <tdeglobal.h> #include "kpersonalizer.h" #include "kfindlanguage.h" |