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

---
 kabc/frontend/main.cpp                           | 2 +-
 kabc/frontend/mainWindow.ui.h                    | 4 ++--
 kabc/kabc2mutt/CMakeLists.txt                    | 2 +-
 kabc/kabc2mutt/kabc2mutt.cpp                     | 4 ++--
 kabc/kabc2mutt/kabc2mutt.h                       | 2 +-
 kabc/kabc2mutt/main.cpp                          | 2 +-
 kabc/kabcdistlistupdater/kabcdistlistupdater.cpp | 8 ++++----
 7 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'kabc')

diff --git a/kabc/frontend/main.cpp b/kabc/frontend/main.cpp
index 7367508be..0e941e017 100644
--- a/kabc/frontend/main.cpp
+++ b/kabc/frontend/main.cpp
@@ -1,7 +1,7 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 
 #include "mainWindow.h"
diff --git a/kabc/frontend/mainWindow.ui.h b/kabc/frontend/mainWindow.ui.h
index 445b5945c..1a88f1deb 100644
--- a/kabc/frontend/mainWindow.ui.h
+++ b/kabc/frontend/mainWindow.ui.h
@@ -10,10 +10,10 @@
 #include <kinputdialog.h>
 #include <tqmessagebox.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
-#include <kabc/stdaddressbook.h>
+#include <tdeabc/stdaddressbook.h>
 
 using namespace KABC;
 
diff --git a/kabc/kabc2mutt/CMakeLists.txt b/kabc/kabc2mutt/CMakeLists.txt
index f7ec8dbed..98c30f0b5 100644
--- a/kabc/kabc2mutt/CMakeLists.txt
+++ b/kabc/kabc2mutt/CMakeLists.txt
@@ -24,6 +24,6 @@ link_directories(
 
 tde_add_executable( kabc2mutt AUTOMOC
   SOURCES kabc2mutt.cpp main.cpp
-  LINK kabc-shared
+  LINK tdeabc-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/kabc/kabc2mutt/kabc2mutt.cpp b/kabc/kabc2mutt/kabc2mutt.cpp
index 7f346a62c..144ffe2dd 100644
--- a/kabc/kabc2mutt/kabc2mutt.cpp
+++ b/kabc/kabc2mutt/kabc2mutt.cpp
@@ -17,9 +17,9 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-#include <kabc/distributionlist.h>
+#include <tdeabc/distributionlist.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqregexp.h>
 
diff --git a/kabc/kabc2mutt/kabc2mutt.h b/kabc/kabc2mutt/kabc2mutt.h
index eb3ca733f..328f06c17 100644
--- a/kabc/kabc2mutt/kabc2mutt.h
+++ b/kabc/kabc2mutt/kabc2mutt.h
@@ -20,7 +20,7 @@
 #ifndef KABC2MUTT_H
 #define KABC2MUTT_H
 
-#include <kabc/stdaddressbook.h>
+#include <tdeabc/stdaddressbook.h>
 
 class KABC2Mutt : public TQObject
 {
diff --git a/kabc/kabc2mutt/main.cpp b/kabc/kabc2mutt/main.cpp
index 3d6fad649..d1aefd6ef 100644
--- a/kabc/kabc2mutt/main.cpp
+++ b/kabc/kabc2mutt/main.cpp
@@ -19,7 +19,7 @@
 
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <iostream>
 
diff --git a/kabc/kabcdistlistupdater/kabcdistlistupdater.cpp b/kabc/kabcdistlistupdater/kabcdistlistupdater.cpp
index 38fe294ab..b2e8d93b8 100644
--- a/kabc/kabcdistlistupdater/kabcdistlistupdater.cpp
+++ b/kabc/kabcdistlistupdater/kabcdistlistupdater.cpp
@@ -23,11 +23,11 @@
 #include <tdecmdlineargs.h>
 #include <ksimpleconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
-#include <kabc/stdaddressbook.h>
+#include <tdeabc/stdaddressbook.h>
 #include <libtdepim/distributionlist.h>
 
 static const TDECmdLineOptions options[] =
@@ -38,7 +38,7 @@ static const TDECmdLineOptions options[] =
 
 void convertDistributionLists()
 {
-  KSimpleConfig cfg( locateLocal( "data", "kabc/distlists" ) );
+  KSimpleConfig cfg( locateLocal( "data", "tdeabc/distlists" ) );
   const TQMap<TQString, TQString> entryMap = cfg.entryMap( "DistributionLists" );
 
   if ( entryMap.isEmpty() ) // nothing to convert
-- 
cgit v1.2.1