renamed getInstance() -> instance() for singletons

src/providers/irc/Irc2.cpp

@@ -73,13 +73,13 @@ inline QString getCredentialName(const IrcServerData &data)
 void IrcServerData::getPassword(
     QObject *receiver, std::function<void(const QString &)> &&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;

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<void *>(1);

src/providers/twitch/IrcMessageHandler.cpp

@@ -40,7 +40,7 @@ static QMap<QString, QString> parseBadges(QString badgesString)
     return badges;
 }
 
-IrcMessageHandler &IrcMessageHandler::getInstance()
+IrcMessageHandler &IrcMessageHandler::instance()
 {
     static IrcMessageHandler instance;
     return instance;

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<MessagePtr> parseMessage(Channel *channel,

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<MessagePtr> allBuiltMessages;
 

src/providers/twitch/TwitchIrcServer.cpp

@@ -125,7 +125,7 @@ std::shared_ptr<Channel> 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")
     {

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)
     {