summaryrefslogtreecommitdiffstats
path: root/kontact/src
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:05:15 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:05:15 -0600
commit64df902cf71a8ee258fb85f6be26248f399aa01f (patch)
treedba58f705042c22cea26b678d5b0e4e9a34bf202 /kontact/src
parentde53c98cab07e9c4b0f5e25dab82830fb6fc67ec (diff)
downloadtdepim-64df902cf71a8ee258fb85f6be26248f399aa01f.tar.gz
tdepim-64df902cf71a8ee258fb85f6be26248f399aa01f.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kontact/src')
-rw-r--r--kontact/src/kontactconfig.desktop2
-rw-r--r--kontact/src/mainwindow.cpp4
-rw-r--r--kontact/src/prefs.kcfgc2
-rw-r--r--kontact/src/profiledialog.cpp2
-rw-r--r--kontact/src/profilemanager.cpp4
5 files changed, 7 insertions, 7 deletions
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>