summaryrefslogtreecommitdiffstats
path: root/installerbuilder/installerbase/tabcontroller.cpp
diff options
context:
space:
mode:
authorkh1 <qt-info@nokia.com>2011-03-14 22:45:09 +0100
committerkh1 <qt-info@nokia.com>2011-03-14 22:45:09 +0100
commiteb21e905b2e47cdad30621a0c58374a8ed9993bc (patch)
treecd3c64c8fedede55fa8f5766562c4827effbce6c /installerbuilder/installerbase/tabcontroller.cpp
parent6731abd566704a4f21506e1bffed4a9c11998915 (diff)
They need to be slots.
As we may recive change events from the intro page...
Diffstat (limited to 'installerbuilder/installerbase/tabcontroller.cpp')
-rw-r--r--installerbuilder/installerbase/tabcontroller.cpp93
1 files changed, 47 insertions, 46 deletions
diff --git a/installerbuilder/installerbase/tabcontroller.cpp b/installerbuilder/installerbase/tabcontroller.cpp
index 0e1bd27b4..6650db2da 100644
--- a/installerbuilder/installerbase/tabcontroller.cpp
+++ b/installerbuilder/installerbase/tabcontroller.cpp
@@ -180,52 +180,7 @@ void TabController::setInstallerParams(const QHash<QString, QString> &params)
d->m_params = params;
}
-// -- private slots
-
-void TabController::accepted()
-{
- d->m_installer->writeUninstaller();
-}
-
-void TabController::rejected()
-{
- d->m_installer->writeUninstaller();
-}
-
-void TabController::restartWizard()
-{
- d->m_installer->reset(d->m_params);
- init(); // restart and switch back to intro page
-}
-
-void TabController::updaterFinishedWithError()
-{
- d->m_installer->writeUninstaller();
-
- if (!d->m_installer->isInstaller() && !d->m_gui.isNull())
- d->m_gui->rejectWithoutPrompt();
-
- rejected();
-}
-
-void TabController::updaterFinished(bool error)
-{
- if (d->m_installer->needsRestart())
- updaterFinishedWithError();
- //else if (!error)
- // checkRepositories();
-}
-
-void TabController::updaterFinished(int val)
-{
- if (val != QDialog::Accepted) {
- if (!d->m_installer->isInstaller() && !d->m_gui.isNull())
- d->m_gui->rejectWithoutPrompt();
- accepted();
- }
-}
-
-// -- private
+// -- public slots
int TabController::initUpdater()
{
@@ -315,3 +270,49 @@ int TabController::initPackageManager()
return Installer::Success;
}
+
+// -- private slots
+
+void TabController::accepted()
+{
+ d->m_installer->writeUninstaller();
+}
+
+void TabController::rejected()
+{
+ d->m_installer->writeUninstaller();
+}
+
+void TabController::restartWizard()
+{
+ d->m_installer->reset(d->m_params);
+ init(); // restart and switch back to intro page
+}
+
+void TabController::updaterFinishedWithError()
+{
+ d->m_installer->writeUninstaller();
+
+ if (!d->m_installer->isInstaller() && !d->m_gui.isNull())
+ d->m_gui->rejectWithoutPrompt();
+
+ rejected();
+}
+
+void TabController::updaterFinished(bool error)
+{
+ if (d->m_installer->needsRestart())
+ updaterFinishedWithError();
+ //else if (!error)
+ // checkRepositories();
+}
+
+void TabController::updaterFinished(int val)
+{
+ if (val != QDialog::Accepted) {
+ if (!d->m_installer->isInstaller() && !d->m_gui.isNull())
+ d->m_gui->rejectWithoutPrompt();
+ accepted();
+ }
+}
+