diff options
Diffstat (limited to 'src/libs/installer')
41 files changed, 68 insertions, 49 deletions
diff --git a/src/libs/installer/consumeoutputoperation.cpp b/src/libs/installer/consumeoutputoperation.cpp index 4e8fc56aa..5c1aedb93 100644 --- a/src/libs/installer/consumeoutputoperation.cpp +++ b/src/libs/installer/consumeoutputoperation.cpp @@ -43,7 +43,8 @@ using namespace QInstaller; -ConsumeOutputOperation::ConsumeOutputOperation() +ConsumeOutputOperation::ConsumeOutputOperation(PackageManagerCore *core) + : UpdateOperation(core) { setName(QLatin1String("ConsumeOutput")); } diff --git a/src/libs/installer/consumeoutputoperation.h b/src/libs/installer/consumeoutputoperation.h index bb8c28b0d..d887dd579 100644 --- a/src/libs/installer/consumeoutputoperation.h +++ b/src/libs/installer/consumeoutputoperation.h @@ -42,7 +42,7 @@ namespace QInstaller { class INSTALLER_EXPORT ConsumeOutputOperation : public Operation { public: - ConsumeOutputOperation(); + explicit ConsumeOutputOperation(PackageManagerCore *core); void backup(); bool performOperation(); diff --git a/src/libs/installer/copydirectoryoperation.cpp b/src/libs/installer/copydirectoryoperation.cpp index a30874da0..ac5fee269 100644 --- a/src/libs/installer/copydirectoryoperation.cpp +++ b/src/libs/installer/copydirectoryoperation.cpp @@ -52,7 +52,8 @@ public: }; -CopyDirectoryOperation::CopyDirectoryOperation() +CopyDirectoryOperation::CopyDirectoryOperation(PackageManagerCore *core) + : UpdateOperation(core) { setName(QLatin1String("CopyDirectory")); } diff --git a/src/libs/installer/copydirectoryoperation.h b/src/libs/installer/copydirectoryoperation.h index e9f5f32eb..ebed11c48 100644 --- a/src/libs/installer/copydirectoryoperation.h +++ b/src/libs/installer/copydirectoryoperation.h @@ -46,7 +46,7 @@ class INSTALLER_EXPORT CopyDirectoryOperation : public QObject, public Operation Q_OBJECT public: - CopyDirectoryOperation(); + explicit CopyDirectoryOperation(PackageManagerCore *core); void backup(); bool performOperation(); diff --git a/src/libs/installer/createdesktopentryoperation.cpp b/src/libs/installer/createdesktopentryoperation.cpp index f2892dd19..a3bcd1b51 100644 --- a/src/libs/installer/createdesktopentryoperation.cpp +++ b/src/libs/installer/createdesktopentryoperation.cpp @@ -97,7 +97,8 @@ QString CreateDesktopEntryOperation::absoluteFileName() return QDir(directory).absoluteFilePath(filename); } -CreateDesktopEntryOperation::CreateDesktopEntryOperation() +CreateDesktopEntryOperation::CreateDesktopEntryOperation(PackageManagerCore *core) + : UpdateOperation(core) { setName(QLatin1String("CreateDesktopEntry")); } diff --git a/src/libs/installer/createdesktopentryoperation.h b/src/libs/installer/createdesktopentryoperation.h index a40964566..bc0548cb0 100644 --- a/src/libs/installer/createdesktopentryoperation.h +++ b/src/libs/installer/createdesktopentryoperation.h @@ -42,7 +42,7 @@ namespace QInstaller { class INSTALLER_EXPORT CreateDesktopEntryOperation : public Operation { public: - CreateDesktopEntryOperation(); + explicit CreateDesktopEntryOperation(PackageManagerCore *core); ~CreateDesktopEntryOperation(); void backup(); diff --git a/src/libs/installer/createlinkoperation.cpp b/src/libs/installer/createlinkoperation.cpp index d60b7106c..2d7c45705 100644 --- a/src/libs/installer/createlinkoperation.cpp +++ b/src/libs/installer/createlinkoperation.cpp @@ -40,7 +40,8 @@ using namespace QInstaller; -CreateLinkOperation::CreateLinkOperation() +CreateLinkOperation::CreateLinkOperation(PackageManagerCore *core) + : UpdateOperation(core) { setName(QLatin1String("CreateLink")); } diff --git a/src/libs/installer/createlinkoperation.h b/src/libs/installer/createlinkoperation.h index eb57c6f0d..c0fcfd30a 100644 --- a/src/libs/installer/createlinkoperation.h +++ b/src/libs/installer/createlinkoperation.h @@ -42,7 +42,7 @@ namespace QInstaller { class INSTALLER_EXPORT CreateLinkOperation : public Operation { public: - CreateLinkOperation(); + explicit CreateLinkOperation(PackageManagerCore *core); void backup(); bool performOperation(); diff --git a/src/libs/installer/createlocalrepositoryoperation.cpp b/src/libs/installer/createlocalrepositoryoperation.cpp index 1cb35f208..5ce08c26f 100644 --- a/src/libs/installer/createlocalrepositoryoperation.cpp +++ b/src/libs/installer/createlocalrepositoryoperation.cpp @@ -140,7 +140,8 @@ static QString createArchive(const QString repoPath, const QString &sourceDir, c // -- CreateLocalRepositoryOperation -CreateLocalRepositoryOperation::CreateLocalRepositoryOperation() +CreateLocalRepositoryOperation::CreateLocalRepositoryOperation(PackageManagerCore *core) + : UpdateOperation(core) { setName(QLatin1String("CreateLocalRepository")); } @@ -189,7 +190,7 @@ bool CreateLocalRepositoryOperation::performOperation() setValue(QLatin1String("createddir"), mkDirOp.value(QLatin1String("createddir"))); // copy the whole meta data into local repository - CopyDirectoryOperation copyDirOp; + CopyDirectoryOperation copyDirOp(core); copyDirOp.setArguments(QStringList() << QLatin1String(":/metadata/") << repoPath); connect(©DirOp, &CopyDirectoryOperation::outputTextChanged, this, &CreateLocalRepositoryOperation::outputTextChanged); diff --git a/src/libs/installer/createlocalrepositoryoperation.h b/src/libs/installer/createlocalrepositoryoperation.h index 56ffc8fec..e85a4ea21 100644 --- a/src/libs/installer/createlocalrepositoryoperation.h +++ b/src/libs/installer/createlocalrepositoryoperation.h @@ -47,7 +47,7 @@ class INSTALLER_EXPORT CreateLocalRepositoryOperation : public QObject, public O friend struct AutoHelper; public: - CreateLocalRepositoryOperation(); + explicit CreateLocalRepositoryOperation(PackageManagerCore *core); void backup(); bool performOperation(); diff --git a/src/libs/installer/createshortcutoperation.cpp b/src/libs/installer/createshortcutoperation.cpp index d51548d45..692b30aa4 100644 --- a/src/libs/installer/createshortcutoperation.cpp +++ b/src/libs/installer/createshortcutoperation.cpp @@ -158,8 +158,9 @@ static bool createLink(const QString &fileName, const QString &linkName, QString // -- CreateShortcutOperation -CreateShortcutOperation::CreateShortcutOperation() - : m_optionalArgumentsRead(false) +CreateShortcutOperation::CreateShortcutOperation(PackageManagerCore *core) + : UpdateOperation(core) + , m_optionalArgumentsRead(false) { setName(QLatin1String("CreateShortcut")); } diff --git a/src/libs/installer/createshortcutoperation.h b/src/libs/installer/createshortcutoperation.h index 49577812a..c39d9cbb4 100644 --- a/src/libs/installer/createshortcutoperation.h +++ b/src/libs/installer/createshortcutoperation.h @@ -42,7 +42,7 @@ namespace QInstaller { class INSTALLER_EXPORT CreateShortcutOperation : public Operation { public: - CreateShortcutOperation(); + explicit CreateShortcutOperation(PackageManagerCore *core); void backup(); bool performOperation(); diff --git a/src/libs/installer/elevatedexecuteoperation.cpp b/src/libs/installer/elevatedexecuteoperation.cpp index a3d33e907..06bf51f82 100644 --- a/src/libs/installer/elevatedexecuteoperation.cpp +++ b/src/libs/installer/elevatedexecuteoperation.cpp @@ -64,8 +64,9 @@ public: bool showStandardError; }; -ElevatedExecuteOperation::ElevatedExecuteOperation() - : d(new Private(this)) +ElevatedExecuteOperation::ElevatedExecuteOperation(PackageManagerCore *core) + : UpdateOperation(core) + , d(new Private(this)) { // this operation has to "overwrite" the Execute operation from KDUpdater setName(QLatin1String("Execute")); diff --git a/src/libs/installer/elevatedexecuteoperation.h b/src/libs/installer/elevatedexecuteoperation.h index 63663ef54..176d33f82 100644 --- a/src/libs/installer/elevatedexecuteoperation.h +++ b/src/libs/installer/elevatedexecuteoperation.h @@ -44,13 +44,13 @@ class INSTALLER_EXPORT ElevatedExecuteOperation : public QObject, public Operati Q_OBJECT public: - ElevatedExecuteOperation(); + explicit ElevatedExecuteOperation(PackageManagerCore *core); ~ElevatedExecuteOperation(); - - virtual void backup(); - virtual bool performOperation(); - virtual bool undoOperation(); - virtual bool testOperation(); + + void backup() Q_DECL_OVERRIDE; + bool performOperation() Q_DECL_OVERRIDE; + bool undoOperation() Q_DECL_OVERRIDE; + bool testOperation() Q_DECL_OVERRIDE; Q_SIGNALS: void cancelProcess(); diff --git a/src/libs/installer/environmentvariablesoperation.cpp b/src/libs/installer/environmentvariablesoperation.cpp index f962a6f73..8817bec9e 100644 --- a/src/libs/installer/environmentvariablesoperation.cpp +++ b/src/libs/installer/environmentvariablesoperation.cpp @@ -46,7 +46,8 @@ using namespace QInstaller; using namespace KDUpdater; -EnvironmentVariableOperation::EnvironmentVariableOperation() +EnvironmentVariableOperation::EnvironmentVariableOperation(PackageManagerCore *core) + : UpdateOperation(core) { setName(QLatin1String("EnvironmentVariable")); } diff --git a/src/libs/installer/environmentvariablesoperation.h b/src/libs/installer/environmentvariablesoperation.h index b52ee92d1..f3ceb5ece 100644 --- a/src/libs/installer/environmentvariablesoperation.h +++ b/src/libs/installer/environmentvariablesoperation.h @@ -42,7 +42,7 @@ namespace QInstaller { class INSTALLER_EXPORT EnvironmentVariableOperation : public Operation { public: - EnvironmentVariableOperation(); + explicit EnvironmentVariableOperation(PackageManagerCore *core); void backup(); bool performOperation(); diff --git a/src/libs/installer/extractarchiveoperation.cpp b/src/libs/installer/extractarchiveoperation.cpp index 344dd1b92..ca09f6856 100644 --- a/src/libs/installer/extractarchiveoperation.cpp +++ b/src/libs/installer/extractarchiveoperation.cpp @@ -42,7 +42,8 @@ using namespace QInstaller; -ExtractArchiveOperation::ExtractArchiveOperation() +ExtractArchiveOperation::ExtractArchiveOperation(PackageManagerCore *core) + : UpdateOperation(core) { setName(QLatin1String("Extract")); } diff --git a/src/libs/installer/extractarchiveoperation.h b/src/libs/installer/extractarchiveoperation.h index 2e2af2e5a..c7ceeffa0 100644 --- a/src/libs/installer/extractarchiveoperation.h +++ b/src/libs/installer/extractarchiveoperation.h @@ -47,7 +47,7 @@ class INSTALLER_EXPORT ExtractArchiveOperation : public QObject, public Operatio friend class WorkerThread; public: - ExtractArchiveOperation(); + explicit ExtractArchiveOperation(PackageManagerCore *core); void backup(); bool performOperation(); diff --git a/src/libs/installer/fakestopprocessforupdateoperation.cpp b/src/libs/installer/fakestopprocessforupdateoperation.cpp index 4f348f606..d9a4b637f 100644 --- a/src/libs/installer/fakestopprocessforupdateoperation.cpp +++ b/src/libs/installer/fakestopprocessforupdateoperation.cpp @@ -40,7 +40,8 @@ using namespace KDUpdater; using namespace QInstaller; -FakeStopProcessForUpdateOperation::FakeStopProcessForUpdateOperation() +FakeStopProcessForUpdateOperation::FakeStopProcessForUpdateOperation(PackageManagerCore *core) + : UpdateOperation(core) { setName(QLatin1String("FakeStopProcessForUpdate")); } diff --git a/src/libs/installer/fakestopprocessforupdateoperation.h b/src/libs/installer/fakestopprocessforupdateoperation.h index 87df0716a..612c5a234 100644 --- a/src/libs/installer/fakestopprocessforupdateoperation.h +++ b/src/libs/installer/fakestopprocessforupdateoperation.h @@ -44,7 +44,7 @@ class INSTALLER_EXPORT FakeStopProcessForUpdateOperation : public QObject, publi Q_OBJECT public: - FakeStopProcessForUpdateOperation(); + explicit FakeStopProcessForUpdateOperation(PackageManagerCore *core); void backup(); bool performOperation(); diff --git a/src/libs/installer/globalsettingsoperation.cpp b/src/libs/installer/globalsettingsoperation.cpp index c96331937..01514d331 100644 --- a/src/libs/installer/globalsettingsoperation.cpp +++ b/src/libs/installer/globalsettingsoperation.cpp @@ -37,7 +37,8 @@ using namespace QInstaller; -GlobalSettingsOperation::GlobalSettingsOperation() +GlobalSettingsOperation::GlobalSettingsOperation(PackageManagerCore *core) + : UpdateOperation(core) { setName(QLatin1String("GlobalConfig")); } diff --git a/src/libs/installer/globalsettingsoperation.h b/src/libs/installer/globalsettingsoperation.h index 10f2276f4..12db5d409 100644 --- a/src/libs/installer/globalsettingsoperation.h +++ b/src/libs/installer/globalsettingsoperation.h @@ -43,7 +43,7 @@ class QSettingsWrapper; class INSTALLER_EXPORT GlobalSettingsOperation : public Operation { public: - GlobalSettingsOperation(); + explicit GlobalSettingsOperation(PackageManagerCore *core); void backup(); bool performOperation(); diff --git a/src/libs/installer/installiconsoperation.cpp b/src/libs/installer/installiconsoperation.cpp index 6240640f2..b4426fe6a 100644 --- a/src/libs/installer/installiconsoperation.cpp +++ b/src/libs/installer/installiconsoperation.cpp @@ -92,7 +92,8 @@ QString InstallIconsOperation::targetDirectory() return directory; } -InstallIconsOperation::InstallIconsOperation() +InstallIconsOperation::InstallIconsOperation(PackageManagerCore *core) + : UpdateOperation(core) { setName(QLatin1String("InstallIcons")); } diff --git a/src/libs/installer/installiconsoperation.h b/src/libs/installer/installiconsoperation.h index 9f5058087..f51ccbf3c 100644 --- a/src/libs/installer/installiconsoperation.h +++ b/src/libs/installer/installiconsoperation.h @@ -45,7 +45,7 @@ class INSTALLER_EXPORT InstallIconsOperation : public QObject, public Operation { Q_OBJECT public: - InstallIconsOperation(); + explicit InstallIconsOperation(PackageManagerCore *core); ~InstallIconsOperation(); void backup(); diff --git a/src/libs/installer/licenseoperation.cpp b/src/libs/installer/licenseoperation.cpp index fec4292b7..89ffd2706 100644 --- a/src/libs/installer/licenseoperation.cpp +++ b/src/libs/installer/licenseoperation.cpp @@ -43,7 +43,8 @@ using namespace QInstaller; -LicenseOperation::LicenseOperation() +LicenseOperation::LicenseOperation(PackageManagerCore *core) + : UpdateOperation(core) { setName(QLatin1String("License")); } diff --git a/src/libs/installer/licenseoperation.h b/src/libs/installer/licenseoperation.h index 21a994ca3..e03e1d02c 100644 --- a/src/libs/installer/licenseoperation.h +++ b/src/libs/installer/licenseoperation.h @@ -42,7 +42,7 @@ namespace QInstaller { class INSTALLER_EXPORT LicenseOperation : public Operation { public: - LicenseOperation(); + explicit LicenseOperation(PackageManagerCore *core); void backup(); bool performOperation(); diff --git a/src/libs/installer/linereplaceoperation.cpp b/src/libs/installer/linereplaceoperation.cpp index 4c41544f1..2780391c1 100644 --- a/src/libs/installer/linereplaceoperation.cpp +++ b/src/libs/installer/linereplaceoperation.cpp @@ -40,7 +40,8 @@ using namespace QInstaller; -LineReplaceOperation::LineReplaceOperation() +LineReplaceOperation::LineReplaceOperation(PackageManagerCore *core) + : UpdateOperation(core) { setName(QLatin1String("LineReplace")); } diff --git a/src/libs/installer/linereplaceoperation.h b/src/libs/installer/linereplaceoperation.h index c5c23db37..93089956e 100644 --- a/src/libs/installer/linereplaceoperation.h +++ b/src/libs/installer/linereplaceoperation.h @@ -42,7 +42,7 @@ namespace QInstaller { class INSTALLER_EXPORT LineReplaceOperation : public Operation { public: - LineReplaceOperation(); + explicit LineReplaceOperation(PackageManagerCore *core); void backup(); bool performOperation(); diff --git a/src/libs/installer/minimumprogressoperation.cpp b/src/libs/installer/minimumprogressoperation.cpp index d791352d7..83cf98b3a 100644 --- a/src/libs/installer/minimumprogressoperation.cpp +++ b/src/libs/installer/minimumprogressoperation.cpp @@ -36,7 +36,8 @@ using namespace QInstaller; -MinimumProgressOperation::MinimumProgressOperation() +MinimumProgressOperation::MinimumProgressOperation(PackageManagerCore *core) + : UpdateOperation(core) { // This shouldn't be callable by script, but we need a name for the binary format setName(QLatin1String("MinimumProgress")); diff --git a/src/libs/installer/minimumprogressoperation.h b/src/libs/installer/minimumprogressoperation.h index e5083d2c2..3e1c89e8b 100644 --- a/src/libs/installer/minimumprogressoperation.h +++ b/src/libs/installer/minimumprogressoperation.h @@ -46,7 +46,7 @@ class MinimumProgressOperation : public QObject, public Operation Q_OBJECT public: - MinimumProgressOperation(); + explicit MinimumProgressOperation(PackageManagerCore *core); void backup(); bool performOperation(); diff --git a/src/libs/installer/packagemanagercore_p.cpp b/src/libs/installer/packagemanagercore_p.cpp index c252f4a95..6ead82443 100644 --- a/src/libs/installer/packagemanagercore_p.cpp +++ b/src/libs/installer/packagemanagercore_p.cpp @@ -243,7 +243,6 @@ PackageManagerCorePrivate::PackageManagerCorePrivate(PackageManagerCore *core, q qWarning() << "Failed to load XML for operation" << operation.name; continue; } - op->setPackageManager(core); m_performedOperationsOld.append(op.take()); } diff --git a/src/libs/installer/registerfiletypeoperation.cpp b/src/libs/installer/registerfiletypeoperation.cpp index ce3c11135..6784703aa 100644 --- a/src/libs/installer/registerfiletypeoperation.cpp +++ b/src/libs/installer/registerfiletypeoperation.cpp @@ -80,7 +80,8 @@ static QVariantHash readHive(QSettingsWrapper *const settings, const QString &hi // -- RegisterFileTypeOperation -RegisterFileTypeOperation::RegisterFileTypeOperation() +RegisterFileTypeOperation::RegisterFileTypeOperation(PackageManagerCore *core) + : UpdateOperation(core) { setName(QLatin1String("RegisterFileType")); } diff --git a/src/libs/installer/registerfiletypeoperation.h b/src/libs/installer/registerfiletypeoperation.h index 46ee26385..8b1475d0c 100644 --- a/src/libs/installer/registerfiletypeoperation.h +++ b/src/libs/installer/registerfiletypeoperation.h @@ -44,7 +44,7 @@ class INSTALLER_EXPORT RegisterFileTypeOperation : public QObject, public Operat Q_OBJECT public: - RegisterFileTypeOperation(); + explicit RegisterFileTypeOperation(PackageManagerCore *core); void backup(); bool performOperation(); diff --git a/src/libs/installer/replaceoperation.cpp b/src/libs/installer/replaceoperation.cpp index bd9c1ec3b..b07a8a3c7 100644 --- a/src/libs/installer/replaceoperation.cpp +++ b/src/libs/installer/replaceoperation.cpp @@ -40,7 +40,8 @@ using namespace QInstaller; -ReplaceOperation::ReplaceOperation() +ReplaceOperation::ReplaceOperation(PackageManagerCore *core) + : UpdateOperation(core) { setName(QLatin1String("Replace")); } diff --git a/src/libs/installer/replaceoperation.h b/src/libs/installer/replaceoperation.h index dfde133b1..1537d283e 100644 --- a/src/libs/installer/replaceoperation.h +++ b/src/libs/installer/replaceoperation.h @@ -42,7 +42,7 @@ namespace QInstaller { class INSTALLER_EXPORT ReplaceOperation : public Operation { public: - ReplaceOperation(); + explicit ReplaceOperation(PackageManagerCore *core); void backup(); bool performOperation(); diff --git a/src/libs/installer/selfrestartoperation.cpp b/src/libs/installer/selfrestartoperation.cpp index 8177cf167..4c6965176 100644 --- a/src/libs/installer/selfrestartoperation.cpp +++ b/src/libs/installer/selfrestartoperation.cpp @@ -39,7 +39,8 @@ using namespace QInstaller; -SelfRestartOperation::SelfRestartOperation() +SelfRestartOperation::SelfRestartOperation(PackageManagerCore *core) + : UpdateOperation(core) { setName(QLatin1String("SelfRestart")); } diff --git a/src/libs/installer/selfrestartoperation.h b/src/libs/installer/selfrestartoperation.h index d49073d3f..50505c660 100644 --- a/src/libs/installer/selfrestartoperation.h +++ b/src/libs/installer/selfrestartoperation.h @@ -42,7 +42,7 @@ namespace QInstaller { class INSTALLER_EXPORT SelfRestartOperation : public Operation { public: - SelfRestartOperation(); + explicit SelfRestartOperation(PackageManagerCore *core); void backup(); bool performOperation(); diff --git a/src/libs/installer/settingsoperation.cpp b/src/libs/installer/settingsoperation.cpp index 97a353f44..9884a95e9 100644 --- a/src/libs/installer/settingsoperation.cpp +++ b/src/libs/installer/settingsoperation.cpp @@ -41,7 +41,8 @@ using namespace QInstaller; -SettingsOperation::SettingsOperation() +SettingsOperation::SettingsOperation(PackageManagerCore *core) + : UpdateOperation(core) { setName(QLatin1String("Settings")); } diff --git a/src/libs/installer/settingsoperation.h b/src/libs/installer/settingsoperation.h index dfaca4594..ef238b17a 100644 --- a/src/libs/installer/settingsoperation.h +++ b/src/libs/installer/settingsoperation.h @@ -42,7 +42,7 @@ namespace QInstaller { class INSTALLER_EXPORT SettingsOperation : public Operation { public: - SettingsOperation(); + explicit SettingsOperation(PackageManagerCore *core); void backup(); bool performOperation(); diff --git a/src/libs/installer/simplemovefileoperation.cpp b/src/libs/installer/simplemovefileoperation.cpp index 75078b84e..f69801f9e 100644 --- a/src/libs/installer/simplemovefileoperation.cpp +++ b/src/libs/installer/simplemovefileoperation.cpp @@ -39,7 +39,8 @@ namespace QInstaller { -SimpleMoveFileOperation::SimpleMoveFileOperation() +SimpleMoveFileOperation::SimpleMoveFileOperation(PackageManagerCore *core) + : UpdateOperation(core) { setName(QLatin1String("SimpleMoveFile")); } diff --git a/src/libs/installer/simplemovefileoperation.h b/src/libs/installer/simplemovefileoperation.h index c02ffbe6f..8c0f9075b 100644 --- a/src/libs/installer/simplemovefileoperation.h +++ b/src/libs/installer/simplemovefileoperation.h @@ -46,7 +46,7 @@ class INSTALLER_EXPORT SimpleMoveFileOperation : public QObject, public Operatio Q_OBJECT public: - SimpleMoveFileOperation(); + explicit SimpleMoveFileOperation(PackageManagerCore *core); void backup(); bool performOperation(); |