on xenial help sign in
Fix small typos
commitcbb272fb95342226e008631e9597f0fe92e0a530 authorDalton Durst <me@daltondurst.com> dateSun 12 Aug 2018, 15:25 (8 years ago) parenteab6c0e
2 files changed+13−12
plugins/Wizard/System.cpp+13−10 qml/Wizard/Pages.qml−2
plugins/Wizard/System.cpp+13−10
@@ -56,9 +56,9 @@ QString System::currentFrameworkPath()
5656/*
5757wizardEnabled and isUpdate logic
5858
59−if wizard-has-run does NOT exists == is new install
60−if wizard-has-run does exists but does NOT match current framework == is update
61−if wizard-has-run does exists but does match current framework == show no wizard
59+if wizard-has-run does NOT exist == is new install
60+if wizard-has-run exists but does NOT match current framework == is update
61+if wizard-has-run exists but does match current framework == show no wizard
6262*/
6363
6464bool System::wizardPathExists() {
@@ -67,9 +67,10 @@ bool System::wizardPathExists() {
6767
6868bool System::wizardEnabled() const
6969{
70− if (!wizardPathExists())
71− return true;
72− return isUpdate();
70+ if (!wizardPathExists()) {
71+ return true;
72+ }
73+ return isUpdate();
7374}
7475
7576QString System::readCurrentFramework()
@@ -95,8 +96,9 @@ QString System::version() const
9596
9697bool System::isUpdate() const
9798{
98− if (!wizardPathExists())
99− return false;
99+ if (!wizardPathExists()) {
100+ return false;
101+ }
100102
101103 return readCurrentFramework() != readWizardEnabled();
102104}
@@ -110,8 +112,9 @@ void System::setWizardEnabled(bool enabled)
110112 QFile::remove(wizardEnabledPath());
111113 } else {
112114 QDir(wizardEnabledPath()).mkpath(QStringLiteral(".."));
113− if (QFile::exists(wizardEnabledPath()))
114− QFile::remove(wizardEnabledPath());
115+ if (QFile::exists(wizardEnabledPath())) {
116+ QFile::remove(wizardEnabledPath());
117+ }
115118 QFile::copy(currentFrameworkPath(), wizardEnabledPath());
116119 m_fsWatcher.addPath(wizardEnabledPath());
117120 Q_EMIT wizardEnabledChanged();
qml/Wizard/Pages.qml−2
@@ -124,8 +124,6 @@ StyledItem {
124124 if (visible) {
125125 opacity = 0;
126126 fadeInAnimation.start();
127− } else {
128− // impatientLoadingLabel.text = ""
129127 }
130128 }
131129 }