renamed getInstance() -> instance() for singletons
This commit is contained in:
@@ -40,7 +40,7 @@ static QMap<QString, QString> parseBadges(QString badgesString)
|
||||
return badges;
|
||||
}
|
||||
|
||||
IrcMessageHandler &IrcMessageHandler::getInstance()
|
||||
IrcMessageHandler &IrcMessageHandler::instance()
|
||||
{
|
||||
static IrcMessageHandler instance;
|
||||
return instance;
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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")
|
||||
{
|
||||
|
||||
@@ -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)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user