Remove some qt4 references

nyalldawson · nyalldawson · commit 7cb20e00d95c · 2018-02-06T22:39:42.000+11:00
diff --git a/src/plugins/coordinate_capture/coordinatecapture.cpp b/src/plugins/coordinate_capture/coordinatecapture.cpp
@@ -34,7 +34,7 @@
 #include "coordinatecapturegui.h"
 
 //
-// Qt4 Related Includes
+// Qt Related Includes
 //
 
 #include <QAction>
diff --git a/src/plugins/coordinate_capture/coordinatecapture.h b/src/plugins/coordinate_capture/coordinatecapture.h
@@ -35,7 +35,7 @@
 #ifndef COORDINATECAPTURE_H
 #define COORDINATECAPTURE_H
 
-//QT4 includes
+//QT includes
 #include <QObject>
 #include <QPointer>
 
diff --git a/src/plugins/evis/evis.cpp b/src/plugins/evis/evis.cpp
@@ -62,7 +62,7 @@
 #include "eviseventidtool.h"
 
 //
-// Qt4 Related Includes
+// Qt Related Includes
 //
 #include <QMessageBox>
 #include <QToolBar>
diff --git a/src/plugins/grass/qgsgrasstools.cpp b/src/plugins/grass/qgsgrasstools.cpp
@@ -220,7 +220,7 @@ void QgsGrassTools::runModule( QString name, bool direct )
 
   if ( !pixmap.isNull() )
   {
-    // Icon size in QT4 does not seem to be variable
+    // Icon size in QT does not seem to be variable
     // -> reset the width to max icon width
     if ( mTabWidget->iconSize().width() < pixmap.width() )
     {
diff --git a/src/plugins/plugin_template/plugin.h b/src/plugins/plugin_template/plugin.h
@@ -35,7 +35,7 @@
 #ifndef [pluginname]_H
 #define [pluginname]_H
 
-//QT4 includes
+//QT includes
 #include <QObject>
 
 //QGIS includes
diff --git a/src/plugins/topology/topol.cpp b/src/plugins/topology/topol.cpp
@@ -21,7 +21,7 @@
 #include "qgisinterface.h"
 #include "qgsguiutils.h"
 
-// Qt4 Related Includes
+// Qt Related Includes
 #include <QAction>
 #include <QToolBar>
 #include <QFile>
diff --git a/src/plugins/topology/topol.h b/src/plugins/topology/topol.h
@@ -36,7 +36,7 @@
 #ifndef TOPOL_H
 #define TOPOL_H
 
-//QT4 includes
+//QT includes
 #include <QObject>
 
 //QGIS includes
diff --git a/src/python/qgspythonutilsimpl.cpp b/src/python/qgspythonutilsimpl.cpp
@@ -110,7 +110,7 @@ bool QgsPythonUtilsImpl::checkSystemImports()
     return false;
   }
 
-  // set PyQt4 api versions
+  // set PyQt api versions
   QStringList apiV2classes;
   apiV2classes << QStringLiteral( "QDate" ) << QStringLiteral( "QDateTime" ) << QStringLiteral( "QString" ) << QStringLiteral( "QTextStream" ) << QStringLiteral( "QTime" ) << QStringLiteral( "QUrl" ) << QStringLiteral( "QVariant" );
   Q_FOREACH ( const QString &clsName, apiV2classes )

Original file line number	Diff line number	Diff line change
`@@ -220,7 +220,7 @@ void QgsGrassTools::runModule( QString name, bool direct )`
`220`	`220`
`221`	`221`	`if ( !pixmap.isNull() )`
`222`	`222`	`{`
`223`		`- // Icon size in QT4 does not seem to be variable`
	`223`	`+ // Icon size in QT does not seem to be variable`
`224`	`224`	`// -> reset the width to max icon width`
`225`	`225`	`if ( mTabWidget->iconSize().width() < pixmap.width() )`
`226`	`226`	`{`
Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ bool QgsPythonUtilsImpl::checkSystemImports()`
`110`	`110`	`return false;`
`111`	`111`	`}`
`112`	`112`
`113`		`- // set PyQt4 api versions`
	`113`	`+ // set PyQt api versions`
`114`	`114`	`QStringList apiV2classes;`
`115`	`115`	`apiV2classes << QStringLiteral( "QDate" ) << QStringLiteral( "QDateTime" ) << QStringLiteral( "QString" ) << QStringLiteral( "QTextStream" ) << QStringLiteral( "QTime" ) << QStringLiteral( "QUrl" ) << QStringLiteral( "QVariant" );`
`116`	`116`	`Q_FOREACH ( const QString &clsName, apiV2classes )`