[QGIS Commit] r15463 - 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 07:57:16 -0700 (Sun, 13 Mar 2011)
New Revision: 15463

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:
Replaced addAddLayer with insertAddLayerAction

Modified: trunk/qgis/python/gui/qgisinterface.sip
===================================================================
--- trunk/qgis/python/gui/qgisinterface.sip	2011-03-13 14:22:44 UTC (rev 15462)
+++ trunk/qgis/python/gui/qgisinterface.sip	2011-03-13 14:57:16 UTC (rev 15463)
@@ -98,7 +98,7 @@
     /** Add "add layer" action to the layer menu
      * @note added in 1.7
      */
-    virtual void addAddLayer( QAction* action )=0;
+    virtual void insertAddLayerAction( QAction* action )=0;
 
     /** Remove "add layer" action from the layer menu
      * @note added in 1.7

Modified: trunk/qgis/src/app/qgisapp.cpp
===================================================================
--- trunk/qgis/src/app/qgisapp.cpp	2011-03-13 14:22:44 UTC (rev 15462)
+++ trunk/qgis/src/app/qgisapp.cpp	2011-03-13 14:57:16 UTC (rev 15463)
@@ -5299,7 +5299,7 @@
   return menu;
 }
 
-void QgisApp::addAddLayer( QAction *action )
+void QgisApp::insertAddLayerAction( QAction *action )
 {
   mLayerMenu->insertAction( mActionAddLayerSeparator, action );
 }

Modified: trunk/qgis/src/app/qgisapp.h
===================================================================
--- trunk/qgis/src/app/qgisapp.h	2011-03-13 14:22:44 UTC (rev 15462)
+++ trunk/qgis/src/app/qgisapp.h	2011-03-13 14:57:16 UTC (rev 15463)
@@ -520,7 +520,7 @@
     //! Remove the action to the submenu with the given name under the Database menu
     void removePluginDatabaseMenu( QString name, QAction* action );
     //! Add "add layer" action to layer menu
-    void addAddLayer( QAction* action );
+    void insertAddLayerAction( QAction* action );
     //! Remove "add layer" action to layer menu
     void removeAddLayer( QAction* action );
     //! Add an icon to the plugin toolbar

Modified: trunk/qgis/src/app/qgisappinterface.cpp
===================================================================
--- trunk/qgis/src/app/qgisappinterface.cpp	2011-03-13 14:22:44 UTC (rev 15462)
+++ trunk/qgis/src/app/qgisappinterface.cpp	2011-03-13 14:57:16 UTC (rev 15463)
@@ -140,9 +140,9 @@
   qgis->addPluginToMenu( name, action );
 }
 
-void QgisAppInterface::addAddLayer( QAction *action )
+void QgisAppInterface::insertAddLayerAction( QAction *action )
 {
-  qgis->addAddLayer( action );
+  qgis->insertAddLayerAction( action );
 }
 
 void QgisAppInterface::removeAddLayer( QAction *action )

Modified: trunk/qgis/src/app/qgisappinterface.h
===================================================================
--- trunk/qgis/src/app/qgisappinterface.h	2011-03-13 14:22:44 UTC (rev 15462)
+++ trunk/qgis/src/app/qgisappinterface.h	2011-03-13 14:57:16 UTC (rev 15463)
@@ -118,7 +118,7 @@
     void removePluginDatabaseMenu( QString name, QAction* action );
 
     /** Add "add layer" action to the layer menu */
-    void addAddLayer( QAction *action );
+    void insertAddLayerAction( QAction *action );
     /** remove "add layer" action from the layer menu */
     void removeAddLayer( QAction *action );
 

Modified: trunk/qgis/src/gui/qgisinterface.h
===================================================================
--- trunk/qgis/src/gui/qgisinterface.h	2011-03-13 14:22:44 UTC (rev 15462)
+++ trunk/qgis/src/gui/qgisinterface.h	2011-03-13 14:57:16 UTC (rev 15463)
@@ -139,7 +139,7 @@
     /** Add "add layer" action to layer menu
      * @note added in 1.7
      */
-    virtual void addAddLayer( QAction *action ) = 0;
+    virtual void insertAddLayerAction( QAction *action ) = 0;
 
     /** Remove "add layer" action from layer 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:22:44 UTC (rev 15462)
+++ trunk/qgis/src/plugins/delimited_text/qgsdelimitedtextplugin.cpp	2011-03-13 14:57:16 UTC (rev 15463)
@@ -109,7 +109,7 @@
   connect( myQActionPointer, SIGNAL( triggered() ), this, SLOT( run() ) );
   // Add the icon to the toolbar
   qGisInterface->addToolBarIcon( myQActionPointer );
-  qGisInterface->addAddLayer( myQActionPointer );
+  qGisInterface->insertAddLayerAction( myQActionPointer );
   // this is called when the icon theme is changed
   connect( qGisInterface, SIGNAL( currentThemeChanged( QString ) ), this, SLOT( setCurrentTheme( QString ) ) );
 

Modified: trunk/qgis/src/plugins/oracle_raster/qgsoracle_plugin.cpp
===================================================================
--- trunk/qgis/src/plugins/oracle_raster/qgsoracle_plugin.cpp	2011-03-13 14:22:44 UTC (rev 15462)
+++ trunk/qgis/src/plugins/oracle_raster/qgsoracle_plugin.cpp	2011-03-13 14:57:16 UTC (rev 15463)
@@ -61,7 +61,7 @@
   connect( mQActionPointer, SIGNAL( triggered() ), this, SLOT( run() ) );
   // Add the icon to the toolbar
   mQGisIface->addToolBarIcon( mQActionPointer );
-  mQGisIface->addAddLayer( mQActionPointer );
+  mQGisIface->insertAddLayerAction( mQActionPointer );
 
 }
 //method defined in interface

Modified: trunk/qgis/src/plugins/sqlanywhere/sqlanywhere.cpp
===================================================================
--- trunk/qgis/src/plugins/sqlanywhere/sqlanywhere.cpp	2011-03-13 14:22:44 UTC (rev 15462)
+++ trunk/qgis/src/plugins/sqlanywhere/sqlanywhere.cpp	2011-03-13 14:57:16 UTC (rev 15463)
@@ -86,7 +86,7 @@
   // mQGisIface->addToolBarIcon( mActionAddSqlAnywhereLayer );
 
   // Also add to Layer menu
-  mQGisIface->addAddLayer( mActionAddSqlAnywhereLayer );
+  mQGisIface->insertAddLayerAction( mActionAddSqlAnywhereLayer );
 }
 
 //method defined in interface

Modified: trunk/qgis/src/plugins/wfs/qgswfsplugin.cpp
===================================================================
--- trunk/qgis/src/plugins/wfs/qgswfsplugin.cpp	2011-03-13 14:22:44 UTC (rev 15462)
+++ trunk/qgis/src/plugins/wfs/qgswfsplugin.cpp	2011-03-13 14:57:16 UTC (rev 15463)
@@ -54,7 +54,7 @@
     setCurrentTheme( "" );
     QObject::connect( mWfsDialogAction, SIGNAL( triggered() ), this, SLOT( showSourceDialog() ) );
     mIface->layerToolBar()->addAction( mWfsDialogAction );
-    mIface->addAddLayer( mWfsDialogAction );
+    mIface->insertAddLayerAction( mWfsDialogAction );
     // this is called when the icon theme is changed
     connect( mIface, SIGNAL( currentThemeChanged( QString ) ), this, SLOT( setCurrentTheme( QString ) ) );
   }