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

---
 quanta/src/CMakeLists.txt  | 2 +-
 quanta/src/document.cpp    | 6 +++---
 quanta/src/dtds.cpp        | 6 +++---
 quanta/src/kqapp.cpp       | 2 +-
 quanta/src/main.cpp        | 2 +-
 quanta/src/quanta.cpp      | 8 ++++----
 quanta/src/quanta_init.cpp | 8 ++++----
 quanta/src/quantadoc.cpp   | 4 ++--
 quanta/src/quantaview.cpp  | 6 +++---
 quanta/src/viewmanager.cpp | 2 +-
 10 files changed, 23 insertions(+), 23 deletions(-)

(limited to 'quanta/src')

diff --git a/quanta/src/CMakeLists.txt b/quanta/src/CMakeLists.txt
index 86d93f09..91910b2a 100644
--- a/quanta/src/CMakeLists.txt
+++ b/quanta/src/CMakeLists.txt
@@ -72,7 +72,7 @@ tde_add_executable( quanta AUTOMOC
     tableeditor-static preview-static
     utility-static quantamodule-static
     kafkalibrary-static tdemdi-shared tdehtml-shared
-    knewstuff-shared kabc-shared tdetexteditor-shared
+    knewstuff-shared tdeabc-shared tdetexteditor-shared
     ${LIBXML_LIBRARIES} ${LIBXSLT_LIBRARIES}
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/quanta/src/document.cpp b/quanta/src/document.cpp
index 753fa255..a2f316e8 100644
--- a/quanta/src/document.cpp
+++ b/quanta/src/document.cpp
@@ -34,14 +34,14 @@
 // KDE includes
 #include <tdeapplication.h>
 #include <twin.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <tdeactionclasses.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>
 #include <kmdcodec.h>
-#include <kmessagebox.h>
-#include <ktempfile.h>
+#include <tdemessagebox.h>
+#include <tdetempfile.h>
 #include <kdirwatch.h>
 #include <kdebug.h>
 #include <kprogress.h>
diff --git a/quanta/src/dtds.cpp b/quanta/src/dtds.cpp
index a102e506..737a3a00 100644
--- a/quanta/src/dtds.cpp
+++ b/quanta/src/dtds.cpp
@@ -32,9 +32,9 @@
 #include <kdialogbase.h>
 #include <kurl.h>
 #include <kurlrequester.h>
-#include <kglobal.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <tdefiledialog.h>
 
diff --git a/quanta/src/kqapp.cpp b/quanta/src/kqapp.cpp
index 80232b7f..fc826178 100644
--- a/quanta/src/kqapp.cpp
+++ b/quanta/src/kqapp.cpp
@@ -25,7 +25,7 @@
 #include <kurl.h>
 #include <kiconloader.h>
 #include <kstandarddirs.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <ksplashscreen.h>
 #include <dcopclient.h>
 #include <tdeversion.h>
diff --git a/quanta/src/main.cpp b/quanta/src/main.cpp
index dcc10e57..91e0dbd5 100644
--- a/quanta/src/main.cpp
+++ b/quanta/src/main.cpp
@@ -18,7 +18,7 @@
 #include <stdlib.h>
 
 // kde includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutdata.h>
 #include <kiconloader.h>
 #include <ksimpleconfig.h>
diff --git a/quanta/src/quanta.cpp b/quanta/src/quanta.cpp
index 812afa55..75ac7db0 100644
--- a/quanta/src/quanta.cpp
+++ b/quanta/src/quanta.cpp
@@ -56,11 +56,11 @@
 #include <kcolordialog.h>
 #include <kcombobox.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kencodingfiledialog.h>
 #include <tdefiledialog.h>
-#include <kmenubar.h>
-#include <klocale.h>
+#include <tdemenubar.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <tdehtmlview.h>
 #include <kdialogbase.h>
@@ -75,7 +75,7 @@
 #include <kprocess.h>
 #include <kprogress.h>
 #include <ktempdir.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <ktextedit.h>
 #include <kdebug.h>
 #include <ktar.h>
diff --git a/quanta/src/quanta_init.cpp b/quanta/src/quanta_init.cpp
index fa09db96..0a4d0262 100644
--- a/quanta/src/quanta_init.cpp
+++ b/quanta/src/quanta_init.cpp
@@ -39,11 +39,11 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
-#include <kglobal.h>
-#include <kmenubar.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdemenubar.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <tdehtmlview.h>
 #include <kstandarddirs.h>
diff --git a/quanta/src/quantadoc.cpp b/quanta/src/quantadoc.cpp
index fdf9497c..354cb464 100644
--- a/quanta/src/quantadoc.cpp
+++ b/quanta/src/quantadoc.cpp
@@ -27,11 +27,11 @@
 
 
 // include files for KDE
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <tdeconfig.h>
 #include <tdepopupmenu.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdirwatch.h>
 #include <tdeversion.h>
 #include <kdebug.h>
diff --git a/quanta/src/quantaview.cpp b/quanta/src/quantaview.cpp
index d5dabb1e..bcef6729 100644
--- a/quanta/src/quantaview.cpp
+++ b/quanta/src/quantaview.cpp
@@ -36,11 +36,11 @@
 #include <kdebug.h>
 #include <kdirwatch.h>
 #include <tdehtmlview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kurldrag.h>
 #include <tdeversion.h>
 #include <tdeparts/partmanager.h>
diff --git a/quanta/src/viewmanager.cpp b/quanta/src/viewmanager.cpp
index 7c73f093..f76973d7 100644
--- a/quanta/src/viewmanager.cpp
+++ b/quanta/src/viewmanager.cpp
@@ -18,7 +18,7 @@
 //kde includes
 #include <kdirwatch.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdemdimainfrm.h>
 #include <kurl.h>
 #include <tdepopupmenu.h>
-- 
cgit v1.2.3