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

---
 interfaces/tdeimproxy/library/tdeimproxy.cpp                        | 2 +-
 .../tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.cpp      | 4 ++--
 interfaces/tdescript/scriptloader.cpp                               | 4 ++--
 interfaces/tdescript/scriptmanager.cpp                              | 4 ++--
 interfaces/tdetexteditor/CMakeLists.txt                             | 2 +-
 interfaces/tdetexteditor/Makefile.am                                | 2 +-
 interfaces/tdetexteditor/editorchooser.cpp                          | 2 +-
 interfaces/tdetexteditor/templateinterface.cpp                      | 6 +++---
 interfaces/terminal/test/main.cc                                    | 2 +-
 9 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'interfaces')

diff --git a/interfaces/tdeimproxy/library/tdeimproxy.cpp b/interfaces/tdeimproxy/library/tdeimproxy.cpp
index c4d77c61e..fb2db0eb4 100644
--- a/interfaces/tdeimproxy/library/tdeimproxy.cpp
+++ b/interfaces/tdeimproxy/library/tdeimproxy.cpp
@@ -27,7 +27,7 @@
 #include <tdeapplication.h>
 #include <kdcopservicestarter.h> 
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <ksimpleconfig.h>
 #include <kiconloader.h>
 #include <kservice.h>
diff --git a/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.cpp b/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.cpp
index 7dd746c4f..370805a74 100644
--- a/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.cpp
+++ b/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.cpp
@@ -5,10 +5,10 @@
 #include <tqlayout.h>
 #include <tqvgroupbox.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <klibloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdemediaplayer/player.h>
 #include <kmimetype.h>
 #include <tdeparts/componentfactory.h>
diff --git a/interfaces/tdescript/scriptloader.cpp b/interfaces/tdescript/scriptloader.cpp
index ad6c8df20..803feb3a6 100644
--- a/interfaces/tdescript/scriptloader.cpp
+++ b/interfaces/tdescript/scriptloader.cpp
@@ -21,8 +21,8 @@
 #include <tdeapplication.h>
 #include <tdeparts/part.h>
 #include <tdeparts/componentfactory.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kdesktopfile.h>
 #include <kstandarsdirs.h>
diff --git a/interfaces/tdescript/scriptmanager.cpp b/interfaces/tdescript/scriptmanager.cpp
index 42e20cd5b..a0dfbe921 100644
--- a/interfaces/tdescript/scriptmanager.cpp
+++ b/interfaces/tdescript/scriptmanager.cpp
@@ -5,8 +5,8 @@
 #include <kdesktopfile.h>
 #include <kstandarddirs.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 
 //using namespace KScriptInterface;
diff --git a/interfaces/tdetexteditor/CMakeLists.txt b/interfaces/tdetexteditor/CMakeLists.txt
index 0808a84f3..ca0176ce7 100644
--- a/interfaces/tdetexteditor/CMakeLists.txt
+++ b/interfaces/tdetexteditor/CMakeLists.txt
@@ -90,7 +90,7 @@ set( ${target}_SRCS
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
   VERSION 0.0.0
-  LINK tdeui-shared kabc-shared tdeparts-shared
+  LINK tdeui-shared tdeabc-shared tdeparts-shared
   DEPENDENCIES dcopidl dcopidl2cpp
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/interfaces/tdetexteditor/Makefile.am b/interfaces/tdetexteditor/Makefile.am
index b535b39cc..4b1590abe 100644
--- a/interfaces/tdetexteditor/Makefile.am
+++ b/interfaces/tdetexteditor/Makefile.am
@@ -46,7 +46,7 @@ servicetype_DATA = tdetexteditor.desktop tdetexteditoreditor.desktop tdetextedit
 kcm_tdetexteditor_DATA = kcm_tdetexteditor.desktop
 kcm_tdetexteditordir = $(kde_datadir)/kcm_componentchooser
 
-templateinterface.lo: $(top_builddir)/kabc/addressee.h
+templateinterface.lo: $(top_builddir)/tdeabc/addressee.h
 
 include ../../admin/Doxyfile.am
 
diff --git a/interfaces/tdetexteditor/editorchooser.cpp b/interfaces/tdetexteditor/editorchooser.cpp
index aed904c54..1eddfb8d6 100644
--- a/interfaces/tdetexteditor/editorchooser.cpp
+++ b/interfaces/tdetexteditor/editorchooser.cpp
@@ -6,7 +6,7 @@
 #include <tdeconfig.h>
 #include <tqstringlist.h>
 #include <kservice.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlabel.h>
 #include <tdeapplication.h>
 #include <tqlayout.h>
diff --git a/interfaces/tdetexteditor/templateinterface.cpp b/interfaces/tdetexteditor/templateinterface.cpp
index ecc34c7e2..01e0c292f 100644
--- a/interfaces/tdetexteditor/templateinterface.cpp
+++ b/interfaces/tdetexteditor/templateinterface.cpp
@@ -22,11 +22,11 @@
 #include <addressee.h>
 #include <addresseedialog.h>
 #include <tqstring.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <tqdatetime.h>
 #include <tqregexp.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kcalendarsystem.h>
 #include <unistd.h>
 
diff --git a/interfaces/terminal/test/main.cc b/interfaces/terminal/test/main.cc
index bcce6fdbc..8130f85d6 100644
--- a/interfaces/terminal/test/main.cc
+++ b/interfaces/terminal/test/main.cc
@@ -8,7 +8,7 @@
 #include <tdeapplication.h>
 #include <tqdir.h>
 #include <assert.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <cassert>
 #include "main.h"
 #include "main.moc"
-- 
cgit v1.2.3