From 9dacee18f9b7211699164bc70dd17f9934a15f50 Mon Sep 17 00:00:00 2001 From: Katja Marttila Date: Thu, 1 Nov 2018 10:38:13 +0200 Subject: Replace 0 with nullptr Prevents a lot of warnings seen in QtCreator Change-Id: I63bf95aca68a04fc9fd0eecbe29c63e9b9c47efd Reviewed-by: Iikka Eklund --- src/libs/installer/packagemanagergui.cpp | 44 ++++++++++++++++---------------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'src/libs/installer/packagemanagergui.cpp') diff --git a/src/libs/installer/packagemanagergui.cpp b/src/libs/installer/packagemanagergui.cpp index 0e2577850..3fd35a5c8 100644 --- a/src/libs/installer/packagemanagergui.cpp +++ b/src/libs/installer/packagemanagergui.cpp @@ -95,7 +95,7 @@ class DynamicInstallerPage : public PackageManagerPage Q_PROPERTY(bool complete READ isComplete WRITE setComplete) public: - explicit DynamicInstallerPage(QWidget *widget, PackageManagerCore *core = 0) + explicit DynamicInstallerPage(QWidget *widget, PackageManagerCore *core = nullptr) : PackageManagerPage(core) , m_widget(widget) { @@ -398,7 +398,7 @@ void PackageManagerGui::setMaxSize() */ PackageManagerGui::~PackageManagerGui() { - m_core->setGuiObject(0); + m_core->setGuiObject(nullptr); delete d; } @@ -665,7 +665,7 @@ void PackageManagerGui::wizardPageInsertionRequested(QWidget *widget, wizardPageRemovalRequested(widget); int pageId = static_cast(page) - 1; - while (QWizard::page(pageId) != 0) + while (QWizard::page(pageId) != nullptr) --pageId; // add it @@ -679,7 +679,7 @@ void PackageManagerGui::wizardPageRemovalRequested(QWidget *widget) { foreach (int pageId, pageIds()) { DynamicInstallerPage *const dynamicPage = qobject_cast(page(pageId)); - if (dynamicPage == 0) + if (dynamicPage == nullptr) continue; if (dynamicPage->widget() != widget) continue; @@ -710,7 +710,7 @@ void PackageManagerGui::wizardWidgetInsertionRequested(QWidget *widget, void PackageManagerGui::wizardWidgetRemovalRequested(QWidget *widget) { Q_ASSERT(widget); - widget->setParent(0); + widget->setParent(nullptr); packageManagerCore()->controlScriptEngine()->removeFromGlobalObject(widget); packageManagerCore()->componentScriptEngine()->removeFromGlobalObject(widget); } @@ -721,9 +721,9 @@ void PackageManagerGui::wizardWidgetRemovalRequested(QWidget *widget) */ void PackageManagerGui::wizardPageVisibilityChangeRequested(bool visible, int p) { - if (visible && page(p) == 0) { + if (visible && page(p) == nullptr) { setPage(p, d->m_defaultPages[p]); - } else if (!visible && page(p) != 0) { + } else if (!visible && page(p) != nullptr) { d->m_defaultPages[p] = page(p); removePage(p); } @@ -753,7 +753,7 @@ QWidget *PackageManagerGui::pageByObjectName(const QString &name) const return p; } qWarning() << "No page found for object name" << name; - return 0; + return nullptr; } /*! @@ -781,7 +781,7 @@ QWidget *PackageManagerGui::pageWidgetByObjectName(const QString &name) const return p; } qWarning() << "No page found for object name" << name; - return 0; + return nullptr; } /*! @@ -1057,7 +1057,7 @@ PackageManagerPage::PackageManagerPage(PackageManagerCore *core) : m_complete(true) , m_needsSettingsButton(false) , m_core(core) - , validatorComponent(0) + , validatorComponent(nullptr) { if (!m_core->settings().titleColor().isEmpty()) { m_titleColor = m_core->settings().titleColor(); @@ -1192,8 +1192,8 @@ bool PackageManagerPage::validatePage() void PackageManagerPage::insertWidget(QWidget *widget, const QString &siblingName, int offset) { QWidget *sibling = findChild(siblingName); - QWidget *parent = sibling ? sibling->parentWidget() : 0; - QLayout *layout = parent ? parent->layout() : 0; + QWidget *parent = sibling ? sibling->parentWidget() : nullptr; + QLayout *layout = parent ? parent->layout() : nullptr; QBoxLayout *blayout = qobject_cast(layout); if (blayout) { @@ -1264,13 +1264,13 @@ IntroductionPage::IntroductionPage(PackageManagerCore *core) : PackageManagerPage(core) , m_updatesFetched(false) , m_allPackagesFetched(false) - , m_label(0) - , m_msgLabel(0) - , m_errorLabel(0) - , m_progressBar(0) - , m_packageManager(0) - , m_updateComponents(0) - , m_removeAllComponents(0) + , m_label(nullptr) + , m_msgLabel(nullptr) + , m_errorLabel(nullptr) + , m_progressBar(nullptr) + , m_packageManager(nullptr) + , m_updateComponents(nullptr) + , m_removeAllComponents(nullptr) { setObjectName(QLatin1String("IntroductionPage")); setColoredTitle(tr("Setup - %1").arg(productName())); @@ -1347,7 +1347,7 @@ IntroductionPage::IntroductionPage(PackageManagerCore *core) connect(core, &PackageManagerCore::metaJobProgress, m_taskButton->progress(), &QWinTaskbarProgress::setValue); } else { - m_taskButton = 0; + m_taskButton = nullptr; } #endif } @@ -2802,7 +2802,7 @@ void PerformInstallationPage::toggleDetailsWereChanged() */ FinishedPage::FinishedPage(PackageManagerCore *core) : PackageManagerPage(core) - , m_commitButton(0) + , m_commitButton(nullptr) { setObjectName(QLatin1String("FinishedPage")); setColoredTitle(tr("Completing the %1 Wizard").arg(productName())); @@ -2835,7 +2835,7 @@ void FinishedPage::entering() if (m_commitButton) { disconnect(m_commitButton, &QAbstractButton::clicked, this, &FinishedPage::handleFinishClicked); - m_commitButton = 0; + m_commitButton = nullptr; } if (packageManagerCore()->isMaintainer()) { -- cgit v1.2.3 From afd61c9700ea24569ade2af9e7ec0a268b02b98a Mon Sep 17 00:00:00 2001 From: Katja Marttila Date: Tue, 8 Jan 2019 12:33:05 +0200 Subject: Hide category widgets in updater mode We don't need categories in updater mode, the categories were accidently visible if we first visited the 'Add or remove components' page before going to 'Update components' Task-number: QTIFW-1259 Change-Id: I945c2b7e8cdfbb8bfeefbfa0ed07222189573179 Reviewed-by: Iikka Eklund --- src/libs/installer/packagemanagergui.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/libs/installer/packagemanagergui.cpp') diff --git a/src/libs/installer/packagemanagergui.cpp b/src/libs/installer/packagemanagergui.cpp index 3fd35a5c8..dfa7542c6 100644 --- a/src/libs/installer/packagemanagergui.cpp +++ b/src/libs/installer/packagemanagergui.cpp @@ -1912,7 +1912,9 @@ void ComponentSelectionPage::entering() setModified(isComplete()); if (core->settings().repositoryCategories().count() > 0 && !core->isOfflineOnly() && !core->isUpdater()) { - d->setupCategoryLayout(); + d->showCategoryLayout(true); + } else { + d->showCategoryLayout(false); } d->showCompressedRepositoryButton(); } -- cgit v1.2.3 From 7c3c796cbfb13afcf01755d189e01ac392ec9b2b Mon Sep 17 00:00:00 2001 From: Katja Marttila Date: Mon, 14 Jan 2019 10:16:23 +0200 Subject: Allow unstable components when categories are used Unstable component means that the component has unresolved dependency, script error etc. Installer cannot recover if we are already in component selection view and fetch new packages from a category which has unstable components if AllowUnstableComponent is false. Fixed so that allowing unstable components is forced when categories are used. Ideal solution would be to recover and rollback the install tree if unstable components are found but that requires huge changes to IFW. Task-id: QTIFW-1257 Change-Id: I786df1b8b54c238f50e15b94a06005e244417c97 Reviewed-by: Leena Miettinen Reviewed-by: Jani Heikkinen --- src/libs/installer/packagemanagergui.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src/libs/installer/packagemanagergui.cpp') diff --git a/src/libs/installer/packagemanagergui.cpp b/src/libs/installer/packagemanagergui.cpp index dfa7542c6..a053e9bff 100644 --- a/src/libs/installer/packagemanagergui.cpp +++ b/src/libs/installer/packagemanagergui.cpp @@ -1913,6 +1913,7 @@ void ComponentSelectionPage::entering() if (core->settings().repositoryCategories().count() > 0 && !core->isOfflineOnly() && !core->isUpdater()) { d->showCategoryLayout(true); + core->settings().setAllowUnstableComponents(true); } else { d->showCategoryLayout(false); } -- cgit v1.2.3