diff --git a/scripts/customwidget_template.cpp b/scripts/customwidget.cpp.template similarity index 100% rename from scripts/customwidget_template.cpp rename to scripts/customwidget.cpp.template diff --git a/scripts/customwidget_template.h b/scripts/customwidget.h.template similarity index 93% rename from scripts/customwidget_template.h rename to scripts/customwidget.h.template index 09f93e61b540..a86544633e27 100644 --- a/scripts/customwidget_template.h +++ b/scripts/customwidget.h.template @@ -18,13 +18,8 @@ #include -#if QT_VERSION < 0x050000 -#include -#include -#else #include #include -#endif class CUSTOMWIDGETS_EXPORT %CLASSMIXEDCASE%Plugin : public QObject, public QDesignerCustomWidgetInterface diff --git a/scripts/customwidget_create.sh b/scripts/customwidget_create.sh index 13c25bb6de15..f613d68bb611 100755 --- a/scripts/customwidget_create.sh +++ b/scripts/customwidget_create.sh @@ -26,7 +26,7 @@ declare -a EXT=("cpp" "h") for i in "${EXT[@]}" do DESTFILE=$DIR/../src/customwidgets/${CLASSLOWER}plugin.$i - cp $DIR/customwidget_template.$i $DESTFILE + cp $DIR/customwidget.$i.template $DESTFILE sed -i s/%DATE%/"$TODAY"/g "$DESTFILE" sed -i s/%YEAR%/"$YEAR"/g "$DESTFILE" sed -i s/%AUTHOR%/"$AUTHOR"/g "$DESTFILE" diff --git a/src/customwidgets/qgiscustomwidgets.cpp b/src/customwidgets/qgiscustomwidgets.cpp index 80dfb86d2ca3..b3352f2d7089 100644 --- a/src/customwidgets/qgiscustomwidgets.cpp +++ b/src/customwidgets/qgiscustomwidgets.cpp @@ -63,8 +63,3 @@ QList QgisCustomWidgets::customWidgets() const { return mWidgets; } - -Q_EXPORT_PLUGIN2( customwidgetsplugin, QgisCustomWidgets ) - - - diff --git a/src/providers/oracle/ocispatial/main.cpp b/src/providers/oracle/ocispatial/main.cpp index 25e11d51bca6..01b6ad68fa8d 100644 --- a/src/providers/oracle/ocispatial/main.cpp +++ b/src/providers/oracle/ocispatial/main.cpp @@ -68,9 +68,4 @@ QStringList QOCISpatialDriverPlugin::keys() const return l; } -#if QT_VERSION < 0x050000 -Q_EXPORT_STATIC_PLUGIN( QOCISpatialDriverPlugin ) -Q_EXPORT_PLUGIN2( qsqlocispatial, QOCISpatialDriverPlugin ) -#endif - QT_END_NAMESPACE diff --git a/src/providers/oracle/ocispatial/main.h b/src/providers/oracle/ocispatial/main.h index 96653024477f..d47d4163ef87 100644 --- a/src/providers/oracle/ocispatial/main.h +++ b/src/providers/oracle/ocispatial/main.h @@ -47,10 +47,6 @@ #include #include -#if QT_VERSION < 0x050000 -#define Q_PLUGIN_METADATA(x) -#endif - class QOCISpatialDriverPlugin : public QSqlDriverPlugin { Q_OBJECT diff --git a/src/providers/oracle/ocispatial/qsql_ocispatial.cpp b/src/providers/oracle/ocispatial/qsql_ocispatial.cpp index b0ccdcbdc6f9..ccfcf85116d0 100644 --- a/src/providers/oracle/ocispatial/qsql_ocispatial.cpp +++ b/src/providers/oracle/ocispatial/qsql_ocispatial.cpp @@ -94,10 +94,8 @@ #define QOCISPATIAL_THREADED -#if QT_VERSION >= 0x050000 Q_DECLARE_OPAQUE_POINTER( OCIEnv* ) Q_DECLARE_OPAQUE_POINTER( OCIStmt* ) -#endif Q_DECLARE_METATYPE( OCIEnv* ) Q_DECLARE_METATYPE( OCIStmt* ) @@ -3255,23 +3253,6 @@ QVariant QOCISpatialResult::lastInsertId() const return QVariant(); } -void QOCISpatialResult::virtual_hook( int id, void *data ) -{ - ENTER - Q_ASSERT( data ); - - switch ( id ) - { -#if QT_VERSION < 0x050000 - case QSqlResult::BatchOperation: - QOCISpatialCols::execBatch( d, boundValues(), *reinterpret_cast( data ) ); - break; -#endif - default: - QSqlCachedResult::virtual_hook( id, data ); - } -} - //////////////////////////////////////////////////////////////////////////// @@ -3356,9 +3337,7 @@ bool QOCISpatialDriver::hasFeature( DriverFeature f ) const case EventNotifications: case FinishQuery: case MultipleResultSets: -#if QT_VERSION >= 0x050000 case CancelQuery: -#endif return false; case Unicode: return d->serverVersion >= 9; diff --git a/src/providers/oracle/ocispatial/qsql_ocispatial.h b/src/providers/oracle/ocispatial/qsql_ocispatial.h index 743882804def..8e1116965e66 100644 --- a/src/providers/oracle/ocispatial/qsql_ocispatial.h +++ b/src/providers/oracle/ocispatial/qsql_ocispatial.h @@ -83,7 +83,6 @@ class Q_EXPORT_SQLDRIVER_OCISPATIAL QOCISpatialResult : public QSqlCachedResult int numRowsAffected(); QSqlRecord record() const; QVariant lastInsertId() const; - void virtual_hook( int id, void *data ); private: QOCISpatialResultPrivate *d; diff --git a/src/providers/oracle/qgsoracleprovider.cpp b/src/providers/oracle/qgsoracleprovider.cpp index c709cbf38bce..6d9cd74f687e 100644 --- a/src/providers/oracle/qgsoracleprovider.cpp +++ b/src/providers/oracle/qgsoracleprovider.cpp @@ -271,86 +271,6 @@ QString QgsOracleProvider::storageType() const return "Oracle database with locator/spatial extension"; } -#if QT_VERSION < 0x050000 -static bool operator<( const QVariant &a, const QVariant &b ) -{ - if ( a.isNull() || b.isNull() ) - return false; - - if ( a.type() == b.type() ) - { - switch ( a.type() ) - { - case QVariant::Int: - case QVariant::Char: - return a.toInt() < b.toInt(); - - case QVariant::Double: - return a.toDouble() < b.toDouble(); - - case QVariant::LongLong: - return a.toLongLong() < b.toLongLong(); - - case QVariant::List: - { - QList al = a.toList(); - QList bl = b.toList(); - - int i, n = qMin( al.size(), bl.size() ); - for ( i = 0; i < n && al[i] == bl[i]; i++ ) - ; - - if ( i == n ) - return al.size() < bl.size(); - else - return al[i] < bl[i]; - } - break; - - case QVariant::StringList: - { - QStringList al = a.toStringList(); - QStringList bl = b.toStringList(); - - int i, n = qMin( al.size(), bl.size() ); - for ( i = 0; i < n && al[i] == bl[i]; i++ ) - ; - - if ( i == n ) - return al.size() < bl.size(); - else - return al[i] < bl[i]; - } - break; - - case QVariant::Date: - return a.toDate() < b.toDate(); - - case QVariant::Time: - return a.toTime() < b.toTime(); - - case QVariant::DateTime: - return a.toDateTime() < b.toDateTime(); - - case QVariant::Bool: - return a.toBool() < b.toBool(); - - case QVariant::UInt: - return a.toUInt() < b.toUInt(); - - case QVariant::ULongLong: - return a.toULongLong() < b.toULongLong(); - - default: - break; - } - } - - return a.canConvert( QVariant::String ) && b.canConvert( QVariant::String ) && a.toString() < b.toString(); -} -#endif - - QString QgsOracleProvider::pkParamWhereClause() const { QString whereClause; diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp index f8861e90b120..e32e3e62a975 100644 --- a/src/providers/postgres/qgspostgresprovider.cpp +++ b/src/providers/postgres/qgspostgresprovider.cpp @@ -333,7 +333,7 @@ QString QgsPostgresProvider::storageType() const return QStringLiteral( "PostgreSQL database with PostGIS extension" ); } -#if QT_VERSION >= 0x050000 && QT_VERSION < 0x050600 +#if QT_VERSION < 0x050600 #include template bool operator<( const QList &lhs, const QList &rhs ) diff --git a/src/providers/spatialite/qspatialite/qsql_spatialite.cpp b/src/providers/spatialite/qspatialite/qsql_spatialite.cpp index 1e27330410b5..349101e124a0 100644 --- a/src/providers/spatialite/qspatialite/qsql_spatialite.cpp +++ b/src/providers/spatialite/qspatialite/qsql_spatialite.cpp @@ -60,10 +60,8 @@ #include #include -#if QT_VERSION >= 0x050000 Q_DECLARE_OPAQUE_POINTER(sqlite3*) Q_DECLARE_OPAQUE_POINTER(sqlite3_stmt*) -#endif Q_DECLARE_METATYPE(sqlite3*) Q_DECLARE_METATYPE(sqlite3_stmt*) @@ -326,20 +324,6 @@ QSpatiaLiteResult::~QSpatiaLiteResult() delete d; } -void QSpatiaLiteResult::virtual_hook(int id, void *data) -{ - switch (id) { -#if QT_VERSION < 0x050000 - case QSqlResult::DetachFromResultSet: - if (d->stmt) - sqlite3_reset(d->stmt); - break; -#endif - default: - QSqlCachedResult::virtual_hook(id, data); - } -} - bool QSpatiaLiteResult::reset(const QString &query) { if (!prepare(query)) @@ -491,13 +475,11 @@ QSqlRecord QSpatiaLiteResult::record() const return d->rInf; } -#if QT_VERSION >= 0x050000 void QSpatiaLiteResult::detachFromResultSet() { if (d->stmt) sqlite3_reset(d->stmt); } -#endif QVariant QSpatiaLiteResult::handle() const { @@ -545,9 +527,7 @@ bool QSpatiaLiteDriver::hasFeature(DriverFeature f) const case BatchOperations: case EventNotifications: case MultipleResultSets: -#if QT_VERSION >= 0x050000 case CancelQuery: -#endif return false; } return false; diff --git a/src/providers/spatialite/qspatialite/qsql_spatialite.h b/src/providers/spatialite/qspatialite/qsql_spatialite.h index 3f1d2a32fa2f..d3db80089a1b 100644 --- a/src/providers/spatialite/qspatialite/qsql_spatialite.h +++ b/src/providers/spatialite/qspatialite/qsql_spatialite.h @@ -80,10 +80,7 @@ class QSpatiaLiteResult : public QSqlCachedResult int numRowsAffected(); QVariant lastInsertId() const; QSqlRecord record() const; -#if QT_VERSION >= 0x050000 void detachFromResultSet(); -#endif - void virtual_hook(int id, void *data); private: QSpatiaLiteResultPrivate* d; diff --git a/src/providers/spatialite/qspatialite/smain.cpp b/src/providers/spatialite/qspatialite/smain.cpp index b91645fbb30a..a6b67504e886 100644 --- a/src/providers/spatialite/qspatialite/smain.cpp +++ b/src/providers/spatialite/qspatialite/smain.cpp @@ -62,8 +62,3 @@ QStringList QSpatiaLiteDriverPlugin::keys() const l << QLatin1String("QSPATIALITE"); return l; } - -#if QT_VERSION < 0x050000 -Q_EXPORT_STATIC_PLUGIN( QSpatiaLiteDriverPlugin ) -Q_EXPORT_PLUGIN2( qspatialite, QSpatiaLiteDriverPlugin ) -#endif diff --git a/src/providers/spatialite/qspatialite/smain.h b/src/providers/spatialite/qspatialite/smain.h index 1b148150f1a6..ffc76675d2f6 100644 --- a/src/providers/spatialite/qspatialite/smain.h +++ b/src/providers/spatialite/qspatialite/smain.h @@ -45,9 +45,6 @@ #include #include -#if QT_VERSION < 0x050000 -#define Q_PLUGIN_METADATA(x) -#endif class QSpatiaLiteDriverPlugin : public QSqlDriverPlugin { diff --git a/src/server/qgsremotedatasourcebuilder.cpp b/src/server/qgsremotedatasourcebuilder.cpp index 0839be149afe..2ceb494d25e4 100644 --- a/src/server/qgsremotedatasourcebuilder.cpp +++ b/src/server/qgsremotedatasourcebuilder.cpp @@ -17,10 +17,6 @@ #include "qgis.h" #include "qgsremotedatasourcebuilder.h" -#if QT_VERSION < 0x050000 -#include "qgsftptransaction.h" -#include "qgshttptransaction.h" -#endif #include "qgslogger.h" #include "qgsrasterlayer.h" #include "qgsvectorlayer.h" @@ -158,30 +154,8 @@ QgsVectorLayer* QgsRemoteDataSourceBuilder::vectorLayerFromRemoteVDS( const QDom int QgsRemoteDataSourceBuilder::loadData( const QString& url, QByteArray& data ) const { -#if QT_VERSION < 0x050000 - if ( url.startsWith( "http", Qt::CaseInsensitive ) ) - { - QgsHttpTransaction http( url ); - if ( !http.getSynchronously( data ) ) - { - QgsDebugMsg( "Error, loading from http failed" ); - return 1; //no success - } - } - else if ( url.startsWith( "ftp", Qt::CaseInsensitive ) ) - { - Q_NOWARN_DEPRECATED_PUSH; - QgsFtpTransaction ftp; - if ( ftp.get( url, data ) != 0 ) - { - return 1; - } - Q_NOWARN_DEPRECATED_POP; - } -#else Q_UNUSED( url ) Q_UNUSED( data ) QgsDebugMsg( "http and ftp remote datasources not supported with Qt5" ); -#endif return 0; } diff --git a/src/server/qgsremoteowsbuilder.cpp b/src/server/qgsremoteowsbuilder.cpp index 6834c89b1cd3..4d17e33c3229 100644 --- a/src/server/qgsremoteowsbuilder.cpp +++ b/src/server/qgsremoteowsbuilder.cpp @@ -17,9 +17,6 @@ #include "qgsdatasourceuri.h" #include "qgsremoteowsbuilder.h" -#if QT_VERSION < 0x050000 -#include "qgshttptransaction.h" -#endif #include "qgslogger.h" #include "qgsmslayercache.h" #include "qgsrasterlayer.h" @@ -236,131 +233,11 @@ QgsRasterLayer* QgsRemoteOWSBuilder::wcsLayerFromUrl( const QString &url, { Q_UNUSED( layerName ); Q_UNUSED( allowCaching ); - -#if QT_VERSION < 0x050000 - QgsDebugMsg( "Entering" ); - - //write server url and coverage name to a temporary file - QString fileName = createTempFile(); - if ( fileName.isEmpty() ) - { - return nullptr; - } - - QFile tempFile( fileName ); - - QTemporaryFile* tmpFile = new QTemporaryFile(); - if ( !tmpFile->open() ) - { - delete tmpFile; - return nullptr; - } - - filesToRemove.push_back( tmpFile ); //make sure the temporary file gets deleted after each request - - QgsDebugMsg( "opening successful" ); - QgsDebugMsg( "url: " + url ); - //extract server url and coverage name from string - QStringList serverSplit = url.split( "?" ); - if ( serverSplit.size() < 2 ) - { - QgsDebugMsg( "error, no '?' contained in url" ); - return nullptr; - } - QString serverUrl = serverSplit.at( 0 ); - QString request = serverSplit.at( 1 ); - QStringList parameterSplit = request.split( "&" ); - QString coverageName; - QString format; - for ( int i = 0; i < parameterSplit.size(); ++i ) - { - if ( parameterSplit.at( i ).startsWith( "COVERAGE", Qt::CaseInsensitive ) ) - { - coverageName = parameterSplit.at( i ).split( "=" ).at( 1 ); - } - else if ( parameterSplit.at( i ).startsWith( "FORMAT", Qt::CaseInsensitive ) ) - { - format = parameterSplit.at( i ).split( "=" ).at( 1 ); - } - } - - if ( coverageName.isEmpty() ) - { - QgsDebugMsg( "coverage name is empty" ); - return nullptr; - } - - if ( format.isEmpty() ) - { - format = "GeoTIFF"; //use geotiff as default - } - - QgsDebugMsg( "wcs server url: " + serverUrl ); - QgsDebugMsg( "coverage name: " + coverageName ); - - //fetch WCS layer in the current resolution as geotiff - QString wcsRequest = serverUrl + "?SERVICE=WCS&VERSION=1.0.0&REQUEST=GetCoverage&COVERAGE=" + coverageName + "&FORMAT=" + format; - - //CRS (or SRS) - QString crs = mParameterMap.value( "CRS", mParameterMap.value( "SRS" ) ); - if ( crs.isEmpty() ) - { - QgsDebugMsg( "No CRS or SRS parameter found for wcs layer, returning 0" ); - return nullptr; - } - wcsRequest += "&CRS=" + crs; - - //width - QString width = mParameterMap.value( "WIDTH" ); - if ( width.isEmpty() ) - { - QgsDebugMsg( "No WIDTH parameter found for wcs layer, returning 0" ); - return nullptr; - } - wcsRequest += "&WIDTH=" + width; - - //height - QString height = mParameterMap.value( "HEIGHT" ); - if ( height.isEmpty() ) - { - QgsDebugMsg( "No HEIGHT parameter found for wcs layer, returning 0" ); - return nullptr; - } - wcsRequest += "&HEIGHT=" + height; - - //bbox - QString bbox = mParameterMap.value( "BBOX" ); - if ( bbox.isEmpty() ) - { - QgsDebugMsg( "No BBOX parameter found for wcs layer, returning 0" ); - return nullptr; - } - wcsRequest += "&BBOX=" + bbox; - - QgsDebugMsg( "WCS request is: " + wcsRequest ); - //make request and store byte array into temporary file - QgsHttpTransaction httpTransaction( wcsRequest ); - QByteArray result; - if ( !httpTransaction.getSynchronously( result ) ) - { - return nullptr; - } - - QDataStream tempFileStream( &tempFile ); - tempFileStream.writeRawData( result.data(), result.size() ); - tempFile.close(); - - QgsRasterLayer* rl = new QgsRasterLayer( fileName, layerNameFromUri( fileName ) ); - layersToRemove.push_back( rl ); //make sure the layer gets deleted after each request - return rl; -#else Q_UNUSED( url ) Q_UNUSED( filesToRemove ) Q_UNUSED( layersToRemove ) QgsDebugMsg( "remote http not supported with Qt5" ); return nullptr; -#endif - } QgsVectorLayer* QgsRemoteOWSBuilder::sosLayer( const QDomElement& remoteOWSElem, const QString& url, const QString& layerName, QList& layersToRemove, bool allowCaching ) const diff --git a/src/server/qgsrequesthandler.cpp b/src/server/qgsrequesthandler.cpp index 9ecb9a4984b6..9a383e00f69d 100644 --- a/src/server/qgsrequesthandler.cpp +++ b/src/server/qgsrequesthandler.cpp @@ -19,10 +19,6 @@ #include "qgis.h" #include "qgsrequesthandler.h" -#if QT_VERSION < 0x050000 -#include "qgsftptransaction.h" -#include "qgshttptransaction.h" -#endif #include "qgsmessagelog.h" #include "qgsserverexception.h" #include "qgsserverrequest.h" @@ -234,5 +230,3 @@ void QgsRequestHandler::removeParameter( const QString &key ) { mRequest.removeParameter( key ); } - -