Change function names (to what they actually do) and signature.

The signature change is kind of a cosmetic one, but I think it
is more obvious that passing a reference into a function might
modify the parameter.

Change-Id: I424c06ed7a449204bd0b243ff07c2d36669b7381
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>

4 files changed, 26 insertions, 28 deletions

diff --git a/tools/binarycreator/binarycreator.cpp b/tools/binarycreator/binarycreator.cpp
index a40a2a055..67ed1d5c5 100644
--- a/tools/binarycreator/binarycreator.cpp
+++ b/tools/binarycreator/binarycreator.cpp
@@ -478,7 +478,7 @@ static void printUsage()
     std::cout << std::endl;
 }
 
-void copyInstallerConfigurationToDirectory(const QString &configFile, const QString &targetDir)
+void copyConfigData(const QString &configFile, const QString &targetDir)
 {
     qDebug() << "Begin to copy configuration file and data.";
 
@@ -698,9 +698,9 @@ int main(int argc, char **argv)
         const Settings settings = Settings::fromFileAndPrefix(configFile, QFileInfo(configFile).absolutePath());
         QInstallerTools::PackageInfoVector packages = createListOfPackages(packagesDirectory,
             filteredPackages, ftype);
-        generateMetaDataDirectory(tmpMetaDir, packagesDirectory, packages, settings.applicationName(),
-                settings.applicationVersion());
-        copyInstallerConfigurationToDirectory(configFile, tmpMetaDir + QLatin1String("/installer-config"));
+        copyMetaData(tmpMetaDir, packagesDirectory, packages, settings.applicationName(),
+            settings.applicationVersion());
+        copyConfigData(configFile, tmpMetaDir + QLatin1String("/installer-config"));
         {
             QSettings confInternal(tmpMetaDir + QLatin1String("/config/config-internal.ini")
                 , QSettings::IniFormat);
@@ -721,7 +721,7 @@ int main(int argc, char **argv)
             input.binaryResourcePath = createBinaryResourceFile(tmpMetaDir);
             input.binaryResources = createBinaryResourceFiles(resources);
 
-            QInstallerTools::copyComponentData(packagesDirectory, tmpMetaDir, packages);
+            QInstallerTools::copyComponentData(packagesDirectory, tmpMetaDir, &packages);
 
             // now put the packages into the components section of the binary
             foreach (const QInstallerTools::PackageInfo &info, packages) {
diff --git a/tools/common/repositorygen.cpp b/tools/common/repositorygen.cpp
index b119c392a..6bb003c63 100644
--- a/tools/common/repositorygen.cpp
+++ b/tools/common/repositorygen.cpp
@@ -107,26 +107,26 @@ void QInstallerTools::compressPaths(const QStringList &paths, const QString &arc
     Lib7z::createArchive(&archive, paths);
 }
 
-void QInstallerTools::generateMetaDataDirectory(const QString &outDir, const QString &dataDir,
+void QInstallerTools::copyMetaData(const QString &_targetDir, const QString &metaDataDir,
     const PackageInfoVector &packages, const QString &appName, const QString &appVersion,
     const QString &redirectUpdateUrl)
 {
-    const QString metapath = makePathAbsolute(outDir);
+    const QString metapath = makePathAbsolute(_targetDir);
     if (!QFile::exists(metapath))
         QInstaller::mkpath(metapath);
 
     QDomDocument doc;
     QDomElement root;
     // use existing Updates.xml, if any
-    QFile existingUpdatesXml(QFileInfo(dataDir, QLatin1String("Updates.xml")).absoluteFilePath());
+    QFile existingUpdatesXml(QFileInfo(metaDataDir, QLatin1String("Updates.xml")).absoluteFilePath());
     if (!existingUpdatesXml.open(QIODevice::ReadOnly) || !doc.setContent(&existingUpdatesXml)) {
         root = doc.createElement(QLatin1String("Updates"));
-        root.appendChild(doc.createElement(QLatin1String("ApplicationName"))).appendChild(
-            doc.createTextNode(appName));
-        root.appendChild(doc.createElement(QLatin1String("ApplicationVersion"))).appendChild(
-            doc.createTextNode(appVersion));
-        root.appendChild(doc.createElement(QLatin1String("Checksum"))).appendChild(
-            doc.createTextNode(QLatin1String("true")));
+        root.appendChild(doc.createElement(QLatin1String("ApplicationName"))).appendChild(doc
+            .createTextNode(appName));
+        root.appendChild(doc.createElement(QLatin1String("ApplicationVersion"))).appendChild(doc
+            .createTextNode(appVersion));
+        root.appendChild(doc.createElement(QLatin1String("Checksum"))).appendChild(doc
+            .createTextNode(QLatin1String("true")));
         if (!redirectUpdateUrl.isEmpty()) {
             root.appendChild(doc.createElement(QLatin1String("RedirectUpdateUrl"))).appendChild(
                 doc.createTextNode(redirectUpdateUrl));
@@ -217,9 +217,9 @@ void QInstallerTools::generateMetaDataDirectory(const QString &outDir, const QSt
         quint64 compressedComponentSize = 0;
 
         const QDir::Filters filters = QDir::Files | QDir::NoDotAndDotDot;
-        const QDir componentDataDir = QString::fromLatin1("%1/%2/data").arg(dataDir, it->name);
+        const QDir componentDataDir = QString::fromLatin1("%1/%2/data").arg(metaDataDir, it->name);
         const QFileInfoList entries = componentDataDir.exists() ? componentDataDir.entryInfoList(filters | QDir::Dirs)
-            : QDir(QString::fromLatin1("%1/%2").arg(dataDir, it->name)).entryInfoList(filters);
+            : QDir(QString::fromLatin1("%1/%2").arg(metaDataDir, it->name)).entryInfoList(filters);
 
         qDebug() << QString::fromLatin1("calculate size of directory: %1").arg(componentDataDir.absolutePath());
         foreach (const QFileInfo &fi, entries) {
@@ -572,10 +572,10 @@ void QInstallerTools::compressMetaDirectories(const QString &repoDir, const QStr
 }
 
 void QInstallerTools::copyComponentData(const QString &packageDir, const QString &repoDir,
-    PackageInfoVector &infos)
+    PackageInfoVector *const infos)
 {
-    for (int i = 0; i < infos.count(); ++i) {
-        const PackageInfo info = infos.at(i);
+    for (int i = 0; i < infos->count(); ++i) {
+        const PackageInfo info = infos->at(i);
         const QString name = info.name;
         qDebug() << "Copying component data for" << name;
 
@@ -624,7 +624,7 @@ void QInstallerTools::copyComponentData(const QString &packageDir, const QString
         }
 
         foreach (const QString &target, compressedFiles) {
-            infos[i].copiedArchives.append(target);
+            (*infos)[i].copiedArchives.append(target);
 
             QFile archiveFile(target);
             QFile archiveHashFile(archiveFile.fileName() + QLatin1String(".sha1"));
@@ -641,7 +641,7 @@ void QInstallerTools::copyComponentData(const QString &packageDir, const QString
                 QInstaller::openForWrite(&archiveHashFile, archiveHashFile.fileName());
                 archiveHashFile.write(hashOfArchiveData);
                 qDebug() << "Generated sha1 hash:" << hashOfArchiveData;
-                infos[i].copiedArchives.append(archiveHashFile.fileName());
+                (*infos)[i].copiedArchives.append(archiveHashFile.fileName());
                 archiveHashFile.close();
             } catch (const QInstaller::Error &/*e*/) {
                 archiveFile.close();
diff --git a/tools/common/repositorygen.h b/tools/common/repositorygen.h
index 5085d526b..7b312bace 100644
--- a/tools/common/repositorygen.h
+++ b/tools/common/repositorygen.h
@@ -73,11 +73,9 @@ void compressPaths(const QStringList &paths, const QString &archivePath);
 void compressMetaDirectories(const QString &repoDir, const QString &baseDir,
     const QHash<QString, QString> &versionMapping);
 
-void copyComponentData(const QString &packageDir, const QString &repoDir, PackageInfoVector &infos);
-
-void generateMetaDataDirectory(const QString &outDir, const QString &dataDir,
-    const PackageInfoVector &packages, const QString &appName,
-    const QString& appVersion, const QString &redirectUpdateUrl = QString());
+void copyMetaData(const QString &outDir, const QString &dataDir, const PackageInfoVector &packages,
+    const QString &appName, const QString& appVersion, const QString &redirectUpdateUrl = QString());
+void copyComponentData(const QString &packageDir, const QString &repoDir, PackageInfoVector *const infos);
 
 PackageInfoVector createListOfPackages(const QString &packagesDirectory, const QStringList &filteredPackages,
     FilterType ftype);
diff --git a/tools/repogen/repogen.cpp b/tools/repogen/repogen.cpp
index d319b2c89..559b9911f 100644
--- a/tools/repogen/repogen.cpp
+++ b/tools/repogen/repogen.cpp
@@ -199,13 +199,13 @@ int main(int argc, char** argv)
                 removeDirectory(fi.absoluteFilePath());
         }
 
-        copyComponentData(packagesDir, repositoryDir, packages);
+        copyComponentData(packagesDir, repositoryDir, &packages);
 
         TempDirDeleter tmpDeleter;
         const QString metaTmp = createTemporaryDirectory();
         tmpDeleter.add(metaTmp);
 
-        generateMetaDataDirectory(metaTmp, repositoryDir, packages, QLatin1String("{AnyApplication}"),
+        copyMetaData(metaTmp, repositoryDir, packages, QLatin1String("{AnyApplication}"),
             QLatin1String(QUOTE(IFW_REPOSITORY_FORMAT_VERSION)), redirectUpdateUrl);
         QInstallerTools::compressMetaDirectories(metaTmp, metaTmp, pathToVersionMapping);