qgis · Nov 3, 2018
diff --git a/‎src/app/CMakeLists.txt
Lines changed: 25 additions & 22 deletions b/‎src/app/CMakeLists.txt
Lines changed: 25 additions & 22 deletions
diff --git a/‎src/app/qgsdecorationcopyright.cpp renamed to ‎src/app/decorations/qgsdecorationcopyright.cpp b/‎src/app/qgsdecorationcopyright.cpp renamed to ‎src/app/decorations/qgsdecorationcopyright.cpp
diff --git a/‎src/app/qgsdecorationcopyright.h renamed to ‎src/app/decorations/qgsdecorationcopyright.h b/‎src/app/qgsdecorationcopyright.h renamed to ‎src/app/decorations/qgsdecorationcopyright.h
diff --git a/‎src/app/qgsdecorationcopyrightdialog.cpp renamed to ‎src/app/decorations/qgsdecorationcopyrightdialog.cpp b/‎src/app/qgsdecorationcopyrightdialog.cpp renamed to ‎src/app/decorations/qgsdecorationcopyrightdialog.cpp
diff --git a/‎src/app/qgsdecorationcopyrightdialog.h renamed to ‎src/app/decorations/qgsdecorationcopyrightdialog.h b/‎src/app/qgsdecorationcopyrightdialog.h renamed to ‎src/app/decorations/qgsdecorationcopyrightdialog.h
diff --git a/‎src/app/qgsdecorationgrid.cpp renamed to ‎src/app/decorations/qgsdecorationgrid.cpp b/‎src/app/qgsdecorationgrid.cpp renamed to ‎src/app/decorations/qgsdecorationgrid.cpp
diff --git a/‎src/app/qgsdecorationgrid.h renamed to ‎src/app/decorations/qgsdecorationgrid.h b/‎src/app/qgsdecorationgrid.h renamed to ‎src/app/decorations/qgsdecorationgrid.h
diff --git a/‎src/app/qgsdecorationgriddialog.cpp renamed to ‎src/app/decorations/qgsdecorationgriddialog.cpp b/‎src/app/qgsdecorationgriddialog.cpp renamed to ‎src/app/decorations/qgsdecorationgriddialog.cpp
diff --git a/‎src/app/qgsdecorationgriddialog.h renamed to ‎src/app/decorations/qgsdecorationgriddialog.h b/‎src/app/qgsdecorationgriddialog.h renamed to ‎src/app/decorations/qgsdecorationgriddialog.h
diff --git a/‎src/app/qgsdecorationitem.cpp renamed to ‎src/app/decorations/qgsdecorationitem.cpp b/‎src/app/qgsdecorationitem.cpp renamed to ‎src/app/decorations/qgsdecorationitem.cpp
diff --git a/‎src/app/qgsdecorationitem.h renamed to ‎src/app/decorations/qgsdecorationitem.h b/‎src/app/qgsdecorationitem.h renamed to ‎src/app/decorations/qgsdecorationitem.h
diff --git a/‎src/app/qgsdecorationlayoutextent.cpp renamed to ‎src/app/decorations/qgsdecorationlayoutextent.cpp b/‎src/app/qgsdecorationlayoutextent.cpp renamed to ‎src/app/decorations/qgsdecorationlayoutextent.cpp
diff --git a/‎src/app/qgsdecorationlayoutextent.h renamed to ‎src/app/decorations/qgsdecorationlayoutextent.h b/‎src/app/qgsdecorationlayoutextent.h renamed to ‎src/app/decorations/qgsdecorationlayoutextent.h
diff --git a/‎src/app/qgsdecorationlayoutextentdialog.cpp renamed to ‎src/app/decorations/qgsdecorationlayoutextentdialog.cpp b/‎src/app/qgsdecorationlayoutextentdialog.cpp renamed to ‎src/app/decorations/qgsdecorationlayoutextentdialog.cpp
diff --git a/‎src/app/qgsdecorationlayoutextentdialog.h renamed to ‎src/app/decorations/qgsdecorationlayoutextentdialog.h b/‎src/app/qgsdecorationlayoutextentdialog.h renamed to ‎src/app/decorations/qgsdecorationlayoutextentdialog.h
diff --git a/‎src/app/qgsdecorationnortharrow.cpp renamed to ‎src/app/decorations/qgsdecorationnortharrow.cpp b/‎src/app/qgsdecorationnortharrow.cpp renamed to ‎src/app/decorations/qgsdecorationnortharrow.cpp
diff --git a/‎src/app/qgsdecorationnortharrow.h renamed to ‎src/app/decorations/qgsdecorationnortharrow.h b/‎src/app/qgsdecorationnortharrow.h renamed to ‎src/app/decorations/qgsdecorationnortharrow.h
diff --git a/‎src/app/qgsdecorationnortharrowdialog.cpp renamed to ‎src/app/decorations/qgsdecorationnortharrowdialog.cpp b/‎src/app/qgsdecorationnortharrowdialog.cpp renamed to ‎src/app/decorations/qgsdecorationnortharrowdialog.cpp
diff --git a/‎src/app/qgsdecorationnortharrowdialog.h renamed to ‎src/app/decorations/qgsdecorationnortharrowdialog.h b/‎src/app/qgsdecorationnortharrowdialog.h renamed to ‎src/app/decorations/qgsdecorationnortharrowdialog.h
diff --git a/‎src/app/qgsdecorationscalebar.cpp renamed to ‎src/app/decorations/qgsdecorationscalebar.cpp b/‎src/app/qgsdecorationscalebar.cpp renamed to ‎src/app/decorations/qgsdecorationscalebar.cpp
diff --git a/‎src/app/qgsdecorationscalebar.h renamed to ‎src/app/decorations/qgsdecorationscalebar.h b/‎src/app/qgsdecorationscalebar.h renamed to ‎src/app/decorations/qgsdecorationscalebar.h
diff --git a/‎src/app/qgsdecorationscalebardialog.cpp renamed to ‎src/app/decorations/qgsdecorationscalebardialog.cpp b/‎src/app/qgsdecorationscalebardialog.cpp renamed to ‎src/app/decorations/qgsdecorationscalebardialog.cpp
diff --git a/‎src/app/qgsdecorationscalebardialog.h renamed to ‎src/app/decorations/qgsdecorationscalebardialog.h b/‎src/app/qgsdecorationscalebardialog.h renamed to ‎src/app/decorations/qgsdecorationscalebardialog.h
@@ -27,17 +27,6 @@ SET(QGIS_APP_SRCS
   qgscustomization.cpp
   qgscustomprojectiondialog.cpp
   qgsdatumtransformtablewidget.cpp
-  qgsdecorationitem.cpp
-  qgsdecorationcopyright.cpp
-  qgsdecorationcopyrightdialog.cpp
-  qgsdecorationlayoutextent.cpp
-  qgsdecorationlayoutextentdialog.cpp
-  qgsdecorationnortharrow.cpp
-  qgsdecorationnortharrowdialog.cpp
-  qgsdecorationscalebar.cpp
-  qgsdecorationscalebardialog.cpp
-  qgsdecorationgrid.cpp
-  qgsdecorationgriddialog.cpp
   qgsdiscoverrelationsdlg.cpp
   qgsdxfexportdialog.cpp
   qgsformannotationdialog.cpp
@@ -119,6 +108,18 @@ SET(QGIS_APP_SRCS
   qgsmaptoolsvgannotation.cpp
   qgsmaptooltextannotation.cpp
 
+  decorations/qgsdecorationitem.cpp
+  decorations/qgsdecorationcopyright.cpp
+  decorations/qgsdecorationcopyrightdialog.cpp
+  decorations/qgsdecorationlayoutextent.cpp
+  decorations/qgsdecorationlayoutextentdialog.cpp
+  decorations/qgsdecorationnortharrow.cpp
+  decorations/qgsdecorationnortharrowdialog.cpp
+  decorations/qgsdecorationscalebar.cpp
+  decorations/qgsdecorationscalebardialog.cpp
+  decorations/qgsdecorationgrid.cpp
+  decorations/qgsdecorationgriddialog.cpp
+
   vertextool/qgsselectedfeature.cpp
   vertextool/qgsvertexentry.cpp
   vertextool/qgsvertexeditor.cpp
@@ -258,17 +259,6 @@ SET (QGIS_APP_MOC_HDRS
   qgscustomization.h
   qgscustomprojectiondialog.h
   qgsdatumtransformtablewidget.h
-  qgsdecorationitem.h
-  qgsdecorationcopyright.h
-  qgsdecorationcopyrightdialog.h
-  qgsdecorationlayoutextent.h
-  qgsdecorationlayoutextentdialog.h
-  qgsdecorationnortharrow.h
-  qgsdecorationnortharrowdialog.h
-  qgsdecorationscalebar.h
-  qgsdecorationscalebardialog.h
-  qgsdecorationgrid.h
-  qgsdecorationgriddialog.h
   qgsdelattrdialog.h
   qgsdiagramproperties.h
   qgsdiscoverrelationsdlg.h
@@ -370,6 +360,18 @@ SET (QGIS_APP_MOC_HDRS
   qgsmaptoolregularpolygoncenterpoint.h
   qgsmaptoolregularpolygoncentercorner.h
 
+  decorations/qgsdecorationitem.h
+  decorations/qgsdecorationcopyright.h
+  decorations/qgsdecorationcopyrightdialog.h
+  decorations/qgsdecorationlayoutextent.h
+  decorations/qgsdecorationlayoutextentdialog.h
+  decorations/qgsdecorationnortharrow.h
+  decorations/qgsdecorationnortharrowdialog.h
+  decorations/qgsdecorationscalebar.h
+  decorations/qgsdecorationscalebardialog.h
+  decorations/qgsdecorationgrid.h
+  decorations/qgsdecorationgriddialog.h
+
   vertextool/qgsselectedfeature.h
   vertextool/qgsvertexeditor.h
   vertextool/qgsvertextool.h
@@ -632,6 +634,7 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_SOURCE_DIR}/external/nmea
 
   ${CMAKE_SOURCE_DIR}/src/app
+  ${CMAKE_SOURCE_DIR}/src/app/decorations
   ${CMAKE_SOURCE_DIR}/src/app/layout
   ${CMAKE_SOURCE_DIR}/src/app/pluginmanager
   ${CMAKE_SOURCE_DIR}/src/app/gps