diff options
author | ronso0 <ronso0@mixxx.org> | 2021-01-05 20:16:25 +0100 |
---|---|---|
committer | ronso0 <ronso0@mixxx.org> | 2021-01-05 22:11:28 +0100 |
commit | 850bbdf347c9b5ec72dd2539c25301f26abf5942 (patch) | |
tree | b3b748061164a442376eb8b7c66bf59713f86e05 /src/controllers | |
parent | a0e791157980c5fef0ea6fa3eb06b5fc58835a4f (diff) |
string.h: make coloredLinkString() a free function
Diffstat (limited to 'src/controllers')
-rw-r--r-- | src/controllers/dlgprefcontroller.cpp | 12 | ||||
-rw-r--r-- | src/controllers/dlgprefcontrollers.cpp | 10 |
2 files changed, 11 insertions, 11 deletions
diff --git a/src/controllers/dlgprefcontroller.cpp b/src/controllers/dlgprefcontroller.cpp index 647d74a590..8158e45992 100644 --- a/src/controllers/dlgprefcontroller.cpp +++ b/src/controllers/dlgprefcontroller.cpp @@ -244,7 +244,7 @@ QString DlgPrefController::presetSupportLinks( QString forumLink = pPreset->forumlink(); if (!forumLink.isEmpty()) { - linkList << m_stringFormatter.coloredLinkString( + linkList << coloredLinkString( m_pLinkColor, "Mixxx Forums", forumLink); @@ -252,7 +252,7 @@ QString DlgPrefController::presetSupportLinks( QString wikiLink = pPreset->wikilink(); if (!wikiLink.isEmpty()) { - linkList << m_stringFormatter.coloredLinkString( + linkList << coloredLinkString( m_pLinkColor, "Mixxx Wiki", wikiLink); @@ -260,7 +260,7 @@ QString DlgPrefController::presetSupportLinks( QString manualLink = pPreset->manualLink(); if (!manualLink.isEmpty()) { - linkList << m_stringFormatter.coloredLinkString( + linkList << coloredLinkString( m_pLinkColor, "Mixxx Manual", manualLink); @@ -268,7 +268,7 @@ QString DlgPrefController::presetSupportLinks( // There is always at least one support link. // TODO(rryan): This is a horrible general support link for MIDI! - linkList << m_stringFormatter.coloredLinkString( + linkList << coloredLinkString( m_pLinkColor, tr("Troubleshooting"), MIXXX_WIKI_MIDI_SCRIPTING_URL); @@ -285,7 +285,7 @@ QString DlgPrefController::presetFileLinks( const QString builtinFileSuffix = QStringLiteral(" (") + tr("built-in") + QStringLiteral(")"); QString systemPresetPath = resourcePresetsPath(m_pConfig); QStringList linkList; - QString xmlFileLink = m_stringFormatter.coloredLinkString( + QString xmlFileLink = coloredLinkString( m_pLinkColor, QFileInfo(pPreset->filePath()).fileName(), pPreset->filePath()); @@ -295,7 +295,7 @@ QString DlgPrefController::presetFileLinks( linkList << xmlFileLink; for (const auto& script : pPreset->getScriptFiles()) { - QString scriptFileLink = m_stringFormatter.coloredLinkString( + QString scriptFileLink = coloredLinkString( m_pLinkColor, script.name, script.file.absoluteFilePath()); diff --git a/src/controllers/dlgprefcontrollers.cpp b/src/controllers/dlgprefcontrollers.cpp index 6457ff0ab2..d66daa7ea7 100644 --- a/src/controllers/dlgprefcontrollers.cpp +++ b/src/controllers/dlgprefcontrollers.cpp @@ -42,27 +42,27 @@ DlgPrefControllers::DlgPrefControllers(DlgPreferences* pPreferences, "Folder\" then restart Mixxx. If you download a mapping in a ZIP file, " "extract the XML and Javascript file(s) from the ZIP file to your " "\"User Mapping Folder\" then restart Mixxx.") - .arg(m_stringFormatter.coloredLinkString( + .arg(coloredLinkString( m_pLinkColor, QStringLiteral("Mixxx Controller Forums"), MIXXX_CONTROLLER_FORUMS_URL))); - txtHardwareCompatibility->setText(m_stringFormatter.coloredLinkString( + txtHardwareCompatibility->setText(coloredLinkString( m_pLinkColor, tr("Mixxx DJ Hardware Guide"), MIXXX_WIKI_HARDWARE_COMPATIBILITY_URL)); - txtControllerForums->setText(m_stringFormatter.coloredLinkString( + txtControllerForums->setText(coloredLinkString( m_pLinkColor, tr("MIDI Mapping File Format"), MIXXX_WIKI_CONTROLLER_PRESET_FORMAT_URL)); - txtControllerPresetFormat->setText(m_stringFormatter.coloredLinkString( + txtControllerPresetFormat->setText(coloredLinkString( m_pLinkColor, QStringLiteral("Mixxx Controller Forums"), MIXXX_CONTROLLER_FORUMS_URL)); - txtControllerScripting->setText(m_stringFormatter.coloredLinkString( + txtControllerScripting->setText(coloredLinkString( m_pLinkColor, tr("MIDI Scripting with Javascript"), MIXXX_WIKI_MIDI_SCRIPTING_URL)); |