From 3ba4a78b39609c4568d6357b092790a78f919fe9 Mon Sep 17 00:00:00 2001
From: Niels Weber <niels.weber@digia.com>
Date: Mon, 8 Apr 2013 11:41:15 +0200
Subject: Move setPixmap to constructor, as requested.

Change-Id: I99614ef80b9a97d8f84509be6ffa1558f35d8ab9
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
---
 src/libs/installer/packagemanagergui.cpp | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/src/libs/installer/packagemanagergui.cpp b/src/libs/installer/packagemanagergui.cpp
index 90375f710..487546be2 100644
--- a/src/libs/installer/packagemanagergui.cpp
+++ b/src/libs/installer/packagemanagergui.cpp
@@ -692,6 +692,9 @@ PackageManagerPage::PackageManagerPage(PackageManagerCore *core)
     , m_core(core)
     , validatorComponent(0)
 {
+    setPixmap(QWizard::WatermarkPixmap, watermarkPixmap());
+    setPixmap(QWizard::BannerPixmap, bannerPixmap());
+    setPixmap(QWizard::LogoPixmap, logoPixmap());
 }
 
 PackageManagerCore *PackageManagerPage::packageManagerCore() const
@@ -821,9 +824,7 @@ IntroductionPage::IntroductionPage(PackageManagerCore *core)
     , m_widget(0)
 {
     setObjectName(QLatin1String("IntroductionPage"));
-    setPixmap(QWizard::WatermarkPixmap, watermarkPixmap());
     setTitle(tr("Setup - %1").arg(productName()));
-    setPixmap(QWizard::BannerPixmap, bannerPixmap());
 
     m_msgLabel = new QLabel(this);
     m_msgLabel->setWordWrap(true);
@@ -884,9 +885,7 @@ private:
 LicenseAgreementPage::LicenseAgreementPage(PackageManagerCore *core)
     : PackageManagerPage(core)
 {
-    setPixmap(QWizard::LogoPixmap, logoPixmap());
     setPixmap(QWizard::WatermarkPixmap, QPixmap());
-    setPixmap(QWizard::BannerPixmap, bannerPixmap());
     setObjectName(QLatin1String("LicenseAgreementPage"));
     setTitle(tr("License Agreement"));
 
@@ -1221,9 +1220,7 @@ ComponentSelectionPage::ComponentSelectionPage(PackageManagerCore *core)
     : PackageManagerPage(core)
     , d(new Private(this, core))
 {
-    setPixmap(QWizard::LogoPixmap, logoPixmap());
     setPixmap(QWizard::WatermarkPixmap, QPixmap());
-    setPixmap(QWizard::BannerPixmap, bannerPixmap());
     setObjectName(QLatin1String("ComponentSelectionPage"));
     setTitle(tr("Select Components"));
 }
@@ -1315,9 +1312,7 @@ bool ComponentSelectionPage::isComplete() const
 TargetDirectoryPage::TargetDirectoryPage(PackageManagerCore *core)
     : PackageManagerPage(core)
 {
-    setPixmap(QWizard::LogoPixmap, logoPixmap());
     setPixmap(QWizard::WatermarkPixmap, QPixmap());
-    setPixmap(QWizard::BannerPixmap, bannerPixmap());
     setObjectName(QLatin1String("TargetDirectoryPage"));
     setTitle(tr("Installation Folder"));
 
@@ -1436,9 +1431,7 @@ void TargetDirectoryPage::dirRequested()
 StartMenuDirectoryPage::StartMenuDirectoryPage(PackageManagerCore *core)
     : PackageManagerPage(core)
 {
-    setPixmap(QWizard::LogoPixmap, logoPixmap());
     setPixmap(QWizard::WatermarkPixmap, QPixmap());
-    setPixmap(QWizard::BannerPixmap, bannerPixmap());
     setObjectName(QLatin1String("StartMenuDirectoryPage"));
     setTitle(tr("Start Menu shortcuts"));
     setSubTitle(tr("Select the Start Menu in which you would like to create the program's shortcuts. You can "
@@ -1527,9 +1520,7 @@ ReadyForInstallationPage::ReadyForInstallationPage(PackageManagerCore *core)
     : PackageManagerPage(core)
     , m_msgLabel(new QLabel)
 {
-    setPixmap(QWizard::LogoPixmap, logoPixmap());
     setPixmap(QWizard::WatermarkPixmap, QPixmap());
-    setPixmap(QWizard::BannerPixmap, bannerPixmap());
     setObjectName(QLatin1String("ReadyForInstallationPage"));
 
     QVBoxLayout *baseLayout = new QVBoxLayout();
@@ -1757,9 +1748,7 @@ PerformInstallationPage::PerformInstallationPage(PackageManagerCore *core)
     : PackageManagerPage(core)
     , m_performInstallationForm(new PerformInstallationForm(this))
 {
-    setPixmap(QWizard::LogoPixmap, logoPixmap());
     setPixmap(QWizard::WatermarkPixmap, QPixmap());
-    setPixmap(QWizard::BannerPixmap, bannerPixmap());
     setObjectName(QLatin1String("PerformInstallationPage"));
 
     m_performInstallationForm->setupUi(this);
@@ -1879,9 +1868,7 @@ FinishedPage::FinishedPage(PackageManagerCore *core)
     , m_commitButton(0)
 {
     setObjectName(QLatin1String("FinishedPage"));
-    setPixmap(QWizard::WatermarkPixmap, watermarkPixmap());
     setTitle(tr("Completing the %1 Wizard").arg(productName()));
-    setPixmap(QWizard::BannerPixmap, bannerPixmap());
 
     m_msgLabel = new QLabel(this);
     m_msgLabel->setWordWrap(true);
@@ -1991,9 +1978,7 @@ RestartPage::RestartPage(PackageManagerCore *core)
     : PackageManagerPage(core)
 {
     setObjectName(QLatin1String("RestartPage"));
-    setPixmap(QWizard::WatermarkPixmap, watermarkPixmap());
     setTitle(tr("Completing the %1 Setup Wizard").arg(productName()));
-    setPixmap(QWizard::BannerPixmap, bannerPixmap());
 
     setFinalPage(false);
     setCommitPage(false);
-- 
cgit v1.2.3