From 3bc7e2da8a2e1859bc3e07ef6761742074fe5d9f Mon Sep 17 00:00:00 2001 From: Rasmus Karlsson Date: Thu, 7 Jun 2018 12:36:06 +0200 Subject: [PATCH] Key twitch emotes by QString instead of std::string --- src/providers/twitch/twitchemotes.cpp | 2 +- src/providers/twitch/twitchemotes.hpp | 2 +- src/widgets/emotepopup.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/providers/twitch/twitchemotes.cpp b/src/providers/twitch/twitchemotes.cpp index 879424a7e..d659a3a8b 100644 --- a/src/providers/twitch/twitchemotes.cpp +++ b/src/providers/twitch/twitchemotes.cpp @@ -72,7 +72,7 @@ void TwitchEmotes::refresh(const std::shared_ptr &user) return; } - TwitchAccountEmoteData &emoteData = this->emotes[roomID.toStdString()]; + TwitchAccountEmoteData &emoteData = this->emotes[roomID]; if (emoteData.filled) { qDebug() << "Already loaded for room id " << roomID; diff --git a/src/providers/twitch/twitchemotes.hpp b/src/providers/twitch/twitchemotes.hpp index 57f9595b4..b69044508 100644 --- a/src/providers/twitch/twitchemotes.hpp +++ b/src/providers/twitch/twitchemotes.hpp @@ -36,7 +36,7 @@ public: bool filled = false; }; - std::map emotes; + std::map emotes; private: // emote code diff --git a/src/widgets/emotepopup.cpp b/src/widgets/emotepopup.cpp index 127a88b0a..ae111c758 100644 --- a/src/widgets/emotepopup.cpp +++ b/src/widgets/emotepopup.cpp @@ -88,7 +88,7 @@ void EmotePopup::loadChannel(ChannelPtr _channel) // fourtf: the entire emote manager needs to be refactored so there's no point in trying to // fix this pile of garbage - for (const auto &set : app->emotes->twitch.emotes[userID.toStdString()].emoteSets) { + for (const auto &set : app->emotes->twitch.emotes[userID].emoteSets) { // TITLE messages::MessageBuilder builder1;