summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-26 13:14:32 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-26 13:14:32 -0600
commit141b201164fdc2c4851ac220250b88774ba5d2a7 (patch)
tree0a8a1df85e3f7506fd1a1d5d7ad440f2f17960cc
parentcfd4d70fae90b96e79f8b2b7f53dbc1e059e19a4 (diff)
downloadpytdeextensions-141b2011.tar.gz
pytdeextensions-141b2011.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
-rw-r--r--app_templates/kdeapp/src/kdeappview.py4
-rw-r--r--src/kdedistutils.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/app_templates/kdeapp/src/kdeappview.py b/app_templates/kdeapp/src/kdeappview.py
index 16de315..94e0e6e 100644
--- a/app_templates/kdeapp/src/kdeappview.py
+++ b/app_templates/kdeapp/src/kdeappview.py
@@ -19,8 +19,8 @@ from qt import *
from tdecore import *
from tdeui import *
from kio import *
-from khtml import *
-from kparts import *
+from tdehtml import *
+from tdeparts import *
#from kdeappiface import *
class KdeAppView(QWidget):
diff --git a/src/kdedistutils.py b/src/kdedistutils.py
index 8b5eb0d..89fd4b4 100644
--- a/src/kdedistutils.py
+++ b/src/kdedistutils.py
@@ -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', 'kfile', 'kparts', 'khtml', 'kspell'):
+ for k_module in ('dcop', 'tdecore', 'tdeui', 'kio', 'kfile', 'tdeparts', 'tdehtml', 'tdespell'):
self.announce(k_module)
try:
exec('import ' + k_module)