Skip to content

Commit

Permalink
Remove QgsBillboardRegistry
Browse files Browse the repository at this point in the history
  • Loading branch information
manisandro committed Jun 3, 2016
1 parent 6a46e71 commit bded2b5
Show file tree
Hide file tree
Showing 10 changed files with 0 additions and 304 deletions.
1 change: 0 additions & 1 deletion python/core/core.sip
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
71 changes: 0 additions & 71 deletions python/core/qgsbillboardregistry.sip

This file was deleted.

5 changes: 0 additions & 5 deletions python/core/qgsproject.sip
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
Expand Down
2 changes: 0 additions & 2 deletions src/core/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ SET(QGIS_CORE_SRCS
qgsactionmanager.cpp
qgsaggregatecalculator.cpp
qgsattributetableconfig.cpp
qgsbillboardregistry.cpp
qgsbrowsermodel.cpp
qgscachedfeatureiterator.cpp
qgscacheindex.cpp
Expand Down Expand Up @@ -452,7 +451,6 @@ ENDIF(NOT MSVC)

SET(QGIS_CORE_MOC_HDRS
qgsapplication.h
qgsbillboardregistry.h
qgsbrowsermodel.h
qgscontexthelp.h
qgscoordinatetransform.h
Expand Down
47 changes: 0 additions & 47 deletions src/core/qgsbillboardregistry.cpp

This file was deleted.

97 changes: 0 additions & 97 deletions src/core/qgsbillboardregistry.h

This file was deleted.

3 changes: 0 additions & 3 deletions src/core/qgsproject.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

#include "qgsproject.h"

#include "qgsbillboardregistry.h"
#include "qgsdatasourceuri.h"
#include "qgsexception.h"
#include "qgslayertree.h"
Expand Down Expand Up @@ -366,7 +365,6 @@ QgsProject::QgsProject()
, mBadLayerHandler( new QgsProjectBadLayerDefaultHandler() )
, mRelationManager( new QgsRelationManager( this ) )
, mRootGroup( new QgsLayerTreeGroup )
, mBillboardRegistry( new QgsBillBoardRegistry( this ) )
{
clear();

Expand All @@ -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
Expand Down
8 changes: 0 additions & 8 deletions src/core/qgsproject.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ class QDomDocument;
class QDomElement;
class QDomNode;

class QgsBillBoardRegistry;
class QgsLayerTreeGroup;
class QgsLayerTreeRegistryBridge;
class QgsMapLayer;
Expand Down Expand Up @@ -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
*/
Expand Down Expand Up @@ -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;

Expand Down
Loading

0 comments on commit bded2b5

Please sign in to comment.