Skip to content
Permalink
Browse files

Rename indx to index in some slots

  • Loading branch information
borysiasty committed Nov 6, 2017
1 parent 966e2d6 commit 64ab28bf596d68398090e31c12ab3d7b89368e7d
@@ -128,8 +128,8 @@ class QgsOptionsDialogBase : QDialog

protected slots:
virtual void updateOptionsListVerticalTabs();
virtual void optionsStackedWidget_CurrentChanged( int indx );
virtual void optionsStackedWidget_WidgetRemoved( int indx );
virtual void optionsStackedWidget_CurrentChanged( int index );
virtual void optionsStackedWidget_WidgetRemoved( int index );

void warnAboutMissingObjects();

@@ -172,7 +172,7 @@ class QgsPluginManager : public QgsOptionsDialogBase, private Ui::QgsPluginManag
void showHelp();

//! 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)
void setRepositoryFilter();
@@ -356,24 +356,24 @@ void QgsOptionsDialogBase::updateOptionsListVerticalTabs()
mOptListWidget->setWordWrap( true );
}

void QgsOptionsDialogBase::optionsStackedWidget_CurrentChanged( int indx )
void QgsOptionsDialogBase::optionsStackedWidget_CurrentChanged( int index )
{
mOptListWidget->blockSignals( true );
mOptListWidget->setCurrentRow( indx );
mOptListWidget->setCurrentRow( index );
mOptListWidget->blockSignals( false );

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
delete mOptListWidget->item( indx );
delete mOptListWidget->item( index );

QList<QPair< QgsSearchHighlightOptionWidget *, int > >::iterator it = mRegisteredSearchWidgets.begin();
while ( it != mRegisteredSearchWidgets.end() )
{
if ( ( *it ).second == indx )
if ( ( *it ).second == index )
it = mRegisteredSearchWidgets.erase( it );
else
++it;
@@ -159,8 +159,8 @@ class GUI_EXPORT QgsOptionsDialogBase : public QDialog

protected slots:
virtual void updateOptionsListVerticalTabs();
virtual void optionsStackedWidget_CurrentChanged( int indx );
virtual void optionsStackedWidget_WidgetRemoved( int indx );
virtual void optionsStackedWidget_CurrentChanged( int index );
virtual void optionsStackedWidget_WidgetRemoved( int index );

void warnAboutMissingObjects();

0 comments on commit 64ab28b

Please sign in to comment.
You can’t perform that action at this time.