summaryrefslogtreecommitdiffstats
path: root/libtdepim/komposer/core
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-27 01:05:15 -0600
committerTimothy Pearson <[email protected]>2013-01-27 01:05:15 -0600
commit64df902cf71a8ee258fb85f6be26248f399aa01f (patch)
treedba58f705042c22cea26b678d5b0e4e9a34bf202 /libtdepim/komposer/core
parentde53c98cab07e9c4b0f5e25dab82830fb6fc67ec (diff)
downloadtdepim-64df902cf71a8ee258fb85f6be26248f399aa01f.tar.gz
tdepim-64df902cf71a8ee258fb85f6be26248f399aa01f.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'libtdepim/komposer/core')
-rw-r--r--libtdepim/komposer/core/core.cpp2
-rw-r--r--libtdepim/komposer/core/komposerconfig.desktop2
-rw-r--r--libtdepim/komposer/core/settings.kcfgc2
3 files changed, 3 insertions, 3 deletions
diff --git a/libtdepim/komposer/core/core.cpp b/libtdepim/komposer/core/core.cpp
index 945c22311..a2f5fd003 100644
--- a/libtdepim/komposer/core/core.cpp
+++ b/libtdepim/komposer/core/core.cpp
@@ -29,7 +29,7 @@
#include <ksettings/dialog.h>
#include <kplugininfo.h>
#include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <ktrader.h>
#include <klibloader.h>
#include <kstdaction.h>
diff --git a/libtdepim/komposer/core/komposerconfig.desktop b/libtdepim/komposer/core/komposerconfig.desktop
index 5ceb12582..ab5239b08 100644
--- a/libtdepim/komposer/core/komposerconfig.desktop
+++ b/libtdepim/komposer/core/komposerconfig.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Exec=kcmshell komposerconfig
+Exec=tdecmshell komposerconfig
Icon=komposer
Type=Application
Terminal=false
diff --git a/libtdepim/komposer/core/settings.kcfgc b/libtdepim/komposer/core/settings.kcfgc
index fc98478a9..a4c881006 100644
--- a/libtdepim/komposer/core/settings.kcfgc
+++ b/libtdepim/komposer/core/settings.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
File=komposer.kcfg
NameSpace=Komposer
ClassName=Config