From 64df902cf71a8ee258fb85f6be26248f399aa01f Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 27 Jan 2013 01:05:15 -0600
Subject: Rename a number of libraries and executables to avoid conflicts with
 KDE4

---
 libkpimidentities/identity.cpp        | 4 ++--
 libkpimidentities/identitymanager.cpp | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'libkpimidentities')

diff --git a/libkpimidentities/identity.cpp b/libkpimidentities/identity.cpp
index c467599a5..9b4c9df67 100644
--- a/libkpimidentities/identity.cpp
+++ b/libkpimidentities/identity.cpp
@@ -8,13 +8,13 @@
 
 #include "identity.h"
 
-#include <libtdepim/kfileio.h>
+#include <libtdepim/tdefileio.h>
 #include <libtdepim/collectingprocess.h>
 
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kurl.h>
 
 #include <tqfileinfo.h>
diff --git a/libkpimidentities/identitymanager.cpp b/libkpimidentities/identitymanager.cpp
index f6bc5def4..d9d626156 100644
--- a/libkpimidentities/identitymanager.cpp
+++ b/libkpimidentities/identitymanager.cpp
@@ -45,7 +45,7 @@ static const char configKeyDefaultIdentity[] = "Default Identity";
 #include <kapplication.h>
 #include <klocale.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kuser.h>
 #include <dcopclient.h>
 
@@ -74,7 +74,7 @@ IdentityManager::IdentityManager( bool readonly, TQObject * parent, const char *
   readConfig(mConfig);
   if ( mIdentities.isEmpty() ) {
     kdDebug(5006) << "emailidentities is empty -> convert from kmailrc" << endl;
-    // No emailidentities file, or an empty one due to broken conversion (kconf_update bug in tdelibs <= 3.2.2)
+    // No emailidentities file, or an empty one due to broken conversion (tdeconf_update bug in tdelibs <= 3.2.2)
     // => convert it, i.e. read settings from kmailrc
     TDEConfig kmailConf( "kmailrc", true );
     readConfig( &kmailConf );
-- 
cgit v1.2.1