From aeab038bc8672b296a43da2e0369918316c09435 Mon Sep 17 00:00:00 2001 From: fourtf Date: Mon, 7 Oct 2019 22:32:11 +0200 Subject: [PATCH] removed `get` function prefix in Version --- src/common/Version.cpp | 8 ++++---- src/main.cpp | 2 +- src/widgets/Window.cpp | 2 +- src/widgets/settingspages/AboutPage.cpp | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/common/Version.cpp b/src/common/Version.cpp index 42185ae26..025ed79b2 100644 --- a/src/common/Version.cpp +++ b/src/common/Version.cpp @@ -40,22 +40,22 @@ const Version &Version::getInstance() return instance; } -const QString &Version::getVersion() const +const QString &Version::version() const { return this->version_; } -const QString &Version::getFullVersion() const +const QString &Version::fullVersion() const { return this->fullVersion_; } -const QString &Version::getCommitHash() const +const QString &Version::commitHash() const { return this->commitHash_; } -const QString &Version::getDateOfBuild() const +const QString &Version::dateOfBuild() const { return this->dateOfBuild_; } diff --git a/src/main.cpp b/src/main.cpp index 45a2e2b45..c815b1d2a 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -32,7 +32,7 @@ int main(int argc, char **argv) } else if (getArgs().printVersion) { - qInfo().noquote() << Version::getInstance().getFullVersion(); + qInfo().noquote() << Version::getInstance().fullVersion(); } else { diff --git a/src/widgets/Window.cpp b/src/widgets/Window.cpp index 75432e78d..11baaac92 100644 --- a/src/widgets/Window.cpp +++ b/src/widgets/Window.cpp @@ -367,7 +367,7 @@ void Window::onAccountSelected() auto user = getApp()->accounts->twitch.getCurrent(); // update title - this->setWindowTitle(Version::getInstance().getFullVersion()); + this->setWindowTitle(Version::getInstance().fullVersion()); // update user if (user->isAnon()) diff --git a/src/widgets/settingspages/AboutPage.cpp b/src/widgets/settingspages/AboutPage.cpp index eee74c737..cc1fb00a9 100644 --- a/src/widgets/settingspages/AboutPage.cpp +++ b/src/widgets/settingspages/AboutPage.cpp @@ -77,14 +77,14 @@ AboutPage::AboutPage() { auto version = Version::getInstance(); QString text = QString("%1 (commit %2%3)") - .arg(version.getFullVersion()) + .arg(version.fullVersion()) .arg("" + - version.getCommitHash() + "") + version.commitHash() + "\">" + + version.commitHash() + "") .arg(Modes::getInstance().isNightly - ? ", " + version.getDateOfBuild() + ? ", " + version.dateOfBuild() : ""); auto versionLabel = versionInfo.emplace(text);