Move georeferencer sources from plugins to app

qgis · May 25, 2020 · 80a29fd · 80a29fd
1 parent 788180c
commit 80a29fd
Show file tree

Hide file tree

Showing 93 changed files with 154 additions and 198 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -637,6 +637,10 @@ ADD_DEFINITIONS(-DQT_DEPRECATED_WARNINGS)
 # Unfortunately Qwt uses deprecated QString::null in headers, preventing this being raised above 5.8
 ADD_DEFINITIONS(-DQT_DISABLE_DEPRECATED_BEFORE=0x050800)
 
+IF (WITH_GEOREFERENCER)
+  FIND_PACKAGE(GSL REQUIRED)
+ENDIF (WITH_GEOREFERENCER)
+
 IF(ENABLE_COVERAGE)
   INCLUDE("cmake/modules/coverage/CodeCoverage.cmake")
   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0 -fprofile-arcs -ftest-coverage --coverage")

diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
@@ -175,6 +175,29 @@ SET(QGIS_APP_SRCS
   devtools/profiler/qgsprofilerpanelwidget.cpp
   devtools/profiler/qgsprofilerwidgetfactory.cpp
 
+  georeferencer/qgsgcpcanvasitem.cpp
+  georeferencer/qgsgeorefconfigdialog.cpp
+  georeferencer/qgsgeorefdatapoint.cpp
+  georeferencer/qgsgeorefdelegates.cpp
+  georeferencer/qgsgeorefdescriptiondialog.cpp
+  georeferencer/qgsgeorefplugin.cpp
+  georeferencer/qgsgeorefplugingui.cpp
+  georeferencer/qgsgeoreftooladdpoint.cpp
+  georeferencer/qgsgeoreftooldeletepoint.cpp
+  georeferencer/qgsgeoreftoolmovepoint.cpp
+  georeferencer/qgsgeorefvalidators.cpp
+  georeferencer/qgsleastsquares.cpp
+  georeferencer/qgsmapcoordsdialog.cpp
+  georeferencer/qgsresidualplotitem.cpp
+  georeferencer/qgstransformsettingsdialog.cpp
+  georeferencer/qgsgcplist.cpp
+  georeferencer/qgsgcplistmodel.cpp
+  georeferencer/qgsimagewarper.cpp
+  georeferencer/qgsgeoreftransform.cpp
+  georeferencer/qgsgcplistwidget.cpp
+  georeferencer/qgsrasterchangecoords.cpp
+  georeferencer/qgsvalidateddoublespinbox.cpp
+
   labeling/qgslabelpropertydialog.cpp
   labeling/qgsmaptoolchangelabelproperties.cpp
   labeling/qgsmaptoolpinlabels.cpp
@@ -581,6 +604,15 @@ IF (WITH_3D)
   )
 ENDIF (WITH_3D)
 
+IF (WITH_GEOREFERENCER)
+  INCLUDE_DIRECTORIES(SYSTEM
+    ${GSL_INCLUDE_DIR}
+  )
+  TARGET_LINK_LIBRARIES(qgis_app
+    ${GSL_LIBRARIES}
+  )
+ENDIF (WITH_GEOREFERENCER)
+
 GENERATE_EXPORT_HEADER(
    qgis_app
    BASE_NAME APP

diff --git a/src/plugins/georeferencer/georeferencer.qrc → src/app/georeferencer/georeferencer.qrc b/src/plugins/georeferencer/georeferencer.qrc → src/app/georeferencer/georeferencer.qrc
diff --git a/...ncer/icons/default/mActionAddGCPPoint.png → ...ncer/icons/default/mActionAddGCPPoint.png b/...ncer/icons/default/mActionAddGCPPoint.png → ...ncer/icons/default/mActionAddGCPPoint.png
diff --git a/...r/icons/default/mActionDeleteGCPPoint.png → ...r/icons/default/mActionDeleteGCPPoint.png b/...r/icons/default/mActionDeleteGCPPoint.png → ...r/icons/default/mActionDeleteGCPPoint.png
diff --git a/...s/default/mActionFullHistogramStretch.png → ...s/default/mActionFullHistogramStretch.png b/...s/default/mActionFullHistogramStretch.png → ...s/default/mActionFullHistogramStretch.png
diff --git a/...encer/icons/default/mActionGDALScript.png → ...encer/icons/default/mActionGDALScript.png b/...encer/icons/default/mActionGDALScript.png → ...encer/icons/default/mActionGDALScript.png
diff --git a/...er/icons/default/mActionInfoTabWidget.png → ...er/icons/default/mActionInfoTabWidget.png b/...er/icons/default/mActionInfoTabWidget.png → ...er/icons/default/mActionInfoTabWidget.png
diff --git a/...icons/default/mActionLinkGeorefToQGis.png → ...icons/default/mActionLinkGeorefToQGis.png b/...icons/default/mActionLinkGeorefToQGis.png → ...icons/default/mActionLinkGeorefToQGis.png
diff --git a/...icons/default/mActionLinkGeorefToQGis.xcf → ...icons/default/mActionLinkGeorefToQGis.xcf b/...icons/default/mActionLinkGeorefToQGis.xcf → ...icons/default/mActionLinkGeorefToQGis.xcf
diff --git a/...icons/default/mActionLinkQGisToGeoref.png → ...icons/default/mActionLinkQGisToGeoref.png b/...icons/default/mActionLinkQGisToGeoref.png → ...icons/default/mActionLinkQGisToGeoref.png
diff --git a/...icons/default/mActionLinkQGisToGeoref.xcf → ...icons/default/mActionLinkQGisToGeoref.xcf b/...icons/default/mActionLinkQGisToGeoref.xcf → ...icons/default/mActionLinkQGisToGeoref.xcf
diff --git a/...er/icons/default/mActionLoadGCPpoints.png → ...er/icons/default/mActionLoadGCPpoints.png b/...er/icons/default/mActionLoadGCPpoints.png → ...er/icons/default/mActionLoadGCPpoints.png
diff --git a/.../default/mActionLocalHistogramStretch.png → .../default/mActionLocalHistogramStretch.png b/.../default/mActionLocalHistogramStretch.png → .../default/mActionLocalHistogramStretch.png
diff --git a/...cer/icons/default/mActionMoveGCPPoint.png → ...cer/icons/default/mActionMoveGCPPoint.png b/...cer/icons/default/mActionMoveGCPPoint.png → ...cer/icons/default/mActionMoveGCPPoint.png
diff --git a/...encer/icons/default/mActionOpenRaster.png → ...encer/icons/default/mActionOpenRaster.png b/...encer/icons/default/mActionOpenRaster.png → ...encer/icons/default/mActionOpenRaster.png
diff --git a/...cons/default/mActionProjectProperties.png → ...cons/default/mActionProjectProperties.png b/...cons/default/mActionProjectProperties.png → ...cons/default/mActionProjectProperties.png
diff --git a/.../icons/default/mActionSaveGCPpointsAs.png → .../icons/default/mActionSaveGCPpointsAs.png b/.../icons/default/mActionSaveGCPpointsAs.png → .../icons/default/mActionSaveGCPpointsAs.png
diff --git a/...cer/icons/default/mActionSaveRasterAs.png → ...cer/icons/default/mActionSaveRasterAs.png b/...cer/icons/default/mActionSaveRasterAs.png → ...cer/icons/default/mActionSaveRasterAs.png
diff --git a/...ncer/icons/default/mActionStartGeoref.png → ...ncer/icons/default/mActionStartGeoref.png b/...ncer/icons/default/mActionStartGeoref.png → ...ncer/icons/default/mActionStartGeoref.png
diff --git a/...cons/default/mActionTransformSettings.png → ...cons/default/mActionTransformSettings.png b/...cons/default/mActionTransformSettings.png → ...cons/default/mActionTransformSettings.png
diff --git a/...ncer/icons/default/mGeorefDescription.png → ...ncer/icons/default/mGeorefDescription.png b/...ncer/icons/default/mGeorefDescription.png → ...ncer/icons/default/mGeorefDescription.png
diff --git a/...eoreferencer/icons/default/mGeorefRun.png → ...eoreferencer/icons/default/mGeorefRun.png b/...eoreferencer/icons/default/mGeorefRun.png → ...eoreferencer/icons/default/mGeorefRun.png
diff --git a/...er/icons/default/mPushButtonClipboard.png → ...er/icons/default/mPushButtonClipboard.png b/...er/icons/default/mPushButtonClipboard.png → ...er/icons/default/mPushButtonClipboard.png
diff --git a/...er/icons/default/mPushButtonEditPaste.png → ...er/icons/default/mPushButtonEditPaste.png b/...er/icons/default/mPushButtonEditPaste.png → ...er/icons/default/mPushButtonEditPaste.png
diff --git a/...cer/icons/default/mPushButtonFileOpen.png → ...cer/icons/default/mPushButtonFileOpen.png b/...cer/icons/default/mPushButtonFileOpen.png → ...cer/icons/default/mPushButtonFileOpen.png
diff --git a/...encer/icons/default/mPushButtonPencil.png → ...encer/icons/default/mPushButtonPencil.png b/...encer/icons/default/mPushButtonPencil.png → ...encer/icons/default/mPushButtonPencil.png
diff --git a/.../default/mPushButtonTargetSRSDisabled.png → .../default/mPushButtonTargetSRSDisabled.png b/.../default/mPushButtonTargetSRSDisabled.png → .../default/mPushButtonTargetSRSDisabled.png
diff --git a/...s/default/mPushButtonTargetSRSEnabled.png → ...s/default/mPushButtonTargetSRSEnabled.png b/...s/default/mPushButtonTargetSRSEnabled.png → ...s/default/mPushButtonTargetSRSEnabled.png
diff --git a/.../icons_old/default/mActionAddGCPPoint.png → .../icons_old/default/mActionAddGCPPoint.png b/.../icons_old/default/mActionAddGCPPoint.png → .../icons_old/default/mActionAddGCPPoint.png
diff --git a/...ons_old/default/mActionDeleteGCPPoint.png → ...ons_old/default/mActionDeleteGCPPoint.png b/...ons_old/default/mActionDeleteGCPPoint.png → ...ons_old/default/mActionDeleteGCPPoint.png
diff --git a/...r/icons_old/default/mActionGDALScript.png → ...r/icons_old/default/mActionGDALScript.png b/...r/icons_old/default/mActionGDALScript.png → ...r/icons_old/default/mActionGDALScript.png
diff --git a/...cons_old/default/mActionLoadGCPpoints.png → ...cons_old/default/mActionLoadGCPpoints.png b/...cons_old/default/mActionLoadGCPpoints.png → ...cons_old/default/mActionLoadGCPpoints.png
diff --git a/...icons_old/default/mActionMoveGCPPoint.png → ...icons_old/default/mActionMoveGCPPoint.png b/...icons_old/default/mActionMoveGCPPoint.png → ...icons_old/default/mActionMoveGCPPoint.png
diff --git a/...r/icons_old/default/mActionOpenRaster.png → ...r/icons_old/default/mActionOpenRaster.png b/...r/icons_old/default/mActionOpenRaster.png → ...r/icons_old/default/mActionOpenRaster.png
diff --git a/...ns_old/default/mActionSaveGCPpointsAs.png → ...ns_old/default/mActionSaveGCPpointsAs.png b/...ns_old/default/mActionSaveGCPpointsAs.png → ...ns_old/default/mActionSaveGCPpointsAs.png
diff --git a/.../icons_old/default/mActionStartGeoref.png → .../icons_old/default/mActionStartGeoref.png b/.../icons_old/default/mActionStartGeoref.png → .../icons_old/default/mActionStartGeoref.png
diff --git a/..._old/default/mActionTransformSettings.png → ..._old/default/mActionTransformSettings.png b/..._old/default/mActionTransformSettings.png → ..._old/default/mActionTransformSettings.png
diff --git a/...ferencer/icons_old/default/mGeorefRun.png → ...ferencer/icons_old/default/mGeorefRun.png b/...ferencer/icons_old/default/mGeorefRun.png → ...ferencer/icons_old/default/mGeorefRun.png
diff --git a/...lugins/georeferencer/qgsgcpcanvasitem.cpp → src/app/georeferencer/qgsgcpcanvasitem.cpp b/...lugins/georeferencer/qgsgcpcanvasitem.cpp → src/app/georeferencer/qgsgcpcanvasitem.cpp
diff --git a/src/plugins/georeferencer/qgsgcpcanvasitem.h → src/app/georeferencer/qgsgcpcanvasitem.h b/src/plugins/georeferencer/qgsgcpcanvasitem.h → src/app/georeferencer/qgsgcpcanvasitem.h
diff --git a/src/plugins/georeferencer/qgsgcplist.cpp → src/app/georeferencer/qgsgcplist.cpp b/src/plugins/georeferencer/qgsgcplist.cpp → src/app/georeferencer/qgsgcplist.cpp
diff --git a/src/plugins/georeferencer/qgsgcplist.h → src/app/georeferencer/qgsgcplist.h b/src/plugins/georeferencer/qgsgcplist.h → src/app/georeferencer/qgsgcplist.h
diff --git a/...plugins/georeferencer/qgsgcplistmodel.cpp → src/app/georeferencer/qgsgcplistmodel.cpp b/...plugins/georeferencer/qgsgcplistmodel.cpp → src/app/georeferencer/qgsgcplistmodel.cpp
diff --git a/src/plugins/georeferencer/qgsgcplistmodel.h → src/app/georeferencer/qgsgcplistmodel.h b/src/plugins/georeferencer/qgsgcplistmodel.h → src/app/georeferencer/qgsgcplistmodel.h
diff --git a/...lugins/georeferencer/qgsgcplistwidget.cpp → src/app/georeferencer/qgsgcplistwidget.cpp b/...lugins/georeferencer/qgsgcplistwidget.cpp → src/app/georeferencer/qgsgcplistwidget.cpp
@@ -91,7 +91,8 @@ void QgsGCPListWidget::updateGCPList()
 
 void QgsGCPListWidget::closeEditors()
 {
-  Q_FOREACH ( const QModelIndex &index, selectedIndexes() )
+  const QModelIndexList selection = selectedIndexes();
+  for ( const QModelIndex &index : selection )
   {
     closePersistentEditor( index );
   }

diff --git a/src/plugins/georeferencer/qgsgcplistwidget.h → src/app/georeferencer/qgsgcplistwidget.h b/src/plugins/georeferencer/qgsgcplistwidget.h → src/app/georeferencer/qgsgcplistwidget.h
diff --git a/...s/georeferencer/qgsgeorefconfigdialog.cpp → ...p/georeferencer/qgsgeorefconfigdialog.cpp b/...s/georeferencer/qgsgeorefconfigdialog.cpp → ...p/georeferencer/qgsgeorefconfigdialog.cpp
diff --git a/...ins/georeferencer/qgsgeorefconfigdialog.h → ...app/georeferencer/qgsgeorefconfigdialog.h b/...ins/georeferencer/qgsgeorefconfigdialog.h → ...app/georeferencer/qgsgeorefconfigdialog.h
diff --git a/...gins/georeferencer/qgsgeorefdatapoint.cpp → src/app/georeferencer/qgsgeorefdatapoint.cpp b/...gins/georeferencer/qgsgeorefdatapoint.cpp → src/app/georeferencer/qgsgeorefdatapoint.cpp
diff --git a/...lugins/georeferencer/qgsgeorefdatapoint.h → src/app/georeferencer/qgsgeorefdatapoint.h b/...lugins/georeferencer/qgsgeorefdatapoint.h → src/app/georeferencer/qgsgeorefdatapoint.h
diff --git a/...gins/georeferencer/qgsgeorefdelegates.cpp → src/app/georeferencer/qgsgeorefdelegates.cpp b/...gins/georeferencer/qgsgeorefdelegates.cpp → src/app/georeferencer/qgsgeorefdelegates.cpp
diff --git a/...lugins/georeferencer/qgsgeorefdelegates.h → src/app/georeferencer/qgsgeorefdelegates.h b/...lugins/georeferencer/qgsgeorefdelegates.h → src/app/georeferencer/qgsgeorefdelegates.h
diff --git a/...referencer/qgsgeorefdescriptiondialog.cpp → ...referencer/qgsgeorefdescriptiondialog.cpp b/...referencer/qgsgeorefdescriptiondialog.cpp → ...referencer/qgsgeorefdescriptiondialog.cpp
diff --git a/...eoreferencer/qgsgeorefdescriptiondialog.h → ...eoreferencer/qgsgeorefdescriptiondialog.h b/...eoreferencer/qgsgeorefdescriptiondialog.h → ...eoreferencer/qgsgeorefdescriptiondialog.h
diff --git a/...plugins/georeferencer/qgsgeorefplugin.cpp → src/app/georeferencer/qgsgeorefplugin.cpp b/...plugins/georeferencer/qgsgeorefplugin.cpp → src/app/georeferencer/qgsgeorefplugin.cpp
diff --git a/src/plugins/georeferencer/qgsgeorefplugin.h → src/app/georeferencer/qgsgeorefplugin.h b/src/plugins/georeferencer/qgsgeorefplugin.h → src/app/georeferencer/qgsgeorefplugin.h
diff --git a/...gins/georeferencer/qgsgeorefplugingui.cpp → src/app/georeferencer/qgsgeorefplugingui.cpp b/...gins/georeferencer/qgsgeorefplugingui.cpp → src/app/georeferencer/qgsgeorefplugingui.cpp
@@ -1280,7 +1280,7 @@ void QgsGeorefPluginGui::saveGCPs()
   {
     QTextStream points( &pointFile );
     points << "mapX,mapY,pixelX,pixelY,enable,dX,dY,residual" << endl;
-    Q_FOREACH ( QgsGeorefDataPoint *pt, mPoints )
+    for ( QgsGeorefDataPoint *pt : qgis::as_const( mPoints ) )
     {
       points << QStringLiteral( "%1,%2,%3,%4,%5,%6,%7,%8" )
              .arg( qgsDoubleToString( pt->mapCoords().x() ),
@@ -1863,7 +1863,7 @@ QString QgsGeorefPluginGui::generateGDALtranslateCommand( bool generateTFW )
     gdalCommand << QStringLiteral( "-co TFW=YES" );
   }
 
-  Q_FOREACH ( QgsGeorefDataPoint *pt, mPoints )
+  for ( QgsGeorefDataPoint *pt : qgis::as_const( mPoints ) )
   {
     gdalCommand << QStringLiteral( "-gcp %1 %2 %3 %4" ).arg( pt->pixelCoords().x() ).arg( -pt->pixelCoords().y() )
                 .arg( pt->mapCoords().x() ).arg( pt->mapCoords().y() );

diff --git a/...lugins/georeferencer/qgsgeorefplugingui.h → src/app/georeferencer/qgsgeorefplugingui.h b/...lugins/georeferencer/qgsgeorefplugingui.h → src/app/georeferencer/qgsgeorefplugingui.h
diff --git a/...s/georeferencer/qgsgeoreftooladdpoint.cpp → ...p/georeferencer/qgsgeoreftooladdpoint.cpp b/...s/georeferencer/qgsgeoreftooladdpoint.cpp → ...p/georeferencer/qgsgeoreftooladdpoint.cpp
diff --git a/...ins/georeferencer/qgsgeoreftooladdpoint.h → ...app/georeferencer/qgsgeoreftooladdpoint.h b/...ins/georeferencer/qgsgeoreftooladdpoint.h → ...app/georeferencer/qgsgeoreftooladdpoint.h
diff --git a/...eoreferencer/qgsgeoreftooldeletepoint.cpp → ...eoreferencer/qgsgeoreftooldeletepoint.cpp b/...eoreferencer/qgsgeoreftooldeletepoint.cpp → ...eoreferencer/qgsgeoreftooldeletepoint.cpp
diff --git a/.../georeferencer/qgsgeoreftooldeletepoint.h → .../georeferencer/qgsgeoreftooldeletepoint.h b/.../georeferencer/qgsgeoreftooldeletepoint.h → .../georeferencer/qgsgeoreftooldeletepoint.h
diff --git a/.../georeferencer/qgsgeoreftoolmovepoint.cpp → .../georeferencer/qgsgeoreftoolmovepoint.cpp b/.../georeferencer/qgsgeoreftoolmovepoint.cpp → .../georeferencer/qgsgeoreftoolmovepoint.cpp
diff --git a/...ns/georeferencer/qgsgeoreftoolmovepoint.h → ...pp/georeferencer/qgsgeoreftoolmovepoint.h b/...ns/georeferencer/qgsgeoreftoolmovepoint.h → ...pp/georeferencer/qgsgeoreftoolmovepoint.h
diff --git a/...gins/georeferencer/qgsgeoreftransform.cpp → src/app/georeferencer/qgsgeoreftransform.cpp b/...gins/georeferencer/qgsgeoreftransform.cpp → src/app/georeferencer/qgsgeoreftransform.cpp
@@ -577,7 +577,7 @@ bool QgsProjectiveGeorefTransform::updateParametersFromGCPs( const QVector<QgsPo
   // HACK: flip y coordinates, because georeferencer and gdal use different conventions
   QVector<QgsPointXY> flippedPixelCoords;
   flippedPixelCoords.reserve( pixelCoords.size() );
-  Q_FOREACH ( const QgsPointXY &coord, pixelCoords )
+  for ( const QgsPointXY &coord : pixelCoords )
   {
     flippedPixelCoords << QgsPointXY( coord.x(), -coord.y() );
   }

diff --git a/...lugins/georeferencer/qgsgeoreftransform.h → src/app/georeferencer/qgsgeoreftransform.h b/...lugins/georeferencer/qgsgeoreftransform.h → src/app/georeferencer/qgsgeoreftransform.h
diff --git a/...ins/georeferencer/qgsgeorefvalidators.cpp → ...app/georeferencer/qgsgeorefvalidators.cpp b/...ins/georeferencer/qgsgeorefvalidators.cpp → ...app/georeferencer/qgsgeorefvalidators.cpp
diff --git a/...ugins/georeferencer/qgsgeorefvalidators.h → src/app/georeferencer/qgsgeorefvalidators.h b/...ugins/georeferencer/qgsgeorefvalidators.h → src/app/georeferencer/qgsgeorefvalidators.h
diff --git a/src/plugins/georeferencer/qgsimagewarper.cpp → src/app/georeferencer/qgsimagewarper.cpp b/src/plugins/georeferencer/qgsimagewarper.cpp → src/app/georeferencer/qgsimagewarper.cpp
diff --git a/src/plugins/georeferencer/qgsimagewarper.h → src/app/georeferencer/qgsimagewarper.h b/src/plugins/georeferencer/qgsimagewarper.h → src/app/georeferencer/qgsimagewarper.h
diff --git a/...plugins/georeferencer/qgsleastsquares.cpp → src/app/georeferencer/qgsleastsquares.cpp b/...plugins/georeferencer/qgsleastsquares.cpp → src/app/georeferencer/qgsleastsquares.cpp
diff --git a/src/plugins/georeferencer/qgsleastsquares.h → src/app/georeferencer/qgsleastsquares.h b/src/plugins/georeferencer/qgsleastsquares.h → src/app/georeferencer/qgsleastsquares.h
diff --git a/...gins/georeferencer/qgsmapcoordsdialog.cpp → src/app/georeferencer/qgsmapcoordsdialog.cpp b/...gins/georeferencer/qgsmapcoordsdialog.cpp → src/app/georeferencer/qgsmapcoordsdialog.cpp
diff --git a/...lugins/georeferencer/qgsmapcoordsdialog.h → src/app/georeferencer/qgsmapcoordsdialog.h b/...lugins/georeferencer/qgsmapcoordsdialog.h → src/app/georeferencer/qgsmapcoordsdialog.h
diff --git a/...s/georeferencer/qgsrasterchangecoords.cpp → ...p/georeferencer/qgsrasterchangecoords.cpp b/...s/georeferencer/qgsrasterchangecoords.cpp → ...p/georeferencer/qgsrasterchangecoords.cpp
diff --git a/...ins/georeferencer/qgsrasterchangecoords.h → ...app/georeferencer/qgsrasterchangecoords.h b/...ins/georeferencer/qgsrasterchangecoords.h → ...app/georeferencer/qgsrasterchangecoords.h
diff --git a/...ins/georeferencer/qgsresidualplotitem.cpp → ...app/georeferencer/qgsresidualplotitem.cpp b/...ins/georeferencer/qgsresidualplotitem.cpp → ...app/georeferencer/qgsresidualplotitem.cpp
diff --git a/...ugins/georeferencer/qgsresidualplotitem.h → src/app/georeferencer/qgsresidualplotitem.h b/...ugins/georeferencer/qgsresidualplotitem.h → src/app/georeferencer/qgsresidualplotitem.h
diff --git a/...referencer/qgstransformsettingsdialog.cpp → ...referencer/qgstransformsettingsdialog.cpp b/...referencer/qgstransformsettingsdialog.cpp → ...referencer/qgstransformsettingsdialog.cpp
@@ -95,7 +95,7 @@ QgsTransformSettingsDialog::QgsTransformSettingsDialog( const QString &raster, c
   mListCompression.append( QStringLiteral( "PACKBITS" ) );
   mListCompression.append( QStringLiteral( "DEFLATE" ) );
   QStringList listCompressionTr;
-  Q_FOREACH ( const QString &item, mListCompression )
+  for ( const QString &item : qgis::as_const( mListCompression ) )
   {
     listCompressionTr.append( tr( item.toLatin1().data() ) );
   }

diff --git a/...eoreferencer/qgstransformsettingsdialog.h → ...eoreferencer/qgstransformsettingsdialog.h b/...eoreferencer/qgstransformsettingsdialog.h → ...eoreferencer/qgstransformsettingsdialog.h
diff --git a/src/app/georeferencer/qgsvalidateddoublespinbox.cpp b/src/app/georeferencer/qgsvalidateddoublespinbox.cpp
@@ -0,0 +1,76 @@
+/***************************************************************************
+    qgsvalidateddoublespinbox.cpp
+     --------------------------------------
+    Date                 : 23-Feb-2010
+    Copyright            : (c) 2010 by Manuel Massing
+    Email                : m.massing at warped-space.de
+ ***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#include "qgsvalidateddoublespinbox.h"
+
+QgsValidatedDoubleSpinBox::QgsValidatedDoubleSpinBox( QWidget *widget )
+  : QDoubleSpinBox( widget )
+{ }
+
+QValidator::State QgsValidatedDoubleSpinBox::validate( QString &input, int &pos ) const
+{
+  QValidator::State state = QDoubleSpinBox::validate( input, pos );
+  if ( state != QValidator::Acceptable )
+  {
+    return state;
+  }
+
+  // A value of zero is acceptable as intermediate result,
+  // but not as final entry
+  double val = valueFromText( input );
+  if ( val == 0.0 )
+  {
+    return QValidator::Intermediate;
+  }
+  return QValidator::Acceptable;
+}
+
+QAbstractSpinBox::StepEnabled QgsValidatedDoubleSpinBox::stepEnabled() const
+{
+  StepEnabled mayStep = StepNone;
+
+  // Zero is off limits, so handle the logic differently
+  // (always exclude zero from the permitted interval)
+  if ( minimum() == 0.0 )
+  {
+    if ( value() - singleStep() > minimum() )
+    {
+      mayStep |= StepDownEnabled;
+    }
+  }
+  else // closed interval
+  {
+    if ( value() - singleStep() >= minimum() )
+    {
+      mayStep |= StepDownEnabled;
+    }
+  }
+
+  if ( maximum() == 0.0 )
+  {
+    if ( value() + singleStep() < maximum() )
+    {
+      mayStep |= StepUpEnabled;
+    }
+  }
+  else
+  {
+    if ( value() + singleStep() <= maximum() )
+    {
+      mayStep |= StepUpEnabled;
+    }
+  }
+  return mayStep;
+}
diff --git a/src/app/georeferencer/qgsvalidateddoublespinbox.h b/src/app/georeferencer/qgsvalidateddoublespinbox.h
@@ -0,0 +1,33 @@
+/***************************************************************************
+    qgsvalidateddoublespinbox.h - Simple extension to QDoubleSpinBox which
+    implements a validate function to disallow zero as input.
+     --------------------------------------
+    Date                 : 23-Feb-2010
+    Copyright            : (c) 2010 by Manuel Massing
+    Email                : m.massing at warped-space.de
+ ***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#ifndef QGSVALIDATEDDOUBLESPINBOX_H
+#define QGSVALIDATEDDOUBLESPINBOX_H
+
+#include <QDoubleSpinBox>
+
+class QgsValidatedDoubleSpinBox : public QDoubleSpinBox
+{
+    Q_OBJECT
+
+  public:
+    QgsValidatedDoubleSpinBox( QWidget *widget );
+
+    QValidator::State validate( QString &input, int &pos ) const override;
+    StepEnabled stepEnabled() const override;
+};
+
+#endif
diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
@@ -16,10 +16,6 @@ IF (GRASS_FOUND)
   ADD_SUBDIRECTORY(grass)
 ENDIF (GRASS_FOUND)
 
-IF (WITH_GEOREFERENCER)
-  ADD_SUBDIRECTORY(georeferencer)
-ENDIF (WITH_GEOREFERENCER)
-
 IF (CUSTOM_PLUGINS)
   ADD_SUBDIRECTORY(${CUSTOM_PLUGINS})
 ENDIF (CUSTOM_PLUGINS)

diff --git a/src/plugins/georeferencer/CMakeLists.txt b/src/plugins/georeferencer/CMakeLists.txt