Rename a number of libraries and executables to avoid conflicts with KDE4

13 files changed, 15 insertions, 15 deletions

diff --git a/kontact/plugins/kmail/kcmkmailsummary.cpp b/kontact/plugins/kmail/kcmkmailsummary.cpp
index 72141a6f1..eb8906d26 100644
--- a/kontact/plugins/kmail/kcmkmailsummary.cpp
+++ b/kontact/plugins/kmail/kcmkmailsummary.cpp
@@ -29,7 +29,7 @@
 #include <kaboutdata.h>
 #include <kaccelmanager.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <klistview.h>
diff --git a/kontact/plugins/kmail/summarywidget.cpp b/kontact/plugins/kmail/summarywidget.cpp
index 89e572bf8..a67c0a594 100644
--- a/kontact/plugins/kmail/summarywidget.cpp
+++ b/kontact/plugins/kmail/summarywidget.cpp
@@ -27,7 +27,7 @@
 
 #include <dcopref.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <kglobal.h>
diff --git a/kontact/plugins/korganizer/kcmkorgsummary.cpp b/kontact/plugins/korganizer/kcmkorgsummary.cpp
index 203055d5a..818f3c056 100644
--- a/kontact/plugins/korganizer/kcmkorgsummary.cpp
+++ b/kontact/plugins/korganizer/kcmkorgsummary.cpp
@@ -30,7 +30,7 @@
 #include <kaboutdata.h>
 #include <kapplication.h>
 #include <kaccelmanager.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <klocale.h>
diff --git a/kontact/plugins/newsticker/kcmkontactknt.cpp b/kontact/plugins/newsticker/kcmkontactknt.cpp
index 6e0efd0fc..958959667 100644
--- a/kontact/plugins/newsticker/kcmkontactknt.cpp
+++ b/kontact/plugins/newsticker/kcmkontactknt.cpp
@@ -34,7 +34,7 @@
 #include <kaboutdata.h>
 #include <kapplication.h>
 #include <kaccelmanager.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <klistview.h>
diff --git a/kontact/plugins/newsticker/summarywidget.cpp b/kontact/plugins/newsticker/summarywidget.cpp
index 52bb8b6e4..f0f7d7460 100644
--- a/kontact/plugins/newsticker/summarywidget.cpp
+++ b/kontact/plugins/newsticker/summarywidget.cpp
@@ -32,7 +32,7 @@
 #include <dcopclient.h>
 #include <kapplication.h>
 #include <kcharsets.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kiconloader.h>
diff --git a/kontact/plugins/specialdates/kcmsdsummary.cpp b/kontact/plugins/specialdates/kcmsdsummary.cpp
index 193958b89..a15d1118c 100644
--- a/kontact/plugins/specialdates/kcmsdsummary.cpp
+++ b/kontact/plugins/specialdates/kcmsdsummary.cpp
@@ -32,7 +32,7 @@
 #include <kaboutdata.h>
 #include <kapplication.h>
 #include <kaccelmanager.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <klocale.h>
diff --git a/kontact/plugins/summary/kcmkontactsummary.cpp b/kontact/plugins/summary/kcmkontactsummary.cpp
index d880f153b..43f18f22a 100644
--- a/kontact/plugins/summary/kcmkontactsummary.cpp
+++ b/kontact/plugins/summary/kcmkontactsummary.cpp
@@ -23,7 +23,7 @@
 */
 
 #include <kaboutdata.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <kiconloader.h>
diff --git a/kontact/plugins/summary/summaryview_part.cpp b/kontact/plugins/summary/summaryview_part.cpp
index de5902b06..27dac829f 100644
--- a/kontact/plugins/summary/summaryview_part.cpp
+++ b/kontact/plugins/summary/summaryview_part.cpp
@@ -29,7 +29,7 @@
 #include <dcopclient.h>
 #include <kaction.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdcopservicestarter.h>
 #include <kdebug.h>
 #include <kdialog.h>
diff --git a/kontact/src/kontactconfig.desktop b/kontact/src/kontactconfig.desktop
index 0c094d502..532e692c8 100644
--- a/kontact/src/kontactconfig.desktop
+++ b/kontact/src/kontactconfig.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kcmshell kontactconfig
+Exec=tdecmshell kontactconfig
 Icon=kontact
 Type=Service
 ServiceTypes=TDECModule
diff --git a/kontact/src/mainwindow.cpp b/kontact/src/mainwindow.cpp
index d3642b6a5..e914fe07d 100644
--- a/kontact/src/mainwindow.cpp
+++ b/kontact/src/mainwindow.cpp
@@ -35,7 +35,7 @@
 
 #include <dcopclient.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kedittoolbar.h>
 #include <kguiitem.h>
@@ -62,7 +62,7 @@
 #include <krsqueezedtextlabel.h>
 #include <tdehtml_part.h>
 #include <tdehtmlview.h>
-#include <libtdepim/kfileio.h>
+#include <libtdepim/tdefileio.h>
 #include <kcursor.h>
 #include <krun.h>
 #include <kaboutdata.h>
diff --git a/kontact/src/prefs.kcfgc b/kontact/src/prefs.kcfgc
index 31e6e4338..03eb7af75 100644
--- a/kontact/src/prefs.kcfgc
+++ b/kontact/src/prefs.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=kontact.kcfg
 NameSpace=Kontact
 ClassName=Prefs
diff --git a/kontact/src/profiledialog.cpp b/kontact/src/profiledialog.cpp
index 89e241be9..e959ad865 100644
--- a/kontact/src/profiledialog.cpp
+++ b/kontact/src/profiledialog.cpp
@@ -25,7 +25,7 @@
 #include "profiledialog.h"
 #include "profilemanager.h"
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klistview.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/kontact/src/profilemanager.cpp b/kontact/src/profilemanager.cpp
index 295f4615d..3b0a568c6 100644
--- a/kontact/src/profilemanager.cpp
+++ b/kontact/src/profilemanager.cpp
@@ -24,10 +24,10 @@
 
 #include "profilemanager.h"
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
 #include <kstaticdeleter.h>