Renamed removeAddLayer to removeAddLayerAction

timlinux · timlinux · commit cd835d76d5cf · 2011-03-13T18:59:33.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@15464 c8812cc2-4d05-0410-92ff-de0c093fc19c
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;
 }

Original file line number	Diff line number	Diff line change
`@@ -5304,7 +5304,7 @@ void QgisApp::insertAddLayerAction( QAction *action )`
`5304`	`5304`	`mLayerMenu->insertAction( mActionAddLayerSeparator, action );`
`5305`	`5305`	`}`
`5306`	`5306`
`5307`		`-void QgisApp::removeAddLayer( QAction *action )`
	`5307`	`+void QgisApp::removeAddLayerAction( QAction *action )`
`5308`	`5308`	`{`
`5309`	`5309`	`mLayerMenu->removeAction( action );`
`5310`	`5310`	`}`
Original file line number	Diff line number	Diff line change
`@@ -145,9 +145,9 @@ void QgisAppInterface::insertAddLayerAction( QAction *action )`
`145`	`145`	`qgis->insertAddLayerAction( action );`
`146`	`146`	`}`
`147`	`147`
`148`		`-void QgisAppInterface::removeAddLayer( QAction *action )`
	`148`	`+void QgisAppInterface::removeAddLayerAction( QAction *action )`
`149`	`149`	`{`
`150`		`- qgis->removeAddLayer( action );`
	`150`	`+ qgis->removeAddLayerAction( action );`
`151`	`151`	`}`
`152`	`152`
`153`	`153`	`void QgisAppInterface::removePluginMenu( QString name, QAction* action )`
Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ void QgsDelimitedTextPlugin::drawVectorLayer( QString thePathNameQString,`
`143`	`143`	`void QgsDelimitedTextPlugin::unload()`
`144`	`144`	`{`
`145`	`145`	`// remove the GUI`
`146`		`- qGisInterface->removeAddLayer( myQActionPointer );`
	`146`	`+ qGisInterface->removeAddLayerAction( myQActionPointer );`
`147`	`147`	`qGisInterface->removeToolBarIcon( myQActionPointer );`
`148`	`148`	`delete myQActionPointer;`
`149`	`149`	`}`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ void QgsOraclePlugin::unload()`
`90`	`90`	`{`
`91`	`91`	`// remove the GUI`
`92`	`92`	`mQGisIface->removeToolBarIcon( mQActionPointer );`
`93`		`- mQGisIface->removeAddLayer( mQActionPointer );`
	`93`	`+ mQGisIface->removeAddLayerAction( mQActionPointer );`
`94`	`94`	`delete mQActionPointer;`
`95`	`95`	`}`
`96`	`96`
Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ void SqlAnywhere::addSqlAnywhereLayer()`
`182`	`182`	`void SqlAnywhere::unload()`
`183`	`183`	`{`
`184`	`184`	`// mQGisIface->removeToolBarIcon( mActionAddSqlAnywhereLayer );`
`185`		`- mQGisIface->removeAddLayer( mActionAddSqlAnywhereLayer );`
	`185`	`+ mQGisIface->removeAddLayerAction( mActionAddSqlAnywhereLayer );`
`186`	`186`	`delete mActionAddSqlAnywhereLayer;`
`187`	`187`	`}`
`188`	`188`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ void QgsWFSPlugin::initGui()`
`63`	`63`	`void QgsWFSPlugin::unload()`
`64`	`64`	`{`
`65`	`65`	`mIface->removeToolBarIcon( mWfsDialogAction );`
`66`		`- mIface->removeAddLayer( mWfsDialogAction );`
	`66`	`+ mIface->removeAddLayerAction( mWfsDialogAction );`
`67`	`67`	`delete mWfsDialogAction;`
`68`	`68`	`mWfsDialogAction = 0;`
`69`	`69`	`}`