sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-17 00:04:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename indx to index in some slots

Browse Source
This commit is contained in:
Borys Jurgiel 2017-11-06 16:37:27 +01:00
parent 966e2d6639
commit 64ab28bf59
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
python/gui/qgsoptionsdialogbase.sip
View File

@ -128,8 +128,8 @@ class QgsOptionsDialogBase : QDialog
protected slots: protected slots:
virtual void updateOptionsListVerticalTabs(); virtual void updateOptionsListVerticalTabs();
virtual void optionsStackedWidget_CurrentChanged( int indx ); virtual void optionsStackedWidget_CurrentChanged( int index );
virtual void optionsStackedWidget_WidgetRemoved( int indx ); virtual void optionsStackedWidget_WidgetRemoved( int index );
void warnAboutMissingObjects(); void warnAboutMissingObjects();

2
src/app/pluginmanager/qgspluginmanager.h
View File

@ -172,7 +172,7 @@ class QgsPluginManager : public QgsOptionsDialogBase, private Ui::QgsPluginManag
void showHelp(); void showHelp();
//! Reimplement QgsOptionsDialogBase method to prevent modifying the tab list by signals from the stacked widget //! Reimplement QgsOptionsDialogBase method to prevent modifying the tab list by signals from the stacked widget
void optionsStackedWidget_CurrentChanged( int indx ) override { Q_UNUSED( indx ) }; void optionsStackedWidget_CurrentChanged( int index ) override { Q_UNUSED( index ) };
//! Only show plugins from selected repository (e.g. for inspection) //! Only show plugins from selected repository (e.g. for inspection)
void setRepositoryFilter(); void setRepositoryFilter();

10
src/gui/qgsoptionsdialogbase.cpp
View File

@ -356,24 +356,24 @@ void QgsOptionsDialogBase::updateOptionsListVerticalTabs()
mOptListWidget->setWordWrap( true ); mOptListWidget->setWordWrap( true );
} }
void QgsOptionsDialogBase::optionsStackedWidget_CurrentChanged( int indx ) void QgsOptionsDialogBase::optionsStackedWidget_CurrentChanged( int index )
{ {
mOptListWidget->blockSignals( true ); mOptListWidget->blockSignals( true );
mOptListWidget->setCurrentRow( indx ); mOptListWidget->setCurrentRow( index );
mOptListWidget->blockSignals( false ); mOptListWidget->blockSignals( false );
updateWindowTitle(); updateWindowTitle();
} }
void QgsOptionsDialogBase::optionsStackedWidget_WidgetRemoved( int indx ) void QgsOptionsDialogBase::optionsStackedWidget_WidgetRemoved( int index )
{ {
// will need to take item first, if widgets are set for item in future // will need to take item first, if widgets are set for item in future
delete mOptListWidget->item( indx ); delete mOptListWidget->item( index );
QList<QPair< QgsSearchHighlightOptionWidget *, int > >::iterator it = mRegisteredSearchWidgets.begin(); QList<QPair< QgsSearchHighlightOptionWidget *, int > >::iterator it = mRegisteredSearchWidgets.begin();
while ( it != mRegisteredSearchWidgets.end() ) while ( it != mRegisteredSearchWidgets.end() )
{ {
if ( ( *it ).second == indx ) if ( ( *it ).second == index )
it = mRegisteredSearchWidgets.erase( it ); it = mRegisteredSearchWidgets.erase( it );
else else
++it; ++it;

4
src/gui/qgsoptionsdialogbase.h
View File

@ -159,8 +159,8 @@ class GUI_EXPORT QgsOptionsDialogBase : public QDialog
protected slots: protected slots:
virtual void updateOptionsListVerticalTabs(); virtual void updateOptionsListVerticalTabs();
virtual void optionsStackedWidget_CurrentChanged( int indx ); virtual void optionsStackedWidget_CurrentChanged( int index );
virtual void optionsStackedWidget_WidgetRemoved( int indx ); virtual void optionsStackedWidget_WidgetRemoved( int index );
void warnAboutMissingObjects(); void warnAboutMissingObjects();