Reorder to match header file.

1 files changed, 33 insertions, 30 deletions

diff --git a/installerbuilder/common/binaryformat.cpp b/installerbuilder/common/binaryformat.cpp
index 9c6e8dadc..72ec4494e 100644
--- a/installerbuilder/common/binaryformat.cpp
+++ b/installerbuilder/common/binaryformat.cpp
@@ -639,11 +639,6 @@ bool Component::operator==(const Component& other) const
     return m_name == other.m_name && m_binarySegment == other.m_binarySegment;
 }
 
-Component ComponentIndex::componentByName(const QByteArray &id) const
-{
-    return m_components.value(id);
-}
-
 /*!
     Destroys this component.
  */
@@ -678,24 +673,31 @@ QSharedPointer<Archive> Component::archiveByName(const QByteArray &name) const
     return QSharedPointer<Archive>();
 }
 
-void ComponentIndex::insertComponent(const Component& c)
-{
-    m_components.insert(c.name(), c);
-}
 
-int ComponentIndex::componentCount() const
+// -- ComponentIndex
+
+ComponentIndex::ComponentIndex()
 {
-    return m_components.size();
 }
 
-void ComponentIndex::removeComponent(const QByteArray &name)
+ComponentIndex ComponentIndex::read(QIODevice *dev, qint64 offset)
 {
-    m_components.remove(name);
+    ComponentIndex result;
+    const qint64 size = retrieveInt64(dev);
+    for (int i = 0; i < size; ++i)
+        result.insertComponent(Component::readFromIndexEntry(dev, offset));
+    retrieveInt64(dev);
+    return result;
 }
 
-QVector<Component> ComponentIndex::components() const
+void ComponentIndex::writeIndex(QIODevice *out, qint64 offset) const
 {
-    return m_components.values().toVector();
+    // Q: why do we write the size twice?
+    // A: for us to be able to read it beginning from the end of the file as well
+    appendInt64(out, componentCount());
+    foreach (const Component& i, components())
+        i.writeIndexEntry(out, offset);
+    appendInt64(out, componentCount());
 }
 
 void ComponentIndex::writeComponentData(QIODevice *out, qint64 offset) const
@@ -706,31 +708,32 @@ void ComponentIndex::writeComponentData(QIODevice *out, qint64 offset) const
         component.writeData(out, offset);
 }
 
+Component ComponentIndex::componentByName(const QByteArray &id) const
+{
+    return m_components.value(id);
+}
 
-ComponentIndex::ComponentIndex()
+void ComponentIndex::insertComponent(const Component& c)
 {
+    m_components.insert(c.name(), c);
 }
 
-ComponentIndex ComponentIndex::read(QIODevice *dev, qint64 offset)
+void ComponentIndex::removeComponent(const QByteArray &name)
 {
-    ComponentIndex result;
-    const qint64 size = retrieveInt64(dev);
-    for (int i = 0; i < size; ++i)
-        result.insertComponent(Component::readFromIndexEntry(dev, offset));
-    retrieveInt64(dev);
-    return result;
+    m_components.remove(name);
 }
 
-void ComponentIndex::writeIndex(QIODevice *out, qint64 offset) const
+QVector<Component> ComponentIndex::components() const
 {
-    // Q: why do we write the size twice?
-    // A: for us to be able to read it beginning from the end of the file as well
-    appendInt64(out, componentCount());
-    foreach (const Component& i, components())
-        i.writeIndexEntry(out, offset);
-    appendInt64(out, componentCount());
+    return m_components.values().toVector();
 }
 
+int ComponentIndex::componentCount() const
+{
+    return m_components.size();
+}
+
+
 /*!
     \internal
     Registers the resource found at \a segment within \a file into the Qt resource system.