Code shuffle

qgis · Jan 8, 2018 · 3d36653 · 3d36653
1 parent db90627
commit 3d36653
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/python/core/core_auto.sip b/python/core/core_auto.sip
@@ -358,7 +358,6 @@
 %Include annotations/qgshtmlannotation.sip
 %Include annotations/qgssvgannotation.sip
 %Include annotations/qgstextannotation.sip
-%Include composer/qgslayoutmanager.sip
 %Include locator/qgslocator.sip
 %Include locator/qgslocatorfilter.sip
 %Include locator/qgslocatormodel.sip
@@ -400,6 +399,7 @@
 %Include layout/qgslayoutitemscalebar.sip
 %Include layout/qgslayoutitemshape.sip
 %Include layout/qgslayoutitemtexttable.sip
+%Include layout/qgslayoutmanager.sip
 %Include layout/qgslayoutmodel.sip
 %Include layout/qgslayoutmultiframe.sip
 %Include layout/qgslayoutpagecollection.sip

diff --git a/python/core/composer/qgslayoutmanager.sip → python/core/layout/qgslayoutmanager.sip b/python/core/composer/qgslayoutmanager.sip → python/core/layout/qgslayoutmanager.sip
@@ -1,7 +1,7 @@
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *
- * src/core/composer/qgslayoutmanager.h                                 *
+ * src/core/layout/qgslayoutmanager.h                                   *
  *                                                                      *
  * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
  ************************************************************************/
@@ -184,7 +184,7 @@ Emitted when a layout is renamed
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *
- * src/core/composer/qgslayoutmanager.h                                 *
+ * src/core/layout/qgslayoutmanager.h                                   *
  *                                                                      *
  * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
  ************************************************************************/
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -356,7 +356,6 @@ SET(QGIS_CORE_SRCS
   composer/qgscomposerutils.cpp
   composer/qgscomposition.cpp
   composer/qgsgroupungroupitemscommand.cpp
-  composer/qgslayoutmanager.cpp
   composer/qgspaperitem.cpp
 
   dxf/qgsdxfexport.cpp
@@ -394,6 +393,7 @@ SET(QGIS_CORE_SRCS
   layout/qgslayoutitemshape.cpp
   layout/qgslayoutitemtexttable.cpp
   layout/qgslayoutitemundocommand.cpp
+  layout/qgslayoutmanager.cpp
   layout/qgslayoutmeasurement.cpp
   layout/qgslayoutmeasurementconverter.cpp
   layout/qgslayoutmodel.cpp
@@ -714,7 +714,6 @@ SET(QGIS_CORE_MOC_HDRS
   composer/qgscomposertexttable.h
   composer/qgscomposition.h
   composer/qgsgroupungroupitemscommand.h
-  composer/qgslayoutmanager.h
   composer/qgspaperitem.h
 
   locator/qgslocator.h
@@ -768,6 +767,7 @@ SET(QGIS_CORE_MOC_HDRS
   layout/qgslayoutitemscalebar.h
   layout/qgslayoutitemshape.h
   layout/qgslayoutitemtexttable.h
+  layout/qgslayoutmanager.h
   layout/qgslayoutmodel.h
   layout/qgslayoutmultiframe.h
   layout/qgslayoutpagecollection.h

diff --git a/src/core/composer/qgslayoutmanager.cpp → src/core/layout/qgslayoutmanager.cpp b/src/core/composer/qgslayoutmanager.cpp → src/core/layout/qgslayoutmanager.cpp
diff --git a/src/core/composer/qgslayoutmanager.h → src/core/layout/qgslayoutmanager.h b/src/core/composer/qgslayoutmanager.h → src/core/layout/qgslayoutmanager.h