diff options
author | Katja Marttila <katja.marttila@qt.io> | 2019-03-29 13:10:48 +0200 |
---|---|---|
committer | Katja Marttila <katja.marttila@qt.io> | 2019-04-01 08:32:16 +0000 |
commit | 701beccd14edb3c7ca5445833d0cf93435c52666 (patch) | |
tree | c0b29c209aee9a1478361124b6409840c36d0de4 /src | |
parent | 2767210585916bc5b9c94701ad736ca07eb6d067 (diff) |
Rename variables
We have named 'archive' to 'category' ages ago, rename the remaining
variables accordingly.
Change-Id: I3f723d3e7014c264e2a4db21c434708691a1038e
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/libs/installer/metadatajob.cpp | 4 | ||||
-rw-r--r-- | src/libs/installer/repository.cpp | 18 | ||||
-rw-r--r-- | src/libs/installer/repository.h | 6 | ||||
-rw-r--r-- | src/libs/installer/settings.cpp | 2 |
4 files changed, 15 insertions, 15 deletions
diff --git a/src/libs/installer/metadatajob.cpp b/src/libs/installer/metadatajob.cpp index 3beda7ef2..6052da02e 100644 --- a/src/libs/installer/metadatajob.cpp +++ b/src/libs/installer/metadatajob.cpp @@ -619,13 +619,13 @@ MetadataJob::Status MetadataJob::parseUpdatesXml(const QList<FileTaskResult> &re } } } - if (metadata.repository.archivename().isEmpty()) { + if (metadata.repository.categoryname().isEmpty()) { m_metaFromDefaultRepositories.insert(metadata.directory, metadata); } else { //Hash metadata to help checking if meta for repository is already fetched ArchiveMetadata archiveMetadata; archiveMetadata.metaData = metadata; - m_fetchedArchive.insertMulti(metadata.repository.archivename(), archiveMetadata); + m_fetchedArchive.insertMulti(metadata.repository.categoryname(), archiveMetadata); // Hash for faster lookups m_metaFromArchive.insert(metadata.directory, metadata); } diff --git a/src/libs/installer/repository.cpp b/src/libs/installer/repository.cpp index 5e31d81e2..a165b8617 100644 --- a/src/libs/installer/repository.cpp +++ b/src/libs/installer/repository.cpp @@ -57,7 +57,7 @@ Repository::Repository(const Repository &other) , m_password(other.m_password) , m_displayname(other.m_displayname) , m_compressed(other.m_compressed) - , m_archivename(other.m_archivename) + , m_categoryname(other.m_categoryname) { registerMetaType(); } @@ -202,17 +202,17 @@ void Repository::setDisplayName(const QString &displayname) /*! Returns the archive name if the repository belongs to an archive. */ -QString Repository::archivename() const +QString Repository::categoryname() const { - return m_archivename; + return m_categoryname; } /*! - Sets the archive name to \a archivename if the repository belongs to an archive. + Sets the category name to \a categoryname if the repository belongs to an category. */ -void Repository::setArchiveName(const QString &archivename) +void Repository::setCategoryName(const QString &categoryname) { - m_archivename = archivename; + m_categoryname = categoryname; } /*! @@ -265,7 +265,7 @@ const Repository &Repository::operator=(const Repository &other) m_password = other.m_password; m_displayname = other.m_displayname; m_compressed = other.m_compressed; - m_archivename = other.m_archivename; + m_categoryname = other.m_categoryname; return *this; } @@ -280,7 +280,7 @@ QDataStream &operator>>(QDataStream &istream, Repository &repository) { QByteArray url, username, password, displayname, compressed; istream >> url >> repository.m_default >> repository.m_enabled >> username >> password - >> displayname >> repository.m_archivename; + >> displayname >> repository.m_categoryname; repository.setUrl(QUrl::fromEncoded(QByteArray::fromBase64(url))); repository.setUsername(QString::fromUtf8(QByteArray::fromBase64(username))); repository.setPassword(QString::fromUtf8(QByteArray::fromBase64(password))); @@ -292,7 +292,7 @@ QDataStream &operator<<(QDataStream &ostream, const Repository &repository) { return ostream << repository.m_url.toEncoded().toBase64() << repository.m_default << repository.m_enabled << repository.m_username.toUtf8().toBase64() << repository.m_password.toUtf8().toBase64() - << repository.m_displayname.toUtf8().toBase64() << repository.m_archivename.toUtf8().toBase64(); + << repository.m_displayname.toUtf8().toBase64() << repository.m_categoryname.toUtf8().toBase64(); } } diff --git a/src/libs/installer/repository.h b/src/libs/installer/repository.h index 83393ead9..546cddc97 100644 --- a/src/libs/installer/repository.h +++ b/src/libs/installer/repository.h @@ -64,8 +64,8 @@ public: QString displayname() const; void setDisplayName(const QString &displayname); - QString archivename() const; - void setArchiveName(const QString &archivename); + QString categoryname() const; + void setCategoryName(const QString &categoryname); bool isCompressed() const; void setCompressed(bool compressed); @@ -85,7 +85,7 @@ private: QString m_username; QString m_password; QString m_displayname; - QString m_archivename; + QString m_categoryname; bool m_compressed; }; diff --git a/src/libs/installer/settings.cpp b/src/libs/installer/settings.cpp index 13eb2ce40..21fea279a 100644 --- a/src/libs/installer/settings.cpp +++ b/src/libs/installer/settings.cpp @@ -168,7 +168,7 @@ static QSet<Repository> readRepositories(QXmlStreamReader &reader, bool isDefaul } } if (displayName && !displayName->isEmpty()) - repo.setArchiveName(*displayName); + repo.setCategoryName(*displayName); set.insert(repo); } else if (reader.name() == QLatin1String("Tooltip")) { *tooltip = reader.readElementText(); |