sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-17 00:04:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Renamed removeAddLayer to removeAddLayerAction

Browse Source 
git-svn-id: http://svn.osgeo.org/qgis/trunk@15464 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
timlinux 2011-03-13 18:59:33 +00:00
parent d7ad3b0167
commit 9cca04da3e
10 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/gui/qgisinterface.sip
View File

@ -103,7 +103,7 @@ class QgisInterface : QObject
/** Remove "add layer" action from the layer menu /** Remove "add layer" action from the layer menu
* @note added in 1.7 * @note added in 1.7
*/ */
virtual void removeAddLayer( QAction* action )=0; virtual void removeAddLayerAction( QAction* action )=0;
/** Add action to the Database menu /** Add action to the Database menu
* @note added in 1.7 * @note added in 1.7

2
src/app/qgisapp.cpp
View File

@ -5304,7 +5304,7 @@ void QgisApp::insertAddLayerAction( QAction *action )
mLayerMenu->insertAction( mActionAddLayerSeparator, action ); mLayerMenu->insertAction( mActionAddLayerSeparator, action );
} }
void QgisApp::removeAddLayer( QAction *action ) void QgisApp::removeAddLayerAction( QAction *action )
{ {
mLayerMenu->removeAction( action ); mLayerMenu->removeAction( action );
} }

2
src/app/qgisapp.h
View File

@ -522,7 +522,7 @@ class QgisApp : public QMainWindow, private Ui::MainWindow
//! Add "add layer" action to layer menu //! Add "add layer" action to layer menu
void insertAddLayerAction( QAction* action ); void insertAddLayerAction( QAction* action );
//! Remove "add layer" action to layer menu //! Remove "add layer" action to layer menu
void removeAddLayer( QAction* action ); void removeAddLayerAction( QAction* action );
//! Add an icon to the plugin toolbar //! Add an icon to the plugin toolbar
int addPluginToolBarIcon( QAction * qAction ); int addPluginToolBarIcon( QAction * qAction );
//! Remove an icon from the plugin toolbar //! Remove an icon from the plugin toolbar

4
src/app/qgisappinterface.cpp
View File

@ -145,9 +145,9 @@ void QgisAppInterface::insertAddLayerAction( QAction *action )
qgis->insertAddLayerAction( action ); qgis->insertAddLayerAction( action );
} }
void QgisAppInterface::removeAddLayer( QAction *action ) void QgisAppInterface::removeAddLayerAction( QAction *action )
{ {
qgis->removeAddLayer( action ); qgis->removeAddLayerAction( action );
} }
void QgisAppInterface::removePluginMenu( QString name, QAction* action ) void QgisAppInterface::removePluginMenu( QString name, QAction* action )

2
src/app/qgisappinterface.h
View File

@ -120,7 +120,7 @@ class QgisAppInterface : public QgisInterface
/** Add "add layer" action to the layer menu */ /** Add "add layer" action to the layer menu */
void insertAddLayerAction( QAction *action ); void insertAddLayerAction( QAction *action );
/** remove "add layer" action from the layer menu */ /** remove "add layer" action from the layer menu */
void removeAddLayer( QAction *action ); void removeAddLayerAction( QAction *action );
/** Add a dock widget to the main window */ /** Add a dock widget to the main window */
void addDockWidget( Qt::DockWidgetArea area, QDockWidget * dockwidget ); void addDockWidget( Qt::DockWidgetArea area, QDockWidget * dockwidget );

2
src/gui/qgisinterface.h
View File

@ -144,7 +144,7 @@ class GUI_EXPORT QgisInterface : public QObject
/** Remove "add layer" action from layer menu /** Remove "add layer" action from layer menu
* @note added in 1.7 * @note added in 1.7
*/ */
virtual void removeAddLayer( QAction *action ) = 0; virtual void removeAddLayerAction( QAction *action ) = 0;
/** Add action to the Database menu /** Add action to the Database menu
* @note added in 1.7 * @note added in 1.7

2
src/plugins/delimited_text/qgsdelimitedtextplugin.cpp
View File

@ -143,7 +143,7 @@ void QgsDelimitedTextPlugin::drawVectorLayer( QString thePathNameQString,
void QgsDelimitedTextPlugin::unload() void QgsDelimitedTextPlugin::unload()
{ {
// remove the GUI // remove the GUI
qGisInterface->removeAddLayer( myQActionPointer ); qGisInterface->removeAddLayerAction( myQActionPointer );
qGisInterface->removeToolBarIcon( myQActionPointer ); qGisInterface->removeToolBarIcon( myQActionPointer );
delete myQActionPointer; delete myQActionPointer;
} }

2
src/plugins/oracle_raster/qgsoracle_plugin.cpp
View File

@ -90,7 +90,7 @@ void QgsOraclePlugin::unload()
{ {
// remove the GUI // remove the GUI
mQGisIface->removeToolBarIcon( mQActionPointer ); mQGisIface->removeToolBarIcon( mQActionPointer );
mQGisIface->removeAddLayer( mQActionPointer ); mQGisIface->removeAddLayerAction( mQActionPointer );
delete mQActionPointer; delete mQActionPointer;
} }

2
src/plugins/sqlanywhere/sqlanywhere.cpp
View File

@ -182,7 +182,7 @@ void SqlAnywhere::addSqlAnywhereLayer()
void SqlAnywhere::unload() void SqlAnywhere::unload()
{ {
// mQGisIface->removeToolBarIcon( mActionAddSqlAnywhereLayer ); // mQGisIface->removeToolBarIcon( mActionAddSqlAnywhereLayer );
mQGisIface->removeAddLayer( mActionAddSqlAnywhereLayer ); mQGisIface->removeAddLayerAction( mActionAddSqlAnywhereLayer );
delete mActionAddSqlAnywhereLayer; delete mActionAddSqlAnywhereLayer;
} }

2
src/plugins/wfs/qgswfsplugin.cpp
View File

@ -63,7 +63,7 @@ void QgsWFSPlugin::initGui()
void QgsWFSPlugin::unload() void QgsWFSPlugin::unload()
{ {
mIface->removeToolBarIcon( mWfsDialogAction ); mIface->removeToolBarIcon( mWfsDialogAction );
mIface->removeAddLayer( mWfsDialogAction ); mIface->removeAddLayerAction( mWfsDialogAction );
delete mWfsDialogAction; delete mWfsDialogAction;
mWfsDialogAction = 0; mWfsDialogAction = 0;
} }