string.h: make coloredLinkString() a free function

6 files changed, 6 insertions, 7 deletions

diff --git a/src/preferences/dialog/dlgprefdeck.cpp b/src/preferences/dialog/dlgprefdeck.cpp
index a37dbf0966..8c943fa276 100644
--- a/src/preferences/dialog/dlgprefdeck.cpp
+++ b/src/preferences/dialog/dlgprefdeck.cpp
@@ -334,7 +334,7 @@ DlgPrefDeck::DlgPrefDeck(QWidget* parent,
 
     // Add "(?)" with a manual link to the label
     labelCueMode->setText(labelCueMode->text() + QStringLiteral(" ") +
-            m_stringFormatter.coloredLinkString(
+            coloredLinkString(
                     m_pLinkColor,
                     QStringLiteral("(?)"),
                     MIXXX_MANUAL_CUE_MODES_URL));
diff --git a/src/preferences/dialog/dlgprefmodplug.cpp b/src/preferences/dialog/dlgprefmodplug.cpp
index c3c0706e48..d4ed76f8cd 100644
--- a/src/preferences/dialog/dlgprefmodplug.cpp
+++ b/src/preferences/dialog/dlgprefmodplug.cpp
@@ -34,7 +34,7 @@ DlgPrefModplug::DlgPrefModplug(QWidget *parent,
     m_pUi->modplugSettingsHint->setText(
             tr("All settings take effect on next track load. Currently loaded tracks "
                "are not affected. For an explanation of these settings, see the %1")
-                    .arg(m_stringFormatter.coloredLinkString(
+                    .arg(coloredLinkString(
                             m_pLinkColor,
                             "OpenMPT manual",
                             "http://wiki.openmpt.org/Manual:_Setup/Player")));
diff --git a/src/preferences/dialog/dlgprefnovinyl.cpp b/src/preferences/dialog/dlgprefnovinyl.cpp
index d8e20d71ef..94eb893aee 100644
--- a/src/preferences/dialog/dlgprefnovinyl.cpp
+++ b/src/preferences/dialog/dlgprefnovinyl.cpp
@@ -14,7 +14,7 @@ DlgPrefNoVinyl::DlgPrefNoVinyl(QWidget * parent, SoundManager * soundman,
     noVinylControlHint->setText(
             tr("This version of Mixxx does not support vinyl control.\n"
                "Please visit %1 for more information.")
-                    .arg(m_stringFormatter.coloredLinkString(
+                    .arg(coloredLinkString(
                             m_pLinkColor,
                             MIXXX_WEBSITE_SHORT_URL,
                             MIXXX_WEBSITE_URL)));
diff --git a/src/preferences/dialog/dlgprefsound.cpp b/src/preferences/dialog/dlgprefsound.cpp
index 47bbc14d69..e0baf65b7d 100644
--- a/src/preferences/dialog/dlgprefsound.cpp
+++ b/src/preferences/dialog/dlgprefsound.cpp
@@ -241,7 +241,7 @@ DlgPrefSound::DlgPrefSound(QWidget* pParent,
 
     realtimeHint->setText(
             tr("To enable Realtime scheduling (currently disabled), see the %1.")
-                    .arg(m_stringFormatter.coloredLinkString(
+                    .arg(coloredLinkString(
                             m_pLinkColor,
                             QStringLiteral("Mixxx Wiki"),
                             MIXXX_WIKI_AUDIO_LATENCY_URL)));
@@ -249,7 +249,7 @@ DlgPrefSound::DlgPrefSound(QWidget* pParent,
     hardwareGuide->setText(
             tr("The %1 lists sound cards and controllers you may want to "
                "consider for using Mixxx.")
-                    .arg(m_stringFormatter.coloredLinkString(
+                    .arg(coloredLinkString(
                             m_pLinkColor,
                             tr("Mixxx DJ Hardware Guide"),
                             MIXXX_WIKI_HARDWARE_COMPATIBILITY_URL)));
diff --git a/src/preferences/dialog/dlgprefvinyl.cpp b/src/preferences/dialog/dlgprefvinyl.cpp
index fa4183b57b..1a12984ad2 100644
--- a/src/preferences/dialog/dlgprefvinyl.cpp
+++ b/src/preferences/dialog/dlgprefvinyl.cpp
@@ -77,7 +77,7 @@ DlgPrefVinyl::DlgPrefVinyl(QWidget * parent, VinylControlManager *pVCMan,
     LeadinTime3->setSuffix(" s");
     LeadinTime4->setSuffix(" s");
 
-    TroubleshootingLink->setText(m_stringFormatter.coloredLinkString(
+    TroubleshootingLink->setText(coloredLinkString(
             m_pLinkColor,
             QStringLiteral("Troubleshooting"),
             MIXXX_MANUAL_VINYL_TROUBLESHOOTING_URL));
diff --git a/src/preferences/dlgpreferencepage.h b/src/preferences/dlgpreferencepage.h
index 2871d6c6fb..d2a06a2515 100644
--- a/src/preferences/dlgpreferencepage.h
+++ b/src/preferences/dlgpreferencepage.h
@@ -20,7 +20,6 @@ class DlgPreferencePage : public QWidget {
     virtual QUrl helpUrl() const;
 
     QColor m_pLinkColor;
-    LinkFormatter m_stringFormatter;
 
   public slots:
     /// Called when the preference dialog is shown to the user (not necessarily