diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:59:53 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:59:53 -0600 |
commit | 508a49f9ef02a7b03411c8e9953ba79c99b91c0c (patch) | |
tree | 1df40da8f05d010a3e175c3d48e3529cccf2e067 /tdeunittest | |
parent | 19cea58302be2d15b10b106c80ff82f7b5a2fa79 (diff) | |
download | tdesdk-508a49f9ef02a7b03411c8e9953ba79c99b91c0c.tar.gz tdesdk-508a49f9ef02a7b03411c8e9953ba79c99b91c0c.zip |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'tdeunittest')
-rw-r--r-- | tdeunittest/example/simple/maingui.cpp | 2 | ||||
-rw-r--r-- | tdeunittest/guimodrunner.cpp | 4 | ||||
-rw-r--r-- | tdeunittest/runnergui.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/tdeunittest/example/simple/maingui.cpp b/tdeunittest/example/simple/maingui.cpp index 183d7492..985276cb 100644 --- a/tdeunittest/example/simple/maingui.cpp +++ b/tdeunittest/example/simple/maingui.cpp @@ -26,7 +26,7 @@ #include <tdeaboutdata.h> #include <tdeapplication.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> #include "tdeunittest/runnergui.h" diff --git a/tdeunittest/guimodrunner.cpp b/tdeunittest/guimodrunner.cpp index 0a9377e7..d719069b 100644 --- a/tdeunittest/guimodrunner.cpp +++ b/tdeunittest/guimodrunner.cpp @@ -25,11 +25,11 @@ #include <kdebug.h> #include <tdeapplication.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kinstance.h> #include <tdeaboutdata.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> #include "runnergui.h" diff --git a/tdeunittest/runnergui.cpp b/tdeunittest/runnergui.cpp index 8e31dac2..2e9ca350 100644 --- a/tdeunittest/runnergui.cpp +++ b/tdeunittest/runnergui.cpp @@ -35,7 +35,7 @@ #include <dcopobject.h> #include <kiconloader.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeunittest/tester.h> |