diff options
author | kh1 <karsten.heimrich@nokia.com> | 2011-09-30 12:17:38 +0200 |
---|---|---|
committer | Karsten Heimrich <karsten.heimrich@nokia.com> | 2011-09-30 14:18:08 +0200 |
commit | 6f24db9d2372a27e2f57a8dac3266bde567953fe (patch) | |
tree | 45f4785b57d02ef2fa74807023f89fa4ea027be7 /installerbuilder/installerbase/installerbase.cpp | |
parent | 7cb720c413464af24d0c78e768f1164f2f91d7bf (diff) |
Move these into private source files, Include cleanup.
Change-Id: I8118c45a015f403a3f9aa28eff2e2b3cb795d1d4
Reviewed-on: http://codereview.qt-project.org/5862
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
Diffstat (limited to 'installerbuilder/installerbase/installerbase.cpp')
-rw-r--r-- | installerbuilder/installerbase/installerbase.cpp | 76 |
1 files changed, 16 insertions, 60 deletions
diff --git a/installerbuilder/installerbase/installerbase.cpp b/installerbuilder/installerbase/installerbase.cpp index 4256fae3e..50e645cc3 100644 --- a/installerbuilder/installerbase/installerbase.cpp +++ b/installerbuilder/installerbase/installerbase.cpp @@ -30,33 +30,32 @@ ** (qt-info@nokia.com). ** **************************************************************************/ -#include "common/binaryformat.h" -#include "common/errors.h" -#include "common/fileutils.h" -#include "common/utils.h" -#include "fsengineserver.h" -#include "init.h" +#include "installerbase_p.h" + #include "installerbasecommons.h" -#include "lib7z_facade.h" -#include "qinstallerglobal.h" -#include "packagemanagergui.h" #include "tabcontroller.h" -#include "updater.h" -#include "operationrunner.h" +#include <common/binaryformat.h> +#include <common/errors.h> +#include <common/fileutils.h> +#include <common/utils.h> +#include <fsengineserver.h> +#include <init.h> +#include <lib7z_facade.h> +#include <operationrunner.h> #include <packagemanagercore.h> +#include <packagemanagergui.h> +#include <qinstallerglobal.h> #include <settings.h> +#include <updater.h> -#include <QtCore/QTranslator> -#include <QtCore/QThread> +#include <KDToolsCore/KDSelfRestarter> +#include <KDToolsCore/KDRunOnceChecker> -#include <QtGui/QApplication> +#include <QtCore/QTranslator> #include <QtNetwork/QNetworkProxyFactory> -#include <KDToolsCore/KDSelfRestarter> -#include <KDToolsCore/KDRunOnceChecker> - #include <iostream> #define INSTALLERBASE_VERSION "2" @@ -64,49 +63,6 @@ using namespace QInstaller; using namespace QInstallerCreator; -class Sleep : public QThread -{ -public: - static void sleep(unsigned long ms) - { - QThread::usleep(ms); - } -}; - -class MyApplication : public QApplication { -public: - MyApplication(int& argc, char ** argv) : - QApplication(argc, argv) { } - virtual ~MyApplication() { } - - // reimplemented from QApplication so we can throw exceptions in scripts and slots - virtual bool notify(QObject * receiver, QEvent * event) { - try { - return QApplication::notify(receiver, event); - } catch(std::exception& e) { - qCritical() << "Exception thrown:" << e.what(); - } - return false; - } -}; - -class MyCoreApplication : public QCoreApplication { -public: - MyCoreApplication(int& argc, char ** argv) : - QCoreApplication(argc, argv) { } - virtual ~MyCoreApplication() { } - - // reimplemented from QCoreApplication so we can throw exceptions in scripts and slots - virtual bool notify(QObject * receiver, QEvent * event) { - try { - return QCoreApplication::notify(receiver, event); - } catch(std::exception& e) { - qCritical() << "Exception thrown:" << e.what(); - } - return false; - } -}; - static QList<Repository> repositories(const QStringList &arguments, const int index) { QList<Repository> repoList; |