Additional kde to tde renaming

2 files changed, 11 insertions, 11 deletions

diff --git a/src/kdedistutils.py b/src/kdedistutils.py
index 6e9003a..00e1d1b 100644
--- a/src/kdedistutils.py
+++ b/src/kdedistutils.py
@@ -621,7 +621,7 @@ class BuildKControlModule(Command):
             # PyKDE dir
             if self.pykde_dir is None:
                 self.pykde_dir = sysconfig.get_python_lib()
-            if (FindFileInPaths("libtdecorecmodule*",[self.pykde_dir]) is None) and (FindFileInPaths("kdecore*",[self.pykde_dir]) is None):
+            if (FindFileInPaths("libtdecorecmodule*",[self.pykde_dir]) is None) and (FindFileInPaths("tdecore*",[self.pykde_dir]) is None):
                 raise SystemExit, "Failed to find the PyKDE directory: %s" % self.pykde_dir
             self.announce("Using %s for PyKDE modules" % self.pykde_dir)
             
@@ -805,16 +805,16 @@ class BuildKControlModule(Command):
             # PyQt libs
             linklist.append(self.pyqt_dir+"/qt.so")
             # PyKDE libs
-            linklist.append(self.pykde_dir+"/kdecore.so")
-            linklist.append(self.pykde_dir+"/kdeui.so")
+            linklist.append(self.pykde_dir+"/tdecore.so")
+            linklist.append(self.pykde_dir+"/tdeui.so")
             
 #            linklist.append("-L"+self.sip_dir); linklist.append("-lsip")
 #            # PyQt libs
 #            linklist.append("-L"+self.pyqt_dir); linklist.append("-lqtcmodule")
 #            # PyKDE libs
-#            linklist.append("-L"+self.pykde_dir); linklist.append("-lkdecorecmodule"); linklist.append("-lkdeuicmodule")
+#            linklist.append("-L"+self.pykde_dir); linklist.append("-ltdecorecmodule"); linklist.append("-ltdeuicmodule")
             
-            linklist.append("-L"+self.kde_lib_dir); linklist.append("-L/opt/trinity/lib"); linklist.append("-lkdecore"); linklist.append("-lpythonize")
+            linklist.append("-L"+self.kde_lib_dir); linklist.append("-L/opt/trinity/lib"); linklist.append("-ltdecore"); linklist.append("-lpythonize")
             linklist.append("-L"+self.qt_lib_dir); linklist.append("-lqt-mt")
             linklist.append("-lm")
             linklist.append("-lstdc++")
@@ -1549,7 +1549,7 @@ class BuildKioslave(Command):
             # PyKDE dir
             if self.pykde_dir is None:
                 self.pykde_dir = sysconfig.get_python_lib()
-            if (FindFileInPaths("libtdecorecmodule*",[self.pykde_dir]) is None) and (FindFileInPaths("kdecore*",[self.pykde_dir]) is None):
+            if (FindFileInPaths("libtdecorecmodule*",[self.pykde_dir]) is None) and (FindFileInPaths("tdecore*",[self.pykde_dir]) is None):
                 raise SystemExit, "Failed to find the PyKDE directory: %s" % self.pykde_dir
             self.announce("Using %s for PyKDE modules" % self.pykde_dir)
             
@@ -1718,15 +1718,15 @@ class BuildKioslave(Command):
             # PyQt libs
             linklist.append(self.pyqt_dir+"/qt.so")
             # PyKDE libs
-            linklist.append(self.pykde_dir+"/kdecore.so")
+            linklist.append(self.pykde_dir+"/tdecore.so")
             
 #            linklist.append("-L"+self.sip_dir); linklist.append("-lsip")
 #            # PyQt libs
 #            linklist.append("-L"+self.pyqt_dir); linklist.append("-lqtcmodule")
 #            # PyKDE libs
-#            linklist.append("-L"+self.pykde_dir); linklist.append("-lkdecorecmodule"); linklist.append("-lkdeuicmodule")
+#            linklist.append("-L"+self.pykde_dir); linklist.append("-ltdecorecmodule"); linklist.append("-ltdeuicmodule")
             
-            linklist.append("-L"+self.kde_lib_dir); linklist.append("-L/opt/trinity/lib"); linklist.append("-lkdecore"); linklist.append("-lpythonize")
+            linklist.append("-L"+self.kde_lib_dir); linklist.append("-L/opt/trinity/lib"); linklist.append("-ltdecore"); linklist.append("-lpythonize")
             linklist.append("-L"+self.qt_lib_dir); linklist.append("-lqt-mt")
             linklist.append("-lm")
             linklist.append("-lstdc++")
@@ -2007,7 +2007,7 @@ class CheckPyKDE(Command):
         self.announce("Checking for a working PyKDE...")
         
         # Try to import modules one by one. 
-        for k_module in ('dcop', 'kdecore', 'kdeui', 'kio', 'kfile', 'kparts', 'khtml', 'kspell'):
+        for k_module in ('dcop', 'tdecore', 'tdeui', 'kio', 'kfile', 'kparts', 'khtml', 'kspell'):
             self.announce(k_module)
             try:
                 exec('import ' + k_module)
diff --git a/src/qtuicompiler.py b/src/qtuicompiler.py
index 4d590aa..90b4eb1 100644
--- a/src/qtuicompiler.py
+++ b/src/qtuicompiler.py
@@ -61,7 +61,7 @@ def CompileUI(ui_file_name, py_file_name=None, kde=False):
     for line in input.readlines():
         if kde and string.strip(line) == 'from qt import *':
             output.write(line)
-            output.write('from kdecore import *\nfrom kdeui import *\n\n')
+            output.write('from tdecore import *\nfrom tdeui import *\n\n')
         elif kde and string.find(line, " = KDatePicker(") != -1:
             o = string.find(line, ",")
             output.write(line[:o] + ",QDate.currentDate()" + line[o:])