[QGIS Commit] r15464 - in trunk/qgis: python/gui src/app src/gui src/plugins/delimited_text src/plugins/oracle_raster src/plugins/sqlanywhere src/plugins/wfs

[svn_qgis at osgeo.org]

Author: timlinux
Date: 2011-03-13 11:59:33 -0700 (Sun, 13 Mar 2011)
New Revision: 15464

Modified:
   trunk/qgis/python/gui/qgisinterface.sip
   trunk/qgis/src/app/qgisapp.cpp
   trunk/qgis/src/app/qgisapp.h
   trunk/qgis/src/app/qgisappinterface.cpp
   trunk/qgis/src/app/qgisappinterface.h
   trunk/qgis/src/gui/qgisinterface.h
   trunk/qgis/src/plugins/delimited_text/qgsdelimitedtextplugin.cpp
   trunk/qgis/src/plugins/oracle_raster/qgsoracle_plugin.cpp
   trunk/qgis/src/plugins/sqlanywhere/sqlanywhere.cpp
   trunk/qgis/src/plugins/wfs/qgswfsplugin.cpp
Log:
Renamed removeAddLayer to removeAddLayerAction

Modified: trunk/qgis/python/gui/qgisinterface.sip
===================================================================
--- trunk/qgis/python/gui/qgisinterface.sip	2011-03-13 14:57:16 UTC (rev 15463)
+++ trunk/qgis/python/gui/qgisinterface.sip	2011-03-13 18:59:33 UTC (rev 15464)
@@ -103,7 +103,7 @@
     /** 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

Modified: trunk/qgis/src/app/qgisapp.cpp
===================================================================
--- trunk/qgis/src/app/qgisapp.cpp	2011-03-13 14:57:16 UTC (rev 15463)
+++ trunk/qgis/src/app/qgisapp.cpp	2011-03-13 18:59:33 UTC (rev 15464)
@@ -5304,7 +5304,7 @@
   mLayerMenu->insertAction( mActionAddLayerSeparator, action );
 }
 
-void QgisApp::removeAddLayer( QAction *action )
+void QgisApp::removeAddLayerAction( QAction *action )
 {
   mLayerMenu->removeAction( action );
 }

Modified: trunk/qgis/src/app/qgisapp.h
===================================================================
--- trunk/qgis/src/app/qgisapp.h	2011-03-13 14:57:16 UTC (rev 15463)
+++ trunk/qgis/src/app/qgisapp.h	2011-03-13 18:59:33 UTC (rev 15464)
@@ -522,7 +522,7 @@
     //! 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

Modified: trunk/qgis/src/app/qgisappinterface.cpp
===================================================================
--- trunk/qgis/src/app/qgisappinterface.cpp	2011-03-13 14:57:16 UTC (rev 15463)
+++ trunk/qgis/src/app/qgisappinterface.cpp	2011-03-13 18:59:33 UTC (rev 15464)
@@ -145,9 +145,9 @@
   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 )

Modified: trunk/qgis/src/app/qgisappinterface.h
===================================================================
--- trunk/qgis/src/app/qgisappinterface.h	2011-03-13 14:57:16 UTC (rev 15463)
+++ trunk/qgis/src/app/qgisappinterface.h	2011-03-13 18:59:33 UTC (rev 15464)
@@ -120,7 +120,7 @@
     /** 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 );

Modified: trunk/qgis/src/gui/qgisinterface.h
===================================================================
--- trunk/qgis/src/gui/qgisinterface.h	2011-03-13 14:57:16 UTC (rev 15463)
+++ trunk/qgis/src/gui/qgisinterface.h	2011-03-13 18:59:33 UTC (rev 15464)
@@ -144,7 +144,7 @@
     /** 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

Modified: trunk/qgis/src/plugins/delimited_text/qgsdelimitedtextplugin.cpp
===================================================================
--- trunk/qgis/src/plugins/delimited_text/qgsdelimitedtextplugin.cpp	2011-03-13 14:57:16 UTC (rev 15463)
+++ trunk/qgis/src/plugins/delimited_text/qgsdelimitedtextplugin.cpp	2011-03-13 18:59:33 UTC (rev 15464)
@@ -143,7 +143,7 @@
 void QgsDelimitedTextPlugin::unload()
 {
   // remove the GUI
-  qGisInterface->removeAddLayer( myQActionPointer );
+  qGisInterface->removeAddLayerAction( myQActionPointer );
   qGisInterface->removeToolBarIcon( myQActionPointer );
   delete myQActionPointer;
 }

Modified: trunk/qgis/src/plugins/oracle_raster/qgsoracle_plugin.cpp
===================================================================
--- trunk/qgis/src/plugins/oracle_raster/qgsoracle_plugin.cpp	2011-03-13 14:57:16 UTC (rev 15463)
+++ trunk/qgis/src/plugins/oracle_raster/qgsoracle_plugin.cpp	2011-03-13 18:59:33 UTC (rev 15464)
@@ -90,7 +90,7 @@
 {
   // remove the GUI
   mQGisIface->removeToolBarIcon( mQActionPointer );
-  mQGisIface->removeAddLayer( mQActionPointer );
+  mQGisIface->removeAddLayerAction( mQActionPointer );
   delete mQActionPointer;
 }
 

Modified: trunk/qgis/src/plugins/sqlanywhere/sqlanywhere.cpp
===================================================================
--- trunk/qgis/src/plugins/sqlanywhere/sqlanywhere.cpp	2011-03-13 14:57:16 UTC (rev 15463)
+++ trunk/qgis/src/plugins/sqlanywhere/sqlanywhere.cpp	2011-03-13 18:59:33 UTC (rev 15464)
@@ -182,7 +182,7 @@
 void SqlAnywhere::unload()
 {
   // mQGisIface->removeToolBarIcon( mActionAddSqlAnywhereLayer );
-  mQGisIface->removeAddLayer( mActionAddSqlAnywhereLayer );
+  mQGisIface->removeAddLayerAction( mActionAddSqlAnywhereLayer );
   delete mActionAddSqlAnywhereLayer;
 }
 

Modified: trunk/qgis/src/plugins/wfs/qgswfsplugin.cpp
===================================================================
--- trunk/qgis/src/plugins/wfs/qgswfsplugin.cpp	2011-03-13 14:57:16 UTC (rev 15463)
+++ trunk/qgis/src/plugins/wfs/qgswfsplugin.cpp	2011-03-13 18:59:33 UTC (rev 15464)
@@ -63,7 +63,7 @@
 void QgsWFSPlugin::unload()
 {
   mIface->removeToolBarIcon( mWfsDialogAction );
-  mIface->removeAddLayer( mWfsDialogAction );
+  mIface->removeAddLayerAction( mWfsDialogAction );
   delete mWfsDialogAction;
   mWfsDialogAction = 0;
 }