diff options
author | Tim Jenssen <tim.jenssen@digia.com> | 2013-05-31 14:11:22 +0200 |
---|---|---|
committer | Tim Jenssen <tim.jenssen@digia.com> | 2013-05-31 14:23:51 +0200 |
commit | 955db4b7492cbb044de2a7f1d3a145e533f5a701 (patch) | |
tree | 3c694f5ba75c57ce60dbe1855df6b61041ccfc6d /src | |
parent | b6f7e6fb942d60e00d16a26a4b03ce07dcd6f769 (diff) |
rename method in productkeycheck
- isValidLicense(fileName) -> isValidLicenseTextFile(fileName)
- so we don't confuse user with hasValidKey
Change-Id: Ife2a88f244a75238dec5d70c280e6b4331a34a8a
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/libs/installer/component.cpp | 2 | ||||
-rw-r--r-- | src/libs/installer/productkeycheck.cpp | 2 | ||||
-rw-r--r-- | src/libs/installer/productkeycheck.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/libs/installer/component.cpp b/src/libs/installer/component.cpp index e32219d72..ffc4ea904 100644 --- a/src/libs/installer/component.cpp +++ b/src/libs/installer/component.cpp @@ -577,7 +577,7 @@ void Component::loadLicenses(const QString &directory, const QHash<QString, QVar for (it = licenseHash.begin(); it != licenseHash.end(); ++it) { const QString &fileName = it.value().toString(); - if (!ProductKeyCheck::instance(d->m_core)->isValidLicense(fileName)) + if (!ProductKeyCheck::instance(d->m_core)->isValidLicenseTextFile(fileName)) continue; QFileInfo fileInfo(fileName); diff --git a/src/libs/installer/productkeycheck.cpp b/src/libs/installer/productkeycheck.cpp index e2aac1813..fe1fd10af 100644 --- a/src/libs/installer/productkeycheck.cpp +++ b/src/libs/installer/productkeycheck.cpp @@ -84,7 +84,7 @@ QString ProductKeyCheck::maintainanceToolDetailErrorNotice() } // to filter none valid licenses -bool ProductKeyCheck::isValidLicense(const QString &/*fileName*/) +bool ProductKeyCheck::isValidLicenseTextFile(const QString &/*fileName*/) { return true; } diff --git a/src/libs/installer/productkeycheck.h b/src/libs/installer/productkeycheck.h index 382986e30..d472d9288 100644 --- a/src/libs/installer/productkeycheck.h +++ b/src/libs/installer/productkeycheck.h @@ -58,7 +58,7 @@ public: bool applyKey(const QStringList &arguments); // to filter none valid licenses - bool isValidLicense(const QString &fileName); + bool isValidLicenseTextFile(const QString &fileName); private: ProductKeyCheck(); |