switch bindings to pyqt wrappers

qgis · Mar 21, 2016 · 271750f · 271750f
1 parent f413046
commit 271750f
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 18 deletions.
diff --git a/python/__init__.py b/python/__init__.py
@@ -23,11 +23,7 @@
 # This will get replaced with a git SHA1 when you do a git archive
 __revision__ = '$Format:%H$'
 
-import sip
+from PyQt import QtCore
-
-for api in ["QDate", "QDateTime", "QString", "QTextStream", "QTime", "QUrl", "QVariant"]:
-    sip.setapi(api, 2)
-
 from qgis.core import QgsFeature, QgsGeometry
 
 

diff --git a/python/analysis/__init__.py b/python/analysis/__init__.py
@@ -23,4 +23,6 @@
 # This will get replaced with a git SHA1 when you do a git archive
 __revision__ = '$Format:%H$'
 
+from PyQt import QtCore
+
 from qgis._analysis import *
diff --git a/python/core/__init__.py b/python/core/__init__.py
@@ -23,16 +23,11 @@
 # This will get replaced with a git SHA1 when you do a git archive
 __revision__ = '$Format:%H$'
 
-try:
+from PyQt.QtCore import QCoreApplication, QPyNullVariant, NULL
-    import sip
-    sip.setapi("QVariant", 2)
-except:
-    pass
 
 import inspect
 import string
 from qgis._core import *
-from PyQt.QtCore import QCoreApplication, QPyNullVariant, NULL
 
 
 def register_function(function, arg_count, group, usesgeometry=False, **kwargs):

diff --git a/python/gui/__init__.py b/python/gui/__init__.py
@@ -23,4 +23,6 @@
 # This will get replaced with a git SHA1 when you do a git archive
 __revision__ = '$Format:%H$'
 
+from PyQt import QtCore
+
 from qgis._gui import *
diff --git a/python/networkanalysis/__init__.py b/python/networkanalysis/__init__.py
@@ -23,4 +23,6 @@
 # This will get replaced with a git SHA1 when you do a git archive
 __revision__ = '$Format:%H$'
 
+from PyQt import QtCore
+
 from qgis._networkanalysis import *
diff --git a/python/qsci_apis/generate_console_pap.py b/python/qsci_apis/generate_console_pap.py
@@ -22,9 +22,9 @@
 import sys
 import os
 
-from PyQt4.Qsci import QsciLexerPython, QsciAPIs
+from PyQt.Qsci import QsciLexerPython, QsciAPIs
-from PyQt4.QtGui import QApplication
+from PyQt.QtWidgets import QApplication
-from PyQt4.QtCore import QObject
+from PyQt.QtCore import QObject
 
 
 class PrepareAPIs(QObject):

diff --git a/python/server/__init__.py b/python/server/__init__.py
@@ -23,4 +23,6 @@
 # This will get replaced with a git SHA1 when you do a git archive
 __revision__ = '$Format:%H$'
 
-from qgis._server import *
+from PyQt import QtCore     # NOQA
+
+from qgis._server import *  # NOQA
diff --git a/python/user.py b/python/user.py
@@ -28,7 +28,7 @@
 import glob
 import traceback
 
-from PyQt4.QtCore import QCoreApplication
+from PyQt.QtCore import QCoreApplication
 from qgis.core import QgsApplication, QgsMessageLog
 
 

diff --git a/python/utils.py b/python/utils.py
@@ -28,8 +28,8 @@
 
 """
 
-from PyQt4.QtCore import QCoreApplication, QLocale
+from PyQt.QtCore import QCoreApplication, QLocale
-from PyQt4.QtGui import QPushButton, QApplication
+from PyQt.QtWidgets import QPushButton, QApplication
 from qgis.core import QGis, QgsExpression, QgsMessageLog, qgsfunction, QgsMessageOutput
 from qgis.gui import QgsMessageBar