noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-21 22:24:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

removed get function prefix in Version

Browse source
This commit is contained in:
fourtf 2019-10-07 22:32:11 +02:00
parent ec2a2f30b7
commit aeab038bc8
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/common/Version.cpp
View file

@ -40,22 +40,22 @@ const Version &Version::getInstance()
return instance; return instance;
} }
const QString &Version::getVersion() const const QString &Version::version() const
{ {
return this->version_; return this->version_;
} }
const QString &Version::getFullVersion() const const QString &Version::fullVersion() const
{ {
return this->fullVersion_; return this->fullVersion_;
} }
const QString &Version::getCommitHash() const const QString &Version::commitHash() const
{ {
return this->commitHash_; return this->commitHash_;
} }
const QString &Version::getDateOfBuild() const const QString &Version::dateOfBuild() const
{ {
return this->dateOfBuild_; return this->dateOfBuild_;
} }

2
src/main.cpp
View file

@ -32,7 +32,7 @@ int main(int argc, char **argv)
} }
else if (getArgs().printVersion) else if (getArgs().printVersion)
{ {
qInfo().noquote() << Version::getInstance().getFullVersion(); qInfo().noquote() << Version::getInstance().fullVersion();
} }
else else
{ {

2
src/widgets/Window.cpp
View file

@ -367,7 +367,7 @@ void Window::onAccountSelected()
auto user = getApp()->accounts->twitch.getCurrent(); auto user = getApp()->accounts->twitch.getCurrent();
// update title // update title
this->setWindowTitle(Version::getInstance().getFullVersion()); this->setWindowTitle(Version::getInstance().fullVersion());
// update user // update user
if (user->isAnon()) if (user->isAnon())

8
src/widgets/settingspages/AboutPage.cpp
View file

@ -77,14 +77,14 @@ AboutPage::AboutPage()
{ {
auto version = Version::getInstance(); auto version = Version::getInstance();
QString text = QString("%1 (commit %2%3)") QString text = QString("%1 (commit %2%3)")
.arg(version.getFullVersion()) .arg(version.fullVersion())
.arg("<a " .arg("<a "
"href=\"https://github.com/Chatterino/" "href=\"https://github.com/Chatterino/"
"chatterino2/commit/" + "chatterino2/commit/" +
version.getCommitHash() + "\">" + version.commitHash() + "\">" +
version.getCommitHash() + "</a>") version.commitHash() + "</a>")
.arg(Modes::getInstance().isNightly .arg(Modes::getInstance().isNightly
? ", " + version.getDateOfBuild() ? ", " + version.dateOfBuild()
: ""); : "");
auto versionLabel = versionInfo.emplace<QLabel>(text); auto versionLabel = versionInfo.emplace<QLabel>(text);