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

---
 kappfinder/common.cpp       | 2 +-
 kappfinder/main.cpp         | 2 +-
 kappfinder/main_install.cpp | 4 ++--
 kappfinder/toplevel.cpp     | 8 ++++----
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'kappfinder')

diff --git a/kappfinder/common.cpp b/kappfinder/common.cpp
index 9fb00f9df..51d30dee5 100644
--- a/kappfinder/common.cpp
+++ b/kappfinder/common.cpp
@@ -21,7 +21,7 @@
 
 #include <kdebug.h>
 #include <kdesktopfile.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 
 #include <tqdir.h>
diff --git a/kappfinder/main.cpp b/kappfinder/main.cpp
index bcd83d13e..813e8a195 100644
--- a/kappfinder/main.cpp
+++ b/kappfinder/main.cpp
@@ -20,7 +20,7 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "toplevel.h"
 
diff --git a/kappfinder/main_install.cpp b/kappfinder/main_install.cpp
index 0195172f5..c56179548 100644
--- a/kappfinder/main_install.cpp
+++ b/kappfinder/main_install.cpp
@@ -20,9 +20,9 @@
 */
 
 #include <tdecmdlineargs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kinstance.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include <tqstringlist.h>
diff --git a/kappfinder/toplevel.cpp b/kappfinder/toplevel.cpp
index 16b8cdbd0..25bbec9e7 100644
--- a/kappfinder/toplevel.cpp
+++ b/kappfinder/toplevel.cpp
@@ -24,16 +24,16 @@
 #include <kbuttonbox.h>
 #include <kdebug.h>
 #include <kdesktopfile.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprogress.h>
 #include <kservice.h>
 #include <kservicegroup.h>
 #include <kstandarddirs.h>
 #include <kstdguiitem.h>
-#include <kstartupinfo.h>
+#include <tdestartupinfo.h>
 
 #include <tqaccel.h>
 #include <tqlabel.h>
-- 
cgit v1.2.3