Also move app labeling files to dedicated subdirectory

qgis · Dec 11, 2019 · 03803b0 · 03803b0
1 parent d3da0e0
commit 03803b0
Show file tree

Hide file tree

Showing 22 changed files with 13 additions and 10 deletions.
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
@@ -105,6 +105,7 @@ IF(WITH_APIDOC)
       ${CMAKE_SOURCE_DIR}/src/gui/editorwidgets
       ${CMAKE_SOURCE_DIR}/src/gui/editorwidgets/core
       ${CMAKE_SOURCE_DIR}/src/gui/effects
+      ${CMAKE_SOURCE_DIR}/src/gui/labeling
       ${CMAKE_SOURCE_DIR}/src/gui/layertree
       ${CMAKE_SOURCE_DIR}/src/gui/layout
       ${CMAKE_SOURCE_DIR}/src/gui/locator

diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
@@ -54,9 +54,6 @@ SET(QGIS_APP_SRCS
   qgsidentifyresultsdialog.cpp
   qgsinstallgridshiftdialog.cpp
   qgsfeatureaction.cpp
-  qgslabelpropertydialog.cpp
-  qgslabelengineconfigdialog.cpp
-  qgslabelingwidget.cpp
   qgslayercapabilitiesmodel.cpp
   qgslayertreeviewindicatorprovider.cpp
   qgslayertreeviewembeddedindicator.cpp
@@ -74,7 +71,6 @@ SET(QGIS_APP_SRCS
   qgsprojectlistitemdelegate.cpp
   qgspuzzlewidget.cpp
   qgsversionmigration.cpp
-  qgsrulebasedlabelingwidget.cpp
   qgssnappinglayertreemodel.cpp
   qgssnappingwidget.cpp
   qgsstatusbarcoordinateswidget.cpp
@@ -92,27 +88,21 @@ SET(QGIS_APP_SRCS
   qgsmaptooladdring.cpp
   qgsmaptoolfillring.cpp
   qgsmaptoolannotation.cpp
-  qgsmaptoolchangelabelproperties.cpp
   qgsmaptooldeletering.cpp
   qgsmaptooldeletepart.cpp
   qgsmaptooltrimextendfeature.cpp
   qgsmaptoolfeatureaction.cpp
   qgsmaptoolformannotation.cpp
   qgsmaptoolhtmlannotation.cpp
-  qgsmaptoolpinlabels.cpp
-  qgsmaptoolshowhidelabels.cpp
   qgsmaptoolidentifyaction.cpp
-  qgsmaptoollabel.cpp
   qgsmaptoolmeasureangle.cpp
   qgsmaptoolmovefeature.cpp
-  qgsmaptoolmovelabel.cpp
   qgsmaptooloffsetcurve.cpp
   qgsmaptooloffsetpointsymbol.cpp
   qgsmaptoolpointsymbol.cpp
   qgsmaptoolreshape.cpp
   qgsmaptoolreverseline.cpp
   qgsmaptoolrotatefeature.cpp
-  qgsmaptoolrotatelabel.cpp
   qgsmaptoolrotatepointsymbols.cpp
   qgsmaptoolselect.cpp
   qgsmaptoolselectionhandler.cpp
@@ -193,6 +183,17 @@ SET(QGIS_APP_SRCS
 
   browser/qgsinbuiltdataitemproviders.cpp
 
+  labeling/qgslabelpropertydialog.cpp
+  labeling/qgslabelengineconfigdialog.cpp
+  labeling/qgslabelingwidget.cpp
+  labeling/qgsmaptoolchangelabelproperties.cpp
+  labeling/qgsmaptoolpinlabels.cpp
+  labeling/qgsmaptoolshowhidelabels.cpp
+  labeling/qgsmaptoollabel.cpp
+  labeling/qgsmaptoolmovelabel.cpp
+  labeling/qgsmaptoolrotatelabel.cpp
+  labeling/qgsrulebasedlabelingwidget.cpp
+
   layout/qgsgeopdflayertreemodel.cpp
   layout/qgslayoutaddpagesdialog.cpp
   layout/qgslayoutapputils.cpp
@@ -419,6 +420,7 @@ INCLUDE_DIRECTORIES(
 
   ${CMAKE_SOURCE_DIR}/src/app
   ${CMAKE_SOURCE_DIR}/src/app/decorations
+  ${CMAKE_SOURCE_DIR}/src/app/labeling
   ${CMAKE_SOURCE_DIR}/src/app/layout
   ${CMAKE_SOURCE_DIR}/src/app/pluginmanager
   ${CMAKE_SOURCE_DIR}/src/app/gps

diff --git a/src/app/qgslabelengineconfigdialog.cpp → ...p/labeling/qgslabelengineconfigdialog.cpp b/src/app/qgslabelengineconfigdialog.cpp → ...p/labeling/qgslabelengineconfigdialog.cpp
diff --git a/src/app/qgslabelengineconfigdialog.h → ...app/labeling/qgslabelengineconfigdialog.h b/src/app/qgslabelengineconfigdialog.h → ...app/labeling/qgslabelengineconfigdialog.h
diff --git a/src/app/qgslabelingwidget.cpp → src/app/labeling/qgslabelingwidget.cpp b/src/app/qgslabelingwidget.cpp → src/app/labeling/qgslabelingwidget.cpp
diff --git a/src/app/qgslabelingwidget.h → src/app/labeling/qgslabelingwidget.h b/src/app/qgslabelingwidget.h → src/app/labeling/qgslabelingwidget.h
diff --git a/src/app/qgslabelpropertydialog.cpp → src/app/labeling/qgslabelpropertydialog.cpp b/src/app/qgslabelpropertydialog.cpp → src/app/labeling/qgslabelpropertydialog.cpp
diff --git a/src/app/qgslabelpropertydialog.h → src/app/labeling/qgslabelpropertydialog.h b/src/app/qgslabelpropertydialog.h → src/app/labeling/qgslabelpropertydialog.h
diff --git a/src/app/qgsmaptoolchangelabelproperties.cpp → ...eling/qgsmaptoolchangelabelproperties.cpp b/src/app/qgsmaptoolchangelabelproperties.cpp → ...eling/qgsmaptoolchangelabelproperties.cpp
diff --git a/src/app/qgsmaptoolchangelabelproperties.h → ...abeling/qgsmaptoolchangelabelproperties.h b/src/app/qgsmaptoolchangelabelproperties.h → ...abeling/qgsmaptoolchangelabelproperties.h
diff --git a/src/app/qgsmaptoollabel.cpp → src/app/labeling/qgsmaptoollabel.cpp b/src/app/qgsmaptoollabel.cpp → src/app/labeling/qgsmaptoollabel.cpp
diff --git a/src/app/qgsmaptoollabel.h → src/app/labeling/qgsmaptoollabel.h b/src/app/qgsmaptoollabel.h → src/app/labeling/qgsmaptoollabel.h
diff --git a/src/app/qgsmaptoolmovelabel.cpp → src/app/labeling/qgsmaptoolmovelabel.cpp b/src/app/qgsmaptoolmovelabel.cpp → src/app/labeling/qgsmaptoolmovelabel.cpp
diff --git a/src/app/qgsmaptoolmovelabel.h → src/app/labeling/qgsmaptoolmovelabel.h b/src/app/qgsmaptoolmovelabel.h → src/app/labeling/qgsmaptoolmovelabel.h
diff --git a/src/app/qgsmaptoolpinlabels.cpp → src/app/labeling/qgsmaptoolpinlabels.cpp b/src/app/qgsmaptoolpinlabels.cpp → src/app/labeling/qgsmaptoolpinlabels.cpp
diff --git a/src/app/qgsmaptoolpinlabels.h → src/app/labeling/qgsmaptoolpinlabels.h b/src/app/qgsmaptoolpinlabels.h → src/app/labeling/qgsmaptoolpinlabels.h
diff --git a/src/app/qgsmaptoolrotatelabel.cpp → src/app/labeling/qgsmaptoolrotatelabel.cpp b/src/app/qgsmaptoolrotatelabel.cpp → src/app/labeling/qgsmaptoolrotatelabel.cpp
diff --git a/src/app/qgsmaptoolrotatelabel.h → src/app/labeling/qgsmaptoolrotatelabel.h b/src/app/qgsmaptoolrotatelabel.h → src/app/labeling/qgsmaptoolrotatelabel.h
diff --git a/src/app/qgsmaptoolshowhidelabels.cpp → ...app/labeling/qgsmaptoolshowhidelabels.cpp b/src/app/qgsmaptoolshowhidelabels.cpp → ...app/labeling/qgsmaptoolshowhidelabels.cpp
diff --git a/src/app/qgsmaptoolshowhidelabels.h → src/app/labeling/qgsmaptoolshowhidelabels.h b/src/app/qgsmaptoolshowhidelabels.h → src/app/labeling/qgsmaptoolshowhidelabels.h
diff --git a/src/app/qgsrulebasedlabelingwidget.cpp → ...p/labeling/qgsrulebasedlabelingwidget.cpp b/src/app/qgsrulebasedlabelingwidget.cpp → ...p/labeling/qgsrulebasedlabelingwidget.cpp
diff --git a/src/app/qgsrulebasedlabelingwidget.h → ...app/labeling/qgsrulebasedlabelingwidget.h b/src/app/qgsrulebasedlabelingwidget.h → ...app/labeling/qgsrulebasedlabelingwidget.h