AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QWizard: move 'initialized' bit into QWizardPage

Browse Source 
... as suggested by a code comment.

This avoids the external bookkeeping using a QSet, and will allow, in
Qt 6, when we can port QWizardPage to the NVI idiom, maintaining the
bit as part of the initialize and cleanup functions directly.

Change-Id: I25a4dbf4c42f2c0286aa1a72ab9c59463d44c5df
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
This commit is contained in:
Marc Mutz 2017-05-22 10:26:29 +02:00
parent d3f1076d0a
commit 85554be25f
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -498,6 +498,7 @@ public:
mutable TriState completeState;
bool explicitlyFinal;
bool commit;
bool initialized = false;
QMap<int, QString> buttonCustomTexts;
};
@ -633,7 +634,6 @@ public:
QMap<QString, int> fieldIndexMap;
QVector<QWizardDefaultProperty> defaultPropertyTable;
QList<int> history;
QSet<int> initialized; // ### remove and move bit to QWizardPage?
int start;
bool startSetByUser;
int current;
@ -772,7 +772,8 @@ void QWizardPrivate::reset()
for (int i = history.count() - 1; i >= 0; --i)
q->cleanupPage(history.at(i));
history.clear();
initialized.clear();
for (QWizardPage *page : pageMap)
page->d_func()->initialized = false;
current = -1;
emit q->currentIdChanged(-1);
@ -783,14 +784,12 @@ void QWizardPrivate::cleanupPagesNotInHistory()
{
Q_Q(QWizard);
const QSet<int> original = initialized;
QSet<int>::const_iterator i = original.constBegin();
QSet<int>::const_iterator end = original.constEnd();
for (; i != end; ++i) {
if (!history.contains(*i)) {
q->cleanupPage(*i);
initialized.remove(*i);
for (auto it = pageMap.begin(), end = pageMap.end(); it != end; ++it) {
const auto idx = it.key();
const auto page = it.value()->d_func();
if (page->initialized && !history.contains(idx)) {
q->cleanupPage(idx);
page->initialized = false;
}
}
}
@ -845,7 +844,7 @@ void QWizardPrivate::switchToPage(int newId, Direction direction)
if (direction == Backward) {
if (!(opts & QWizard::IndependentPages)) {
q->cleanupPage(oldId);
initialized.remove(oldId);
oldPage->d_func()->initialized = false;
}
Q_ASSERT(history.constLast() == oldId);
history.removeLast();
@ -858,8 +857,8 @@ void QWizardPrivate::switchToPage(int newId, Direction direction)
QWizardPage *newPage = q->currentPage();
if (newPage) {
if (direction == Forward) {
if (!initialized.contains(current)) {
initialized.insert(current);
if (!newPage->d_func()->initialized) {
newPage->d_func()->initialized = true;
q->initializePage(current);
}
history.append(current);
@ -2359,9 +2358,9 @@ void QWizard::removePage(int id)
}
if (removedPage) {
if (d->initialized.contains(id)) {
if (removedPage->d_func()->initialized) {
cleanupPage(id);
d->initialized.remove(id);
removedPage->d_func()->initialized = false;
}
d->pageVBoxLayout->removeWidget(removedPage);