[Globe] Remove python bindings

qgis · May 30, 2016 · 2297ade · 2297ade
1 parent 0050262
commit 2297ade
Show file tree

Hide file tree

Showing 15 changed files with 0 additions and 318 deletions.
diff --git a/python/core/core.sip b/python/core/core.sip
@@ -104,7 +104,6 @@
 %Include qgsowsconnection.sip
 %Include qgspaintenginehack.sip
 %Include qgspallabeling.sip
-%Include qgsplugininterface.sip
 %Include qgspluginlayer.sip
 %Include qgspluginlayerregistry.sip
 %Include qgspoint.sip

diff --git a/python/core/qgsplugininterface.sip b/python/core/qgsplugininterface.sip
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -168,7 +168,6 @@ SET(QGIS_CORE_SRCS
   qgspallabeling.cpp
   qgspluginlayer.cpp
   qgspluginlayerregistry.cpp
-  qgsplugininterface.cpp
   qgspoint.cpp
   qgspointlocator.cpp
   qgsproject.cpp
@@ -482,7 +481,6 @@ SET(QGIS_CORE_MOC_HDRS
   qgsofflineediting.h
   qgsowsconnection.h
   qgspluginlayer.h
-  qgsplugininterface.h
   qgspointlocator.h
   qgsproject.h
   qgsrelationmanager.h

diff --git a/src/core/qgsplugininterface.cpp b/src/core/qgsplugininterface.cpp
diff --git a/src/core/qgsplugininterface.h b/src/core/qgsplugininterface.h
diff --git a/src/plugins/globe/CMakeLists.txt b/src/plugins/globe/CMakeLists.txt
@@ -12,7 +12,6 @@ SET (GLOBE_PLUGIN_SRCS
     globe_plugin.cpp
     qgsglobetilesource.cpp
     qgsglobeplugindialog.cpp
-    qgsglobeinterface.cpp
     qgsglobevectorlayerproperties.cpp
     qgsglobefeatureidentify.cpp
     qgsglobefrustumhighlight.cpp
@@ -27,14 +26,12 @@ SET (GLOBE_PLUGIN_UIS
 SET (GLOBE_PLUGIN_MOC_HDRS
     globe_plugin.h
     qgsglobeplugindialog.h
-    qgsglobeinterface.h
     qgsglobevectorlayerproperties.h
     qgsglobetilesource.h
     qgsglobewidget.h
 )
 
 SET (GLOBE_PLUGIN_HDRS
-    qgsglobeinterface.h
     qgsglobevectorlayerproperties.h
     qgsglobefeatureidentify.h
     qgsglobefrustumhighlight.h
@@ -92,11 +89,6 @@ TARGET_LINK_LIBRARIES(globeplugin
   ${OPENTHREADS_LIBRARY}
 )
 
-IF (WITH_BINDINGS)
-  # Restore default CXX flags (without visibility=hidden, which breaks python bindings)
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_OLD}")
-  ADD_SUBDIRECTORY(python)
-ENDIF (WITH_BINDINGS)
 ADD_SUBDIRECTORY(featuresource)
 
 ########################################################

diff --git a/src/plugins/globe/globe_plugin.cpp b/src/plugins/globe/globe_plugin.cpp
@@ -18,8 +18,6 @@
 
 // Include this first to avoid _POSIX_C_SOURCE redefined warnings
 // see http://bytes.com/topic/python/answers/30009-warning-_posix_c_source-redefined
-#include "qgsglobeinterface.h"
-
 #include "globe_plugin.h"
 #include "qgsglobeplugindialog.h"
 #include "qgsglobefeatureidentify.h"
@@ -238,7 +236,6 @@ GlobePlugin::GlobePlugin( QgisInterface* theQgisInterface )
     , mViewerWidget( 0 )
     , mDockWidget( 0 )
     , mSettingsDialog( 0 )
-    , mGlobeInterface( this )
     , mSelectedLat( 0. )
     , mSelectedLon( 0. )
     , mSelectedElevation( 0. )
@@ -1295,8 +1292,3 @@ QGISEXTERN void unload( QgisPlugin * thePluginPointer )
 {
   delete thePluginPointer;
 }
-
-QgsPluginInterface* GlobePlugin::pluginInterface()
-{
-  return &mGlobeInterface;
-}
diff --git a/src/plugins/globe/globe_plugin.h b/src/plugins/globe/globe_plugin.h
@@ -24,7 +24,6 @@
 #include <osg/ref_ptr>
 #include <osgEarth/Version>
 
-#include "qgsglobeinterface.h"
 #include "qgsglobeplugindialog.h"
 #include "qgsrectangle.h"
 
@@ -35,7 +34,6 @@ class QgsAnnotationItem;
 class QgsBillBoardItem;
 class QgsGlobeAnnotation;
 class QgsGlobeLayerPropertiesFactory;
-class QgsGlobeInterface;
 class QgsGlobePluginDialog;
 class QgsGlobeWidget;
 class QgsMapLayer;
@@ -85,8 +83,6 @@ class GLOBE_EXPORT GlobePlugin : public QObject, public QgisPlugin
     GlobePlugin( QgisInterface* theQgisInterface );
     ~GlobePlugin();
 
-    //! offer an interface for python plugins
-    virtual QgsPluginInterface* pluginInterface();
     //! init the gui
     virtual void initGui() override;
     //! unload the plugin
@@ -130,8 +126,6 @@ class GLOBE_EXPORT GlobePlugin : public QObject, public QgisPlugin
     osgEarth::QtGui::ViewerWidget* mViewerWidget;
     QgsGlobeWidget* mDockWidget;
     QgsGlobePluginDialog* mSettingsDialog;
-
-    QgsGlobeInterface mGlobeInterface;
     QString mBaseLayerUrl;
     QList<QgsGlobePluginDialog::LayerDataSource> mImagerySources;
     QList<QgsGlobePluginDialog::LayerDataSource> mElevationSources;

diff --git a/src/plugins/globe/python/CMakeLists.txt b/src/plugins/globe/python/CMakeLists.txt
diff --git a/src/plugins/globe/python/__init__.py b/src/plugins/globe/python/__init__.py
diff --git a/src/plugins/globe/python/globe.sip b/src/plugins/globe/python/globe.sip
diff --git a/src/plugins/globe/python/qgsglobefeatureutils.sip b/src/plugins/globe/python/qgsglobefeatureutils.sip
diff --git a/src/plugins/globe/python/qgsglobeinterface.sip b/src/plugins/globe/python/qgsglobeinterface.sip
diff --git a/src/plugins/globe/qgsglobeinterface.cpp b/src/plugins/globe/qgsglobeinterface.cpp