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 /interfaces/tdescript | |
| parent | e5f2d46e9caf6942f365f1b454087dda71a340f7 (diff) | |
| download | tdelibs-ed99a30644c19b0a3cf0d2147243532df4daa16b.tar.gz tdelibs-ed99a30644c19b0a3cf0d2147243532df4daa16b.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'interfaces/tdescript')
| -rw-r--r-- | interfaces/tdescript/scriptloader.cpp | 4 | ||||
| -rw-r--r-- | interfaces/tdescript/scriptmanager.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/interfaces/tdescript/scriptloader.cpp b/interfaces/tdescript/scriptloader.cpp index ad6c8df20..803feb3a6 100644 --- a/interfaces/tdescript/scriptloader.cpp +++ b/interfaces/tdescript/scriptloader.cpp @@ -21,8 +21,8 @@ #include <tdeapplication.h> #include <tdeparts/part.h> #include <tdeparts/componentfactory.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <kdesktopfile.h> #include <kstandarsdirs.h> diff --git a/interfaces/tdescript/scriptmanager.cpp b/interfaces/tdescript/scriptmanager.cpp index 42e20cd5b..a0dfbe921 100644 --- a/interfaces/tdescript/scriptmanager.cpp +++ b/interfaces/tdescript/scriptmanager.cpp @@ -5,8 +5,8 @@ #include <kdesktopfile.h> #include <kstandarddirs.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kdebug.h> //using namespace KScriptInterface; |