Skip to content
Permalink
Browse files

Renamed removeAddLayer to removeAddLayerAction

git-svn-id: http://svn.osgeo.org/qgis/trunk@15464 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
timlinux
timlinux committed Mar 13, 2011
1 parent d7ad3b0 commit 9cca04da3e81dd23a4e722eafb640284309c2621
@@ -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
@@ -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 );
}
@@ -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
@@ -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 )
@@ -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 );
@@ -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
@@ -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;
}
@@ -90,7 +90,7 @@ void QgsOraclePlugin::unload()
{
// remove the GUI
mQGisIface->removeToolBarIcon( mQActionPointer );
mQGisIface->removeAddLayer( mQActionPointer );
mQGisIface->removeAddLayerAction( mQActionPointer );
delete mQActionPointer;
}

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

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

0 comments on commit 9cca04d

Please sign in to comment.
You can’t perform that action at this time.