summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--installerbuilder/installerbase/installerbase.cpp1
-rw-r--r--installerbuilder/installerbase/tabcontroller.cpp27
-rw-r--r--installerbuilder/installerbase/tabcontroller.h5
3 files changed, 9 insertions, 24 deletions
diff --git a/installerbuilder/installerbase/installerbase.cpp b/installerbuilder/installerbase/installerbase.cpp
index 190773b11..d8231e9b0 100644
--- a/installerbuilder/installerbase/installerbase.cpp
+++ b/installerbuilder/installerbase/installerbase.cpp
@@ -299,7 +299,6 @@ int main(int argc, char *argv[])
TabController controller(0);
controller.setInstaller(&installer);
controller.setInstallerParams(params);
- controller.setApplication(&updaterapp);
controller.setControlScript(controlScript);
if (installer.isInstaller()) {
diff --git a/installerbuilder/installerbase/tabcontroller.cpp b/installerbuilder/installerbase/tabcontroller.cpp
index c165ce6a7..b22f4f955 100644
--- a/installerbuilder/installerbase/tabcontroller.cpp
+++ b/installerbuilder/installerbase/tabcontroller.cpp
@@ -37,9 +37,6 @@
#include <qinstaller.h>
#include <qinstallercomponent.h>
-#include <KDUpdater/Application>
-#include <KDUpdater/PackagesInfo>
-
#include <QtCore/QPointer>
#include <QtCore/QTimer>
@@ -47,6 +44,7 @@
using namespace QInstaller;
+
// -- TabController::Private
class TabController::Private
@@ -55,24 +53,22 @@ public:
Private();
~Private();
- QHash<QString, QString> m_params;
+ bool m_init;
bool m_updaterInitialized;
bool m_packageManagerInitialized;
- bool m_init;
QPointer<QInstaller::Gui> m_gui;
QInstaller::Installer *m_installer;
- KDUpdater::Application *m_app;
+
QString m_controlScript;
+ QHash<QString, QString> m_params;
};
TabController::Private::Private()
- :
- m_updaterInitialized(false),
- m_packageManagerInitialized(false),
- m_init(false),
- m_gui(0),
- m_installer(0),
- m_app(0)
+ : m_init(false)
+ , m_updaterInitialized(false)
+ , m_packageManagerInitialized(false)
+ , m_gui(0)
+ , m_installer(0)
{
}
@@ -107,11 +103,6 @@ void TabController::setControlScript (const QString &script)
d->m_controlScript = script;
}
-void TabController::setApplication(KDUpdater::Application *app)
-{
- d->m_app = app;
-}
-
void TabController::setInstaller(QInstaller::Installer *installer)
{
d->m_installer = installer;
diff --git a/installerbuilder/installerbase/tabcontroller.h b/installerbuilder/installerbase/tabcontroller.h
index e68a1c3a2..a88e956de 100644
--- a/installerbuilder/installerbase/tabcontroller.h
+++ b/installerbuilder/installerbase/tabcontroller.h
@@ -34,10 +34,6 @@ namespace QInstaller {
class Installer;
}
-namespace KDUpdater {
- class Application;
-}
-
class TabController : public QObject
{
Q_OBJECT
@@ -49,7 +45,6 @@ public:
void setInstallerGui(QInstaller::Gui *gui);
void setControlScript(const QString &script);
- void setApplication(KDUpdater::Application *app);
void setInstaller(QInstaller::Installer *installer);
void setInstallerParams(const QHash<QString, QString> &params);