diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:57:54 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:57:54 -0600 |
| commit | ed99a30644c19b0a3cf0d2147243532df4daa16b (patch) | |
| tree | 7f3f2850e59824fdf100a642367a82b1e7f0204f /kinit | |
| parent | e5f2d46e9caf6942f365f1b454087dda71a340f7 (diff) | |
| download | tdelibs-ed99a30644c19b0a3cf0d2147243532df4daa16b.tar.gz tdelibs-ed99a30644c19b0a3cf0d2147243532df4daa16b.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kinit')
| -rw-r--r-- | kinit/autostart.cpp | 2 | ||||
| -rw-r--r-- | kinit/kinit.cpp | 6 | ||||
| -rw-r--r-- | kinit/tdelauncher.cpp | 8 | ||||
| -rw-r--r-- | kinit/tdelauncher_main.cpp | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/kinit/autostart.cpp b/kinit/autostart.cpp index 4e4ad1f56..ccdbd3d97 100644 --- a/kinit/autostart.cpp +++ b/kinit/autostart.cpp @@ -24,7 +24,7 @@ #include <tdeconfig.h> #include <kdesktopfile.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kstandarddirs.h> #include <stdlib.h> diff --git a/kinit/kinit.cpp b/kinit/kinit.cpp index f6b4a3e59..1dc03002d 100644 --- a/kinit/kinit.cpp +++ b/kinit/kinit.cpp @@ -54,11 +54,11 @@ #include <tqfont.h> #include <kinstance.h> #include <kstandarddirs.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdeconfig.h> #include <klibloader.h> #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #ifdef HAVE_SYS_PRCTL_H #include <sys/prctl.h> @@ -68,7 +68,7 @@ #endif #if defined Q_WS_X11 && ! defined K_WS_QTONLY -#include <kstartupinfo.h> // schroder +#include <tdestartupinfo.h> // schroder #endif #include <tdeversion.h> diff --git a/kinit/tdelauncher.cpp b/kinit/tdelauncher.cpp index 7b75bfaf5..f7ca08678 100644 --- a/kinit/tdelauncher.cpp +++ b/kinit/tdelauncher.cpp @@ -32,16 +32,16 @@ #include <tdeconfig.h> #include <kdebug.h> #include <klibloader.h> -#include <klocale.h> -#include <kprotocolmanager.h> +#include <tdelocale.h> +#include <tdeprotocolmanager.h> #include <kprotocolinfo.h> #include <krun.h> #include <kstandarddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kurl.h> #if defined Q_WS_X11 && ! defined K_WS_QTONLY -#include <kstartupinfo.h> // schroder +#include <tdestartupinfo.h> // schroder #endif diff --git a/kinit/tdelauncher_main.cpp b/kinit/tdelauncher_main.cpp index d59cfb86f..747050668 100644 --- a/kinit/tdelauncher_main.cpp +++ b/kinit/tdelauncher_main.cpp @@ -31,7 +31,7 @@ #include <stdlib.h> #include <signal.h> #include <tqcstring.h> -#include <klocale.h> +#include <tdelocale.h> #include "tdelauncher_cmds.h" |