summaryrefslogtreecommitdiffstats
path: root/src/sdk
diff options
context:
space:
mode:
Diffstat (limited to 'src/sdk')
-rw-r--r--src/sdk/installerbasecommons.cpp40
-rw-r--r--src/sdk/installerbasecommons.h4
2 files changed, 0 insertions, 44 deletions
diff --git a/src/sdk/installerbasecommons.cpp b/src/sdk/installerbasecommons.cpp
index 4a935356c..6ae1ddc3a 100644
--- a/src/sdk/installerbasecommons.cpp
+++ b/src/sdk/installerbasecommons.cpp
@@ -526,25 +526,6 @@ void InstallerGui::init()
{
}
-int InstallerGui::nextId() const
-{
- const int next = QWizard::nextId();
- if (next == PackageManagerCore::LicenseCheck) {
- PackageManagerCore *const core = packageManagerCore();
- const int nextNextId = pageIds().value(pageIds().indexOf(next)+ 1, -1);
- if (!core->isInstaller())
- return nextNextId;
-
- core->calculateComponentsToInstall();
- foreach (Component* component, core->orderedComponentsToInstall()) {
- if (!component->licenses().isEmpty())
- return next;
- }
- return nextNextId;
- }
- return next;
-}
-
// -- MaintenanceGui
@@ -573,27 +554,6 @@ void MaintenanceGui::init()
{
}
-int MaintenanceGui::nextId() const
-{
- const int next = QWizard::nextId();
- if (next == PackageManagerCore::LicenseCheck) {
- PackageManagerCore *const core = packageManagerCore();
- const int nextNextId = pageIds().value(pageIds().indexOf(next)+ 1, -1);
- if (!core->isPackageManager() && !core->isUpdater())
- return nextNextId;
-
- core->calculateComponentsToInstall();
- foreach (Component* component, core->orderedComponentsToInstall()) {
- if (component->isInstalled())
- continue;
- if (!component->licenses().isEmpty())
- return next;
- }
- return nextNextId;
- }
- return next;
-}
-
void MaintenanceGui::updateRestartPage()
{
wizardPageVisibilityChangeRequested((packageManagerCore()->isUninstaller() ? false : true),
diff --git a/src/sdk/installerbasecommons.h b/src/sdk/installerbasecommons.h
index 67eb3a101..2bcdce3f2 100644
--- a/src/sdk/installerbasecommons.h
+++ b/src/sdk/installerbasecommons.h
@@ -133,9 +133,7 @@ class InstallerGui : public QInstaller::PackageManagerGui
public:
explicit InstallerGui(QInstaller::PackageManagerCore *core);
-
virtual void init();
- virtual int nextId() const;
};
@@ -147,9 +145,7 @@ class MaintenanceGui : public QInstaller::PackageManagerGui
public:
explicit MaintenanceGui(QInstaller::PackageManagerCore *core);
-
virtual void init();
- virtual int nextId() const;
private Q_SLOTS:
void updateRestartPage();