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

14 files changed, 11 insertions, 11 deletions

diff --git a/app_templates/kcontrol_module/src/kcontrol_module.desktop b/app_templates/kcontrol_module/src/kcontrol_module.desktop
index 4487e8a..83298c4 100644
--- a/app_templates/kcontrol_module/src/kcontrol_module.desktop
+++ b/app_templates/kcontrol_module/src/kcontrol_module.desktop
@@ -11,5 +11,5 @@ X-TDE-Library=kcontrol_module
 X-TDE-FactoryName=kcontrol_module
 X-TDE-RootOnly=false
 Type=Application
-Exec=kcmshell kcontrol_module
+Exec=tdecmshell kcontrol_module
 Categories=QT;TDE;X-TDE-settings-system;
diff --git a/app_templates/kioslave/AUTHORS b/app_templates/tdeioslave/AUTHORS
index 0463c0d..0463c0d 100644
--- a/app_templates/kioslave/AUTHORS
+++ b/app_templates/tdeioslave/AUTHORS
diff --git a/app_templates/kioslave/COPYING b/app_templates/tdeioslave/COPYING
index c13faf0..c13faf0 100644
--- a/app_templates/kioslave/COPYING
+++ b/app_templates/tdeioslave/COPYING
diff --git a/app_templates/kioslave/ChangeLog b/app_templates/tdeioslave/ChangeLog
index e69de29..e69de29 100644
--- a/app_templates/kioslave/ChangeLog
+++ b/app_templates/tdeioslave/ChangeLog
diff --git a/app_templates/kioslave/INSTALL b/app_templates/tdeioslave/INSTALL
index b94cd85..b94cd85 100644
--- a/app_templates/kioslave/INSTALL
+++ b/app_templates/tdeioslave/INSTALL
diff --git a/app_templates/kioslave/MANIFEST.in b/app_templates/tdeioslave/MANIFEST.in
index c2dde3f..c2dde3f 100644
--- a/app_templates/kioslave/MANIFEST.in
+++ b/app_templates/tdeioslave/MANIFEST.in
diff --git a/app_templates/kioslave/NEWS b/app_templates/tdeioslave/NEWS
index e69de29..e69de29 100644
--- a/app_templates/kioslave/NEWS
+++ b/app_templates/tdeioslave/NEWS
diff --git a/app_templates/kioslave/README b/app_templates/tdeioslave/README
index e69de29..e69de29 100644
--- a/app_templates/kioslave/README
+++ b/app_templates/tdeioslave/README
diff --git a/app_templates/kioslave/TODO b/app_templates/tdeioslave/TODO
index e69de29..e69de29 100644
--- a/app_templates/kioslave/TODO
+++ b/app_templates/tdeioslave/TODO
diff --git a/app_templates/kioslave/doc/en/index.docbook b/app_templates/tdeioslave/doc/en/index.docbook
index c169ccd..c169ccd 100644
--- a/app_templates/kioslave/doc/en/index.docbook
+++ b/app_templates/tdeioslave/doc/en/index.docbook
diff --git a/app_templates/kioslave/setup.py b/app_templates/tdeioslave/setup.py
index f9b9e30..f2a5468 100755
--- a/app_templates/kioslave/setup.py
+++ b/app_templates/tdeioslave/setup.py
@@ -17,7 +17,7 @@
 
 import kdedistutils
 
-kdedistutils.setup(name="kioslave",
+kdedistutils.setup(name="tdeioslave",
     version="0.1.0",
     author="AUTHOR",
     author_email="YOUR@EMAIL.com",
@@ -25,6 +25,6 @@ kdedistutils.setup(name="kioslave",
     min_kde_version = "3.0.0",
     min_qt_version = "3.0.0",
     license = "GPL",
-    application_data = ['src/kioslave.py'],
+    application_data = ['src/tdeioslave.py'],
     docbooks = [ ('doc/en','en') ],
-    kioslaves = [ ('src/kioslave.protocol','kioslave.py')] )
+    tdeioslaves = [ ('src/tdeioslave.protocol','tdeioslave.py')] )
diff --git a/app_templates/kioslave/src/kioslave.lsm b/app_templates/tdeioslave/src/tdeioslave.lsm
index 97e43a6..97e43a6 100644
--- a/app_templates/kioslave/src/kioslave.lsm
+++ b/app_templates/tdeioslave/src/tdeioslave.lsm
diff --git a/app_templates/kioslave/src/kioslave.protocol b/app_templates/tdeioslave/src/tdeioslave.protocol
index 01dc5bb..f59b9f5 100644
--- a/app_templates/kioslave/src/kioslave.protocol
+++ b/app_templates/tdeioslave/src/tdeioslave.protocol
@@ -1,6 +1,6 @@
 [Protocol]
-exec=kioslave
-protocol=kioslave
+exec=tdeioslave
+protocol=tdeioslave
 input=none
 output=filesystem
 listing=Name,Type,Size,Date
diff --git a/app_templates/kioslave/src/kioslave.py b/app_templates/tdeioslave/src/tdeioslave.py
index 2d013b0..edc874f 100755
--- a/app_templates/kioslave/src/kioslave.py
+++ b/app_templates/tdeioslave/src/tdeioslave.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 ###########################################################################
-# kioslave - description                                                  #
+# tdeioslave - description                                                  #
 # ------------------------------                                          #
 # begin     : Mon May 2 2005                                              #
 # copyright : (C) 2005 by AUTHOR                                          #
@@ -31,13 +31,13 @@ DEBUG = 1
 class SlaveClass(KIO.SlaveBase):
     """SlaveClass(KIO.SlaveBase)
     
-    See tdelibs/kio/kio/slavebase.h for virtual functions to override.
+    See tdelibs/tdeio/tdeio/slavebase.h for virtual functions to override.
     """
     
     ########################################################################
     def __init__(self, pool, app):
         # We must call the initialisation method of the base class.
-        KIO.SlaveBase.__init__(self, "kioslave", pool, app)
+        KIO.SlaveBase.__init__(self, "tdeioslave", pool, app)
         
         # Attach the DCOP client object associated with this IOSlave to the
         # DCOP server.
@@ -355,7 +355,7 @@ class SlaveClass(KIO.SlaveBase):
     ############################################################################
     def debug(self,msg):
         if DEBUG == 0: return
-        print "kioslave:"+str(msg)+"\n"
+        print "tdeioslave:"+str(msg)+"\n"
         sys.stdout.flush()
 
 ############################################################################
@@ -496,7 +496,7 @@ class RAMDir(object):
     def debug(self,msg):
         if DEBUG == 0: return
         
-        print "kioslave:"+str(msg)+"\n"
+        print "tdeioslave:"+str(msg)+"\n"
         sys.stdout.flush()
         
     ############################################################################