noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-21 22:24:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

renamed members in Helpers.cpp

Browse source
This commit is contained in:
fourtf 2019-09-18 16:31:51 +02:00
parent ffd63d9407
commit 88d8bf7cec
5 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/appbase/util/Helpers.cpp
View file

@ -4,19 +4,19 @@
namespace AB_NAMESPACE { namespace AB_NAMESPACE {
QString CreateUUID() QString generateUuid()
{ {
auto uuid = QUuid::createUuid(); auto uuid = QUuid::createUuid();
return uuid.toString(); return uuid.toString();
} }
QString createLink(const QString &url, bool file) QString formatRichLink(const QString &url, bool file)
{ {
return QString("<a href=\"") + (file ? "file:///" : "") + url + "\">" + return QString("<a href=\"") + (file ? "file:///" : "") + url + "\">" +
url + "</a>"; url + "</a>";
} }
QString createNamedLink(const QString &url, const QString &name, bool file) QString formatRichNamedLink(const QString &url, const QString &name, bool file)
{ {
return QString("<a href=\"") + (file ? "file:///" : "") + url + "\">" + return QString("<a href=\"") + (file ? "file:///" : "") + url + "\">" +
name + "</a>"; name + "</a>";

6
lib/appbase/util/Helpers.hpp
View file

@ -11,11 +11,11 @@ auto fS(Args &&... args)
return fmt::format(std::forward<Args>(args)...); return fmt::format(std::forward<Args>(args)...);
} }
QString CreateUUID(); QString generateUuid();
QString createLink(const QString &url, bool file = false); QString formatRichLink(const QString &url, bool file = false);
QString createNamedLink(const QString &url, const QString &name, QString formatRichNamedLink(const QString &url, const QString &name,
bool file = false); bool file = false);
QString shortenString(const QString &str, unsigned maxWidth = 50); QString shortenString(const QString &str, unsigned maxWidth = 50);

6
src/providers/twitch/PubsubClient.cpp
View file

@ -65,7 +65,7 @@ namespace detail {
Listener{topic.GetString(), false, false, false}); Listener{topic.GetString(), false, false, false});
} }
auto uuid = CreateUUID(); auto uuid = generateUuid();
rj::set(message, "nonce", uuid); rj::set(message, "nonce", uuid);
@ -102,9 +102,9 @@ namespace detail {
auto message = createUnlistenMessage(topics); auto message = createUnlistenMessage(topics);
auto uuid = CreateUUID(); auto uuid = generateUuid();
rj::set(message, "nonce", CreateUUID()); rj::set(message, "nonce", generateUuid());
std::string payload = rj::stringify(message); std::string payload = rj::stringify(message);
sentMessages[uuid] = payload; sentMessages[uuid] = payload;

5
src/widgets/settingspages/ExternalToolsPage.cpp
View file

@ -30,8 +30,9 @@ ExternalToolsPage::ExternalToolsPage()
description->setStyleSheet("color: #bbb"); description->setStyleSheet("color: #bbb");
auto links = new QLabel( auto links = new QLabel(
createNamedLink("https://streamlink.github.io/", "Website") + " " + formatRichNamedLink("https://streamlink.github.io/", "Website") +
createNamedLink( " " +
formatRichNamedLink(
"https://github.com/streamlink/streamlink/releases/latest", "https://github.com/streamlink/streamlink/releases/latest",
"Download")); "Download"));
links->setTextFormat(Qt::RichText); links->setTextFormat(Qt::RichText);

6
src/widgets/settingspages/GeneralPage.cpp
View file

@ -438,10 +438,10 @@ void GeneralPage::initLayout(SettingsLayout &layout)
layout.addDescription("The browser extension replaces the default " layout.addDescription("The browser extension replaces the default "
"Twitch.tv chat with chatterino."); "Twitch.tv chat with chatterino.");
layout.addDescription(formatRichNamedLink(CHROME_EXTENSION_LINK,
"Download for Google Chrome"));
layout.addDescription( layout.addDescription(
createNamedLink(CHROME_EXTENSION_LINK, "Download for Google Chrome")); formatRichNamedLink(FIREFOX_EXTENSION_LINK, "Download for Firefox"));
layout.addDescription(
createNamedLink(FIREFOX_EXTENSION_LINK, "Download for Firefox"));
#endif #endif
layout.addTitle("Miscellaneous"); layout.addTitle("Miscellaneous");