Properly import python_tqt module

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit a7b3f0dc23)

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 *

mountconfig/SMBShareSelectDialog.py

@@ -14,7 +14,7 @@
 #                                                                         #
 ###########################################################################
 
-from qt import *
+from python_tqt.qt import *
 from tdeui import *
 from tdecore import *
 from tdeio import *

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
 

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 *

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 *

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
 

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

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 *

wineconfig/firstrunwizard.py

@@ -16,7 +16,7 @@
 #                                                                         #
 ###########################################################################
 
-from qt import *
+from python_tqt.qt import *
 from tdecore import *
 from tdeui import *
 from tdefile import *

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 *