From 6f710823ed38258d6852313a90a46409f984b050 Mon Sep 17 00:00:00 2001 From: fourtf Date: Mon, 7 Oct 2019 22:42:34 +0200 Subject: [PATCH] renamed getInstance() -> instance() for singletons --- src/Application.cpp | 4 ++-- src/RunGui.cpp | 2 +- src/common/Channel.cpp | 2 +- src/common/Credentials.cpp | 2 +- src/common/Credentials.hpp | 2 +- src/common/Modes.cpp | 2 +- src/common/Modes.hpp | 2 +- src/common/Version.cpp | 4 ++-- src/common/Version.hpp | 2 +- src/main.cpp | 4 ++-- src/providers/irc/Irc2.cpp | 8 ++++---- src/providers/irc/Irc2.hpp | 2 +- src/providers/twitch/IrcMessageHandler.cpp | 2 +- src/providers/twitch/IrcMessageHandler.hpp | 2 +- src/providers/twitch/TwitchChannel.cpp | 2 +- src/providers/twitch/TwitchIrcServer.cpp | 6 +++--- src/providers/twitch/TwitchMessageBuilder.cpp | 2 +- src/singletons/Paths.cpp | 2 +- src/singletons/Settings.cpp | 10 +++++----- src/singletons/Settings.hpp | 4 ++-- src/singletons/TooltipPreviewImage.cpp | 4 ++-- src/singletons/TooltipPreviewImage.hpp | 2 +- src/singletons/Updates.cpp | 4 ++-- src/singletons/Updates.hpp | 2 +- src/singletons/WindowManager.cpp | 2 +- src/util/InitUpdateButton.cpp | 10 +++++----- src/widgets/BaseWindow.cpp | 4 ++-- src/widgets/TooltipWidget.cpp | 2 +- src/widgets/TooltipWidget.hpp | 2 +- src/widgets/Window.cpp | 2 +- src/widgets/dialogs/LastRunCrashDialog.cpp | 4 ++-- src/widgets/dialogs/SelectChannelDialog.cpp | 20 +++++++++---------- src/widgets/dialogs/UpdateDialog.cpp | 14 ++++++------- src/widgets/helper/ChannelView.cpp | 4 ++-- src/widgets/settingspages/AboutPage.cpp | 4 ++-- src/widgets/splits/Split.cpp | 2 +- src/widgets/splits/SplitHeader.cpp | 6 +++--- 37 files changed, 77 insertions(+), 77 deletions(-) diff --git a/src/Application.cpp b/src/Application.cpp index cb81a4d1..776fef60 100644 --- a/src/Application.cpp +++ b/src/Application.cpp @@ -82,7 +82,7 @@ void Application::initialize(Settings &settings, Paths &paths) if (getSettings()->enableExperimentalIrc) { - Irc::getInstance().load(); + Irc::instance().load(); } for (auto &singleton : this->singletons_) @@ -130,7 +130,7 @@ int Application::run(QApplication &qtApp) this->windows->getMainWindow().show(); getSettings()->betaUpdates.connect( - [] { Updates::getInstance().checkForUpdates(); }, false); + [] { Updates::instance().checkForUpdates(); }, false); return qtApp.exec(); } diff --git a/src/RunGui.cpp b/src/RunGui.cpp index a53f79a9..3088b6da 100644 --- a/src/RunGui.cpp +++ b/src/RunGui.cpp @@ -194,7 +194,7 @@ void runGui(QApplication &a, Paths &paths, Settings &settings) }); chatterino::NetworkManager::init(); - chatterino::Updates::getInstance().checkForUpdates(); + chatterino::Updates::instance().checkForUpdates(); #ifdef C_USE_BREAKPAD QBreakpadInstance.setDumpPath(getPaths()->settingsFolderPath + "/Crashes"); diff --git a/src/common/Channel.cpp b/src/common/Channel.cpp index 1c13b6db..e1c5ba0d 100644 --- a/src/common/Channel.cpp +++ b/src/common/Channel.cpp @@ -178,7 +178,7 @@ void Channel::addOrReplaceTimeout(MessagePtr message) } // XXX: Might need the following line - // WindowManager::getInstance().repaintVisibleChatWidgets(this); + // WindowManager::instance().repaintVisibleChatWidgets(this); } void Channel::disableAllMessages() diff --git a/src/common/Credentials.cpp b/src/common/Credentials.cpp index f9d12b72..9bc2e6a9 100644 --- a/src/common/Credentials.cpp +++ b/src/common/Credentials.cpp @@ -143,7 +143,7 @@ namespace { } } // namespace -Credentials &Credentials::getInstance() +Credentials &Credentials::instance() { static Credentials creds; return creds; diff --git a/src/common/Credentials.hpp b/src/common/Credentials.hpp index b71ed6cd..5cf9da92 100644 --- a/src/common/Credentials.hpp +++ b/src/common/Credentials.hpp @@ -8,7 +8,7 @@ namespace chatterino { class Credentials { public: - static Credentials &getInstance(); + static Credentials &instance(); void get(const QString &provider, const QString &name, QObject *receiver, std::function &&onLoaded); diff --git a/src/common/Modes.cpp b/src/common/Modes.cpp index 23c385ec..ead79dea 100644 --- a/src/common/Modes.cpp +++ b/src/common/Modes.cpp @@ -27,7 +27,7 @@ Modes::Modes() } } -const Modes &Modes::getInstance() +const Modes &Modes::instance() { static Modes instance; return instance; diff --git a/src/common/Modes.hpp b/src/common/Modes.hpp index 6bf5cc25..87bef41a 100644 --- a/src/common/Modes.hpp +++ b/src/common/Modes.hpp @@ -7,7 +7,7 @@ class Modes public: Modes(); - static const Modes &getInstance(); + static const Modes &instance(); bool isNightly{}; bool isPortable{}; diff --git a/src/common/Version.cpp b/src/common/Version.cpp index 025ed79b..4e4707d2 100644 --- a/src/common/Version.cpp +++ b/src/common/Version.cpp @@ -26,7 +26,7 @@ Version::Version() // "Full" version string, as displayed in window title this->fullVersion_ = "Chatterino "; - if (Modes::getInstance().isNightly) + if (Modes::instance().isNightly) { this->fullVersion_ += "Nightly "; } @@ -34,7 +34,7 @@ Version::Version() this->fullVersion_ += this->version_; } -const Version &Version::getInstance() +const Version &Version::instance() { static Version instance; return instance; diff --git a/src/common/Version.hpp b/src/common/Version.hpp index abd8151e..a4f468b8 100644 --- a/src/common/Version.hpp +++ b/src/common/Version.hpp @@ -20,7 +20,7 @@ namespace chatterino { class Version { public: - static const Version &getInstance(); + static const Version &instance(); const QString &version() const; const QString &commitHash() const; diff --git a/src/main.cpp b/src/main.cpp index c815b1d2..46346589 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().fullVersion(); + qInfo().noquote() << Version::instance().fullVersion(); } else { @@ -45,7 +45,7 @@ int main(int argc, char **argv) catch (std::runtime_error &error) { QMessageBox box; - if (Modes::getInstance().isPortable) + if (Modes::instance().isPortable) { box.setText( error.what() + diff --git a/src/providers/irc/Irc2.cpp b/src/providers/irc/Irc2.cpp index 7409ac98..1c5603cf 100644 --- a/src/providers/irc/Irc2.cpp +++ b/src/providers/irc/Irc2.cpp @@ -73,13 +73,13 @@ inline QString getCredentialName(const IrcServerData &data) void IrcServerData::getPassword( QObject *receiver, std::function &&onLoaded) const { - Credentials::getInstance().get("irc", getCredentialName(*this), receiver, + Credentials::instance().get("irc", getCredentialName(*this), receiver, std::move(onLoaded)); } void IrcServerData::setPassword(const QString &password) { - Credentials::getInstance().set("irc", getCredentialName(*this), password); + Credentials::instance().set("irc", getCredentialName(*this), password); } Irc::Irc() @@ -133,7 +133,7 @@ Irc::Irc() if (args.caller != Irc::noEraseCredentialCaller) { - Credentials::getInstance().erase("irc", + Credentials::instance().erase("irc", getCredentialName(args.item)); } }); @@ -164,7 +164,7 @@ ChannelPtr Irc::getOrAddChannel(int id, QString name) } } -Irc &Irc::getInstance() +Irc &Irc::instance() { static Irc irc; return irc; diff --git a/src/providers/irc/Irc2.hpp b/src/providers/irc/Irc2.hpp index 0d40f6fe..de484924 100644 --- a/src/providers/irc/Irc2.hpp +++ b/src/providers/irc/Irc2.hpp @@ -36,7 +36,7 @@ class Irc public: Irc(); - static Irc &getInstance(); + static Irc &instance(); static inline void *const noEraseCredentialCaller = reinterpret_cast(1); diff --git a/src/providers/twitch/IrcMessageHandler.cpp b/src/providers/twitch/IrcMessageHandler.cpp index 3586c2a3..24bd8320 100644 --- a/src/providers/twitch/IrcMessageHandler.cpp +++ b/src/providers/twitch/IrcMessageHandler.cpp @@ -40,7 +40,7 @@ static QMap parseBadges(QString badgesString) return badges; } -IrcMessageHandler &IrcMessageHandler::getInstance() +IrcMessageHandler &IrcMessageHandler::instance() { static IrcMessageHandler instance; return instance; diff --git a/src/providers/twitch/IrcMessageHandler.hpp b/src/providers/twitch/IrcMessageHandler.hpp index c0bc67d5..fe8321ad 100644 --- a/src/providers/twitch/IrcMessageHandler.hpp +++ b/src/providers/twitch/IrcMessageHandler.hpp @@ -13,7 +13,7 @@ class IrcMessageHandler IrcMessageHandler() = default; public: - static IrcMessageHandler &getInstance(); + static IrcMessageHandler &instance(); // parseMessage parses a single IRC message into 0+ Chatterino messages std::vector parseMessage(Channel *channel, diff --git a/src/providers/twitch/TwitchChannel.cpp b/src/providers/twitch/TwitchChannel.cpp index 3f2f78dd..01455203 100644 --- a/src/providers/twitch/TwitchChannel.cpp +++ b/src/providers/twitch/TwitchChannel.cpp @@ -566,7 +566,7 @@ void TwitchChannel::loadRecentMessages() auto messages = parseRecentMessages(result.parseJson(), shared); - auto &handler = IrcMessageHandler::getInstance(); + auto &handler = IrcMessageHandler::instance(); std::vector allBuiltMessages; diff --git a/src/providers/twitch/TwitchIrcServer.cpp b/src/providers/twitch/TwitchIrcServer.cpp index a8e7a230..c651a819 100644 --- a/src/providers/twitch/TwitchIrcServer.cpp +++ b/src/providers/twitch/TwitchIrcServer.cpp @@ -125,7 +125,7 @@ std::shared_ptr TwitchIrcServer::createChannel( void TwitchIrcServer::privateMessageReceived( Communi::IrcPrivateMessage *message) { - IrcMessageHandler::getInstance().handlePrivMessage(message, *this); + IrcMessageHandler::instance().handlePrivMessage(message, *this); } void TwitchIrcServer::readConnectionMessageReceived( @@ -141,7 +141,7 @@ void TwitchIrcServer::readConnectionMessageReceived( const QString &command = message->command(); - auto &handler = IrcMessageHandler::getInstance(); + auto &handler = IrcMessageHandler::instance(); // Below commands enabled through the twitch.tv/membership CAP REQ if (command == "MODE") @@ -194,7 +194,7 @@ void TwitchIrcServer::writeConnectionMessageReceived( { const QString &command = message->command(); - auto &handler = IrcMessageHandler::getInstance(); + auto &handler = IrcMessageHandler::instance(); // Below commands enabled through the twitch.tv/commands CAP REQ if (command == "USERSTATE") { diff --git a/src/providers/twitch/TwitchMessageBuilder.cpp b/src/providers/twitch/TwitchMessageBuilder.cpp index f54d3a64..d58dac26 100644 --- a/src/providers/twitch/TwitchMessageBuilder.cpp +++ b/src/providers/twitch/TwitchMessageBuilder.cpp @@ -652,7 +652,7 @@ void TwitchMessageBuilder::appendUsername() { // TODO(pajlada): Re-implement // userDisplayString += - // IrcManager::getInstance().getUser().getUserName(); + // IrcManager::instance().getUser().getUserName(); } else if (this->args.isReceivedWhisper) { diff --git a/src/singletons/Paths.cpp b/src/singletons/Paths.cpp index 83d7ab5a..efbe5a99 100644 --- a/src/singletons/Paths.cpp +++ b/src/singletons/Paths.cpp @@ -35,7 +35,7 @@ bool Paths::createFolder(const QString &folderPath) bool Paths::isPortable() { - return Modes::getInstance().isPortable; + return Modes::instance().isPortable; } QString Paths::cacheDirectory() diff --git a/src/singletons/Settings.cpp b/src/singletons/Settings.cpp index 9a077b09..94d13b68 100644 --- a/src/singletons/Settings.cpp +++ b/src/singletons/Settings.cpp @@ -9,12 +9,12 @@ namespace chatterino { -Settings *Settings::instance = nullptr; +Settings *Settings::instance_ = nullptr; Settings::Settings(const QString &settingsDirectory) : ABSettings(settingsDirectory) { - instance = this; + instance_ = this; #ifdef USEWINSDK this->autorun = isRegisteredForStartup(); @@ -23,14 +23,14 @@ Settings::Settings(const QString &settingsDirectory) #endif } -Settings &Settings::getInstance() +Settings &Settings::instance() { - return *instance; + return *instance_; } Settings *getSettings() { - return &Settings::getInstance(); + return &Settings::instance(); } } // namespace chatterino diff --git a/src/singletons/Settings.hpp b/src/singletons/Settings.hpp index 82233f84..25e87a8b 100644 --- a/src/singletons/Settings.hpp +++ b/src/singletons/Settings.hpp @@ -13,12 +13,12 @@ namespace chatterino { class Settings : public ABSettings { - static Settings *instance; + static Settings *instance_; public: Settings(const QString &settingsDirectory); - static Settings &getInstance(); + static Settings &instance(); /// Appearance BoolSetting showTimestamps = {"/appearance/messages/showTimestamps", true}; diff --git a/src/singletons/TooltipPreviewImage.cpp b/src/singletons/TooltipPreviewImage.cpp index 847cc3e6..5355b7d8 100644 --- a/src/singletons/TooltipPreviewImage.cpp +++ b/src/singletons/TooltipPreviewImage.cpp @@ -5,7 +5,7 @@ #include "widgets/TooltipWidget.hpp" namespace chatterino { -TooltipPreviewImage &TooltipPreviewImage::getInstance() +TooltipPreviewImage &TooltipPreviewImage::instance() { static TooltipPreviewImage *instance = new TooltipPreviewImage(); return *instance; @@ -14,7 +14,7 @@ TooltipPreviewImage &TooltipPreviewImage::getInstance() TooltipPreviewImage::TooltipPreviewImage() { connections_.push_back(getApp()->windows->gifRepaintRequested.connect([&] { - auto tooltipWidget = TooltipWidget::getInstance(); + auto tooltipWidget = TooltipWidget::instance(); if (this->image_ && !tooltipWidget->isHidden()) { auto pixmap = this->image_->pixmapOrLoad(); diff --git a/src/singletons/TooltipPreviewImage.hpp b/src/singletons/TooltipPreviewImage.hpp index 67ba9cd9..5b23945f 100644 --- a/src/singletons/TooltipPreviewImage.hpp +++ b/src/singletons/TooltipPreviewImage.hpp @@ -6,7 +6,7 @@ namespace chatterino { class TooltipPreviewImage { public: - static TooltipPreviewImage &getInstance(); + static TooltipPreviewImage &instance(); void setImage(ImagePtr image); TooltipPreviewImage(const TooltipPreviewImage &) = delete; diff --git a/src/singletons/Updates.cpp b/src/singletons/Updates.cpp index 7d38bffb..8f105498 100644 --- a/src/singletons/Updates.cpp +++ b/src/singletons/Updates.cpp @@ -62,7 +62,7 @@ Updates::Updates() qDebug() << "init UpdateManager"; } -Updates &Updates::getInstance() +Updates &Updates::instance() { // fourtf: don't add this class to the application class static Updates instance; @@ -234,7 +234,7 @@ void Updates::checkForUpdates() { // Disable updates if on nightly and windows. #ifdef Q_OS_WIN - if (Modes::getInstance().isNightly) + if (Modes::instance().isNightly) { return; } diff --git a/src/singletons/Updates.hpp b/src/singletons/Updates.hpp index ac1bba9d..9ad33b28 100644 --- a/src/singletons/Updates.hpp +++ b/src/singletons/Updates.hpp @@ -22,7 +22,7 @@ public: }; // fourtf: don't add this class to the application class - static Updates &getInstance(); + static Updates &instance(); void checkForUpdates(); const QString &getCurrentVersion() const; diff --git a/src/singletons/WindowManager.cpp b/src/singletons/WindowManager.cpp index ae555161..e1c6158c 100644 --- a/src/singletons/WindowManager.cpp +++ b/src/singletons/WindowManager.cpp @@ -649,7 +649,7 @@ IndirectChannel WindowManager::decodeChannel(const QJsonObject &obj) } else if (type == "irc") { - return Irc::getInstance().getOrAddChannel( + return Irc::instance().getOrAddChannel( obj.value("server").toInt(-1), obj.value("channel").toString()); } diff --git a/src/util/InitUpdateButton.cpp b/src/util/InitUpdateButton.cpp index 563f3654..826c8feb 100644 --- a/src/util/InitUpdateButton.cpp +++ b/src/util/InitUpdateButton.cpp @@ -27,7 +27,7 @@ void initUpdateButton(Button &button, } break; case UpdateDialog::Install: { - Updates::getInstance().installUpdates(); + Updates::instance().installUpdates(); } break; } @@ -39,18 +39,18 @@ void initUpdateButton(Button &button, // update image when state changes auto updateChange = [&button](auto) { - button.setVisible(Updates::getInstance().shouldShowUpdateButton()); + button.setVisible(Updates::instance().shouldShowUpdateButton()); - auto imageUrl = Updates::getInstance().isError() + auto imageUrl = Updates::instance().isError() ? ":/buttons/updateError.png" : ":/buttons/update.png"; button.setPixmap(QPixmap(imageUrl)); }; - updateChange(Updates::getInstance().getStatus()); + updateChange(Updates::instance().getStatus()); signalHolder.managedConnect( - Updates::getInstance().statusUpdated, + Updates::instance().statusUpdated, [updateChange](auto status) { updateChange(status); }); } diff --git a/src/widgets/BaseWindow.cpp b/src/widgets/BaseWindow.cpp index 8374d71a..bee9393a 100644 --- a/src/widgets/BaseWindow.cpp +++ b/src/widgets/BaseWindow.cpp @@ -464,7 +464,7 @@ void BaseWindow::changeEvent(QEvent *) { if (this->isVisible()) { - TooltipWidget::getInstance()->hide(); + TooltipWidget::instance()->hide(); } #ifdef USEWINSDK @@ -494,7 +494,7 @@ void BaseWindow::changeEvent(QEvent *) void BaseWindow::leaveEvent(QEvent *) { - TooltipWidget::getInstance()->hide(); + TooltipWidget::instance()->hide(); } void BaseWindow::moveTo(QWidget *parent, QPoint point, bool offset) diff --git a/src/widgets/TooltipWidget.cpp b/src/widgets/TooltipWidget.cpp index e859de12..d0898b45 100644 --- a/src/widgets/TooltipWidget.cpp +++ b/src/widgets/TooltipWidget.cpp @@ -14,7 +14,7 @@ namespace chatterino { -TooltipWidget *TooltipWidget::getInstance() +TooltipWidget *TooltipWidget::instance() { static TooltipWidget *tooltipWidget = new TooltipWidget(); return tooltipWidget; diff --git a/src/widgets/TooltipWidget.hpp b/src/widgets/TooltipWidget.hpp index 3a9ea8bc..c693f1df 100644 --- a/src/widgets/TooltipWidget.hpp +++ b/src/widgets/TooltipWidget.hpp @@ -13,7 +13,7 @@ class TooltipWidget : public BaseWindow Q_OBJECT public: - static TooltipWidget *getInstance(); + static TooltipWidget *instance(); TooltipWidget(BaseWidget *parent = nullptr); ~TooltipWidget() override; diff --git a/src/widgets/Window.cpp b/src/widgets/Window.cpp index 11baaac9..030ba835 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().fullVersion()); + this->setWindowTitle(Version::instance().fullVersion()); // update user if (user->isAnon()) diff --git a/src/widgets/dialogs/LastRunCrashDialog.cpp b/src/widgets/dialogs/LastRunCrashDialog.cpp index e70b2bb5..1233116f 100644 --- a/src/widgets/dialogs/LastRunCrashDialog.cpp +++ b/src/widgets/dialogs/LastRunCrashDialog.cpp @@ -31,7 +31,7 @@ LastRunCrashDialog::LastRunCrashDialog() // QDialogButtonBox::NoRole); installUpdateButton->setEnabled(false); // QObject::connect(installUpdateButton, &QPushButton::clicked, [this, // update]() mutable { - // auto &updateManager = UpdateManager::getInstance(); + // auto &updateManager = UpdateManager::instance(); // updateManager.installUpdates(); // this->setEnabled(false); @@ -45,7 +45,7 @@ LastRunCrashDialog::LastRunCrashDialog() // Updates // auto updateUpdateLabel = [update]() mutable { - // auto &updateManager = UpdateManager::getInstance(); + // auto &updateManager = UpdateManager::instance(); // switch (updateManager.getStatus()) { // case UpdateManager::None: { diff --git a/src/widgets/dialogs/SelectChannelDialog.cpp b/src/widgets/dialogs/SelectChannelDialog.cpp index 30df13a8..6870ba93 100644 --- a/src/widgets/dialogs/SelectChannelDialog.cpp +++ b/src/widgets/dialogs/SelectChannelDialog.cpp @@ -134,7 +134,7 @@ SelectChannelDialog::SelectChannelDialog(QWidget *parent) { auto view = this->ui_.irc.servers = new EditableModelView( - Irc::getInstance().newConnectionModel(this)); + Irc::instance().newConnectionModel(this)); view->setTitles({"host", "port", "ssl", "user", "nick", "real", "password", "login command"}); @@ -147,12 +147,12 @@ SelectChannelDialog::SelectChannelDialog(QWidget *parent) view->addButtonPressed.connect([] { auto unique = IrcServerData{}; - unique.id = Irc::getInstance().uniqueId(); + unique.id = Irc::instance().uniqueId(); auto editor = new IrcConnectionEditor(unique); if (editor->exec() == QDialog::Accepted) { - Irc::getInstance().connections.appendItem(editor->data()); + Irc::instance().connections.appendItem(editor->data()); } }); @@ -160,22 +160,22 @@ SelectChannelDialog::SelectChannelDialog(QWidget *parent) view->getTableView(), &QTableView::doubleClicked, [](const QModelIndex &index) { auto editor = new IrcConnectionEditor( - Irc::getInstance() + Irc::instance() .connections.getVector()[size_t(index.row())]); if (editor->exec() == QDialog::Accepted) { auto data = editor->data(); auto &&conns = - Irc::getInstance().connections.getVector(); + Irc::instance().connections.getVector(); int i = 0; for (auto &&conn : conns) { if (conn.id == data.id) { - Irc::getInstance().connections.removeItem( + Irc::instance().connections.removeItem( i, Irc::noEraseCredentialCaller); - Irc::getInstance().connections.insertItem(data, + Irc::instance().connections.insertItem(data, i); } i++; @@ -289,7 +289,7 @@ void SelectChannelDialog::setSelectedChannel(IndirectChannel _channel) if (auto server = ircChannel->server()) { int i = 0; - for (auto &&conn : Irc::getInstance().connections) + for (auto &&conn : Irc::instance().connections) { if (conn.id == server->id()) { @@ -350,11 +350,11 @@ IndirectChannel SelectChannelDialog::getSelectedChannel() const ->currentIndex() .row(); - auto &&vector = Irc::getInstance().connections.getVector(); + auto &&vector = Irc::instance().connections.getVector(); if (row >= 0 && row < int(vector.size())) { - return Irc::getInstance().getOrAddChannel( + return Irc::instance().getOrAddChannel( vector[size_t(row)].id, this->ui_.irc.channel->text()); } else diff --git a/src/widgets/dialogs/UpdateDialog.cpp b/src/widgets/dialogs/UpdateDialog.cpp index f28d6223..4d96a38a 100644 --- a/src/widgets/dialogs/UpdateDialog.cpp +++ b/src/widgets/dialogs/UpdateDialog.cpp @@ -26,7 +26,7 @@ UpdateDialog::UpdateDialog() auto dismiss = buttons->addButton("Dismiss", QDialogButtonBox::RejectRole); QObject::connect(install, &QPushButton::clicked, this, [this] { - Updates::getInstance().installUpdates(); + Updates::instance().installUpdates(); this->close(); }); QObject::connect(dismiss, &QPushButton::clicked, this, [this] { @@ -34,9 +34,9 @@ UpdateDialog::UpdateDialog() this->close(); }); - this->updateStatusChanged(Updates::getInstance().getStatus()); + this->updateStatusChanged(Updates::instance().getStatus()); this->connections_.managedConnect( - Updates::getInstance().statusUpdated, + Updates::instance().statusUpdated, [this](auto status) { this->updateStatusChanged(status); }); this->setScaleIndependantHeight(150); @@ -50,17 +50,17 @@ void UpdateDialog::updateStatusChanged(Updates::Status status) { case Updates::UpdateAvailable: { this->ui_.label->setText( - (Updates::getInstance().isDowngrade() + (Updates::instance().isDowngrade() ? QString( "The version online (%1) seems to be lower than the " "current (%2).\nEither a version was reverted or " "you are running a newer build.\n\nDo you want to " "download and install it?") - .arg(Updates::getInstance().getOnlineVersion(), - Updates::getInstance().getCurrentVersion()) + .arg(Updates::instance().getOnlineVersion(), + Updates::instance().getCurrentVersion()) : QString("An update (%1) is available.\n\nDo you want to " "download and install it?") - .arg(Updates::getInstance().getOnlineVersion()))); + .arg(Updates::instance().getOnlineVersion()))); this->updateGeometry(); } break; diff --git a/src/widgets/helper/ChannelView.cpp b/src/widgets/helper/ChannelView.cpp index afebf10f..3dc61eed 100644 --- a/src/widgets/helper/ChannelView.cpp +++ b/src/widgets/helper/ChannelView.cpp @@ -1049,7 +1049,7 @@ void ChannelView::mouseMoveEvent(QMouseEvent *event) this->pause(PauseReason::Mouse); } - auto tooltipWidget = TooltipWidget::getInstance(); + auto tooltipWidget = TooltipWidget::instance(); std::shared_ptr layout; QPoint relativePos; int messageIndex; @@ -1242,7 +1242,7 @@ void ChannelView::mouseMoveEvent(QMouseEvent *event) } else { - auto &tooltipPreviewImage = TooltipPreviewImage::getInstance(); + auto &tooltipPreviewImage = TooltipPreviewImage::instance(); auto emoteElement = dynamic_cast( &hoverLayoutElement->getCreator()); auto badgeElement = dynamic_cast( diff --git a/src/widgets/settingspages/AboutPage.cpp b/src/widgets/settingspages/AboutPage.cpp index cc1fb00a..0814fc66 100644 --- a/src/widgets/settingspages/AboutPage.cpp +++ b/src/widgets/settingspages/AboutPage.cpp @@ -75,7 +75,7 @@ AboutPage::AboutPage() auto versionInfo = layout.emplace("Version"); { - auto version = Version::getInstance(); + auto version = Version::instance(); QString text = QString("%1 (commit %2%3)") .arg(version.fullVersion()) .arg("" + version.commitHash() + "") - .arg(Modes::getInstance().isNightly + .arg(Modes::instance().isNightly ? ", " + version.dateOfBuild() : ""); diff --git a/src/widgets/splits/Split.cpp b/src/widgets/splits/Split.cpp index c3df3cd6..729eb825 100644 --- a/src/widgets/splits/Split.cpp +++ b/src/widgets/splits/Split.cpp @@ -412,7 +412,7 @@ void Split::leaveEvent(QEvent *event) this->overlay_->hide(); - TooltipWidget::getInstance()->hide(); + TooltipWidget::instance()->hide(); this->handleModifiers(QGuiApplication::queryKeyboardModifiers()); } diff --git a/src/widgets/splits/SplitHeader.cpp b/src/widgets/splits/SplitHeader.cpp index 60875567..8839708d 100644 --- a/src/widgets/splits/SplitHeader.cpp +++ b/src/widgets/splits/SplitHeader.cpp @@ -670,9 +670,9 @@ void SplitHeader::enterEvent(QEvent *event) { if (!this->tooltipText_.isEmpty()) { - TooltipPreviewImage::getInstance().setImage(nullptr); + TooltipPreviewImage::instance().setImage(nullptr); - auto tooltip = TooltipWidget::getInstance(); + auto tooltip = TooltipWidget::instance(); tooltip->moveTo(this, this->mapToGlobal(this->rect().bottomLeft()), false); tooltip->setText(this->tooltipText_); @@ -687,7 +687,7 @@ void SplitHeader::enterEvent(QEvent *event) void SplitHeader::leaveEvent(QEvent *event) { - TooltipWidget::getInstance()->hide(); + TooltipWidget::instance()->hide(); BaseWidget::leaveEvent(event); }