Skip to content
Permalink
Browse files
Replaced QgisAppInterface::getToolBox() with QgisAppInterface::addDoc…
…kWidget and updated dependent code & python bindings. Note you may need to do a clean build after this commit for python bindings to build ok. The toolbox was removed in 0.11.0 and so the old getToolBox call was broken - this provides a replacement for that functionality.

git-svn-id: http://svn.osgeo.org/qgis/trunk@8774 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
timlinux committed Jul 14, 2008
1 parent 3099a5b commit 3c13ecf648ba7835243a0cec36babce3e7843535
Showing with 9 additions and 9 deletions.
  1. +2 −2 python/gui/qgisinterface.sip
  2. +2 −2 src/app/qgisappinterface.cpp
  3. +2 −2 src/app/qgisappinterface.h
  4. +3 −3 src/gui/qgisinterface.h
@@ -82,8 +82,8 @@ class QgisInterface : QObject
/** Remove action from the plugins menu */
virtual void removePluginMenu(QString name, QAction* action)=0;

/** Return a pointer to the toolbox (where additional pages can be inserted) */
virtual QToolBox* getToolBox()=0;
/** Add a dock widget to the main window */
virtual void addDockWidget ( Qt::DockWidgetArea area, QDockWidget * dockwidget );=0;

/** refresh legend of a layer */
virtual void refreshLegend( QgsMapLayer * layer )=0;
@@ -141,9 +141,9 @@ QWidget * QgisAppInterface::getMainWindow()
return qgis;
}

QToolBox* QgisAppInterface::getToolBox()
void QgisAppInterface::addDockWidget ( Qt::DockWidgetArea area, QDockWidget * dockwidget )
{
return NULL;
qgis->addDockWidget ( area, dockwidget );
}

void QgisAppInterface::refreshLegend(QgsMapLayer *l)
@@ -101,8 +101,8 @@ class QgisAppInterface : public QgisInterface
/** Remove action from the plugins menu */
void removePluginMenu(QString name, QAction* action);

/** Return a pointer to the toolbox (where additional pages can be inserted) */
virtual QToolBox* getToolBox();
/** Add a dock widget to the main window */
void addDockWidget ( Qt::DockWidgetArea area, QDockWidget * dockwidget );

virtual void refreshLegend(QgsMapLayer *l);

@@ -22,7 +22,7 @@
class QAction;
class QMenu;
class QToolBar;
class QToolBox;
class QDockWidget;
class QWidget;
#include <QObject>

@@ -115,8 +115,8 @@ class GUI_EXPORT QgisInterface : public QObject
/** Remove action from the plugins menu */
virtual void removePluginMenu(QString name, QAction* action)=0;

/** Return a pointer to the toolbox (where additional pages can be inserted) */
virtual QToolBox* getToolBox()=0;
/** Add a dock widget to the main window */
virtual void addDockWidget ( Qt::DockWidgetArea area, QDockWidget * dockwidget )=0;

/** refresh the legend of a layer */
virtual void refreshLegend(QgsMapLayer *l)=0;

0 comments on commit 3c13ecf

Please sign in to comment.