From f4828b7d092f1949cbc4197ff13bee22e8bd97eb Mon Sep 17 00:00:00 2001 From: 23rd <23rd@vivaldi.net> Date: Sat, 25 Aug 2018 21:38:14 +0300 Subject: [PATCH] Rename everything. --- chatterino.pro | 4 ++-- src/providers/{bttv/BttvTooltip.cpp => LinkResolver.cpp} | 4 ++-- src/providers/{bttv/BttvTooltip.hpp => LinkResolver.hpp} | 4 ++-- src/providers/twitch/TwitchMessageBuilder.cpp | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) rename src/providers/{bttv/BttvTooltip.cpp => LinkResolver.cpp} (91%) rename src/providers/{bttv/BttvTooltip.hpp => LinkResolver.hpp} (74%) diff --git a/chatterino.pro b/chatterino.pro index ebe784deb..00b866a1b 100644 --- a/chatterino.pro +++ b/chatterino.pro @@ -237,7 +237,7 @@ SOURCES += \ src/messages/Emote.cpp \ src/messages/ImageSet.cpp \ src/providers/bttv/BttvEmotes.cpp \ - src/providers/bttv/BttvTooltip.cpp \ + src/providers/LinkResolver.cpp \ src/providers/ffz/FfzEmotes.cpp \ src/autogenerated/ResourcesAutogen.cpp \ src/singletons/Badges.cpp \ @@ -434,7 +434,7 @@ HEADERS += \ src/messages/ImageSet.hpp \ src/common/Outcome.hpp \ src/providers/bttv/BttvEmotes.hpp \ - src/providers/bttv/BttvTooltip.hpp \ + src/providers/LinkResolver.hpp \ src/providers/ffz/FfzEmotes.hpp \ src/autogenerated/ResourcesAutogen.hpp \ src/singletons/Badges.hpp \ diff --git a/src/providers/bttv/BttvTooltip.cpp b/src/providers/LinkResolver.cpp similarity index 91% rename from src/providers/bttv/BttvTooltip.cpp rename to src/providers/LinkResolver.cpp index df3738411..5ebad69e3 100644 --- a/src/providers/bttv/BttvTooltip.cpp +++ b/src/providers/LinkResolver.cpp @@ -1,4 +1,4 @@ -#include "providers/bttv/BttvTooltip.hpp" +#include "providers/LinkResolver.hpp" #include "common/Common.hpp" #include "common/NetworkRequest.hpp" @@ -7,7 +7,7 @@ namespace chatterino { -void BttvTooltip::getUrlTooltip(const QString url, +void LinkResolver::getLinkInfo(const QString url, std::function successCallback) { QString requestUrl("https://api.betterttv.net/2/link_resolver/" + diff --git a/src/providers/bttv/BttvTooltip.hpp b/src/providers/LinkResolver.hpp similarity index 74% rename from src/providers/bttv/BttvTooltip.hpp rename to src/providers/LinkResolver.hpp index 2c6b2597a..919109aaf 100644 --- a/src/providers/bttv/BttvTooltip.hpp +++ b/src/providers/LinkResolver.hpp @@ -5,10 +5,10 @@ namespace chatterino { -class BttvTooltip +class LinkResolver { public: - static void getUrlTooltip(const QString url, + static void getLinkInfo(const QString url, std::function callback); private: diff --git a/src/providers/twitch/TwitchMessageBuilder.cpp b/src/providers/twitch/TwitchMessageBuilder.cpp index b83bfd29d..d19d3252c 100644 --- a/src/providers/twitch/TwitchMessageBuilder.cpp +++ b/src/providers/twitch/TwitchMessageBuilder.cpp @@ -8,7 +8,7 @@ #include "messages/Message.hpp" #include "providers/twitch/TwitchBadges.hpp" #include "providers/twitch/TwitchChannel.hpp" -#include "providers/bttv/BttvTooltip.hpp" +#include "providers/LinkResolver.hpp" #include "singletons/Emotes.hpp" #include "singletons/Resources.hpp" #include "singletons/Settings.hpp" @@ -276,7 +276,7 @@ void TwitchMessageBuilder::addTextOrEmoji(const QString &string_) textColor) ->setLink(link); - BttvTooltip::getUrlTooltip( + LinkResolver::getLinkInfo( linkString, [linkMessageElement](QString tooltipText) { if (!tooltipText.isEmpty()) { linkMessageElement->setTooltip(tooltipText);