Simplified QString getter handling
This commit is contained in:
parent
15838fb5e1
commit
6733abfc2e
@ -17,19 +17,13 @@ QSimpleUpdater::QSimpleUpdater(QObject *parent)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// Return the contents of the downloaded changelog
|
||||||
QString QSimpleUpdater::changeLog() const {
|
QString QSimpleUpdater::changeLog() const {
|
||||||
// Return the contents of the downloaded changelog
|
if (m_changelog.isEmpty()) {
|
||||||
if (!m_changelog.isEmpty()) {
|
|
||||||
return m_changelog;
|
|
||||||
}
|
|
||||||
|
|
||||||
// If the changelog is empty, we issue a warning message in
|
|
||||||
// the console and return an empty string
|
|
||||||
else {
|
|
||||||
qWarning() << "QSimpleUpdater: change log is empty,"
|
qWarning() << "QSimpleUpdater: change log is empty,"
|
||||||
<< "did you call setChangelogUrl() and checkForUpdates()?";
|
<< "did you call setChangelogUrl() and checkForUpdates()?";
|
||||||
return NULL;
|
|
||||||
}
|
}
|
||||||
|
return m_changelog;
|
||||||
}
|
}
|
||||||
|
|
||||||
void QSimpleUpdater::checkForUpdates() {
|
void QSimpleUpdater::checkForUpdates() {
|
||||||
@ -59,35 +53,24 @@ void QSimpleUpdater::checkForUpdates() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Return the application version referenced by the string
|
||||||
|
// that we downloaded
|
||||||
QString QSimpleUpdater::latestVersion() const {
|
QString QSimpleUpdater::latestVersion() const {
|
||||||
// Return the application version referenced by the string
|
if (m_latest_version.isEmpty()) {
|
||||||
// that we downloaded
|
|
||||||
if (!m_latest_version.isEmpty()) {
|
|
||||||
return m_latest_version;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Issue a warning message in the case that the downloaded
|
|
||||||
// application version string is empty
|
|
||||||
else {
|
|
||||||
qWarning() << "QSimpleUpdater: latest version is empty,"
|
qWarning() << "QSimpleUpdater: latest version is empty,"
|
||||||
<< "did you call checkForUpdates() and setReferenceUrl()?";
|
<< "did you call checkForUpdates() and setReferenceUrl()?";
|
||||||
return NULL;
|
|
||||||
}
|
}
|
||||||
|
return m_latest_version;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Return the string issued by the user in the setApplicationVersion() function
|
||||||
QString QSimpleUpdater::installedVersion() const {
|
QString QSimpleUpdater::installedVersion() const {
|
||||||
// Return the string issued by the user in the setApplicationVersion() function
|
if (m_installed_version.isEmpty()) {
|
||||||
if (!m_installed_version.isEmpty()) {
|
|
||||||
return m_installed_version;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Issue a warning message in the case that the installed application
|
|
||||||
// version is empty
|
|
||||||
else {
|
|
||||||
qWarning() << "QSimpleUpdater: installed version is empty,"
|
qWarning() << "QSimpleUpdater: installed version is empty,"
|
||||||
<< "did you call setApplicationVersion()?";
|
<< "did you call setApplicationVersion()?";
|
||||||
return NULL;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return m_installed_version;
|
||||||
}
|
}
|
||||||
|
|
||||||
void QSimpleUpdater::downloadLatestVersion() {
|
void QSimpleUpdater::downloadLatestVersion() {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user