Properly import python_tqt moduler14.0.4

Signed-off-by: Slávek Banko <[email protected]>
(cherry picked from commit a7b3f0dc2315c54f38220595472ccbc79d5f317c)

10 files changed, 10 insertions, 70 deletions

diff --git a/grubconfig/grubconfig.py b/grubconfig/grubconfig.py
index bcdf323..245b596 100644
--- a/grubconfig/grubconfig.py
+++ b/grubconfig/grubconfig.py
@@ -19,19 +19,7 @@
 import sys
 import os
 import os.path
-# Trinity-specific paths
-tqt_modules = []
-for m_path in sys.path:
-    if os.path.exists(os.path.join(m_path, 'sip4_tqt')):
-        m_sip_dir = os.path.join(m_path, 'sip4_tqt')
-        tqt_modules.insert(0, m_sip_dir)
-    if os.path.exists(os.path.join(m_path, 'python_tqt')):
-        m_pyqt_dir = os.path.join(m_path, 'python_tqt')
-        tqt_modules.insert(0, m_pyqt_dir)
-for m_path in tqt_modules:
-    sys.path.insert(0, m_path)
-
-from qt import *
+from python_tqt.qt import *
 from tdeui import *
 from tdecore import *
 from tdefile import *
diff --git a/mountconfig/SMBShareSelectDialog.py b/mountconfig/SMBShareSelectDialog.py
index fbc06f0..86f668a 100644
--- a/mountconfig/SMBShareSelectDialog.py
+++ b/mountconfig/SMBShareSelectDialog.py
@@ -14,7 +14,7 @@
 #                                                                         #
 ###########################################################################
 
-from qt import *
+from python_tqt.qt import *
 from tdeui import *
 from tdecore import *
 from tdeio import *
diff --git a/mountconfig/SimpleCommandRunner.py b/mountconfig/SimpleCommandRunner.py
index 300310e..b879934 100644
--- a/mountconfig/SimpleCommandRunner.py
+++ b/mountconfig/SimpleCommandRunner.py
@@ -13,7 +13,7 @@
 #   (at your option) any later version.                                   #
 #                                                                         #
 ###########################################################################
-from qt import *
+from python_tqt.qt import *
 from tdecore import *
 import locale
 
diff --git a/mountconfig/fuser.py b/mountconfig/fuser.py
index 3071885..291a6bc 100644
--- a/mountconfig/fuser.py
+++ b/mountconfig/fuser.py
@@ -22,7 +22,7 @@ TODO:
 
 import sys
 import os
-from qt import *
+from python_tqt.qt import *
 from tdeui import *
 #import kdedesigner
 from fuser_ui import *
diff --git a/mountconfig/mountconfig.py b/mountconfig/mountconfig.py
index d7e3641..d2576f1 100755
--- a/mountconfig/mountconfig.py
+++ b/mountconfig/mountconfig.py
@@ -19,19 +19,7 @@
 import sys
 import os
 import os.path
-# Trinity-specific paths
-tqt_modules = []
-for m_path in sys.path:
-    if os.path.exists(os.path.join(m_path, 'sip4_tqt')):
-        m_sip_dir = os.path.join(m_path, 'sip4_tqt')
-        tqt_modules.insert(0, m_sip_dir)
-    if os.path.exists(os.path.join(m_path, 'python_tqt')):
-        m_pyqt_dir = os.path.join(m_path, 'python_tqt')
-        tqt_modules.insert(0, m_pyqt_dir)
-for m_path in tqt_modules:
-    sys.path.insert(0, m_path)
-
-from qt import *
+from python_tqt.qt import *
 from tdeui import *
 from tdecore import *
 from tdefile import *
diff --git a/mountconfig/sizeview.py b/mountconfig/sizeview.py
index 05c5115..b0e37f7 100644
--- a/mountconfig/sizeview.py
+++ b/mountconfig/sizeview.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from qt import *
+from python_tqt.qt import *
 from tdecore import *
 import sys, os
 
diff --git a/serviceconfig/serviceconfig.py b/serviceconfig/serviceconfig.py
index 4e82bf8..1fdacc3 100755
--- a/serviceconfig/serviceconfig.py
+++ b/serviceconfig/serviceconfig.py
@@ -19,19 +19,7 @@
 import sys
 import os
 import os.path
-# Trinity-specific paths
-tqt_modules = []
-for m_path in sys.path:
-    if os.path.exists(os.path.join(m_path, 'sip4_tqt')):
-        m_sip_dir = os.path.join(m_path, 'sip4_tqt')
-        tqt_modules.insert(0, m_sip_dir)
-    if os.path.exists(os.path.join(m_path, 'python_tqt')):
-        m_pyqt_dir = os.path.join(m_path, 'python_tqt')
-        tqt_modules.insert(0, m_pyqt_dir)
-for m_path in tqt_modules:
-    sys.path.insert(0, m_path)
-
-from qt import *
+from python_tqt.qt import *
 from tdeui import *
 from tdecore import *
 import posix
diff --git a/userconfig/userconfig.py b/userconfig/userconfig.py
index 3671acc..693d7ce 100755
--- a/userconfig/userconfig.py
+++ b/userconfig/userconfig.py
@@ -18,19 +18,7 @@
 
 import sys
 import os.path
-# Trinity-specific paths
-tqt_modules = []
-for m_path in sys.path:
-    if os.path.exists(os.path.join(m_path, 'sip4_tqt')):
-        m_sip_dir = os.path.join(m_path, 'sip4_tqt')
-        tqt_modules.insert(0, m_sip_dir)
-    if os.path.exists(os.path.join(m_path, 'python_tqt')):
-        m_pyqt_dir = os.path.join(m_path, 'python_tqt')
-        tqt_modules.insert(0, m_pyqt_dir)
-for m_path in tqt_modules:
-    sys.path.insert(0, m_path)
-
-from qt import *
+from python_tqt.qt import *
 from tdeui import *
 from tdecore import *
 from tdefile import *
diff --git a/wineconfig/firstrunwizard.py b/wineconfig/firstrunwizard.py
index 43891b3..da5977c 100755
--- a/wineconfig/firstrunwizard.py
+++ b/wineconfig/firstrunwizard.py
@@ -16,7 +16,7 @@
 #                                                                         #
 ###########################################################################
 
-from qt import *
+from python_tqt.qt import *
 from tdecore import *
 from tdeui import *
 from tdefile import *
diff --git a/wineconfig/wineconfig.py b/wineconfig/wineconfig.py
index cf6d008..ea2ba42 100755
--- a/wineconfig/wineconfig.py
+++ b/wineconfig/wineconfig.py
@@ -19,19 +19,7 @@
 import sys
 import os
 import os.path
-# Trinity-specific paths
-tqt_modules = []
-for m_path in sys.path:
-    if os.path.exists(os.path.join(m_path, 'sip4_tqt')):
-        m_sip_dir = os.path.join(m_path, 'sip4_tqt')
-        tqt_modules.insert(0, m_sip_dir)
-    if os.path.exists(os.path.join(m_path, 'python_tqt')):
-        m_pyqt_dir = os.path.join(m_path, 'python_tqt')
-        tqt_modules.insert(0, m_pyqt_dir)
-for m_path in tqt_modules:
-    sys.path.insert(0, m_path)
-
-from qt import *
+from python_tqt.qt import *
 from tdecore import *
 from tdeui import *
 from tdefile import *