From 88d8bf7cecb0afa7d211b2d70b2faa481036c985 Mon Sep 17 00:00:00 2001
From: fourtf <tf.four@gmail.com>
Date: Wed, 18 Sep 2019 16:31:51 +0200
Subject: [PATCH] renamed members in Helpers.cpp

---
 lib/appbase/util/Helpers.cpp                    | 6 +++---
 lib/appbase/util/Helpers.hpp                    | 8 ++++----
 src/providers/twitch/PubsubClient.cpp           | 6 +++---
 src/widgets/settingspages/ExternalToolsPage.cpp | 5 +++--
 src/widgets/settingspages/GeneralPage.cpp       | 6 +++---
 5 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/lib/appbase/util/Helpers.cpp b/lib/appbase/util/Helpers.cpp
index 2c05778a..8658b2ce 100644
--- a/lib/appbase/util/Helpers.cpp
+++ b/lib/appbase/util/Helpers.cpp
@@ -4,19 +4,19 @@
 
 namespace AB_NAMESPACE {
 
-QString CreateUUID()
+QString generateUuid()
 {
     auto uuid = QUuid::createUuid();
     return uuid.toString();
 }
 
-QString createLink(const QString &url, bool file)
+QString formatRichLink(const QString &url, bool file)
 {
     return QString("<a href=\"") + (file ? "file:///" : "") + url + "\">" +
            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 + "\">" +
            name + "</a>";
diff --git a/lib/appbase/util/Helpers.hpp b/lib/appbase/util/Helpers.hpp
index a1038f78..bc2e714e 100644
--- a/lib/appbase/util/Helpers.hpp
+++ b/lib/appbase/util/Helpers.hpp
@@ -11,12 +11,12 @@ auto fS(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,
-                        bool file = false);
+QString formatRichNamedLink(const QString &url, const QString &name,
+                            bool file = false);
 
 QString shortenString(const QString &str, unsigned maxWidth = 50);
 
diff --git a/src/providers/twitch/PubsubClient.cpp b/src/providers/twitch/PubsubClient.cpp
index 9bb6ed3a..7753d584 100644
--- a/src/providers/twitch/PubsubClient.cpp
+++ b/src/providers/twitch/PubsubClient.cpp
@@ -65,7 +65,7 @@ namespace detail {
                 Listener{topic.GetString(), false, false, false});
         }
 
-        auto uuid = CreateUUID();
+        auto uuid = generateUuid();
 
         rj::set(message, "nonce", uuid);
 
@@ -102,9 +102,9 @@ namespace detail {
 
         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);
         sentMessages[uuid] = payload;
diff --git a/src/widgets/settingspages/ExternalToolsPage.cpp b/src/widgets/settingspages/ExternalToolsPage.cpp
index 7541b565..57a8a496 100644
--- a/src/widgets/settingspages/ExternalToolsPage.cpp
+++ b/src/widgets/settingspages/ExternalToolsPage.cpp
@@ -30,8 +30,9 @@ ExternalToolsPage::ExternalToolsPage()
         description->setStyleSheet("color: #bbb");
 
         auto links = new QLabel(
-            createNamedLink("https://streamlink.github.io/", "Website") + " " +
-            createNamedLink(
+            formatRichNamedLink("https://streamlink.github.io/", "Website") +
+            " " +
+            formatRichNamedLink(
                 "https://github.com/streamlink/streamlink/releases/latest",
                 "Download"));
         links->setTextFormat(Qt::RichText);
diff --git a/src/widgets/settingspages/GeneralPage.cpp b/src/widgets/settingspages/GeneralPage.cpp
index d49ac2da..344933a8 100644
--- a/src/widgets/settingspages/GeneralPage.cpp
+++ b/src/widgets/settingspages/GeneralPage.cpp
@@ -438,10 +438,10 @@ void GeneralPage::initLayout(SettingsLayout &layout)
     layout.addDescription("The browser extension replaces the default "
                           "Twitch.tv chat with chatterino.");
 
+    layout.addDescription(formatRichNamedLink(CHROME_EXTENSION_LINK,
+                                              "Download for Google Chrome"));
     layout.addDescription(
-        createNamedLink(CHROME_EXTENSION_LINK, "Download for Google Chrome"));
-    layout.addDescription(
-        createNamedLink(FIREFOX_EXTENSION_LINK, "Download for Firefox"));
+        formatRichNamedLink(FIREFOX_EXTENSION_LINK, "Download for Firefox"));
 #endif
 
     layout.addTitle("Miscellaneous");