Renamed removeAddLayer to removeAddLayerAction

git-svn-id: http://svn.osgeo.org/qgis/trunk@15464 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Mar 13, 2011 · 9cca04d · 9cca04d
1 parent d7ad3b0
commit 9cca04d
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 11 deletions.
diff --git a/python/gui/qgisinterface.sip b/python/gui/qgisinterface.sip
@@ -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

diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -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 );
 }

diff --git a/src/app/qgisapp.h b/src/app/qgisapp.h
@@ -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

diff --git a/src/app/qgisappinterface.cpp b/src/app/qgisappinterface.cpp
@@ -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 )

diff --git a/src/app/qgisappinterface.h b/src/app/qgisappinterface.h
@@ -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 );

diff --git a/src/gui/qgisinterface.h b/src/gui/qgisinterface.h
@@ -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

diff --git a/src/plugins/delimited_text/qgsdelimitedtextplugin.cpp b/src/plugins/delimited_text/qgsdelimitedtextplugin.cpp
@@ -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;
 }

diff --git a/src/plugins/oracle_raster/qgsoracle_plugin.cpp b/src/plugins/oracle_raster/qgsoracle_plugin.cpp
@@ -90,7 +90,7 @@ void QgsOraclePlugin::unload()
 {
   // remove the GUI
   mQGisIface->removeToolBarIcon( mQActionPointer );
-  mQGisIface->removeAddLayer( mQActionPointer );
+  mQGisIface->removeAddLayerAction( mQActionPointer );
   delete mQActionPointer;
 }
 

diff --git a/src/plugins/sqlanywhere/sqlanywhere.cpp b/src/plugins/sqlanywhere/sqlanywhere.cpp
@@ -182,7 +182,7 @@ void SqlAnywhere::addSqlAnywhereLayer()
 void SqlAnywhere::unload()
 {
   // mQGisIface->removeToolBarIcon( mActionAddSqlAnywhereLayer );
-  mQGisIface->removeAddLayer( mActionAddSqlAnywhereLayer );
+  mQGisIface->removeAddLayerAction( mActionAddSqlAnywhereLayer );
   delete mActionAddSqlAnywhereLayer;
 }
 

diff --git a/src/plugins/wfs/qgswfsplugin.cpp b/src/plugins/wfs/qgswfsplugin.cpp
@@ -63,7 +63,7 @@ void QgsWFSPlugin::initGui()
 void QgsWFSPlugin::unload()
 {
   mIface->removeToolBarIcon( mWfsDialogAction );
-  mIface->removeAddLayer( mWfsDialogAction );
+  mIface->removeAddLayerAction( mWfsDialogAction );
   delete mWfsDialogAction;
   mWfsDialogAction = 0;
 }