Operations -> OperationList

10 files changed, 25 insertions, 25 deletions

diff --git a/installerbuilder/common/binaryformat.cpp b/installerbuilder/common/binaryformat.cpp
index ee71d3384..a93202d85 100644
--- a/installerbuilder/common/binaryformat.cpp
+++ b/installerbuilder/common/binaryformat.cpp
@@ -1040,7 +1040,7 @@ int BinaryContent::registerEmbeddedQResources()
     Returns the operations performed during installation. Returns an empty list if no operations are
     performed or the binary is the installer application.
 */
-Operations BinaryContent::performedOperations() const
+OperationList BinaryContent::performedOperations() const
 {
     return m_performedOperations.toList();
 }
diff --git a/installerbuilder/common/binaryformat.h b/installerbuilder/common/binaryformat.h
index c47ddf798..1269eb18b 100644
--- a/installerbuilder/common/binaryformat.h
+++ b/installerbuilder/common/binaryformat.h
@@ -195,7 +195,7 @@ public:
 
     qint64 magicmaker() const;
     int registerEmbeddedQResources();
-    Operations performedOperations() const;
+    OperationList performedOperations() const;
 
 private:
     static void readBinaryData(BinaryContent &content, const QSharedPointer<QFile> &file,
diff --git a/installerbuilder/libinstaller/component.cpp b/installerbuilder/libinstaller/component.cpp
index 887543dcb..6c27db625 100644
--- a/installerbuilder/libinstaller/component.cpp
+++ b/installerbuilder/libinstaller/component.cpp
@@ -727,7 +727,7 @@ QStringList Component::stopProcessForUpdateRequests() const
     Returns the operations needed to install this component. If autoCreateOperations is true,
     createOperations is called, if no operations have been auto-created yet.
 */
-Operations Component::operations() const
+OperationList Component::operations() const
 {
     if (d->m_autoCreateOperations && !d->m_operationsCreated) {
         const_cast<Component*>(this)->createOperations();
diff --git a/installerbuilder/libinstaller/component.h b/installerbuilder/libinstaller/component.h
index 5ea5a6957..e0b32002a 100644
--- a/installerbuilder/libinstaller/component.h
+++ b/installerbuilder/libinstaller/component.h
@@ -128,7 +128,7 @@ public:
     Q_INVOKABLE QList<QPair<QString, bool> > pathesForUninstallation() const;
     Q_INVOKABLE void registerPathForUninstallation(const QString &path, bool wipe = false);
 
-    Operations operations() const;
+    OperationList operations() const;
 
     void addOperation(Operation *operation);
     Q_INVOKABLE bool addOperation(const QString &operation, const QString &parameter1 = QString(),
diff --git a/installerbuilder/libinstaller/component_p.h b/installerbuilder/libinstaller/component_p.h
index e8f9a982b..d9f6ab911 100644
--- a/installerbuilder/libinstaller/component_p.h
+++ b/installerbuilder/libinstaller/component_p.h
@@ -61,7 +61,7 @@ public:
 
     PackageManagerCore *m_core;
     Component *m_parentComponent;
-    Operations m_operations;
+    OperationList m_operations;
     Operation *m_licenseOperation;
     Operation *m_minimumProgressOperation;
 
diff --git a/installerbuilder/libinstaller/packagemanagercore.cpp b/installerbuilder/libinstaller/packagemanagercore.cpp
index 0e9ca7e26..d3b6792fe 100644
--- a/installerbuilder/libinstaller/packagemanagercore.cpp
+++ b/installerbuilder/libinstaller/packagemanagercore.cpp
@@ -577,7 +577,7 @@ PackageManagerCore::PackageManagerCore()
 {
 }
 
-PackageManagerCore::PackageManagerCore(qint64 magicmaker, const Operations &performedOperations)
+PackageManagerCore::PackageManagerCore(qint64 magicmaker, const OperationList &performedOperations)
     : d(new PackageManagerCorePrivate(this, magicmaker, performedOperations))
 {
     qRegisterMetaType<QInstaller::PackageManagerCore::Status>("QInstaller::PackageManagerCore::Status");
diff --git a/installerbuilder/libinstaller/packagemanagercore.h b/installerbuilder/libinstaller/packagemanagercore.h
index 879723350..a4327e1fd 100644
--- a/installerbuilder/libinstaller/packagemanagercore.h
+++ b/installerbuilder/libinstaller/packagemanagercore.h
@@ -60,7 +60,7 @@ class INSTALLER_EXPORT PackageManagerCore : public QObject
 
 public:
     explicit PackageManagerCore();
-    explicit PackageManagerCore(qint64 magicmaker, const Operations &oldOperations = Operations());
+    explicit PackageManagerCore(qint64 magicmaker, const OperationList &oldOperations = OperationList());
     ~PackageManagerCore();
 
     // status
diff --git a/installerbuilder/libinstaller/packagemanagercore_p.cpp b/installerbuilder/libinstaller/packagemanagercore_p.cpp
index d699fba89..4dec6a4f8 100644
--- a/installerbuilder/libinstaller/packagemanagercore_p.cpp
+++ b/installerbuilder/libinstaller/packagemanagercore_p.cpp
@@ -161,7 +161,7 @@ PackageManagerCorePrivate::PackageManagerCorePrivate(PackageManagerCore *core)
 }
 
 PackageManagerCorePrivate::PackageManagerCorePrivate(PackageManagerCore *core, qint64 magicInstallerMaker,
-        const Operations &performedOperations)
+        const OperationList &performedOperations)
     : m_updateFinder(0)
     , m_FSEngineClientHandler(initFSEngineClientHandler())
     , m_status(PackageManagerCore::Unfinished)
@@ -557,7 +557,7 @@ void PackageManagerCorePrivate::stopProcessesForUpdates(const QList<Component*>
     }
 }
 
-int PackageManagerCorePrivate::countProgressOperations(const Operations &operations)
+int PackageManagerCorePrivate::countProgressOperations(const OperationList &operations)
 {
     int operationCount = 0;
     foreach (Operation *operation, operations) {
@@ -673,7 +673,7 @@ void PackageManagerCorePrivate::writeUninstallerBinary(QFile *const input, qint6
 }
 
 void PackageManagerCorePrivate::writeUninstallerBinaryData(QIODevice *output, QFile *const input,
-    const Operations &performedOperations, const BinaryLayout &layout, bool compressOperations,
+    const OperationList &performedOperations, const BinaryLayout &layout, bool compressOperations,
     bool forceUncompressedResources)
 {
     const qint64 dataBlockStart = output->pos();
@@ -734,7 +734,7 @@ void PackageManagerCorePrivate::writeUninstallerBinaryData(QIODevice *output, QF
     appendInt64(output, MagicUninstallerMarker);
 }
 
-void PackageManagerCorePrivate::writeUninstaller(Operations performedOperations)
+void PackageManagerCorePrivate::writeUninstaller(OperationList performedOperations)
 {
     bool gainedAdminRights = false;
     QTemporaryFile tempAdminFile(targetDir() + QString::fromLatin1("/testjsfdjlkdsjflkdsjfldsjlfds")
@@ -1143,8 +1143,8 @@ void PackageManagerCorePrivate::runPackageUpdater()
             }
         }
 
-        Operations undoOperations;
-        Operations nonRevertedOperations;
+        OperationList undoOperations;
+        OperationList nonRevertedOperations;
         QHash<QString, Component*> componentsByName;
 
         // build a list of undo operations based on the checked state of the component
@@ -1262,7 +1262,7 @@ void PackageManagerCorePrivate::runUninstaller()
         if (!QFileInfo(installerBinaryPath()).isWritable() || !QFileInfo(componentsXmlPath()).isWritable())
             adminRightsGained = m_core->gainAdminRights();
 
-        Operations undoOperations;
+        OperationList undoOperations;
         bool updateAdminRights = false;
         foreach (Operation *op, m_performedOperationsOld) {
             undoOperations.prepend(op);
@@ -1339,7 +1339,7 @@ void PackageManagerCorePrivate::runUninstaller()
 void PackageManagerCorePrivate::installComponent(Component *component, double progressOperationSize,
     bool adminRightsGained)
 {
-    const Operations operations = component->operations();
+    const OperationList operations = component->operations();
     if (!component->operationsCreatedSuccessfully())
         m_core->setCanceled();
 
@@ -1524,7 +1524,7 @@ void PackageManagerCorePrivate::unregisterUninstaller()
 #endif
 }
 
-void PackageManagerCorePrivate::runUndoOperations(const Operations &undoOperations, double progressSize,
+void PackageManagerCorePrivate::runUndoOperations(const OperationList &undoOperations, double progressSize,
     bool adminRightsGained, bool deleteOperation)
 {
     KDUpdater::PackagesInfo &packages = *m_updaterApplication.packagesInfo();
diff --git a/installerbuilder/libinstaller/packagemanagercore_p.h b/installerbuilder/libinstaller/packagemanagercore_p.h
index 9643d69a0..0c1291d44 100644
--- a/installerbuilder/libinstaller/packagemanagercore_p.h
+++ b/installerbuilder/libinstaller/packagemanagercore_p.h
@@ -74,7 +74,7 @@ public:
 
     explicit PackageManagerCorePrivate(PackageManagerCore *core);
     explicit PackageManagerCorePrivate(PackageManagerCore *core, qint64 magicInstallerMaker,
-        const Operations &performedOperations);
+        const OperationList &performedOperations);
     ~PackageManagerCorePrivate();
 
     static bool isProcessRunning(const QString &name, const QList<KDSysInfo::ProcessInfo> &processes);
@@ -93,7 +93,7 @@ public:
     QString uninstallerName() const;
     QString installerBinaryPath() const;
     void readUninstallerIniFile(const QString &targetDir);
-    void writeUninstaller(Operations performedOperations);
+    void writeUninstaller(OperationList performedOperations);
 
     QString componentsXmlPath() const;
     QString configurationFileName() const;
@@ -119,7 +119,7 @@ public:
 
     void stopProcessesForUpdates(const QList<Component*> &components);
     int countProgressOperations(const QList<Component*> &components);
-    int countProgressOperations(const Operations &operations);
+    int countProgressOperations(const OperationList &operations);
     void connectOperationToInstaller(Operation* const operation, double progressOperationPartSize);
 
     Operation* createOwnedOperation(const QString &type);
@@ -169,9 +169,9 @@ public:
     QList<Component*> m_updaterComponents;
     QList<Component*> m_updaterComponentsDeps;
 
-    Operations m_ownedOperations;
-    Operations m_performedOperationsOld;
-    Operations m_performedOperationsCurrentSession;
+    OperationList m_ownedOperations;
+    OperationList m_performedOperationsOld;
+    OperationList m_performedOperationsCurrentSession;
 
 private:
     void deleteUninstaller();
@@ -179,10 +179,10 @@ private:
     void unregisterUninstaller();
 
     void writeUninstallerBinary(QFile *const input, qint64 size, bool writeBinaryLayout);
-    void writeUninstallerBinaryData(QIODevice *output, QFile *const input, const Operations &performed,
+    void writeUninstallerBinaryData(QIODevice *output, QFile *const input, const OperationList &performed,
         const BinaryLayout &layout, bool compressOperations, bool forceUncompressedResources);
 
-    void runUndoOperations(const Operations &undoOperations, double undoOperationProgressSize,
+    void runUndoOperations(const OperationList &undoOperations, double undoOperationProgressSize,
         bool adminRightsGained, bool deleteOperation);
 
     PackageManagerCore::RemotePackages remotePackages();
diff --git a/installerbuilder/libinstaller/qinstallerglobal.h b/installerbuilder/libinstaller/qinstallerglobal.h
index c77cbd880..52092a396 100644
--- a/installerbuilder/libinstaller/qinstallerglobal.h
+++ b/installerbuilder/libinstaller/qinstallerglobal.h
@@ -58,7 +58,7 @@ enum INSTALLER_EXPORT JobError
 };
 
 typedef KDUpdater::UpdateOperation Operation;
-typedef QList<QInstaller::Operation*> Operations;
+typedef QList<QInstaller::Operation*> OperationList;
 
 QString uncaughtExceptionString(QScriptEngine *scriptEngine);
 QScriptValue qInstallerComponentByName(QScriptContext *context, QScriptEngine *engine);