diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:55:37 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:55:37 -0600 |
| commit | 77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8 (patch) | |
| tree | a1cce95474892add7cb970b8e9fbdb16e12bc2d7 /kpager | |
| parent | 9286b9ebcc5c6b73a1061763cf5e3d9dd8eea3c0 (diff) | |
| download | tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.tar.gz tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kpager')
| -rw-r--r-- | kpager/config.cpp | 2 | ||||
| -rw-r--r-- | kpager/desktop.cpp | 4 | ||||
| -rw-r--r-- | kpager/kpager.cpp | 6 | ||||
| -rw-r--r-- | kpager/main.cpp | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/kpager/config.cpp b/kpager/config.cpp index 065240516..0c022d4bb 100644 --- a/kpager/config.cpp +++ b/kpager/config.cpp @@ -30,7 +30,7 @@ #include <tqlayout.h> #include <kdialogbase.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <kseparator.h> #include <tdeapplication.h> diff --git a/kpager/desktop.cpp b/kpager/desktop.cpp index bfe6bc390..74ead587f 100644 --- a/kpager/desktop.cpp +++ b/kpager/desktop.cpp @@ -29,11 +29,11 @@ #include <dcopclient.h> #include <kdatastream.h> #include <tdeapplication.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <twinmodule.h> #include <twin.h> #include <tdeconfig.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kdebug.h> #include <ksharedpixmap.h> #include <kpixmapio.h> diff --git a/kpager/kpager.cpp b/kpager/kpager.cpp index 7c134fe76..3bceac2f3 100644 --- a/kpager/kpager.cpp +++ b/kpager/kpager.cpp @@ -43,13 +43,13 @@ #include <tqtimer.h> #include <tdeapplication.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tdeaction.h> #include <kstdaction.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdeconfig.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <twin.h> #include <twinmodule.h> #include <netwm.h> diff --git a/kpager/main.cpp b/kpager/main.cpp index 47f4d1d14..4a6ab2bcd 100644 --- a/kpager/main.cpp +++ b/kpager/main.cpp @@ -22,7 +22,7 @@ ***************************************************************************/ #include <kuniqueapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdecmdlineargs.h> #include <tdeaboutdata.h> #include <tqcolor.h> |