diff --git a/src/lyrics/geniuslyricsprovider.cpp b/src/lyrics/geniuslyricsprovider.cpp index f36ed611..62745caf 100644 --- a/src/lyrics/geniuslyricsprovider.cpp +++ b/src/lyrics/geniuslyricsprovider.cpp @@ -297,7 +297,7 @@ bool GeniusLyricsProvider::StartSearch(const int id, const LyricsSearchRequest & requests_search_.insert(id, search); QUrlQuery url_query; - url_query.addQueryItem("q", QUrl::toPercentEncoding(QString(request.artist + " " + request.title))); + url_query.addQueryItem("q", QUrl::toPercentEncoding(QString("%1 %2").arg(request.artist, request.title))); QUrl url(kUrlSearch); url.setQuery(url_query); diff --git a/src/playlistparsers/asxparser.cpp b/src/playlistparsers/asxparser.cpp index e315932e..4bde4164 100644 --- a/src/playlistparsers/asxparser.cpp +++ b/src/playlistparsers/asxparser.cpp @@ -55,7 +55,7 @@ SongList ASXParser::Load(QIODevice *device, const QString &playlist_path, const QString url = re_match.captured(2); url.replace(QRegularExpression("&(?!amp;|quot;|apos;|lt;|gt;)"), "&"); - QByteArray replacement = QString(re_match.captured(1) + url + "\"").toLocal8Bit(); + QByteArray replacement = QString("%1%2\"").arg(re_match.captured(1), url).toLocal8Bit(); data.replace(re_match.captured(0).toLocal8Bit(), replacement); index += replacement.length(); } diff --git a/src/queue/queue.cpp b/src/queue/queue.cpp index 88fad4c4..99e43ebb 100644 --- a/src/queue/queue.cpp +++ b/src/queue/queue.cpp @@ -158,7 +158,7 @@ QVariant Queue::data(const QModelIndex &proxy_index, int role) const { const QString title = source_index.sibling(source_index.row(), Playlist::Column_Title).data().toString(); if (artist.isEmpty()) return title; - return QString(artist + " - " + title); + return QString("%1 - %2").arg(artist, title); } default: diff --git a/src/utilities/envutils.cpp b/src/utilities/envutils.cpp index 9709ccc1..d5caa8fe 100644 --- a/src/utilities/envutils.cpp +++ b/src/utilities/envutils.cpp @@ -54,7 +54,7 @@ QString DesktopEnvironment() { QString session = GetEnv("DESKTOP_SESSION"); qint64 slash = session.lastIndexOf('/'); if (slash != -1) { - QSettings desktop_file(QString(session + ".desktop"), QSettings::IniFormat); + QSettings desktop_file(QString("%1.desktop").arg(session), QSettings::IniFormat); desktop_file.beginGroup("Desktop Entry"); QString name = desktop_file.value("DesktopNames").toString(); desktop_file.endGroup();