Skip to content

Commit

Permalink
Renamed removeAddLayer to removeAddLayerAction
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@15464 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
timlinux committed Mar 13, 2011
1 parent 68ffc9c commit cd835d7
Show file tree
Hide file tree
Showing 10 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion python/gui/qgisinterface.sip
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ class QgisInterface : QObject
/** Remove "add layer" action from the layer menu
* @note added in 1.7
*/
virtual void removeAddLayer( QAction* action )=0;
virtual void removeAddLayerAction( QAction* action )=0;

/** Add action to the Database menu
* @note added in 1.7
Expand Down
2 changes: 1 addition & 1 deletion src/app/qgisapp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5304,7 +5304,7 @@ void QgisApp::insertAddLayerAction( QAction *action )
mLayerMenu->insertAction( mActionAddLayerSeparator, action );
}

void QgisApp::removeAddLayer( QAction *action )
void QgisApp::removeAddLayerAction( QAction *action )
{
mLayerMenu->removeAction( action );
}
Expand Down
2 changes: 1 addition & 1 deletion src/app/qgisapp.h
Original file line number Diff line number Diff line change
Expand Up @@ -522,7 +522,7 @@ class QgisApp : public QMainWindow, private Ui::MainWindow
//! Add "add layer" action to layer menu
void insertAddLayerAction( QAction* action );
//! Remove "add layer" action to layer menu
void removeAddLayer( QAction* action );
void removeAddLayerAction( QAction* action );
//! Add an icon to the plugin toolbar
int addPluginToolBarIcon( QAction * qAction );
//! Remove an icon from the plugin toolbar
Expand Down
4 changes: 2 additions & 2 deletions src/app/qgisappinterface.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -145,9 +145,9 @@ void QgisAppInterface::insertAddLayerAction( QAction *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 )
Expand Down
2 changes: 1 addition & 1 deletion src/app/qgisappinterface.h
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ class QgisAppInterface : public QgisInterface
/** Add "add layer" action to the layer menu */
void insertAddLayerAction( QAction *action );
/** remove "add layer" action from the layer menu */
void removeAddLayer( QAction *action );
void removeAddLayerAction( QAction *action );

/** Add a dock widget to the main window */
void addDockWidget( Qt::DockWidgetArea area, QDockWidget * dockwidget );
Expand Down
2 changes: 1 addition & 1 deletion src/gui/qgisinterface.h
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ class GUI_EXPORT QgisInterface : public QObject
/** Remove "add layer" action from layer menu
* @note added in 1.7
*/
virtual void removeAddLayer( QAction *action ) = 0;
virtual void removeAddLayerAction( QAction *action ) = 0;

/** Add action to the Database menu
* @note added in 1.7
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/delimited_text/qgsdelimitedtextplugin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ void QgsDelimitedTextPlugin::drawVectorLayer( QString thePathNameQString,
void QgsDelimitedTextPlugin::unload()
{
// remove the GUI
qGisInterface->removeAddLayer( myQActionPointer );
qGisInterface->removeAddLayerAction( myQActionPointer );
qGisInterface->removeToolBarIcon( myQActionPointer );
delete myQActionPointer;
}
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/oracle_raster/qgsoracle_plugin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ void QgsOraclePlugin::unload()
{
// remove the GUI
mQGisIface->removeToolBarIcon( mQActionPointer );
mQGisIface->removeAddLayer( mQActionPointer );
mQGisIface->removeAddLayerAction( mQActionPointer );
delete mQActionPointer;
}

Expand Down
2 changes: 1 addition & 1 deletion src/plugins/sqlanywhere/sqlanywhere.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ void SqlAnywhere::addSqlAnywhereLayer()
void SqlAnywhere::unload()
{
// mQGisIface->removeToolBarIcon( mActionAddSqlAnywhereLayer );
mQGisIface->removeAddLayer( mActionAddSqlAnywhereLayer );
mQGisIface->removeAddLayerAction( mActionAddSqlAnywhereLayer );
delete mActionAddSqlAnywhereLayer;
}

Expand Down
2 changes: 1 addition & 1 deletion src/plugins/wfs/qgswfsplugin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ void QgsWFSPlugin::initGui()
void QgsWFSPlugin::unload()
{
mIface->removeToolBarIcon( mWfsDialogAction );
mIface->removeAddLayer( mWfsDialogAction );
mIface->removeAddLayerAction( mWfsDialogAction );
delete mWfsDialogAction;
mWfsDialogAction = 0;
}
Expand Down

0 comments on commit cd835d7

Please sign in to comment.