From 77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 21:55:37 -0600
Subject: Rename additional header files to avoid conflicts with KDE4

---
 kpager/config.cpp  | 2 +-
 kpager/desktop.cpp | 4 ++--
 kpager/kpager.cpp  | 6 +++---
 kpager/main.cpp    | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'kpager')

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>
-- 
cgit v1.2.1