1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QWizard: provoke 'enum value not handled in switch' warnings in object_name_for_button

Browse Source 
This is strictly speaking a behavior change, since we're no longer returning
something for Stretch and NoButton, but - guessing here - that shouldn't matter.
Yet, better safe than sorry, thus submitted as a separate patch.

Change-Id: I20cb084147f8c9257ce37d1e87ea38febabec28d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
This commit is contained in:
Marc Mutz 2013-10-25 19:17:28 +02:00 committed by The Qt Project
parent 1ea191276e
commit 269590516d
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/widgets/dialogs/qwizard.cpp
View File

@ -1354,10 +1354,22 @@ static QString object_name_for_button(QWizard::WizardButton which)
return QLatin1String("qt_wizard_") + QLatin1String("finish"); return QLatin1String("qt_wizard_") + QLatin1String("finish");
case QWizard::CancelButton: case QWizard::CancelButton:
return QLatin1String("qt_wizard_") + QLatin1String("cancel"); return QLatin1String("qt_wizard_") + QLatin1String("cancel");
default: case QWizard::BackButton:
case QWizard::NextButton:
case QWizard::HelpButton:
case QWizard::CustomButton1:
case QWizard::CustomButton2:
case QWizard::CustomButton3:
// Make navigation buttons detectable as passive interactor in designer // Make navigation buttons detectable as passive interactor in designer
return QLatin1String("__qt__passive_wizardbutton") + QString::number(which); return QLatin1String("__qt__passive_wizardbutton") + QString::number(which);
case QWizard::Stretch:
case QWizard::NoButton:
//case QWizard::NStandardButtons:
//case QWizard::NButtons:
;
} }
Q_UNREACHABLE();
return QString();
} }
bool QWizardPrivate::ensureButton(QWizard::WizardButton which) const bool QWizardPrivate::ensureButton(QWizard::WizardButton which) const