Skip to content

Commit 68ffc9c

Browse files
author
timlinux
committed
Replaced addAddLayer with insertAddLayerAction
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@15463 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent dc7538b commit 68ffc9c

File tree

10 files changed

+11
-11
lines changed

10 files changed

+11
-11
lines changed

python/gui/qgisinterface.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ class QgisInterface : QObject
9898
/** Add "add layer" action to the layer menu
9999
* @note added in 1.7
100100
*/
101-
virtual void addAddLayer( QAction* action )=0;
101+
virtual void insertAddLayerAction( QAction* action )=0;
102102

103103
/** Remove "add layer" action from the layer menu
104104
* @note added in 1.7

src/app/qgisapp.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -5299,7 +5299,7 @@ QMenu* QgisApp::getDatabaseMenu( QString menuName )
52995299
return menu;
53005300
}
53015301

5302-
void QgisApp::addAddLayer( QAction *action )
5302+
void QgisApp::insertAddLayerAction( QAction *action )
53035303
{
53045304
mLayerMenu->insertAction( mActionAddLayerSeparator, action );
53055305
}

src/app/qgisapp.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -520,7 +520,7 @@ class QgisApp : public QMainWindow, private Ui::MainWindow
520520
//! Remove the action to the submenu with the given name under the Database menu
521521
void removePluginDatabaseMenu( QString name, QAction* action );
522522
//! Add "add layer" action to layer menu
523-
void addAddLayer( QAction* action );
523+
void insertAddLayerAction( QAction* action );
524524
//! Remove "add layer" action to layer menu
525525
void removeAddLayer( QAction* action );
526526
//! Add an icon to the plugin toolbar

src/app/qgisappinterface.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -140,9 +140,9 @@ void QgisAppInterface::addPluginToMenu( QString name, QAction* action )
140140
qgis->addPluginToMenu( name, action );
141141
}
142142

143-
void QgisAppInterface::addAddLayer( QAction *action )
143+
void QgisAppInterface::insertAddLayerAction( QAction *action )
144144
{
145-
qgis->addAddLayer( action );
145+
qgis->insertAddLayerAction( action );
146146
}
147147

148148
void QgisAppInterface::removeAddLayer( QAction *action )

src/app/qgisappinterface.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ class QgisAppInterface : public QgisInterface
118118
void removePluginDatabaseMenu( QString name, QAction* action );
119119

120120
/** Add "add layer" action to the layer menu */
121-
void addAddLayer( QAction *action );
121+
void insertAddLayerAction( QAction *action );
122122
/** remove "add layer" action from the layer menu */
123123
void removeAddLayer( QAction *action );
124124

src/gui/qgisinterface.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ class GUI_EXPORT QgisInterface : public QObject
139139
/** Add "add layer" action to layer menu
140140
* @note added in 1.7
141141
*/
142-
virtual void addAddLayer( QAction *action ) = 0;
142+
virtual void insertAddLayerAction( QAction *action ) = 0;
143143

144144
/** Remove "add layer" action from layer menu
145145
* @note added in 1.7

src/plugins/delimited_text/qgsdelimitedtextplugin.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ void QgsDelimitedTextPlugin::initGui()
109109
connect( myQActionPointer, SIGNAL( triggered() ), this, SLOT( run() ) );
110110
// Add the icon to the toolbar
111111
qGisInterface->addToolBarIcon( myQActionPointer );
112-
qGisInterface->addAddLayer( myQActionPointer );
112+
qGisInterface->insertAddLayerAction( myQActionPointer );
113113
// this is called when the icon theme is changed
114114
connect( qGisInterface, SIGNAL( currentThemeChanged( QString ) ), this, SLOT( setCurrentTheme( QString ) ) );
115115

src/plugins/oracle_raster/qgsoracle_plugin.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ void QgsOraclePlugin::initGui()
6161
connect( mQActionPointer, SIGNAL( triggered() ), this, SLOT( run() ) );
6262
// Add the icon to the toolbar
6363
mQGisIface->addToolBarIcon( mQActionPointer );
64-
mQGisIface->addAddLayer( mQActionPointer );
64+
mQGisIface->insertAddLayerAction( mQActionPointer );
6565

6666
}
6767
//method defined in interface

src/plugins/sqlanywhere/sqlanywhere.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ void SqlAnywhere::initGui()
8686
// mQGisIface->addToolBarIcon( mActionAddSqlAnywhereLayer );
8787

8888
// Also add to Layer menu
89-
mQGisIface->addAddLayer( mActionAddSqlAnywhereLayer );
89+
mQGisIface->insertAddLayerAction( mActionAddSqlAnywhereLayer );
9090
}
9191

9292
//method defined in interface

src/plugins/wfs/qgswfsplugin.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ void QgsWFSPlugin::initGui()
5454
setCurrentTheme( "" );
5555
QObject::connect( mWfsDialogAction, SIGNAL( triggered() ), this, SLOT( showSourceDialog() ) );
5656
mIface->layerToolBar()->addAction( mWfsDialogAction );
57-
mIface->addAddLayer( mWfsDialogAction );
57+
mIface->insertAddLayerAction( mWfsDialogAction );
5858
// this is called when the icon theme is changed
5959
connect( mIface, SIGNAL( currentThemeChanged( QString ) ), this, SLOT( setCurrentTheme( QString ) ) );
6060
}

0 commit comments

Comments
 (0)