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/kxsconfig | |
| parent | 2a66a2cdb1c9c8017e821e34ec93732761b14d47 (diff) | |
| download | tdeartwork-ce1660ccd810825d9e087d0e9bc27dd4aea3e08a.tar.gz tdeartwork-ce1660ccd810825d9e087d0e9bc27dd4aea3e08a.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'tdescreensaver/kxsconfig')
| -rw-r--r-- | tdescreensaver/kxsconfig/kxsconfig.cpp | 4 | ||||
| -rw-r--r-- | tdescreensaver/kxsconfig/kxscontrol.cpp | 2 | ||||
| -rw-r--r-- | tdescreensaver/kxsconfig/kxsitem.cpp | 2 | ||||
| -rw-r--r-- | tdescreensaver/kxsconfig/kxsrun.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/tdescreensaver/kxsconfig/kxsconfig.cpp b/tdescreensaver/kxsconfig/kxsconfig.cpp index a8eb9bca..fdff38e2 100644 --- a/tdescreensaver/kxsconfig/kxsconfig.cpp +++ b/tdescreensaver/kxsconfig/kxsconfig.cpp @@ -49,9 +49,9 @@ #include <kdialogbase.h> #include <kprocess.h> #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdecmdlineargs.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include "kxsconfig.h" #include "kxscontrol.h" diff --git a/tdescreensaver/kxsconfig/kxscontrol.cpp b/tdescreensaver/kxsconfig/kxscontrol.cpp index 594a0255..294c18bd 100644 --- a/tdescreensaver/kxsconfig/kxscontrol.cpp +++ b/tdescreensaver/kxsconfig/kxscontrol.cpp @@ -27,7 +27,7 @@ #include <tqspinbox.h> #include <tqpushbutton.h> #include <tqxml.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdefiledialog.h> #include "kxscontrol.h" diff --git a/tdescreensaver/kxsconfig/kxsitem.cpp b/tdescreensaver/kxsconfig/kxsitem.cpp index 96e20758..62614cb6 100644 --- a/tdescreensaver/kxsconfig/kxsitem.cpp +++ b/tdescreensaver/kxsconfig/kxsitem.cpp @@ -20,7 +20,7 @@ // Boston, MA 02110-1301, USA. #include "kxsconfig.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqxml.h> //=========================================================================== diff --git a/tdescreensaver/kxsconfig/kxsrun.cpp b/tdescreensaver/kxsconfig/kxsrun.cpp index 2151f306..1d7f6cc6 100644 --- a/tdescreensaver/kxsconfig/kxsrun.cpp +++ b/tdescreensaver/kxsconfig/kxsrun.cpp @@ -33,7 +33,7 @@ #include <tdeapplication.h> #include <tdeconfig.h> #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdecmdlineargs.h> #include "kxsitem.h" |