1 files changed, 6 insertions, 12 deletions
diff --git a/src/libs/installer/packagemanagergui.h b/src/libs/installer/packagemanagergui.h
index 5b7bd0615..913bfb2a6 100644
--- a/src/libs/installer/packagemanagergui.h
+++ b/src/libs/installer/packagemanagergui.h
@@ -60,7 +60,6 @@ class QListWidget;
 class QListWidgetItem;
 class QRadioButton;
 class QTextBrowser;
-class QScriptEngine;
 QT_END_NAMESPACE
 
 namespace QInstaller {
@@ -84,8 +83,6 @@ public:
     void loadControlScript(const QString& scriptPath);
     void callControlScriptMethod(const QString& methodName);
 
-    QScriptEngine *controlScriptEngine() const;
-
     Q_INVOKABLE PackageManagerPage* page(int pageId) const;
     Q_INVOKABLE QWidget* pageWidgetByObjectName(const QString& name) const;
     Q_INVOKABLE QWidget* currentPageWidget() const;
@@ -118,8 +115,7 @@ protected Q_SLOTS:
     void wizardWidgetInsertionRequested(QWidget *widget, QInstaller::PackageManagerCore::WizardPage page);
     void wizardWidgetRemovalRequested(QWidget *widget);
     void wizardPageVisibilityChangeRequested(bool visible, int page);
-    void slotCurrentPageChanged(int id);
-    void delayedControlScriptExecution(int id);
+    void executeControlScript(int pageId);
     void setValidatorForCustomPageRequested(QInstaller::Component *component, const QString &name,
                                             const QString &callbackName);
 
@@ -155,6 +151,7 @@ public:
     virtual QPixmap logoPixmap() const;
     virtual QString productName() const;
     virtual QPixmap watermarkPixmap() const;
+    virtual QPixmap bannerPixmap() const;
 
     virtual bool isComplete() const;
     void setComplete(bool complete);
@@ -165,13 +162,12 @@ public:
     void setValidatePageComponent(QInstaller::Component *component);
 
     bool validatePage();
+signals:
+    void entered();
+    void left();
 
 protected:
     PackageManagerCore *packageManagerCore() const;
-    QVariantHash elementsForPage(const QString &pageName) const;
-
-    QString titleForPage(const QString &pageName, const QString &value = QString()) const;
-    QString subTitleForPage(const QString &pageName, const QString &value = QString()) const;
 
     // Inserts widget into the same layout like a sibling identified
     // by its name. Default position is just behind the sibling.
@@ -187,9 +183,6 @@ protected:
     bool isConstructing() const { return m_fresh; }
 
 private:
-    QString titleFromHash(const QVariantHash &hash, const QString &value = QString()) const;
-
-private:
     bool m_fresh;
     bool m_complete;
 
@@ -408,6 +401,7 @@ public:
 
 public Q_SLOTS:
     void handleFinishClicked();
+    void cleanupChangedConnects();
 
 protected:
     void entering();