diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:55:15 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:55:15 -0600 |
| commit | ce1660ccd810825d9e087d0e9bc27dd4aea3e08a (patch) | |
| tree | 57df8fa20601c7b06117399bd921a485b7476e4a /tdescreensaver/xsavers | |
| parent | 2a66a2cdb1c9c8017e821e34ec93732761b14d47 (diff) | |
| download | tdeartwork-ce1660ccd810825d9e087d0e9bc27dd4aea3e08a.tar.gz tdeartwork-ce1660ccd810825d9e087d0e9bc27dd4aea3e08a.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'tdescreensaver/xsavers')
| -rw-r--r-- | tdescreensaver/xsavers/demowin.h | 2 | ||||
| -rw-r--r-- | tdescreensaver/xsavers/main.cpp | 2 | ||||
| -rw-r--r-- | tdescreensaver/xsavers/saver.cpp | 4 | ||||
| -rw-r--r-- | tdescreensaver/xsavers/space.cpp | 6 | ||||
| -rw-r--r-- | tdescreensaver/xsavers/swarm.cpp | 6 |
5 files changed, 10 insertions, 10 deletions
diff --git a/tdescreensaver/xsavers/demowin.h b/tdescreensaver/xsavers/demowin.h index dea8b376..c20f5495 100644 --- a/tdescreensaver/xsavers/demowin.h +++ b/tdescreensaver/xsavers/demowin.h @@ -14,7 +14,7 @@ #include <stdio.h> #include <stdlib.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <kstandarddirs.h> #include <tdeapplication.h> diff --git a/tdescreensaver/xsavers/main.cpp b/tdescreensaver/xsavers/main.cpp index 3456c943..d649caec 100644 --- a/tdescreensaver/xsavers/main.cpp +++ b/tdescreensaver/xsavers/main.cpp @@ -13,7 +13,7 @@ #include <tqcolor.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <kstandarddirs.h> #include <kdebug.h> diff --git a/tdescreensaver/xsavers/saver.cpp b/tdescreensaver/xsavers/saver.cpp index dc3c3977..10343267 100644 --- a/tdescreensaver/xsavers/saver.cpp +++ b/tdescreensaver/xsavers/saver.cpp @@ -1,7 +1,7 @@ #include <tdeapplication.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kprocess.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <X11/Xlib.h> diff --git a/tdescreensaver/xsavers/space.cpp b/tdescreensaver/xsavers/space.cpp index bd87a9b4..c94294c5 100644 --- a/tdescreensaver/xsavers/space.cpp +++ b/tdescreensaver/xsavers/space.cpp @@ -51,7 +51,7 @@ #include <tqslider.h> #include <tqlayout.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdeconfig.h> #include <krandomsequence.h> #include <kdebug.h> @@ -63,7 +63,7 @@ #ifdef HAVE_GL -#include <klocale.h> +#include <tdelocale.h> #undef index #include "space.h" @@ -467,7 +467,7 @@ initSpace(Window window) #include <tqlabel.h> #include <tqcolor.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include "space.moc" diff --git a/tdescreensaver/xsavers/swarm.cpp b/tdescreensaver/xsavers/swarm.cpp index 9c5a4923..c813d809 100644 --- a/tdescreensaver/xsavers/swarm.cpp +++ b/tdescreensaver/xsavers/swarm.cpp @@ -22,7 +22,7 @@ #define DEFBATCH 20 #include <tqslider.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdeconfig.h> #include <krandomsequence.h> #include "xlock.h" @@ -222,8 +222,8 @@ drawswarm(Window win, KRandomSequence &rnd) #include <tqcolor.h> #include <tqlayout.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include "swarm.h" #include "swarm.moc" |