diff options
Diffstat (limited to 'installerbuilder')
52 files changed, 189 insertions, 213 deletions
diff --git a/installerbuilder/archivegen/archive.cpp b/installerbuilder/archivegen/archive.cpp index 310999a27..9355646a0 100644 --- a/installerbuilder/archivegen/archive.cpp +++ b/installerbuilder/archivegen/archive.cpp @@ -29,12 +29,12 @@ ** Nokia at qt-info@nokia.com. ** **************************************************************************/ +#include "common/repositorygen.h" -#include <common/errors.h> -#include <common/utils.h> -#include <common/repositorygen.h> +#include <errors.h> #include <init.h> #include <lib7z_facade.h> +#include <utils.h> #include <QtCore/QCoreApplication> #include <QtCore/QFileInfo> diff --git a/installerbuilder/archivegen/archivegen.pro b/installerbuilder/archivegen/archivegen.pro index 6ee903da7..f3584e6c3 100644 --- a/installerbuilder/archivegen/archivegen.pro +++ b/installerbuilder/archivegen/archivegen.pro @@ -1,7 +1,7 @@ TEMPLATE = app TARGET = archivegen DEPENDPATH += . .. ../common -INCLUDEPATH += . .. +INCLUDEPATH += . .. ../common DESTDIR = ../bin @@ -14,5 +14,5 @@ include(../libinstaller/libinstaller.pri) # Input SOURCES += archive.cpp \ - ../common/repositorygen.cpp -HEADERS += ../common/repositorygen.h + repositorygen.cpp +HEADERS += repositorygen.h diff --git a/installerbuilder/binarycreator/binarycreator.cpp b/installerbuilder/binarycreator/binarycreator.cpp index fab3a207a..322e372be 100644 --- a/installerbuilder/binarycreator/binarycreator.cpp +++ b/installerbuilder/binarycreator/binarycreator.cpp @@ -29,14 +29,16 @@ ** Nokia at qt-info@nokia.com. ** **************************************************************************/ -#include <common/binaryformat.h> -#include <common/errors.h> -#include <common/fileutils.h> -#include <common/repositorygen.h> -#include <common/utils.h> +#include "common/repositorygen.h" + +#include <binaryformat.h> +#include <errors.h> +#include <fileutils.h> #include <init.h> -#include <kdsavefile.h> #include <settings.h> +#include <utils.h> + +#include <kdsavefile.h> #include <QtCore/QDirIterator> #include <QtCore/QProcess> diff --git a/installerbuilder/binarycreator/binarycreator.pro b/installerbuilder/binarycreator/binarycreator.pro index 7145ace41..2544da588 100644 --- a/installerbuilder/binarycreator/binarycreator.pro +++ b/installerbuilder/binarycreator/binarycreator.pro @@ -1,8 +1,8 @@ TEMPLATE = app TARGET = binarycreator -DEPENDPATH += . .. -INCLUDEPATH += . .. rcc +DEPENDPATH += . .. rcc ../common +INCLUDEPATH += . .. rcc ../common DESTDIR = ../bin @@ -15,8 +15,7 @@ RESOURCES += binarycreator.qrc # Input SOURCES = binarycreator.cpp \ - rcc/rcc.cpp \ - rcc/rccmain.cpp \ - ../common/repositorygen.cpp - -HEADERS = rcc/rcc.h + rcc.cpp \ + rccmain.cpp \ + repositorygen.cpp +HEADERS = rcc.h diff --git a/installerbuilder/common/repositorygen.cpp b/installerbuilder/common/repositorygen.cpp index b4610f3a4..f5465cc47 100644 --- a/installerbuilder/common/repositorygen.cpp +++ b/installerbuilder/common/repositorygen.cpp @@ -29,13 +29,15 @@ ** Nokia at qt-info@nokia.com. ** **************************************************************************/ -#include <common/fileutils.h> -#include <common/errors.h> -#include <common/repositorygen.h> -#include <kdupdater.h> +#include "repositorygen.h" + +#include <fileutils.h> +#include <errors.h> #include <lib7z_facade.h> #include <settings.h> +#include <kdupdater.h> + #include <QtCore/QCryptographicHash> #include <QtCore/QDirIterator> diff --git a/installerbuilder/installerbase/installerbase.cpp b/installerbuilder/installerbase/installerbase.cpp index 62b1165e6..bee26e329 100644 --- a/installerbuilder/installerbase/installerbase.cpp +++ b/installerbuilder/installerbase/installerbase.cpp @@ -29,16 +29,14 @@ ** Nokia at qt-info@nokia.com. ** **************************************************************************/ - #include "installerbase_p.h" #include "installerbasecommons.h" #include "tabcontroller.h" -#include <common/binaryformat.h> -#include <common/errors.h> -#include <common/fileutils.h> -#include <common/utils.h> +#include <binaryformat.h> +#include <errors.h> +#include <fileutils.h> #include <fsengineserver.h> #include <init.h> #include <lib7z_facade.h> @@ -47,11 +45,12 @@ #include <packagemanagergui.h> #include <qinstallerglobal.h> #include <settings.h> +#include <utils.h> #include <updater.h> #include <kdselfrestarter.h> #include <kdrunoncechecker.h> -#include "kdupdaterfiledownloaderfactory.h" +#include <kdupdaterfiledownloaderfactory.h> #include <QtCore/QTranslator> #include <QtGui/QMessageBox> diff --git a/installerbuilder/installerbase/installerbase_p.cpp b/installerbuilder/installerbase/installerbase_p.cpp index 5482c137a..611e491bf 100644 --- a/installerbuilder/installerbase/installerbase_p.cpp +++ b/installerbuilder/installerbase/installerbase_p.cpp @@ -29,21 +29,19 @@ ** Nokia at qt-info@nokia.com. ** **************************************************************************/ - #include "installerbase_p.h" -#include <common/binaryformat.h> -#include <common/errors.h> -#include <common/fileutils.h> -#include <common/utils.h> +#include <binaryformat.h> +#include <errors.h> +#include <fileutils.h> #include <lib7z_facade.h> #include <qprocesswrapper.h> +#include <utils.h> +#include <kdsavefile.h> #include <kdupdaterfiledownloader.h> #include <kdupdaterfiledownloaderfactory.h> -#include <kdsavefile.h> - #include <QtCore/QDir> #include <QtCore/QDebug> #include <QtCore/QTemporaryFile> @@ -56,19 +54,19 @@ #include <iostream> #ifdef Q_OS_WIN -#include <wincon.h> +# include <wincon.h> -#ifndef ENABLE_INSERT_MODE -# define ENABLE_INSERT_MODE 0x0020 -#endif +# ifndef ENABLE_INSERT_MODE +# define ENABLE_INSERT_MODE 0x0020 +# endif -#ifndef ENABLE_QUICK_EDIT_MODE -# define ENABLE_QUICK_EDIT_MODE 0x0040 -#endif +# ifndef ENABLE_QUICK_EDIT_MODE +# define ENABLE_QUICK_EDIT_MODE 0x0040 +# endif -#ifndef ENABLE_EXTENDED_FLAGS -# define ENABLE_EXTENDED_FLAGS 0x0080 -#endif +# ifndef ENABLE_EXTENDED_FLAGS +# define ENABLE_EXTENDED_FLAGS 0x0080 +# endif #endif using namespace KDUpdater; diff --git a/installerbuilder/installerbase/installerbasecommons.cpp b/installerbuilder/installerbase/installerbasecommons.cpp index 3cb8a44a3..76a27cb90 100644 --- a/installerbuilder/installerbase/installerbasecommons.cpp +++ b/installerbuilder/installerbase/installerbasecommons.cpp @@ -29,7 +29,6 @@ ** Nokia at qt-info@nokia.com. ** **************************************************************************/ - #include "installerbasecommons.h" #include <component.h> diff --git a/installerbuilder/installerbase/settingsdialog.h b/installerbuilder/installerbase/settingsdialog.h index bb0ef0a7d..a222ecf87 100644 --- a/installerbuilder/installerbase/settingsdialog.h +++ b/installerbuilder/installerbase/settingsdialog.h @@ -29,14 +29,14 @@ ** Nokia at qt-info@nokia.com. ** **************************************************************************/ - #ifndef SETTINGSDIALOG_H #define SETTINGSDIALOG_H -#include <common/repository.h> -#include <kdjob.h> +#include <repository.h> #include <settings.h> +#include <kdjob.h> + #include <QtGui/QDialog> #include <QtGui/QStyledItemDelegate> #include <QtGui/QTreeWidgetItem> diff --git a/installerbuilder/installerbase/tabcontroller.cpp b/installerbuilder/installerbase/tabcontroller.cpp index 19fb12b8d..200de2359 100644 --- a/installerbuilder/installerbase/tabcontroller.cpp +++ b/installerbuilder/installerbase/tabcontroller.cpp @@ -29,7 +29,6 @@ ** Nokia at qt-info@nokia.com. ** **************************************************************************/ - #include "tabcontroller.h" #include "installerbasecommons.h" diff --git a/installerbuilder/libinstaller/3rdparty/7zip/lib7z_facade.cpp b/installerbuilder/libinstaller/3rdparty/7zip/lib7z_facade.cpp index 285f9bbbb..c679572fd 100644 --- a/installerbuilder/libinstaller/3rdparty/7zip/lib7z_facade.cpp +++ b/installerbuilder/libinstaller/3rdparty/7zip/lib7z_facade.cpp @@ -1,7 +1,10 @@ #include "lib7z_facade.h" +#include "errors.h" +#include "fileutils.h" + #ifndef Q_OS_WIN -#include "StdAfx.h" +# include "StdAfx.h" #endif #include "Common/MyInitGuid.h" @@ -36,9 +39,6 @@ #include "Windows/PropVariant.h" #include "Windows/PropVariantConversions.h" -#include <common/errors.h> -#include <common/fileutils.h> - #include <QtCore/QCoreApplication> #include <QtCore/QDebug> #include <QtCore/QDir> diff --git a/installerbuilder/libinstaller/3rdparty/7zip/lib7z_facade.h b/installerbuilder/libinstaller/3rdparty/7zip/lib7z_facade.h index 855648aa2..58774df11 100644 --- a/installerbuilder/libinstaller/3rdparty/7zip/lib7z_facade.h +++ b/installerbuilder/libinstaller/3rdparty/7zip/lib7z_facade.h @@ -1,21 +1,21 @@ #ifndef LIB7Z_FACADE_H #define LIB7Z_FACADE_H -#include <QCoreApplication> -#include <QDateTime> -#include <QFile> -#include <QString> -#include <QRunnable> -#include <QVector> -#include <QVariant> -#include <QPoint> - -#include <stdexcept> -#include <string> +#include "installer_global.h" #include "Common/MyWindows.h" -#include "../../installerbuilder/libinstaller/installer_global.h" +#include <QtCore/QCoreApplication> +#include <QtCore/QDateTime> +#include <QtCore/QFile> +#include <QtCore/QPoint> +#include <QtCore/QRunnable> +#include <QtCore/QString> +#include <QtCore/QVector> +#include <QtCore/QVariant> + +#include <stdexcept> +#include <string> QT_BEGIN_NAMESPACE class QStringList; diff --git a/installerbuilder/libinstaller/adminauthorization_win.cpp b/installerbuilder/libinstaller/adminauthorization_win.cpp index 21a592b89..7cfd6b3dc 100644 --- a/installerbuilder/libinstaller/adminauthorization_win.cpp +++ b/installerbuilder/libinstaller/adminauthorization_win.cpp @@ -29,10 +29,9 @@ ** Nokia at qt-info@nokia.com. ** **************************************************************************/ - #include "adminauthorization.h" -#include <common/utils.h> +#include "utils.h" #include <QtCore/QDebug> #include <QtCore/QDir> diff --git a/installerbuilder/common/binaryformat.cpp b/installerbuilder/libinstaller/binaryformat.cpp index 133df3690..133df3690 100644 --- a/installerbuilder/common/binaryformat.cpp +++ b/installerbuilder/libinstaller/binaryformat.cpp diff --git a/installerbuilder/common/binaryformat.h b/installerbuilder/libinstaller/binaryformat.h index e2e1f6a0f..e2e1f6a0f 100644 --- a/installerbuilder/common/binaryformat.h +++ b/installerbuilder/libinstaller/binaryformat.h diff --git a/installerbuilder/common/binaryformatengine.cpp b/installerbuilder/libinstaller/binaryformatengine.cpp index 05affaf4b..05affaf4b 100644 --- a/installerbuilder/common/binaryformatengine.cpp +++ b/installerbuilder/libinstaller/binaryformatengine.cpp diff --git a/installerbuilder/common/binaryformatengine.h b/installerbuilder/libinstaller/binaryformatengine.h index d5ac18a45..d5ac18a45 100644 --- a/installerbuilder/common/binaryformatengine.h +++ b/installerbuilder/libinstaller/binaryformatengine.h diff --git a/installerbuilder/common/binaryformatenginehandler.cpp b/installerbuilder/libinstaller/binaryformatenginehandler.cpp index 2b1bbcad4..2b1bbcad4 100644 --- a/installerbuilder/common/binaryformatenginehandler.cpp +++ b/installerbuilder/libinstaller/binaryformatenginehandler.cpp diff --git a/installerbuilder/common/binaryformatenginehandler.h b/installerbuilder/libinstaller/binaryformatenginehandler.h index 82269eda9..82269eda9 100644 --- a/installerbuilder/common/binaryformatenginehandler.h +++ b/installerbuilder/libinstaller/binaryformatenginehandler.h diff --git a/installerbuilder/libinstaller/component.cpp b/installerbuilder/libinstaller/component.cpp index 39021fab0..4c57e981b 100644 --- a/installerbuilder/libinstaller/component.cpp +++ b/installerbuilder/libinstaller/component.cpp @@ -29,11 +29,10 @@ ** Nokia at qt-info@nokia.com. ** **************************************************************************/ - #include "component.h" -#include "common/errors.h" -#include "common/fileutils.h" +#include "errors.h" +#include "fileutils.h" #include "fsengineclient.h" #include "lib7z_facade.h" #include "packagemanagercore.h" diff --git a/installerbuilder/libinstaller/createdesktopentryoperation.cpp b/installerbuilder/libinstaller/createdesktopentryoperation.cpp index da2a253c2..feda777cc 100644 --- a/installerbuilder/libinstaller/createdesktopentryoperation.cpp +++ b/installerbuilder/libinstaller/createdesktopentryoperation.cpp @@ -29,18 +29,18 @@ ** Nokia at qt-info@nokia.com. ** **************************************************************************/ - #include "createdesktopentryoperation.h" -#include "common/errors.h" -#include "common/fileutils.h" - -#include <QDir> -#include <QFile> -#include <QFileInfo> -#include <QTextStream> -#include <QProcess> + +#include "errors.h" +#include "fileutils.h" + +#include <QtCore/QDir> +#include <QtCore/QFile> +#include <QtCore/QFileInfo> +#include <QtCore/QTextStream> +#include <QtCore/QProcess> #if QT_VERSION >= 0x040600 -#include <QProcessEnvironment> +# include <QtCore/QProcessEnvironment> #endif using namespace QInstaller; diff --git a/installerbuilder/libinstaller/createlocalrepositoryoperation.cpp b/installerbuilder/libinstaller/createlocalrepositoryoperation.cpp index 5e4af2fb1..a0527f432 100644 --- a/installerbuilder/libinstaller/createlocalrepositoryoperation.cpp +++ b/installerbuilder/libinstaller/createlocalrepositoryoperation.cpp @@ -31,14 +31,15 @@ **************************************************************************/ #include "createlocalrepositoryoperation.h" -#include "common/binaryformat.h" -#include "common/errors.h" -#include "common/fileutils.h" +#include "binaryformat.h" +#include "errors.h" +#include "fileutils.h" #include "copydirectoryoperation.h" -#include "kdupdaterupdateoperations.h" #include "lib7z_facade.h" #include "packagemanagercore.h" +#include "kdupdaterupdateoperations.h" + #include <QtCore/QDir> #include <QtCore/QDirIterator> diff --git a/installerbuilder/libinstaller/createshortcutoperation.cpp b/installerbuilder/libinstaller/createshortcutoperation.cpp index 7d553792f..bd0608233 100644 --- a/installerbuilder/libinstaller/createshortcutoperation.cpp +++ b/installerbuilder/libinstaller/createshortcutoperation.cpp @@ -29,24 +29,24 @@ ** Nokia at qt-info@nokia.com. ** **************************************************************************/ +#include "createshortcutoperation.h" -#include <kdupdaterapplication.h> -#include <kdupdaterpackagesinfo.h> +#include "errors.h" +#include "fileutils.h" -#include "createshortcutoperation.h" -#include "common/errors.h" -#include "common/fileutils.h" +#include "kdupdaterapplication.h" +#include "kdupdaterpackagesinfo.h" -#include <QDir> -#include <QFileInfo> -#include <QTemporaryFile> +#include <QtCore/QDir> +#include <QtCore/QFileInfo> +#include <QtCore/QTemporaryFile> #include <algorithm> #include <cerrno> #ifdef Q_WS_WIN -#include <windows.h> -#include <shlobj.h> +# include <windows.h> +# include <shlobj.h> #endif using namespace QInstaller; diff --git a/installerbuilder/libinstaller/downloadarchivesjob.cpp b/installerbuilder/libinstaller/downloadarchivesjob.cpp index 19417c3e6..f33108442 100644 --- a/installerbuilder/libinstaller/downloadarchivesjob.cpp +++ b/installerbuilder/libinstaller/downloadarchivesjob.cpp @@ -29,16 +29,15 @@ ** Nokia at qt-info@nokia.com. ** **************************************************************************/ - #include "downloadarchivesjob.h" -#include "common/binaryformatenginehandler.h" +#include "binaryformatenginehandler.h" #include "component.h" #include "messageboxhandler.h" #include "packagemanagercore.h" -#include <kdupdaterfiledownloader.h> -#include <kdupdaterfiledownloaderfactory.h> +#include "kdupdaterfiledownloader.h" +#include "kdupdaterfiledownloaderfactory.h" #include <QtCore/QFile> #include <QtCore/QTimerEvent> diff --git a/installerbuilder/common/errors.h b/installerbuilder/libinstaller/errors.h index 09ad52b14..09ad52b14 100644 --- a/installerbuilder/common/errors.h +++ b/installerbuilder/libinstaller/errors.h diff --git a/installerbuilder/libinstaller/extractarchiveoperation_p.h b/installerbuilder/libinstaller/extractarchiveoperation_p.h index bbb750630..25c38e61e 100644 --- a/installerbuilder/libinstaller/extractarchiveoperation_p.h +++ b/installerbuilder/libinstaller/extractarchiveoperation_p.h @@ -29,15 +29,14 @@ ** Nokia at qt-info@nokia.com. ** **************************************************************************/ - #ifndef EXTRACTARCHIVEOPERATION_P_H #define EXTRACTARCHIVEOPERATION_P_H #include "extractarchiveoperation.h" +#include "fileutils.h" #include "lib7z_facade.h" #include "packagemanagercore.h" -#include "common/fileutils.h" #include <QtCore/QDir> #include <QtCore/QFile> diff --git a/installerbuilder/common/fileutils.cpp b/installerbuilder/libinstaller/fileutils.cpp index 96cc15e2b..b07b5b08f 100644 --- a/installerbuilder/common/fileutils.cpp +++ b/installerbuilder/libinstaller/fileutils.cpp @@ -29,10 +29,9 @@ ** Nokia at qt-info@nokia.com. ** **************************************************************************/ - #include "fileutils.h" -#include <common/errors.h> +#include <errors.h> #include <QtCore/QDateTime> #include <QtCore/QDir> diff --git a/installerbuilder/common/fileutils.h b/installerbuilder/libinstaller/fileutils.h index 4e634a210..4e634a210 100644 --- a/installerbuilder/common/fileutils.h +++ b/installerbuilder/libinstaller/fileutils.h diff --git a/installerbuilder/libinstaller/fsengineserver.cpp b/installerbuilder/libinstaller/fsengineserver.cpp index 06c63b283..19539334c 100644 --- a/installerbuilder/libinstaller/fsengineserver.cpp +++ b/installerbuilder/libinstaller/fsengineserver.cpp @@ -29,10 +29,9 @@ ** Nokia at qt-info@nokia.com. ** **************************************************************************/ - #include "fsengineserver.h" -#include <common/utils.h> +#include "utils.h" #include <QtCore/QCoreApplication> #include <QtCore/QFSFileEngine> diff --git a/installerbuilder/libinstaller/getrepositoriesmetainfojob.h b/installerbuilder/libinstaller/getrepositoriesmetainfojob.h index 968e0f129..e44032b48 100644 --- a/installerbuilder/libinstaller/getrepositoriesmetainfojob.h +++ b/installerbuilder/libinstaller/getrepositoriesmetainfojob.h @@ -29,22 +29,20 @@ ** Nokia at qt-info@nokia.com. ** **************************************************************************/ - #ifndef GETREPOSITORIESMETAINFOJOB_H #define GETREPOSITORIESMETAINFOJOB_H -#include <kdjob.h> +#include "fileutils.h" +#include "installer_global.h" +#include "repository.h" + +#include "kdjob.h" #include <QtCore/QList> #include <QtCore/QPointer> #include <QtCore/QString> #include <QtCore/QStringList> -#include <common/fileutils.h> -#include <common/repository.h> - -#include "installer_global.h" - namespace KDUpdater { class FileDownloader; } diff --git a/installerbuilder/libinstaller/getrepositorymetainfojob.cpp b/installerbuilder/libinstaller/getrepositorymetainfojob.cpp index 421db52b8..a72a861a0 100644 --- a/installerbuilder/libinstaller/getrepositorymetainfojob.cpp +++ b/installerbuilder/libinstaller/getrepositorymetainfojob.cpp @@ -29,18 +29,17 @@ ** Nokia at qt-info@nokia.com. ** **************************************************************************/ - #include "getrepositorymetainfojob.h" #include "constants.h" -#include "common/errors.h" +#include "errors.h" #include "lib7z_facade.h" #include "messageboxhandler.h" #include "packagemanagercore_p.h" #include "qinstallerglobal.h" -#include <kdupdaterfiledownloader.h> -#include <kdupdaterfiledownloaderfactory.h> +#include "kdupdaterfiledownloader.h" +#include "kdupdaterfiledownloaderfactory.h" #include <QtCore/QFile> #include <QtCore/QTimer> diff --git a/installerbuilder/libinstaller/getrepositorymetainfojob.h b/installerbuilder/libinstaller/getrepositorymetainfojob.h index c30de9828..aec94603d 100644 --- a/installerbuilder/libinstaller/getrepositorymetainfojob.h +++ b/installerbuilder/libinstaller/getrepositorymetainfojob.h @@ -29,22 +29,20 @@ ** Nokia at qt-info@nokia.com. ** **************************************************************************/ - #ifndef GETREPOSITORYMETAINFOJOB_H #define GETREPOSITORYMETAINFOJOB_H -#include <kdjob.h> +#include "fileutils.h" +#include "installer_global.h" +#include "repository.h" + +#include "kdjob.h" #include <QtCore/QPointer> #include <QtCore/QString> #include <QtCore/QStringList> #include <QtCore/QThreadPool> -#include <common/fileutils.h> -#include <common/repository.h> - -#include "installer_global.h" - namespace KDUpdater { class FileDownloader; } diff --git a/installerbuilder/libinstaller/init.cpp b/installerbuilder/libinstaller/init.cpp index f71facf5b..5a464684a 100644 --- a/installerbuilder/libinstaller/init.cpp +++ b/installerbuilder/libinstaller/init.cpp @@ -29,7 +29,6 @@ ** Nokia at qt-info@nokia.com. ** **************************************************************************/ - #include "init.h" #include "createshortcutoperation.h" @@ -69,15 +68,15 @@ #include "minimumprogressoperation.h" #ifdef Q_OS_MAC - #include "macreplaceinstallnamesoperation.h" +# include "macreplaceinstallnamesoperation.h" #endif // Q_OS_MAC -#include "common/utils.h" +#include "utils.h" -#include <kdupdaterupdateoperation.h> -#include <kdupdaterupdateoperationfactory.h> -#include <kdupdaterfiledownloader.h> -#include <kdupdaterfiledownloaderfactory.h> +#include "kdupdaterupdateoperation.h" +#include "kdupdaterupdateoperationfactory.h" +#include "kdupdaterfiledownloader.h" +#include "kdupdaterfiledownloaderfactory.h" #include <QtPlugin> #include <QNetworkProxyFactory> diff --git a/installerbuilder/libinstaller/installiconsoperation.cpp b/installerbuilder/libinstaller/installiconsoperation.cpp index 50c8454ba..c2fee33eb 100644 --- a/installerbuilder/libinstaller/installiconsoperation.cpp +++ b/installerbuilder/libinstaller/installiconsoperation.cpp @@ -29,19 +29,18 @@ ** Nokia at qt-info@nokia.com. ** **************************************************************************/ - #include "installiconsoperation.h" -#include "common/fileutils.h" +#include "fileutils.h" #include "packagemanagercore.h" #include <QtCore/QDir> #include <QtCore/QDirIterator> #if QT_VERSION >= 0x040600 -#include <QProcessEnvironment> +# include <QProcessEnvironment> #else -#include <QProcess> +# include <QProcess> #endif using namespace QInstaller; diff --git a/installerbuilder/libinstaller/libinstaller.pro b/installerbuilder/libinstaller/libinstaller.pro index 10f58d409..7a01e0a5f 100644 --- a/installerbuilder/libinstaller/libinstaller.pro +++ b/installerbuilder/libinstaller/libinstaller.pro @@ -1,11 +1,9 @@ TEMPLATE = lib TARGET = installer -DEPENDPATH += . \ - .. \ - ../common -INCLUDEPATH += . \ - .. +INCLUDEPATH += . .. +DEPENDPATH += . .. 3rdparty/kdtools + DESTDIR = $$OUT_PWD/../lib DLLDESTDIR = $$OUT_PWD/../bin @@ -29,16 +27,16 @@ contains(CONFIG, static): { include(3rdparty/7zip/7zip.pri) include(3rdparty/kdtools/kdtools.pri) -HEADERS += $$PWD/packagemanagercore.h \ - $$PWD/packagemanagercore_p.h \ - $$PWD/packagemanagergui.h \ - ../common/binaryformat.h \ - ../common/binaryformatengine.h \ - ../common/binaryformatenginehandler.h \ - ../common/repository.h \ - ../common/zipjob.h \ - ../common/utils.h \ - ../common/errors.h \ +HEADERS += packagemanagercore.h \ + packagemanagercore_p.h \ + packagemanagergui.h \ + binaryformat.h \ + binaryformatengine.h \ + binaryformatenginehandler.h \ + repository.h \ + zipjob.h \ + utils.h \ + errors.h \ component.h \ componentmodel.h \ qinstallerglobal.h \ @@ -101,16 +99,16 @@ HEADERS += $$PWD/packagemanagercore.h \ packagemanagerproxyfactory.h \ createlocalrepositoryoperation.h -SOURCES += $$PWD/packagemanagercore.cpp \ - $$PWD/packagemanagercore_p.cpp \ - $$PWD/packagemanagergui.cpp \ - ../common/binaryformat.cpp \ - ../common/binaryformatengine.cpp \ - ../common/binaryformatenginehandler.cpp \ - ../common/repository.cpp \ - ../common/zipjob.cpp \ - ../common/fileutils.cpp \ - ../common/utils.cpp \ +SOURCES += packagemanagercore.cpp \ + packagemanagercore_p.cpp \ + packagemanagergui.cpp \ + binaryformat.cpp \ + binaryformatengine.cpp \ + binaryformatenginehandler.cpp \ + repository.cpp \ + zipjob.cpp \ + fileutils.cpp \ + utils.cpp \ component.cpp \ componentmodel.cpp \ qtpatch.cpp \ diff --git a/installerbuilder/libinstaller/operationrunner.cpp b/installerbuilder/libinstaller/operationrunner.cpp index b9dd3cea0..26e7e6b02 100644 --- a/installerbuilder/libinstaller/operationrunner.cpp +++ b/installerbuilder/libinstaller/operationrunner.cpp @@ -29,18 +29,17 @@ ** Nokia at qt-info@nokia.com. ** **************************************************************************/ - #include "operationrunner.h" -#include "common/errors.h" -#include "common/binaryformat.h" -#include "common/utils.h" +#include "binaryformat.h" #include "component.h" +#include "errors.h" #include "init.h" #include "packagemanagercore.h" +#include "utils.h" -#include <kdupdaterupdateoperation.h> -#include <kdupdaterupdateoperationfactory.h> +#include "kdupdaterupdateoperation.h" +#include "kdupdaterupdateoperationfactory.h" #include <iostream> diff --git a/installerbuilder/libinstaller/packagemanagercore.cpp b/installerbuilder/libinstaller/packagemanagercore.cpp index b47708c7a..8b871c61e 100644 --- a/installerbuilder/libinstaller/packagemanagercore.cpp +++ b/installerbuilder/libinstaller/packagemanagercore.cpp @@ -29,15 +29,13 @@ ** Nokia at qt-info@nokia.com. ** **************************************************************************/ - #include "packagemanagercore.h" #include "adminauthorization.h" -#include "common/binaryformat.h" -#include "common/errors.h" -#include "common/utils.h" +#include "binaryformat.h" #include "component.h" #include "downloadarchivesjob.h" +#include "errors.h" #include "fsengineclient.h" #include "getrepositoriesmetainfojob.h" #include "messageboxhandler.h" @@ -48,6 +46,7 @@ #include "qprocesswrapper.h" #include "qsettingswrapper.h" #include "settings.h" +#include "utils.h" #include <QtCore/QTemporaryFile> @@ -56,11 +55,11 @@ #include <QtScript/QScriptEngine> #include <QtScript/QScriptContext> -#include <kdsysinfo.h> -#include <kdupdaterupdateoperationfactory.h> +#include "kdsysinfo.h" +#include "kdupdaterupdateoperationfactory.h" #ifdef Q_OS_WIN -#include "qt_windows.h" +# include "qt_windows.h" #endif using namespace QInstaller; diff --git a/installerbuilder/libinstaller/packagemanagercore.h b/installerbuilder/libinstaller/packagemanagercore.h index 13509b6b1..4e02b3ba3 100644 --- a/installerbuilder/libinstaller/packagemanagercore.h +++ b/installerbuilder/libinstaller/packagemanagercore.h @@ -29,11 +29,10 @@ ** Nokia at qt-info@nokia.com. ** **************************************************************************/ - #ifndef PACKAGEMANAGERCORE_H #define PACKAGEMANAGERCORE_H -#include "common/repository.h" +#include "repository.h" #include "qinstallerglobal.h" #include <QtCore/QHash> diff --git a/installerbuilder/libinstaller/packagemanagercore_p.cpp b/installerbuilder/libinstaller/packagemanagercore_p.cpp index abb1523a9..765db4e4e 100644 --- a/installerbuilder/libinstaller/packagemanagercore_p.cpp +++ b/installerbuilder/libinstaller/packagemanagercore_p.cpp @@ -29,14 +29,13 @@ ** Nokia at qt-info@nokia.com. ** **************************************************************************/ - #include "packagemanagercore_p.h" #include "adminauthorization.h" -#include "common/binaryformat.h" -#include "common/errors.h" -#include "common/fileutils.h" +#include "binaryformat.h" #include "component.h" +#include "errors.h" +#include "fileutils.h" #include "fsengineclient.h" #include "messageboxhandler.h" #include "packagemanagercore.h" @@ -44,12 +43,12 @@ #include "qprocesswrapper.h" #include "qsettingswrapper.h" -#include <kdsavefile.h> -#include <kdselfrestarter.h> +#include "kdsavefile.h" +#include "kdselfrestarter.h" #include "kdupdaterfiledownloaderfactory.h" -#include <kdupdaterupdatesourcesinfo.h> -#include <kdupdaterupdateoperationfactory.h> -#include <kdupdaterupdatefinder.h> +#include "kdupdaterupdatesourcesinfo.h" +#include "kdupdaterupdateoperationfactory.h" +#include "kdupdaterupdatefinder.h" #include <QtCore/QtConcurrentRun> #include <QtCore/QCoreApplication> diff --git a/installerbuilder/libinstaller/packagemanagergui.cpp b/installerbuilder/libinstaller/packagemanagergui.cpp index 3fb88bee8..a041c9838 100644 --- a/installerbuilder/libinstaller/packagemanagergui.cpp +++ b/installerbuilder/libinstaller/packagemanagergui.cpp @@ -29,23 +29,21 @@ ** Nokia at qt-info@nokia.com. ** **************************************************************************/ - #include "packagemanagergui.h" #include "component.h" #include "componentmodel.h" +#include "errors.h" +#include "fileutils.h" #include "messageboxhandler.h" #include "packagemanagercore.h" #include "qinstallerglobal.h" #include "progresscoordinator.h" #include "performinstallationform.h" #include "settings.h" +#include "utils.h" -#include "common/errors.h" -#include "common/utils.h" -#include "common/fileutils.h" - -#include <kdsysinfo.h> +#include "kdsysinfo.h" #include <QtCore/QDir> #include <QtCore/QDynamicPropertyChangeEvent> diff --git a/installerbuilder/common/range.h b/installerbuilder/libinstaller/range.h index f97aa0317..f97aa0317 100644 --- a/installerbuilder/common/range.h +++ b/installerbuilder/libinstaller/range.h diff --git a/installerbuilder/common/repository.cpp b/installerbuilder/libinstaller/repository.cpp index cc80a20d9..cc80a20d9 100644 --- a/installerbuilder/common/repository.cpp +++ b/installerbuilder/libinstaller/repository.cpp diff --git a/installerbuilder/common/repository.h b/installerbuilder/libinstaller/repository.h index 432a851c4..432a851c4 100644 --- a/installerbuilder/common/repository.h +++ b/installerbuilder/libinstaller/repository.h diff --git a/installerbuilder/libinstaller/settings.cpp b/installerbuilder/libinstaller/settings.cpp index 6507c0e7d..ace61761e 100644 --- a/installerbuilder/libinstaller/settings.cpp +++ b/installerbuilder/libinstaller/settings.cpp @@ -29,12 +29,11 @@ ** Nokia at qt-info@nokia.com. ** **************************************************************************/ - #include "settings.h" -#include "common/errors.h" -#include "common/repository.h" +#include "errors.h" #include "qinstallerglobal.h" +#include "repository.h" #include <QtCore/QFileInfo> #include <QtCore/QStringList> diff --git a/installerbuilder/libinstaller/updater.cpp b/installerbuilder/libinstaller/updater.cpp index 519c6d18f..ec0564a8f 100644 --- a/installerbuilder/libinstaller/updater.cpp +++ b/installerbuilder/libinstaller/updater.cpp @@ -29,16 +29,16 @@ ** Nokia at qt-info@nokia.com. ** **************************************************************************/ - #include "updater.h" -#include "common/binaryformat.h" -#include "common/utils.h" +#include "binaryformat.h" #include "component.h" #include "init.h" #include "packagemanagercore.h" +#include "utils.h" #include <QtCore/QDebug> + #include <QtXml/QDomDocument> #include <iostream> diff --git a/installerbuilder/libinstaller/updatesettings.cpp b/installerbuilder/libinstaller/updatesettings.cpp index 078db3adb..f06a1fa87 100644 --- a/installerbuilder/libinstaller/updatesettings.cpp +++ b/installerbuilder/libinstaller/updatesettings.cpp @@ -29,11 +29,10 @@ ** Nokia at qt-info@nokia.com. ** **************************************************************************/ - #include "updatesettings.h" -#include "common/errors.h" -#include "common/repository.h" +#include "errors.h" +#include "repository.h" #include "settings.h" #include <QtCore/QDateTime> diff --git a/installerbuilder/common/utils.cpp b/installerbuilder/libinstaller/utils.cpp index 4bd93430f..4bd93430f 100644 --- a/installerbuilder/common/utils.cpp +++ b/installerbuilder/libinstaller/utils.cpp diff --git a/installerbuilder/common/utils.h b/installerbuilder/libinstaller/utils.h index cbf2e95e7..cbf2e95e7 100644 --- a/installerbuilder/common/utils.h +++ b/installerbuilder/libinstaller/utils.h diff --git a/installerbuilder/common/zipjob.cpp b/installerbuilder/libinstaller/zipjob.cpp index 064c6a7b1..bcc617d31 100644 --- a/installerbuilder/common/zipjob.cpp +++ b/installerbuilder/libinstaller/zipjob.cpp @@ -29,13 +29,12 @@ ** Nokia at qt-info@nokia.com. ** **************************************************************************/ +#include <zipjob.h> -#include <common/zipjob.h> - -#include <QDebug> -#include <QDir> -#include <QStringList> -#include <QMetaType> +#include <QtCore/QDebug> +#include <QtCore/QDir> +#include <QtCore/QMetaType> +#include <QtCore/QStringList> #include <cassert> #include <climits> diff --git a/installerbuilder/common/zipjob.h b/installerbuilder/libinstaller/zipjob.h index 72ab40796..72ab40796 100644 --- a/installerbuilder/common/zipjob.h +++ b/installerbuilder/libinstaller/zipjob.h diff --git a/installerbuilder/repogen/repogen.cpp b/installerbuilder/repogen/repogen.cpp index 3613ea52b..3101c658e 100644 --- a/installerbuilder/repogen/repogen.cpp +++ b/installerbuilder/repogen/repogen.cpp @@ -29,12 +29,13 @@ ** Nokia at qt-info@nokia.com. ** **************************************************************************/ -#include <common/errors.h> -#include <common/fileutils.h> -#include <common/repositorygen.h> -#include <common/utils.h> -#include <settings.h> +#include "common/repositorygen.h" + +#include <errors.h> +#include <fileutils.h> #include <init.h> +#include <settings.h> +#include <utils.h> #include <lib7z_facade.h> #include <QtCore/QDir> diff --git a/installerbuilder/repogen/repogen.pro b/installerbuilder/repogen/repogen.pro index 7d656e656..fb0bbe097 100644 --- a/installerbuilder/repogen/repogen.pro +++ b/installerbuilder/repogen/repogen.pro @@ -1,7 +1,7 @@ TEMPLATE = app TARGET = repogen DEPENDPATH += . .. ../common -INCLUDEPATH += . .. +INCLUDEPATH += . .. ../common DESTDIR = ../bin @@ -14,5 +14,5 @@ include(../libinstaller/libinstaller.pri) # Input SOURCES += repogen.cpp \ - ../common/repositorygen.cpp -HEADERS += ../common/repositorygen.h + repositorygen.cpp +HEADERS += repositorygen.h |