Drop composer from app

qgis · Jan 10, 2018 · b95363c · b95363c
1 parent d87c605
commit b95363c
Show file tree

Hide file tree

Showing 79 changed files with 10 additions and 29,778 deletions.
diff --git a/python/core/layout/qgslayoutmanager.sip b/python/core/layout/qgslayoutmanager.sip
@@ -117,12 +117,6 @@ Returns true if save was successful.
 Duplicates an existing ``layout`` from the manager. The new
 layout will automatically be stored in the manager.
 Returns new the layout if duplication was successful.
-%End
-
-    QString generateUniqueComposerTitle() const;
-%Docstring
-Generates a unique title for a new composition, which does not
-clash with any already contained by the manager.
 %End
 
     QString generateUniqueTitle( QgsMasterLayoutInterface::Type type = QgsMasterLayoutInterface::PrintLayout ) const;
@@ -133,47 +127,26 @@ clash with any already contained by the manager.
 
   signals:
 
-    void compositionAboutToBeAdded( const QString &name );
-%Docstring
-Emitted when a composition is about to be added to the manager
-%End
-
     void layoutAboutToBeAdded( const QString &name );
 %Docstring
 Emitted when a layout is about to be added to the manager
-%End
-
-    void compositionAdded( const QString &name );
-%Docstring
-Emitted when a composition has been added to the manager
 %End
 
     void layoutAdded( const QString &name );
 %Docstring
 Emitted when a layout has been added to the manager
-%End
-
-    void compositionRemoved( const QString &name );
-%Docstring
-Emitted when a composition was removed from the manager
 %End
 
     void layoutRemoved( const QString &name );
 %Docstring
 Emitted when a layout was removed from the manager
-%End
-
-    void compositionAboutToBeRemoved( const QString &name );
-%Docstring
-Emitted when a composition is about to be removed from the manager
 %End
 
     void layoutAboutToBeRemoved( const QString &name );
 %Docstring
 Emitted when a layout is about to be removed from the manager
 %End
 
-
     void layoutRenamed( QgsMasterLayoutInterface *layout, const QString &newName );
 %Docstring
 Emitted when a layout is renamed

diff --git a/python/core/layout/qgsmasterlayoutinterface.sip b/python/core/layout/qgsmasterlayoutinterface.sip
@@ -7,6 +7,7 @@
  ************************************************************************/
 
 
+
 %ModuleHeaderCode
 #include "qgsprintlayout.h"
 #include "qgsreport.h"

diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
@@ -157,28 +157,6 @@ SET(QGIS_APP_SRCS
   qgsmaptoolregularpolygoncenterpoint.cpp
   qgsmaptoolregularpolygoncentercorner.cpp
 
-  composer/qgsattributeselectiondialog.cpp
-  composer/qgscomposer.cpp
-  composer/qgscomposerarrowwidget.cpp
-  composer/qgscomposerattributetablewidget.cpp
-  composer/qgscomposerhtmlwidget.cpp
-  composer/qgscomposerimageexportoptionsdialog.cpp
-  composer/qgscomposeritemwidget.cpp
-  composer/qgscomposerlabelwidget.cpp
-  composer/qgscomposerpicturewidget.cpp
-  composer/qgscomposermanager.cpp
-  composer/qgscomposermapgridwidget.cpp
-  composer/qgscomposermapwidget.cpp
-  composer/qgscomposerscalebarwidget.cpp
-  composer/qgscomposershapewidget.cpp
-  composer/qgscomposerpolygonwidget.cpp
-  composer/qgscomposerpolylinewidget.cpp
-  composer/qgscomposertablebackgroundcolorsdialog.cpp
-  composer/qgscomposerlegendlayersdialog.cpp
-  composer/qgscomposerlegendwidget.cpp
-  composer/qgscompositionwidget.cpp
-  composer/qgsatlascompositionwidget.cpp
-
   layout/qgslayoutaddpagesdialog.cpp
   layout/qgslayoutapputils.cpp
   layout/qgslayoutatlaswidget.cpp
@@ -383,28 +361,6 @@ SET (QGIS_APP_MOC_HDRS
   qgsmapthemes.h
   qgshandlebadlayers.h
 
-  composer/qgsattributeselectiondialog.h
-  composer/qgscomposer.h
-  composer/qgscomposerarrowwidget.h
-  composer/qgscomposerattributetablewidget.h
-  composer/qgscomposerhtmlwidget.h
-  composer/qgscomposerimageexportoptionsdialog.h
-  composer/qgscomposeritemwidget.h
-  composer/qgscomposerlabelwidget.h
-  composer/qgscomposerlegendwidget.h
-  composer/qgscomposerlegendlayersdialog.h
-  composer/qgscomposermanager.h
-  composer/qgscomposermapgridwidget.h
-  composer/qgscomposermapwidget.h
-  composer/qgscomposerpicturewidget.h
-  composer/qgscomposerscalebarwidget.h
-  composer/qgscomposertablebackgroundcolorsdialog.h
-  composer/qgscomposershapewidget.h
-  composer/qgscomposerpolygonwidget.h
-  composer/qgscomposerpolylinewidget.h
-  composer/qgscompositionwidget.h
-  composer/qgsatlascompositionwidget.h
-
   layout/qgslayoutaddpagesdialog.h
   layout/qgslayoutappmenuprovider.h
   layout/qgslayoutatlaswidget.h
@@ -610,7 +566,6 @@ ENDIF(MSVC)
 
 INCLUDE_DIRECTORIES(
   ${CMAKE_SOURCE_DIR}/src/app
-  ${CMAKE_SOURCE_DIR}/src/app/composer
   ${CMAKE_SOURCE_DIR}/src/app/layout
   ${CMAKE_SOURCE_DIR}/src/app/pluginmanager
   ${CMAKE_SOURCE_DIR}/src/app/gps
@@ -621,9 +576,9 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_SOURCE_DIR}/src/core
   ${CMAKE_SOURCE_DIR}/src/core/annotations
   ${CMAKE_SOURCE_DIR}/src/core/auth
+  ${CMAKE_SOURCE_DIR}/src/core/composer
   ${CMAKE_SOURCE_DIR}/src/core/expression
   ${CMAKE_SOURCE_DIR}/src/core/gps
-  ${CMAKE_SOURCE_DIR}/src/core/composer
   ${CMAKE_SOURCE_DIR}/src/core/dxf
   ${CMAKE_SOURCE_DIR}/src/core/geometry
   ${CMAKE_SOURCE_DIR}/src/core/geocms/geonode
@@ -681,8 +636,8 @@ INCLUDE_DIRECTORIES(
   ../core
   ../core/annotations
   ../core/auth
-  ../core/gps
   ../core/composer
+  ../core/gps
   ../core/dxf
   ../core/geometry
   ../core/geocms/geonode
@@ -747,7 +702,7 @@ ELSE (ANDROID)
 ENDIF (ANDROID)
 
 # Putting IMAGE_RCC_SRCS into qgis_app lib is causing problems when the lib is
-# loaded (by plugin for example) in test unit (qgis_composerpicturetest).
+# loaded (by plugin for example) in test unit (qgis_layoutpicturetest).
 ADD_LIBRARY(qgis_app SHARED ${QGIS_APP_SRCS} ${QGIS_APP_MOC_SRCS} ${QGIS_APP_HDRS} ${QGIS_APP_MOC_HDRS})
 
 TARGET_LINK_LIBRARIES(qgis_app