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

10 files changed, 10 insertions, 10 deletions

diff --git a/kdelirc/kcmlirc/CMakeLists.txt b/kdelirc/kcmlirc/CMakeLists.txt
index 9f09d3e..e5c6e2b 100644
--- a/kdelirc/kcmlirc/CMakeLists.txt
+++ b/kdelirc/kcmlirc/CMakeLists.txt
@@ -34,7 +34,7 @@ tde_add_kpart( kcm_kcmlirc AUTOMOC
     addaction.cpp kcmlirc.skel editactionbase.ui
     editmodebase.ui editmode.cpp editaction.cpp
     modeslist.cpp
-  LINK kdelirc-static tdeui-shared kio-shared
+  LINK kdelirc-static tdeui-shared tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
diff --git a/kdelirc/kcmlirc/kcmlirc.cpp b/kdelirc/kcmlirc/kcmlirc.cpp
index c97b203..74856d0 100644
--- a/kdelirc/kcmlirc/kcmlirc.cpp
+++ b/kdelirc/kcmlirc/kcmlirc.cpp
@@ -21,7 +21,7 @@
 #include <kapplication.h>
 #include <klocale.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kicondialog.h>
 #include <kiconloader.h>
 #include <kdebug.h>
diff --git a/kdelirc/kcmlirc/kcmlirc.desktop b/kdelirc/kcmlirc/kcmlirc.desktop
index 94a3503..09033c1 100644
--- a/kdelirc/kcmlirc/kcmlirc.desktop
+++ b/kdelirc/kcmlirc/kcmlirc.desktop
@@ -50,7 +50,7 @@ Comment[tr]=Uzaktan kontrol ayarlarınızı uygulamalarla kullanmak için ayarla
 Comment[uk]=Налаштування елементів дистанційного керування для використання з програмами
 Comment[zh_CN]=配置您的远程控制以供应用程序使用
 Comment[zh_TW]=設定遙控按鍵與應用程式的關聯
-Exec=kcmshell kcmlirc
+Exec=tdecmshell kcmlirc
 Keywords=KCMLirc,kcmlirc
 Keywords[bg]=дистанционно устройство, дистанционно, инфрачервени, лъчи, KCMLirc, kcmlirc
 Keywords[nl]=kcmlirc,linux infrarood,infrarood,afstandsbediening
diff --git a/kdelirc/kdelirc/iraction.cpp b/kdelirc/kdelirc/iraction.cpp
index 7e2c26e..00be5da 100644
--- a/kdelirc/kdelirc/iraction.cpp
+++ b/kdelirc/kdelirc/iraction.cpp
@@ -13,7 +13,7 @@
 
 #include <tqvariant.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 
 #include "iraction.h"
diff --git a/kdelirc/kdelirc/iractions.cpp b/kdelirc/kdelirc/iractions.cpp
index fa5d34f..85d144e 100644
--- a/kdelirc/kdelirc/iractions.cpp
+++ b/kdelirc/kdelirc/iractions.cpp
@@ -10,7 +10,7 @@
 // Copyright: See COPYING file that comes with this distribution
 //
 //
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 #include "iractions.h"
diff --git a/kdelirc/kdelirc/mode.cpp b/kdelirc/kdelirc/mode.cpp
index 3acae0a..9402573 100644
--- a/kdelirc/kdelirc/mode.cpp
+++ b/kdelirc/kdelirc/mode.cpp
@@ -11,7 +11,7 @@
 //
 //
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "modes.h"
 #include "mode.h"
diff --git a/kdelirc/kdelirc/modes.cpp b/kdelirc/kdelirc/modes.cpp
index bbab16f..8eedce0 100644
--- a/kdelirc/kdelirc/modes.cpp
+++ b/kdelirc/kdelirc/modes.cpp
@@ -10,7 +10,7 @@
 // Copyright: See COPYING file that comes with this distribution
 //
 //
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 #include "modes.h"
diff --git a/kdelirc/profiles/CMakeLists.txt b/kdelirc/profiles/CMakeLists.txt
index c6f8828..7fedebd 100644
--- a/kdelirc/profiles/CMakeLists.txt
+++ b/kdelirc/profiles/CMakeLists.txt
@@ -10,7 +10,7 @@
 #################################################
 
 install( FILES profile.dtd noatun.profile.xml
-     klauncher.profile.xml konqueror.profile.xml
+     tdelauncher.profile.xml konqueror.profile.xml
   DESTINATION ${DATA_INSTALL_DIR}/profiles
 )
 
diff --git a/kdelirc/profiles/Makefile.am b/kdelirc/profiles/Makefile.am
index e25d1d4..9561d73 100644
--- a/kdelirc/profiles/Makefile.am
+++ b/kdelirc/profiles/Makefile.am
@@ -1,4 +1,4 @@
-profiledata_DATA = profile.dtd noatun.profile.xml klauncher.profile.xml konqueror.profile.xml
+profiledata_DATA = profile.dtd noatun.profile.xml tdelauncher.profile.xml konqueror.profile.xml
 profiledatadir = $(kde_datadir)/profiles
 
 EXTRA_DIST = $(profiledata_DATA)
diff --git a/kdelirc/profiles/klauncher.profile.xml b/kdelirc/profiles/tdelauncher.profile.xml
index 4a19c71..57eca31 100644
--- a/kdelirc/profiles/klauncher.profile.xml
+++ b/kdelirc/profiles/tdelauncher.profile.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <!DOCTYPE profile SYSTEM "profile.dtd">
-<profile id="klauncher">
+<profile id="tdelauncher">
 	<name>TDE Program Launcher</name>
 	<author>Gav Wood</author>
 	<action objid="default" prototype="void tdeinit_exec(QString, QStringList)" repeat="0" autostart="0">