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

6 files changed, 10 insertions, 10 deletions

diff --git a/kicker/applets/clock/Makefile.am b/kicker/applets/clock/Makefile.am
index 15bde61cf..fbb8ec319 100644
--- a/kicker/applets/clock/Makefile.am
+++ b/kicker/applets/clock/Makefile.am
@@ -19,7 +19,7 @@ clock_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
 clock_panelapplet_la_LIBADD =  ../../libkicker/libkickermain.la $(LIB_TDEUI)
 
 srcdoc:
-	kdoc -a -p -H -d $$HOME/web/src/clockapplet clockapplet *.h -lqt -ltdecore -ltdeui -lkfile
+	kdoc -a -p -H -d $$HOME/web/src/clockapplet clockapplet *.h -lqt -ltdecore -ltdeui -ltdefile
 
 messages: rc.cpp
 	$(XGETTEXT) *.cpp *.h -o $(podir)/clockapplet.pot
diff --git a/kicker/applets/clock/clock.cpp b/kicker/applets/clock/clock.cpp
index 35dccf148..f9dd63e9e 100644
--- a/kicker/applets/clock/clock.cpp
+++ b/kicker/applets/clock/clock.cpp
@@ -47,10 +47,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <klocale.h>
 #include <kpopupmenu.h>
 #include <kstringhandler.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kfontrequester.h>
 #include <kglobalsettings.h>
-#include <kconfigdialogmanager.h>
+#include <tdeconfigdialogmanager.h>
 #include <kcalendarsystem.h>
 #include <kicontheme.h>
 #include <kiconloader.h>
@@ -1518,12 +1518,12 @@ void ClockApplet::contextMenuActivated(int result)
             proc << locate("exe", "tdesu");
             proc << "--nonewdcop";
             proc << TQString("%1 tde-clock.desktop --lang %2")
-                .arg(locate("exe", "kcmshell"))
+                .arg(locate("exe", "tdecmshell"))
                 .arg(TDEGlobal::locale()->language());
             proc.start(TDEProcess::DontCare);
             break;
         case 104:
-            proc << locate("exe", "kcmshell");
+            proc << locate("exe", "tdecmshell");
             proc << "tde-language.desktop";
             proc.start(TDEProcess::DontCare);
             break;
diff --git a/kicker/applets/clock/clock.h b/kicker/applets/clock/clock.h
index 9a80c24b6..34d73cf83 100644
--- a/kicker/applets/clock/clock.h
+++ b/kicker/applets/clock/clock.h
@@ -37,7 +37,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <dcopobject.h>
 #include <kpanelapplet.h>
 #include <kdirwatch.h>
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
 
 #include <kickertip.h>
 #include "settings.h"
diff --git a/kicker/applets/clock/init.cpp b/kicker/applets/clock/init.cpp
index 9b89da87d..8cf336866 100644
--- a/kicker/applets/clock/init.cpp
+++ b/kicker/applets/clock/init.cpp
@@ -47,10 +47,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <klocale.h>
 #include <kpopupmenu.h>
 #include <kstringhandler.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kfontrequester.h>
 #include <kglobalsettings.h>
-#include <kconfigdialogmanager.h>
+#include <tdeconfigdialogmanager.h>
 #include <kcalendarsystem.h>
 #include <kicontheme.h>
 #include <kiconloader.h>
diff --git a/kicker/applets/clock/prefs.kcfgc b/kicker/applets/clock/prefs.kcfgc
index 890209526..fff5e1cad 100644
--- a/kicker/applets/clock/prefs.kcfgc
+++ b/kicker/applets/clock/prefs.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=clockapplet.kcfg
 ClassName=Prefs
 Singleton=false
diff --git a/kicker/applets/clock/zone.cpp b/kicker/applets/clock/zone.cpp
index bf007c933..c43b76db1 100644
--- a/kicker/applets/clock/zone.cpp
+++ b/kicker/applets/clock/zone.cpp
@@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "zone.h"
 
 #include <kcolorbutton.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
 #include <kstringhandler.h>