Fix typo. magicmaker() -> magicMarker()

Change-Id: Ie822aef8943799497088bbc6949a2712a63b51c4
Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>

5 files changed, 10 insertions, 10 deletions

diff --git a/installerbuilder/common/binaryformat.cpp b/installerbuilder/common/binaryformat.cpp
index 0c210bc15..e5db08153 100644
--- a/installerbuilder/common/binaryformat.cpp
+++ b/installerbuilder/common/binaryformat.cpp
@@ -754,7 +754,7 @@ BinaryContent::BinaryContent(const QString &path)
     : m_binary(new QFile(path))
     , m_binaryFile(0)
     , handler(m_components)
-    , m_magicmarker(0)
+    , m_magicMarker(0)
     , m_dataBlockStart(0)
 {
 }
@@ -932,7 +932,7 @@ BinaryLayout BinaryContent::readBinaryLayout(QIODevice *const file, qint64 cooki
 void BinaryContent::readBinaryData(BinaryContent &content, const QSharedPointer<QFile> &file,
     const BinaryLayout &layout)
 {
-    content.m_magicmarker = layout.magicMarker;
+    content.m_magicMarker = layout.magicMarker;
     content.m_metadataResourceSegments = layout.metadataResourceSegments;
 
     const qint64 dataBlockStart = layout.endOfData - layout.dataBlockSize;
@@ -994,9 +994,9 @@ void BinaryContent::readBinaryData(BinaryContent &content, const QSharedPointer<
 /*!
     Returns the magic marker found in the binary. Returns 0 if no marker has been found.
 */
-qint64 BinaryContent::magicmaker() const
+qint64 BinaryContent::magicMarker() const
 {
-    return m_magicmarker;
+    return m_magicMarker;
 }
 
 /*!
diff --git a/installerbuilder/common/binaryformat.h b/installerbuilder/common/binaryformat.h
index 599662a63..222b220fb 100644
--- a/installerbuilder/common/binaryformat.h
+++ b/installerbuilder/common/binaryformat.h
@@ -201,7 +201,7 @@ public:
     static BinaryContent readFromBinary(const QString &path);
     static BinaryLayout readBinaryLayout(QIODevice *const file, qint64 cookiePos);
 
-    qint64 magicmaker() const;
+    qint64 magicMarker() const;
     int registerEmbeddedQResources();
     OperationList performedOperations() const;
 
@@ -216,7 +216,7 @@ private:
     QInstallerCreator::BinaryFormatEngineHandler handler;
     QVector<Range<qint64> > m_metadataResourceSegments;
     QVector<const uchar *> m_resourceMappings;
-    qint64 m_magicmarker;
+    qint64 m_magicMarker;
     qint64 m_dataBlockStart;
     QStack<Operation *> m_performedOperations;
 };
diff --git a/installerbuilder/installerbase/installerbase.cpp b/installerbuilder/installerbase/installerbase.cpp
index e1943e949..b4fbd0771 100644
--- a/installerbuilder/installerbase/installerbase.cpp
+++ b/installerbuilder/installerbase/installerbase.cpp
@@ -252,7 +252,7 @@ int main(int argc, char *argv[])
         content.registerEmbeddedQResources();
 
         // instantiate the installer we are actually going to use
-        QInstaller::PackageManagerCore core(content.magicmaker(), content.performedOperations());
+        QInstaller::PackageManagerCore core(content.magicMarker(), content.performedOperations());
         Settings m_settings = Settings(Settings::fromFileAndPrefix(QLatin1String(":/metadata/installer-config/config.xml"),
             QLatin1String(":/metadata/installer-config/")));
 
diff --git a/installerbuilder/libinstaller/operationrunner.cpp b/installerbuilder/libinstaller/operationrunner.cpp
index 19ec17c80..012f2e785 100644
--- a/installerbuilder/libinstaller/operationrunner.cpp
+++ b/installerbuilder/libinstaller/operationrunner.cpp
@@ -76,7 +76,7 @@ bool OperationRunner::init()
     try {
         BinaryContent content = BinaryContent::readFromApplicationFile();
         content.registerEmbeddedQResources();
-        m_core = new PackageManagerCore(content.magicmaker(), content.performedOperations());
+        m_core = new PackageManagerCore(content.magicMarker(), content.performedOperations());
     } catch (const Error &e) {
         std::cerr << qPrintable(e.message()) << std::endl;
         return false;
diff --git a/installerbuilder/libinstaller/updater.cpp b/installerbuilder/libinstaller/updater.cpp
index 918a216a1..f2b6b5092 100644
--- a/installerbuilder/libinstaller/updater.cpp
+++ b/installerbuilder/libinstaller/updater.cpp
@@ -62,12 +62,12 @@ bool Updater::checkForUpdates()
     BinaryContent content = BinaryContent::readFromApplicationFile();
     content.registerEmbeddedQResources();
 
-    if (content.magicmaker() == MagicInstallerMarker) {
+    if (content.magicMarker() == MagicInstallerMarker) {
         qDebug() << "Impossible to use an installer to check for updates!";
         return false;
     }
 
-    PackageManagerCore core(content.magicmaker(), content.performedOperations());
+    PackageManagerCore core(content.magicMarker(), content.performedOperations());
     core.setUpdater();
     PackageManagerCore::setVirtualComponentsVisible(true);