Skip to content

Commit 64ab28b

Browse files
committed
Rename indx to index in some slots
1 parent 966e2d6 commit 64ab28b

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

python/gui/qgsoptionsdialogbase.sip

+2-2
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,8 @@ class QgsOptionsDialogBase : QDialog
128128

129129
protected slots:
130130
virtual void updateOptionsListVerticalTabs();
131-
virtual void optionsStackedWidget_CurrentChanged( int indx );
132-
virtual void optionsStackedWidget_WidgetRemoved( int indx );
131+
virtual void optionsStackedWidget_CurrentChanged( int index );
132+
virtual void optionsStackedWidget_WidgetRemoved( int index );
133133

134134
void warnAboutMissingObjects();
135135

src/app/pluginmanager/qgspluginmanager.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ class QgsPluginManager : public QgsOptionsDialogBase, private Ui::QgsPluginManag
172172
void showHelp();
173173

174174
//! Reimplement QgsOptionsDialogBase method to prevent modifying the tab list by signals from the stacked widget
175-
void optionsStackedWidget_CurrentChanged( int indx ) override { Q_UNUSED( indx ) };
175+
void optionsStackedWidget_CurrentChanged( int index ) override { Q_UNUSED( index ) };
176176

177177
//! Only show plugins from selected repository (e.g. for inspection)
178178
void setRepositoryFilter();

src/gui/qgsoptionsdialogbase.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -356,24 +356,24 @@ void QgsOptionsDialogBase::updateOptionsListVerticalTabs()
356356
mOptListWidget->setWordWrap( true );
357357
}
358358

359-
void QgsOptionsDialogBase::optionsStackedWidget_CurrentChanged( int indx )
359+
void QgsOptionsDialogBase::optionsStackedWidget_CurrentChanged( int index )
360360
{
361361
mOptListWidget->blockSignals( true );
362-
mOptListWidget->setCurrentRow( indx );
362+
mOptListWidget->setCurrentRow( index );
363363
mOptListWidget->blockSignals( false );
364364

365365
updateWindowTitle();
366366
}
367367

368-
void QgsOptionsDialogBase::optionsStackedWidget_WidgetRemoved( int indx )
368+
void QgsOptionsDialogBase::optionsStackedWidget_WidgetRemoved( int index )
369369
{
370370
// will need to take item first, if widgets are set for item in future
371-
delete mOptListWidget->item( indx );
371+
delete mOptListWidget->item( index );
372372

373373
QList<QPair< QgsSearchHighlightOptionWidget *, int > >::iterator it = mRegisteredSearchWidgets.begin();
374374
while ( it != mRegisteredSearchWidgets.end() )
375375
{
376-
if ( ( *it ).second == indx )
376+
if ( ( *it ).second == index )
377377
it = mRegisteredSearchWidgets.erase( it );
378378
else
379379
++it;

src/gui/qgsoptionsdialogbase.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,8 @@ class GUI_EXPORT QgsOptionsDialogBase : public QDialog
159159

160160
protected slots:
161161
virtual void updateOptionsListVerticalTabs();
162-
virtual void optionsStackedWidget_CurrentChanged( int indx );
163-
virtual void optionsStackedWidget_WidgetRemoved( int indx );
162+
virtual void optionsStackedWidget_CurrentChanged( int index );
163+
virtual void optionsStackedWidget_WidgetRemoved( int index );
164164

165165
void warnAboutMissingObjects();
166166

0 commit comments

Comments
 (0)