Rename KIO

1 files changed, 14 insertions, 14 deletions

diff --git a/src/kdedistutils.py b/src/kdedistutils.py
index 5a444e8..c058f7b 100644
--- a/src/kdedistutils.py
+++ b/src/kdedistutils.py
@@ -64,8 +64,8 @@ def setup(**arg_dict):
         'build_html' : BuildDocbookHTML,
         'install_html' : InstallDocbookHTML,
         'install_lib' : InstallLibWithRoot,
-        'build_tdeioslave' : BuildKioslave,
-        'install_tdeioslave' : InstallKioslave}
+        'build_tdeioslave' : BuildTdeioslave,
+        'install_tdeioslave' : InstallTdeioslave}
 
     for key in kdecmdclass.iterkeys():
         cmdclass.setdefault(key,kdecmdclass[key])
@@ -1429,8 +1429,8 @@ class InstallI18NMessages(Command):
 
  
 ###########################################################################
-class BuildKioslave(Command):
-    description = "Build Kioslaves"
+class BuildTdeioslave(Command):
+    description = "Build Tdeioslaves"
 
     user_options = [('no-tdeioslave',None,"Don't build tdeioslaves"),
                     ('build-dir=','b', "build directory (where to install from)"),
@@ -1499,8 +1499,8 @@ class BuildKioslave(Command):
             #    self.kde_tdeioslave_lib_dir = os.path.join(self.kde_lib_dir,"trinity")
             self.kde_tdeioslave_lib_dir = "/opt/trinity/lib/trinity/"
             if FindFileInPaths('tdeio_*.so',[self.kde_tdeioslave_lib_dir]) is None:
-                raise SystemExit, "Failed to find KDE Kioslave library files in: %s" % self.kde_tdeioslave_lib_dir
-            self.announce("Using %s for KDE Kioslave library files" % self.kde_tdeioslave_lib_dir)
+                raise SystemExit, "Failed to find KDE Tdeioslave library files in: %s" % self.kde_tdeioslave_lib_dir
+            self.announce("Using %s for KDE Tdeioslave library files" % self.kde_tdeioslave_lib_dir)
             
             # Qt inc dir
             if self.qt_inc_dir is None:
@@ -1622,14 +1622,14 @@ class BuildKioslave(Command):
 
     def run(self):
         if self.no_tdeioslave:
-            self.announce("Skipping KIO Slaves")
+            self.announce("Skipping TDEIO Slaves")
             return
     
         if not os.path.isdir(self.build_dir):
             os.mkdir(self.build_dir)
         
         for moduletuple in self.distribution.tdeioslaves:
-            self.announce("Building KIO Slave from protocol file %s." % moduletuple[0])
+            self.announce("Building TDEIO Slave from protocol file %s." % moduletuple[0])
             
             protocolfilename = moduletuple[0]
             
@@ -1891,8 +1891,8 @@ extern "C" {
 }
 """
 ###########################################################################
-class InstallKioslave(Command):
-    description = "Install Kioslave files"
+class InstallTdeioslave(Command):
+    description = "Install Tdeioslave files"
     
     user_options = [
         ('install-dir=', 'd', "base directory for installing tdeioslave module files"),
@@ -1943,10 +1943,10 @@ class InstallKioslave(Command):
         if not self.skip_build:
             self.run_command('build_tdeioslave')
     
-        self.announce("Installing Kioslave files...")
+        self.announce("Installing Tdeioslave files...")
 
         for moduletuple in self.distribution.tdeioslaves:
-            self.announce("Building Kioslave module from protocol file %s." % moduletuple[0])
+            self.announce("Building Tdeioslave module from protocol file %s." % moduletuple[0])
             
             protocolfilename = moduletuple[0]
             
@@ -1989,7 +1989,7 @@ class InstallKioslave(Command):
             self.outfiles = [os.path.join(self.install_dir,os.path.basename(file)) for file in glob.glob(os.path.join(self.build_dir,'.libs',libraryname+'*'))]
             self.outfiles.append(protocolfile_dest)
             
-        self.announce("Done installing Kioslave files.")
+        self.announce("Done installing Tdeioslave files.")
         
     def get_outputs(self):
         return self.outfiles or []
@@ -2045,7 +2045,7 @@ class CheckPyTDE(Command):
         self.announce("Checking for a working PyTDE...")
         
         # Try to import modules one by one. 
-        for k_module in ('dcop', 'tdecore', 'tdeui', 'kio', 'tdefile', 'tdeparts', 'tdehtml', 'tdespell'):
+        for k_module in ('dcop', 'tdecore', 'tdeui', 'tdeio', 'tdefile', 'tdeparts', 'tdehtml', 'tdespell'):
             self.announce(k_module)
             try:
                 exec('import ' + k_module)