Skip to content

Commit 2297ade

Browse files
committed
[Globe] Remove python bindings
1 parent 0050262 commit 2297ade

15 files changed

+0
-318
lines changed

python/core/core.sip

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@
104104
%Include qgsowsconnection.sip
105105
%Include qgspaintenginehack.sip
106106
%Include qgspallabeling.sip
107-
%Include qgsplugininterface.sip
108107
%Include qgspluginlayer.sip
109108
%Include qgspluginlayerregistry.sip
110109
%Include qgspoint.sip

python/core/qgsplugininterface.sip

Lines changed: 0 additions & 28 deletions
This file was deleted.

src/core/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,6 @@ SET(QGIS_CORE_SRCS
168168
qgspallabeling.cpp
169169
qgspluginlayer.cpp
170170
qgspluginlayerregistry.cpp
171-
qgsplugininterface.cpp
172171
qgspoint.cpp
173172
qgspointlocator.cpp
174173
qgsproject.cpp
@@ -482,7 +481,6 @@ SET(QGIS_CORE_MOC_HDRS
482481
qgsofflineediting.h
483482
qgsowsconnection.h
484483
qgspluginlayer.h
485-
qgsplugininterface.h
486484
qgspointlocator.h
487485
qgsproject.h
488486
qgsrelationmanager.h

src/core/qgsplugininterface.cpp

Whitespace-only changes.

src/core/qgsplugininterface.h

Lines changed: 0 additions & 33 deletions
This file was deleted.

src/plugins/globe/CMakeLists.txt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ SET (GLOBE_PLUGIN_SRCS
1212
globe_plugin.cpp
1313
qgsglobetilesource.cpp
1414
qgsglobeplugindialog.cpp
15-
qgsglobeinterface.cpp
1615
qgsglobevectorlayerproperties.cpp
1716
qgsglobefeatureidentify.cpp
1817
qgsglobefrustumhighlight.cpp
@@ -27,14 +26,12 @@ SET (GLOBE_PLUGIN_UIS
2726
SET (GLOBE_PLUGIN_MOC_HDRS
2827
globe_plugin.h
2928
qgsglobeplugindialog.h
30-
qgsglobeinterface.h
3129
qgsglobevectorlayerproperties.h
3230
qgsglobetilesource.h
3331
qgsglobewidget.h
3432
)
3533

3634
SET (GLOBE_PLUGIN_HDRS
37-
qgsglobeinterface.h
3835
qgsglobevectorlayerproperties.h
3936
qgsglobefeatureidentify.h
4037
qgsglobefrustumhighlight.h
@@ -92,11 +89,6 @@ TARGET_LINK_LIBRARIES(globeplugin
9289
${OPENTHREADS_LIBRARY}
9390
)
9491

95-
IF (WITH_BINDINGS)
96-
# Restore default CXX flags (without visibility=hidden, which breaks python bindings)
97-
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_OLD}")
98-
ADD_SUBDIRECTORY(python)
99-
ENDIF (WITH_BINDINGS)
10092
ADD_SUBDIRECTORY(featuresource)
10193

10294
########################################################

src/plugins/globe/globe_plugin.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818

1919
// Include this first to avoid _POSIX_C_SOURCE redefined warnings
2020
// see http://bytes.com/topic/python/answers/30009-warning-_posix_c_source-redefined
21-
#include "qgsglobeinterface.h"
22-
2321
#include "globe_plugin.h"
2422
#include "qgsglobeplugindialog.h"
2523
#include "qgsglobefeatureidentify.h"
@@ -238,7 +236,6 @@ GlobePlugin::GlobePlugin( QgisInterface* theQgisInterface )
238236
, mViewerWidget( 0 )
239237
, mDockWidget( 0 )
240238
, mSettingsDialog( 0 )
241-
, mGlobeInterface( this )
242239
, mSelectedLat( 0. )
243240
, mSelectedLon( 0. )
244241
, mSelectedElevation( 0. )
@@ -1295,8 +1292,3 @@ QGISEXTERN void unload( QgisPlugin * thePluginPointer )
12951292
{
12961293
delete thePluginPointer;
12971294
}
1298-
1299-
QgsPluginInterface* GlobePlugin::pluginInterface()
1300-
{
1301-
return &mGlobeInterface;
1302-
}

src/plugins/globe/globe_plugin.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
#include <osg/ref_ptr>
2525
#include <osgEarth/Version>
2626

27-
#include "qgsglobeinterface.h"
2827
#include "qgsglobeplugindialog.h"
2928
#include "qgsrectangle.h"
3029

@@ -35,7 +34,6 @@ class QgsAnnotationItem;
3534
class QgsBillBoardItem;
3635
class QgsGlobeAnnotation;
3736
class QgsGlobeLayerPropertiesFactory;
38-
class QgsGlobeInterface;
3937
class QgsGlobePluginDialog;
4038
class QgsGlobeWidget;
4139
class QgsMapLayer;
@@ -85,8 +83,6 @@ class GLOBE_EXPORT GlobePlugin : public QObject, public QgisPlugin
8583
GlobePlugin( QgisInterface* theQgisInterface );
8684
~GlobePlugin();
8785

88-
//! offer an interface for python plugins
89-
virtual QgsPluginInterface* pluginInterface();
9086
//! init the gui
9187
virtual void initGui() override;
9288
//! unload the plugin
@@ -130,8 +126,6 @@ class GLOBE_EXPORT GlobePlugin : public QObject, public QgisPlugin
130126
osgEarth::QtGui::ViewerWidget* mViewerWidget;
131127
QgsGlobeWidget* mDockWidget;
132128
QgsGlobePluginDialog* mSettingsDialog;
133-
134-
QgsGlobeInterface mGlobeInterface;
135129
QString mBaseLayerUrl;
136130
QList<QgsGlobePluginDialog::LayerDataSource> mImagerySources;
137131
QList<QgsGlobePluginDialog::LayerDataSource> mElevationSources;

src/plugins/globe/python/CMakeLists.txt

Lines changed: 0 additions & 38 deletions
This file was deleted.

src/plugins/globe/python/__init__.py

Lines changed: 0 additions & 24 deletions
This file was deleted.

0 commit comments

Comments
 (0)