Remove QgsBillboardRegistry

qgis · Jun 3, 2016 · bded2b5 · bded2b5
1 parent 6a46e71
commit bded2b5
Show file tree

Hide file tree

Showing 10 changed files with 0 additions and 304 deletions.
diff --git a/python/core/core.sip b/python/core/core.sip
@@ -24,7 +24,6 @@
 %Include qgsaggregatecalculator.sip
 %Include qgsattributeaction.sip
 %Include qgsattributetableconfig.sip
-%Include qgsbillboardregistry.sip
 %Include qgsbrowsermodel.sip
 %Include qgsclipper.sip
 %Include qgscolorscheme.sip

diff --git a/python/core/qgsbillboardregistry.sip b/python/core/qgsbillboardregistry.sip
diff --git a/python/core/qgsproject.sip b/python/core/qgsproject.sip
@@ -275,11 +275,6 @@ class QgsProject : QObject
 
     QgsRelationManager* relationManager() const;
 
-    /** Return the project's billboard manager instance pointer
-     * @note added in QGIS 2.16
-     */
-    QgsBillBoardRegistry* billboardRegistry() const;
-
     /** Return pointer to the root (invisible) node of the project's layer tree
      * @note added in 2.4
      */

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -81,7 +81,6 @@ SET(QGIS_CORE_SRCS
   qgsactionmanager.cpp
   qgsaggregatecalculator.cpp
   qgsattributetableconfig.cpp
-  qgsbillboardregistry.cpp
   qgsbrowsermodel.cpp
   qgscachedfeatureiterator.cpp
   qgscacheindex.cpp
@@ -452,7 +451,6 @@ ENDIF(NOT MSVC)
 
 SET(QGIS_CORE_MOC_HDRS
   qgsapplication.h
-  qgsbillboardregistry.h
   qgsbrowsermodel.h
   qgscontexthelp.h
   qgscoordinatetransform.h

diff --git a/src/core/qgsbillboardregistry.cpp b/src/core/qgsbillboardregistry.cpp
diff --git a/src/core/qgsbillboardregistry.h b/src/core/qgsbillboardregistry.h
diff --git a/src/core/qgsproject.cpp b/src/core/qgsproject.cpp
@@ -17,7 +17,6 @@
 
 #include "qgsproject.h"
 
-#include "qgsbillboardregistry.h"
 #include "qgsdatasourceuri.h"
 #include "qgsexception.h"
 #include "qgslayertree.h"
@@ -366,7 +365,6 @@ QgsProject::QgsProject()
     , mBadLayerHandler( new QgsProjectBadLayerDefaultHandler() )
     , mRelationManager( new QgsRelationManager( this ) )
     , mRootGroup( new QgsLayerTreeGroup )
-    , mBillboardRegistry( new QgsBillBoardRegistry( this ) )
 {
   clear();
 
@@ -385,7 +383,6 @@ QgsProject::~QgsProject()
   delete mBadLayerHandler;
   delete mRelationManager;
   delete mRootGroup;
-  delete mBillboardRegistry;
 
   // note that QScopedPointer automatically deletes imp_ when it's destroyed
 } // QgsProject dtor

diff --git a/src/core/qgsproject.h b/src/core/qgsproject.h
@@ -41,7 +41,6 @@ class QDomDocument;
 class QDomElement;
 class QDomNode;
 
-class QgsBillBoardRegistry;
 class QgsLayerTreeGroup;
 class QgsLayerTreeRegistryBridge;
 class QgsMapLayer;
@@ -317,11 +316,6 @@ class CORE_EXPORT QgsProject : public QObject
 
     QgsRelationManager* relationManager() const;
 
-    /** Return the project's billboard manager instance pointer
-     * @note added in QGIS 2.16
-     */
-    QgsBillBoardRegistry* billboardRegistry() const { return mBillboardRegistry; }
-
     /** Return pointer to the root (invisible) node of the project's layer tree
      * @note added in 2.4
      */
@@ -512,8 +506,6 @@ class CORE_EXPORT QgsProject : public QObject
 
     QgsLayerTreeRegistryBridge* mLayerTreeRegistryBridge;
 
-    QgsBillBoardRegistry* mBillboardRegistry;
-
     //! map of transaction group: QPair( providerKey, connString ) -> transactionGroup
     QMap< QPair< QString, QString>, QgsTransactionGroup*> mTransactionGroups;