Define some typedefs and hide the "Update"...

2 files changed, 5 insertions, 10 deletions

diff --git a/installerbuilder/common/binaryformat.cpp b/installerbuilder/common/binaryformat.cpp
index 42b77b9cc..ee71d3384 100644
--- a/installerbuilder/common/binaryformat.cpp
+++ b/installerbuilder/common/binaryformat.cpp
@@ -38,7 +38,6 @@
 #include "utils.h"
 #include "zipjob.h"
 
-#include <KDUpdater/UpdateOperation>
 #include <KDUpdater/UpdateOperationFactory>
 
 #include <QtCore/QResource>
@@ -966,7 +965,7 @@ void BinaryContent::readBinaryData(BinaryContent &content, const QSharedPointer<
 
     for (int i = 0; i < operationsCount; ++i) {
         const QString name = retrieveString(file.data());
-        KDUpdater::UpdateOperation *op = KDUpdater::UpdateOperationFactory::instance().create(name);
+        Operation *op = KDUpdater::UpdateOperationFactory::instance().create(name);
         Q_ASSERT_X(op, __FUNCTION__, QString::fromLatin1("Invalid operation name: %1").arg(name)
             .toLatin1());
 
@@ -1041,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.
 */
-QList<KDUpdater::UpdateOperation*> BinaryContent::performedOperations() const
+Operations BinaryContent::performedOperations() const
 {
     return m_performedOperations.toList();
 }
diff --git a/installerbuilder/common/binaryformat.h b/installerbuilder/common/binaryformat.h
index 65da83471..c47ddf798 100644
--- a/installerbuilder/common/binaryformat.h
+++ b/installerbuilder/common/binaryformat.h
@@ -27,8 +27,8 @@
 #define BINARYFORMAT_H
 
 #include "binaryformatenginehandler.h"
-#include "installer_global.h"
 #include "range.h"
+#include "qinstallerglobal.h"
 
 #include <QtCore/QCoreApplication>
 #include <QtCore/QFile>
@@ -37,10 +37,6 @@
 #include <QtCore/QVector>
 #include <QtCore/QSharedPointer>
 
-namespace KDUpdater {
-    class UpdateOperation;
-}
-
 namespace QInstaller {
     static const qint64 MagicInstallerMarker = 0x12023233UL;
     static const qint64 MagicUninstallerMarker = 0x12023234UL;
@@ -199,7 +195,7 @@ public:
 
     qint64 magicmaker() const;
     int registerEmbeddedQResources();
-    QList<KDUpdater::UpdateOperation*> performedOperations() const;
+    Operations performedOperations() const;
 
 private:
     static void readBinaryData(BinaryContent &content, const QSharedPointer<QFile> &file,
@@ -214,7 +210,7 @@ private:
     QVector<const uchar*> m_resourceMappings;
     qint64 m_magicmarker;
     qint64 m_dataBlockStart;
-    QStack<KDUpdater::UpdateOperation*> m_performedOperations;
+    QStack<Operation*> m_performedOperations;
 };
 
 }