mirror of
https://github.com/qgis/QGIS.git
synced 2025-04-17 00:04:02 -04:00
Remove some qt4 references
This commit is contained in:
parent
9553dea201
commit
7cb20e00d9
@ -34,7 +34,7 @@
|
|||||||
#include "coordinatecapturegui.h"
|
#include "coordinatecapturegui.h"
|
||||||
|
|
||||||
//
|
//
|
||||||
// Qt4 Related Includes
|
// Qt Related Includes
|
||||||
//
|
//
|
||||||
|
|
||||||
#include <QAction>
|
#include <QAction>
|
||||||
|
@ -35,7 +35,7 @@
|
|||||||
#ifndef COORDINATECAPTURE_H
|
#ifndef COORDINATECAPTURE_H
|
||||||
#define COORDINATECAPTURE_H
|
#define COORDINATECAPTURE_H
|
||||||
|
|
||||||
//QT4 includes
|
//QT includes
|
||||||
#include <QObject>
|
#include <QObject>
|
||||||
#include <QPointer>
|
#include <QPointer>
|
||||||
|
|
||||||
|
@ -62,7 +62,7 @@
|
|||||||
#include "eviseventidtool.h"
|
#include "eviseventidtool.h"
|
||||||
|
|
||||||
//
|
//
|
||||||
// Qt4 Related Includes
|
// Qt Related Includes
|
||||||
//
|
//
|
||||||
#include <QMessageBox>
|
#include <QMessageBox>
|
||||||
#include <QToolBar>
|
#include <QToolBar>
|
||||||
|
@ -220,7 +220,7 @@ void QgsGrassTools::runModule( QString name, bool direct )
|
|||||||
|
|
||||||
if ( !pixmap.isNull() )
|
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
|
// -> reset the width to max icon width
|
||||||
if ( mTabWidget->iconSize().width() < pixmap.width() )
|
if ( mTabWidget->iconSize().width() < pixmap.width() )
|
||||||
{
|
{
|
||||||
|
@ -35,7 +35,7 @@
|
|||||||
#ifndef [pluginname]_H
|
#ifndef [pluginname]_H
|
||||||
#define [pluginname]_H
|
#define [pluginname]_H
|
||||||
|
|
||||||
//QT4 includes
|
//QT includes
|
||||||
#include <QObject>
|
#include <QObject>
|
||||||
|
|
||||||
//QGIS includes
|
//QGIS includes
|
||||||
|
@ -21,7 +21,7 @@
|
|||||||
#include "qgisinterface.h"
|
#include "qgisinterface.h"
|
||||||
#include "qgsguiutils.h"
|
#include "qgsguiutils.h"
|
||||||
|
|
||||||
// Qt4 Related Includes
|
// Qt Related Includes
|
||||||
#include <QAction>
|
#include <QAction>
|
||||||
#include <QToolBar>
|
#include <QToolBar>
|
||||||
#include <QFile>
|
#include <QFile>
|
||||||
|
@ -36,7 +36,7 @@
|
|||||||
#ifndef TOPOL_H
|
#ifndef TOPOL_H
|
||||||
#define TOPOL_H
|
#define TOPOL_H
|
||||||
|
|
||||||
//QT4 includes
|
//QT includes
|
||||||
#include <QObject>
|
#include <QObject>
|
||||||
|
|
||||||
//QGIS includes
|
//QGIS includes
|
||||||
|
@ -110,7 +110,7 @@ bool QgsPythonUtilsImpl::checkSystemImports()
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
// set PyQt4 api versions
|
// set PyQt api versions
|
||||||
QStringList apiV2classes;
|
QStringList apiV2classes;
|
||||||
apiV2classes << QStringLiteral( "QDate" ) << QStringLiteral( "QDateTime" ) << QStringLiteral( "QString" ) << QStringLiteral( "QTextStream" ) << QStringLiteral( "QTime" ) << QStringLiteral( "QUrl" ) << QStringLiteral( "QVariant" );
|
apiV2classes << QStringLiteral( "QDate" ) << QStringLiteral( "QDateTime" ) << QStringLiteral( "QString" ) << QStringLiteral( "QTextStream" ) << QStringLiteral( "QTime" ) << QStringLiteral( "QUrl" ) << QStringLiteral( "QVariant" );
|
||||||
Q_FOREACH ( const QString &clsName, apiV2classes )
|
Q_FOREACH ( const QString &clsName, apiV2classes )
|
||||||
|
Loading…
x
Reference in New Issue
Block a user