CueParser: Detect and handle different text encodings

Fixes #1429

.github/FUNDING.yml

@@ -1,3 +1,4 @@
 github: jonaski
 patreon: jonaskvinge
+ko_fi: jonaskvinge
 custom: https://paypal.me/jonaskvinge

.gitmodules

@@ -0,0 +1,4 @@
+[submodule "3rdparty/kdsingleapplication/KDSingleApplication"]
+	path = 3rdparty/kdsingleapplication/KDSingleApplication
+	url = https://github.com/KDAB/KDSingleApplication.git
+	branch = master

3rdparty/getopt/getopt.cpp

@@ -62,7 +62,7 @@ enum ENUM_ORDERING {
 
 //
 //
-//		Ansi structures and functions follow
+// Ansi structures and functions follow
 //
 //
 
@@ -409,7 +409,7 @@ int _getopt_long_only_r_a(int argc, char *const *argv, const char *options, cons
 
 //
 //
-//	Unicode Structures and Functions
+// Unicode Structures and Functions
 //
 //
 
@@ -750,4 +750,4 @@ int _getopt_long_r_w(int argc, wchar_t *const *argv, const wchar_t *options, con
 int _getopt_long_only_r_w(int argc, wchar_t *const *argv, const wchar_t *options, const struct option_w *long_options, int *opt_index, struct _getopt_data_w *d);
 int _getopt_long_only_r_w(int argc, wchar_t *const *argv, const wchar_t *options, const struct option_w *long_options, int *opt_index, struct _getopt_data_w *d) {
   return _getopt_internal_r_w(argc, argv, options, long_options, opt_index, 1, d, 0);
-}
+}

3rdparty/kdsingleapplication/CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.7)
-set(SOURCES kdsingleapplication.cpp kdsingleapplication_localsocket.cpp)
-set(HEADERS kdsingleapplication.h kdsingleapplication_localsocket_p.h)
+set(SOURCES KDSingleApplication/src/kdsingleapplication.cpp KDSingleApplication/src/kdsingleapplication_localsocket.cpp)
+set(HEADERS KDSingleApplication/src/kdsingleapplication.h KDSingleApplication/src/kdsingleapplication_localsocket_p.h)
 qt_wrap_cpp(MOC ${HEADERS})
 add_library(kdsingleapplication STATIC ${SOURCES} ${MOC})
 target_compile_definitions(kdsingleapplication PRIVATE -DKDSINGLEAPPLICATION_STATIC_BUILD)

3rdparty/kdsingleapplication/KDSingleApplication

@@ -0,0 +1 @@
+Subproject commit cb0c664b40d3b31bad30aa3521eff603162ed0bd

3rdparty/kdsingleapplication/LICENSE

@@ -1,6 +0,0 @@
-KDSingleApplication is (C) 2019-2023, Klarälvdalens Datakonsult AB,
-and is available under the terms of the MIT license.
-
-See the full license text in the LICENSES folder.
-
-Contact KDAB at <info@kdab.com> to inquire about commercial licensing.

3rdparty/kdsingleapplication/LICENSES/BSD-3-Clause.txt

@@ -1,11 +0,0 @@
-Copyright (c) <year> <owner>.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

3rdparty/kdsingleapplication/LICENSES/MIT.txt

@@ -1,9 +0,0 @@
-MIT License
-
-Copyright (c) <year> <copyright holders>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

3rdparty/kdsingleapplication/README.md

@@ -1,53 +0,0 @@
-# KDSingleApplication
-
-`KDSingleApplication` is a helper class for single-instance policy applications
-written by [KDAB](https://www.kdab.com).
-
-## Usage
-
-Currently the documentation is woefully lacking, but see the examples or tests
-for inspiration. Basically it involves:
-
-1. Create a `Q(Core|Gui)Application` object.
-2. Create a `KDSingleApplication` object.
-3. Check if the current instance is *primary* (or "master") or
-   *secondary* (or "slave") by calling `isPrimaryInstance`:
-    * the *primary* instance needs to listen from messages coming from the
-      secondary instances, by connecting a slot to the `messageReceived` signal;
-    * the *secondary* instances can send messages to the primary instance
-      by calling `sendMessage`.
-
-## Licensing
-
-KDSingleApplication is (C) 2019-2023, Klarälvdalens Datakonsult AB, and is available
-under the terms of the [MIT license](LICENSES/MIT.txt).
-
-Contact KDAB at <info@kdab.com> if you need different licensing options.
-
-## Get Involved
-
-KDAB will happily accept external contributions.
-
-Please submit your contributions or issue reports from our GitHub space at
-<https://github.com/KDAB/KDSingleApplication>.
-
-## About KDAB
-
-KDSingleApplication is supported and maintained by Klarälvdalens Datakonsult AB (KDAB).
-
-The KDAB Group is the global No.1 software consultancy for Qt, C++ and
-OpenGL applications across desktop, embedded and mobile platforms.
-
-The KDAB Group provides consulting and mentoring for developing Qt applications
-from scratch and in porting from all popular and legacy frameworks to Qt.
-We continue to help develop parts of Qt and are one of the major contributors
-to the Qt Project. We can give advanced or standard trainings anywhere
-around the globe on Qt as well as C++, OpenGL, 3D and more.
-
-Please visit <https://www.kdab.com> to meet the people who write code like this.
-
-Stay up-to-date with KDAB product announcements:
-
-* [KDAB Newsletter](https://news.kdab.com)
-* [KDAB Blogs](https://www.kdab.com/category/blogs)
-* [KDAB on Twitter](https://twitter.com/KDABQt)

3rdparty/kdsingleapplication/kdsingleapplication.cpp

@@ -1,106 +0,0 @@
-/*
-  This file is part of KDSingleApplication.
-
-  SPDX-FileCopyrightText: 2019-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
-
-  SPDX-License-Identifier: MIT
-
-  Contact KDAB at <info@kdab.com> for commercial licensing options.
-*/
-
-#include "kdsingleapplication.h"
-
-#include <QtCore/QCoreApplication>
-#include <QtCore/QFileInfo>
-
-// TODO: make this pluggable.
-#include "kdsingleapplication_localsocket_p.h"
-
-// Avoiding dragging in Qt private APIs for now, so this does not inherit
-// from QObjectPrivate.
-class KDSingleApplicationPrivate
-{
-public:
-    explicit KDSingleApplicationPrivate(const QString &name, KDSingleApplication *q);
-
-    QString name() const
-    {
-        return m_name;
-    }
-
-    bool isPrimaryInstance() const
-    {
-        return m_impl.isPrimaryInstance();
-    }
-
-    bool sendMessage(const QByteArray &message, int timeout)
-    {
-        return m_impl.sendMessage(message, timeout);
-    }
-
-private:
-    Q_DECLARE_PUBLIC(KDSingleApplication)
-
-    KDSingleApplication *q_ptr;
-    QString m_name;
-
-    KDSingleApplicationLocalSocket m_impl;
-};
-
-KDSingleApplicationPrivate::KDSingleApplicationPrivate(const QString &name, KDSingleApplication *q)
-    : q_ptr(q)
-    , m_name(name)
-    , m_impl(name)
-{
-    if (Q_UNLIKELY(name.isEmpty()))
-        qFatal("KDSingleApplication requires a non-empty application name");
-
-    if (isPrimaryInstance()) {
-        QObject::connect(&m_impl, &KDSingleApplicationLocalSocket::messageReceived,
-                         q, &KDSingleApplication::messageReceived);
-    }
-}
-
-static QString extractExecutableName(const QString &applicationFilePath)
-{
-    return QFileInfo(applicationFilePath).fileName();
-}
-
-KDSingleApplication::KDSingleApplication(QObject *parent)
-    : KDSingleApplication(extractExecutableName(QCoreApplication::applicationFilePath()), parent)
-{
-}
-
-KDSingleApplication::KDSingleApplication(const QString &name, QObject *parent)
-    : QObject(parent)
-    , d_ptr(new KDSingleApplicationPrivate(name, this))
-{
-}
-
-QString KDSingleApplication::name() const
-{
-    Q_D(const KDSingleApplication);
-    return d->name();
-}
-
-bool KDSingleApplication::isPrimaryInstance() const
-{
-    Q_D(const KDSingleApplication);
-    return d->isPrimaryInstance();
-}
-
-bool KDSingleApplication::sendMessage(const QByteArray &message)
-{
-    return sendMessageWithTimeout(message, 5000);
-}
-
-bool KDSingleApplication::sendMessageWithTimeout(const QByteArray &message, int timeout)
-{
-    Q_ASSERT(!isPrimaryInstance());
-
-    Q_D(KDSingleApplication);
-    return d->sendMessage(message, timeout);
-}
-
-
-KDSingleApplication::~KDSingleApplication() = default;

3rdparty/kdsingleapplication/kdsingleapplication.h

@@ -1,48 +0,0 @@
-/*
-  This file is part of KDSingleApplication.
-
-  SPDX-FileCopyrightText: 2019-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
-
-  SPDX-License-Identifier: MIT
-
-  Contact KDAB at <info@kdab.com> for commercial licensing options.
-*/
-#ifndef KDSINGLEAPPLICATION_H
-#define KDSINGLEAPPLICATION_H
-
-#include <QtCore/QObject>
-
-#include <memory>
-
-#include "kdsingleapplication_lib.h"
-
-class KDSingleApplicationPrivate;
-
-class KDSINGLEAPPLICATION_EXPORT KDSingleApplication : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(QString name READ name CONSTANT)
-    Q_PROPERTY(bool isPrimaryInstance READ isPrimaryInstance CONSTANT)
-
-public:
-    explicit KDSingleApplication(QObject *parent = nullptr);
-    explicit KDSingleApplication(const QString &name, QObject *parent = nullptr);
-    ~KDSingleApplication();
-
-    QString name() const;
-    bool isPrimaryInstance() const;
-
-public Q_SLOTS:
-    // avoid default arguments and overloads, as they don't mix with connections
-    bool sendMessage(const QByteArray &message);
-    bool sendMessageWithTimeout(const QByteArray &message, int timeout);
-
-Q_SIGNALS:
-    void messageReceived(const QByteArray &message);
-
-private:
-    Q_DECLARE_PRIVATE(KDSingleApplication)
-    std::unique_ptr<KDSingleApplicationPrivate> d_ptr;
-};
-
-#endif // KDSINGLEAPPLICATION_H

3rdparty/kdsingleapplication/kdsingleapplication_lib.h

@@ -1,23 +0,0 @@
-/*
-  This file is part of KDSingleApplication.
-
-  SPDX-FileCopyrightText: 2019-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
-
-  SPDX-License-Identifier: MIT
-
-  Contact KDAB at <info@kdab.com> for commercial licensing options.
-*/
-#ifndef KDSINGLEAPPLICATION_LIB_H
-#define KDSINGLEAPPLICATION_LIB_H
-
-#include <QtCore/QtGlobal>
-
-#if defined(KDSINGLEAPPLICATION_STATIC_BUILD)
-#define KDSINGLEAPPLICATION_EXPORT
-#elif defined(KDSINGLEAPPLICATION_SHARED_BUILD)
-#define KDSINGLEAPPLICATION_EXPORT Q_DECL_EXPORT
-#else
-#define KDSINGLEAPPLICATION_EXPORT Q_DECL_IMPORT
-#endif
-
-#endif // KDSINGLEAPPLICATION_LIB_H

3rdparty/kdsingleapplication/kdsingleapplication_localsocket.cpp

@@ -1,324 +0,0 @@
-/*
-  This file is part of KDSingleApplication.
-
-  SPDX-FileCopyrightText: 2019-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
-
-  SPDX-License-Identifier: MIT
-
-  Contact KDAB at <info@kdab.com> for commercial licensing options.
-*/
-
-#include "kdsingleapplication_localsocket_p.h"
-
-#include <QtCore/QDir>
-#include <QtCore/QDeadlineTimer>
-#include <QtCore/QTimer>
-#include <QtCore/QLockFile>
-#include <QtCore/QDataStream>
-
-#include <QtCore/QtDebug>
-#include <QtCore/QLoggingCategory>
-
-#include <QtNetwork/QLocalServer>
-#include <QtNetwork/QLocalSocket>
-
-#include <chrono>
-#include <algorithm>
-
-#ifdef Q_OS_UNIX
-// for ::getuid()
-#  include <sys/types.h>
-#  include <unistd.h>
-#endif
-
-#ifdef Q_OS_WIN
-#  include <qt_windows.h>
-#endif
-
-namespace {
-static constexpr auto LOCALSOCKET_CONNECTION_TIMEOUT = std::chrono::seconds(5);
-static constexpr char LOCALSOCKET_PROTOCOL_VERSION = 2;
-}  // namespace
-
-#ifdef __GNUC__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wmissing-declarations"
-#endif
-Q_LOGGING_CATEGORY(kdsaLocalSocket, "kdsingleapplication.localsocket", QtWarningMsg)
-#ifdef __GNUC__
-#pragma GCC diagnostic pop
-#endif
-
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wgnu-zero-variadic-macro-arguments"
-#endif
-
-KDSingleApplicationLocalSocket::KDSingleApplicationLocalSocket(const QString &name, QObject *parent)
-    : QObject(parent)
-{
-#if defined(Q_OS_UNIX)
-    /* cppcheck-suppress useInitializationList */
-    m_socketName = QStringLiteral("kdsingleapp-%1-%2")
-                       .arg(::getuid())
-                       .arg(name);
-#elif defined(Q_OS_WIN)
-    // I'm not sure of a "global session identifier" on Windows; are
-    // multiple logins from the same user a possibility? For now, following this:
-    // https://docs.microsoft.com/en-us/windows/desktop/devnotes/getting-the-session-id-of-the-current-process
-
-    DWORD sessionId;
-    BOOL haveSessionId = ProcessIdToSessionId(GetCurrentProcessId(), &sessionId);
-
-    m_socketName = QString::fromUtf8("kdsingleapp-%1-%2")
-                       .arg(haveSessionId ? sessionId : 0)
-                       .arg(name);
-#else
-#error "KDSingleApplication has not been ported to this platform"
-#endif
-
-    const QString lockFilePath =
-        QDir::tempPath() + QLatin1Char('/') + m_socketName + QLatin1String(".lock");
-
-    qCDebug(kdsaLocalSocket) << "Socket name is" << m_socketName;
-    qCDebug(kdsaLocalSocket) << "Lock file path is" << lockFilePath;
-
-    std::unique_ptr<QLockFile> lockFile(new QLockFile(lockFilePath));
-    lockFile->setStaleLockTime(0);
-
-    if (!lockFile->tryLock()) {
-        // someone else has the lock => we're secondary
-        qCDebug(kdsaLocalSocket) << "Secondary instance";
-        return;
-    }
-
-    qCDebug(kdsaLocalSocket) << "Primary instance";
-
-    std::unique_ptr<QLocalServer> server = std::make_unique<QLocalServer>();
-    if (!server->listen(m_socketName)) {
-        // maybe the primary crashed, leaving a stale socket; delete it and try again
-        QLocalServer::removeServer(m_socketName);
-        if (!server->listen(m_socketName)) {
-            // TODO: better error handling.
-            qWarning("KDSingleApplication: unable to make the primary instance listen on %ls: %ls",
-                     qUtf16Printable(m_socketName),
-                     qUtf16Printable(server->errorString()));
-
-            return;
-        }
-    }
-
-    connect(server.get(), &QLocalServer::newConnection,
-            this, &KDSingleApplicationLocalSocket::handleNewConnection);
-
-    m_lockFile = std::move(lockFile);
-    m_localServer = std::move(server);
-}
-
-KDSingleApplicationLocalSocket::~KDSingleApplicationLocalSocket() = default;
-
-bool KDSingleApplicationLocalSocket::isPrimaryInstance() const
-{
-    return m_localServer != nullptr;
-}
-
-bool KDSingleApplicationLocalSocket::sendMessage(const QByteArray &message, int timeout)
-{
-    Q_ASSERT(!isPrimaryInstance());
-    QLocalSocket socket;
-
-    qCDebug(kdsaLocalSocket) << "Preparing to send message" << message << "with timeout" << timeout;
-
-    QDeadlineTimer deadline(timeout);
-
-    // There is an inherent race here with the setup of the server side.
-    // Even if the socket lock is held by the server, the server may not
-    // be listening yet. So this connection may fail; keep retrying
-    // until we hit the timeout.
-    do {
-        socket.connectToServer(m_socketName);
-        if (socket.waitForConnected(static_cast<int>(deadline.remainingTime())))
-            break;
-    } while (!deadline.hasExpired());
-
-    qCDebug(kdsaLocalSocket) << "Socket state:" << socket.state() << "Timer remaining" << deadline.remainingTime() << "Expired?" << deadline.hasExpired();
-
-    if (deadline.hasExpired()) {
-        qCWarning(kdsaLocalSocket) << "Connection timed out";
-        return false;
-    }
-
-    socket.write(&LOCALSOCKET_PROTOCOL_VERSION, 1);
-
-    {
-        QByteArray encodedMessage;
-        QDataStream ds(&encodedMessage, QIODevice::WriteOnly);
-        ds << message;
-        socket.write(encodedMessage);
-    }
-
-    qCDebug(kdsaLocalSocket) << "Wrote message in the socket"
-                             << "Timer remaining" << deadline.remainingTime() << "Expired?" << deadline.hasExpired();
-
-    // There is no acknowledgement mechanism here.
-    // Should there be one?
-
-    while (socket.bytesToWrite() > 0) {
-        if (!socket.waitForBytesWritten(static_cast<int>(deadline.remainingTime()))) {
-            qCWarning(kdsaLocalSocket) << "Message to primary timed out";
-            return false;
-        }
-    }
-
-    qCDebug(kdsaLocalSocket) << "Bytes written, now disconnecting"
-                             << "Timer remaining" << deadline.remainingTime() << "Expired?" << deadline.hasExpired();
-
-    socket.disconnectFromServer();
-
-    if (socket.state() == QLocalSocket::UnconnectedState) {
-        qCDebug(kdsaLocalSocket) << "Disconnected -- success!";
-        return true;
-    }
-
-    if (!socket.waitForDisconnected(static_cast<int>(deadline.remainingTime()))) {
-        qCWarning(kdsaLocalSocket) << "Disconnection from primary timed out";
-        return false;
-    }
-
-    qCDebug(kdsaLocalSocket) << "Disconnected -- success!";
-
-    return true;
-}
-
-void KDSingleApplicationLocalSocket::handleNewConnection()
-{
-    Q_ASSERT(m_localServer);
-
-    QLocalSocket *socket = nullptr;
-    while ((socket = m_localServer->nextPendingConnection())) {
-        qCDebug(kdsaLocalSocket) << "Got new connection on" << m_socketName << "state" << socket->state();
-
-        Connection c(socket);
-        socket = c.socket.get();
-
-        c.readDataConnection = QObjectConnectionHolder(
-            connect(socket, &QLocalSocket::readyRead,
-                    this, &KDSingleApplicationLocalSocket::readDataFromSecondary));
-
-        c.secondaryDisconnectedConnection = QObjectConnectionHolder(
-            connect(socket, &QLocalSocket::disconnected,
-                    this, &KDSingleApplicationLocalSocket::secondaryDisconnected));
-
-        c.abortConnection = QObjectConnectionHolder(
-            connect(c.timeoutTimer.get(), &QTimer::timeout,
-                    this, &KDSingleApplicationLocalSocket::abortConnectionToSecondary));
-
-        m_clients.push_back(std::move(c));
-
-        // Note that by the time we get here, the socket could've already been closed,
-        // and no signals emitted (hello, Windows!). Read what's already in the socket.
-        if (readDataFromSecondarySocket(socket))
-            return;
-
-        if (socket->state() == QLocalSocket::UnconnectedState)
-            secondarySocketDisconnected(socket);
-    }
-}
-
-template<typename Container>
-static auto findConnectionBySocket(Container &container, QLocalSocket *socket)
-{
-    auto i = std::find_if(container.begin(),
-                          container.end(),
-                          [socket](const auto &c) { return c.socket.get() == socket; });
-    Q_ASSERT(i != container.end());
-    return i;
-}
-
-template<typename Container>
-static auto findConnectionByTimer(Container &container, QTimer *timer)
-{
-    auto i = std::find_if(container.begin(),
-                          container.end(),
-                          [timer](const auto &c) { return c.timeoutTimer.get() == timer; });
-    Q_ASSERT(i != container.end());
-    return i;
-}
-
-void KDSingleApplicationLocalSocket::readDataFromSecondary()
-{
-    QLocalSocket *socket = static_cast<QLocalSocket *>(sender());
-    readDataFromSecondarySocket(socket);
-}
-
-bool KDSingleApplicationLocalSocket::readDataFromSecondarySocket(QLocalSocket *socket)
-{
-    auto i = findConnectionBySocket(m_clients, socket);
-    Connection &c = *i;
-    c.readData.append(socket->readAll());
-
-    qCDebug(kdsaLocalSocket) << "Got more data from a secondary. Data read so far:" << c.readData;
-
-    const QByteArray &data = c.readData;
-
-    if (data.size() >= 1) {
-        if (data[0] != LOCALSOCKET_PROTOCOL_VERSION) {
-            qCDebug(kdsaLocalSocket) << "Got an invalid protocol version";
-            m_clients.erase(i);
-            return true;
-        }
-    }
-
-    QDataStream ds(data);
-    ds.skipRawData(1);
-
-    ds.startTransaction();
-    QByteArray message;
-    ds >> message;
-
-    if (ds.commitTransaction()) {
-        qCDebug(kdsaLocalSocket) << "Got a complete message:" << message;
-        Q_EMIT messageReceived(message);
-        m_clients.erase(i);
-        return true;
-    }
-
-    return false;
-}
-
-void KDSingleApplicationLocalSocket::secondaryDisconnected()
-{
-    QLocalSocket *socket = static_cast<QLocalSocket *>(sender());
-    secondarySocketDisconnected(socket);
-}
-
-void KDSingleApplicationLocalSocket::secondarySocketDisconnected(QLocalSocket *socket)
-{
-    auto i = findConnectionBySocket(m_clients, socket);
-    Connection c = std::move(*i);
-    m_clients.erase(i);
-
-    qCDebug(kdsaLocalSocket) << "Secondary disconnected. Data read:" << c.readData;
-}
-
-void KDSingleApplicationLocalSocket::abortConnectionToSecondary()
-{
-    QTimer *timer = static_cast<QTimer *>(sender());
-
-    auto i = findConnectionByTimer(m_clients, timer);
-    Connection c = std::move(*i);
-    m_clients.erase(i);
-
-    qCDebug(kdsaLocalSocket) << "Secondary timed out. Data read:" << c.readData;
-}
-
-KDSingleApplicationLocalSocket::Connection::Connection(QLocalSocket *_socket)
-    : socket(_socket)
-    , timeoutTimer(new QTimer)
-{
-    timeoutTimer->start(LOCALSOCKET_CONNECTION_TIMEOUT);
-}
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif

3rdparty/kdsingleapplication/kdsingleapplication_localsocket_p.h

@@ -1,126 +0,0 @@
-/*
-  This file is part of KDSingleApplication.
-
-  SPDX-FileCopyrightText: 2019-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
-
-  SPDX-License-Identifier: MIT
-
-  Contact KDAB at <info@kdab.com> for commercial licensing options.
-*/
-
-#ifndef KDSINGLEAPPLICATION_LOCALSOCKET_P_H
-#define KDSINGLEAPPLICATION_LOCALSOCKET_P_H
-
-#include <QtCore/QObject>
-#include <QtCore/QByteArray>
-#include <QtCore/QString>
-
-QT_BEGIN_NAMESPACE
-class QLockFile;
-class QLocalServer;
-class QLocalSocket;
-class QTimer;
-QT_END_NAMESPACE
-
-#include <memory>
-#include <vector>
-
-struct QObjectDeleteLater
-{
-    void operator()(QObject *o)
-    {
-        o->deleteLater();
-    }
-};
-
-class QObjectConnectionHolder
-{
-    Q_DISABLE_COPY(QObjectConnectionHolder)
-    QMetaObject::Connection c;
-
-public:
-    QObjectConnectionHolder()
-    {
-    }
-
-    explicit QObjectConnectionHolder(QMetaObject::Connection _c)
-        : c(std::move(_c))
-    {
-    }
-
-    ~QObjectConnectionHolder()
-    {
-        QObject::disconnect(c);
-    }
-
-    QObjectConnectionHolder(QObjectConnectionHolder &&other) noexcept
-        : c(std::exchange(other.c, {}))
-    {
-    }
-
-    QObjectConnectionHolder &operator=(QObjectConnectionHolder &&other) noexcept
-    {
-        QObjectConnectionHolder moved(std::move(other));
-        swap(moved);
-        return *this;
-    }
-
-    void swap(QObjectConnectionHolder &other) noexcept
-    {
-        using std::swap;
-        swap(c, other.c);
-    }
-};
-
-class KDSingleApplicationLocalSocket : public QObject
-{
-    Q_OBJECT
-
-public:
-    explicit KDSingleApplicationLocalSocket(const QString &name,
-                                            QObject *parent = nullptr);
-    ~KDSingleApplicationLocalSocket();
-
-    bool isPrimaryInstance() const;
-
-public Q_SLOTS:
-    bool sendMessage(const QByteArray &message, int timeout);
-
-Q_SIGNALS:
-    void messageReceived(const QByteArray &message);
-
-private:
-    void handleNewConnection();
-    void readDataFromSecondary();
-    bool readDataFromSecondarySocket(QLocalSocket *socket);
-    void secondaryDisconnected();
-    void secondarySocketDisconnected(QLocalSocket *socket);
-    void abortConnectionToSecondary();
-
-    QString m_socketName;
-
-    std::unique_ptr<QLockFile> m_lockFile; // protects m_localServer
-    std::unique_ptr<QLocalServer> m_localServer;
-
-    struct Connection
-    {
-        explicit Connection(QLocalSocket *s);
-
-        std::unique_ptr<QLocalSocket, QObjectDeleteLater> socket;
-        std::unique_ptr<QTimer, QObjectDeleteLater> timeoutTimer;
-        QByteArray readData;
-
-        // socket/timeoutTimer are deleted via deleteLater (as we delete them
-        // in slots connected to their signals). Before the deleteLater is acted upon,
-        // they may emit further signals, triggering logic that it's not supposed
-        // to be triggered (as the Connection has already been destroyed).
-        // Use this Holder to break the connections.
-        QObjectConnectionHolder readDataConnection;
-        QObjectConnectionHolder secondaryDisconnectedConnection;
-        QObjectConnectionHolder abortConnection;
-    };
-
-    std::vector<Connection> m_clients;
-};
-
-#endif // KDSINGLEAPPLICATION_LOCALSOCKET_P_H

CMakeLists.txt

@@ -99,23 +99,14 @@ if(CCACHE_EXECUTABLE)
   SET_PROPERTY(GLOBAL PROPERTY RULE_LAUNCH_LINK ${CCACHE_EXECUTABLE})
 endif()
 
-option(USE_ICU "Use ICU" ON)
-
 find_package(PkgConfig REQUIRED)
-find_package(Boost REQUIRED)
-find_package(Threads)
+find_package(Threads REQUIRED)
 find_package(Backtrace)
 if(Backtrace_FOUND)
   set(HAVE_BACKTRACE ON)
 endif()
-if(USE_ICU)
-  find_package(ICU COMPONENTS uc i18n REQUIRED)
-  if(ICU_FOUND)
-    set(HAVE_ICU ON)
-  endif()
-else()
-  find_package(Iconv)
-endif()
+find_package(Boost REQUIRED)
+find_package(ICU COMPONENTS uc i18n REQUIRED)
 find_package(Protobuf CONFIG)
 if(NOT Protobuf_FOUND)
   find_package(Protobuf REQUIRED)
@@ -266,25 +257,19 @@ if(X11_FOUND)
 
 endif(X11_FOUND)
 
-option(USE_TAGLIB "Build with TagLib" OFF)
+option(USE_TAGLIB "Build with TagLib" ON)
 option(USE_TAGPARSER "Build with TagParser" OFF)
 
-if(NOT USE_TAGLIB AND NOT USE_TAGPARSER)
-  set(USE_TAGLIB ON)
-endif()
-
 # TAGLIB
 if(USE_TAGLIB)
-  pkg_check_modules(TAGLIB REQUIRED taglib>=1.11.1)
-  if(TAGLIB_FOUND)
-    find_path(HAVE_TAGLIB_DSFFILE_H taglib/dsffile.h)
-    find_path(HAVE_TAGLIB_DSDIFFFILE_H taglib/dsdifffile.h)
-    if(HAVE_TAGLIB_DSFFILE_H)
-      set(HAVE_TAGLIB_DSFFILE ON)
-    endif(HAVE_TAGLIB_DSFFILE_H)
-    if(HAVE_TAGLIB_DSDIFFFILE_H)
-      set(HAVE_TAGLIB_DSDIFFFILE ON)
-    endif(HAVE_TAGLIB_DSDIFFFILE_H)
+  find_package(TagLib 2.0)
+  if(TARGET TagLib::TagLib)
+    set(TAGLIB_FOUND ON)
+    set(TAGLIB_LIBRARIES TagLib::TagLib)
+    set(HAVE_TAGLIB_DSFFILE ON)
+    set(HAVE_TAGLIB_DSDIFFFILE ON)
+  else()
+    pkg_check_modules(TAGLIB REQUIRED taglib>=1.11.1)
   endif()
 endif()
 
@@ -300,10 +285,28 @@ if(NOT TAGLIB_FOUND AND NOT TAGPARSER_FOUND)
 endif()
 
 # SingleApplication
-add_subdirectory(3rdparty/kdsingleapplication)
-set(SINGLEAPPLICATION_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/kdsingleapplication)
-set(SINGLEAPPLICATION_LIBRARIES kdsingleapplication)
-add_definitions(-DKDSINGLEAPPLICATION_STATIC_BUILD)
+if(QT_VERSION_MAJOR EQUAL 5)
+  set(KDSINGLEAPPLICATION_NAME "KDSingleApplication")
+else()
+  set(KDSINGLEAPPLICATION_NAME "KDSingleApplication-qt${QT_VERSION_MAJOR}")
+endif()
+find_package(${KDSINGLEAPPLICATION_NAME} 1.1.0)
+if(TARGET KDAB::kdsingleapplication)
+  if(QT_VERSION_MAJOR EQUAL 5)
+    set(KDSINGLEAPPLICATION_VERSION "${KDSingleApplication_VERSION}")
+  elseif(QT_VERSION_MAJOR EQUAL 6)
+    set(KDSINGLEAPPLICATION_VERSION "${KDSingleApplication-qt6_VERSION}")
+  endif()
+  message(STATUS "Using system KDSingleApplication (Version ${KDSINGLEAPPLICATION_VERSION})")
+  set(SINGLEAPPLICATION_LIBRARIES KDAB::kdsingleapplication)
+else()
+  message(STATUS "Using 3rdparty KDSingleApplication")
+  set(HAVE_KDSINGLEAPPLICATION_OPTIONS ON)
+  add_subdirectory(3rdparty/kdsingleapplication)
+  set(SINGLEAPPLICATION_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/kdsingleapplication/KDSingleApplication/src)
+  set(SINGLEAPPLICATION_LIBRARIES kdsingleapplication)
+  add_definitions(-DKDSINGLEAPPLICATION_STATIC_BUILD)
+endif()
 
 if(APPLE)
   add_subdirectory(3rdparty/SPMediaKeyTap)
@@ -440,19 +443,11 @@ optional_component(EBUR128 ON "EBU R 128 loudness normalization"
 )
 
 if(APPLE OR WIN32)
-  option(USE_BUNDLE "Bundle dependencies" ON)
+  set(USE_BUNDLE_DEFAULT ON)
 else()
-  option(USE_BUNDLE "Bundle dependencies" OFF)
-endif()
-
-if(USE_BUNDLE AND NOT USE_BUNDLE_DIR)
-  if(LINUX)
-    set(USE_BUNDLE_DIR "../plugins")
-  endif()
-  if(APPLE)
-    set(USE_BUNDLE_DIR "../PlugIns")
-  endif()
+  set(USE_BUNDLE_DEFAULT OFF)
 endif()
+option(USE_BUNDLE "Bundle dependencies" ${USE_BUNDLE_DEFAULT})
 
 if(NOT CMAKE_CROSSCOMPILING)
   # Check that we have Qt with sqlite driver
@@ -504,6 +499,8 @@ add_definitions(
   -DQT_NO_CAST_TO_ASCII
   -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT
   -DQT_NO_FOREACH
+  -DQT_ASCII_CAST_WARNINGS
+  -DQT_NO_CAST_FROM_ASCII
 )
 
 if(WIN32)

CONTRIBUTING.md

@@ -48,24 +48,27 @@ small as possible.
 
 ### Commit messages
 
-The first line should start with "Class:", which referer to the class
-that is changed. Don't use a trailing period after the first line.
-If this change affects more than one class, omit the class and write a
+The first line should start with the name of the class that is changed
+followed by a colon then a short explanation of the commit.
+Don't use a trailing period after the first line.
+If this change affects more than one class, omit the class name and write a
 more general message.
+
 You only need to include a main description (body) for larger changes
 where the one line is not enough to describe everything.
 The main description starts after two newlines, it is normal prose and
 should use normal punctuation and capital letters where appropriate.
+It should explain exactly what's changed, why it's changed,
+and what bugs were fixed.
 
 An example of the expected format for git commit messages is as follows:
 
 ```
-class: Short explanation of the commit
+StretchHeaderView: Set default section size
 
-Longer explanation explaining exactly what's changed, why it's changed,
-and what bugs were fixed.
+As of Qt 6.6.1, style changes are resetting the column sizes. To prevent this, we set a default section size.
 
-Fixes #1234
+Fixes #1328
 ```
 
 

Changelog

@@ -2,6 +2,88 @@ Strawberry Music Player
 =======================
 ChangeLog
 
+Unreleased:
+
+  Bugfixes:
+    * Fixed crash when pressing CTRL + C (#1359).
+    * Pass on scroll events to page in settings to avoid changing settings when scrolling with mouse (#1380).
+    * Fixed misredered playlist search field with Wayland using scaling (#1255).
+    * Fixed Azlyrics lyrics provider because of website changes.
+    * Fixed Musixmatch lyrics provider because of website changes.
+    * Fixed application exiting when closing file dialog (#1401).
+    * Fixed playlist shuffle randomness (#707).
+    * Fixed playlist shuffle order always the same when restarting playback (#1381).
+    * Fixed dynamic random mix not always ignoring shuffle and repeat mode (#1366).
+    * Fixed manual shuffle while playing not setting current song to new index (##1353).
+    * Fixed volume sync with PA when output is set to auto (#1123).
+    * Fixed mpris:trackid type with KDE 6 (#1397).
+    * (macOS/Windows) Fixed dash and hls streaming, plugins were missing.
+    * (Windows) Fixed incorrect colors in smart playlist wizard with Fusion in dark mode (#1399).
+
+  Enhancements:
+    * Improve error messages when connecting and copying to devices.
+    * Allow enter to be used with multiselection to add songs to playlist (#1360)
+    * Add song progress to taskbar using D-Bus.
+    * Use API to receive Radio Paradise channels.
+    * Added letras lyrics provider.
+    * Added Open Tidal API (openapi.tidal.com) cover provider.
+    * Added button for fetching lyrics to tag editor (#1391).
+    * Added option not to skip "A", "An" and "The” when sorting artist names in collection (#1393).
+    * Improved album and title disc, remastered, etc matching and stripping (#1387).
+    * (Unix) Add experimental GStreamer pipewire support.
+    * (Windows) Add experimental exclusive mode for WASAPI.
+    * (Windows MSVC) Add ASIO support.
+    * (Windows MSVC) Add back WASAPI2.
+
+  Removed features:
+    * Removed now broken lyricsmode.com lyrics provider because of website changes.
+
+Version 1.0.23 (2024.01.11):
+
+  Bugfixes:
+    * Fixed possible duplication of song entries after organizing (#1341).
+    * Fixed possible crash when connecting devices (#1313).
+    * Fixed playlist sorting of original year (#1349).
+    * (macOS) Fixed crash when adding collection directory (QTBUG-120469) (#1350).
+
+  Enhancements:
+    * Treat all stream errors as non-fatal (#1347).
+    * Require KDSingleApplication 1.1.0.
+    * Fix logging of restored unavailable songs.
+
+Version 1.0.22 (2023.12.09):
+
+  Bugfixes:
+    * Fixed KDSingleApplication cmake version check.
+    * Fixed KDSingleApplication Qt 5 detection (#1299).
+    * Fixed timer started in wrong thread (#1302).
+    * Fixed erratic seeking behaviour if buffer duration is set to zero (#1302).
+    * Fixed SCollection related crash on exit with Qt 5 (#1316).
+    * Fixed track about to end related crash on playback failure (#1332).
+    * Fixed playlist column widths not remembered if stretch mode is off with Qt 6.6.1 and higher (#1328).
+    * (Windows) Properly handle silent uninstall (#1323).
+
+  Enhancements:
+    * Increase thread priority for playback threads.
+    * Allow drag and drop of songs to favorite playlists.
+
+Version 1.0.21 (2023.10.21):
+
+  Bugfixes:
+    * Fixed seekbar position resetting to zero before showing actual position when seeking.
+    * Fixed compressed files showing up in collection (#1274).
+    * Fixed connecting devices (#1288).
+    * Fixed device schema missing ebur128 fields.
+    * Fixed collection search by tag not working with space between colon and search term (#1290).
+    * Fixed seeking when 5 seconds is remaining of the song resetting position to beginning (#1258).
+    * Fixed intermittent crash when seeking with Auto as output (#1123).
+    * (Windows) Fixed playlist header colors in dark mode (#1275).
+
+  Enhancements:
+    * Support using system KDSingleApplication when available.
+    * Improved lyrics matching.
+    * (macOS) Fully codesign binaries and DMG.
+
 Version 1.0.20 (2023.09.24):
 
   Bugfixes:

README.md

@@ -1,4 +1,4 @@
-:strawberry: Strawberry Music Player [![Build Status](https://github.com/strawberrymusicplayer/strawberry/workflows/build/badge.svg)](https://github.com/strawberrymusicplayer/strawberry/actions)
+:strawberry: Strawberry Music Player [![Build Status](https://github.com/strawberrymusicplayer/strawberry/workflows/Build/badge.svg)](https://github.com/strawberrymusicplayer/strawberry/actions)
 =======================
 [![Sponsor](https://img.shields.io/badge/-Sponsor-green?logo=github)](https://github.com/sponsors/jonaski)
 [![Patreon](https://img.shields.io/badge/patreon-donate-green.svg)](https://patreon.com/jonaskvinge)
@@ -19,9 +19,8 @@ Resources:
   * openSUSE buildservice: https://build.opensuse.org/package/show/home:jonaski:audio/strawberry
   * Ubuntu PPA: https://launchpad.net/~jonaski/+archive/ubuntu/strawberry
   * Ubuntu Unstable PPA: https://launchpad.net/~jonaski/+archive/ubuntu/strawberry-unstable
-  * Translations: https://translate.zanata.org/iteration/view/strawberry/master
 
-### :bangbang: Opening an issue:
+### :bangbang: Opening an issue
 
 * Read the FAQ: https://wiki.strawberrymusicplayer.org/wiki/FAQ
 * Search for the issue to see if it is already solved, or if there is an open issue for it already. If there is an open issue already, you can comment on it if you have additional information that could be useful to us.
@@ -29,18 +28,19 @@ Resources:
 * We do not take feature requests from users on GitHub. Any issues related to feature requests will be closed. This does not necessarily mean that we won't add new features, but we don't have time to take feature requests or answer questions about new features from users. It is still possible to suggest or discuss new features on the forum (https://forum.strawberrymusicplayer.org/).
 * We do not maintain the Flatpak package. Do not report issues related to Flatpak unless the issue can be reproduced with a native package, use Flatpak support instead https://flatpak.org/about/
 
-### :moneybag:	Sponsoring:
+### :moneybag: Sponsoring
 
 The program is free software, released under GPL. If you like this program and can make use of it, consider sponsoring or donating to help fund the project.
-There are currently 3 options for sponsoring:
+There are currently 4 options for sponsoring:
 
-1. [GitHub Sponsors](https://github.com/sponsors/jonaski)
+1. [GitHub](https://github.com/sponsors/jonaski)
 2. [Patreon](https://www.patreon.com/jonaskvinge)
-3. [PayPal](https://paypal.me/jonaskvinge)
+3. [Ko-fi](https://ko-fi.com/jonaskvinge)
+4. [PayPal](https://paypal.me/jonaskvinge)
 
 Funding developers is a way to contribute to open source projects you appreciate, it helps developers get the resources they need, and recognize contributors working behind the scenes to make open source better for everyone.
 
-### :heavy_check_mark: Features:
+### :heavy_check_mark: Features
 
   * Play and organize music
   * Supports WAV, FLAC, WavPack, Ogg FLAC, Ogg Vorbis, Ogg Opus, Ogg Speex, MPC, TrueAudio, AIFF, MP4, MP3, ASF and Monkey's Audio.
@@ -53,7 +53,7 @@ Funding developers is a way to contribute to open source projects you appreciate
   * Edit tags on audio files
   * Fetch tags from MusicBrainz
   * Album cover art from [Last.fm](https://www.last.fm/), [Musicbrainz](https://musicbrainz.org/), [Discogs](https://www.discogs.com/), [Musixmatch](https://www.musixmatch.com/), [Deezer](https://www.deezer.com/), [Tidal](https://www.tidal.com/), [Qobuz](https://www.qobuz.com/) and [Spotify](https://www.spotify.com/)
-  * Song lyrics from [Genius](https://genius.com/), [Musixmatch](https://www.musixmatch.com/), [ChartLyrics](http://www.chartlyrics.com/), [lyrics.ovh](https://lyrics.ovh/), [lololyrics.com](https://www.lololyrics.com/), [songlyrics.com](https://www.songlyrics.com/), [azlyrics.com](https://www.azlyrics.com/), [elyrics.net](https://www.elyrics.net/) and [lyricsmode.com](https://www.lyricsmode.com/)
+  * Song lyrics from [Genius](https://genius.com/), [Musixmatch](https://www.musixmatch.com/), [ChartLyrics](http://www.chartlyrics.com/), [lyrics.ovh](https://lyrics.ovh/), [lololyrics.com](https://www.lololyrics.com/), [songlyrics.com](https://www.songlyrics.com/), [azlyrics.com](https://www.azlyrics.com/) and [elyrics.net](https://www.elyrics.net/)
   * Support for multiple backends
   * Audio analyzer
   * Audio equalizer
@@ -64,7 +64,7 @@ Funding developers is a way to contribute to open source projects you appreciate
 
 It has so far been tested to work on Linux, OpenBSD, FreeBSD, macOS and Windows.
 
-**macOS releases are currently limited to sponsors. This is because macOS releases require a developer account, Apple hardware and maintaining all libraries strawberry depends on. If you are sponsoring strawberry, e-mail support@strawberrymusicplayer.org for access to downloads.**
+**macOS releases are currently limited to sponsors. This is because Strawberry mainly has one contributor/developer and supporting macOS requires Apple hardware, building libraries Strawberry depends and a Apple developer account for signing releases. If you are sponsoring strawberry through Patreon, releases are available directly on Patreon, if you are sponsoring through GitHub, Ko-fi or Paypal, please e-mail support@strawberrymusicplayer.org for access to downloads.**
 
 ### :heavy_exclamation_mark: Requirements
 
@@ -96,11 +96,11 @@ Optional dependencies:
 
 You should also install the gstreamer plugins base and good, and optionally bad, ugly and libav to support all audio formats.
 
-### :wrench:	Compiling from source
+### :wrench: Compiling from source
 
 ### Get the code:
 
-    git clone https://github.com/strawberrymusicplayer/strawberry
+    git clone --recursive https://github.com/strawberrymusicplayer/strawberry
 
 ### Compile and install:
 
@@ -117,6 +117,6 @@ Strawberry is backwards compatible with Qt 5, to compile with Qt 5 use:
 
 To compile on Windows with Visual Studio 2019 or 2022, see https://github.com/strawberrymusicplayer/strawberry-msvc
 
-### :penguin:	Packaging status
+### :penguin: Packaging status
 
 [![Packaging status](https://repology.org/badge/vertical-allrepos/strawberry.svg?exclude_unsupported=1)](https://repology.org/metapackage/strawberry/versions)

cmake/Dmg.cmake

@@ -27,7 +27,7 @@ if(MACDEPLOYQT_EXECUTABLE)
     COMMAND cp -v ${CMAKE_SOURCE_DIR}/dist/macos/Info.plist ${CMAKE_BINARY_DIR}/strawberry.app/Contents/
     COMMAND cp -v ${CMAKE_SOURCE_DIR}/dist/macos/strawberry.icns ${CMAKE_BINARY_DIR}/strawberry.app/Contents/Resources/
     COMMAND ${CMAKE_SOURCE_DIR}/dist/macos/macgstcopy.sh ${CMAKE_BINARY_DIR}/strawberry.app
-    COMMAND ${MACDEPLOYQT_EXECUTABLE} strawberry.app -verbose=3 -executable=${CMAKE_BINARY_DIR}/strawberry.app/Contents/PlugIns/strawberry-tagreader -executable=${CMAKE_BINARY_DIR}/strawberry.app/Contents/PlugIns/gst-plugin-scanner -executable=strawberry.app/Contents/PlugIns/gio-modules/libgioopenssl.so -executable=strawberry.app/Contents/PlugIns/gio-modules/libgiognutls.so ${MACDEPLOYQT_CODESIGN}
+    COMMAND ${MACDEPLOYQT_EXECUTABLE} strawberry.app -verbose=3 -executable=${CMAKE_BINARY_DIR}/strawberry.app/Contents/PlugIns/strawberry-tagreader -executable=${CMAKE_BINARY_DIR}/strawberry.app/Contents/PlugIns/gst-plugin-scanner ${MACDEPLOYQT_CODESIGN}
     WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
     DEPENDS strawberry strawberry-tagreader
   )

cmake/Translations.cmake

@@ -1,21 +1,33 @@
-find_program(GETTEXT_XGETTEXT_EXECUTABLE xgettext)
-if(NOT GETTEXT_XGETTEXT_EXECUTABLE)
-  message(FATAL_ERROR "Could not find xgettext executable")
-endif(NOT GETTEXT_XGETTEXT_EXECUTABLE)
+find_program(GETTEXT_XGETTEXT_EXECUTABLE xgettext REQUIRED)
+find_program(CAT_EXECUTABLE cat REQUIRED)
 
-set (XGETTEXT_OPTIONS
-    --qt
-    --keyword=tr:1,2c
-    --keyword=tr --flag=tr:1:pass-c-format --flag=tr:1:pass-qt-format
-    --keyword=trUtf8 --flag=tr:1:pass-c-format --flag=tr:1:pass-qt-format
-    --keyword=translate:2,3c
-    --keyword=translate:2 --flag=translate:2:pass-c-format --flag=translate:2:pass-qt-format
-    --keyword=QT_TR_NOOP --flag=QT_TR_NOOP:1:pass-c-format --flag=QT_TR_NOOP:1:pass-qt-format
-    --keyword=QT_TRANSLATE_NOOP:2 --flag=QT_TRANSLATE_NOOP:2:pass-c-format --flag=QT_TRANSLATE_NOOP:2:pass-qt-format
-    --keyword=_ --flag=_:1:pass-c-format --flag=_:1:pass-qt-format
-    --keyword=N_ --flag=N_:1:pass-c-format --flag=N_:1:pass-qt-format
-    --from-code=utf-8
-    )
+list(APPEND XGETTEXT_OPTIONS
+  --qt
+  --keyword=tr:1,2c
+  --keyword=tr
+  --flag=tr:1:pass-c-format
+  --flag=tr:1:pass-qt-format
+  --keyword=trUtf8
+  --flag=tr:1:pass-c-format
+  --flag=tr:1:pass-qt-format
+  --keyword=translate:2,3c
+  --keyword=translate:2
+  --flag=translate:2:pass-c-format
+  --flag=translate:2:pass-qt-format
+  --keyword=QT_TR_NOOP
+  --flag=QT_TR_NOOP:1:pass-c-format
+  --flag=QT_TR_NOOP:1:pass-qt-format
+  --keyword=QT_TRANSLATE_NOOP:2
+  --flag=QT_TRANSLATE_NOOP:2:pass-c-format
+  --flag=QT_TRANSLATE_NOOP:2:pass-qt-format
+  --keyword=_
+  --flag=_:1:pass-c-format
+  --flag=_:1:pass-qt-format
+  --keyword=N_
+  --flag=N_:1:pass-c-format
+  --flag=N_:1:pass-qt-format
+  --from-code=utf-8
+)
 
 execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/translations)
 
@@ -32,7 +44,7 @@ macro(add_pot outfiles header pot)
   add_custom_command(
     OUTPUT ${pot}
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-    COMMAND ${GETTEXT_XGETTEXT_EXECUTABLE} ${XGETTEXT_OPTIONS} -s -C --omit-header --output=${CMAKE_CURRENT_BINARY_DIR}/pot.temp ${add_pot_sources}
+    COMMAND xgettext ${XGETTEXT_OPTIONS} -s -C --omit-header --output="${CMAKE_CURRENT_BINARY_DIR}/pot.temp" ${add_pot_sources}
     COMMAND cat ${header} ${CMAKE_CURRENT_BINARY_DIR}/pot.temp > ${pot}
     DEPENDS ${add_pot_sources} ${header}
   )
@@ -59,7 +71,7 @@ macro(add_po outfiles po_prefix)
     # Convert the .po files to .qm files
     add_custom_command(
       OUTPUT ${_qm_filepath}
-      COMMAND ${QT_LCONVERT_EXECUTABLE} ARGS ${_po_filepath} -o ${_qm_filepath} -of qm
+      COMMAND ${QT_LCONVERT_EXECUTABLE} ARGS ${_po_filepath} -o ${_qm_filepath} -of qm -target-language ${_lang}
       DEPENDS ${_po_filepath} ${_po_filepath}
     )
 

cmake/Version.cmake

@@ -1,9 +1,9 @@
 set(STRAWBERRY_VERSION_MAJOR 1)
 set(STRAWBERRY_VERSION_MINOR 0)
-set(STRAWBERRY_VERSION_PATCH 20)
+set(STRAWBERRY_VERSION_PATCH 23)
 #set(STRAWBERRY_VERSION_PRERELEASE rc1)
 
-set(INCLUDE_GIT_REVISION OFF)
+set(INCLUDE_GIT_REVISION ON)
 
 set(majorminorpatch "${STRAWBERRY_VERSION_MAJOR}.${STRAWBERRY_VERSION_MINOR}.${STRAWBERRY_VERSION_PATCH}")
 
@@ -25,7 +25,7 @@ if(INCLUDE_GIT_REVISION AND EXISTS "${CMAKE_SOURCE_DIR}/.git")
 
   find_program(GIT_EXECUTABLE git)
   if(NOT GIT_EXECUTABLE OR GIT_EXECUTABLE-NOTFOUND)
-    message(FATAL_ERROR "Missing GIT executable." )
+    message(FATAL_ERROR "Missing Git executable." )
   endif()
 
   # Get the current working branch
@@ -48,7 +48,7 @@ if(INCLUDE_GIT_REVISION AND EXISTS "${CMAKE_SOURCE_DIR}/.git")
   )
 
   if(NOT ${GIT_CMD_RESULT_REVISION} EQUAL 0)
-    message(FATAL_ERROR "GIT command failed to get revision string '${GIT_REVISION}'")
+    message(FATAL_ERROR "Git command failed to get revision string '${GIT_REVISION}'")
   endif()
 
 endif()
@@ -67,7 +67,7 @@ if(GIT_REVISION)
 
   list(LENGTH GIT_PARTS GIT_PARTS_LENGTH)
   if(NOT GIT_PARTS_LENGTH EQUAL 3)
-    message(FATAL_ERROR "Failed to parse git revision string '${GIT_REVISION}'")
+    set(GIT_PARTS "${majorminorpatch};0;${GIT_REVISION}")
   endif()
 
   list(GET GIT_PARTS 0 GIT_TAGNAME)

data/data.qrc

@@ -42,5 +42,6 @@
         <file>pictures/star-off.png</file>
         <file>mood/sample.mood</file>
         <file>text/ghosts.txt</file>
+        <file>pictures/sidebar-background.png</file>
     </qresource>
 </RCC>

data/icons.qrc

@@ -290,8 +290,8 @@
         <file>icons/48x48/moodbar.png</file>
         <file>icons/48x48/love.png</file>
         <file>icons/48x48/subsonic.png</file>
-	<file>icons/48x48/tidal.png</file>
-	<file>icons/48x48/qobuz.png</file>
+        <file>icons/48x48/tidal.png</file>
+        <file>icons/48x48/qobuz.png</file>
         <file>icons/48x48/multimedia-player-ipod-standard-black.png</file>
         <file>icons/48x48/radio.png</file>
         <file>icons/48x48/somafm.png</file>

data/schema/device-schema.sql

@@ -18,7 +18,7 @@ CREATE TABLE device_%deviceid_songs (
   track INTEGER NOT NULL DEFAULT -1,
   disc INTEGER NOT NULL DEFAULT -1,
   year INTEGER NOT NULL DEFAULT -1,
-  originalyear INTEGER NOT NULL DEFAULT 0,
+  originalyear INTEGER NOT NULL DEFAULT -1,
   genre TEXT,
   compilation INTEGER NOT NULL DEFAULT 0,
   composer TEXT,
@@ -83,7 +83,10 @@ CREATE TABLE device_%deviceid_songs (
   musicbrainz_track_id TEXT,
   musicbrainz_disc_id TEXT,
   musicbrainz_release_group_id TEXT,
-  musicbrainz_work_id TEXT
+  musicbrainz_work_id TEXT,
+
+  ebur128_integrated_loudness_lufs REAL,
+  ebur128_loudness_range_lu REAL
 
 );
 
@@ -96,4 +99,4 @@ CREATE VIRTUAL TABLE device_%deviceid_fts USING fts5(
   tokenize = "unicode61 remove_diacritics 1"
 );
 
-UPDATE devices SET schema_version=4 WHERE ROWID=%deviceid;
+UPDATE devices SET schema_version=5 WHERE ROWID=%deviceid;

data/style/strawberry.css

@@ -35,32 +35,32 @@
   background-color: %palette-base;
 }
 
-QToolButton {
+QToolButton[accessibleName="MenuPopupToolButton"] {
   border: 2px solid transparent;
   border-radius: 3px;
   padding: 1px;
 }
 
-QToolButton:hover {
+QToolButton:hover[accessibleName="MenuPopupToolButton"] {
   border: 2px solid %palette-highlight;
   background-color: %palette-highlight-lighter;
 }
 
-QToolButton:pressed {
+QToolButton:pressed[accessibleName="MenuPopupToolButton"] {
   border: 2px solid %palette-highlight-darker;
   background-color: %palette-highlight-lighter;
 }
 
-QToolButton[popupMode="MenuButtonPopup"], QToolButton:hover[popupMode="MenuButtonPopup"], QToolButton:pressed[popupMode="MenuButtonPopup"] {
+QToolButton[popupMode="MenuButtonPopup"][accessibleName="MenuPopupToolButton"], QToolButton:hover[popupMode="MenuButtonPopup"][accessibleName="MenuPopupToolButton"], QToolButton:pressed[popupMode="MenuButtonPopup"][accessibleName="MenuPopupToolButton"] {
   padding-right: 16px;
 }
 
 /* For backwards compatibility with Qt 5 as it does not support property name */
-QToolButton[popupMode="1"], QToolButton:hover[popupMode="1"], QToolButton:pressed[popupMode="1"] {
+QToolButton[popupMode="1"][accessibleName="MenuPopupToolButton"], QToolButton:hover[popupMode="1"][accessibleName="MenuPopupToolButton"], QToolButton:pressed[popupMode="1"][accessibleName="MenuPopupToolButton"] {
   padding-right: 16px;
 }
 
-QToolButton::menu-button {
+QToolButton::menu-button[accessibleName="MenuPopupToolButton"] {
   width: 16px;
   border: none;
 }

debian/control.in

@@ -25,7 +25,8 @@ Build-Depends: debhelper (>= 11),
                libgpod-dev,
                libmtp-dev,
                libchromaprint-dev,
-               libfftw3-dev
+               libfftw3-dev,
+               libebur128-dev
 Standards-Version: 4.6.1
 
 Package: strawberry
@@ -52,7 +53,7 @@ Description: music player and music collection organizer
   - Edit tags on audio files
   - Automatically retrieve tags from MusicBrainz
   - Album cover art from Last.fm, Musicbrainz, Discogs, Musixmatch, Deezer, Tidal, Qobuz and Spotify
-  - Song lyrics from Genius, Musixmatch, ChartLyrics, lyrics.ovh, lololyrics.com, songlyrics.com, azlyrics.com, elyrics.net and lyricsmode.com
+  - Song lyrics from Genius, Musixmatch, ChartLyrics, lyrics.ovh, lololyrics.com, songlyrics.com, azlyrics.com and elyrics.net
   - Audio analyzer
   - Audio equalizer
   - Transfer music to mass-storage USB players, MTP compatible devices and iPod Nano/Classic

dist/CMakeLists.txt

@@ -4,6 +4,11 @@ if(RPM_DISTRO AND RPM_DATE)
 endif(RPM_DISTRO AND RPM_DATE)
 
 if(APPLE)
+  if(DEFINED ENV{MACOSX_DEPLOYMENT_TARGET})
+    set(LSMinimumSystemVersion $ENV{MACOSX_DEPLOYMENT_TARGET})
+  else()
+    set(LSMinimumSystemVersion 11.0)
+  endif()
   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/macos/Info.plist.in ${CMAKE_CURRENT_SOURCE_DIR}/macos/Info.plist)
 endif(APPLE)
 

dist/macos/Info.plist.in

@@ -33,7 +33,7 @@
   <key>LSApplicationCategoryType</key>
   <string>public.app-category.music</string>
   <key>LSMinimumSystemVersion</key>
-  <string>11.0</string>
+  <string>@LSMinimumSystemVersion@</string>
   <key>SUFeedURL</key>
   <string>https://www.strawberrymusicplayer.org/sparkle-macos</string>
   <key>SUPublicEDKey</key>

dist/macos/macgstcopy.sh

@@ -23,6 +23,26 @@ if [ "${GST_PLUGIN_PATH}" = "" ]; then
   exit 1
 fi
 
+if ! [ -e "${GIO_EXTRA_MODULES}/libgiognutls.so" ] && ! [ -e "${GIO_EXTRA_MODULES}/libgioopenssl.so" ]; then
+  echo "Error: Missing ${GIO_EXTRA_MODULES}/libgiognutls.so or ${GIO_EXTRA_MODULES}/libgioopenssl.so."
+  exit 1
+fi
+
+if ! [ -e "${GST_PLUGIN_SCANNER}" ]; then
+  echo "Error: Missing ${GST_PLUGIN_SCANNER}"
+  exit 1
+fi
+
+if ! [ -d "${GST_PLUGIN_PATH}" ]; then
+  echo "Error: GStreamer plugins path ${GST_PLUGIN_PATH} does not exist."
+  exit 1
+fi
+
+if ! [ -e "${GST_PLUGIN_PATH}/libgstcoreelements.so" ] && ! [ -e "${GST_PLUGIN_PATH}/libgstcoreelements.dylib" ]; then
+  echo "Error: Missing libgstcoreelements.{so,dylib} in GStreamer plugins path ${GST_PLUGIN_PATH}."
+  exit 1
+fi
+
 mkdir -p "${bundledir}/Contents/PlugIns/gio-modules" || exit 1
 mkdir -p "${bundledir}/Contents/PlugIns/gstreamer" || exit 1
 
@@ -38,82 +58,94 @@ else
   echo "Warning: Missing ${GIO_EXTRA_MODULES}/libgioopenssl.so"
 fi
 
-if ! [ -e "${GST_PLUGIN_SCANNER}" ]; then
-  echo "Error: Missing ${GST_PLUGIN_SCANNER}"
-  exit 1
-fi
 cp -v -f "${GST_PLUGIN_SCANNER}" "${bundledir}/Contents/PlugIns/" || exit 1
-
-if ! [ -d "${GST_PLUGIN_PATH}" ]; then
-  echo "Error: GStreamer plugins path ${GST_PLUGIN_PATH} does not exist."
-  exit 1
-fi
+install_name_tool -add_rpath "@loader_path/../Frameworks" "${bundledir}/Contents/PlugIns/$(basename ${GST_PLUGIN_SCANNER})" || exit 1
 
 gst_plugins="
-libgstaes.dylib
-libgstaiff.dylib
-libgstapetag.dylib
-libgstapp.dylib
-libgstasf.dylib
-libgstasfmux.dylib
-libgstaudioconvert.dylib
-libgstaudiofx.dylib
-libgstaudiomixer.dylib
-libgstaudioparsers.dylib
-libgstaudiorate.dylib
-libgstaudioresample.dylib
-libgstaudiotestsrc.dylib
-libgstautodetect.dylib
-libgstbs2b.dylib
-libgstcdio.dylib
-libgstcoreelements.dylib
-libgstdash.dylib
-libgstequalizer.dylib
-libgstfaac.dylib
-libgstfaad.dylib
-libgstfdkaac.dylib
-libgstflac.dylib
-libgstgio.dylib
-libgsthls.dylib
-libgsticydemux.dylib
-libgstid3demux.dylib
-libgstid3tag.dylib
-libgstisomp4.dylib
-libgstlame.dylib
-libgstlibav.dylib
-libgstmpg123.dylib
-libgstmusepack.dylib
-libgstogg.dylib
-libgstopenmpt.dylib
-libgstopus.dylib
-libgstopusparse.dylib
-libgstosxaudio.dylib
-libgstpbtypes.dylib
-libgstplayback.dylib
-libgstreplaygain.dylib
-libgstrtp.dylib
-libgstrtsp.dylib
-libgstsoup.dylib
-libgstspectrum.dylib
-libgstspeex.dylib
-libgsttaglib.dylib
-libgsttcp.dylib
-libgsttwolame.dylib
-libgsttypefindfunctions.dylib
-libgstudp.dylib
-libgstvolume.dylib
-libgstvorbis.dylib
-libgstwavenc.dylib
-libgstwavpack.dylib
-libgstwavparse.dylib
-libgstxingmux.dylib
+libgstadaptivedemux2
+libgstaes
+libgstaiff
+libgstapetag
+libgstapp
+libgstasf
+libgstasfmux
+libgstaudioconvert
+libgstaudiofx
+libgstaudioparsers
+libgstaudioresample
+libgstautodetect
+libgstbs2b
+libgstcdio
+libgstcoreelements
+libgstdash
+libgstdsd
+libgstequalizer
+libgstfaac
+libgstfaad
+libgstfdkaac
+libgstflac
+libgstgio
+libgsthls
+libgsticydemux
+libgstid3demux
+libgstid3tag
+libgstisomp4
+libgstlame
+libgstmpegpsdemux
+libgstmpegpsmux
+libgstmpegtsdemux
+libgstmpegtsmux
+libgstlibav
+libgstmpg123
+libgstmusepack
+libgstogg
+libgstopenmpt
+libgstopus
+libgstopusparse
+libgstosxaudio
+libgstpbtypes
+libgstplayback
+libgstreplaygain
+libgstrtp
+libgstrtsp
+libgstsoup
+libgstspectrum
+libgstspeex
+libgsttaglib
+libgsttcp
+libgsttwolame
+libgsttypefindfunctions
+libgstudp
+libgstvolume
+libgstvorbis
+libgstwavenc
+libgstwavpack
+libgstwavparse
+libgstxingmux
 "
 
 gst_plugins=$(echo "$gst_plugins" | tr '\n' ' ' | sed -e 's/^ //g' | sed -e 's/  / /g')
 for gst_plugin in $gst_plugins; do
-  if [ -e "${GST_PLUGIN_PATH}/${gst_plugin}" ]; then
-    cp -v -f "${GST_PLUGIN_PATH}/${gst_plugin}" "${bundledir}/Contents/PlugIns/gstreamer/" || exit 1
+  if [ -e "${GST_PLUGIN_PATH}/${gst_plugin}.dylib" ]; then
+    cp -v -f "${GST_PLUGIN_PATH}/${gst_plugin}.dylib" "${bundledir}/Contents/PlugIns/gstreamer/" || exit 1
+    install_name_tool -id "@rpath/${gst_plugin}.dylib" "${bundledir}/Contents/PlugIns/gstreamer/${gst_plugin}.dylib"
+  elif [ -e "${GST_PLUGIN_PATH}/${gst_plugin}.so" ]; then
+    cp -v -f "${GST_PLUGIN_PATH}/${gst_plugin}.so" "${bundledir}/Contents/PlugIns/gstreamer/" || exit 1
+    install_name_tool -id "@rpath/${gst_plugin}.so" "${bundledir}/Contents/PlugIns/gstreamer/${gst_plugin}.so"
   else
-    echo "Warning: Missing gstreamer plugin ${gst_plugin}"
+    echo "Warning: Missing gstreamer plugin ${gst_plugin}."
   fi
 done
+
+# libsoup is dynamically loaded by gstreamer, so it needs to be copied.
+if [ "${LIBSOUP_LIBRARY_PATH}" = "" ]; then
+  echo "Warning: Set the LIBSOUP_LIBRARY_PATH environment variable for copying libsoup."
+else
+  if [ -e "${LIBSOUP_LIBRARY_PATH}" ]; then
+    mkdir -p "${bundledir}/Contents/Frameworks" || exit 1
+    cp -v -f "${LIBSOUP_LIBRARY_PATH}" "${bundledir}/Contents/Frameworks/" || exit 1
+    install_name_tool -id "@rpath/$(basename ${LIBSOUP_LIBRARY_PATH})" "${bundledir}/Contents/Frameworks/$(basename ${LIBSOUP_LIBRARY_PATH})"
+  else
+    echo "Warning: Missing libsoup ${LIBSOUP_LIBRARY_PATH}."
+  fi
+fi

dist/unix/org.strawberrymusicplayer.strawberry.appdata.xml

@@ -29,7 +29,7 @@
       <li>Edit tags on audio files</li>
       <li>Automatically retrieve tags from MusicBrainz</li>
       <li>Album cover art from Last.fm, Musicbrainz, Discogs, Musixmatch, Deezer, Tidal, Qobuz and Spotify</li>
-      <li>Song lyrics from Genius, Musixmatch, ChartLyrics, lyrics.ovh, lololyrics.com, songlyrics.com, azlyrics.com, elyrics.net and lyricsmode.com</li>
+      <li>Song lyrics from Genius, Musixmatch, ChartLyrics, lyrics.ovh, lololyrics.com, songlyrics.com, azlyrics.com and elyrics.net</li>
       <li>Support for multiple backends</li>
       <li>Audio analyzer and equalizer</li>
       <li>Transfer music to mass-storage USB players, MTP compatible devices and iPod Nano/Classic</li>
@@ -50,6 +50,9 @@
   </screenshots>
   <update_contact>eclipseo@fedoraproject.org</update_contact>
     <releases>
+        <release version="1.0.23" date="2024-01-11"/>
+        <release version="1.0.22" date="2023-12-09"/>
+        <release version="1.0.21" date="2023-10-21"/>
         <release version="1.0.20" date="2023-09-24"/>
         <release version="1.0.19" date="2023-09-24"/>
         <release version="1.0.18" date="2023-07-02"/>

dist/unix/org.strawberrymusicplayer.strawberry.desktop

@@ -3,8 +3,10 @@ Version=1.0
 Type=Application
 Name=Strawberry
 GenericName=Strawberry Music Player
+GenericName[fr]=Lecteur de musique Strawberry
 GenericName[ru]=Музыкальный проигрыватель Strawberry
 Comment=Plays music
+Comment[fr]=Joue de la musique
 Comment[ru]=Прослушивание музыки
 Exec=strawberry %U
 TryExec=strawberry

dist/unix/strawberry.spec.in

@@ -1,9 +1,9 @@
 Name:           strawberry
 Version:        @STRAWBERRY_VERSION_RPM_V@
-%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos} || "%{?_vendor}" == "openmandriva"
-Release:        @STRAWBERRY_VERSION_RPM_R@%{?dist}
-%else
+%if 0%{?suse_version}
 Release:        @STRAWBERRY_VERSION_RPM_R@.@RPM_DISTRO@
+%else
+Release:        @STRAWBERRY_VERSION_RPM_R@%{?dist}
 %endif
 Summary:        A music player and music collection organizer
 Group:          Productivity/Multimedia/Sound/Players
@@ -11,7 +11,7 @@ License:        GPL-3.0+
 URL:            https://www.strawberrymusicplayer.org/
 Source0:        %{name}-@STRAWBERRY_VERSION_PACKAGE@.tar.xz
 
-%if 0%{?suse_version} && 0%{?suse_version} > 1325
+%if 0%{?suse_version}
 BuildRequires:  libboost_headers-devel
 %else
 BuildRequires:  boost-devel
@@ -25,15 +25,13 @@ BuildRequires:  gettext
 BuildRequires:  desktop-file-utils
 %if 0%{?suse_version}
 BuildRequires:  update-desktop-files
-%endif
-%if 0%{?suse_version}
 BuildRequires:  appstream-glib
-%else
-  %if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos}
+%endif
+%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos}
 BuildRequires:  libappstream-glib
-  %else
+%endif
+%if 0%{?mageia} || "%{?_vendor}" == "openmandriva"
 BuildRequires:  appstream-util
-  %endif
 %endif
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(glib-2.0)
@@ -44,48 +42,31 @@ BuildRequires:  pkgconfig(dbus-1)
 BuildRequires:  pkgconfig(alsa)
 BuildRequires:  pkgconfig(protobuf)
 BuildRequires:  pkgconfig(sqlite3) >= 3.9
-%if ! 0%{?centos} && ! 0%{?mageia}
 BuildRequires:  pkgconfig(taglib)
-%endif
 BuildRequires:  pkgconfig(fftw3)
 BuildRequires:  pkgconfig(icu-uc)
 BuildRequires:  pkgconfig(icu-i18n)
-%if "@QT_VERSION_MAJOR@" == "5" && ( 0%{?fedora} || 0%{?rhel_version} || 0%{?centos} )
-BuildRequires:  pkgconfig(Qt@QT_VERSION_MAJOR@Core)
-BuildRequires:  pkgconfig(Qt@QT_VERSION_MAJOR@Gui)
-BuildRequires:  pkgconfig(Qt@QT_VERSION_MAJOR@Widgets)
-BuildRequires:  pkgconfig(Qt@QT_VERSION_MAJOR@Concurrent)
-BuildRequires:  pkgconfig(Qt@QT_VERSION_MAJOR@Network)
-BuildRequires:  pkgconfig(Qt@QT_VERSION_MAJOR@Sql)
-BuildRequires:  pkgconfig(Qt@QT_VERSION_MAJOR@DBus)
-BuildRequires:  pkgconfig(Qt@QT_VERSION_MAJOR@Test)
-BuildRequires:  pkgconfig(Qt@QT_VERSION_MAJOR@X11Extras)
-%else
 BuildRequires:  cmake(Qt@QT_VERSION_MAJOR@Core)
-BuildRequires:  cmake(Qt@QT_VERSION_MAJOR@Gui)
-BuildRequires:  cmake(Qt@QT_VERSION_MAJOR@Widgets)
 BuildRequires:  cmake(Qt@QT_VERSION_MAJOR@Concurrent)
 BuildRequires:  cmake(Qt@QT_VERSION_MAJOR@Network)
 BuildRequires:  cmake(Qt@QT_VERSION_MAJOR@Sql)
 BuildRequires:  cmake(Qt@QT_VERSION_MAJOR@DBus)
+BuildRequires:  cmake(Qt@QT_VERSION_MAJOR@Gui)
+BuildRequires:  cmake(Qt@QT_VERSION_MAJOR@Widgets)
 BuildRequires:  cmake(Qt@QT_VERSION_MAJOR@Test)
+BuildRequires:  cmake(Qt@QT_VERSION_MAJOR@LinguistTools)
 %if "@QT_VERSION_MAJOR@" == "5"
 BuildRequires:  cmake(Qt@QT_VERSION_MAJOR@X11Extras)
 %endif
-%endif
-%if 0%{?suse_version} || 0%{?fedora_version} || 0%{?mageia}
-BuildRequires:  cmake(Qt@QT_VERSION_MAJOR@LinguistTools)
-%endif
 BuildRequires:  pkgconfig(gstreamer-1.0)
 BuildRequires:  pkgconfig(gstreamer-app-1.0)
 BuildRequires:  pkgconfig(gstreamer-audio-1.0)
 BuildRequires:  pkgconfig(gstreamer-base-1.0)
 BuildRequires:  pkgconfig(gstreamer-tag-1.0)
-%if ! 0%{?centos}
 BuildRequires:  pkgconfig(libchromaprint)
-%endif
 BuildRequires:  pkgconfig(libpulse)
 BuildRequires:  pkgconfig(libcdio)
+BuildRequires:  pkgconfig(libebur128)
 BuildRequires:  pkgconfig(libgpod-1.0)
 BuildRequires:  pkgconfig(libmtp)
 %if 0%{?suse_version} || 0%{?fedora_version}
@@ -118,7 +99,7 @@ Features:
   - Edit tags on audio files
   - Automatically retrieve tags from MusicBrainz
   - Album cover art from Last.fm, Musicbrainz, Discogs, Musixmatch, Deezer, Tidal, Qobuz and Spotify
-  - Song lyrics from Genius, Musixmatch, ChartLyrics, lyrics.ovh, lololyrics.com, songlyrics.com, azlyrics.com, elyrics.net and lyricsmode.com
+  - Song lyrics from Genius, Musixmatch, ChartLyrics, lyrics.ovh, lololyrics.com, songlyrics.com, azlyrics.com and elyrics.net
   - Support for multiple backends
   - Audio analyzer
   - Audio equalizer
@@ -138,22 +119,19 @@ Features:
 %if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos}
   export CXXFLAGS="-fPIC $RPM_OPT_FLAGS"
 %endif
-%{cmake} -DQT_VERSION_MAJOR=@QT_VERSION_MAJOR@
-%if 0%{?centos} || (0%{?mageia} && 0%{?mageia} <= 7) || "%{?_vendor}" == "openmandriva"
-  %make_build
+%if "%{?_vendor}" == "openmandriva"
+%{cmake} -DQT_VERSION_MAJOR=@QT_VERSION_MAJOR@ -DENABLE_TRANSLATIONS=OFF
+%make_build
 %else
-  %cmake_build
+%{cmake} -DQT_VERSION_MAJOR=@QT_VERSION_MAJOR@
+%cmake_build
 %endif
 
 %install
-%if 0%{?centos}
-  %make_install
+%if "%{?_vendor}" == "openmandriva"
+%make_install -C build
 %else
-%if 0%{?mageia} || "%{?_vendor}" == "openmandriva"
-  %make_install -C build
-%else
-  %cmake_install
-%endif
+%cmake_install
 %endif
 
 %if 0%{?suse_version}
@@ -162,10 +140,10 @@ Features:
 
 %check
 desktop-file-validate %{buildroot}%{_datadir}/applications/org.strawberrymusicplayer.strawberry.desktop
-%if 0%{?fedora_version}
-  appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/org.strawberrymusicplayer.strawberry.appdata.xml
-%else
+%if 0%{?suse_version}
   appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/org.strawberrymusicplayer.strawberry.appdata.xml
+%else
+  appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/org.strawberrymusicplayer.strawberry.appdata.xml
 %endif
 
 %files
@@ -176,13 +154,13 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.strawberrymusicpl
 %{_bindir}/strawberry-tagreader
 %{_datadir}/applications/*.desktop
 %{_datadir}/icons/hicolor/*/apps/strawberry.*
-%if 0%{?fedora_version}
-  %{_metainfodir}/*.appdata.xml
-%else
-  %{_datadir}/metainfo/*.appdata.xml
-%endif
 %{_mandir}/man1/%{name}.1.*
 %{_mandir}/man1/%{name}-tagreader.1.*
+%if 0%{?suse_version}
+%{_datadir}/metainfo/*.appdata.xml
+%else
+%{_metainfodir}/*.appdata.xml
+%endif
 
 %changelog
 * @RPM_DATE@ Jonas Kvinge <jonas@jkvinge.net> - @STRAWBERRY_VERSION_RPM_V@

dist/windows/strawberry.nsi.in

@@ -109,7 +109,11 @@
 
 Unicode True
 
+!ifdef debug
+SetCompressor lzma
+!else
 SetCompressor /SOLID lzma
+!endif
 
 !include "MUI2.nsh"
 !include "FileAssociation.nsh"
@@ -136,8 +140,6 @@ SetCompressor /SOLID lzma
   ReserveFile "${NSISDIR}\Plugins\x86-unicode\INetC.dll"
 !endif
 
-!define LockedListPATH	$InstallDir
-
 ; Installer pages
 !insertmacro MUI_PAGE_WELCOME
 !insertmacro MUI_PAGE_LICENSE COPYING
@@ -184,19 +186,22 @@ FunctionEnd
 Function CheckPreviousInstall
 
   ReadRegStr $R0 ${PRODUCT_UNINST_ROOT_KEY} ${PRODUCT_UNINST_KEY} "UninstallString"
-  StrCmp $R0 "" done
+  StrCmp $R0 "" Done
 
-  MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION \
-  "${PRODUCT_NAME} is already installed. $\n$\nClick `OK` to remove the \
-  previous version or `Cancel` to cancel this upgrade." \
-  IDOK uninst
+${IfNot} ${Silent}
+  MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION "${PRODUCT_NAME} is already installed. $\n$\nClick `OK` to remove the previous version or `Cancel` to cancel this upgrade." IDOK Uninstall
   Abort
-; Run the uninstaller
-uninst:
-  ClearErrors
-  ExecWait '$R0' ; Do not copy the uninstaller to a temp file
+${EndIf}
 
-done:
+  Uninstall:
+  ClearErrors
+  ${If} ${Silent}
+  ExecWait '$R0 /S'
+  ${Else}
+  ExecWait '$R0'
+  ${EndIf}
+
+  Done:
 
 FunctionEnd
 
@@ -281,8 +286,10 @@ Section "Strawberry" Strawberry
   File "libgstaudio-1.0-0.dll"
   File "libgstbadaudio-1.0-0.dll"
   File "libgstbase-1.0-0.dll"
+  File "libgstcodecparsers-1.0-0.dll"
   File "libgstfft-1.0-0.dll"
   File "libgstisoff-1.0-0.dll"
+  File "libgstmpegts-1.0-0.dll"
   File "libgstnet-1.0-0.dll"
   File "libgstpbutils-1.0-0.dll"
   File "libgstreamer-1.0-0.dll"
@@ -299,6 +306,7 @@ Section "Strawberry" Strawberry
   File "libidn2-0.dll"
   File "libintl-8.dll"
   File "libjpeg-9.dll"
+  File "libkdsingleapplication-qt6.dll"
   File "liblzma-5.dll"
   File "libmp3lame-0.dll"
   File "libmpcdec.dll"
@@ -343,6 +351,7 @@ Section "Strawberry" Strawberry
   File "libabsl_examine_stack.dll"
   File "libabsl_hash.dll"
   File "libabsl_int128.dll"
+  File "libabsl_kernel_timeout_internal.dll"
   File "libabsl_log_globals.dll"
   File "libabsl_log_internal_check_op.dll"
   File "libabsl_log_internal_conditions.dll"
@@ -406,7 +415,7 @@ Section "Strawberry" Strawberry
   File "brotlidec.dll"
   File "chromaprint.dll"
   File "ebur128.dll"
-  File "faad.dll"
+  File "faad-2.dll"
   File "fdk-aac.dll"
   File "ffi-7.dll"
   File "gio-2.0-0.dll"
@@ -419,8 +428,10 @@ Section "Strawberry" Strawberry
   File "gstaudio-1.0-0.dll"
   File "gstbadaudio-1.0-0.dll"
   File "gstbase-1.0-0.dll"
+  File "gstcodecparsers-1.0-0.dll"
   File "gstfft-1.0-0.dll"
   File "gstisoff-1.0-0.dll"
+  File "gstmpegts-1.0-0.dll"
   File "gstnet-1.0-0.dll"
   File "gstpbutils-1.0-0.dll"
   File "gstreamer-1.0-0.dll"
@@ -435,6 +446,7 @@ Section "Strawberry" Strawberry
   File "harfbuzz.dll"
   File "intl-8.dll"
   File "jpeg62.dll"
+  File "kdsingleapplication-qt6.dll"
   File "libbs2b.dll"
   File "libfaac_dll.dll"
   File "liblzma.dll"
@@ -489,7 +501,7 @@ Section "Strawberry" Strawberry
 
   ; Common files
 
-  File "icudt73.dll"
+  File "icudt75.dll"
   File "libfftw3-3.dll"
 !ifdef debug
   File "libprotobufd.dll"
@@ -497,8 +509,8 @@ Section "Strawberry" Strawberry
   File "libprotobuf.dll"
 !endif
 !ifdef msvc && debug
-  File "icuin73d.dll"
-  File "icuuc73d.dll"
+  File "icuin75d.dll"
+  File "icuuc75d.dll"
   File "Qt6Concurrentd.dll"
   File "Qt6Cored.dll"
   File "Qt6Guid.dll"
@@ -506,8 +518,8 @@ Section "Strawberry" Strawberry
   File "Qt6Sqld.dll"
   File "Qt6Widgetsd.dll"
 !else
-  File "icuin73.dll"
-  File "icuuc73.dll"
+  File "icuin75.dll"
+  File "icuuc75.dll"
   File "Qt6Concurrent.dll"
   File "Qt6Core.dll"
   File "Qt6Gui.dll"
@@ -580,9 +592,9 @@ SectionEnd
 Section "Qt styles" styles
   SetOutPath "$INSTDIR\styles"
 !ifdef msvc && debug
-  File "/oname=qwindowsvistastyled.dll" "styles\qwindowsvistastyled.dll"
+  File "/oname=qmodernwindowsstyled.dll" "styles\qmodernwindowsstyled.dll"
 !else
-  File "/oname=qwindowsvistastyle.dll" "styles\qwindowsvistastyle.dll"
+  File "/oname=qmodernwindowsstyle.dll" "styles\qmodernwindowsstyle.dll"
 !endif
 SectionEnd
 
@@ -623,6 +635,7 @@ Section "Gstreamer plugins" gstreamer-plugins
   SetOutPath "$INSTDIR\gstreamer-plugins"
 
 !ifdef mingw
+  File "/oname=libgstadaptivedemux2.dll" "gstreamer-plugins\libgstadaptivedemux2.dll"
   File "/oname=libgstaes.dll" "gstreamer-plugins\libgstaes.dll"
   File "/oname=libgstaiff.dll" "gstreamer-plugins\libgstaiff.dll"
   File "/oname=libgstapetag.dll" "gstreamer-plugins\libgstapetag.dll"
@@ -631,16 +644,14 @@ Section "Gstreamer plugins" gstreamer-plugins
   File "/oname=libgstasfmux.dll" "gstreamer-plugins\libgstasfmux.dll"
   File "/oname=libgstaudioconvert.dll" "gstreamer-plugins\libgstaudioconvert.dll"
   File "/oname=libgstaudiofx.dll" "gstreamer-plugins\libgstaudiofx.dll"
-  File "/oname=libgstaudiomixer.dll" "gstreamer-plugins\libgstaudiomixer.dll"
   File "/oname=libgstaudioparsers.dll" "gstreamer-plugins\libgstaudioparsers.dll"
-  File "/oname=libgstaudiorate.dll" "gstreamer-plugins\libgstaudiorate.dll"
   File "/oname=libgstaudioresample.dll" "gstreamer-plugins\libgstaudioresample.dll"
-  File "/oname=libgstaudiotestsrc.dll" "gstreamer-plugins\libgstaudiotestsrc.dll"
   File "/oname=libgstautodetect.dll" "gstreamer-plugins\libgstautodetect.dll"
   File "/oname=libgstbs2b.dll" "gstreamer-plugins\libgstbs2b.dll"
   File "/oname=libgstcoreelements.dll" "gstreamer-plugins\libgstcoreelements.dll"
   File "/oname=libgstdash.dll" "gstreamer-plugins\libgstdash.dll"
   File "/oname=libgstdirectsound.dll" "gstreamer-plugins\libgstdirectsound.dll"
+  File "/oname=libgstdsd.dll" "gstreamer-plugins\libgstdsd.dll"
   File "/oname=libgstequalizer.dll" "gstreamer-plugins\libgstequalizer.dll"
   File "/oname=libgstfaac.dll" "gstreamer-plugins\libgstfaac.dll"
   File "/oname=libgstfaad.dll" "gstreamer-plugins\libgstfaad.dll"
@@ -655,6 +666,10 @@ Section "Gstreamer plugins" gstreamer-plugins
   File "/oname=libgstisomp4.dll" "gstreamer-plugins\libgstisomp4.dll"
   File "/oname=libgstlame.dll" "gstreamer-plugins\libgstlame.dll"
   File "/oname=libgstlibav.dll" "gstreamer-plugins\libgstlibav.dll"
+  File "/oname=libgstmpegpsdemux.dll" "gstreamer-plugins\libgstmpegpsdemux.dll"
+  File "/oname=libgstmpegpsmux.dll" "gstreamer-plugins\libgstmpegpsmux.dll"
+  File "/oname=libgstmpegtsdemux.dll" "gstreamer-plugins\libgstmpegtsdemux.dll"
+  File "/oname=libgstmpegtsmux.dll" "gstreamer-plugins\libgstmpegtsmux.dll"
   File "/oname=libgstmpg123.dll" "gstreamer-plugins\libgstmpg123.dll"
   File "/oname=libgstmusepack.dll" "gstreamer-plugins\libgstmusepack.dll"
   File "/oname=libgstogg.dll" "gstreamer-plugins\libgstogg.dll"
@@ -677,6 +692,7 @@ Section "Gstreamer plugins" gstreamer-plugins
   File "/oname=libgstvolume.dll" "gstreamer-plugins\libgstvolume.dll"
   File "/oname=libgstvorbis.dll" "gstreamer-plugins\libgstvorbis.dll"
   File "/oname=libgstwasapi.dll" "gstreamer-plugins\libgstwasapi.dll"
+  File "/oname=libgstwaveform.dll" "gstreamer-plugins\libgstwaveform.dll"
   File "/oname=libgstwavenc.dll" "gstreamer-plugins\libgstwavenc.dll"
   File "/oname=libgstwavpack.dll" "gstreamer-plugins\libgstwavpack.dll"
   File "/oname=libgstwavparse.dll" "gstreamer-plugins\libgstwavparse.dll"
@@ -684,24 +700,24 @@ Section "Gstreamer plugins" gstreamer-plugins
 !endif ; MinGW
 
 !ifdef msvc
+  File "/oname=gstadaptivedemux2.dll" "gstreamer-plugins\gstadaptivedemux2.dll"
   File "/oname=gstaes.dll" "gstreamer-plugins\gstaes.dll"
   File "/oname=gstaiff.dll" "gstreamer-plugins\gstaiff.dll"
   File "/oname=gstapetag.dll" "gstreamer-plugins\gstapetag.dll"
   File "/oname=gstapp.dll" "gstreamer-plugins\gstapp.dll"
   File "/oname=gstasf.dll" "gstreamer-plugins\gstasf.dll"
   File "/oname=gstasfmux.dll" "gstreamer-plugins\gstasfmux.dll"
+  File "/oname=gstasio.dll" "gstreamer-plugins\gstasio.dll"
   File "/oname=gstaudioconvert.dll" "gstreamer-plugins\gstaudioconvert.dll"
   File "/oname=gstaudiofx.dll" "gstreamer-plugins\gstaudiofx.dll"
-  File "/oname=gstaudiomixer.dll" "gstreamer-plugins\gstaudiomixer.dll"
   File "/oname=gstaudioparsers.dll" "gstreamer-plugins\gstaudioparsers.dll"
-  File "/oname=gstaudiorate.dll" "gstreamer-plugins\gstaudiorate.dll"
   File "/oname=gstaudioresample.dll" "gstreamer-plugins\gstaudioresample.dll"
-  File "/oname=gstaudiotestsrc.dll" "gstreamer-plugins\gstaudiotestsrc.dll"
   File "/oname=gstautodetect.dll" "gstreamer-plugins\gstautodetect.dll"
   File "/oname=gstbs2b.dll" "gstreamer-plugins\gstbs2b.dll"
   File "/oname=gstcoreelements.dll" "gstreamer-plugins\gstcoreelements.dll"
   File "/oname=gstdash.dll" "gstreamer-plugins\gstdash.dll"
   File "/oname=gstdirectsound.dll" "gstreamer-plugins\gstdirectsound.dll"
+  File "/oname=gstdsd.dll" "gstreamer-plugins\gstdsd.dll"
   File "/oname=gstequalizer.dll" "gstreamer-plugins\gstequalizer.dll"
   File "/oname=gstfaac.dll" "gstreamer-plugins\gstfaac.dll"
   File "/oname=gstfaad.dll" "gstreamer-plugins\gstfaad.dll"
@@ -716,6 +732,10 @@ Section "Gstreamer plugins" gstreamer-plugins
   File "/oname=gstisomp4.dll" "gstreamer-plugins\gstisomp4.dll"
   File "/oname=gstlame.dll" "gstreamer-plugins\gstlame.dll"
   File "/oname=gstlibav.dll" "gstreamer-plugins\gstlibav.dll"
+  File "/oname=gstmpegpsdemux.dll" "gstreamer-plugins\gstmpegpsdemux.dll"
+  File "/oname=gstmpegpsmux.dll" "gstreamer-plugins\gstmpegpsmux.dll"
+  File "/oname=gstmpegtsdemux.dll" "gstreamer-plugins\gstmpegtsdemux.dll"
+  File "/oname=gstmpegtsmux.dll" "gstreamer-plugins\gstmpegtsmux.dll"
   File "/oname=gstmpg123.dll" "gstreamer-plugins\gstmpg123.dll"
   File "/oname=gstmusepack.dll" "gstreamer-plugins\gstmusepack.dll"
   File "/oname=gstogg.dll" "gstreamer-plugins\gstogg.dll"
@@ -738,8 +758,8 @@ Section "Gstreamer plugins" gstreamer-plugins
   File "/oname=gstvolume.dll" "gstreamer-plugins\gstvolume.dll"
   File "/oname=gstvorbis.dll" "gstreamer-plugins\gstvorbis.dll"
   File "/oname=gstwasapi.dll" "gstreamer-plugins\gstwasapi.dll"
-  ; Disable wasapi2 until issue (https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/2870) is fixed.
-  ;File "/oname=gstwasapi2.dll" "gstreamer-plugins\gstwasapi2.dll"
+  File "/oname=gstwasapi2.dll" "gstreamer-plugins\gstwasapi2.dll"
+  File "/oname=gstwaveform.dll" "gstreamer-plugins\gstwaveform.dll"
   File "/oname=gstwavenc.dll" "gstreamer-plugins\gstwavenc.dll"
   File "/oname=gstwavpack.dll" "gstreamer-plugins\gstwavpack.dll"
   File "/oname=gstwavparse.dll" "gstreamer-plugins\gstwavparse.dll"
@@ -835,8 +855,10 @@ Section "Uninstall"
   Delete "$INSTDIR\libgstaudio-1.0-0.dll"
   Delete "$INSTDIR\libgstbadaudio-1.0-0.dll"
   Delete "$INSTDIR\libgstbase-1.0-0.dll"
+  Delete "$INSTDIR\libgstcodecparsers-1.0-0.dll"
   Delete "$INSTDIR\libgstfft-1.0-0.dll"
   Delete "$INSTDIR\libgstisoff-1.0-0.dll"
+  Delete "$INSTDIR\libgstmpegts-1.0-0.dll"
   Delete "$INSTDIR\libgstnet-1.0-0.dll"
   Delete "$INSTDIR\libgstpbutils-1.0-0.dll"
   Delete "$INSTDIR\libgstreamer-1.0-0.dll"
@@ -853,6 +875,7 @@ Section "Uninstall"
   Delete "$INSTDIR\libidn2-0.dll"
   Delete "$INSTDIR\libintl-8.dll"
   Delete "$INSTDIR\libjpeg-9.dll"
+  Delete "$INSTDIR\libkdsingleapplication-qt6.dll"
   Delete "$INSTDIR\liblzma-5.dll"
   Delete "$INSTDIR\libmp3lame-0.dll"
   Delete "$INSTDIR\libmpcdec.dll"
@@ -897,6 +920,7 @@ Section "Uninstall"
   Delete "$INSTDIR\libabsl_examine_stack.dll"
   Delete "$INSTDIR\libabsl_hash.dll"
   Delete "$INSTDIR\libabsl_int128.dll"
+  Delete "$INSTDIR\libabsl_kernel_timeout_internal.dll"
   Delete "$INSTDIR\libabsl_log_globals.dll"
   Delete "$INSTDIR\libabsl_log_internal_check_op.dll"
   Delete "$INSTDIR\libabsl_log_internal_conditions.dll"
@@ -960,7 +984,7 @@ Section "Uninstall"
   Delete "$INSTDIR\brotlidec.dll"
   Delete "$INSTDIR\chromaprint.dll"
   Delete "$INSTDIR\ebur128.dll"
-  Delete "$INSTDIR\faad.dll"
+  Delete "$INSTDIR\faad-2.dll"
   Delete "$INSTDIR\fdk-aac.dll"
   Delete "$INSTDIR\ffi-7.dll"
   Delete "$INSTDIR\gio-2.0-0.dll"
@@ -973,8 +997,10 @@ Section "Uninstall"
   Delete "$INSTDIR\gstaudio-1.0-0.dll"
   Delete "$INSTDIR\gstbadaudio-1.0-0.dll"
   Delete "$INSTDIR\gstbase-1.0-0.dll"
+  Delete "$INSTDIR\gstcodecparsers-1.0-0.dll"
   Delete "$INSTDIR\gstfft-1.0-0.dll"
   Delete "$INSTDIR\gstisoff-1.0-0.dll"
+  Delete "$INSTDIR\gstmpegts-1.0-0.dll"
   Delete "$INSTDIR\gstnet-1.0-0.dll"
   Delete "$INSTDIR\gstpbutils-1.0-0.dll"
   Delete "$INSTDIR\gstreamer-1.0-0.dll"
@@ -989,6 +1015,7 @@ Section "Uninstall"
   Delete "$INSTDIR\harfbuzz.dll"
   Delete "$INSTDIR\intl-8.dll"
   Delete "$INSTDIR\jpeg62.dll"
+  Delete "$INSTDIR\kdsingleapplication-qt6.dll"
   Delete "$INSTDIR\libbs2b.dll"
   Delete "$INSTDIR\libfaac_dll.dll"
   Delete "$INSTDIR\liblzma.dll"
@@ -1042,7 +1069,7 @@ Section "Uninstall"
 
   ; Common files
 
-  Delete "$INSTDIR\icudt73.dll"
+  Delete "$INSTDIR\icudt75.dll"
   Delete "$INSTDIR\libfftw3-3.dll"
 !ifdef debug
   Delete "$INSTDIR\libprotobufd.dll"
@@ -1050,8 +1077,8 @@ Section "Uninstall"
   Delete "$INSTDIR\libprotobuf.dll"
 !endif
 !ifdef msvc && debug
-  Delete "$INSTDIR\icuin73d.dll"
-  Delete "$INSTDIR\icuuc73d.dll"
+  Delete "$INSTDIR\icuin75d.dll"
+  Delete "$INSTDIR\icuuc75d.dll"
   Delete "$INSTDIR\Qt6Concurrentd.dll"
   Delete "$INSTDIR\Qt6Cored.dll"
   Delete "$INSTDIR\Qt6Guid.dll"
@@ -1059,8 +1086,8 @@ Section "Uninstall"
   Delete "$INSTDIR\Qt6Sqld.dll"
   Delete "$INSTDIR\Qt6Widgetsd.dll"
 !else
-  Delete "$INSTDIR\icuin73.dll"
-  Delete "$INSTDIR\icuuc73.dll"
+  Delete "$INSTDIR\icuin75.dll"
+  Delete "$INSTDIR\icuuc75.dll"
   Delete "$INSTDIR\Qt6Concurrent.dll"
   Delete "$INSTDIR\Qt6Core.dll"
   Delete "$INSTDIR\Qt6Gui.dll"
@@ -1088,7 +1115,7 @@ Section "Uninstall"
 
 !ifdef msvc && debug
   Delete "$INSTDIR\platforms\qwindowsd.dll"
-  Delete "$INSTDIR\styles\qwindowsvistastyled.dll"
+  Delete "$INSTDIR\styles\qmodernwindowsstyled.dll"
   Delete "$INSTDIR\tls\qschannelbackendd.dll"
   Delete "$INSTDIR\tls\qopensslbackendd.dll"
   Delete "$INSTDIR\sqldrivers\qsqlited.dll"
@@ -1097,7 +1124,7 @@ Section "Uninstall"
   Delete "$INSTDIR\imageformats\qjpegd.dll"
 !else
   Delete "$INSTDIR\platforms\qwindows.dll"
-  Delete "$INSTDIR\styles\qwindowsvistastyle.dll"
+  Delete "$INSTDIR\styles\qmodernwindowsstyle.dll"
   Delete "$INSTDIR\tls\qschannelbackend.dll"
   Delete "$INSTDIR\tls\qopensslbackend.dll"
   Delete "$INSTDIR\sqldrivers\qsqlite.dll"
@@ -1109,6 +1136,7 @@ Section "Uninstall"
   ; MinGW GStreamer plugins
 
 !ifdef mingw
+  Delete "$INSTDIR\gstreamer-plugins\libgstadaptivedemux2.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstaes.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstaiff.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstapetag.dll"
@@ -1117,16 +1145,14 @@ Section "Uninstall"
   Delete "$INSTDIR\gstreamer-plugins\libgstasfmux.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstaudioconvert.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstaudiofx.dll"
-  Delete "$INSTDIR\gstreamer-plugins\libgstaudiomixer.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstaudioparsers.dll"
-  Delete "$INSTDIR\gstreamer-plugins\libgstaudiorate.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstaudioresample.dll"
-  Delete "$INSTDIR\gstreamer-plugins\libgstaudiotestsrc.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstautodetect.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstbs2b.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstcoreelements.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstdash.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstdirectsound.dll"
+  Delete "$INSTDIR\gstreamer-plugins\libgstdsd.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstequalizer.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstfaac.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstfaad.dll"
@@ -1141,6 +1167,10 @@ Section "Uninstall"
   Delete "$INSTDIR\gstreamer-plugins\libgstisomp4.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstlame.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstlibav.dll"
+  Delete "$INSTDIR\gstreamer-plugins\libgstmpegpsdemux.dll"
+  Delete "$INSTDIR\gstreamer-plugins\libgstmpegpsmux.dll"
+  Delete "$INSTDIR\gstreamer-plugins\libgstmpegtsdemux.dll"
+  Delete "$INSTDIR\gstreamer-plugins\libgstmpegtsmux.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstmpg123.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstmusepack.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstogg.dll"
@@ -1163,6 +1193,7 @@ Section "Uninstall"
   Delete "$INSTDIR\gstreamer-plugins\libgstvolume.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstvorbis.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstwasapi.dll"
+  Delete "$INSTDIR\gstreamer-plugins\libgstwaveform.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstwavenc.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstwavpack.dll"
   Delete "$INSTDIR\gstreamer-plugins\libgstwavparse.dll"
@@ -1172,24 +1203,24 @@ Section "Uninstall"
   ; MSVC GStreamer plugins
 
 !ifdef msvc
+  Delete "$INSTDIR\gstreamer-plugins\gstadaptivedemux2.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstaes.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstaiff.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstapetag.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstapp.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstasf.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstasfmux.dll"
+  Delete "$INSTDIR\gstreamer-plugins\gstasio.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstaudioconvert.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstaudiofx.dll"
-  Delete "$INSTDIR\gstreamer-plugins\gstaudiomixer.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstaudioparsers.dll"
-  Delete "$INSTDIR\gstreamer-plugins\gstaudiorate.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstaudioresample.dll"
-  Delete "$INSTDIR\gstreamer-plugins\gstaudiotestsrc.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstautodetect.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstbs2b.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstcoreelements.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstdash.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstdirectsound.dll"
+  Delete "$INSTDIR\gstreamer-plugins\gstdsd.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstequalizer.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstfaac.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstfaad.dll"
@@ -1204,6 +1235,10 @@ Section "Uninstall"
   Delete "$INSTDIR\gstreamer-plugins\gstisomp4.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstlame.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstlibav.dll"
+  Delete "$INSTDIR\gstreamer-plugins\gstmpegpsdemux.dll"
+  Delete "$INSTDIR\gstreamer-plugins\gstmpegpsmux.dll"
+  Delete "$INSTDIR\gstreamer-plugins\gstmpegtsdemux.dll"
+  Delete "$INSTDIR\gstreamer-plugins\gstmpegtsmux.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstmpg123.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstmusepack.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstogg.dll"
@@ -1227,6 +1262,7 @@ Section "Uninstall"
   Delete "$INSTDIR\gstreamer-plugins\gstvorbis.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstwasapi.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstwasapi2.dll"
+  Delete "$INSTDIR\gstreamer-plugins\gstwaveform.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstwavenc.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstwavpack.dll"
   Delete "$INSTDIR\gstreamer-plugins\gstwavparse.dll"

ext/libstrawberry-common/core/logging.cpp

@@ -67,8 +67,8 @@ static QIODevice *sNullDevice = nullptr;
 
 const char *kDefaultLogLevels = "*:3";
 
-static const char *kMessageHandlerMagic = "__logging_message__";
-static const size_t kMessageHandlerMagicLength = strlen(kMessageHandlerMagic);
+static constexpr char kMessageHandlerMagic[] = "__logging_message__";
+static const size_t kMessageHandlerMagicLen = strlen(kMessageHandlerMagic);
 static QtMessageHandler sOriginalMessageHandler = nullptr;
 
 template<class T>
@@ -135,9 +135,9 @@ class LoggedDebug : public DebugBase<LoggedDebug> {
 
 static void MessageHandler(QtMsgType type, const QMessageLogContext&, const QString &message) {
 
-  if (message.startsWith(kMessageHandlerMagic)) {
+  if (message.startsWith(QLatin1String(kMessageHandlerMagic))) {
     QByteArray message_data = message.toUtf8();
-    fprintf(type == QtCriticalMsg || type == QtFatalMsg ? stderr : stdout, "%s\n", message_data.constData() + kMessageHandlerMagicLength);
+    fprintf(type == QtCriticalMsg || type == QtFatalMsg ? stderr : stdout, "%s\n", message_data.constData() + kMessageHandlerMagicLen);
     fflush(type == QtCriticalMsg || type == QtFatalMsg ? stderr : stdout);
     return;
   }
@@ -157,8 +157,8 @@ static void MessageHandler(QtMsgType type, const QMessageLogContext&, const QStr
       break;
   }
 
-  for (const QString &line : message.split('\n')) {
-    BufferedDebug d = CreateLogger<BufferedDebug>(level, "unknown", -1, nullptr);
+  for (const QString &line : message.split(QLatin1Char('\n'))) {
+    BufferedDebug d = CreateLogger<BufferedDebug>(level, QStringLiteral("unknown"), -1, nullptr);
     d << line.toLocal8Bit().constData();
     if (d.buf_) {
       d.buf_->close();
@@ -193,8 +193,8 @@ void SetLevels(const QString &levels) {
 
   if (!sClassLevels) return;
 
-  for (const QString &item : levels.split(',')) {
-    const QStringList class_level = item.split(':');
+  for (const QString &item : levels.split(QLatin1Char(','))) {
+    const QStringList class_level = item.split(QLatin1Char(':'));
 
     QString class_name;
     bool ok = false;
@@ -212,7 +212,7 @@ void SetLevels(const QString &levels) {
       continue;
     }
 
-    if (class_name.isEmpty() || class_name == "*") {
+    if (class_name.isEmpty() || class_name == QStringLiteral("*")) {
       sDefaultLevel = static_cast<Level>(level);
     }
     else {
@@ -225,10 +225,10 @@ void SetLevels(const QString &levels) {
 static QString ParsePrettyFunction(const char *pretty_function) {
 
   // Get the class name out of the function name.
-  QString class_name = pretty_function;
-  const qint64 paren = class_name.indexOf('(');
+  QString class_name = QLatin1String(pretty_function);
+  const qint64 paren = class_name.indexOf(QLatin1Char('('));
   if (paren != -1) {
-    const qint64 colons = class_name.lastIndexOf("::", paren);
+    const qint64 colons = class_name.lastIndexOf(QLatin1String("::"), paren);
     if (colons != -1) {
       class_name = class_name.left(colons);
     }
@@ -237,7 +237,7 @@ static QString ParsePrettyFunction(const char *pretty_function) {
     }
   }
 
-  const qint64 space = class_name.lastIndexOf(' ');
+  const qint64 space = class_name.lastIndexOf(QLatin1Char(' '));
   if (space != -1) {
     class_name = class_name.mid(space + 1);
   }
@@ -259,7 +259,7 @@ static T CreateLogger(Level level, const QString &class_name, int line, const ch
     case Level_Fatal:   level_name = " FATAL "; break;
   }
 
-  QString filter_category = (category != nullptr) ? category : class_name;
+  QString filter_category = (category != nullptr) ? QLatin1String(category) : class_name;
   // Check the settings to see if we're meant to show or hide this message.
   Level threshold_level = sDefaultLevel;
   if (sClassLevels && sClassLevels->contains(filter_category)) {
@@ -272,10 +272,10 @@ static T CreateLogger(Level level, const QString &class_name, int line, const ch
 
   QString function_line = class_name;
   if (line != -1) {
-    function_line += ":" + QString::number(line);
+    function_line += QStringLiteral(":") + QString::number(line);
   }
   if (category) {
-    function_line += "(" + QString(category) + ")";
+    function_line += QStringLiteral("(") + QLatin1String(category) + QStringLiteral(")");
   }
 
   QtMsgType type = QtDebugMsg;
@@ -284,7 +284,7 @@ static T CreateLogger(Level level, const QString &class_name, int line, const ch
   }
 
   T ret(type);
-  ret.nospace() << QDateTime::currentDateTime().toString("hh:mm:ss.zzz").toLatin1().constData() << level_name << function_line.leftJustified(32).toLatin1().constData();
+  ret.nospace() << QDateTime::currentDateTime().toString(QStringLiteral("hh:mm:ss.zzz")).toLatin1().constData() << level_name << function_line.leftJustified(32).toLatin1().constData();
 
   return ret.space();
 
@@ -310,7 +310,7 @@ QString CXXDemangle(const QString &mangled_function) {
 QString LinuxDemangle(const QString &symbol);
 QString LinuxDemangle(const QString &symbol) {
 
-  QRegularExpression regex("\\(([^+]+)");
+  QRegularExpression regex(QStringLiteral("\\(([^+]+)"));
   QRegularExpressionMatch match = regex.match(symbol);
   if (!match.hasMatch()) {
     return symbol;
@@ -326,9 +326,9 @@ QString DarwinDemangle(const QString &symbol);
 QString DarwinDemangle(const QString &symbol) {
 
 #  if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-  QStringList split = symbol.split(' ', Qt::SkipEmptyParts);
+  QStringList split = symbol.split(QLatin1Char(' '), Qt::SkipEmptyParts);
 #  else
-  QStringList split = symbol.split(' ', QString::SkipEmptyParts);
+  QStringList split = symbol.split(QLatin1Char(' '), QString::SkipEmptyParts);
 #  endif
   QString mangled_function = split[3];
   return CXXDemangle(mangled_function);
@@ -392,7 +392,7 @@ namespace {
 
 template<typename T>
 QString print_duration(T duration, const std::string &unit) {
-  return QString("%1%2").arg(duration.count()).arg(unit.c_str());
+  return QStringLiteral("%1%2").arg(duration.count()).arg(QString::fromStdString(unit));
 }
 
 }  // namespace

ext/libstrawberry-common/core/workerpool.h

@@ -23,6 +23,7 @@
 
 #include <cstdio>
 #include <cstddef>
+#include <utility>
 
 #include <QtGlobal>
 #include <QObject>
@@ -31,6 +32,7 @@
 #include <QMutex>
 #include <QLocalServer>
 #include <QProcess>
+#include <QDir>
 #include <QFile>
 #include <QList>
 #include <QQueue>
@@ -170,7 +172,7 @@ WorkerPool<HandlerType>::WorkerPool(QObject *parent)
   local_server_name_ = qApp->applicationName().toLower();
 
   if (local_server_name_.isEmpty()) {
-    local_server_name_ = "workerpool";
+    local_server_name_ = QStringLiteral("workerpool");
   }
 
 }
@@ -242,15 +244,15 @@ void WorkerPool<HandlerType>::DoStart() {
   QStringList search_path;
   search_path << QCoreApplication::applicationDirPath();
 #if defined(Q_OS_UNIX)
-  search_path << "/usr/libexec";
-  search_path << "/usr/local/libexec";
+  search_path << QStringLiteral("/usr/libexec");
+  search_path << QStringLiteral("/usr/local/libexec");
 #endif
-#if defined(Q_OS_MACOS) && defined(USE_BUNDLE)
-  search_path << QCoreApplication::applicationDirPath() + "/" + USE_BUNDLE_DIR;
+#if defined(Q_OS_MACOS)
+  search_path << QDir::cleanPath(QCoreApplication::applicationDirPath() + QStringLiteral("/../PlugIns"));
 #endif
 
-  for (const QString &path_prefix : search_path) {
-    const QString executable_path = path_prefix + "/" + executable_name_;
+  for (const QString &path_prefix : std::as_const(search_path)) {
+    const QString executable_path = path_prefix + QLatin1Char('/') + executable_name_;
     if (QFile::exists(executable_path)) {
       executable_path_ = executable_path;
       qLog(Debug) << "Using worker" << executable_name_ << "from" << path_prefix;
@@ -293,7 +295,7 @@ void WorkerPool<HandlerType>::StartOneWorker(Worker *worker) {
   // Create a server, find an unused name and start listening
   forever {
     const quint32 unique_number = QRandomGenerator::global()->bounded(static_cast<quint32>(quint64(this) & 0xFFFFFFFF));
-    const QString name = QString("%1_%2").arg(local_server_name_).arg(unique_number);
+    const QString name = QStringLiteral("%1_%2").arg(local_server_name_).arg(unique_number);
 
     if (worker->local_server_->listen(name)) {
       break;

ext/libstrawberry-tagreader/tagreaderbase.cpp

@@ -74,7 +74,7 @@ TagReaderBase::Cover TagReaderBase::LoadCoverFromRequest(const spb::tagreader::S
   }
   QString cover_mime_type;
   if (request.has_cover_mime_type()) {
-    cover_mime_type = QByteArray(request.cover_mime_type().data(), static_cast<qint64>(request.cover_mime_type().size()));
+    cover_mime_type = QString::fromStdString(request.cover_mime_type());
   }
 
   return LoadCoverFromRequest(song_filename, cover_filename, cover_data, cover_mime_type);
@@ -94,7 +94,7 @@ TagReaderBase::Cover TagReaderBase::LoadCoverFromRequest(const spb::tagreader::S
   }
   QString cover_mime_type;
   if (request.has_cover_mime_type()) {
-    cover_mime_type = QByteArray(request.cover_mime_type().data(), static_cast<qint64>(request.cover_mime_type().size()));
+    cover_mime_type = QString::fromStdString(request.cover_mime_type());
   }
 
   return LoadCoverFromRequest(song_filename, cover_filename, cover_data, cover_mime_type);
@@ -118,24 +118,28 @@ TagReaderBase::Cover TagReaderBase::LoadCoverFromRequest(const QString &song_fil
     if (cover_mime_type.isEmpty()) {
       cover_mime_type = QMimeDatabase().mimeTypeForData(cover_data).name();
     }
-    if (cover_mime_type == "image/jpeg") {
+    if (cover_mime_type == QStringLiteral("image/jpeg")) {
       qLog(Debug) << "Using cover from JPEG data for" << song_filename;
       return Cover(cover_data, cover_mime_type);
     }
-    if (cover_mime_type == "image/png") {
+    if (cover_mime_type == QStringLiteral("image/png")) {
       qLog(Debug) << "Using cover from PNG data for" << song_filename;
       return Cover(cover_data, cover_mime_type);
     }
     // Convert image to JPEG.
     qLog(Debug) << "Converting cover to JPEG data for" << song_filename;
-    QImage cover_image(cover_data);
+    QImage cover_image;
+    if (!cover_image.loadFromData(cover_data)) {
+      qLog(Error) << "Failed to load image from cover data for" << song_filename;
+      return Cover();
+    }
     cover_data.clear();
     QBuffer buffer(&cover_data);
     if (buffer.open(QIODevice::WriteOnly)) {
       cover_image.save(&buffer, "JPEG");
       buffer.close();
     }
-    return Cover(cover_data, "image/jpeg");
+    return Cover(cover_data, QStringLiteral("image/jpeg"));
   }
 
   return Cover();

ext/libstrawberry-tagreader/tagreadergme.cpp

@@ -36,16 +36,16 @@
 #include "tagreadertaglib.h"
 
 bool GME::IsSupportedFormat(const QFileInfo &file_info) {
-  return file_info.exists() && (file_info.completeSuffix().endsWith("spc", Qt::CaseInsensitive) || file_info.completeSuffix().endsWith("vgm"), Qt::CaseInsensitive);
+  return file_info.exists() && (file_info.completeSuffix().endsWith(QLatin1String("spc"), Qt::CaseInsensitive) || file_info.completeSuffix().endsWith(QLatin1String("vgm")), Qt::CaseInsensitive);
 }
 
 bool GME::ReadFile(const QFileInfo &file_info, spb::tagreader::SongMetadata *song_info) {
 
-  if (file_info.completeSuffix().endsWith("spc"), Qt::CaseInsensitive) {
+  if (file_info.completeSuffix().endsWith(QLatin1String("spc")), Qt::CaseInsensitive) {
     SPC::Read(file_info, song_info);
     return true;
   }
-  if (file_info.completeSuffix().endsWith("vgm", Qt::CaseInsensitive)) {
+  if (file_info.completeSuffix().endsWith(QLatin1String("vgm"), Qt::CaseInsensitive)) {
     VGM::Read(file_info, song_info);
     return true;
   }
@@ -75,7 +75,7 @@ void GME::SPC::Read(const QFileInfo &file_info, spb::tagreader::SongMetadata *so
   qLog(Debug) << "Reading tags from SPC file" << file_info.fileName();
 
   // Check for header -- more reliable than file name alone.
-  if (!file.read(33).startsWith(QString("SNES-SPC700").toLatin1())) return;
+  if (!file.read(33).startsWith(QStringLiteral("SNES-SPC700").toLatin1())) return;
 
   // First order of business -- get any tag values that exist within the core file information.
   // These only allow for a certain number of bytes per field,
@@ -125,7 +125,7 @@ void GME::SPC::Read(const QFileInfo &file_info, spb::tagreader::SongMetadata *so
   // Check for XID6 data -- this is infrequently used, but being able to fill in data from this is ideal before trying to rely on APETAG values.
   // XID6 format follows EA's binary file format standard named "IFF"
   file.seek(XID6_OFFSET);
-  if (has_id6 && file.read(4) == QString("xid6").toLatin1()) {
+  if (has_id6 && file.read(4) == QStringLiteral("xid6").toLatin1()) {
     QByteArray xid6_head_data = file.read(4);
     if (xid6_head_data.size() >= 4) {
       qint64 xid6_size = xid6_head_data[0] | (xid6_head_data[1] << 8) | (xid6_head_data[2] << 16) | xid6_head_data[3];
@@ -195,7 +195,7 @@ void GME::VGM::Read(const QFileInfo &file_info, spb::tagreader::SongMetadata *so
 
   qLog(Debug) << "Reading tags from VGM file" << file_info.fileName();
 
-  if (!file.read(4).startsWith(QString("Vgm ").toLatin1())) return;
+  if (!file.read(4).startsWith(QStringLiteral("Vgm ").toLatin1())) return;
 
   file.seek(GD3_TAG_PTR);
   QByteArray gd3_head = file.read(4);
@@ -226,7 +226,7 @@ void GME::VGM::Read(const QFileInfo &file_info, spb::tagreader::SongMetadata *so
 #else
   fileTagStream.setCodec("UTF-16");
 #endif
-  QStringList strings = fileTagStream.readLine(0).split(QChar('\0'));
+  QStringList strings = fileTagStream.readLine(0).split(QLatin1Char('\0'));
   if (strings.count() < 10) return;
 
   // VGM standard dictates string tag data exist in specific order.

ext/libstrawberry-tagreader/tagreadergme.h

@@ -34,7 +34,7 @@ namespace GME {
 bool IsSupportedFormat(const QFileInfo &file_info);
 bool ReadFile(const QFileInfo &file_info, spb::tagreader::SongMetadata *song_info);
 
-uint32_t UnpackBytes32(const char *const arr, size_t length);
+uint32_t UnpackBytes32(const char *const bytes, size_t length);
 
 namespace SPC {
 // SPC SPEC: http://vspcplay.raphnet.net/spc_file_format.txt

ext/libstrawberry-tagreader/tagreadertaglib.cpp

@@ -248,7 +248,7 @@ bool TagReaderTagLib::ReadFile(const QString &filename, spb::tagreader::SongMeta
     song->set_ctime(song->mtime());
   }
 
-  song->set_lastseen(QDateTime::currentDateTime().toSecsSinceEpoch());
+  song->set_lastseen(QDateTime::currentSecsSinceEpoch());
 
   std::unique_ptr<TagLib::FileRef> fileref(factory_->GetFileRef(filename));
   if (fileref->isNull()) {
@@ -328,137 +328,8 @@ bool TagReaderTagLib::ReadFile(const QString &filename, spb::tagreader::SongMeta
   }
 
   else if (TagLib::MPEG::File *file_mpeg = dynamic_cast<TagLib::MPEG::File*>(fileref->file())) {
-
-    if (file_mpeg->ID3v2Tag()) {
-      const TagLib::ID3v2::FrameListMap &map = file_mpeg->ID3v2Tag()->frameListMap();
-
-      if (map.contains("TPOS")) disc = TStringToQString(map["TPOS"].front()->toString()).trimmed();
-      if (map.contains("TCOM")) TStringToStdString(map["TCOM"].front()->toString(), song->mutable_composer());
-
-      // content group
-      if (map.contains("TIT1")) TStringToStdString(map["TIT1"].front()->toString(), song->mutable_grouping());
-
-      // original artist/performer
-      if (map.contains("TOPE")) TStringToStdString(map["TOPE"].front()->toString(), song->mutable_performer());
-
-      // Skip TPE1 (which is the artist) here because we already fetched it
-
-      // non-standard: Apple, Microsoft
-      if (map.contains("TPE2")) TStringToStdString(map["TPE2"].front()->toString(), song->mutable_albumartist());
-
-      if (map.contains("TCMP")) compilation = TStringToQString(map["TCMP"].front()->toString()).trimmed();
-
-      if (map.contains("TDOR")) {
-        song->set_originalyear(map["TDOR"].front()->toString().substr(0, 4).toInt());
-      }
-      else if (map.contains("TORY")) {
-        song->set_originalyear(map["TORY"].front()->toString().substr(0, 4).toInt());
-      }
-
-      if (map.contains("USLT")) {
-        TStringToStdString(map["USLT"].front()->toString(), song->mutable_lyrics());
-      }
-      else if (map.contains("SYLT")) {
-        TStringToStdString(map["SYLT"].front()->toString(), song->mutable_lyrics());
-      }
-
-      if (map.contains("APIC")) song->set_art_embedded(true);
-
-      // Find a suitable comment tag.  For now we ignore iTunNORM comments.
-      for (uint i = 0; i < map["COMM"].size(); ++i) {
-        const TagLib::ID3v2::CommentsFrame *frame = dynamic_cast<const TagLib::ID3v2::CommentsFrame*>(map["COMM"][i]);
-
-        if (frame && TStringToQString(frame->description()) != "iTunNORM") {
-          TStringToStdString(frame->text(), song->mutable_comment());
-          break;
-        }
-      }
-
-      if (TagLib::ID3v2::UserTextIdentificationFrame *frame_fmps_playcount = TagLib::ID3v2::UserTextIdentificationFrame::find(file_mpeg->ID3v2Tag(), "FMPS_Playcount")) {
-        TagLib::StringList frame_field_list = frame_fmps_playcount->fieldList();
-        if (frame_field_list.size() > 1) {
-          int playcount = TStringToQString(frame_field_list[1]).toInt();
-          if (song->playcount() <= 0 && playcount > 0) {
-            song->set_playcount(playcount);
-          }
-        }
-      }
-
-      if (TagLib::ID3v2::UserTextIdentificationFrame *frame_fmps_rating = TagLib::ID3v2::UserTextIdentificationFrame::find(file_mpeg->ID3v2Tag(), "FMPS_Rating")) {
-        TagLib::StringList frame_field_list = frame_fmps_rating->fieldList();
-        if (frame_field_list.size() > 1) {
-          float rating = TStringToQString(frame_field_list[1]).toFloat();
-          if (song->rating() <= 0 && rating > 0 && rating <= 1.0) {
-            song->set_rating(rating);
-          }
-        }
-      }
-
-      if (map.contains("POPM")) {
-        const TagLib::ID3v2::PopularimeterFrame *frame = dynamic_cast<const TagLib::ID3v2::PopularimeterFrame*>(map["POPM"].front());
-        if (frame) {
-          if (song->playcount() <= 0 && frame->counter() > 0) {
-            song->set_playcount(frame->counter());
-          }
-          if (song->rating() <= 0 && frame->rating() > 0) {
-            song->set_rating(ConvertPOPMRating(frame->rating()));
-          }
-        }
-      }
-
-      if (map.contains("UFID")) {
-        for (uint i = 0; i < map["UFID"].size(); ++i) {
-          if (TagLib::ID3v2::UniqueFileIdentifierFrame *frame = dynamic_cast<TagLib::ID3v2::UniqueFileIdentifierFrame*>(map["UFID"][i])) {
-            const TagLib::PropertyMap property_map = frame->asProperties();
-            if (property_map.contains(kID3v2_MusicBrainz_RecordingID)) {
-              TStringToStdString(property_map[kID3v2_MusicBrainz_RecordingID].toString(), song->mutable_musicbrainz_recording_id());
-            }
-          }
-        }
-      }
-
-      if (map.contains("TXXX")) {
-        for (uint i = 0; i < map["TXXX"].size(); ++i) {
-          if (TagLib::ID3v2::UserTextIdentificationFrame *frame = dynamic_cast<TagLib::ID3v2::UserTextIdentificationFrame*>(map["TXXX"][i])) {
-            const TagLib::StringList frame_field_list = frame->fieldList();
-            if (frame_field_list.size() != 2) continue;
-            if (frame->description() == kID3v2_AcoustID_ID) {
-              TStringToStdString(frame_field_list.back(), song->mutable_acoustid_id());
-            }
-            if (frame->description() == kID3v2_AcoustID_Fingerprint) {
-              TStringToStdString(frame_field_list.back(), song->mutable_acoustid_fingerprint());
-            }
-            if (frame->description() == kID3v2_MusicBrainz_AlbumArtistID) {
-              TStringToStdString(frame_field_list.back(), song->mutable_musicbrainz_album_artist_id());
-            }
-            if (frame->description() == kID3v2_MusicBrainz_ArtistID) {
-              TStringToStdString(frame_field_list.back(), song->mutable_musicbrainz_artist_id());
-            }
-            if (frame->description() == kID3v2_MusicBrainz_OriginalArtistID) {
-              TStringToStdString(frame_field_list.back(), song->mutable_musicbrainz_original_artist_id());
-            }
-            if (frame->description() == kID3v2_MusicBrainz_AlbumID) {
-              TStringToStdString(frame_field_list.back(), song->mutable_musicbrainz_album_id());
-            }
-            if (frame->description() == kID3v2_MusicBrainz_OriginalAlbumID) {
-              TStringToStdString(frame_field_list.back(), song->mutable_musicbrainz_original_album_id());
-            }
-            if (frame->description() == kID3v2_MusicBrainz_TrackID) {
-              TStringToStdString(frame_field_list.back(), song->mutable_musicbrainz_track_id());
-            }
-            if (frame->description() == kID3v2_MusicBrainz_DiscID) {
-              TStringToStdString(frame_field_list.back(), song->mutable_musicbrainz_disc_id());
-            }
-            if (frame->description() == kID3v2_MusicBrainz_ReleaseGroupID) {
-              TStringToStdString(frame_field_list.back(), song->mutable_musicbrainz_release_group_id());
-            }
-            if (frame->description() == kID3v2_MusicBrainz_WorkID) {
-              TStringToStdString(frame_field_list.back(), song->mutable_musicbrainz_work_id());
-            }
-          }
-        }
-      }
-
+    if (file_mpeg->hasID3v2Tag()) {
+      ParseID3v2Tag(file_mpeg->ID3v2Tag(), &disc, &compilation, song);
     }
   }
 
@@ -658,12 +529,18 @@ bool TagReaderTagLib::ReadFile(const QString &filename, spb::tagreader::SongMeta
     if (tag) TStringToStdString(tag->comment(), song->mutable_comment());
   }
 
+  else if (TagLib::RIFF::WAV::File *file_wav = dynamic_cast<TagLib::RIFF::WAV::File*>(fileref->file())) {
+    if (file_wav->hasID3v2Tag()) {
+      ParseID3v2Tag(file_wav->ID3v2Tag(), &disc, &compilation, song);
+    }
+  }
+
   else if (tag) {
     TStringToStdString(tag->comment(), song->mutable_comment());
   }
 
   if (!disc.isEmpty()) {
-    const qint64 i = disc.indexOf('/');
+    const qint64 i = disc.indexOf(QLatin1Char('/'));
     if (i != -1) {
       // disc.right( i ).toInt() is total number of discs, we don't use this at the moment
       song->set_disc(disc.left(i).toInt());
@@ -677,7 +554,7 @@ bool TagReaderTagLib::ReadFile(const QString &filename, spb::tagreader::SongMeta
     // well, it wasn't set, but if the artist is VA assume it's a compilation
     const QString albumartist = QString::fromUtf8(song->albumartist().data(), static_cast<qint64>(song->albumartist().size()));
     const QString artist = QString::fromUtf8(song->artist().data(), static_cast<qint64>(song->artist().size()));
-    if (artist.compare("various artists") == 0 || albumartist.compare("various artists") == 0) {
+    if (artist.compare(QLatin1String("various artists")) == 0 || albumartist.compare(QLatin1String("various artists")) == 0) {
       song->set_compilation(true);
     }
   }
@@ -710,6 +587,139 @@ void TagReaderTagLib::TStringToStdString(const TagLib::String &tag, std::string
 
 }
 
+void TagReaderTagLib::ParseID3v2Tag(TagLib::ID3v2::Tag *tag, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const {
+
+  TagLib::ID3v2::FrameListMap map = tag->frameListMap();
+
+  if (map.contains("TPOS")) *disc = TStringToQString(map["TPOS"].front()->toString()).trimmed();
+  if (map.contains("TCOM")) TStringToStdString(map["TCOM"].front()->toString(), song->mutable_composer());
+
+  // content group
+  if (map.contains("TIT1")) TStringToStdString(map["TIT1"].front()->toString(), song->mutable_grouping());
+
+  // original artist/performer
+  if (map.contains("TOPE")) TStringToStdString(map["TOPE"].front()->toString(), song->mutable_performer());
+
+  // Skip TPE1 (which is the artist) here because we already fetched it
+
+  // non-standard: Apple, Microsoft
+  if (map.contains("TPE2")) TStringToStdString(map["TPE2"].front()->toString(), song->mutable_albumartist());
+
+  if (map.contains("TCMP")) *compilation = TStringToQString(map["TCMP"].front()->toString()).trimmed();
+
+  if (map.contains("TDOR")) {
+    song->set_originalyear(map["TDOR"].front()->toString().substr(0, 4).toInt());
+  }
+  else if (map.contains("TORY")) {
+    song->set_originalyear(map["TORY"].front()->toString().substr(0, 4).toInt());
+  }
+
+  if (map.contains("USLT")) {
+    TStringToStdString(map["USLT"].front()->toString(), song->mutable_lyrics());
+  }
+  else if (map.contains("SYLT")) {
+    TStringToStdString(map["SYLT"].front()->toString(), song->mutable_lyrics());
+  }
+
+  if (map.contains("APIC")) song->set_art_embedded(true);
+
+  // Find a suitable comment tag.  For now we ignore iTunNORM comments.
+  for (uint i = 0; i < map["COMM"].size(); ++i) {
+    const TagLib::ID3v2::CommentsFrame *frame = dynamic_cast<const TagLib::ID3v2::CommentsFrame*>(map["COMM"][i]);
+
+    if (frame && TStringToQString(frame->description()) != QStringLiteral("iTunNORM")) {
+      TStringToStdString(frame->text(), song->mutable_comment());
+      break;
+    }
+  }
+
+  if (TagLib::ID3v2::UserTextIdentificationFrame *frame_fmps_playcount = TagLib::ID3v2::UserTextIdentificationFrame::find(tag, "FMPS_Playcount")) {
+    TagLib::StringList frame_field_list = frame_fmps_playcount->fieldList();
+    if (frame_field_list.size() > 1) {
+      int playcount = TStringToQString(frame_field_list[1]).toInt();
+      if (song->playcount() <= 0 && playcount > 0) {
+        song->set_playcount(playcount);
+      }
+    }
+  }
+
+  if (TagLib::ID3v2::UserTextIdentificationFrame *frame_fmps_rating = TagLib::ID3v2::UserTextIdentificationFrame::find(tag, "FMPS_Rating")) {
+    TagLib::StringList frame_field_list = frame_fmps_rating->fieldList();
+    if (frame_field_list.size() > 1) {
+      float rating = TStringToQString(frame_field_list[1]).toFloat();
+      if (song->rating() <= 0 && rating > 0 && rating <= 1.0) {
+        song->set_rating(rating);
+      }
+    }
+  }
+
+  if (map.contains("POPM")) {
+    const TagLib::ID3v2::PopularimeterFrame *frame = dynamic_cast<const TagLib::ID3v2::PopularimeterFrame*>(map["POPM"].front());
+    if (frame) {
+      if (song->playcount() <= 0 && frame->counter() > 0) {
+        song->set_playcount(frame->counter());
+      }
+      if (song->rating() <= 0 && frame->rating() > 0) {
+        song->set_rating(ConvertPOPMRating(frame->rating()));
+      }
+    }
+  }
+
+  if (map.contains("UFID")) {
+    for (uint i = 0; i < map["UFID"].size(); ++i) {
+      if (TagLib::ID3v2::UniqueFileIdentifierFrame *frame = dynamic_cast<TagLib::ID3v2::UniqueFileIdentifierFrame*>(map["UFID"][i])) {
+        const TagLib::PropertyMap property_map = frame->asProperties();
+        if (property_map.contains(kID3v2_MusicBrainz_RecordingID)) {
+          TStringToStdString(property_map[kID3v2_MusicBrainz_RecordingID].toString(), song->mutable_musicbrainz_recording_id());
+        }
+      }
+    }
+  }
+
+  if (map.contains("TXXX")) {
+    for (uint i = 0; i < map["TXXX"].size(); ++i) {
+      if (TagLib::ID3v2::UserTextIdentificationFrame *frame = dynamic_cast<TagLib::ID3v2::UserTextIdentificationFrame*>(map["TXXX"][i])) {
+        const TagLib::StringList frame_field_list = frame->fieldList();
+        if (frame_field_list.size() != 2) continue;
+        if (frame->description() == kID3v2_AcoustID_ID) {
+          TStringToStdString(frame_field_list.back(), song->mutable_acoustid_id());
+        }
+        if (frame->description() == kID3v2_AcoustID_Fingerprint) {
+          TStringToStdString(frame_field_list.back(), song->mutable_acoustid_fingerprint());
+        }
+        if (frame->description() == kID3v2_MusicBrainz_AlbumArtistID) {
+          TStringToStdString(frame_field_list.back(), song->mutable_musicbrainz_album_artist_id());
+        }
+        if (frame->description() == kID3v2_MusicBrainz_ArtistID) {
+          TStringToStdString(frame_field_list.back(), song->mutable_musicbrainz_artist_id());
+        }
+        if (frame->description() == kID3v2_MusicBrainz_OriginalArtistID) {
+          TStringToStdString(frame_field_list.back(), song->mutable_musicbrainz_original_artist_id());
+        }
+        if (frame->description() == kID3v2_MusicBrainz_AlbumID) {
+          TStringToStdString(frame_field_list.back(), song->mutable_musicbrainz_album_id());
+        }
+        if (frame->description() == kID3v2_MusicBrainz_OriginalAlbumID) {
+          TStringToStdString(frame_field_list.back(), song->mutable_musicbrainz_original_album_id());
+        }
+        if (frame->description() == kID3v2_MusicBrainz_TrackID) {
+          TStringToStdString(frame_field_list.back(), song->mutable_musicbrainz_track_id());
+        }
+        if (frame->description() == kID3v2_MusicBrainz_DiscID) {
+          TStringToStdString(frame_field_list.back(), song->mutable_musicbrainz_disc_id());
+        }
+        if (frame->description() == kID3v2_MusicBrainz_ReleaseGroupID) {
+          TStringToStdString(frame_field_list.back(), song->mutable_musicbrainz_release_group_id());
+        }
+        if (frame->description() == kID3v2_MusicBrainz_WorkID) {
+          TStringToStdString(frame_field_list.back(), song->mutable_musicbrainz_work_id());
+        }
+      }
+    }
+  }
+
+}
+
 void TagReaderTagLib::ParseOggTag(const TagLib::Ogg::FieldListMap &map, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const {
 
   if (map.contains("COMPOSER")) TStringToStdString(map["COMPOSER"].front(), song->mutable_composer());
@@ -824,7 +834,7 @@ void TagReaderTagLib::SetVorbisComments(TagLib::Ogg::XiphComment *vorbis_comment
   vorbis_comment->addField("PERFORMER", StdStringToTaglibString(song.performer()), true);
   vorbis_comment->addField("GROUPING", StdStringToTaglibString(song.grouping()), true);
   vorbis_comment->addField("DISCNUMBER", QStringToTaglibString(song.disc() <= 0 ? QString() : QString::number(song.disc())), true);
-  vorbis_comment->addField("COMPILATION", QStringToTaglibString(song.compilation() ? "1" : QString()), true);
+  vorbis_comment->addField("COMPILATION", QStringToTaglibString(song.compilation() ? QStringLiteral("1") : QString()), true);
 
   // Try to be coherent, the two forms are used but the first one is preferred
 
@@ -849,19 +859,19 @@ bool TagReaderTagLib::SaveFile(const spb::tagreader::SaveFileRequest &request) c
 
   QStringList save_tags_options;
   if (save_tags) {
-    save_tags_options << "tags";
+    save_tags_options << QStringLiteral("tags");
   }
   if (save_playcount) {
-    save_tags_options << "playcount";
+    save_tags_options << QStringLiteral("playcount");
   }
   if (save_rating) {
-    save_tags_options << "rating";
+    save_tags_options << QStringLiteral("rating");
   }
   if (save_cover) {
-    save_tags_options << "embedded cover";
+    save_tags_options << QStringLiteral("embedded cover");
   }
 
-  qLog(Debug) << "Saving" << save_tags_options.join(", ") << "to" << filename;
+  qLog(Debug) << "Saving" << save_tags_options.join(QStringLiteral(", ")) << "to" << filename;
 
   const Cover cover = LoadCoverFromRequest(request);
 
@@ -943,14 +953,7 @@ bool TagReaderTagLib::SaveFile(const spb::tagreader::SaveFileRequest &request) c
     TagLib::ID3v2::Tag *tag = file_mpeg->ID3v2Tag(true);
     if (!tag) return false;
     if (save_tags) {
-      SetTextFrame("TPOS", song.disc() <= 0 ? QString() : QString::number(song.disc()), tag);
-      SetTextFrame("TCOM", song.composer().empty() ? std::string() : song.composer(), tag);
-      SetTextFrame("TIT1", song.grouping().empty() ? std::string() : song.grouping(), tag);
-      SetTextFrame("TOPE", song.performer().empty() ? std::string() : song.performer(), tag);
-      // Skip TPE1 (which is the artist) here because we already set it
-      SetTextFrame("TPE2", song.albumartist().empty() ? std::string() : song.albumartist(), tag);
-      SetTextFrame("TCMP", song.compilation() ? QString::number(1) : QString(), tag);
-      SetUnsyncLyricsFrame(song.lyrics().empty() ? std::string() : song.lyrics(), tag);
+      SaveID3v2Tag(tag, song);
     }
     if (save_playcount) {
       SetPlaycount(tag, song);
@@ -959,7 +962,7 @@ bool TagReaderTagLib::SaveFile(const spb::tagreader::SaveFileRequest &request) c
       SetRating(tag, song);
     }
     if (save_cover) {
-      SetEmbeddedArt(file_mpeg, tag, cover.data, cover.mime_type);
+      SetEmbeddedArt(tag, cover.data, cover.mime_type);
     }
   }
 
@@ -985,6 +988,22 @@ bool TagReaderTagLib::SaveFile(const spb::tagreader::SaveFileRequest &request) c
     }
   }
 
+  else if (TagLib::RIFF::WAV::File *file_wav = dynamic_cast<TagLib::RIFF::WAV::File*>(fileref->file())) {
+    TagLib::ID3v2::Tag *tag = file_wav->ID3v2Tag();
+    if (save_tags) {
+      SaveID3v2Tag(tag, song);
+    }
+    if (save_playcount) {
+      SetPlaycount(tag, song);
+    }
+    if (save_rating) {
+      SetRating(tag, song);
+    }
+    if (save_cover) {
+      SetEmbeddedArt(tag, cover.data, cover.mime_type);
+    }
+  }
+
   // Handle all the files which have VorbisComments (Ogg, OPUS, ...) in the same way;
   // apart, so we keep specific behavior for some formats by adding another "else if" block above.
   if (!is_flac) {
@@ -1016,6 +1035,19 @@ bool TagReaderTagLib::SaveFile(const spb::tagreader::SaveFileRequest &request) c
 
 }
 
+void TagReaderTagLib::SaveID3v2Tag(TagLib::ID3v2::Tag *tag, const spb::tagreader::SongMetadata &song) const {
+
+  SetTextFrame("TPOS", song.disc() <= 0 ? QString() : QString::number(song.disc()), tag);
+  SetTextFrame("TCOM", song.composer().empty() ? std::string() : song.composer(), tag);
+  SetTextFrame("TIT1", song.grouping().empty() ? std::string() : song.grouping(), tag);
+  SetTextFrame("TOPE", song.performer().empty() ? std::string() : song.performer(), tag);
+  // Skip TPE1 (which is the artist) here because we already set it
+  SetTextFrame("TPE2", song.albumartist().empty() ? std::string() : song.albumartist(), tag);
+  SetTextFrame("TCMP", song.compilation() ? QString::number(1) : QString(), tag);
+  SetUnsyncLyricsFrame(song.lyrics().empty() ? std::string() : song.lyrics(), tag);
+
+}
+
 void TagReaderTagLib::SaveAPETag(TagLib::APE::Tag *tag, const spb::tagreader::SongMetadata &song) const {
 
   tag->setItem("album artist", TagLib::APE::Item("album artist", TagLib::StringList(song.albumartist().c_str())));
@@ -1278,9 +1310,7 @@ void TagReaderTagLib::SetEmbeddedArt(TagLib::Ogg::XiphComment *xiph_comment, con
 
 }
 
-void TagReaderTagLib::SetEmbeddedArt(TagLib::MPEG::File *file_mp3, TagLib::ID3v2::Tag *tag, const QByteArray &data, const QString &mime_type) const {
-
-  (void)file_mp3;
+void TagReaderTagLib::SetEmbeddedArt(TagLib::ID3v2::Tag *tag, const QByteArray &data, const QString &mime_type) const {
 
   // Remove existing covers
   TagLib::ID3v2::FrameList apiclist = tag->frameListMap()["APIC"];
@@ -1311,10 +1341,10 @@ void TagReaderTagLib::SetEmbeddedArt(TagLib::MP4::File *aac_file, TagLib::MP4::T
   }
   else {
     TagLib::MP4::CoverArt::Format cover_format = TagLib::MP4::CoverArt::Format::JPEG;
-    if (mime_type == "image/jpeg") {
+    if (mime_type == QStringLiteral("image/jpeg")) {
       cover_format = TagLib::MP4::CoverArt::Format::JPEG;
     }
-    else if (mime_type == "image/png") {
+    else if (mime_type == QStringLiteral("image/png")) {
       cover_format = TagLib::MP4::CoverArt::Format::PNG;
     }
     else {
@@ -1360,7 +1390,7 @@ bool TagReaderTagLib::SaveEmbeddedArt(const spb::tagreader::SaveEmbeddedArtReque
   else if (TagLib::MPEG::File *file_mp3 = dynamic_cast<TagLib::MPEG::File*>(fileref.file())) {
     TagLib::ID3v2::Tag *tag = file_mp3->ID3v2Tag();
     if (!tag) return false;
-    SetEmbeddedArt(file_mp3, tag, cover.data, cover.mime_type);
+    SetEmbeddedArt(tag, cover.data, cover.mime_type);
   }
 
   // MP4/AAC
@@ -1427,7 +1457,7 @@ void TagReaderTagLib::SetPlaycount(TagLib::APE::Tag *tag, const spb::tagreader::
 
 void TagReaderTagLib::SetPlaycount(TagLib::ID3v2::Tag *tag, const spb::tagreader::SongMetadata &song) const {
 
-  SetUserTextFrame("FMPS_Playcount", QString::number(song.playcount()), tag);
+  SetUserTextFrame(QStringLiteral("FMPS_Playcount"), QString::number(song.playcount()), tag);
   TagLib::ID3v2::PopularimeterFrame *frame = GetPOPMFrameFromTag(tag);
   if (frame) {
     frame->setCounter(song.playcount());
@@ -1546,7 +1576,7 @@ void TagReaderTagLib::SetRating(TagLib::APE::Tag *tag, const spb::tagreader::Son
 
 void TagReaderTagLib::SetRating(TagLib::ID3v2::Tag *tag, const spb::tagreader::SongMetadata &song) const {
 
-  SetUserTextFrame("FMPS_Rating", QString::number(song.rating()), tag);
+  SetUserTextFrame(QStringLiteral("FMPS_Rating"), QString::number(song.rating()), tag);
   TagLib::ID3v2::PopularimeterFrame *frame = GetPOPMFrameFromTag(tag);
   if (frame) {
     frame->setRating(ConvertToPOPMRating(song.rating()));

ext/libstrawberry-tagreader/tagreadertaglib.h

@@ -68,10 +68,12 @@ class TagReaderTagLib : public TagReaderBase {
  private:
   spb::tagreader::SongMetadata_FileType GuessFileType(TagLib::FileRef *fileref) const;
 
+  void ParseID3v2Tag(TagLib::ID3v2::Tag *tag, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const;
   void ParseOggTag(const TagLib::Ogg::FieldListMap &map, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const;
   void ParseAPETag(const TagLib::APE::ItemListMap &map, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const;
 
   void SetVorbisComments(TagLib::Ogg::XiphComment *vorbis_comment, const spb::tagreader::SongMetadata &song) const;
+  void SaveID3v2Tag(TagLib::ID3v2::Tag *tag, const spb::tagreader::SongMetadata &song) const;
   void SaveAPETag(TagLib::APE::Tag *tag, const spb::tagreader::SongMetadata &song) const;
 
   void SetTextFrame(const char *id, const QString &value, TagLib::ID3v2::Tag *tag) const;
@@ -98,7 +100,7 @@ class TagReaderTagLib : public TagReaderBase {
 
   void SetEmbeddedArt(TagLib::FLAC::File *flac_file, TagLib::Ogg::XiphComment *xiph_comment, const QByteArray &data, const QString &mime_type) const;
   void SetEmbeddedArt(TagLib::Ogg::XiphComment *xiph_comment, const QByteArray &data, const QString &mime_type) const;
-  void SetEmbeddedArt(TagLib::MPEG::File *file_mp3, TagLib::ID3v2::Tag *tag, const QByteArray &data, const QString &mime_type) const;
+  void SetEmbeddedArt(TagLib::ID3v2::Tag *tag, const QByteArray &data, const QString &mime_type) const;
   void SetEmbeddedArt(TagLib::MP4::File *aac_file, TagLib::MP4::Tag *tag, const QByteArray &data, const QString &mime_type) const;
 
  private:

ext/strawberry-tagreader/tagreaderworker.cpp

@@ -62,7 +62,7 @@ bool TagReaderWorker::HandleMessage(const spb::tagreader::Message &message, spb:
     return success;
   }
   else if (message.has_read_file_request()) {
-    const QString filename = QString::fromUtf8(message.read_file_request().filename().data(), static_cast<qint64>(static_cast<qint64>(message.read_file_request().filename().size())));
+    const QString filename = QString::fromUtf8(message.read_file_request().filename().data(), static_cast<qint64>(message.read_file_request().filename().size()));
     bool success = reader->ReadFile(filename, reply.mutable_read_file_response()->mutable_metadata());
     return success;
   }
@@ -72,7 +72,7 @@ bool TagReaderWorker::HandleMessage(const spb::tagreader::Message &message, spb:
     return success;
   }
   else if (message.has_load_embedded_art_request()) {
-    const QString filename = QString::fromUtf8(message.load_embedded_art_request().filename().data(), static_cast<qint64>(static_cast<qint64>(message.load_embedded_art_request().filename().size())));
+    const QString filename = QString::fromUtf8(message.load_embedded_art_request().filename().data(), static_cast<qint64>(message.load_embedded_art_request().filename().size()));
     QByteArray data = reader->LoadEmbeddedArt(filename);
     reply.mutable_load_embedded_art_response()->set_data(data.constData(), data.size());
     return true;
@@ -83,7 +83,7 @@ bool TagReaderWorker::HandleMessage(const spb::tagreader::Message &message, spb:
     return success;
   }
   else if (message.has_save_song_playcount_to_file_request()) {
-    const QString filename = QString::fromUtf8(message.save_song_playcount_to_file_request().filename().data(), static_cast<qint64>(static_cast<qint64>(message.save_song_playcount_to_file_request().filename().size())));
+    const QString filename = QString::fromUtf8(message.save_song_playcount_to_file_request().filename().data(), static_cast<qint64>(message.save_song_playcount_to_file_request().filename().size()));
     bool success = reader->SaveSongPlaycountToFile(filename, message.save_song_playcount_to_file_request().metadata());
     reply.mutable_save_song_playcount_to_file_response()->set_success(success);
     return success;

src/CMakeLists.txt

@@ -24,6 +24,7 @@ set(SOURCES
   core/networktimeouts.cpp
   core/networkproxyfactory.cpp
   core/qtfslistener.cpp
+  core/settings.cpp
   core/settingsprovider.cpp
   core/signalchecker.cpp
   core/song.cpp
@@ -58,6 +59,7 @@ set(SOURCES
   utilities/coverutils.cpp
   utilities/screenutils.cpp
   utilities/searchparserutils.cpp
+  utilities/textencodingutils.cpp
 
   engine/enginebase.cpp
   engine/enginedevice.cpp
@@ -113,6 +115,7 @@ set(SOURCES
   playlist/playlisttabbar.cpp
   playlist/playlistundocommands.cpp
   playlist/playlistview.cpp
+  playlist/playlistproxystyle.cpp
   playlist/songloaderinserter.cpp
   playlist/songplaylistitem.cpp
   playlist/dynamicplaylistcontrols.cpp
@@ -170,6 +173,7 @@ set(SOURCES
   covermanager/qobuzcoverprovider.cpp
   covermanager/musixmatchcoverprovider.cpp
   covermanager/spotifycoverprovider.cpp
+  covermanager/opentidalcoverprovider.cpp
 
   lyrics/lyricsproviders.cpp
   lyrics/lyricsprovider.cpp
@@ -187,7 +191,7 @@ set(SOURCES
   lyrics/songlyricscomlyricsprovider.cpp
   lyrics/azlyricscomlyricsprovider.cpp
   lyrics/elyricsnetlyricsprovider.cpp
-  lyrics/lyricsmodecomlyricsprovider.cpp
+  lyrics/letraslyricsprovider.cpp
 
   providers/musixmatchprovider.cpp
 
@@ -195,6 +199,7 @@ set(SOURCES
   settings/settingspage.cpp
   settings/behavioursettingspage.cpp
   settings/collectionsettingspage.cpp
+  settings/collectionsettingsdirectorymodel.cpp
   settings/backendsettingspage.cpp
   settings/playlistsettingspage.cpp
   settings/scrobblersettingspage.cpp
@@ -305,6 +310,7 @@ set(HEADERS
   core/threadsafenetworkdiskcache.h
   core/networktimeouts.h
   core/qtfslistener.h
+  core/settings.h
   core/songloader.h
   core/tagreaderclient.h
   core/taskmanager.h
@@ -359,6 +365,7 @@ set(HEADERS
   playlist/playlistsequence.h
   playlist/playlisttabbar.h
   playlist/playlistview.h
+  playlist/playlistproxystyle.h
   playlist/playlistitemmimedata.h
   playlist/songloaderinserter.h
   playlist/songmimedata.h
@@ -414,6 +421,7 @@ set(HEADERS
   covermanager/qobuzcoverprovider.h
   covermanager/musixmatchcoverprovider.h
   covermanager/spotifycoverprovider.h
+  covermanager/opentidalcoverprovider.h
 
   lyrics/lyricsproviders.h
   lyrics/lyricsprovider.h
@@ -429,12 +437,13 @@ set(HEADERS
   lyrics/songlyricscomlyricsprovider.h
   lyrics/azlyricscomlyricsprovider.h
   lyrics/elyricsnetlyricsprovider.h
-  lyrics/lyricsmodecomlyricsprovider.h
+  lyrics/letraslyricsprovider.h
 
   settings/settingsdialog.h
   settings/settingspage.h
   settings/behavioursettingspage.h
   settings/collectionsettingspage.h
+  settings/collectionsettingsdirectorymodel.h
   settings/backendsettingspage.h
   settings/playlistsettingspage.h
   settings/scrobblersettingspage.h
@@ -484,6 +493,7 @@ set(HEADERS
   widgets/qsearchfield.h
   widgets/ratingwidget.h
   widgets/forcescrollperpixel.h
+  widgets/resizabletextedit.h
 
   osd/osdbase.h
   osd/osdpretty.h
@@ -848,7 +858,7 @@ optional_source(WIN32
   HEADERS
     core/windows7thumbbar.h
 )
-optional_source(MSVC SOURCES engine/uwpdevicefinder.cpp)
+optional_source(MSVC SOURCES engine/uwpdevicefinder.cpp engine/asiodevicefinder.cpp)
 
 optional_source(HAVE_SUBSONIC
   SOURCES
@@ -986,14 +996,9 @@ link_directories(
   ${SQLITE_LIBRARY_DIRS}
   ${PROTOBUF_LIBRARY_DIRS}
   ${SINGLEAPPLICATION_LIBRARY_DIRS}
+  ${ICU_LIBRARY_DIRS}
 )
 
-if(HAVE_ICU)
-  link_directories(${ICU_LIBRARY_DIRS})
-else()
-  link_directories(${Iconv_LIBRARY_DIRS})
-endif()
-
 if(HAVE_ALSA)
   link_directories(${ALSA_LIBRARY_DIRS})
 endif()
@@ -1077,6 +1082,7 @@ target_include_directories(strawberry_lib SYSTEM PUBLIC
   ${GOBJECT_INCLUDE_DIRS}
   ${SQLITE_INCLUDE_DIRS}
   ${PROTOBUF_INCLUDE_DIRS}
+  ${ICU_INCLUDE_DIRS}
 )
 
 if(HAVE_QPA_QPLATFORMNATIVEINTERFACE_H)
@@ -1099,6 +1105,7 @@ target_link_libraries(strawberry_lib PUBLIC
   ${GLIB_LIBRARIES}
   ${GOBJECT_LIBRARIES}
   ${SQLITE_LIBRARIES}
+  ${ICU_LIBRARIES}
   Qt${QT_VERSION_MAJOR}::Core
   Qt${QT_VERSION_MAJOR}::Concurrent
   Qt${QT_VERSION_MAJOR}::Gui
@@ -1119,17 +1126,6 @@ if(HAVE_X11_GLOBALSHORTCUTS AND HAVE_X11EXTRAS)
   target_link_libraries(strawberry_lib PUBLIC Qt${QT_VERSION_MAJOR}::X11Extras)
 endif()
 
-if(HAVE_ICU)
-  target_include_directories(strawberry_lib SYSTEM PRIVATE ${ICU_INCLUDE_DIRS})
-  target_link_libraries(strawberry_lib PRIVATE ${ICU_LIBRARIES})
-else()
-  if(FREEBSD AND NOT Iconv_LIBRARIES)
-    set(Iconv_LIBRARIES iconv)
-  endif()
-  target_include_directories(strawberry_lib SYSTEM PRIVATE ${Iconv_INCLUDE_DIRS})
-  target_link_libraries(strawberry_lib PRIVATE ${Iconv_LIBRARIES})
-endif()
-
 if(HAVE_ALSA)
   target_include_directories(strawberry_lib SYSTEM PRIVATE ${ALSA_INCLUDE_DIRS})
   target_link_libraries(strawberry_lib PRIVATE ${ALSA_LIBRARIES})

src/analyzer/analyzerbase.cpp

@@ -108,7 +108,7 @@ void AnalyzerBase::paintEvent(QPaintEvent *e) {
   p.fillRect(e->rect(), palette().color(QPalette::Window));
 
   switch (engine_->state()) {
-    case EngineBase::State::Playing: {
+    case EngineBase::State::Playing:{
       const EngineBase::Scope &thescope = engine_->scope(timeout_);
       int i = 0;
 

src/analyzer/analyzercontainer.cpp

@@ -44,6 +44,7 @@
 
 #include "core/logging.h"
 #include "core/shared_ptr.h"
+#include "core/settings.h"
 #include "engine/enginebase.h"
 
 using namespace std::chrono_literals;
@@ -178,9 +179,9 @@ void AnalyzerContainer::ChangeFramerate(int new_framerate) {
 
 void AnalyzerContainer::Load() {
 
-  QSettings s;
+  Settings s;
   s.beginGroup(kSettingsGroup);
-  QString type = s.value("type", "BlockAnalyzer").toString();
+  QString type = s.value("type", QStringLiteral("BlockAnalyzer")).toString();
   current_framerate_ = s.value(kSettingsFramerate, kMediumFramerate).toInt();
   s.endGroup();
 
@@ -191,7 +192,7 @@ void AnalyzerContainer::Load() {
   }
   else {
     for (int i = 0; i < analyzer_types_.count(); ++i) {
-      if (type == analyzer_types_[i]->className()) {
+      if (type == QString::fromLatin1(analyzer_types_[i]->className())) {
         ChangeAnalyzer(i);
         actions_[i]->setChecked(true);
         break;
@@ -215,7 +216,7 @@ void AnalyzerContainer::SaveFramerate(const int framerate) {
 
   // For now, framerate is common for all analyzers. Maybe each analyzer should have its own framerate?
   current_framerate_ = framerate;
-  QSettings s;
+  Settings s;
   s.beginGroup(kSettingsGroup);
   s.setValue(kSettingsFramerate, current_framerate_);
   s.endGroup();
@@ -224,9 +225,9 @@ void AnalyzerContainer::SaveFramerate(const int framerate) {
 
 void AnalyzerContainer::Save() {
 
-  QSettings s;
+  Settings s;
   s.beginGroup(kSettingsGroup);
-  s.setValue("type", current_analyzer_ ? current_analyzer_->metaObject()->className() : QVariant());
+  s.setValue("type", current_analyzer_ ? QString::fromLatin1(current_analyzer_->metaObject()->className()) : QVariant());
   s.endGroup();
 
 }

src/analyzer/blockanalyzer.cpp

@@ -266,12 +266,12 @@ QColor ensureContrast(const QColor &bg, const QColor &fg, int amount) {
 
   // value is the best measure of contrast
   // if there is enough difference in value already, return fg unchanged
-  if (dv > static_cast<int>(amount)) return fg;
+  if (dv > amount) return fg;
 
   int ds = abs(bs - fs);
 
   // saturation is good enough too. But not as good. TODO adapt this a little
-  if (ds > static_cast<int>(amount)) return fg;
+  if (ds > amount) return fg;
 
   int dh = abs(bh - fh);
 
@@ -294,7 +294,7 @@ QColor ensureContrast(const QColor &bg, const QColor &fg, int amount) {
     // low saturation on a low saturation is sad
     const int tmp = 50 - fs;
     fs = 50;
-    if (static_cast<int>(amount) > tmp) {
+    if (amount > tmp) {
       amount -= tmp;
     }
     else {
@@ -310,25 +310,25 @@ QColor ensureContrast(const QColor &bg, const QColor &fg, int amount) {
     if (amount > 0) adjustToLimits(bs, fs, amount);
 
     // see if we need to adjust the hue
-    if (static_cast<int>(amount) > 0)
-      fh += static_cast<int>(amount);  // cycles around;
+    if (amount > 0)
+      fh += amount;  // cycles around;
 
     return QColor::fromHsv(fh, fs, fv);
   }
 
-  if (fv > bv && bv > static_cast<int>(amount)) {
-    return QColor::fromHsv(fh, fs, bv - static_cast<int>(amount));
+  if (fv > bv && bv > amount) {
+    return QColor::fromHsv(fh, fs, bv - amount);
   }
 
-  if (fv < bv && fv > static_cast<int>(amount)) {
+  if (fv < bv && fv > amount) {
     return QColor::fromHsv(fh, fs, fv - amount);
   }
 
-  if (fv > bv && (255 - fv > static_cast<int>(amount))) {
+  if (fv > bv && (255 - fv > amount)) {
     return QColor::fromHsv(fh, fs, fv + amount);
   }
 
-  if (fv < bv && (255 - bv > static_cast<int>(amount))) {
+  if (fv < bv && (255 - bv > amount)) {
     return QColor::fromHsv(fh, fs, bv + amount);
   }
 

src/analyzer/boomanalyzer.cpp

@@ -78,7 +78,7 @@ void BoomAnalyzer::resizeEvent(QResizeEvent *e) {
   bands_ = qMin(static_cast<int>(static_cast<double>(width() + 1) / (kColumnWidth + 1)) + 1, kMaxBandCount);
   scope_.resize(bands_);
 
-  F_ = static_cast<double>(HEIGHT) / (log10(256) * static_cast<double>(1.1) /*<- max. amplitude*/);
+  F_ = static_cast<double>(HEIGHT) / (log10(256) * 1.1 /*<- max. amplitude*/);
 
   barPixmap_ = QPixmap(kColumnWidth - 2, HEIGHT);
   canvas_ = QPixmap(size());

src/analyzer/fht.cpp

@@ -28,7 +28,7 @@
 #include <QVector>
 #include <QtMath>
 
-FHT::FHT(uint n) : num_((n < 3) ? 0 : 1 << n), exp2_((n < 3) ? static_cast<int>(-1) : static_cast<int>(n)) {
+FHT::FHT(uint n) : num_((n < 3) ? 0 : 1 << n), exp2_((n < 3) ? -1 : static_cast<int>(n)) {
 
   if (n > 3) {
     buf_vector_.resize(num_);

src/analyzer/rainbowanalyzer.cpp

@@ -65,8 +65,8 @@ RainbowAnalyzer::RainbowAnalyzer(const RainbowType rbtype, QWidget *parent)
       background_brush_(QColor(0x0f, 0x43, 0x73)) {
 
   rainbowtype = rbtype;
-  cat_dash_[0] = QPixmap(":/pictures/nyancat.png");
-  cat_dash_[1] = QPixmap(":/pictures/rainbowdash.png");
+  cat_dash_[0] = QPixmap(QStringLiteral(":/pictures/nyancat.png"));
+  cat_dash_[1] = QPixmap(QStringLiteral(":/pictures/rainbowdash.png"));
   memset(history_, 0, sizeof(history_));
 
   for (int i = 0; i < kRainbowBands; ++i) {

src/collection/collection.cpp

@@ -37,6 +37,7 @@
 #include "core/thread.h"
 #include "core/song.h"
 #include "core/logging.h"
+#include "core/settings.h"
 #include "utilities/threadutils.h"
 #include "collection.h"
 #include "collectionwatcher.h"
@@ -45,7 +46,6 @@
 #include "scrobbler/lastfmimport.h"
 #include "settings/collectionsettingspage.h"
 
-using std::make_unique;
 using std::make_shared;
 
 const char *SCollection::kSongsTable = "songs";
@@ -70,7 +70,7 @@ SCollection::SCollection(Application *app, QObject *parent)
   backend()->moveToThread(app->database()->thread());
   qLog(Debug) << &*backend_ << "moved to thread" << app->database()->thread();
 
-  backend_->Init(app->database(), app->task_manager(), Song::Source::Collection, kSongsTable, kFtsTable, kDirsTable, kSubdirsTable);
+  backend_->Init(app->database(), app->task_manager(), Song::Source::Collection, QLatin1String(kSongsTable), QLatin1String(kFtsTable), QLatin1String(kDirsTable), QLatin1String(kSubdirsTable));
 
   model_ = new CollectionModel(backend_, app_, this);
 
@@ -93,14 +93,14 @@ SCollection::~SCollection() {
 
 void SCollection::Init() {
 
-  watcher_ = make_unique<CollectionWatcher>(Song::Source::Collection);
+  watcher_ = new CollectionWatcher(Song::Source::Collection);
   watcher_thread_ = new Thread(this);
 
   watcher_thread_->SetIoPriority(Utilities::IoPriority::IOPRIO_CLASS_IDLE);
 
   watcher_->moveToThread(watcher_thread_);
 
-  qLog(Debug) << &*watcher_ << "moved to thread" << watcher_thread_;
+  qLog(Debug) << watcher_ << "moved to thread" << watcher_thread_;
 
   watcher_thread_->start(QThread::IdlePriority);
 
@@ -108,20 +108,20 @@ void SCollection::Init() {
   watcher_->set_task_manager(app_->task_manager());
 
   QObject::connect(&*backend_, &CollectionBackend::Error, this, &SCollection::Error);
-  QObject::connect(&*backend_, &CollectionBackend::DirectoryDiscovered, &*watcher_, &CollectionWatcher::AddDirectory);
-  QObject::connect(&*backend_, &CollectionBackend::DirectoryDeleted, &*watcher_, &CollectionWatcher::RemoveDirectory);
+  QObject::connect(&*backend_, &CollectionBackend::DirectoryAdded, watcher_, &CollectionWatcher::AddDirectory);
+  QObject::connect(&*backend_, &CollectionBackend::DirectoryDeleted, watcher_, &CollectionWatcher::RemoveDirectory);
   QObject::connect(&*backend_, &CollectionBackend::SongsRatingChanged, this, &SCollection::SongsRatingChanged);
   QObject::connect(&*backend_, &CollectionBackend::SongsStatisticsChanged, this, &SCollection::SongsPlaycountChanged);
 
-  QObject::connect(&*watcher_, &CollectionWatcher::NewOrUpdatedSongs, &*backend_, &CollectionBackend::AddOrUpdateSongs);
-  QObject::connect(&*watcher_, &CollectionWatcher::SongsMTimeUpdated, &*backend_, &CollectionBackend::UpdateMTimesOnly);
-  QObject::connect(&*watcher_, &CollectionWatcher::SongsDeleted, &*backend_, &CollectionBackend::DeleteSongs);
-  QObject::connect(&*watcher_, &CollectionWatcher::SongsUnavailable, &*backend_, &CollectionBackend::MarkSongsUnavailable);
-  QObject::connect(&*watcher_, &CollectionWatcher::SongsReadded, &*backend_, &CollectionBackend::MarkSongsUnavailable);
-  QObject::connect(&*watcher_, &CollectionWatcher::SubdirsDiscovered, &*backend_, &CollectionBackend::AddOrUpdateSubdirs);
-  QObject::connect(&*watcher_, &CollectionWatcher::SubdirsMTimeUpdated, &*backend_, &CollectionBackend::AddOrUpdateSubdirs);
-  QObject::connect(&*watcher_, &CollectionWatcher::CompilationsNeedUpdating, &*backend_, &CollectionBackend::CompilationsNeedUpdating);
-  QObject::connect(&*watcher_, &CollectionWatcher::UpdateLastSeen, &*backend_, &CollectionBackend::UpdateLastSeen);
+  QObject::connect(watcher_, &CollectionWatcher::NewOrUpdatedSongs, &*backend_, &CollectionBackend::AddOrUpdateSongs);
+  QObject::connect(watcher_, &CollectionWatcher::SongsMTimeUpdated, &*backend_, &CollectionBackend::UpdateMTimesOnly);
+  QObject::connect(watcher_, &CollectionWatcher::SongsDeleted, &*backend_, &CollectionBackend::DeleteSongs);
+  QObject::connect(watcher_, &CollectionWatcher::SongsUnavailable, &*backend_, &CollectionBackend::MarkSongsUnavailable);
+  QObject::connect(watcher_, &CollectionWatcher::SongsReadded, &*backend_, &CollectionBackend::MarkSongsUnavailable);
+  QObject::connect(watcher_, &CollectionWatcher::SubdirsDiscovered, &*backend_, &CollectionBackend::AddOrUpdateSubdirs);
+  QObject::connect(watcher_, &CollectionWatcher::SubdirsMTimeUpdated, &*backend_, &CollectionBackend::AddOrUpdateSubdirs);
+  QObject::connect(watcher_, &CollectionWatcher::CompilationsNeedUpdating, &*backend_, &CollectionBackend::CompilationsNeedUpdating);
+  QObject::connect(watcher_, &CollectionWatcher::UpdateLastSeen, &*backend_, &CollectionBackend::UpdateLastSeen);
 
   QObject::connect(&*app_->lastfm_import(), &LastFMImport::UpdateLastPlayed, &*backend_, &CollectionBackend::UpdateLastPlayed);
   QObject::connect(&*app_->lastfm_import(), &LastFMImport::UpdatePlayCount, &*backend_, &CollectionBackend::UpdatePlayCount);
@@ -133,13 +133,13 @@ void SCollection::Init() {
 
 void SCollection::Exit() {
 
-  wait_for_exit_ << &*backend_ << &*watcher_;
+  wait_for_exit_ << &*backend_ << watcher_;
 
-  QObject::disconnect(&*backend_, nullptr, &*watcher_, nullptr);
-  QObject::disconnect(&*watcher_, nullptr, &*backend_, nullptr);
+  QObject::disconnect(&*backend_, nullptr, watcher_, nullptr);
+  QObject::disconnect(watcher_, nullptr, &*backend_, nullptr);
 
   QObject::connect(&*backend_, &CollectionBackend::ExitFinished, this, &SCollection::ExitReceived);
-  QObject::connect(&*watcher_, &CollectionWatcher::ExitFinished, this, &SCollection::ExitReceived);
+  QObject::connect(watcher_, &CollectionWatcher::ExitFinished, this, &SCollection::ExitReceived);
   backend_->ExitAsync();
   watcher_->Abort();
   watcher_->ExitAsync();
@@ -180,7 +180,7 @@ void SCollection::ReloadSettings() {
   watcher_->ReloadSettingsAsync();
   model_->ReloadSettings();
 
-  QSettings s;
+  Settings s;
   s.beginGroup(CollectionSettingsPage::kSettingsGroup);
   save_playcounts_to_files_ = s.value("save_playcounts", false).toBool();
   save_ratings_to_files_ = s.value("save_ratings", false).toBool();

src/collection/collection.h

@@ -29,7 +29,6 @@
 #include <QHash>
 #include <QString>
 
-#include "core/scoped_ptr.h"
 #include "core/shared_ptr.h"
 #include "core/song.h"
 
@@ -91,7 +90,7 @@ class SCollection : public QObject {
   SharedPtr<CollectionBackend> backend_;
   CollectionModel *model_;
 
-  ScopedPtr<CollectionWatcher> watcher_;
+  CollectionWatcher *watcher_;
   Thread *watcher_thread_;
   QThread *original_thread_;
 

src/collection/collectionbackend.h

@@ -2,7 +2,7 @@
  * Strawberry Music Player
  * This file was part of Clementine.
  * Copyright 2010, David Sansome <me@davidsansome.com>
- * Copyright 2018-2023, Jonas Kvinge <jonas@jkvinge.net>
+ * Copyright 2018-2024, Jonas Kvinge <jonas@jkvinge.net>
  *
  * Strawberry is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -130,9 +130,10 @@ class CollectionBackendInterface : public QObject {
   // Returns a section of a song with the given filename and beginning. If the section is not present in collection, returns invalid song.
   // Using default beginning value is suitable when searching for single-section songs.
   virtual Song GetSongByUrl(const QUrl &url, const qint64 beginning = 0) = 0;
+  virtual Song GetSongByUrlAndTrack(const QUrl &url, const int track) = 0;
 
-  virtual void AddDirectory(const QString &path) = 0;
-  virtual void RemoveDirectory(const CollectionDirectory &dir) = 0;
+  virtual void AddDirectoryAsync(const QString &path) = 0;
+  virtual void RemoveDirectoryAsync(const CollectionDirectory &dir) = 0;
 };
 
 class CollectionBackend : public CollectionBackendInterface {
@@ -203,9 +204,10 @@ class CollectionBackend : public CollectionBackendInterface {
 
   SongList GetSongsByUrl(const QUrl &url, const bool unavailable = false) override;
   Song GetSongByUrl(const QUrl &url, qint64 beginning = 0) override;
+  Song GetSongByUrlAndTrack(const QUrl &url, const int track) override;
 
-  void AddDirectory(const QString &path) override;
-  void RemoveDirectory(const CollectionDirectory &dir) override;
+  void AddDirectoryAsync(const QString &path) override;
+  void RemoveDirectoryAsync(const CollectionDirectory &dir) override;
 
   bool ExecCollectionQuery(CollectionQuery *query, SongList &songs);
   bool ExecCollectionQuery(CollectionQuery *query, SongMap &songs);
@@ -237,6 +239,8 @@ class CollectionBackend : public CollectionBackendInterface {
   void UpdateTotalSongCount();
   void UpdateTotalArtistCount();
   void UpdateTotalAlbumCount();
+  void AddDirectory(const QString &path);
+  void RemoveDirectory(const CollectionDirectory &dir);
   void AddOrUpdateSongs(const SongList &songs);
   void UpdateSongsBySongID(const SongMap &new_songs);
   void UpdateMTimesOnly(const SongList &songs);
@@ -248,7 +252,7 @@ class CollectionBackend : public CollectionBackendInterface {
   void UpdateManualAlbumArt(const QString &effective_albumartist, const QString &album, const QUrl &art_manual);
   void UnsetAlbumArt(const QString &effective_albumartist, const QString &album);
   void ClearAlbumArt(const QString &effective_albumartist, const QString &album, const bool art_unset);
-  void ForceCompilation(const QString &album, const QList<QString> &artists, const bool on);
+  void ForceCompilation(const QString &album, const QStringList &artists, const bool on);
   void IncrementPlayCount(const int id);
   void IncrementSkipCount(const int id, const float progress);
   void ResetPlayStatistics(const int id, const bool save_tags = false);
@@ -268,7 +272,7 @@ class CollectionBackend : public CollectionBackendInterface {
   void ExpireSongs(const int directory_id, const int expire_unavailable_songs_days);
 
  signals:
-  void DirectoryDiscovered(const CollectionDirectory &dir, const CollectionSubdirectoryList &subdir);
+  void DirectoryAdded(const CollectionDirectory &dir, const CollectionSubdirectoryList &subdir);
   void DirectoryDeleted(const CollectionDirectory &dir);
 
   void SongsDiscovered(const SongList &songs);

src/collection/collectiondirectorymodel.cpp

@@ -2,6 +2,7 @@
  * Strawberry Music Player
  * This file was part of Clementine.
  * Copyright 2010, David Sansome <me@davidsansome.com>
+ * Copyright 2018-2024, Jonas Kvinge <jonas@jkvinge.net>
  *
  * Strawberry is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -41,15 +42,18 @@ using std::make_shared;
 
 CollectionDirectoryModel::CollectionDirectoryModel(SharedPtr<CollectionBackend> backend, QObject *parent)
     : QStandardItemModel(parent),
-      dir_icon_(IconLoader::Load("document-open-folder")),
+      dir_icon_(IconLoader::Load(QStringLiteral("document-open-folder"))),
       backend_(backend) {
 
-  QObject::connect(&*backend_, &CollectionBackend::DirectoryDiscovered, this, &CollectionDirectoryModel::DirectoryDiscovered);
-  QObject::connect(&*backend_, &CollectionBackend::DirectoryDeleted, this, &CollectionDirectoryModel::DirectoryDeleted);
+  QObject::connect(&*backend_, &CollectionBackend::DirectoryAdded, this, &CollectionDirectoryModel::AddDirectory);
+  QObject::connect(&*backend_, &CollectionBackend::DirectoryDeleted, this, &CollectionDirectoryModel::RemoveDirectory);
 
 }
 
-void CollectionDirectoryModel::DirectoryDiscovered(const CollectionDirectory &dir) {
+void CollectionDirectoryModel::AddDirectory(const CollectionDirectory &dir) {
+
+  directories_.insert(dir.id, dir);
+  paths_.append(dir.path);
 
   QStandardItem *item = new QStandardItem(dir.path);
   item->setData(dir.id, kIdRole);
@@ -59,7 +63,10 @@ void CollectionDirectoryModel::DirectoryDiscovered(const CollectionDirectory &di
 
 }
 
-void CollectionDirectoryModel::DirectoryDeleted(const CollectionDirectory &dir) {
+void CollectionDirectoryModel::RemoveDirectory(const CollectionDirectory &dir) {
+
+  directories_.remove(dir.id);
+  paths_.removeAll(dir.path);
 
   for (int i = 0; i < rowCount(); ++i) {
     if (item(i, 0)->data(kIdRole).toInt() == dir.id) {
@@ -71,26 +78,6 @@ void CollectionDirectoryModel::DirectoryDeleted(const CollectionDirectory &dir)
 
 }
 
-void CollectionDirectoryModel::AddDirectory(const QString &path) {
-
-  if (!backend_) return;
-
-  backend_->AddDirectory(path);
-
-}
-
-void CollectionDirectoryModel::RemoveDirectory(const QModelIndex &idx) {
-
-  if (!backend_ || !idx.isValid()) return;
-
-  CollectionDirectory dir;
-  dir.path = idx.data().toString();
-  dir.id = idx.data(kIdRole).toInt();
-
-  backend_->RemoveDirectory(dir);
-
-}
-
 QVariant CollectionDirectoryModel::data(const QModelIndex &idx, int role) const {
 
   switch (role) {

src/collection/collectiondirectorymodel.h

@@ -2,6 +2,7 @@
  * Strawberry Music Player
  * This file was part of Clementine.
  * Copyright 2010, David Sansome <me@davidsansome.com>
+ * Copyright 2018-2024, Jonas Kvinge <jonas@jkvinge.net>
  *
  * Strawberry is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,15 +27,17 @@
 #include <QObject>
 #include <QStandardItemModel>
 #include <QList>
+#include <QMap>
 #include <QVariant>
 #include <QString>
+#include <QStringList>
 #include <QIcon>
 
 #include "core/shared_ptr.h"
+#include "collectiondirectory.h"
 
 class QModelIndex;
 
-struct CollectionDirectory;
 class CollectionBackend;
 class MusicStorage;
 
@@ -44,22 +47,24 @@ class CollectionDirectoryModel : public QStandardItemModel {
  public:
   explicit CollectionDirectoryModel(SharedPtr<CollectionBackend> collection_backend, QObject *parent = nullptr);
 
-  // To be called by GUIs
-  void AddDirectory(const QString &path);
-  void RemoveDirectory(const QModelIndex &idx);
-
   QVariant data(const QModelIndex &idx, int role) const override;
 
+  SharedPtr<CollectionBackend> backend() const { return backend_; }
+
+  QMap<int, CollectionDirectory> directories() const { return directories_; }
+  QStringList paths() const { return paths_; }
+
  private slots:
-  // To be called by the backend
-  void DirectoryDiscovered(const CollectionDirectory &directories);
-  void DirectoryDeleted(const CollectionDirectory &directories);
+  void AddDirectory(const CollectionDirectory &directory);
+  void RemoveDirectory(const CollectionDirectory &directory);
 
  private:
   static const int kIdRole = Qt::UserRole + 1;
 
   QIcon dir_icon_;
   SharedPtr<CollectionBackend> backend_;
+  QMap<int, CollectionDirectory> directories_;
+  QStringList paths_;
   QList<SharedPtr<MusicStorage>> storage_;
 };
 

src/collection/collectionfilteroptions.cpp

@@ -29,7 +29,7 @@ CollectionFilterOptions::CollectionFilterOptions() : filter_mode_(FilterMode::Al
 bool CollectionFilterOptions::Matches(const Song &song) const {
 
   if (max_age_ != -1) {
-    const qint64 cutoff = QDateTime::currentDateTime().toSecsSinceEpoch() - max_age_;
+    const qint64 cutoff = QDateTime::currentSecsSinceEpoch() - max_age_;
     if (song.ctime() <= cutoff) return false;
   }
 

src/collection/collectionfilterwidget.cpp

@@ -21,6 +21,7 @@
 
 #include "config.h"
 
+#include <utility>
 #include <memory>
 
 #include <QApplication>
@@ -46,6 +47,7 @@
 #include "core/iconloader.h"
 #include "core/song.h"
 #include "core/logging.h"
+#include "core/settings.h"
 #include "collectionfilteroptions.h"
 #include "collectionmodel.h"
 #include "savedgroupingmanager.h"
@@ -72,34 +74,34 @@ CollectionFilterWidget::CollectionFilterWidget(QWidget *parent)
 
   ui_->setupUi(this);
 
-  QString available_fields = Song::kFtsColumns.join(", ").replace(QRegularExpression("\\bfts"), "");
-  available_fields += QString(", ") + Song::kNumericalColumns.join(", ");
+  QString available_fields = Song::kFtsColumns.join(QStringLiteral(", ")).replace(QRegularExpression(QStringLiteral("\\bfts")), QLatin1String(""));
+  available_fields += QStringLiteral(", ") + Song::kNumericalColumns.join(QStringLiteral(", "));
 
   ui_->search_field->setToolTip(
-    QString("<html><head/><body><p>") +
+    QStringLiteral("<html><head/><body><p>") +
     tr("Prefix a word with a field name to limit the search to that field, e.g.:") +
-    QString(" ") +
-    QString("<span style=\"font-weight:600;\">") +
+    QStringLiteral(" ") +
+    QStringLiteral("<span style=\"font-weight:600;\">") +
     tr("artist") +
-    QString(":</span><span style=\"font-style:italic;\">Strawbs</span> ") +
-    tr("searches the collection for all artists that contain the word %1. ").arg("Strawbs") +
-    QString("</p><p>") +
+    QStringLiteral(":</span><span style=\"font-style:italic;\">Strawbs</span> ") +
+    tr("searches the collection for all artists that contain the word %1. ").arg(QStringLiteral("Strawbs")) +
+    QStringLiteral("</p><p>") +
     tr("Search terms for numerical fields can be prefixed with %1 or %2 to refine the search, e.g.: ")
-      .arg(" =, !=, &lt;, &gt;, &lt;=", "&gt;=") +
-    QString("<span style=\"font-weight:600;\">") +
+      .arg(QStringLiteral(" =, !=, &lt;, &gt;, &lt;="), QStringLiteral("&gt;=")) +
+    QStringLiteral("<span style=\"font-weight:600;\">") +
     tr("rating") +
-    QString("</span>") +
-    QString(":>=") +
-    QString("<span style=\"font-weight:italic;\">4</span>") +
+    QStringLiteral("</span>") +
+    QStringLiteral(":>=") +
+    QStringLiteral("<span style=\"font-weight:italic;\">4</span>") +
 
-    QString("</p><p><span style=\"font-weight:600;\">") +
+    QStringLiteral("</p><p><span style=\"font-weight:600;\">") +
     tr("Available fields") +
-    QString(": ") +
-    QString("</span>") +
-    QString("<span style=\"font-style:italic;\">") +
+    QStringLiteral(": ") +
+    QStringLiteral("</span>") +
+    QStringLiteral("<span style=\"font-style:italic;\">") +
     available_fields +
-    QString("</span>.") +
-    QString("</p></body></html>")
+    QStringLiteral("</span>.") +
+    QStringLiteral("</p></body></html>")
   );
 
   QObject::connect(ui_->search_field, &QSearchField::returnPressed, this, &CollectionFilterWidget::ReturnPressed);
@@ -109,7 +111,7 @@ CollectionFilterWidget::CollectionFilterWidget(QWidget *parent)
   filter_delay_->setSingleShot(true);
 
   // Icons
-  ui_->options->setIcon(IconLoader::Load("configure"));
+  ui_->options->setIcon(IconLoader::Load(QStringLiteral("configure")));
 
   // Filter by age
   QActionGroup *filter_age_group = new QActionGroup(this);
@@ -160,7 +162,7 @@ void CollectionFilterWidget::Init(CollectionModel *model) {
     QObject::disconnect(model_, nullptr, this, nullptr);
     QObject::disconnect(model_, nullptr, group_by_dialog_, nullptr);
     QObject::disconnect(group_by_dialog_, nullptr, model_, nullptr);
-    QList<QAction*> filter_ages = filter_ages_.keys();
+    const QList<QAction*> filter_ages = filter_ages_.keys();
     for (QAction *action : filter_ages) {
       QObject::disconnect(action, &QAction::triggered, model_, nullptr);
     }
@@ -173,7 +175,7 @@ void CollectionFilterWidget::Init(CollectionModel *model) {
   QObject::connect(model_, &CollectionModel::GroupingChanged, this, &CollectionFilterWidget::GroupingChanged);
   QObject::connect(group_by_dialog_, &GroupByDialog::Accepted, model_, &CollectionModel::SetGroupBy);
 
-  QList<QAction*> filter_ages = filter_ages_.keys();
+  const QList<QAction*> filter_ages = filter_ages_.keys();
   for (QAction *action : filter_ages) {
     int age = filter_ages_[action];
     QObject::connect(action, &QAction::triggered, this, [this, age]() { model_->SetFilterAge(age); } );
@@ -181,7 +183,7 @@ void CollectionFilterWidget::Init(CollectionModel *model) {
 
   // Load settings
   if (!settings_group_.isEmpty()) {
-    QSettings s;
+    Settings s;
     s.beginGroup(settings_group_);
     int version = 0;
     if (s.contains(group_by_version())) version = s.value(group_by_version(), 0).toInt();
@@ -217,7 +219,7 @@ void CollectionFilterWidget::SetSettingsPrefix(const QString &prefix) {
 
 void CollectionFilterWidget::ReloadSettings() {
 
-  QSettings s;
+  Settings s;
   s.beginGroup(AppearanceSettingsPage::kSettingsGroup);
   int iconsize = s.value(AppearanceSettingsPage::kIconSizeConfigureButtons, 20).toInt();
   s.endGroup();
@@ -229,10 +231,10 @@ void CollectionFilterWidget::ReloadSettings() {
 QString CollectionFilterWidget::group_by_version() const {
 
   if (settings_prefix_.isEmpty()) {
-    return "group_by_version";
+    return QStringLiteral("group_by_version");
   }
   else {
-    return QString("%1_group_by_version").arg(settings_prefix_);
+    return QStringLiteral("%1_group_by_version").arg(settings_prefix_);
   }
 
 }
@@ -240,10 +242,10 @@ QString CollectionFilterWidget::group_by_version() const {
 QString CollectionFilterWidget::group_by_key() const {
 
   if (settings_prefix_.isEmpty()) {
-    return "group_by";
+    return QStringLiteral("group_by");
   }
   else {
-    return QString("%1_group_by").arg(settings_prefix_);
+    return QStringLiteral("%1_group_by").arg(settings_prefix_);
   }
 
 }
@@ -253,10 +255,10 @@ QString CollectionFilterWidget::group_by_key(const int number) const { return gr
 QString CollectionFilterWidget::separate_albums_by_grouping_key() const {
 
   if (settings_prefix_.isEmpty()) {
-    return "separate_albums_by_grouping";
+    return QStringLiteral("separate_albums_by_grouping");
   }
   else {
-    return QString("%1_separate_albums_by_grouping").arg(settings_prefix_);
+    return QStringLiteral("%1_separate_albums_by_grouping").arg(settings_prefix_);
   }
 
 }
@@ -306,13 +308,13 @@ QActionGroup *CollectionFilterWidget::CreateGroupByActions(const QString &saved_
   ret->addAction(sep1);
 
   // Read saved groupings
-  QSettings s;
+  Settings s;
   s.beginGroup(saved_groupings_settings_group);
   int version = s.value("version").toInt();
   if (version == 1) {
     QStringList saved = s.childKeys();
     for (int i = 0; i < saved.size(); ++i) {
-      if (saved.at(i) == "version") continue;
+      if (saved.at(i) == QStringLiteral("version")) continue;
       QByteArray bytes = s.value(saved.at(i)).toByteArray();
       QDataStream ds(&bytes, QIODevice::ReadOnly);
       CollectionModel::Grouping g;
@@ -323,7 +325,7 @@ QActionGroup *CollectionFilterWidget::CreateGroupByActions(const QString &saved_
   else {
     QStringList saved = s.childKeys();
     for (int i = 0; i < saved.size(); ++i) {
-      if (saved.at(i) == "version") continue;
+      if (saved.at(i) == QStringLiteral("version")) continue;
       s.remove(saved.at(i));
     }
   }
@@ -361,17 +363,17 @@ void CollectionFilterWidget::SaveGroupBy() {
 
   qLog(Debug) << "Saving current grouping to" << name;
 
-  QSettings s;
-  if (settings_group_.isEmpty() || settings_group_ == CollectionSettingsPage::kSettingsGroup) {
+  Settings s;
+  if (settings_group_.isEmpty() || settings_group_ == QLatin1String(CollectionSettingsPage::kSettingsGroup)) {
     s.beginGroup(SavedGroupingManager::kSavedGroupingsSettingsGroup);
   }
   else {
-    s.beginGroup(QString(SavedGroupingManager::kSavedGroupingsSettingsGroup) + "_" + settings_group_);
+    s.beginGroup(QLatin1String(SavedGroupingManager::kSavedGroupingsSettingsGroup) + QLatin1Char('_') + settings_group_);
   }
   QByteArray buffer;
   QDataStream datastream(&buffer, QIODevice::WriteOnly);
   datastream << model_->GetGroupBy();
-  s.setValue("version", "1");
+  s.setValue("version", QStringLiteral("1"));
   s.setValue(name, buffer);
   s.endGroup();
 
@@ -425,7 +427,7 @@ void CollectionFilterWidget::GroupByClicked(QAction *action) {
 void CollectionFilterWidget::GroupingChanged(const CollectionModel::Grouping g, const bool separate_albums_by_grouping) {
 
   if (!settings_group_.isEmpty()) {
-    QSettings s;
+    Settings s;
     s.beginGroup(settings_group_);
     s.setValue(group_by_version(), 1);
     s.setValue(group_by_key(1), static_cast<int>(g[0]));
@@ -446,7 +448,8 @@ void CollectionFilterWidget::CheckCurrentGrouping(const CollectionModel::Groupin
     UpdateGroupByActions();
   }
 
-  for (QAction *action : group_by_group_->actions()) {
+  const QList<QAction*> actions = group_by_group_->actions();
+  for (QAction *action : actions) {
     if (action->property("group_by").isNull()) continue;
 
     if (g == action->property("group_by").value<CollectionModel::Grouping>()) {
@@ -456,7 +459,6 @@ void CollectionFilterWidget::CheckCurrentGrouping(const CollectionModel::Groupin
   }
 
   // Check the advanced action
-  QList<QAction*> actions = group_by_group_->actions();
   QAction *action = actions.last();
   action->setChecked(true);
 

src/collection/collectionfilterwidget.ui

@@ -38,6 +38,9 @@
    </item>
    <item>
     <widget class="QToolButton" name="options">
+     <property name="accessibleName">
+      <string>MenuPopupToolButton</string>
+     </property>
      <property name="iconSize">
       <size>
        <width>16</width>

src/collection/collectionitemdelegate.cpp

@@ -130,7 +130,7 @@ bool CollectionItemDelegate::helpEvent(QHelpEvent *event, QAbstractItemView *vie
   if (text.isEmpty()) return false;
 
   switch (event->type()) {
-    case QEvent::ToolTip: {
+    case QEvent::ToolTip:{
 
       QSize real_text = sizeHint(option, idx);
       QRect displayed_text = view->visualRect(idx);

src/collection/collectionmodel.cpp

@@ -2,7 +2,7 @@
  * Strawberry Music Player
  * This file was part of Clementine.
  * Copyright 2010, David Sansome <me@davidsansome.com>
- * Copyright 2018-2023, Jonas Kvinge <jonas@jkvinge.net>
+ * Copyright 2018-2024, Jonas Kvinge <jonas@jkvinge.net>
  *
  * Strawberry is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -61,6 +61,7 @@
 #include "core/logging.h"
 #include "core/taskmanager.h"
 #include "core/sqlrow.h"
+#include "core/settings.h"
 #include "collectionfilteroptions.h"
 #include "collectionquery.h"
 #include "collectionqueryoptions.h"
@@ -86,12 +87,13 @@ CollectionModel::CollectionModel(SharedPtr<CollectionBackend> backend, Applicati
       app_(app),
       dir_model_(new CollectionDirectoryModel(backend, this)),
       show_various_artists_(true),
+      sort_skips_articles_(true),
       total_song_count_(0),
       total_artist_count_(0),
       total_album_count_(0),
       separate_albums_by_grouping_(false),
-      artist_icon_(IconLoader::Load("folder-sound")),
-      album_icon_(IconLoader::Load("cdcase")),
+      artist_icon_(IconLoader::Load(QStringLiteral("folder-sound"))),
+      album_icon_(IconLoader::Load(QStringLiteral("cdcase"))),
       init_task_id_(-1),
       use_pretty_covers_(true),
       show_dividers_(true),
@@ -108,7 +110,7 @@ CollectionModel::CollectionModel(SharedPtr<CollectionBackend> backend, Applicati
     QObject::connect(&*app_->album_cover_loader(), &AlbumCoverLoader::AlbumCoverLoaded, this, &CollectionModel::AlbumCoverLoaded);
   }
 
-  QIcon nocover = IconLoader::Load("cdcase");
+  QIcon nocover = IconLoader::Load(QStringLiteral("cdcase"));
   if (!nocover.isNull()) {
     QList<QSize> nocover_sizes = nocover.availableSizes();
     no_cover_icon_ = nocover.pixmap(nocover_sizes.last()).scaled(kPrettyCoverSize, kPrettyCoverSize, Qt::KeepAspectRatio, Qt::SmoothTransformation);
@@ -116,7 +118,7 @@ CollectionModel::CollectionModel(SharedPtr<CollectionBackend> backend, Applicati
 
   if (app_ && !sIconCache) {
     sIconCache = new QNetworkDiskCache(this);
-    sIconCache->setCacheDirectory(QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + "/" + kPixmapDiskCacheDir);
+    sIconCache->setCacheDirectory(QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + QLatin1Char('/') + QLatin1String(kPixmapDiskCacheDir));
     QObject::connect(app_, &Application::ClearPixmapDiskCache, this, &CollectionModel::ClearDiskCache);
   }
 
@@ -141,7 +143,9 @@ CollectionModel::~CollectionModel() {
 
   qLog(Debug) << "Collection model" << this << "for" << Song::TextForSource(backend_->source()) << "deleted";
 
-  delete root_;
+  beginResetModel();
+  Clear();
+  endResetModel();
 
 }
 
@@ -163,9 +167,18 @@ void CollectionModel::set_show_dividers(const bool show_dividers) {
 
 }
 
+void CollectionModel::set_sort_skips_articles(const bool sort_skips_articles) {
+
+  if (sort_skips_articles != sort_skips_articles_) {
+    sort_skips_articles_ = sort_skips_articles;
+    Reset();
+  }
+
+}
+
 void CollectionModel::ReloadSettings() {
 
-  QSettings s;
+  Settings s;
 
   s.beginGroup(CollectionSettingsPage::kSettingsGroup);
 
@@ -189,6 +202,8 @@ void CollectionModel::ReloadSettings() {
 
 void CollectionModel::Init(const bool async) {
 
+  if (!root_) return;
+
   if (async) {
     // Show a loading indicator in the model.
     CollectionItem *loading = new CollectionItem(CollectionItem::Type_LoadingIndicator, root_);
@@ -212,6 +227,8 @@ void CollectionModel::Init(const bool async) {
 
 void CollectionModel::SongsDiscovered(const SongList &songs) {
 
+  if (!root_) return;
+
   for (const Song &song : songs) {
 
     // Sanity check to make sure we don't add songs that are outside the user's filter
@@ -231,7 +248,7 @@ void CollectionModel::SongsDiscovered(const SongList &songs) {
       GroupBy group_by = group_by_[i];
       if (group_by == GroupBy::None) break;
 
-      if (!key.isEmpty()) key.append("-");
+      if (!key.isEmpty()) key.append(QLatin1Char('-'));
 
       // Special case: if the song is a compilation and the current GroupBy level is Artists, then we want the Various Artists node :(
       if (IsArtistGroupBy(group_by) && song.is_compilation()) {
@@ -291,7 +308,7 @@ CollectionItem *CollectionModel::CreateCompilationArtistNode(const bool signal,
   if (parent != root_ && !parent->key.isEmpty()) parent->compilation_artist_node_->key.append(parent->key);
   parent->compilation_artist_node_->key.append(tr("Various artists"));
   parent->compilation_artist_node_->display_text = tr("Various artists");
-  parent->compilation_artist_node_->sort_text = " various";
+  parent->compilation_artist_node_->sort_text = QStringLiteral(" various");
   parent->compilation_artist_node_->container_level = parent->container_level + 1;
 
   if (signal) endInsertRows();
@@ -313,33 +330,33 @@ QString CollectionModel::ContainerKey(const GroupBy group_by, const bool separat
       break;
     case GroupBy::Album:
       key = TextOrUnknown(song.album());
-      if (!song.album_id().isEmpty()) key.append("-" + song.album_id());
-      if (separate_albums_by_grouping && !song.grouping().isEmpty()) key.append("-" + song.grouping());
+      if (!song.album_id().isEmpty()) key.append(QLatin1Char('-') + song.album_id());
+      if (separate_albums_by_grouping && !song.grouping().isEmpty()) key.append(QLatin1Char('-') + song.grouping());
       break;
     case GroupBy::AlbumDisc:
       key = PrettyAlbumDisc(song.album(), song.disc());
-      if (!song.album_id().isEmpty()) key.append("-" + song.album_id());
-      if (separate_albums_by_grouping && !song.grouping().isEmpty()) key.append("-" + song.grouping());
+      if (!song.album_id().isEmpty()) key.append(QLatin1Char('-') + song.album_id());
+      if (separate_albums_by_grouping && !song.grouping().isEmpty()) key.append(QLatin1Char('-') + song.grouping());
       break;
     case GroupBy::YearAlbum:
       key = PrettyYearAlbum(song.year(), song.album());
-      if (!song.album_id().isEmpty()) key.append("-" + song.album_id());
-      if (separate_albums_by_grouping && !song.grouping().isEmpty()) key.append("-" + song.grouping());
+      if (!song.album_id().isEmpty()) key.append(QLatin1Char('-') + song.album_id());
+      if (separate_albums_by_grouping && !song.grouping().isEmpty()) key.append(QLatin1Char('-') + song.grouping());
       break;
     case GroupBy::YearAlbumDisc:
       key = PrettyYearAlbumDisc(song.year(), song.album(), song.disc());
-      if (!song.album_id().isEmpty()) key.append("-" + song.album_id());
-      if (separate_albums_by_grouping && !song.grouping().isEmpty()) key.append("-" + song.grouping());
+      if (!song.album_id().isEmpty()) key.append(QLatin1Char('-') + song.album_id());
+      if (separate_albums_by_grouping && !song.grouping().isEmpty()) key.append(QLatin1Char('-') + song.grouping());
       break;
     case GroupBy::OriginalYearAlbum:
       key = PrettyYearAlbum(song.effective_originalyear(), song.album());
-      if (!song.album_id().isEmpty()) key.append("-" + song.album_id());
-      if (separate_albums_by_grouping && !song.grouping().isEmpty()) key.append("-" + song.grouping());
+      if (!song.album_id().isEmpty()) key.append(QLatin1Char('-') + song.album_id());
+      if (separate_albums_by_grouping && !song.grouping().isEmpty()) key.append(QLatin1Char('-') + song.grouping());
       break;
     case GroupBy::OriginalYearAlbumDisc:
       key = PrettyYearAlbumDisc(song.effective_originalyear(), song.album(), song.disc());
-      if (!song.album_id().isEmpty()) key.append("-" + song.album_id());
-      if (separate_albums_by_grouping && !song.grouping().isEmpty()) key.append("-" + song.grouping());
+      if (!song.album_id().isEmpty()) key.append(QLatin1Char('-') + song.album_id());
+      if (separate_albums_by_grouping && !song.grouping().isEmpty()) key.append(QLatin1Char('-') + song.grouping());
       break;
     case GroupBy::Disc:
       key = PrettyDisc(song.disc());
@@ -380,10 +397,10 @@ QString CollectionModel::ContainerKey(const GroupBy group_by, const bool separat
       }
       else {
         if (song.bitdepth() <= 0) {
-          key = QString("%1 (%2)").arg(song.TextForFiletype(), QString::number(song.samplerate() / 1000.0, 'G', 5));
+          key = QStringLiteral("%1 (%2)").arg(song.TextForFiletype(), QString::number(song.samplerate() / 1000.0, 'G', 5));
         }
         else {
-          key = QString("%1 (%2/%3)").arg(song.TextForFiletype(), QString::number(song.samplerate() / 1000.0, 'G', 5)).arg(song.bitdepth());
+          key = QStringLiteral("%1 (%2/%3)").arg(song.TextForFiletype(), QString::number(song.samplerate() / 1000.0, 'G', 5)).arg(song.bitdepth());
         }
       }
       break;
@@ -414,10 +431,10 @@ QString CollectionModel::DividerKey(const GroupBy group_by, CollectionItem *item
     case GroupBy::Disc:
     case GroupBy::Genre:
     case GroupBy::Format:
-    case GroupBy::FileType: {
+    case GroupBy::FileType:{
       QChar c = item->sort_text[0];
-      if (c.isDigit()) return "0";
-      if (c == ' ') return QString();
+      if (c.isDigit()) return QStringLiteral("0");
+      if (c == QLatin1Char(' ')) return QString();
       if (c.decompositionTag() != QChar::NoDecomposition) {
         QString decomposition = c.decomposition();
         return QChar(decomposition[0]);
@@ -471,31 +488,31 @@ QString CollectionModel::DividerDisplayText(const GroupBy group_by, const QStrin
     case GroupBy::Genre:
     case GroupBy::FileType:
     case GroupBy::Format:
-      if (key == "0") return "0-9";
+      if (key == QLatin1String("0")) return QStringLiteral("0-9");
       return key.toUpper();
 
     case GroupBy::YearAlbum:
     case GroupBy::YearAlbumDisc:
     case GroupBy::OriginalYearAlbum:
     case GroupBy::OriginalYearAlbumDisc:
-      if (key == "0000") return tr("Unknown");
+      if (key == QStringLiteral("0000")) return tr("Unknown");
       return key.toUpper();
 
     case GroupBy::Year:
     case GroupBy::OriginalYear:
-      if (key == "0000") return tr("Unknown");
+      if (key == QStringLiteral("0000")) return tr("Unknown");
       return QString::number(key.toInt());  // To remove leading 0s
 
     case GroupBy::Samplerate:
-      if (key == "000") return tr("Unknown");
+      if (key == QStringLiteral("000")) return tr("Unknown");
       return QString::number(key.toInt());  // To remove leading 0s
 
     case GroupBy::Bitdepth:
-      if (key == "000") return tr("Unknown");
+      if (key == QStringLiteral("000")) return tr("Unknown");
       return QString::number(key.toInt());  // To remove leading 0s
 
     case GroupBy::Bitrate:
-      if (key == "000") return tr("Unknown");
+      if (key == QStringLiteral("000")) return tr("Unknown");
       return QString::number(key.toInt());  // To remove leading 0s
 
     case GroupBy::None:
@@ -509,6 +526,8 @@ QString CollectionModel::DividerDisplayText(const GroupBy group_by, const QStrin
 
 void CollectionModel::SongsDeleted(const SongList &songs) {
 
+  if (!root_) return;
+
   // Delete the actual song nodes first, keeping track of each parent so we might check to see if they're empty later.
   QSet<CollectionItem*> parents;
   for (const Song &song : songs) {
@@ -613,13 +632,13 @@ QString CollectionModel::AlbumIconPixmapCacheKey(const QModelIndex &idx) const {
     idx_copy = idx_copy.parent();
   }
 
-  return Song::TextForSource(backend_->source()) + "/" + path.join("/");
+  return Song::TextForSource(backend_->source()) + QLatin1Char('/') + path.join(QLatin1Char('/'));
 
 }
 
 QUrl CollectionModel::AlbumIconPixmapDiskCacheKey(const QString &cache_key) const {
 
-  return QUrl(QUrl::toPercentEncoding(cache_key));
+  return QUrl(QString::fromLatin1(QUrl::toPercentEncoding(cache_key)));
 
 }
 
@@ -913,6 +932,8 @@ CollectionModel::QueryResult CollectionModel::RunQuery(const CollectionFilterOpt
 
 void CollectionModel::PostQuery(CollectionItem *parent, const CollectionModel::QueryResult &result, const bool signal) {
 
+  if (!root_) return;
+
   // Information about what we want the children to be
   int child_level = parent == root_ ? 0 : parent->container_level + 1;
   GroupBy child_group_by = child_level >= 3 ? GroupBy::None : group_by_[child_level];
@@ -939,6 +960,8 @@ void CollectionModel::PostQuery(CollectionItem *parent, const CollectionModel::Q
 
 void CollectionModel::LazyPopulate(CollectionItem *parent, const bool signal) {
 
+  if (!root_) return;
+
   if (parent->lazy_loaded) return;
   parent->lazy_loaded = true;
 
@@ -950,6 +973,8 @@ void CollectionModel::LazyPopulate(CollectionItem *parent, const bool signal) {
 
 void CollectionModel::ResetAsync() {
 
+  if (!root_) return;
+
   CollectionQueryOptions query_options = PrepareQuery(root_);
 
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
@@ -965,6 +990,8 @@ void CollectionModel::ResetAsync() {
 
 void CollectionModel::ResetAsyncQueryFinished() {
 
+  if (!root_) return;
+
   QFutureWatcher<CollectionModel::QueryResult> *watcher = static_cast<QFutureWatcher<CollectionModel::QueryResult>*>(sender());
   const struct QueryResult result = watcher->result();
   watcher->deleteLater();
@@ -985,10 +1012,12 @@ void CollectionModel::ResetAsyncQueryFinished() {
 
 }
 
-void CollectionModel::BeginReset() {
+void CollectionModel::Clear() {
 
-  beginResetModel();
-  delete root_;
+  if (root_) {
+    delete root_;
+    root_ = nullptr;
+  }
   song_nodes_.clear();
   container_nodes_[0].clear();
   container_nodes_[1].clear();
@@ -997,6 +1026,13 @@ void CollectionModel::BeginReset() {
   pending_art_.clear();
   pending_cache_keys_.clear();
 
+}
+
+void CollectionModel::BeginReset() {
+
+  beginResetModel();
+  Clear();
+
   root_ = new CollectionItem(this);
   root_->compilation_artist_node_ = nullptr;
   root_->lazy_loaded = false;
@@ -1019,86 +1055,86 @@ void CollectionModel::SetQueryColumnSpec(const GroupBy group_by, const bool sepa
   // Say what group_by of thing we want to get back from the database.
   switch (group_by) {
     case GroupBy::AlbumArtist:
-      query_options->set_column_spec("DISTINCT effective_albumartist");
+      query_options->set_column_spec(QStringLiteral("DISTINCT effective_albumartist"));
       break;
     case GroupBy::Artist:
-      query_options->set_column_spec("DISTINCT artist");
+      query_options->set_column_spec(QStringLiteral("DISTINCT artist"));
       break;
     case GroupBy::Album:{
-      QString query("DISTINCT album, album_id");
-      if (separate_albums_by_grouping) query.append(", grouping");
+      QString query(QStringLiteral("DISTINCT album, album_id"));
+      if (separate_albums_by_grouping) query.append(QStringLiteral(", grouping"));
       query_options->set_column_spec(query);
       break;
     }
     case GroupBy::AlbumDisc:{
-      QString query("DISTINCT album, album_id, disc");
-      if (separate_albums_by_grouping) query.append(", grouping");
+      QString query(QStringLiteral("DISTINCT album, album_id, disc"));
+      if (separate_albums_by_grouping) query.append(QStringLiteral(", grouping"));
       query_options->set_column_spec(query);
       break;
     }
     case GroupBy::YearAlbum:{
-      QString query("DISTINCT year, album, album_id");
-      if (separate_albums_by_grouping) query.append(", grouping");
+      QString query(QStringLiteral("DISTINCT year, album, album_id"));
+      if (separate_albums_by_grouping) query.append(QStringLiteral(", grouping"));
       query_options->set_column_spec(query);
       break;
     }
     case GroupBy::YearAlbumDisc:{
-      QString query("DISTINCT year, album, album_id, disc");
-      if (separate_albums_by_grouping) query.append(", grouping");
+      QString query(QStringLiteral("DISTINCT year, album, album_id, disc"));
+      if (separate_albums_by_grouping) query.append(QStringLiteral(", grouping"));
       query_options->set_column_spec(query);
       break;
     }
     case GroupBy::OriginalYearAlbum:{
-      QString query("DISTINCT year, originalyear, album, album_id");
-      if (separate_albums_by_grouping) query.append(", grouping");
+      QString query(QStringLiteral("DISTINCT year, originalyear, album, album_id"));
+      if (separate_albums_by_grouping) query.append(QStringLiteral(", grouping"));
       query_options->set_column_spec(query);
       break;
     }
     case GroupBy::OriginalYearAlbumDisc:{
-      QString query("DISTINCT year, originalyear, album, album_id, disc");
-      if (separate_albums_by_grouping) query.append(", grouping");
+      QString query(QStringLiteral("DISTINCT year, originalyear, album, album_id, disc"));
+      if (separate_albums_by_grouping) query.append(QStringLiteral(", grouping"));
       query_options->set_column_spec(query);
       break;
     }
     case GroupBy::Disc:
-      query_options->set_column_spec("DISTINCT disc");
+      query_options->set_column_spec(QStringLiteral("DISTINCT disc"));
       break;
     case GroupBy::Year:
-      query_options->set_column_spec("DISTINCT year");
+      query_options->set_column_spec(QStringLiteral("DISTINCT year"));
       break;
     case GroupBy::OriginalYear:
-      query_options->set_column_spec("DISTINCT effective_originalyear");
+      query_options->set_column_spec(QStringLiteral("DISTINCT effective_originalyear"));
       break;
     case GroupBy::Genre:
-      query_options->set_column_spec("DISTINCT genre");
+      query_options->set_column_spec(QStringLiteral("DISTINCT genre"));
       break;
     case GroupBy::Composer:
-      query_options->set_column_spec("DISTINCT composer");
+      query_options->set_column_spec(QStringLiteral("DISTINCT composer"));
       break;
     case GroupBy::Performer:
-      query_options->set_column_spec("DISTINCT performer");
+      query_options->set_column_spec(QStringLiteral("DISTINCT performer"));
       break;
     case GroupBy::Grouping:
-      query_options->set_column_spec("DISTINCT grouping");
+      query_options->set_column_spec(QStringLiteral("DISTINCT grouping"));
       break;
     case GroupBy::FileType:
-      query_options->set_column_spec("DISTINCT filetype");
+      query_options->set_column_spec(QStringLiteral("DISTINCT filetype"));
       break;
     case GroupBy::Format:
-      query_options->set_column_spec("DISTINCT filetype, samplerate, bitdepth");
+      query_options->set_column_spec(QStringLiteral("DISTINCT filetype, samplerate, bitdepth"));
       break;
     case GroupBy::Samplerate:
-      query_options->set_column_spec("DISTINCT samplerate");
+      query_options->set_column_spec(QStringLiteral("DISTINCT samplerate"));
       break;
     case GroupBy::Bitdepth:
-      query_options->set_column_spec("DISTINCT bitdepth");
+      query_options->set_column_spec(QStringLiteral("DISTINCT bitdepth"));
       break;
     case GroupBy::Bitrate:
-      query_options->set_column_spec("DISTINCT bitrate");
+      query_options->set_column_spec(QStringLiteral("DISTINCT bitrate"));
       break;
     case GroupBy::None:
     case GroupBy::GroupByCount:
-      query_options->set_column_spec("%songs_table.ROWID, " + Song::kColumnSpec);
+      query_options->set_column_spec(QStringLiteral("%songs_table.ROWID, ") + Song::kColumnSpec);
       break;
   }
 
@@ -1116,7 +1152,7 @@ void CollectionModel::AddQueryWhere(const GroupBy group_by, const bool separate_
       else {
         // Don't duplicate compilations outside the Various artists node
         query_options->set_compilation_requirement(CollectionQueryOptions::CompilationRequirement::Off);
-        query_options->AddWhere("effective_albumartist", item->metadata.effective_albumartist());
+        query_options->AddWhere(QStringLiteral("effective_albumartist"), item->metadata.effective_albumartist());
       }
       break;
     case GroupBy::Artist:
@@ -1126,85 +1162,85 @@ void CollectionModel::AddQueryWhere(const GroupBy group_by, const bool separate_
       else {
         // Don't duplicate compilations outside the Various artists node
         query_options->set_compilation_requirement(CollectionQueryOptions::CompilationRequirement::Off);
-        query_options->AddWhere("artist", item->metadata.artist());
+        query_options->AddWhere(QStringLiteral("artist"), item->metadata.artist());
       }
       break;
     case GroupBy::Album:
-      query_options->AddWhere("album", item->metadata.album());
-      query_options->AddWhere("album_id", item->metadata.album_id());
-      if (separate_albums_by_grouping) query_options->AddWhere("grouping", item->metadata.grouping());
+      query_options->AddWhere(QStringLiteral("album"), item->metadata.album());
+      query_options->AddWhere(QStringLiteral("album_id"), item->metadata.album_id());
+      if (separate_albums_by_grouping) query_options->AddWhere(QStringLiteral("grouping"), item->metadata.grouping());
       break;
     case GroupBy::AlbumDisc:
-      query_options->AddWhere("album", item->metadata.album());
-      query_options->AddWhere("album_id", item->metadata.album_id());
-      query_options->AddWhere("disc", item->metadata.disc());
-      if (separate_albums_by_grouping) query_options->AddWhere("grouping", item->metadata.grouping());
+      query_options->AddWhere(QStringLiteral("album"), item->metadata.album());
+      query_options->AddWhere(QStringLiteral("album_id"), item->metadata.album_id());
+      query_options->AddWhere(QStringLiteral("disc"), item->metadata.disc());
+      if (separate_albums_by_grouping) query_options->AddWhere(QStringLiteral("grouping"), item->metadata.grouping());
       break;
     case GroupBy::YearAlbum:
-      query_options->AddWhere("year", item->metadata.year());
-      query_options->AddWhere("album", item->metadata.album());
-      query_options->AddWhere("album_id", item->metadata.album_id());
-      if (separate_albums_by_grouping) query_options->AddWhere("grouping", item->metadata.grouping());
+      query_options->AddWhere(QStringLiteral("year"), item->metadata.year());
+      query_options->AddWhere(QStringLiteral("album"), item->metadata.album());
+      query_options->AddWhere(QStringLiteral("album_id"), item->metadata.album_id());
+      if (separate_albums_by_grouping) query_options->AddWhere(QStringLiteral("grouping"), item->metadata.grouping());
       break;
     case GroupBy::YearAlbumDisc:
-      query_options->AddWhere("year", item->metadata.year());
-      query_options->AddWhere("album", item->metadata.album());
-      query_options->AddWhere("album_id", item->metadata.album_id());
-      query_options->AddWhere("disc", item->metadata.disc());
-      if (separate_albums_by_grouping) query_options->AddWhere("grouping", item->metadata.grouping());
+      query_options->AddWhere(QStringLiteral("year"), item->metadata.year());
+      query_options->AddWhere(QStringLiteral("album"), item->metadata.album());
+      query_options->AddWhere(QStringLiteral("album_id"), item->metadata.album_id());
+      query_options->AddWhere(QStringLiteral("disc"), item->metadata.disc());
+      if (separate_albums_by_grouping) query_options->AddWhere(QStringLiteral("grouping"), item->metadata.grouping());
       break;
     case GroupBy::OriginalYearAlbum:
-      query_options->AddWhere("year", item->metadata.year());
-      query_options->AddWhere("originalyear", item->metadata.originalyear());
-      query_options->AddWhere("album", item->metadata.album());
-      query_options->AddWhere("album_id", item->metadata.album_id());
-      if (separate_albums_by_grouping) query_options->AddWhere("grouping", item->metadata.grouping());
+      query_options->AddWhere(QStringLiteral("year"), item->metadata.year());
+      query_options->AddWhere(QStringLiteral("originalyear"), item->metadata.originalyear());
+      query_options->AddWhere(QStringLiteral("album"), item->metadata.album());
+      query_options->AddWhere(QStringLiteral("album_id"), item->metadata.album_id());
+      if (separate_albums_by_grouping) query_options->AddWhere(QStringLiteral("grouping"), item->metadata.grouping());
       break;
     case GroupBy::OriginalYearAlbumDisc:
-      query_options->AddWhere("year", item->metadata.year());
-      query_options->AddWhere("originalyear", item->metadata.originalyear());
-      query_options->AddWhere("album", item->metadata.album());
-      query_options->AddWhere("album_id", item->metadata.album_id());
-      query_options->AddWhere("disc", item->metadata.disc());
-      if (separate_albums_by_grouping) query_options->AddWhere("grouping", item->metadata.grouping());
+      query_options->AddWhere(QStringLiteral("year"), item->metadata.year());
+      query_options->AddWhere(QStringLiteral("originalyear"), item->metadata.originalyear());
+      query_options->AddWhere(QStringLiteral("album"), item->metadata.album());
+      query_options->AddWhere(QStringLiteral("album_id"), item->metadata.album_id());
+      query_options->AddWhere(QStringLiteral("disc"), item->metadata.disc());
+      if (separate_albums_by_grouping) query_options->AddWhere(QStringLiteral("grouping"), item->metadata.grouping());
       break;
     case GroupBy::Disc:
-      query_options->AddWhere("disc", item->metadata.disc());
+      query_options->AddWhere(QStringLiteral("disc"), item->metadata.disc());
       break;
     case GroupBy::Year:
-      query_options->AddWhere("year", item->metadata.year());
+      query_options->AddWhere(QStringLiteral("year"), item->metadata.year());
       break;
     case GroupBy::OriginalYear:
-      query_options->AddWhere("effective_originalyear", item->metadata.effective_originalyear());
+      query_options->AddWhere(QStringLiteral("effective_originalyear"), item->metadata.effective_originalyear());
       break;
     case GroupBy::Genre:
-      query_options->AddWhere("genre", item->metadata.genre());
+      query_options->AddWhere(QStringLiteral("genre"), item->metadata.genre());
       break;
     case GroupBy::Composer:
-      query_options->AddWhere("composer", item->metadata.composer());
+      query_options->AddWhere(QStringLiteral("composer"), item->metadata.composer());
       break;
     case GroupBy::Performer:
-      query_options->AddWhere("performer", item->metadata.performer());
+      query_options->AddWhere(QStringLiteral("performer"), item->metadata.performer());
       break;
     case GroupBy::Grouping:
-      query_options->AddWhere("grouping", item->metadata.grouping());
+      query_options->AddWhere(QStringLiteral("grouping"), item->metadata.grouping());
       break;
     case GroupBy::FileType:
-      query_options->AddWhere("filetype", static_cast<int>(item->metadata.filetype()));
+      query_options->AddWhere(QStringLiteral("filetype"), static_cast<int>(item->metadata.filetype()));
       break;
     case GroupBy::Format:
-      query_options->AddWhere("filetype", static_cast<int>(item->metadata.filetype()));
-      query_options->AddWhere("samplerate", item->metadata.samplerate());
-      query_options->AddWhere("bitdepth", item->metadata.bitdepth());
+      query_options->AddWhere(QStringLiteral("filetype"), static_cast<int>(item->metadata.filetype()));
+      query_options->AddWhere(QStringLiteral("samplerate"), item->metadata.samplerate());
+      query_options->AddWhere(QStringLiteral("bitdepth"), item->metadata.bitdepth());
       break;
     case GroupBy::Samplerate:
-      query_options->AddWhere("samplerate", item->metadata.samplerate());
+      query_options->AddWhere(QStringLiteral("samplerate"), item->metadata.samplerate());
       break;
     case GroupBy::Bitdepth:
-      query_options->AddWhere("bitdepth", item->metadata.bitdepth());
+      query_options->AddWhere(QStringLiteral("bitdepth"), item->metadata.bitdepth());
       break;
     case GroupBy::Bitrate:
-      query_options->AddWhere("bitrate", item->metadata.bitrate());
+      query_options->AddWhere(QStringLiteral("bitrate"), item->metadata.bitrate());
       break;
     case GroupBy::None:
     case GroupBy::GroupByCount:
@@ -1234,7 +1270,7 @@ CollectionItem *CollectionModel::ItemFromQuery(const GroupBy group_by, const boo
   CollectionItem *item = InitItem(group_by, signal, parent, container_level);
 
   if (parent != root_ && !parent->key.isEmpty()) {
-    item->key = parent->key + "-";
+    item->key = parent->key + QLatin1Char('-');
   }
 
   switch (group_by) {
@@ -1242,30 +1278,30 @@ CollectionItem *CollectionModel::ItemFromQuery(const GroupBy group_by, const boo
       item->metadata.set_albumartist(row.value(0).toString());
       item->key.append(ContainerKey(group_by, separate_albums_by_grouping, item->metadata));
       item->display_text = TextOrUnknown(item->metadata.albumartist());
-      item->sort_text = SortTextForArtist(item->metadata.albumartist());
+      item->sort_text = SortTextForArtist(item->metadata.albumartist(), sort_skips_articles_);
       break;
     }
     case GroupBy::Artist:{
       item->metadata.set_artist(row.value(0).toString());
       item->key.append(ContainerKey(group_by, separate_albums_by_grouping, item->metadata));
       item->display_text = TextOrUnknown(item->metadata.artist());
-      item->sort_text = SortTextForArtist(item->metadata.artist());
+      item->sort_text = SortTextForArtist(item->metadata.artist(), sort_skips_articles_);
       break;
     }
     case GroupBy::Album:{
       item->metadata.set_album(row.value(0).toString());
       item->metadata.set_album_id(row.value(1).toString());
-      item->metadata.set_grouping(row.value(2).toString());
+      if (separate_albums_by_grouping) item->metadata.set_grouping(row.value(2).toString());
       item->key.append(ContainerKey(group_by, separate_albums_by_grouping, item->metadata));
       item->display_text = TextOrUnknown(item->metadata.album());
-      item->sort_text = SortTextForArtist(item->metadata.album());
+      item->sort_text = SortTextForArtist(item->metadata.album(), sort_skips_articles_);
       break;
     }
     case GroupBy::AlbumDisc:{
       item->metadata.set_album(row.value(0).toString());
       item->metadata.set_album_id(row.value(1).toString());
       item->metadata.set_disc(row.value(2).toInt());
-      item->metadata.set_grouping(row.value(3).toString());
+      if (separate_albums_by_grouping) item->metadata.set_grouping(row.value(3).toString());
       item->key.append(ContainerKey(group_by, separate_albums_by_grouping, item->metadata));
       item->display_text = PrettyAlbumDisc(item->metadata.album(), item->metadata.disc());
       item->sort_text = item->metadata.album() + SortTextForNumber(std::max(0, item->metadata.disc()));
@@ -1275,7 +1311,7 @@ CollectionItem *CollectionModel::ItemFromQuery(const GroupBy group_by, const boo
       item->metadata.set_year(row.value(0).toInt());
       item->metadata.set_album(row.value(1).toString());
       item->metadata.set_album_id(row.value(2).toString());
-      item->metadata.set_grouping(row.value(3).toString());
+      if (separate_albums_by_grouping) item->metadata.set_grouping(row.value(3).toString());
       item->key.append(ContainerKey(group_by, separate_albums_by_grouping, item->metadata));
       item->display_text = PrettyYearAlbum(item->metadata.year(), item->metadata.album());
       item->sort_text = SortTextForNumber(std::max(0, item->metadata.year())) + item->metadata.grouping() + item->metadata.album();
@@ -1286,7 +1322,7 @@ CollectionItem *CollectionModel::ItemFromQuery(const GroupBy group_by, const boo
       item->metadata.set_album(row.value(1).toString());
       item->metadata.set_album_id(row.value(2).toString());
       item->metadata.set_disc(row.value(3).toInt());
-      item->metadata.set_grouping(row.value(4).toString());
+      if (separate_albums_by_grouping) item->metadata.set_grouping(row.value(4).toString());
       item->key.append(ContainerKey(group_by, separate_albums_by_grouping, item->metadata));
       item->display_text = PrettyYearAlbumDisc(item->metadata.year(), item->metadata.album(), item->metadata.disc());
       item->sort_text = SortTextForNumber(std::max(0, item->metadata.year())) + item->metadata.album() + SortTextForNumber(std::max(0, item->metadata.disc()));
@@ -1297,7 +1333,7 @@ CollectionItem *CollectionModel::ItemFromQuery(const GroupBy group_by, const boo
       item->metadata.set_originalyear(row.value(1).toInt());
       item->metadata.set_album(row.value(2).toString());
       item->metadata.set_album_id(row.value(3).toString());
-      item->metadata.set_grouping(row.value(4).toString());
+      if (separate_albums_by_grouping) item->metadata.set_grouping(row.value(4).toString());
       item->key.append(ContainerKey(group_by, separate_albums_by_grouping, item->metadata));
       item->display_text = PrettyYearAlbum(item->metadata.effective_originalyear(), item->metadata.album());
       item->sort_text = SortTextForNumber(std::max(0, item->metadata.effective_originalyear())) + item->metadata.grouping() + item->metadata.album();
@@ -1309,7 +1345,7 @@ CollectionItem *CollectionModel::ItemFromQuery(const GroupBy group_by, const boo
       item->metadata.set_album(row.value(2).toString());
       item->metadata.set_album_id(row.value(3).toString());
       item->metadata.set_disc(row.value(4).toInt());
-      item->metadata.set_grouping(row.value(5).toString());
+      if (separate_albums_by_grouping) item->metadata.set_grouping(row.value(5).toString());
       item->key.append(ContainerKey(group_by, separate_albums_by_grouping, item->metadata));
       item->display_text = PrettyYearAlbumDisc(item->metadata.effective_originalyear(), item->metadata.album(), item->metadata.disc());
       item->sort_text = SortTextForNumber(std::max(0, item->metadata.effective_originalyear())) + item->metadata.album() + SortTextForNumber(std::max(0, item->metadata.disc()));
@@ -1328,7 +1364,7 @@ CollectionItem *CollectionModel::ItemFromQuery(const GroupBy group_by, const boo
       item->key.append(ContainerKey(group_by, separate_albums_by_grouping, item->metadata));
       const int year = std::max(0, item->metadata.year());
       item->display_text = QString::number(year);
-      item->sort_text = SortTextForNumber(year) + " ";
+      item->sort_text = SortTextForNumber(year) + QLatin1Char(' ');
       break;
     }
     case GroupBy::OriginalYear:{
@@ -1336,35 +1372,35 @@ CollectionItem *CollectionModel::ItemFromQuery(const GroupBy group_by, const boo
       item->key.append(ContainerKey(group_by, separate_albums_by_grouping, item->metadata));
       const int year = std::max(0, item->metadata.originalyear());
       item->display_text = QString::number(year);
-      item->sort_text = SortTextForNumber(year) + " ";
+      item->sort_text = SortTextForNumber(year) + QLatin1Char(' ');
       break;
     }
     case GroupBy::Genre:{
       item->metadata.set_genre(row.value(0).toString());
       item->key.append(ContainerKey(group_by, separate_albums_by_grouping, item->metadata));
       item->display_text = TextOrUnknown(item->metadata.genre());
-      item->sort_text = SortTextForArtist(item->metadata.genre());
+      item->sort_text = SortTextForArtist(item->metadata.genre(), sort_skips_articles_);
       break;
     }
     case GroupBy::Composer:{
       item->metadata.set_composer(row.value(0).toString());
       item->key.append(ContainerKey(group_by, separate_albums_by_grouping, item->metadata));
       item->display_text = TextOrUnknown(item->metadata.composer());
-      item->sort_text = SortTextForArtist(item->metadata.composer());
+      item->sort_text = SortTextForArtist(item->metadata.composer(), sort_skips_articles_);
       break;
     }
     case GroupBy::Performer:{
       item->metadata.set_performer(row.value(0).toString());
       item->key.append(ContainerKey(group_by, separate_albums_by_grouping, item->metadata));
       item->display_text = TextOrUnknown(item->metadata.performer());
-      item->sort_text = SortTextForArtist(item->metadata.performer());
+      item->sort_text = SortTextForArtist(item->metadata.performer(), sort_skips_articles_);
       break;
     }
     case GroupBy::Grouping:{
       item->metadata.set_grouping(row.value(0).toString());
       item->key.append(ContainerKey(group_by, separate_albums_by_grouping, item->metadata));
       item->display_text = TextOrUnknown(item->metadata.grouping());
-      item->sort_text = SortTextForArtist(item->metadata.grouping());
+      item->sort_text = SortTextForArtist(item->metadata.grouping(), sort_skips_articles_);
       break;
     }
     case GroupBy::FileType:{
@@ -1389,7 +1425,7 @@ CollectionItem *CollectionModel::ItemFromQuery(const GroupBy group_by, const boo
       item->key.append(ContainerKey(group_by, separate_albums_by_grouping, item->metadata));
       const int samplerate = std::max(0, item->metadata.samplerate());
       item->display_text = QString::number(samplerate);
-      item->sort_text = SortTextForNumber(samplerate) + " ";
+      item->sort_text = SortTextForNumber(samplerate) + QLatin1Char(' ');
       break;
     }
     case GroupBy::Bitdepth:{
@@ -1397,7 +1433,7 @@ CollectionItem *CollectionModel::ItemFromQuery(const GroupBy group_by, const boo
       item->key.append(ContainerKey(group_by, separate_albums_by_grouping, item->metadata));
       const int bitdepth = std::max(0, item->metadata.bitdepth());
       item->display_text = QString::number(bitdepth);
-      item->sort_text = SortTextForNumber(bitdepth) + " ";
+      item->sort_text = SortTextForNumber(bitdepth) + QLatin1Char(' ');
       break;
     }
     case GroupBy::Bitrate:{
@@ -1405,7 +1441,7 @@ CollectionItem *CollectionModel::ItemFromQuery(const GroupBy group_by, const boo
       item->key.append(ContainerKey(group_by, separate_albums_by_grouping, item->metadata));
       const int bitrate = std::max(0, item->metadata.bitrate());
       item->display_text = QString::number(bitrate);
-      item->sort_text = SortTextForNumber(bitrate) + " ";
+      item->sort_text = SortTextForNumber(bitrate) + QLatin1Char(' ');
       break;
     }
     case GroupBy::None:
@@ -1433,7 +1469,7 @@ CollectionItem *CollectionModel::ItemFromSong(const GroupBy group_by, const bool
   CollectionItem *item = InitItem(group_by, signal, parent, container_level);
 
   if (parent != root_ && !parent->key.isEmpty()) {
-    item->key = parent->key + "-";
+    item->key = parent->key + QLatin1Char('-');
   }
 
   switch (group_by) {
@@ -1441,14 +1477,14 @@ CollectionItem *CollectionModel::ItemFromSong(const GroupBy group_by, const bool
       item->metadata.set_albumartist(s.effective_albumartist());
       item->key.append(ContainerKey(group_by, separate_albums_by_grouping, s));
       item->display_text = TextOrUnknown(s.effective_albumartist());
-      item->sort_text = SortTextForArtist(s.effective_albumartist());
+      item->sort_text = SortTextForArtist(s.effective_albumartist(), sort_skips_articles_);
       break;
     }
     case GroupBy::Artist:{
       item->metadata.set_artist(s.artist());
       item->key.append(ContainerKey(group_by, separate_albums_by_grouping, s));
       item->display_text = TextOrUnknown(s.artist());
-      item->sort_text = SortTextForArtist(s.artist());
+      item->sort_text = SortTextForArtist(s.artist(), sort_skips_articles_);
       break;
     }
     case GroupBy::Album:{
@@ -1457,7 +1493,7 @@ CollectionItem *CollectionModel::ItemFromSong(const GroupBy group_by, const bool
       item->metadata.set_grouping(s.grouping());
       item->key.append(ContainerKey(group_by, separate_albums_by_grouping, s));
       item->display_text = TextOrUnknown(s.album());
-      item->sort_text = SortTextForArtist(s.album());
+      item->sort_text = SortTextForArtist(s.album(), sort_skips_articles_);
       break;
     }
     case GroupBy::AlbumDisc:{
@@ -1527,7 +1563,7 @@ CollectionItem *CollectionModel::ItemFromSong(const GroupBy group_by, const bool
       item->key.append(ContainerKey(group_by, separate_albums_by_grouping, s));
       const int year = std::max(0, s.year());
       item->display_text = QString::number(year);
-      item->sort_text = SortTextForNumber(year) + " ";
+      item->sort_text = SortTextForNumber(year) + QLatin1Char(' ');
       break;
     }
     case GroupBy::OriginalYear:{
@@ -1535,35 +1571,35 @@ CollectionItem *CollectionModel::ItemFromSong(const GroupBy group_by, const bool
       item->key.append(ContainerKey(group_by, separate_albums_by_grouping, s));
       const int year = std::max(0, s.effective_originalyear());
       item->display_text = QString::number(year);
-      item->sort_text = SortTextForNumber(year) + " ";
+      item->sort_text = SortTextForNumber(year) + QLatin1Char(' ');
       break;
     }
     case GroupBy::Genre:{
       item->metadata.set_genre(s.genre());
       item->key.append(ContainerKey(group_by, separate_albums_by_grouping, s));
       item->display_text = TextOrUnknown(s.genre());
-      item->sort_text = SortTextForArtist(s.genre());
+      item->sort_text = SortTextForArtist(s.genre(), sort_skips_articles_);
       break;
     }
     case GroupBy::Composer:{
       item->metadata.set_composer(s.composer());
       item->key.append(ContainerKey(group_by, separate_albums_by_grouping, s));
       item->display_text = TextOrUnknown(s.composer());
-      item->sort_text = SortTextForArtist(s.composer());
+      item->sort_text = SortTextForArtist(s.composer(), sort_skips_articles_);
       break;
     }
     case GroupBy::Performer:{
       item->metadata.set_performer(s.performer());
       item->key.append(ContainerKey(group_by, separate_albums_by_grouping, s));
       item->display_text = TextOrUnknown(s.performer());
-      item->sort_text = SortTextForArtist(s.performer());
+      item->sort_text = SortTextForArtist(s.performer(), sort_skips_articles_);
       break;
     }
     case GroupBy::Grouping:{
       item->metadata.set_grouping(s.grouping());
       item->key.append(ContainerKey(group_by, separate_albums_by_grouping, s));
       item->display_text = TextOrUnknown(s.grouping());
-      item->sort_text = SortTextForArtist(s.grouping());
+      item->sort_text = SortTextForArtist(s.grouping(), sort_skips_articles_);
       break;
     }
     case GroupBy::FileType:{
@@ -1588,7 +1624,7 @@ CollectionItem *CollectionModel::ItemFromSong(const GroupBy group_by, const bool
       item->key.append(ContainerKey(group_by, separate_albums_by_grouping, s));
       const int samplerate = std::max(0, s.samplerate());
       item->display_text = QString::number(samplerate);
-      item->sort_text = SortTextForNumber(samplerate) + " ";
+      item->sort_text = SortTextForNumber(samplerate) + QLatin1Char(' ');
       break;
     }
     case GroupBy::Bitdepth:{
@@ -1596,7 +1632,7 @@ CollectionItem *CollectionModel::ItemFromSong(const GroupBy group_by, const bool
       item->key.append(ContainerKey(group_by, separate_albums_by_grouping, s));
       const int bitdepth = std::max(0, s.bitdepth());
       item->display_text = QString::number(bitdepth);
-      item->sort_text = SortTextForNumber(bitdepth) + " ";
+      item->sort_text = SortTextForNumber(bitdepth) + QLatin1Char(' ');
       break;
     }
     case GroupBy::Bitrate:{
@@ -1604,7 +1640,7 @@ CollectionItem *CollectionModel::ItemFromSong(const GroupBy group_by, const bool
       item->key.append(ContainerKey(group_by, separate_albums_by_grouping, s));
       const int bitrate = std::max(0, s.bitrate());
       item->display_text = QString::number(bitrate);
-      item->sort_text = SortTextForNumber(bitrate) + " ";
+      item->sort_text = SortTextForNumber(bitrate) + QLatin1Char(' ');
       break;
     }
     case GroupBy::None:
@@ -1623,7 +1659,7 @@ CollectionItem *CollectionModel::ItemFromSong(const GroupBy group_by, const bool
   }
 
   FinishItem(group_by, signal, create_divider, parent, item);
-  if (s.url().scheme() == "cdda") item->lazy_loaded = true;
+  if (s.url().scheme() == QStringLiteral("cdda")) item->lazy_loaded = true;
 
   return item;
 
@@ -1631,6 +1667,8 @@ CollectionItem *CollectionModel::ItemFromSong(const GroupBy group_by, const bool
 
 void CollectionModel::FinishItem(const GroupBy group_by, const bool signal, const bool create_divider, CollectionItem *parent, CollectionItem *item) {
 
+  if (!root_) return;
+
   if (group_by == GroupBy::None) item->lazy_loaded = true;
 
   if (signal) {
@@ -1641,7 +1679,7 @@ void CollectionModel::FinishItem(const GroupBy group_by, const bool signal, cons
   if (create_divider && show_dividers_) {
     QString divider_key = DividerKey(group_by, item);
     if (!divider_key.isEmpty()) {
-      item->sort_text.prepend(divider_key + " ");
+      item->sort_text.prepend(divider_key + QLatin1Char(' '));
     }
 
     if (!divider_key.isEmpty() && !divider_nodes_.contains(divider_key)) {
@@ -1652,7 +1690,7 @@ void CollectionModel::FinishItem(const GroupBy group_by, const bool signal, cons
       CollectionItem *divider = new CollectionItem(CollectionItem::Type_Divider, root_);
       divider->key = divider_key;
       divider->display_text = DividerDisplayText(group_by, divider_key);
-      divider->sort_text = divider_key + "  ";
+      divider->sort_text = divider_key + QStringLiteral("  ");
       divider->lazy_loaded = true;
 
       divider_nodes_[divider_key] = divider;
@@ -1675,14 +1713,14 @@ QString CollectionModel::TextOrUnknown(const QString &text) {
 QString CollectionModel::PrettyYearAlbum(const int year, const QString &album) {
 
   if (year <= 0) return TextOrUnknown(album);
-  return QString::number(year) + " - " + TextOrUnknown(album);
+  return QString::number(year) + QStringLiteral(" - ") + TextOrUnknown(album);
 
 }
 
 QString CollectionModel::PrettyAlbumDisc(const QString &album, const int disc) {
 
-  if (disc <= 0 || album.contains(Song::kAlbumRemoveDisc)) return TextOrUnknown(album);
-  else return TextOrUnknown(album) + " - (Disc " + QString::number(disc) + ")";
+  if (disc <= 0 || Song::AlbumContainsDisc(album)) return TextOrUnknown(album);
+  else return TextOrUnknown(album) + QStringLiteral(" - (Disc ") + QString::number(disc) + QStringLiteral(")");
 
 }
 
@@ -1691,9 +1729,9 @@ QString CollectionModel::PrettyYearAlbumDisc(const int year, const QString &albu
   QString str;
 
   if (year <= 0) str = TextOrUnknown(album);
-  else str = QString::number(year) + " - " + TextOrUnknown(album);
+  else str = QString::number(year) + QStringLiteral(" - ") + TextOrUnknown(album);
 
-  if (!album.contains(Song::kAlbumRemoveDisc) && disc > 0) str += " - (Disc " + QString::number(disc) + ")";
+  if (!Song::AlbumContainsDisc(album) && disc > 0) str += QStringLiteral(" - (Disc ") + QString::number(disc) + QStringLiteral(")");
 
   return str;
 
@@ -1701,33 +1739,35 @@ QString CollectionModel::PrettyYearAlbumDisc(const int year, const QString &albu
 
 QString CollectionModel::PrettyDisc(const int disc) {
 
-  return "Disc " + QString::number(std::max(1, disc));
+  return QStringLiteral("Disc ") + QString::number(std::max(1, disc));
 
 }
 
 QString CollectionModel::SortText(QString text) {
 
   if (text.isEmpty()) {
-    text = " unknown";
+    text = QStringLiteral(" unknown");
   }
   else {
     text = text.toLower();
   }
-  text = text.remove(QRegularExpression("[^\\w ]", QRegularExpression::UseUnicodePropertiesOption));
+  text = text.remove(QRegularExpression(QStringLiteral("[^\\w ]"), QRegularExpression::UseUnicodePropertiesOption));
 
   return text;
 
 }
 
-QString CollectionModel::SortTextForArtist(QString artist) {
+QString CollectionModel::SortTextForArtist(QString artist, const bool skip_articles) {
 
   artist = SortText(artist);
 
-  for (const auto &i : Song::kArticles) {
-    if (artist.startsWith(i)) {
-      qint64 ilen = i.length();
-      artist = artist.right(artist.length() - ilen) + ", " + i.left(ilen - 1);
-      break;
+  if (skip_articles) {
+    for (const auto &i : Song::kArticles) {
+      if (artist.startsWith(i)) {
+        qint64 ilen = i.length();
+        artist = artist.right(artist.length() - ilen) + QStringLiteral(", ") + i.left(ilen - 1);
+        break;
+      }
     }
   }
 
@@ -1737,27 +1777,27 @@ QString CollectionModel::SortTextForArtist(QString artist) {
 
 QString CollectionModel::SortTextForNumber(const int number) {
 
-  return QString("%1").arg(number, 4, 10, QChar('0'));
+  return QStringLiteral("%1").arg(number, 4, 10, QLatin1Char('0'));
 }
 
 QString CollectionModel::SortTextForYear(const int year) {
 
   QString str = QString::number(year);
-  return QString("0").repeated(qMax(0, 4 - str.length())) + str;
+  return QStringLiteral("0").repeated(qMax(0, 4 - str.length())) + str;
 
 }
 
 QString CollectionModel::SortTextForBitrate(const int bitrate) {
 
   QString str = QString::number(bitrate);
-  return QString("0").repeated(qMax(0, 3 - str.length())) + str;
+  return QStringLiteral("0").repeated(qMax(0, 3 - str.length())) + str;
 
 }
 
 QString CollectionModel::SortTextForSong(const Song &song) {
 
   QString ret = QString::number(std::max(0, song.disc()) * 1000 + std::max(0, song.track()));
-  ret.prepend(QString("0").repeated(6 - ret.length()));
+  ret.prepend(QStringLiteral("0").repeated(6 - ret.length()));
   ret.append(song.url().toString());
   return ret;
 
@@ -1779,7 +1819,7 @@ Qt::ItemFlags CollectionModel::flags(const QModelIndex &idx) const {
 }
 
 QStringList CollectionModel::mimeTypes() const {
-  return QStringList() << "text/uri-list";
+  return QStringList() << QStringLiteral("text/uri-list");
 }
 
 QMimeData *CollectionModel::mimeData(const QModelIndexList &indexes) const {
@@ -1819,10 +1859,10 @@ bool CollectionModel::CompareItems(const CollectionItem *a, const CollectionItem
 
 }
 
-qint64 CollectionModel::MaximumCacheSize(QSettings *s, const char *size_id, const char *size_unit_id, const qint64 cache_size_default) {
+qint64 CollectionModel::MaximumCacheSize(Settings *s, const char *size_id, const char *size_unit_id, const qint64 cache_size_default) {
 
-  qint64 size = s->value(size_id, cache_size_default).toInt();
-  int unit = s->value(size_unit_id, static_cast<int>(CollectionSettingsPage::CacheSizeUnit::MB)).toInt() + 1;
+  qint64 size = s->value(QLatin1String(size_id), cache_size_default).toInt();
+  int unit = s->value(QLatin1String(size_unit_id), static_cast<int>(CollectionSettingsPage::CacheSizeUnit::MB)).toInt() + 1;
 
   do {
     size *= 1024;
@@ -1836,7 +1876,7 @@ qint64 CollectionModel::MaximumCacheSize(QSettings *s, const char *size_id, cons
 void CollectionModel::GetChildSongs(CollectionItem *item, QList<QUrl> *urls, SongList *songs, QSet<int> *song_ids) const {
 
   switch (item->type) {
-    case CollectionItem::Type_Container: {
+    case CollectionItem::Type_Container:{
       const_cast<CollectionModel*>(this)->LazyPopulate(item);
 
       QList<CollectionItem*> children = item->children;
@@ -1970,8 +2010,10 @@ void CollectionModel::ClearDiskCache() {
 
 void CollectionModel::ExpandAll(CollectionItem *item) const {
 
+  if (!root_) return;
+
   if (!item) item = root_;
-  const_cast<CollectionModel*>(this)->LazyPopulate(const_cast<CollectionItem*>(item), false);
+  const_cast<CollectionModel*>(this)->LazyPopulate(item, false);
   for (CollectionItem *child : item->children) {
     ExpandAll(child);
   }

src/collection/collectionmodel.h

@@ -2,7 +2,7 @@
  * Strawberry Music Player
  * This file was part of Clementine.
  * Copyright 2010, David Sansome <me@davidsansome.com>
- * Copyright 2018-2023, Jonas Kvinge <jonas@jkvinge.net>
+ * Copyright 2018-2024, Jonas Kvinge <jonas@jkvinge.net>
  *
  * Strawberry is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -55,7 +55,7 @@
 #include "collectionqueryoptions.h"
 #include "collectionitem.h"
 
-class QSettings;
+class Settings;
 
 class Application;
 class CollectionBackend;
@@ -82,7 +82,7 @@ class CollectionModel : public SimpleTreeModel<CollectionItem> {
     LastRole
   };
 
-  // These values get saved in QSettings - don't change them
+  // These values get saved in Settings - don't change them
   enum class GroupBy {
     None = 0,
     AlbumArtist = 1,
@@ -162,6 +162,9 @@ class CollectionModel : public SimpleTreeModel<CollectionItem> {
   // Whether or not to show letters heading in the collection view
   void set_show_dividers(const bool show_dividers);
 
+  // Whether to skip articles such as “The” when sorting artist names
+  void set_sort_skips_articles(const bool sort_skips_articles);
+
   // Reload settings.
   void ReloadSettings();
 
@@ -173,7 +176,7 @@ class CollectionModel : public SimpleTreeModel<CollectionItem> {
   static QString PrettyDisc(const int disc);
   static QString SortText(QString text);
   static QString SortTextForNumber(const int number);
-  static QString SortTextForArtist(QString artist);
+  static QString SortTextForArtist(QString artist, const bool skip_articles);
   static QString SortTextForSong(const Song &song);
   static QString SortTextForYear(const int year);
   static QString SortTextForBitrate(const int bitrate);
@@ -242,6 +245,7 @@ class CollectionModel : public SimpleTreeModel<CollectionItem> {
 
   bool HasCompilations(const QSqlDatabase &db, const CollectionFilterOptions &filter_options, const CollectionQueryOptions &query_options);
 
+  void Clear();
   void BeginReset();
 
   // Functions for working with queries and creating items.
@@ -271,13 +275,14 @@ class CollectionModel : public SimpleTreeModel<CollectionItem> {
   QVariant AlbumIcon(const QModelIndex &idx);
   QVariant data(const CollectionItem *item, const int role) const;
   bool CompareItems(const CollectionItem *a, const CollectionItem *b) const;
-  static qint64 MaximumCacheSize(QSettings *s, const char *size_id, const char *size_unit_id, const qint64 cache_size_default);
+  static qint64 MaximumCacheSize(Settings *s, const char *size_id, const char *size_unit_id, const qint64 cache_size_default);
 
  private:
   SharedPtr<CollectionBackend> backend_;
   Application *app_;
   CollectionDirectoryModel *dir_model_;
   bool show_various_artists_;
+  bool sort_skips_articles_;
 
   int total_song_count_;
   int total_artist_count_;

src/collection/collectionquery.cpp

@@ -2,7 +2,7 @@
  * Strawberry Music Player
  * This file was part of Clementine.
  * Copyright 2010, David Sansome <me@davidsansome.com>
- * Copyright 2018-2021, Jonas Kvinge <jonas@jkvinge.net>
+ * Copyright 2018-2024, Jonas Kvinge <jonas@jkvinge.net>
  *
  * Strawberry is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -30,8 +30,8 @@
 #include <QStringBuilder>
 #include <QRegularExpression>
 #include <QSqlDatabase>
-#include <QSqlQuery>
 
+#include "core/sqlquery.h"
 #include "core/song.h"
 
 #include "collectionquery.h"
@@ -39,7 +39,7 @@
 #include "utilities/searchparserutils.h"
 
 CollectionQuery::CollectionQuery(const QSqlDatabase &db, const QString &songs_table, const QString &fts_table, const CollectionFilterOptions &filter_options)
-    : QSqlQuery(db),
+    : SqlQuery(db),
       songs_table_(songs_table),
       fts_table_(fts_table),
       include_unavailable_(false),
@@ -54,68 +54,57 @@ CollectionQuery::CollectionQuery(const QSqlDatabase &db, const QString &songs_ta
     //  3) Remove colons which don't correspond to column names.
 
     // Split on whitespace
+    QString filter_text = filter_options.filter_text().replace(QRegularExpression(QStringLiteral(":\\s+")), QStringLiteral(":"));
 #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-    QStringList tokens(filter_options.filter_text().split(QRegularExpression("\\s+"), Qt::SkipEmptyParts));
+    QStringList tokens(filter_text.split(QRegularExpression(QStringLiteral("\\s+")), Qt::SkipEmptyParts));
 #else
-    QStringList tokens(filter_options.filter_text().split(QRegularExpression("\\s+"), QString::SkipEmptyParts));
+    QStringList tokens(filter_text.split(QRegularExpression(QStringLiteral("\\s+")), QString::SkipEmptyParts));
 #endif
     QString query;
     for (QString token : tokens) {
-      token.remove('(');
-      token.remove(')');
-      token.remove('"');
-      token.replace('-', ' ');
+      token.remove(QLatin1Char('('))
+           .remove(QLatin1Char(')'))
+           .remove(QLatin1Char('"'))
+           .replace(QLatin1Char('-'), QLatin1Char(' '));
 
-      if (token.contains(':')) {
-        // Only prefix fts if the token is a valid column name.
-        if (Song::kFtsColumns.contains("fts" + token.section(':', 0, 0), Qt::CaseInsensitive)) {
-          // Account for multiple colons.
-          QString columntoken = token.section(':', 0, 0, QString::SectionIncludeTrailingSep);
-          QString subtoken = token.section(':', 1, -1);
-          subtoken.replace(":", " ");
-          subtoken = subtoken.trimmed();
-          if (!subtoken.isEmpty()) {
-            if (!query.isEmpty()) query.append(" ");
-            query += "fts" + columntoken + "\"" + subtoken + "\"*";
+      if (token.contains(QLatin1Char(':'))) {
+        const QString columntoken = token.section(QLatin1Char(':'), 0, 0);
+        QString subtoken = token.section(QLatin1Char(':'), 1, -1).replace(QLatin1String(":"), QLatin1String(" ")).trimmed();
+        if (subtoken.isEmpty()) continue;
+        if (Song::kFtsColumns.contains(QLatin1String("fts") + columntoken, Qt::CaseInsensitive)) {
+          if (!query.isEmpty()) query.append(QLatin1String(" "));
+          query += QStringLiteral("fts") + columntoken + QStringLiteral(":\"") + subtoken + QStringLiteral("\"*");
+        }
+        else if (Song::kNumericalColumns.contains(columntoken, Qt::CaseInsensitive)) {
+          QString comparator = RemoveSqlOperator(subtoken);
+          if (columntoken.compare(QLatin1String("rating"), Qt::CaseInsensitive) == 0) {
+            AddWhereRating(subtoken, comparator);
+          }
+          else if (columntoken.compare(QLatin1String("length"), Qt::CaseInsensitive) == 0) {
+            // Time is saved in nanoseconds, so add 9 0's
+            QString parsedTime = QString::number(Utilities::ParseSearchTime(subtoken)) + QStringLiteral("000000000");
+            AddWhere(columntoken, parsedTime, comparator);
+          }
+          else {
+            AddWhere(columntoken, subtoken, comparator);
           }
         }
-        else if (Song::kNumericalColumns.contains(token.section(':', 0, 0), Qt::CaseInsensitive)) {
-          // Account for multiple colons.
-          QString columntoken = token.section(':', 0, 0);
-          QString subtoken = token.section(':', 1, -1);
-          subtoken = subtoken.trimmed();
-          if (!subtoken.isEmpty()) {
-            QString comparator = RemoveSqlOperator(subtoken);
-            if (columntoken.compare("rating", Qt::CaseInsensitive) == 0) {
-              subtoken.replace(":", " ");
-              AddWhereRating(subtoken, comparator);
-            }
-            else if (columntoken.compare("length", Qt::CaseInsensitive) == 0) {
-              // time is saved in nanoseconds, so add 9 0's
-              QString parsedTime = QString::number(Utilities::ParseSearchTime(subtoken)) + "000000000";
-              AddWhere(columntoken, parsedTime, comparator);
-            }
-            else {
-              subtoken.replace(":", " ");
-              AddWhere(columntoken, subtoken, comparator);
-            }
-          }
-        }
-        // not a valid filter, remove
+        // Not a valid filter, remove
         else {
-          token.replace(":", " ");
-          token = token.trimmed();
-          if (!query.isEmpty()) query.append(" ");
-          query += "\"" + token + "\"*";
+          token = token.replace(QLatin1String(":"), QLatin1String(" ")).trimmed();
+          if (!token.isEmpty()) {
+            if (!query.isEmpty()) query.append(QLatin1Char(' '));
+            query += QLatin1Char('\"') + token + QStringLiteral("\"*");
+          }
         }
       }
       else {
-        if (!query.isEmpty()) query.append(" ");
-        query += "\"" + token + "\"*";
+        if (!query.isEmpty()) query.append(QLatin1Char(' '));
+        query += QLatin1Char('\"') + token + QStringLiteral("\"*");
       }
     }
     if (!query.isEmpty()) {
-      where_clauses_ << "fts.%fts_table_noprefix MATCH ?";
+      where_clauses_ << QStringLiteral("fts.%fts_table_noprefix MATCH ?");
       bound_values_ << query;
       join_with_fts_ = true;
     }
@@ -124,7 +113,7 @@ CollectionQuery::CollectionQuery(const QSqlDatabase &db, const QString &songs_ta
   if (filter_options.max_age() != -1) {
     qint64 cutoff = QDateTime::currentDateTime().toSecsSinceEpoch() - filter_options.max_age();
 
-    where_clauses_ << "ctime > ?";
+    where_clauses_ << QStringLiteral("ctime > ?");
     bound_values_ << cutoff;
   }
 
@@ -137,24 +126,25 @@ CollectionQuery::CollectionQuery(const QSqlDatabase &db, const QString &songs_ta
   duplicates_only_ = filter_options.filter_mode() == CollectionFilterOptions::FilterMode::Duplicates;
 
   if (filter_options.filter_mode() == CollectionFilterOptions::FilterMode::Untagged) {
-    where_clauses_ << "(artist = '' OR album = '' OR title ='')";
+    where_clauses_ << QStringLiteral("(artist = '' OR album = '' OR title ='')");
   }
 
 }
 
 QString CollectionQuery::RemoveSqlOperator(QString &token) {
 
-  QString op = "=";
-  static QRegularExpression rxOp("^(=|<[>=]?|>=?|!=)");
+  QString op = QStringLiteral("=");
+  static QRegularExpression rxOp(QStringLiteral("^(=|<[>=]?|>=?|!=)"));
   QRegularExpressionMatch match = rxOp.match(token);
   if (match.hasMatch()) {
     op = match.captured(0);
   }
   token.remove(rxOp);
 
-  if (op == "!=") {
-    op = "<>";
+  if (op == QStringLiteral("!=")) {
+    op = QStringLiteral("<>");
   }
+
   return op;
 
 }
@@ -162,16 +152,16 @@ QString CollectionQuery::RemoveSqlOperator(QString &token) {
 void CollectionQuery::AddWhere(const QString &column, const QVariant &value, const QString &op) {
 
   // Ignore 'literal' for IN
-  if (op.compare("IN", Qt::CaseInsensitive) == 0) {
+  if (op.compare(QLatin1String("IN"), Qt::CaseInsensitive) == 0) {
     QStringList values = value.toStringList();
     QStringList final_values;
     final_values.reserve(values.count());
     for (const QString &single_value : values) {
-      final_values.append("?");
+      final_values.append(QStringLiteral("?"));
       bound_values_ << single_value;
     }
 
-    where_clauses_ << QString("%1 IN (" + final_values.join(",") + ")").arg(column);
+    where_clauses_ << QStringLiteral("%1 IN (%2)").arg(column, final_values.join(QStringLiteral(",")));
   }
   else {
     // Do integers inline - sqlite seems to get confused when you pass integers to bound parameters
@@ -180,7 +170,7 @@ void CollectionQuery::AddWhere(const QString &column, const QVariant &value, con
 #else
     if (value.type() == QVariant::Int) {
 #endif
-      where_clauses_ << QString("%1 %2 %3").arg(column, op, value.toString());
+      where_clauses_ << QStringLiteral("%1 %2 %3").arg(column, op, value.toString());
     }
     else if (
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
@@ -189,11 +179,11 @@ void CollectionQuery::AddWhere(const QString &column, const QVariant &value, con
       value.type() == QVariant::String
 #endif
       && value.toString().isNull()) {
-      where_clauses_ << QString("%1 %2 ?").arg(column, op);
-      bound_values_ << QString("");
+      where_clauses_ << QStringLiteral("%1 %2 ?").arg(column, op);
+      bound_values_ << QLatin1String("");
     }
     else {
-      where_clauses_ << QString("%1 %2 ?").arg(column, op);
+      where_clauses_ << QStringLiteral("%1 %2 ?").arg(column, op);
       bound_values_ << value;
     }
   }
@@ -202,7 +192,7 @@ void CollectionQuery::AddWhere(const QString &column, const QVariant &value, con
 
 void CollectionQuery::AddWhereArtist(const QVariant &value) {
 
-  where_clauses_ << QString("((artist = ? AND albumartist = '') OR albumartist = ?)");
+  where_clauses_ << QStringLiteral("((artist = ? AND albumartist = '') OR albumartist = ?)");
   bound_values_ << value;
   bound_values_ << value;
 
@@ -214,27 +204,27 @@ void CollectionQuery::AddWhereRating(const QVariant &value, const QString &op) {
 
   // You can't query the database for a float, due to float precision errors,
   // So we have to use a certain tolerance, so that the searched value is definetly included.
-  const float tolerance = 0.001;
-  if (op == "<") {
-    AddWhere("rating", parsed_rating-tolerance, "<");
+  const float tolerance = 0.001F;
+  if (op == QStringLiteral("<")) {
+    AddWhere(QStringLiteral("rating"), parsed_rating-tolerance, QStringLiteral("<"));
   }
-  else if (op == ">") {
-    AddWhere("rating", parsed_rating+tolerance, ">");
+  else if (op == QStringLiteral(">")) {
+    AddWhere(QStringLiteral("rating"), parsed_rating+tolerance, QStringLiteral(">"));
   }
-  else if (op == "<=") {
-    AddWhere("rating", parsed_rating+tolerance, "<=");
+  else if (op == QStringLiteral("<=")) {
+    AddWhere(QStringLiteral("rating"), parsed_rating+tolerance, QStringLiteral("<="));
   }
-  else if (op == ">=") {
-    AddWhere("rating", parsed_rating-tolerance, ">=");
+  else if (op == QStringLiteral(">=")) {
+    AddWhere(QStringLiteral("rating"), parsed_rating-tolerance, QStringLiteral(">="));
   }
-  else if (op == "<>") {
-    where_clauses_ << QString("(rating<? OR rating>?)");
+  else if (op == QStringLiteral("<>")) {
+    where_clauses_ << QStringLiteral("(rating<? OR rating>?)");
     bound_values_ << parsed_rating - tolerance;
     bound_values_ << parsed_rating + tolerance;
   }
   else /* (op == "=") */ {
-    AddWhere("rating", parsed_rating+tolerance, "<");
-    AddWhere("rating", parsed_rating-tolerance, ">");
+    AddWhere(QStringLiteral("rating"), parsed_rating+tolerance, QStringLiteral("<"));
+    AddWhere(QStringLiteral("rating"), parsed_rating-tolerance, QStringLiteral(">"));
   }
 
 }
@@ -243,13 +233,13 @@ void CollectionQuery::AddCompilationRequirement(const bool compilation) {
   // The unary + is added to prevent sqlite from using the index idx_comp_artist.
   // When joining with fts, sqlite 3.8 has a tendency to use this index and thereby nesting the tables in an order which gives very poor performance
 
-  where_clauses_ << QString("+compilation_effective = %1").arg(compilation ? 1 : 0);
+  where_clauses_ << QStringLiteral("+compilation_effective = %1").arg(compilation ? 1 : 0);
 
 }
 
 QString CollectionQuery::GetInnerQuery() const {
   return duplicates_only_
-             ? QString(" INNER JOIN (select * from duplicated_songs) dsongs        "
+             ? QStringLiteral(" INNER JOIN (select * from duplicated_songs) dsongs        "
                    "ON (%songs_table.artist = dsongs.dup_artist       "
                    "AND %songs_table.album = dsongs.dup_album     "
                    "AND %songs_table.title = dsongs.dup_title)    ")
@@ -261,26 +251,26 @@ bool CollectionQuery::Exec() {
   QString sql;
 
   if (join_with_fts_) {
-    sql = QString("SELECT %1 FROM %2 INNER JOIN %3 AS fts ON %2.ROWID = fts.ROWID").arg(column_spec_, songs_table_, fts_table_);
+    sql = QStringLiteral("SELECT %1 FROM %2 INNER JOIN %3 AS fts ON %2.ROWID = fts.ROWID").arg(column_spec_, songs_table_, fts_table_);
   }
   else {
-    sql = QString("SELECT %1 FROM %2 %3").arg(column_spec_, songs_table_, GetInnerQuery());
+    sql = QStringLiteral("SELECT %1 FROM %2 %3").arg(column_spec_, songs_table_, GetInnerQuery());
   }
 
   QStringList where_clauses(where_clauses_);
   if (!include_unavailable_) {
-    where_clauses << "unavailable = 0";
+    where_clauses << QStringLiteral("unavailable = 0");
   }
 
-  if (!where_clauses.isEmpty()) sql += " WHERE " + where_clauses.join(" AND ");
+  if (!where_clauses.isEmpty()) sql += QStringLiteral(" WHERE ") + where_clauses.join(QStringLiteral(" AND "));
 
-  if (!order_by_.isEmpty()) sql += " ORDER BY " + order_by_;
+  if (!order_by_.isEmpty()) sql += QStringLiteral(" ORDER BY ") + order_by_;
 
-  if (limit_ != -1) sql += " LIMIT " + QString::number(limit_);
+  if (limit_ != -1) sql += QStringLiteral(" LIMIT ") + QString::number(limit_);
 
-  sql.replace("%songs_table", songs_table_);
-  sql.replace("%fts_table_noprefix", fts_table_.section('.', -1, -1));
-  sql.replace("%fts_table", fts_table_);
+  sql.replace(QLatin1String("%songs_table"), songs_table_);
+  sql.replace(QLatin1String("%fts_table_noprefix"), fts_table_.section(QLatin1Char('.'), -1, -1));
+  sql.replace(QLatin1String("%fts_table"), fts_table_);
 
   if (!QSqlQuery::prepare(sql)) return false;
 

src/collection/collectionquery.h

@@ -2,7 +2,7 @@
  * Strawberry Music Player
  * This file was part of Clementine.
  * Copyright 2010, David Sansome <me@davidsansome.com>
- * Copyright 2018-2021, Jonas Kvinge <jonas@jkvinge.net>
+ * Copyright 2018-2024, Jonas Kvinge <jonas@jkvinge.net>
  *
  * Strawberry is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -29,11 +29,12 @@
 #include <QString>
 #include <QStringList>
 #include <QSqlDatabase>
-#include <QSqlQuery>
+
+#include "core/sqlquery.h"
 
 #include "collectionfilteroptions.h"
 
-class CollectionQuery : public QSqlQuery {
+class CollectionQuery : public SqlQuery {
  public:
   explicit CollectionQuery(const QSqlDatabase &db, const QString &songs_table, const QString &fts_table, const CollectionFilterOptions &filter_options = CollectionFilterOptions());
 
@@ -41,7 +42,7 @@ class CollectionQuery : public QSqlQuery {
   QVariant value(const int column) const { return Value(column); }
 
   bool Exec();
-  bool exec() { return QSqlQuery::exec(); }
+  bool exec() { return SqlQuery::exec(); }
 
   bool Next();
 
@@ -67,9 +68,9 @@ class CollectionQuery : public QSqlQuery {
   QString RemoveSqlOperator(QString &token);
   // Adds a fragment of WHERE clause. When executed, this Query will connect all the fragments with AND operator.
   // Please note that IN operator expects a QStringList as value.
-  void AddWhere(const QString &column, const QVariant &value, const QString &op = "=");
+  void AddWhere(const QString &column, const QVariant &value, const QString &op = QStringLiteral("="));
   void AddWhereArtist(const QVariant &value);
-  void AddWhereRating(const QVariant &value, const QString &op = "=");
+  void AddWhereRating(const QVariant &value, const QString &op = QStringLiteral("="));
 
   void SetBoundValues(const QVariantList &bound_values) { bound_values_ = bound_values; }
   void SetDuplicatesOnly(const bool duplicates_only) { duplicates_only_ = duplicates_only; }

src/collection/collectionqueryoptions.h

@@ -30,7 +30,7 @@ class CollectionQueryOptions {
   explicit CollectionQueryOptions();
 
   struct Where {
-    explicit Where(const QString _column = QString(), const QVariant _value = QString(), const QString _op = QString()) : column(_column), value(_value), op(_op) {}
+    explicit Where(const QString &_column = QString(), const QVariant &_value = QString(), const QString &_op = QString()) : column(_column), value(_value), op(_op) {}
     QString column;
     QVariant value;
     QString op;
@@ -51,7 +51,7 @@ class CollectionQueryOptions {
   void set_query_have_compilations(const bool query_have_compilations) { query_have_compilations_ = query_have_compilations; }
 
   QList<Where> where_clauses() const { return where_clauses_; }
-  void AddWhere(const QString &column, const QVariant &value, const QString &op = "=");
+  void AddWhere(const QString &column, const QVariant &value, const QString &op = QStringLiteral("="));
 
  private:
   QString column_spec_;

src/collection/collectionview.cpp

@@ -21,6 +21,7 @@
 
 #include "config.h"
 
+#include <utility>
 #include <memory>
 
 #include <QtGlobal>
@@ -52,6 +53,7 @@
 #include "core/mimedata.h"
 #include "core/musicstorage.h"
 #include "core/deletefiles.h"
+#include "core/settings.h"
 #include "utilities/filemanagerutils.h"
 #include "collection.h"
 #include "collectionbackend.h"
@@ -80,7 +82,7 @@ CollectionView::CollectionView(QWidget *parent)
       total_song_count_(-1),
       total_artist_count_(-1),
       total_album_count_(-1),
-      nomusic_(":/pictures/nomusic.png"),
+      nomusic_(QStringLiteral(":/pictures/nomusic.png")),
       context_menu_(nullptr),
       action_load_(nullptr),
       action_add_to_playlist_(nullptr),
@@ -88,6 +90,7 @@ CollectionView::CollectionView(QWidget *parent)
       action_add_to_playlist_enqueue_next_(nullptr),
       action_open_in_new_playlist_(nullptr),
       action_organize_(nullptr),
+      action_search_for_this_(nullptr),
 #ifndef Q_OS_WIN
       action_copy_to_device_(nullptr),
 #endif
@@ -109,7 +112,7 @@ CollectionView::CollectionView(QWidget *parent)
   setDragDropMode(QAbstractItemView::DragOnly);
   setSelectionMode(QAbstractItemView::ExtendedSelection);
 
-  setStyleSheet("QTreeView::item{padding-top:1px;}");
+  setStyleSheet(QStringLiteral("QTreeView::item{padding-top:1px;}"));
 
 }
 
@@ -128,7 +131,7 @@ void CollectionView::SaveFocus() {
   last_selected_container_ = QString();
 
   switch (type.toInt()) {
-    case CollectionItem::Type_Song: {
+    case CollectionItem::Type_Song:{
       QModelIndex index = qobject_cast<QSortFilterProxyModel*>(model())->mapToSource(current);
       SongList songs = app_->collection_model()->GetChildSongs(index);
       if (!songs.isEmpty()) {
@@ -138,7 +141,7 @@ void CollectionView::SaveFocus() {
     }
 
     case CollectionItem::Type_Container:
-    case CollectionItem::Type_Divider: {
+    case CollectionItem::Type_Divider:{
       QString text = model()->data(current, CollectionModel::Role_SortText).toString();
       last_selected_container_ = text;
       break;
@@ -197,7 +200,7 @@ bool CollectionView::RestoreLevelFocus(const QModelIndex &parent) {
         break;
 
       case CollectionItem::Type_Container:
-      case CollectionItem::Type_Divider: {
+      case CollectionItem::Type_Divider:{
         QString text = model()->data(current, CollectionModel::Role_SortText).toString();
         if (!last_selected_container_.isEmpty() && last_selected_container_ == text) {
           expand(current);
@@ -224,7 +227,7 @@ bool CollectionView::RestoreLevelFocus(const QModelIndex &parent) {
 
 void CollectionView::ReloadSettings() {
 
-  QSettings settings;
+  Settings settings;
 
   settings.beginGroup(CollectionSettingsPage::kSettingsGroup);
   SetAutoOpen(settings.value("auto_open", false).toBool());
@@ -232,6 +235,7 @@ void CollectionView::ReloadSettings() {
   if (app_) {
     app_->collection_model()->set_pretty_covers(settings.value("pretty_covers", true).toBool());
     app_->collection_model()->set_show_dividers(settings.value("show_dividers", true).toBool());
+    app_->collection_model()->set_sort_skips_articles(settings.value("sort_skips_articles", true).toBool());
   }
 
   delete_files_ = settings.value("delete_files", false).toBool();
@@ -343,29 +347,49 @@ void CollectionView::mouseReleaseEvent(QMouseEvent *e) {
 
 }
 
+void CollectionView::keyPressEvent(QKeyEvent *e) {
+
+  switch (e->key()) {
+    case Qt::Key_Enter:
+    case Qt::Key_Return:
+      if (currentIndex().isValid()) {
+        AddToPlaylist();
+      }
+      e->accept();
+      break;
+  }
+
+  AutoExpandingTreeView::keyPressEvent(e);
+
+}
+
 void CollectionView::contextMenuEvent(QContextMenuEvent *e) {
 
   if (!context_menu_) {
     context_menu_ = new QMenu(this);
-    action_add_to_playlist_ = context_menu_->addAction(IconLoader::Load("media-playback-start"), tr("Append to current playlist"), this, &CollectionView::AddToPlaylist);
-    action_load_ = context_menu_->addAction(IconLoader::Load("media-playback-start"), tr("Replace current playlist"), this, &CollectionView::Load);
-    action_open_in_new_playlist_ = context_menu_->addAction(IconLoader::Load("document-new"), tr("Open in new playlist"), this, &CollectionView::OpenInNewPlaylist);
+    action_add_to_playlist_ = context_menu_->addAction(IconLoader::Load(QStringLiteral("media-playback-start")), tr("Append to current playlist"), this, &CollectionView::AddToPlaylist);
+    action_load_ = context_menu_->addAction(IconLoader::Load(QStringLiteral("media-playback-start")), tr("Replace current playlist"), this, &CollectionView::Load);
+    action_open_in_new_playlist_ = context_menu_->addAction(IconLoader::Load(QStringLiteral("document-new")), tr("Open in new playlist"), this, &CollectionView::OpenInNewPlaylist);
 
     context_menu_->addSeparator();
-    action_add_to_playlist_enqueue_ = context_menu_->addAction(IconLoader::Load("go-next"), tr("Queue track"), this, &CollectionView::AddToPlaylistEnqueue);
-    action_add_to_playlist_enqueue_next_ = context_menu_->addAction(IconLoader::Load("go-next"), tr("Queue to play next"), this, &CollectionView::AddToPlaylistEnqueueNext);
+    action_add_to_playlist_enqueue_ = context_menu_->addAction(IconLoader::Load(QStringLiteral("go-next")), tr("Queue track"), this, &CollectionView::AddToPlaylistEnqueue);
+    action_add_to_playlist_enqueue_next_ = context_menu_->addAction(IconLoader::Load(QStringLiteral("go-next")), tr("Queue to play next"), this, &CollectionView::AddToPlaylistEnqueueNext);
 
     context_menu_->addSeparator();
-    action_organize_ = context_menu_->addAction(IconLoader::Load("edit-copy"), tr("Organize files..."), this, &CollectionView::Organize);
+
+    action_search_for_this_ = context_menu_->addAction(IconLoader::Load(QStringLiteral("edit-find")), tr("Search for this"), this, &CollectionView::SearchForThis);
+
+    context_menu_->addSeparator();
+    action_organize_ = context_menu_->addAction(IconLoader::Load(QStringLiteral("edit-copy")), tr("Organize files..."), this, &CollectionView::Organize);
 #ifndef Q_OS_WIN
-    action_copy_to_device_ = context_menu_->addAction(IconLoader::Load("device"), tr("Copy to device..."), this, &CollectionView::CopyToDevice);
+    action_copy_to_device_ = context_menu_->addAction(IconLoader::Load(QStringLiteral("device")), tr("Copy to device..."), this, &CollectionView::CopyToDevice);
 #endif
-    action_delete_files_ = context_menu_->addAction(IconLoader::Load("edit-delete"), tr("Delete from disk..."), this, &CollectionView::Delete);
+    action_delete_files_ = context_menu_->addAction(IconLoader::Load(QStringLiteral("edit-delete")), tr("Delete from disk..."), this, &CollectionView::Delete);
 
     context_menu_->addSeparator();
-    action_edit_track_ = context_menu_->addAction(IconLoader::Load("edit-rename"), tr("Edit track information..."), this, &CollectionView::EditTracks);
-    action_edit_tracks_ = context_menu_->addAction(IconLoader::Load("edit-rename"), tr("Edit tracks information..."), this, &CollectionView::EditTracks);
-    action_show_in_browser_ = context_menu_->addAction(IconLoader::Load("document-open-folder"), tr("Show in file browser..."), this, &CollectionView::ShowInBrowser);
+    action_edit_track_ = context_menu_->addAction(IconLoader::Load(QStringLiteral("edit-rename")), tr("Edit track information..."), this, &CollectionView::EditTracks);
+    action_edit_tracks_ = context_menu_->addAction(IconLoader::Load(QStringLiteral("edit-rename")), tr("Edit tracks information..."), this, &CollectionView::EditTracks);
+    action_show_in_browser_ = context_menu_->addAction(IconLoader::Load(QStringLiteral("document-open-folder")), tr("Show in file browser..."), this, &CollectionView::ShowInBrowser);
 
     context_menu_->addSeparator();
 
@@ -391,7 +415,7 @@ void CollectionView::contextMenuEvent(QContextMenuEvent *e) {
 
   context_menu_index_ = qobject_cast<QSortFilterProxyModel*>(model())->mapToSource(context_menu_index_);
 
-  QModelIndexList selected_indexes = qobject_cast<QSortFilterProxyModel*>(model())->mapSelectionToSource(selectionModel()->selection()).indexes();
+  const QModelIndexList selected_indexes = qobject_cast<QSortFilterProxyModel*>(model())->mapSelectionToSource(selectionModel()->selection()).indexes();
 
   int regular_elements = 0;
   int regular_editable = 0;
@@ -462,7 +486,8 @@ void CollectionView::SetShowInVarious(const bool on) {
   // We put through "Various Artists" changes one album at a time,
   // to make sure the old album node gets removed (due to all children removed), before the new one gets added
   QMultiMap<QString, QString> albums;
-  for (const Song &song : GetSelectedSongs()) {
+  const SongList songs = GetSelectedSongs();
+  for (const Song &song : songs) {
     if (albums.find(song.album(), song.artist()) == albums.end())
       albums.insert(song.album(), song.artist());
   }
@@ -472,7 +497,7 @@ void CollectionView::SetShowInVarious(const bool on) {
   if (on && albums.keys().count() == 1) {
     const QStringList albums_list = albums.keys();
     const QString album = albums_list.first();
-    SongList all_of_album = app_->collection_backend()->GetSongsByAlbum(album);
+    const SongList all_of_album = app_->collection_backend()->GetSongsByAlbum(album);
     QSet<QString> other_artists;
     for (const Song &s : all_of_album) {
       if (!albums.contains(album, s.artist()) && !other_artists.contains(s.artist())) {
@@ -489,9 +514,9 @@ void CollectionView::SetShowInVarious(const bool on) {
   }
 
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
-  QSet<QString> albums_set = QSet<QString>(albums.keyBegin(), albums.keyEnd());
+  const QSet<QString> albums_set = QSet<QString>(albums.keyBegin(), albums.keyEnd());
 #else
-  QSet<QString> albums_set = QSet<QString>::fromList(albums.keys());
+  const QSet<QString> albums_set = QSet<QString>::fromList(albums.keys());
 #endif
   for (const QString &album : albums_set) {
     app_->collection_backend()->ForceCompilation(album, albums.values(album), on);
@@ -545,6 +570,100 @@ void CollectionView::OpenInNewPlaylist() {
 
 }
 
+void CollectionView::SearchForThis() {
+
+  QModelIndex current = currentIndex();
+  QVariant type = model()->data(current, CollectionModel::Role_Type);
+  if (!type.isValid() || (type.toInt() != CollectionItem::Type_Song && type.toInt() != CollectionItem::Type_Container && type.toInt() != CollectionItem::Type_Divider)) {
+    return;
+  }
+  QString search;
+  QModelIndex index = qobject_cast<QSortFilterProxyModel*>(model())->mapToSource(current);
+
+  switch (type.toInt()) {
+    case CollectionItem::Type_Song:{
+      SongList songs = app_->collection_model()->GetChildSongs(index);
+      if (!songs.isEmpty()) {
+        last_selected_song_ = songs.last();
+      }
+      search = QStringLiteral("title:%1").arg(last_selected_song_.title());
+      break;
+    }
+
+    case CollectionItem::Type_Divider:{
+      break;
+    }
+
+    case CollectionItem::Type_Container:{
+      CollectionItem *item = app_->collection_model()->IndexToItem(index);
+
+      int container_level = item->container_level;
+      CollectionModel::GroupBy container_group_by = app_->collection_model()->GetGroupBy()[container_level];
+
+      switch (container_group_by) {
+        case CollectionModel::GroupBy::AlbumArtist:
+          search = QStringLiteral("albumartist:%1").arg(item->metadata.effective_albumartist());
+          break;
+        case CollectionModel::GroupBy::Artist:
+          search = QStringLiteral("artist:%1").arg(item->metadata.artist());
+          break;
+        case CollectionModel::GroupBy::Album:
+          search = QStringLiteral("album:%1").arg(item->metadata.album());
+          break;
+        case CollectionModel::GroupBy::AlbumDisc:
+          search = QStringLiteral("album:%1").arg(item->metadata.album());
+          break;
+        case CollectionModel::GroupBy::YearAlbum:
+        case CollectionModel::GroupBy::YearAlbumDisc:{
+          search = QStringLiteral("year:%1 album:%2").arg(item->metadata.year()).arg(item->metadata.album());
+          break;
+        }
+        case CollectionModel::GroupBy::OriginalYearAlbum:
+        case CollectionModel::GroupBy::OriginalYearAlbumDisc:{
+          search = QStringLiteral("year:%1 album:%2").arg(item->metadata.effective_originalyear()).arg(item->metadata.album());
+          break;
+        }
+        case CollectionModel::GroupBy::Year:
+          search = QStringLiteral("year:%1").arg(item->metadata.year());
+          break;
+        case CollectionModel::GroupBy::OriginalYear:
+          search = QStringLiteral("year:%1").arg(item->metadata.effective_originalyear());
+          break;
+        case CollectionModel::GroupBy::Genre:
+          search = QStringLiteral("genre:%1").arg(item->metadata.genre());
+          break;
+        case CollectionModel::GroupBy::Composer:
+          search = QStringLiteral("composer:%1").arg(item->metadata.composer());
+          break;
+        case CollectionModel::GroupBy::Performer:
+          search = QStringLiteral("performer:%1").arg(item->metadata.performer());
+          break;
+        case CollectionModel::GroupBy::Grouping:
+          search = QStringLiteral("grouping:%1").arg(item->metadata.grouping());
+          break;
+        case CollectionModel::GroupBy::Samplerate:
+          search = QStringLiteral("samplerate:%1").arg(item->metadata.samplerate());
+          break;
+        case CollectionModel::GroupBy::Bitdepth:
+          search = QStringLiteral("bitdepth:%1").arg(item->metadata.bitdepth());
+          break;
+        case CollectionModel::GroupBy::Bitrate:
+          search = QStringLiteral("bitrate:%1").arg(item->metadata.bitrate());
+          break;
+        default:
+          search = model()->data(current, Qt::DisplayRole).toString();
+      }
+      break;
+    }
+
+    default:
+      return;
+  }
+
+  filter_->ShowInCollection(search);
+
+}
+
 void CollectionView::keyboardSearch(const QString &search) {
 
   is_in_keyboard_search_ = true;
@@ -646,7 +765,7 @@ void CollectionView::FilterReturnPressed() {
 
 void CollectionView::ShowInBrowser() const {
 
-  SongList songs = GetSelectedSongs();
+  const SongList songs = GetSelectedSongs();
   QList<QUrl> urls;
   urls.reserve(songs.count());
   for (const Song &song : songs) {
@@ -671,7 +790,7 @@ void CollectionView::Delete() {
 
   if (!delete_files_) return;
 
-  SongList selected_songs = GetSelectedSongs();
+  const SongList selected_songs = GetSelectedSongs();
 
   SongList songs;
   QStringList files;

src/collection/collectionview.h

@@ -93,6 +93,7 @@ class CollectionView : public AutoExpandingTreeView {
  protected:
   // QWidget
   void paintEvent(QPaintEvent *event) override;
+  void keyPressEvent(QKeyEvent *e) override;
   void mouseReleaseEvent(QMouseEvent *e) override;
   void contextMenuEvent(QContextMenuEvent *e) override;
 
@@ -102,6 +103,7 @@ class CollectionView : public AutoExpandingTreeView {
   void AddToPlaylistEnqueue();
   void AddToPlaylistEnqueueNext();
   void OpenInNewPlaylist();
+  void SearchForThis();
   void Organize();
   void CopyToDevice();
   void EditTracks();
@@ -136,6 +138,8 @@ class CollectionView : public AutoExpandingTreeView {
   QAction *action_add_to_playlist_enqueue_next_;
   QAction *action_open_in_new_playlist_;
   QAction *action_organize_;
+  QAction *action_search_for_this_;
+
 #ifndef Q_OS_WIN
   QAction *action_copy_to_device_;
 #endif

src/collection/collectionwatcher.cpp

@@ -48,6 +48,7 @@
 #include "core/logging.h"
 #include "core/tagreaderclient.h"
 #include "core/taskmanager.h"
+#include "core/settings.h"
 #include "utilities/imageutils.h"
 #include "utilities/timeconstants.h"
 #include "collectiondirectory.h"
@@ -70,7 +71,8 @@
 
 using namespace std::chrono_literals;
 
-QStringList CollectionWatcher::sValidImages = QStringList() << "jpg" << "png" << "gif" << "jpeg";
+QStringList CollectionWatcher::sValidImages = QStringList() << QStringLiteral("jpg") << QStringLiteral("png") << QStringLiteral("gif") << QStringLiteral("jpeg");
+QStringList CollectionWatcher::kIgnoredExtensions = QStringList() << QStringLiteral("tmp") << QStringLiteral("tar") << QStringLiteral("gz") << QStringLiteral("bz2") << QStringLiteral("xz") << QStringLiteral("tbz") << QStringLiteral("tgz") << QStringLiteral("z") << QStringLiteral("zip") << QStringLiteral("rar");
 
 CollectionWatcher::CollectionWatcher(Song::Source source, QObject *parent)
     : QObject(parent),
@@ -104,7 +106,7 @@ CollectionWatcher::CollectionWatcher(Song::Source source, QObject *parent)
   periodic_scan_timer_->setInterval(86400 * kMsecPerSec);
   periodic_scan_timer_->setSingleShot(false);
 
-  QStringList image_formats = ImageUtils::SupportedImageFormats();
+  const QStringList image_formats = ImageUtils::SupportedImageFormats();
   for (const QString &format : image_formats) {
     if (!sValidImages.contains(format)) {
       sValidImages.append(format);
@@ -149,11 +151,11 @@ void CollectionWatcher::ReloadSettingsAsync() {
 void CollectionWatcher::ReloadSettings() {
 
   const bool was_monitoring_before = monitor_;
-  QSettings s;
+  Settings s;
   s.beginGroup(CollectionSettingsPage::kSettingsGroup);
   scan_on_startup_ = s.value("startup_scan", true).toBool();
   monitor_ = s.value("monitor", true).toBool();
-  QStringList filters = s.value("cover_art_patterns", QStringList() << "front" << "cover").toStringList();
+  const QStringList filters = s.value("cover_art_patterns", QStringList() << QStringLiteral("front") << QStringLiteral("cover")).toStringList();
   if (source_ == Song::Source::Collection) {
     song_tracking_ = s.value("song_tracking", false).toBool();
     song_ebur128_loudness_analysis_ = s.value("song_ebur128_loudness_analysis", false).toBool();
@@ -181,7 +183,7 @@ void CollectionWatcher::ReloadSettings() {
   else if (monitor_ && !was_monitoring_before) {
     // Add all directories to all QFileSystemWatchers again
     for (const CollectionDirectory &dir : std::as_const(watched_dirs_)) {
-      CollectionSubdirectoryList subdirs = backend_->SubdirsInDirectory(dir.id);
+      const CollectionSubdirectoryList subdirs = backend_->SubdirsInDirectory(dir.id);
       for (const CollectionSubdirectory &subdir : subdirs) {
         AddWatch(dir, subdir.path);
       }
@@ -286,7 +288,7 @@ void CollectionWatcher::ScanTransaction::CommitNewOrUpdatedSongs() {
     touched_subdirs.clear();
   }
 
-  for (const CollectionSubdirectory &subdir : deleted_subdirs) {
+  for (const CollectionSubdirectory &subdir : std::as_const(deleted_subdirs)) {
     if (watcher_->watched_dirs_.contains(dir_)) {
       watcher_->RemoveWatch(watcher_->watched_dirs_[dir_], subdir);
     }
@@ -295,7 +297,7 @@ void CollectionWatcher::ScanTransaction::CommitNewOrUpdatedSongs() {
 
   if (watcher_->monitor_) {
     // Watch the new subdirectories
-    for (const CollectionSubdirectory &subdir : new_subdirs) {
+    for (const CollectionSubdirectory &subdir : std::as_const(new_subdirs)) {
       if (watcher_->watched_dirs_.contains(dir_)) {
         watcher_->AddWatch(watcher_->watched_dirs_[dir_], subdir.path);
       }
@@ -315,7 +317,7 @@ SongList CollectionWatcher::ScanTransaction::FindSongsInSubdirectory(const QStri
   if (cached_songs_dirty_) {
     const SongList songs = watcher_->backend_->FindSongsInDirectory(dir_);
     for (const Song &song : songs) {
-      const QString p = song.url().toLocalFile().section('/', 0, -2);
+      const QString p = song.url().toLocalFile().section(QLatin1Char('/'), 0, -2);
       cached_songs_.insert(p, song);
     }
     cached_songs_dirty_ = false;
@@ -333,7 +335,7 @@ bool CollectionWatcher::ScanTransaction::HasSongsWithMissingFingerprint(const QS
   if (cached_songs_missing_fingerprint_dirty_) {
     const SongList songs = watcher_->backend_->SongsWithMissingFingerprint(dir_);
     for (const Song &song : songs) {
-      const QString p = song.url().toLocalFile().section('/', 0, -2);
+      const QString p = song.url().toLocalFile().section(QLatin1Char('/'), 0, -2);
       cached_songs_missing_fingerprint_.insert(p, song);
     }
     cached_songs_missing_fingerprint_dirty_ = false;
@@ -348,7 +350,7 @@ bool CollectionWatcher::ScanTransaction::HasSongsWithMissingLoudnessCharacterist
   if (cached_songs_missing_loudness_characteristics_dirty_) {
     const SongList songs = watcher_->backend_->SongsWithMissingLoudnessCharacteristics(dir_);
     for (const Song &song : songs) {
-      const QString p = song.url().toLocalFile().section('/', 0, -2);
+      const QString p = song.url().toLocalFile().section(QLatin1Char('/'), 0, -2);
       cached_songs_missing_loudness_characteristics_.insert(p, song);
     }
     cached_songs_missing_loudness_characteristics_dirty_ = false;
@@ -382,7 +384,7 @@ CollectionSubdirectoryList CollectionWatcher::ScanTransaction::GetImmediateSubdi
   }
 
   CollectionSubdirectoryList ret;
-  for (const CollectionSubdirectory &subdir : known_subdirs_) {
+  for (const CollectionSubdirectory &subdir : std::as_const(known_subdirs_)) {
     if (subdir.path.left(subdir.path.lastIndexOf(QDir::separator())) == path && subdir.mtime != 0) {
       ret << subdir;
     }
@@ -415,7 +417,7 @@ void CollectionWatcher::AddDirectory(const CollectionDirectory &dir, const Colle
     transaction.SetKnownSubdirs(subdirs);
     transaction.AddToProgressMax(files_count);
     ScanSubdirectory(dir.path, CollectionSubdirectory(), files_count, &transaction);
-    last_scan_time_ = QDateTime::currentDateTime().toSecsSinceEpoch();
+    last_scan_time_ = QDateTime::currentSecsSinceEpoch();
   }
   else {
     // We can do an incremental scan - looking at the mtimes of each subdirectory and only rescan if the directory has changed.
@@ -432,7 +434,7 @@ void CollectionWatcher::AddDirectory(const CollectionDirectory &dir, const Colle
       if (monitor_) AddWatch(dir, subdir.path);
     }
 
-    last_scan_time_ = QDateTime::currentDateTime().toSecsSinceEpoch();
+    last_scan_time_ = QDateTime::currentSecsSinceEpoch();
 
   }
 
@@ -479,7 +481,7 @@ void CollectionWatcher::ScanSubdirectory(const QString &path, const CollectionSu
 
   // If a directory is moved then only its parent gets a changed notification, so we need to look and see if any of our children don't exist anymore.
   // If one has been removed, "rescan" it to get the deleted songs
-  CollectionSubdirectoryList previous_subdirs = t->GetImmediateSubdirs(path);
+  const CollectionSubdirectoryList previous_subdirs = t->GetImmediateSubdirs(path);
   for (const CollectionSubdirectory &prev_subdir : previous_subdirs) {
     if (!QFile::exists(prev_subdir.path) && prev_subdir.path != path) {
       ScanSubdirectory(prev_subdir.path, prev_subdir, 0, t, true);
@@ -509,7 +511,7 @@ void CollectionWatcher::ScanSubdirectory(const QString &path, const CollectionSu
     else {
       QString ext_part(ExtensionPart(child));
       QString dir_part(DirectoryPart(child));
-      if (child_info.suffix() == "tmp" || child_info.baseName() == "qt_temp") {
+      if (kIgnoredExtensions.contains(child_info.suffix(), Qt::CaseInsensitive) || child_info.baseName() == QStringLiteral("qt_temp")) {
         t->AddToProgress(1);
       }
       else if (sValidImages.contains(ext_part)) {
@@ -611,7 +613,7 @@ void CollectionWatcher::ScanSubdirectory(const QString &path, const CollectionSu
           Chromaprinter chromaprinter(file);
           fingerprint = chromaprinter.CreateFingerprint();
           if (fingerprint.isEmpty()) {
-            fingerprint = "NONE";
+            fingerprint = QStringLiteral("NONE");
           }
         }
 #endif
@@ -626,6 +628,7 @@ void CollectionWatcher::ScanSubdirectory(const QString &path, const CollectionSu
 
       // Nothing has changed - mark the song available without re-scanning
       else if (matching_song.unavailable()) {
+        qLog(Debug) << "Unavailable song" << file << "restored.";
         t->readded_songs << matching_songs;
       }
 
@@ -637,11 +640,11 @@ void CollectionWatcher::ScanSubdirectory(const QString &path, const CollectionSu
         Chromaprinter chromaprinter(file);
         fingerprint = chromaprinter.CreateFingerprint();
         if (fingerprint.isEmpty()) {
-          fingerprint = "NONE";
+          fingerprint = QStringLiteral("NONE");
         }
       }
 #endif
-      if (song_tracking_ && !fingerprint.isEmpty() && fingerprint != "NONE" && FindSongsByFingerprint(file, fingerprint, &matching_songs)) {
+      if (song_tracking_ && !fingerprint.isEmpty() && fingerprint != QStringLiteral("NONE") && FindSongsByFingerprint(file, fingerprint, &matching_songs)) {
 
         // The song is in the database and still on disk.
         // Check the mtime to see if it's been changed since it was added.
@@ -655,7 +658,7 @@ void CollectionWatcher::ScanSubdirectory(const QString &path, const CollectionSu
 
         // Make sure the songs aren't deleted, as they still exist elsewhere with a different file path.
         bool matching_songs_has_cue = false;
-        for (const Song &matching_song : matching_songs) {
+        for (const Song &matching_song : std::as_const(matching_songs)) {
           QString matching_filename = matching_song.url().toLocalFile();
           if (!t->files_changed_path_.contains(matching_filename)) {
             t->files_changed_path_ << matching_filename;
@@ -688,7 +691,7 @@ void CollectionWatcher::ScanSubdirectory(const QString &path, const CollectionSu
       }
       else {  // The song is on disk but not in the DB
 
-        SongList songs = ScanNewFile(file, path, fingerprint, new_cue, &cues_processed);
+        const SongList songs = ScanNewFile(file, path, fingerprint, new_cue, &cues_processed);
         if (songs.isEmpty()) {
           t->AddToProgress(1);
           continue;
@@ -710,7 +713,7 @@ void CollectionWatcher::ScanSubdirectory(const QString &path, const CollectionSu
   }
 
   // Look for deleted songs
-  for (const Song &song : songs_in_db) {
+  for (const Song &song : std::as_const(songs_in_db)) {
     QString file = song.url().toLocalFile();
     if (!song.unavailable() && !files_on_disk.contains(file) && !t->files_changed_path_.contains(file)) {
       qLog(Debug) << "Song deleted from disk:" << file;
@@ -736,7 +739,7 @@ void CollectionWatcher::ScanSubdirectory(const QString &path, const CollectionSu
   }
 
   // Recurse into the new subdirs that we found
-  for (const CollectionSubdirectory &my_new_subdir : my_new_subdirs) {
+  for (const CollectionSubdirectory &my_new_subdir : std::as_const(my_new_subdirs)) {
     if (stop_requested_ || abort_requested_) return;
     ScanSubdirectory(my_new_subdir.path, my_new_subdir, 0, t, true);
   }
@@ -885,55 +888,55 @@ void CollectionWatcher::AddChangedSong(const QString &file, const Song &matching
   QStringList changes;
 
   if (matching_song.unavailable()) {
-    qLog(Debug) << "unavailable song" << file << "restored.";
+    qLog(Debug) << "Unavailable song" << file << "restored.";
     notify_new = true;
   }
   else {
     if (matching_song.url() != new_song.url()) {
-      changes << "file path";
+      changes << QStringLiteral("file path");
       notify_new = true;
     }
     if (matching_song.fingerprint() != new_song.fingerprint()) {
-      changes << "fingerprint";
+      changes << QStringLiteral("fingerprint");
       notify_new = true;
     }
     if (!matching_song.IsMetadataEqual(new_song)) {
-      changes << "metadata";
+      changes << QStringLiteral("metadata");
       notify_new = true;
     }
     if (!matching_song.IsPlayStatisticsEqual(new_song)) {
-      changes << "play statistics";
+      changes << QStringLiteral("play statistics");
       notify_new = true;
     }
     if (!matching_song.IsRatingEqual(new_song)) {
-      changes << "rating";
+      changes << QStringLiteral("rating");
       notify_new = true;
     }
     if (!matching_song.IsArtEqual(new_song)) {
-      changes << "album art";
+      changes << QStringLiteral("album art");
       notify_new = true;
     }
     if (!matching_song.IsAcoustIdEqual(new_song)) {
-      changes << "acoustid";
+      changes << QStringLiteral("acoustid");
       notify_new = true;
     }
     if (!matching_song.IsMusicBrainzEqual(new_song)) {
-      changes << "musicbrainz";
+      changes << QStringLiteral("musicbrainz");
       notify_new = true;
     }
     if (!matching_song.IsEBUR128Equal(new_song)) {
-      changes << "ebur128 loudness characteristics";
+      changes << QStringLiteral("ebur128 loudness characteristics");
       notify_new = true;
     }
     if (matching_song.mtime() != new_song.mtime()) {
-      changes << "mtime";
+      changes << QStringLiteral("mtime");
     }
 
     if (changes.isEmpty()) {
       qLog(Debug) << "Song" << file << "unchanged.";
     }
     else {
-      qLog(Debug) << "Song" << file << changes.join(", ") << "changed.";
+      qLog(Debug) << "Song" << file << changes.join(QStringLiteral(", ")) << "changed.";
     }
 
   }
@@ -988,7 +991,7 @@ void CollectionWatcher::AddWatch(const CollectionDirectory &dir, const QString &
 
 void CollectionWatcher::RemoveWatch(const CollectionDirectory &dir, const CollectionSubdirectory &subdir) {
 
-  QStringList subdir_paths = subdir_mapping_.keys(dir);
+  const QStringList subdir_paths = subdir_mapping_.keys(dir);
   for (const QString &subdir_path : subdir_paths) {
     if (subdir_path != subdir.path) continue;
     fs_watcher_->RemovePath(subdir_path);
@@ -1005,7 +1008,7 @@ void CollectionWatcher::RemoveDirectory(const CollectionDirectory &dir) {
 
   // Stop watching the directory's subdirectories
   QStringList subdir_paths = subdir_mapping_.keys(dir);
-  for (const QString &subdir_path : subdir_paths) {
+  for (const QString &subdir_path : std::as_const(subdir_paths)) {
     fs_watcher_->RemovePath(subdir_path);
     subdir_mapping_.remove(subdir_path);
   }
@@ -1027,7 +1030,7 @@ bool CollectionWatcher::FindSongsByPath(const SongList &songs, const QString &pa
 bool CollectionWatcher::FindSongsByFingerprint(const QString &file, const QString &fingerprint, SongList *out) {
 
   SongList songs = backend_->GetSongsByFingerprint(fingerprint);
-  for (const Song &song : songs) {
+  for (const Song &song : std::as_const(songs)) {
     QString filename = song.url().toLocalFile();
     QFileInfo info(filename);
     // Allow mulitiple songs in different directories with the same fingerprint.
@@ -1075,19 +1078,21 @@ void CollectionWatcher::DirectoryChanged(const QString &subdir) {
 
 void CollectionWatcher::RescanPathsNow() {
 
-  QList<int> dirs = rescan_queue_.keys();
+  const QList<int> dirs = rescan_queue_.keys();
   for (const int dir : dirs) {
     if (stop_requested_ || abort_requested_) break;
     ScanTransaction transaction(this, dir, false, false, mark_songs_unavailable_);
 
+    const QStringList paths = rescan_queue_[dir];
+
     QMap<QString, quint64> subdir_files_count;
-    for (const QString &path : rescan_queue_[dir]) {
+    for (const QString &path : paths) {
       quint64 files_count = FilesCountForPath(&transaction, path);
       subdir_files_count[path] = files_count;
       transaction.AddToProgressMax(files_count);
     }
 
-    for (const QString &path : rescan_queue_[dir]) {
+    for (const QString &path : paths) {
       if (stop_requested_ || abort_requested_) break;
       CollectionSubdirectory subdir;
       subdir.directory_id = dir;
@@ -1110,7 +1115,7 @@ QString CollectionWatcher::PickBestArt(const QStringList &art_automatic_list) {
 
   QStringList filtered;
 
-  for (const QString &filter_text : best_art_filters_) {
+  for (const QString &filter_text : std::as_const(best_art_filters_)) {
     // The images in the images list are represented by a full path, so we need to isolate just the filename
     for (const QString &art_automatic : art_automatic_list) {
       QFileInfo fileinfo(art_automatic);
@@ -1132,7 +1137,7 @@ QString CollectionWatcher::PickBestArt(const QStringList &art_automatic_list) {
   int biggest_size = 0;
   QString biggest_path;
 
-  for (const QString &path : filtered) {
+  for (const QString &path : std::as_const(filtered)) {
     if (stop_requested_ || abort_requested_) break;
 
     QImage image(path);
@@ -1195,7 +1200,7 @@ void CollectionWatcher::FullScanAsync() {
 
 void CollectionWatcher::IncrementalScanCheck() {
 
-  qint64 duration = QDateTime::currentDateTime().toSecsSinceEpoch() - last_scan_time_;
+  qint64 duration = QDateTime::currentSecsSinceEpoch() - last_scan_time_;
   if (duration >= 86400) {
     qLog(Debug) << "Performing periodic incremental scan.";
     IncrementalScanNow();
@@ -1230,14 +1235,14 @@ void CollectionWatcher::PerformScan(const bool incremental, const bool ignore_mt
     quint64 files_count = FilesCountForSubdirs(&transaction, subdirs, subdir_files_count);
     transaction.AddToProgressMax(files_count);
 
-    for (const CollectionSubdirectory &subdir : subdirs) {
+    for (const CollectionSubdirectory &subdir : std::as_const(subdirs)) {
       if (stop_requested_ || abort_requested_) break;
       ScanSubdirectory(subdir.path, subdir, subdir_files_count[subdir.path], &transaction);
     }
 
   }
 
-  last_scan_time_ = QDateTime::currentDateTime().toSecsSinceEpoch();
+  last_scan_time_ = QDateTime::currentSecsSinceEpoch();
 
   emit CompilationsNeedUpdating();
 
@@ -1306,10 +1311,10 @@ void CollectionWatcher::RescanSongs(const SongList &songs) {
   QStringList scanned_paths;
   for (const Song &song : songs) {
     if (stop_requested_ || abort_requested_) break;
-    const QString song_path = song.url().toLocalFile().section('/', 0, -2);
+    const QString song_path = song.url().toLocalFile().section(QLatin1Char('/'), 0, -2);
     if (scanned_paths.contains(song_path)) continue;
     ScanTransaction transaction(this, song.directory_id(), false, true, mark_songs_unavailable_);
-    CollectionSubdirectoryList subdirs(transaction.GetAllSubdirs());
+    const CollectionSubdirectoryList subdirs = transaction.GetAllSubdirs();
     for (const CollectionSubdirectory &subdir : subdirs) {
       if (stop_requested_ || abort_requested_) break;
       if (subdir.path != song_path) continue;

src/collection/collectionwatcher.h

@@ -245,20 +245,21 @@ class CollectionWatcher : public QObject {
   CueParser *cue_parser_;
 
   static QStringList sValidImages;
+  static QStringList kIgnoredExtensions;
 
   qint64 last_scan_time_;
 
 };
 
 inline QString CollectionWatcher::NoExtensionPart(const QString &fileName) {
-  return fileName.contains('.') ? fileName.section('.', 0, -2) : "";
+  return fileName.contains(QLatin1Char('.')) ? fileName.section(QLatin1Char('.'), 0, -2) : QLatin1String("");
 }
 // Thanks Amarok
 inline QString CollectionWatcher::ExtensionPart(const QString &fileName) {
-  return fileName.contains( '.' ) ? fileName.mid( fileName.lastIndexOf('.') + 1 ).toLower() : "";
+  return fileName.contains(QLatin1Char('.')) ? fileName.mid(fileName.lastIndexOf(QLatin1Char('.')) + 1).toLower() : QLatin1String("");
 }
 inline QString CollectionWatcher::DirectoryPart(const QString &fileName) {
-  return fileName.section('/', 0, -2);
+  return fileName.section(QLatin1Char('/'), 0, -2);
 }
 
 #endif  // COLLECTIONWATCHER_H

src/collection/savedgroupingmanager.cpp

@@ -21,6 +21,8 @@
 
 #include "config.h"
 
+#include <utility>
+
 #include <QDialog>
 #include <QStandardItemModel>
 #include <QItemSelectionModel>
@@ -36,6 +38,7 @@
 
 #include "core/logging.h"
 #include "core/iconloader.h"
+#include "core/settings.h"
 #include "settings/collectionsettingspage.h"
 #include "collectionmodel.h"
 #include "savedgroupingmanager.h"
@@ -56,7 +59,7 @@ SavedGroupingManager::SavedGroupingManager(const QString &saved_groupings_settin
   model_->setHorizontalHeaderItem(2, new QStandardItem(tr("Second Level")));
   model_->setHorizontalHeaderItem(3, new QStandardItem(tr("Third Level")));
   ui_->list->setModel(model_);
-  ui_->remove->setIcon(IconLoader::Load("edit-delete"));
+  ui_->remove->setIcon(IconLoader::Load(QStringLiteral("edit-delete")));
   ui_->remove->setEnabled(false);
 
   ui_->remove->setShortcut(QKeySequence::Delete);
@@ -72,11 +75,11 @@ SavedGroupingManager::~SavedGroupingManager() {
 
 QString SavedGroupingManager::GetSavedGroupingsSettingsGroup(const QString &settings_group) {
 
-  if (settings_group.isEmpty() || settings_group == CollectionSettingsPage::kSettingsGroup) {
-    return kSavedGroupingsSettingsGroup;
+  if (settings_group.isEmpty() || settings_group == QLatin1String(CollectionSettingsPage::kSettingsGroup)) {
+    return QLatin1String(kSavedGroupingsSettingsGroup);
   }
   else {
-    return QString(kSavedGroupingsSettingsGroup) + "_" + settings_group;
+    return QLatin1String(kSavedGroupingsSettingsGroup) + QLatin1Char('_') + settings_group;
   }
 
 }
@@ -85,67 +88,67 @@ QString SavedGroupingManager::GroupByToString(const CollectionModel::GroupBy g)
 
   switch (g) {
     case CollectionModel::GroupBy::None:
-    case CollectionModel::GroupBy::GroupByCount: {
+    case CollectionModel::GroupBy::GroupByCount:{
       return tr("None");
     }
-    case CollectionModel::GroupBy::AlbumArtist: {
+    case CollectionModel::GroupBy::AlbumArtist:{
       return tr("Album artist");
     }
-    case CollectionModel::GroupBy::Artist: {
+    case CollectionModel::GroupBy::Artist:{
       return tr("Artist");
     }
-    case CollectionModel::GroupBy::Album: {
+    case CollectionModel::GroupBy::Album:{
       return tr("Album");
     }
-    case CollectionModel::GroupBy::AlbumDisc: {
+    case CollectionModel::GroupBy::AlbumDisc:{
       return tr("Album - Disc");
     }
-    case CollectionModel::GroupBy::YearAlbum: {
+    case CollectionModel::GroupBy::YearAlbum:{
       return tr("Year - Album");
     }
-    case CollectionModel::GroupBy::YearAlbumDisc: {
+    case CollectionModel::GroupBy::YearAlbumDisc:{
       return tr("Year - Album - Disc");
     }
-    case CollectionModel::GroupBy::OriginalYearAlbum: {
+    case CollectionModel::GroupBy::OriginalYearAlbum:{
       return tr("Original year - Album");
     }
-    case CollectionModel::GroupBy::OriginalYearAlbumDisc: {
+    case CollectionModel::GroupBy::OriginalYearAlbumDisc:{
       return tr("Original year - Album - Disc");
     }
-    case CollectionModel::GroupBy::Disc: {
+    case CollectionModel::GroupBy::Disc:{
       return tr("Disc");
     }
-    case CollectionModel::GroupBy::Year: {
+    case CollectionModel::GroupBy::Year:{
       return tr("Year");
     }
-    case CollectionModel::GroupBy::OriginalYear: {
+    case CollectionModel::GroupBy::OriginalYear:{
       return tr("Original year");
     }
-    case CollectionModel::GroupBy::Genre: {
+    case CollectionModel::GroupBy::Genre:{
       return tr("Genre");
     }
-    case CollectionModel::GroupBy::Composer: {
+    case CollectionModel::GroupBy::Composer:{
       return tr("Composer");
     }
-    case CollectionModel::GroupBy::Performer: {
+    case CollectionModel::GroupBy::Performer:{
       return tr("Performer");
     }
-    case CollectionModel::GroupBy::Grouping: {
+    case CollectionModel::GroupBy::Grouping:{
       return tr("Grouping");
     }
-    case CollectionModel::GroupBy::FileType: {
+    case CollectionModel::GroupBy::FileType:{
       return tr("File type");
     }
-    case CollectionModel::GroupBy::Format: {
+    case CollectionModel::GroupBy::Format:{
       return tr("Format");
     }
-    case CollectionModel::GroupBy::Samplerate: {
+    case CollectionModel::GroupBy::Samplerate:{
       return tr("Sample rate");
     }
-    case CollectionModel::GroupBy::Bitdepth: {
+    case CollectionModel::GroupBy::Bitdepth:{
       return tr("Bit depth");
     }
-    case CollectionModel::GroupBy::Bitrate: {
+    case CollectionModel::GroupBy::Bitrate:{
       return tr("Bitrate");
     }
   }
@@ -157,13 +160,13 @@ QString SavedGroupingManager::GroupByToString(const CollectionModel::GroupBy g)
 void SavedGroupingManager::UpdateModel() {
 
   model_->setRowCount(0);  // don't use clear, it deletes headers
-  QSettings s;
+  Settings s;
   s.beginGroup(saved_groupings_settings_group_);
   int version = s.value("version").toInt();
   if (version == 1) {
     QStringList saved = s.childKeys();
     for (int i = 0; i < saved.size(); ++i) {
-      if (saved.at(i) == "version") continue;
+      if (saved.at(i) == QStringLiteral("version")) continue;
       QByteArray bytes = s.value(saved.at(i)).toByteArray();
       QDataStream ds(&bytes, QIODevice::ReadOnly);
       CollectionModel::Grouping g;
@@ -181,7 +184,7 @@ void SavedGroupingManager::UpdateModel() {
   else {
     QStringList saved = s.childKeys();
     for (int i = 0; i < saved.size(); ++i) {
-      if (saved.at(i) == "version") continue;
+      if (saved.at(i) == QStringLiteral("version")) continue;
       s.remove(saved.at(i));
     }
   }
@@ -192,9 +195,10 @@ void SavedGroupingManager::UpdateModel() {
 void SavedGroupingManager::Remove() {
 
   if (ui_->list->selectionModel()->hasSelection()) {
-    QSettings s;
+    Settings s;
     s.beginGroup(saved_groupings_settings_group_);
-    for (const QModelIndex &idx : ui_->list->selectionModel()->selectedRows()) {
+    const QModelIndexList indexes = ui_->list->selectionModel()->selectedRows();
+    for (const QModelIndex &idx : indexes) {
       if (idx.isValid()) {
         qLog(Debug) << "Remove saved grouping: " << model_->item(idx.row(), 0)->text();
         s.remove(model_->item(idx.row(), 0)->text());

src/config.h.in

@@ -21,7 +21,6 @@
 #cmakedefine HAVE_MUSICBRAINZ
 #cmakedefine HAVE_GLOBALSHORTCUTS
 #cmakedefine HAVE_X11_GLOBALSHORTCUTS
-#cmakedefine HAVE_ICU
 
 #cmakedefine USE_INSTALL_PREFIX
 
@@ -41,7 +40,6 @@
 #cmakedefine HAVE_TAGLIB_DSDIFFFILE
 
 #cmakedefine USE_BUNDLE
-#define USE_BUNDLE_DIR "${USE_BUNDLE_DIR}"
 
 #cmakedefine HAVE_TRANSLATIONS
 #cmakedefine INSTALL_TRANSLATIONS

src/context/contextalbum.cpp

@@ -56,12 +56,12 @@ ContextAlbum::ContextAlbum(QWidget *parent)
       album_cover_choice_controller_(nullptr),
       downloading_covers_(false),
       timeline_fade_(new QTimeLine(kFadeTimeLineMs, this)),
-      image_strawberry_(":/pictures/strawberry.png"),
+      image_strawberry_(QStringLiteral(":/pictures/strawberry.png")),
       image_original_(image_strawberry_),
       pixmap_current_opacity_(1.0),
       desired_height_(width()) {
 
-  setObjectName("context-widget-album");
+  setObjectName(QStringLiteral("context-widget-album"));
 
   setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
 
@@ -266,7 +266,7 @@ void ContextAlbum::SearchCoverInProgress() {
   downloading_covers_ = true;
 
   // Show a spinner animation
-  spinner_animation_ = make_unique<QMovie>(":/pictures/spinner.gif", QByteArray(), this);
+  spinner_animation_ = make_unique<QMovie>(QStringLiteral(":/pictures/spinner.gif"), QByteArray(), this);
   QObject::connect(&*spinner_animation_, &QMovie::updated, this, &ContextAlbum::Update);
   spinner_animation_->start();
   update();

src/context/contextalbum.h

@@ -87,8 +87,8 @@ class ContextAlbum : public QWidget {
   void AutomaticCoverSearchDone();
   void FadeCurrentCover(const qreal value);
   void FadeCurrentCoverFinished();
-  void FadePreviousCover(SharedPtr<PreviousCover> previouscover);
-  void FadePreviousCoverFinished(SharedPtr<PreviousCover> previouscover);
+  void FadePreviousCover(SharedPtr<PreviousCover> previous_cover);
+  void FadePreviousCoverFinished(SharedPtr<PreviousCover> previous_cover);
 
  public slots:
   void SearchCoverInProgress();

src/context/contextview.cpp

@@ -51,6 +51,7 @@
 #include "core/application.h"
 #include "core/player.h"
 #include "core/song.h"
+#include "core/settings.h"
 #include "utilities/strutils.h"
 #include "utilities/timeutils.h"
 #include "widgets/resizabletextedit.h"
@@ -112,25 +113,25 @@ ContextView::ContextView(QWidget *parent)
 
   setLayout(layout_container_);
 
-  layout_container_->setObjectName("context-layout-container");
+  layout_container_->setObjectName(QStringLiteral("context-layout-container"));
   layout_container_->setContentsMargins(0, 0, 0, 0);
   layout_container_->addWidget(scrollarea_);
 
-  scrollarea_->setObjectName("context-scrollarea");
+  scrollarea_->setObjectName(QStringLiteral("context-scrollarea"));
   scrollarea_->setWidgetResizable(true);
   scrollarea_->setWidget(widget_scrollarea_);
   scrollarea_->setContentsMargins(0, 0, 0, 0);
   scrollarea_->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
   scrollarea_->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
 
-  widget_scrollarea_->setObjectName("context-widget-scrollarea");
+  widget_scrollarea_->setObjectName(QStringLiteral("context-widget-scrollarea"));
   widget_scrollarea_->setLayout(layout_scrollarea_);
   widget_scrollarea_->setContentsMargins(0, 0, 0, 0);
 
   textedit_top_->setReadOnly(true);
   textedit_top_->setFrameShape(QFrame::NoFrame);
 
-  layout_scrollarea_->setObjectName("context-layout-scrollarea");
+  layout_scrollarea_->setObjectName(QStringLiteral("context-layout-scrollarea"));
   layout_scrollarea_->setContentsMargins(15, 15, 15, 15);
   layout_scrollarea_->addWidget(textedit_top_);
   layout_scrollarea_->addWidget(widget_album_);
@@ -291,20 +292,20 @@ void ContextView::ReloadSettings() {
 
   QString default_font;
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-  if (QFontDatabase::families().contains(ContextSettingsPage::kDefaultFontFamily)) {
+  if (QFontDatabase::families().contains(QLatin1String(ContextSettingsPage::kDefaultFontFamily))) {
 #else
-  if (QFontDatabase().families().contains(ContextSettingsPage::kDefaultFontFamily)) {
+  if (QFontDatabase().families().contains(QLatin1String(ContextSettingsPage::kDefaultFontFamily))) {
 #endif
-    default_font = ContextSettingsPage::kDefaultFontFamily;
+    default_font = QLatin1String(ContextSettingsPage::kDefaultFontFamily);
   }
   else {
     default_font = font().family();
   }
 
-  QSettings s;
+  Settings s;
   s.beginGroup(ContextSettingsPage::kSettingsGroup);
-  title_fmt_ = s.value(ContextSettingsPage::kSettingsTitleFmt, "%title% - %artist%").toString();
-  summary_fmt_ = s.value(ContextSettingsPage::kSettingsSummaryFmt, "%album%").toString();
+  title_fmt_ = s.value(ContextSettingsPage::kSettingsTitleFmt, QStringLiteral("%title% - %artist%")).toString();
+  summary_fmt_ = s.value(ContextSettingsPage::kSettingsSummaryFmt, QStringLiteral("%album%")).toString();
   action_show_album_->setChecked(s.value(ContextSettingsPage::kSettingsGroupEnable[static_cast<int>(ContextSettingsPage::ContextSettingsOrder::ALBUM)], true).toBool());
   action_show_data_->setChecked(s.value(ContextSettingsPage::kSettingsGroupEnable[static_cast<int>(ContextSettingsPage::ContextSettingsOrder::TECHNICAL_DATA)], false).toBool());
   action_show_lyrics_->setChecked(s.value(ContextSettingsPage::kSettingsGroupEnable[static_cast<int>(ContextSettingsPage::ContextSettingsOrder::SONG_LYRICS)], true).toBool());
@@ -390,7 +391,7 @@ void ContextView::FadeStopFinished() {
 }
 
 void ContextView::SetLabelText(QLabel *label, int value, const QString &suffix, const QString &def) {
-  label->setText(value <= 0 ? def : (QString::number(value) + " " + suffix));
+  label->setText(value <= 0 ? def : (QString::number(value) + QLatin1Char(' ') + suffix));
 }
 
 void ContextView::UpdateNoSong() {
@@ -409,15 +410,15 @@ void ContextView::NoSong() {
   QString html;
   if (collectionview_->TotalSongs() == 1) html += tr("%1 song").arg(collectionview_->TotalSongs());
   else html += tr("%1 songs").arg(collectionview_->TotalSongs());
-  html += "<br />";
+  html += QLatin1String("<br />");
 
   if (collectionview_->TotalArtists() == 1) html += tr("%1 artist").arg(collectionview_->TotalArtists());
   else html += tr("%1 artists").arg(collectionview_->TotalArtists());
-  html += "<br />";
+  html += QLatin1String("<br />");
 
   if (collectionview_->TotalAlbums() == 1) html += tr("%1 album").arg(collectionview_->TotalAlbums());
   else html += tr("%1 albums").arg(collectionview_->TotalAlbums());
-  html += "<br />";
+  html += QLatin1String("<br />");
 
   label_stop_summary_->setFont(font_normal_);
   label_stop_summary_->setText(html);
@@ -438,7 +439,7 @@ void ContextView::UpdateFonts() {
 void ContextView::SetSong() {
 
   textedit_top_->setFont(font_headline_);
-  textedit_top_->SetText(QString("<b>%1</b><br />%2").arg(Utilities::ReplaceMessage(title_fmt_, song_playing_, "<br />", true), Utilities::ReplaceMessage(summary_fmt_, song_playing_, "<br />", true)));
+  textedit_top_->SetText(QStringLiteral("<b>%1</b><br />%2").arg(Utilities::ReplaceMessage(title_fmt_, song_playing_, QStringLiteral("<br />"), true), Utilities::ReplaceMessage(summary_fmt_, song_playing_, QStringLiteral("<br />"), true)));
 
   label_stop_summary_->clear();
 
@@ -474,7 +475,7 @@ void ContextView::SetSong() {
     else {
       label_samplerate_title_->show();
       label_samplerate_->show();
-      SetLabelText(label_samplerate_, song_playing_.samplerate(), "Hz");
+      SetLabelText(label_samplerate_, song_playing_.samplerate(), QStringLiteral("Hz"));
     }
     if (song_playing_.bitdepth() <= 0) {
       label_bitdepth_title_->hide();
@@ -484,7 +485,7 @@ void ContextView::SetSong() {
     else {
       label_bitdepth_title_->show();
       label_bitdepth_->show();
-      SetLabelText(label_bitdepth_, song_playing_.bitdepth(), "Bit");
+      SetLabelText(label_bitdepth_, song_playing_.bitdepth(), QStringLiteral("Bit"));
     }
     if (song_playing_.bitrate() <= 0) {
       label_bitrate_title_->hide();
@@ -546,7 +547,7 @@ void ContextView::SetSong() {
 
 void ContextView::UpdateSong(const Song &song) {
 
-  textedit_top_->SetText(QString("<b>%1</b><br />%2").arg(Utilities::ReplaceMessage(title_fmt_, song, "<br />", true), Utilities::ReplaceMessage(summary_fmt_, song, "<br />", true)));
+  textedit_top_->SetText(QStringLiteral("<b>%1</b><br />%2").arg(Utilities::ReplaceMessage(title_fmt_, song, QStringLiteral("<br />"), true), Utilities::ReplaceMessage(summary_fmt_, song, QStringLiteral("<br />"), true)));
 
   if (action_show_data_->isChecked()) {
     if (song.filetype() != song_playing_.filetype()) label_filetype_->setText(song.TextForFiletype());
@@ -571,7 +572,7 @@ void ContextView::UpdateSong(const Song &song) {
       else {
         label_samplerate_title_->show();
         label_samplerate_->show();
-        SetLabelText(label_samplerate_, song.samplerate(), "Hz");
+        SetLabelText(label_samplerate_, song.samplerate(), QStringLiteral("Hz"));
       }
     }
     if (song.bitdepth() != song_playing_.bitdepth()) {
@@ -583,7 +584,7 @@ void ContextView::UpdateSong(const Song &song) {
       else {
         label_bitdepth_title_->show();
         label_bitdepth_->show();
-        SetLabelText(label_bitdepth_, song.bitdepth(), "Bit");
+        SetLabelText(label_bitdepth_, song.bitdepth(), QStringLiteral("Bit"));
       }
     }
     if (song.bitrate() != song_playing_.bitrate()) {
@@ -631,7 +632,12 @@ void ContextView::UpdateLyrics(const quint64 id, const QString &provider, const
 
   if (static_cast<qint64>(id) != lyrics_id_) return;
 
-  lyrics_ = lyrics + "\n\n(Lyrics from " + provider + ")\n";
+  if (lyrics.isEmpty()) {
+    lyrics_ = QStringLiteral("No lyrics found.\n");
+  }
+  else {
+    lyrics_ = lyrics + QStringLiteral("\n\n(Lyrics from ") + provider + QStringLiteral(")\n");
+  }
   lyrics_id_ = -1;
 
   if (action_show_lyrics_->isChecked() && !lyrics_.isEmpty()) {
@@ -687,7 +693,7 @@ void ContextView::AlbumCoverLoaded(const Song &song, const QImage &image) {
 
 void ContextView::ActionShowAlbum() {
 
-  QSettings s;
+  Settings s;
   s.beginGroup(ContextSettingsPage::kSettingsGroup);
   s.setValue(ContextSettingsPage::kSettingsGroupEnable[static_cast<int>(ContextSettingsPage::ContextSettingsOrder::ALBUM)], action_show_album_->isChecked());
   s.endGroup();
@@ -697,7 +703,7 @@ void ContextView::ActionShowAlbum() {
 
 void ContextView::ActionShowData() {
 
-  QSettings s;
+  Settings s;
   s.beginGroup(ContextSettingsPage::kSettingsGroup);
   s.setValue(ContextSettingsPage::kSettingsGroupEnable[static_cast<int>(ContextSettingsPage::ContextSettingsOrder::TECHNICAL_DATA)], action_show_data_->isChecked());
   s.endGroup();
@@ -707,7 +713,7 @@ void ContextView::ActionShowData() {
 
 void ContextView::ActionShowLyrics() {
 
-  QSettings s;
+  Settings s;
   s.beginGroup(ContextSettingsPage::kSettingsGroup);
   s.setValue(ContextSettingsPage::kSettingsGroupEnable[static_cast<int>(ContextSettingsPage::ContextSettingsOrder::SONG_LYRICS)], action_show_lyrics_->isChecked());
   s.endGroup();
@@ -720,7 +726,7 @@ void ContextView::ActionShowLyrics() {
 
 void ContextView::ActionSearchLyrics() {
 
-  QSettings s;
+  Settings s;
   s.beginGroup(ContextSettingsPage::kSettingsGroup);
   s.setValue(ContextSettingsPage::kSettingsGroupEnable[static_cast<int>(ContextSettingsPage::ContextSettingsOrder::SEARCH_LYRICS)], action_search_lyrics_->isChecked());
   s.endGroup();

src/core/application.cpp

@@ -57,6 +57,7 @@
 #include "covermanager/deezercoverprovider.h"
 #include "covermanager/musixmatchcoverprovider.h"
 #include "covermanager/spotifycoverprovider.h"
+#include "covermanager/opentidalcoverprovider.h"
 
 #include "lyrics/lyricsproviders.h"
 #include "lyrics/geniuslyricsprovider.h"
@@ -67,7 +68,7 @@
 #include "lyrics/songlyricscomlyricsprovider.h"
 #include "lyrics/azlyricscomlyricsprovider.h"
 #include "lyrics/elyricsnetlyricsprovider.h"
-#include "lyrics/lyricsmodecomlyricsprovider.h"
+#include "lyrics/letraslyricsprovider.h"
 
 #include "scrobbler/audioscrobbler.h"
 #include "scrobbler/lastfmscrobbler.h"
@@ -143,6 +144,7 @@ class ApplicationImpl {
           cover_providers->AddProvider(new DeezerCoverProvider(app, app->network()));
           cover_providers->AddProvider(new MusixmatchCoverProvider(app, app->network()));
           cover_providers->AddProvider(new SpotifyCoverProvider(app, app->network()));
+          cover_providers->AddProvider(new OpenTidalCoverProvider(app, app->network()));
 #ifdef HAVE_TIDAL
           cover_providers->AddProvider(new TidalCoverProvider(app, app->network()));
 #endif
@@ -169,7 +171,7 @@ class ApplicationImpl {
           lyrics_providers->AddProvider(new SongLyricsComLyricsProvider(app->network()));
           lyrics_providers->AddProvider(new AzLyricsComLyricsProvider(app->network()));
           lyrics_providers->AddProvider(new ElyricsNetLyricsProvider(app->network()));
-          lyrics_providers->AddProvider(new LyricsModeComLyricsProvider(app->network()));
+          lyrics_providers->AddProvider(new LetrasLyricsProvider(app->network()));
           lyrics_providers->ReloadSettings();
           return lyrics_providers;
         }),

src/core/commandlineoptions.cpp

@@ -34,6 +34,7 @@
 #include <QIODevice>
 #include <QDataStream>
 #include <QBuffer>
+#include <QDir>
 #include <QFile>
 #include <QFileInfo>
 #include <QByteArray>
@@ -100,7 +101,7 @@ CommandlineOptions::CommandlineOptions(int argc, char **argv)
       play_track_at_(-1),
       show_osd_(false),
       toggle_pretty_osd_(false),
-      log_levels_(logging::kDefaultLogLevels) {
+      log_levels_(QLatin1String(logging::kDefaultLogLevels)) {
 
 #ifdef Q_OS_WIN32
   Q_UNUSED(argv);
@@ -108,11 +109,11 @@ CommandlineOptions::CommandlineOptions(int argc, char **argv)
 
 #ifdef Q_OS_MACOS
   // Remove -psn_xxx option that Mac passes when opened from Finder.
-  RemoveArg("-psn", 1);
+  RemoveArg(QStringLiteral("-psn"), 1);
 #endif
 
   // Remove the -session option that KDE passes
-  RemoveArg("-session", 2);
+  RemoveArg(QStringLiteral("-session"), 2);
 
 }
 
@@ -212,9 +213,9 @@ bool CommandlineOptions::Parse() {
     if (c == -1) break;
 
     switch (c) {
-      case 'h': {
+      case 'h':{
         QString translated_help_text =
-            QString(kHelpText)
+            QString::fromUtf8(kHelpText)
                 .arg(QObject::tr("Usage"), QObject::tr("options"), QObject::tr("URL(s)"),
                      QObject::tr("Player options"),
                      QObject::tr("Start the playlist currently playing"),
@@ -301,16 +302,16 @@ bool CommandlineOptions::Parse() {
         volume_modifier_ = -4;
         break;
       case LongOptions::Quiet:
-        log_levels_ = "1";
+        log_levels_ = QStringLiteral("1");
         break;
       case LongOptions::Verbose:
-        log_levels_ = "3";
+        log_levels_ = QStringLiteral("3");
         break;
       case LongOptions::LogLevels:
         log_levels_ = OptArgToString(optarg);
         break;
-      case LongOptions::Version: {
-        QString version_text = QString(kVersionText).arg(STRAWBERRY_VERSION_DISPLAY);
+      case LongOptions::Version:{
+        QString version_text = QString::fromUtf8(kVersionText).arg(QStringLiteral(STRAWBERRY_VERSION_DISPLAY));
         std::cout << version_text.toLocal8Bit().constData() << std::endl;
         std::exit(0);
       }
@@ -364,7 +365,7 @@ bool CommandlineOptions::Parse() {
     const QString value = DecodeName(argv_[i]);
     QFileInfo fileinfo(value);
     if (fileinfo.exists()) {
-      urls_ << QUrl::fromLocalFile(fileinfo.canonicalFilePath());
+      urls_ << QUrl::fromLocalFile(QDir::cleanPath(fileinfo.filePath()));
     }
     else {
       urls_ << QUrl::fromUserInput(value);
@@ -416,7 +417,7 @@ void CommandlineOptions::Load(const QByteArray &serialized) {
 }
 
 #ifdef Q_OS_WIN32
-QString CommandlineOptions::OptArgToString(wchar_t *opt) {
+QString CommandlineOptions::OptArgToString(const wchar_t *opt) {
 
   return QString::fromWCharArray(opt);
 
@@ -427,9 +428,9 @@ QString CommandlineOptions::DecodeName(wchar_t *opt) {
   return QString::fromWCharArray(opt);
 }
 #else
-QString CommandlineOptions::OptArgToString(char *opt) {
+QString CommandlineOptions::OptArgToString(const char *opt) {
 
-  return QString(opt);
+  return QString::fromUtf8(opt);
 }
 
 QString CommandlineOptions::DecodeName(char *opt) {

src/core/commandlineoptions.h

@@ -108,10 +108,10 @@ class CommandlineOptions {
   void RemoveArg(const QString &starts_with, int count);
 
 #ifdef Q_OS_WIN32
-  static QString OptArgToString(wchar_t *opt);
+  static QString OptArgToString(const wchar_t *opt);
   static QString DecodeName(wchar_t *opt);
 #else
-  static QString OptArgToString(char *opt);
+  static QString OptArgToString(const char *opt);
   static QString DecodeName(char *opt);
 #endif
 

src/core/database.cpp

@@ -21,6 +21,8 @@
 
 #include "config.h"
 
+#include <utility>
+
 #include <sqlite3.h>
 
 #include <QObject>
@@ -47,10 +49,13 @@
 #include "sqlquery.h"
 #include "scopedtransaction.h"
 
-const char *Database::kDatabaseFilename = "strawberry.db";
 const int Database::kSchemaVersion = 18;
-const int Database::kMinSupportedSchemaVersion = 10;
-const char *Database::kMagicAllSongsTables = "%allsongstables";
+
+namespace {
+constexpr char kDatabaseFilename[] = "strawberry.db";
+constexpr int kMinSupportedSchemaVersion = 10;
+constexpr char kMagicAllSongsTables[] = "%allsongstables";
+}  // namespace
 
 int Database::sNextConnectionId = 1;
 QMutex Database::sNextConnectionIdMutex;
@@ -84,7 +89,8 @@ Database::~Database() {
 
   QMutexLocker l(&connect_mutex_);
 
-  for (const QString &connection_id : QSqlDatabase::connectionNames()) {
+  const QStringList connection_names = QSqlDatabase::connectionNames();
+  for (const QString &connection_id : connection_names) {
     qLog(Error) << "Connection" << connection_id << "is still open!";
   }
 
@@ -114,7 +120,7 @@ QSqlDatabase Database::Connect() {
     }
   }
 
-  const QString connection_id = QString("%1_thread_%2").arg(connection_id_).arg(reinterpret_cast<quint64>(QThread::currentThread()));
+  const QString connection_id = QStringLiteral("%1_thread_%2").arg(connection_id_).arg(reinterpret_cast<quint64>(QThread::currentThread()));
 
   // Try to find an existing connection for this thread
   QSqlDatabase db;
@@ -122,23 +128,23 @@ QSqlDatabase Database::Connect() {
     db = QSqlDatabase::database(connection_id);
   }
   else {
-    db = QSqlDatabase::addDatabase("QSQLITE", connection_id);
+    db = QSqlDatabase::addDatabase(QStringLiteral("QSQLITE"), connection_id);
   }
   if (db.isOpen()) {
     return db;
   }
-  db.setConnectOptions("QSQLITE_BUSY_TIMEOUT=30000");
+  db.setConnectOptions(QStringLiteral("QSQLITE_BUSY_TIMEOUT=30000"));
   //qLog(Debug) << "Opened database with connection id" << connection_id;
 
   if (injected_database_name_.isNull()) {
-    db.setDatabaseName(directory_ + "/" + kDatabaseFilename);
+    db.setDatabaseName(directory_ + QLatin1Char('/') + QLatin1String(kDatabaseFilename));
   }
   else {
     db.setDatabaseName(injected_database_name_);
   }
 
   if (!db.open()) {
-    app_->AddError("Database: " + db.lastError().text());
+    app_->AddError(QStringLiteral("Database: ") + db.lastError().text());
     return db;
   }
 
@@ -154,16 +160,16 @@ QSqlDatabase Database::Connect() {
 
   // Attach external databases
   QStringList keys = attached_databases_.keys();
-  for (const QString &key : keys) {
+  for (const QString &key : std::as_const(keys)) {
     QString filename = attached_databases_[key].filename_;
 
     if (!injected_database_name_.isNull()) filename = injected_database_name_;
 
     // Attach the db
     SqlQuery q(db);
-    q.prepare("ATTACH DATABASE :filename AS :alias");
-    q.BindValue(":filename", filename);
-    q.BindValue(":alias", key);
+    q.prepare(QStringLiteral("ATTACH DATABASE :filename AS :alias"));
+    q.BindValue(QStringLiteral(":filename"), filename);
+    q.BindValue(QStringLiteral(":alias"), key);
     if (!q.Exec()) {
       qFatal("Couldn't attach external database '%s'", key.toLatin1().constData());
     }
@@ -175,13 +181,13 @@ QSqlDatabase Database::Connect() {
 
   // We might have to initialize the schema in some attached databases now, if they were deleted and don't match up with the main schema version.
   keys = attached_databases_.keys();
-  for (const QString &key : keys) {
+  for (const QString &key : std::as_const(keys)) {
     if (attached_databases_[key].is_temporary_ && attached_databases_[key].schema_.isEmpty()) {
       continue;
     }
     // Find out if there are any tables in this database
     SqlQuery q(db);
-    q.prepare(QString("SELECT ROWID FROM %1.sqlite_master WHERE type='table'").arg(key));
+    q.prepare(QStringLiteral("SELECT ROWID FROM %1.sqlite_master WHERE type='table'").arg(key));
     if (!q.Exec() || !q.next()) {
       q.finish();
       ExecSchemaCommandsFromFile(db, attached_databases_[key].schema_, 0);
@@ -196,7 +202,7 @@ void Database::Close() {
 
   QMutexLocker l(&connect_mutex_);
 
-  const QString connection_id = QString("%1_thread_%2").arg(connection_id_).arg(reinterpret_cast<quint64>(QThread::currentThread()));
+  const QString connection_id = QStringLiteral("%1_thread_%2").arg(connection_id_).arg(reinterpret_cast<quint64>(QThread::currentThread()));
 
   // Try to find an existing connection for this thread
   if (QSqlDatabase::connectionNames().contains(connection_id)) {
@@ -218,7 +224,7 @@ int Database::SchemaVersion(QSqlDatabase *db) {
   int schema_version = 0;
   {
     SqlQuery q(*db);
-    q.prepare("SELECT version FROM schema_version");
+    q.prepare(QStringLiteral("SELECT version FROM schema_version"));
     if (q.Exec() && q.next()) {
       schema_version = q.value(0).toInt();
     }
@@ -259,8 +265,8 @@ void Database::RecreateAttachedDb(const QString &database_name) {
     QSqlDatabase db(Connect());
 
     SqlQuery q(db);
-    q.prepare("DETACH DATABASE :alias");
-    q.BindValue(":alias", database_name);
+    q.prepare(QStringLiteral("DETACH DATABASE :alias"));
+    q.BindValue(QStringLiteral(":alias"), database_name);
     if (!q.Exec()) {
       qLog(Warning) << "Failed to detach database" << database_name;
       return;
@@ -273,7 +279,8 @@ void Database::RecreateAttachedDb(const QString &database_name) {
 
   // We can't just re-attach the database now because it needs to be done for each thread.
   // Close all the database connections, so each thread will re-attach it when they next connect.
-  for (const QString &name : QSqlDatabase::connectionNames()) {
+  const QStringList connection_names = QSqlDatabase::connectionNames();
+  for (const QString &name : connection_names) {
     QSqlDatabase::removeDatabase(name);
   }
 
@@ -289,9 +296,9 @@ void Database::AttachDatabaseOnDbConnection(const QString &database_name, const
 
   // Attach the db
   SqlQuery q(db);
-  q.prepare("ATTACH DATABASE :filename AS :alias");
-  q.BindValue(":filename", database.filename_);
-  q.BindValue(":alias", database_name);
+  q.prepare(QStringLiteral("ATTACH DATABASE :filename AS :alias"));
+  q.BindValue(QStringLiteral(":filename"), database.filename_);
+  q.BindValue(QStringLiteral(":alias"), database_name);
   if (!q.Exec()) {
     qFatal("Couldn't attach external database '%s'", database_name.toLatin1().constData());
   }
@@ -305,8 +312,8 @@ void Database::DetachDatabase(const QString &database_name) {
     QSqlDatabase db(Connect());
 
     SqlQuery q(db);
-    q.prepare("DETACH DATABASE :alias");
-    q.BindValue(":alias", database_name);
+    q.prepare(QStringLiteral("DETACH DATABASE :alias"));
+    q.BindValue(QStringLiteral(":alias"), database_name);
     if (!q.Exec()) {
       qLog(Warning) << "Failed to detach database" << database_name;
       return;
@@ -321,10 +328,10 @@ void Database::UpdateDatabaseSchema(int version, QSqlDatabase &db) {
 
   QString filename;
   if (version == 0) {
-    filename = ":/schema/schema.sql";
+    filename = QStringLiteral(":/schema/schema.sql");
   }
   else {
-    filename = QString(":/schema/schema-%1.sql").arg(version);
+    filename = QStringLiteral(":/schema/schema-%1.sql").arg(version);
     qLog(Debug) << "Applying database schema update" << version << "from" << filename;
   }
 
@@ -335,9 +342,9 @@ void Database::UpdateDatabaseSchema(int version, QSqlDatabase &db) {
 void Database::UrlEncodeFilenameColumn(const QString &table, QSqlDatabase &db) {
 
   SqlQuery select(db);
-  select.prepare(QString("SELECT ROWID, filename FROM %1").arg(table));
+  select.prepare(QStringLiteral("SELECT ROWID, filename FROM %1").arg(table));
   SqlQuery update(db);
-  update.prepare(QString("UPDATE %1 SET filename=:filename WHERE ROWID=:id").arg(table));
+  update.prepare(QStringLiteral("UPDATE %1 SET filename=:filename WHERE ROWID=:id").arg(table));
   if (!select.Exec()) {
     ReportErrors(select);
   }
@@ -346,14 +353,14 @@ void Database::UrlEncodeFilenameColumn(const QString &table, QSqlDatabase &db) {
     const int rowid = select.value(0).toInt();
     const QString filename = select.value(1).toString();
 
-    if (filename.isEmpty() || filename.contains("://")) {
+    if (filename.isEmpty() || filename.contains(QLatin1String("://"))) {
       continue;
     }
 
     const QUrl url = QUrl::fromLocalFile(filename);
 
-    update.BindValue(":filename", url.toEncoded());
-    update.BindValue(":id", rowid);
+    update.BindValue(QStringLiteral(":filename"), url.toEncoded());
+    update.BindValue(QStringLiteral(":id"), rowid);
     if (!update.Exec()) {
       ReportErrors(update);
     }
@@ -370,8 +377,8 @@ void Database::ExecSchemaCommandsFromFile(QSqlDatabase &db, const QString &filen
   }
   QByteArray data = schema_file.readAll();
   QString schema = QString::fromUtf8(data);
-  if (schema.contains("\r\n")) {
-    schema = schema.replace("\r\n", "\n");
+  if (schema.contains(QLatin1String("\r\n"))) {
+    schema = schema.replace(QLatin1String("\r\n"), QLatin1String("\n"));
   }
   schema_file.close();
   ExecSchemaCommands(db, schema, schema_version, in_transaction);
@@ -381,8 +388,7 @@ void Database::ExecSchemaCommandsFromFile(QSqlDatabase &db, const QString &filen
 void Database::ExecSchemaCommands(QSqlDatabase &db, const QString &schema, int schema_version, bool in_transaction) {
 
   // Run each command
-  QStringList commands;
-  commands = schema.split(QRegularExpression("; *\n\n"));
+  QStringList commands = schema.split(QRegularExpression(QStringLiteral("; *\n\n")));
 
   // We don't want this list to reflect possible DB schema changes, so we initialize it before executing any statements.
   // If no outer transaction is provided the song tables need to be queried before beginning an inner transaction!
@@ -405,16 +411,16 @@ void Database::ExecSongTablesCommands(QSqlDatabase &db, const QStringList &song_
   for (const QString &command : commands) {
     // There are now lots of "songs" tables that need to have the same schema: songs and device_*_songs.
     // We allow a magic value in the schema files to update all songs tables at once.
-    if (command.contains(kMagicAllSongsTables)) {
+    if (command.contains(QLatin1String(kMagicAllSongsTables))) {
       for (const QString &table : song_tables) {
         // Another horrible hack: device songs tables don't have matching _fts tables, so if this command tries to touch one, ignore it.
-        if (table.startsWith("device_") && command.contains(QString(kMagicAllSongsTables) + "_fts")) {
+        if (table.startsWith(QLatin1String("device_")) && command.contains(QLatin1String(kMagicAllSongsTables) + QStringLiteral("_fts"))) {
           continue;
         }
 
         qLog(Info) << "Updating" << table << "for" << kMagicAllSongsTables;
         QString new_command(command);
-        new_command.replace(kMagicAllSongsTables, table);
+        new_command.replace(QLatin1String(kMagicAllSongsTables), table);
         SqlQuery query(db);
         query.prepare(new_command);
         if (!query.Exec()) {
@@ -442,18 +448,19 @@ QStringList Database::SongsTables(QSqlDatabase &db, const int schema_version) {
   QStringList ret;
 
   // look for the tables in the main db
-  for (const QString &table : db.tables()) {
-    if (table == "songs" || table.endsWith("_songs")) ret << table;
+  const QStringList &tables = db.tables();
+  for (const QString &table : tables) {
+    if (table == QStringLiteral("songs") || table.endsWith(QLatin1String("_songs"))) ret << table;
   }
 
   // look for the tables in attached dbs
-  QStringList keys = attached_databases_.keys();
+  const QStringList keys = attached_databases_.keys();
   for (const QString &key : keys) {
     SqlQuery q(db);
-    q.prepare(QString("SELECT NAME FROM %1.sqlite_master WHERE type='table' AND name='songs' OR name LIKE '%songs'").arg(key));
+    q.prepare(QStringLiteral("SELECT NAME FROM %1.sqlite_master WHERE type='table' AND name='songs' OR name LIKE '%songs'").arg(key));
     if (q.Exec()) {
       while (q.next()) {
-        QString tab_name = key + "." + q.value(0).toString();
+        QString tab_name = key + QStringLiteral(".") + q.value(0).toString();
         ret << tab_name;
       }
     }
@@ -462,7 +469,7 @@ QStringList Database::SongsTables(QSqlDatabase &db, const int schema_version) {
     }
   }
 
-  ret << "playlist_items";
+  ret << QStringLiteral("playlist_items");
 
   return ret;
 
@@ -488,20 +495,20 @@ bool Database::IntegrityCheck(const QSqlDatabase &db) {
   bool ok = false;
   // Ask for 10 error messages at most.
   SqlQuery q(db);
-  q.prepare("PRAGMA integrity_check(10)");
+  q.prepare(QStringLiteral("PRAGMA integrity_check(10)"));
   if (q.Exec()) {
     bool error_reported = false;
     while (q.next()) {
       QString message = q.value(0).toString();
 
       // If no errors are found, a single row with the value "ok" is returned
-      if (message == "ok") {
+      if (message == QStringLiteral("ok")) {
         ok = true;
         break;
       }
       else {
         if (!error_reported) { app_->AddError(tr("Database corruption detected.")); }
-        app_->AddError("Database: " + message);
+        app_->AddError(QStringLiteral("Database: ") + message);
         error_reported = true;
       }
     }
@@ -553,7 +560,7 @@ bool Database::OpenDatabase(const QString &filename, sqlite3 **connection) {
 void Database::BackupFile(const QString &filename) {
 
   qLog(Debug) << "Starting database backup";
-  QString dest_filename = QString("%1.bak").arg(filename);
+  QString dest_filename = QStringLiteral("%1.bak").arg(filename);
   const int task_id = app_->task_manager()->StartTask(tr("Backing up database"));
 
   sqlite3 *source_connection = nullptr;

src/core/database.h

@@ -50,6 +50,8 @@ class Database : public QObject {
   explicit Database(Application *app, QObject *parent = nullptr, const QString &database_name = QString());
   ~Database() override;
 
+  static const int kSchemaVersion;
+
   struct AttachedDatabase {
     AttachedDatabase() {}
     AttachedDatabase(const QString &filename, const QString &schema, bool is_temporary)
@@ -60,11 +62,6 @@ class Database : public QObject {
     bool is_temporary_;
   };
 
-  static const int kSchemaVersion;
-  static const int kMinSupportedSchemaVersion;
-  static const char *kDatabaseFilename;
-  static const char *kMagicAllSongsTables;
-
   void ExitAsync();
   QSqlDatabase Connect();
   void Close();
@@ -148,7 +145,7 @@ class MemoryDatabase : public Database {
 
  public:
   explicit MemoryDatabase(Application *app, QObject *parent = nullptr)
-      : Database(app, parent, ":memory:") {}
+      : Database(app, parent, QStringLiteral(":memory:")) {}
   ~MemoryDatabase() override {
     // Make sure Qt doesn't reuse the same database
     QSqlDatabase::removeDatabase(Connect().connectionName());

src/core/deletefiles.cpp

@@ -92,7 +92,8 @@ void DeleteFiles::ProcessSomeFiles() {
   if (progress_ >= songs_.count()) {
     task_manager_->SetTaskProgress(task_id_, progress_, songs_.count());
 
-    storage_->FinishCopy(songs_with_errors_.isEmpty());
+    QString error_text;
+    storage_->FinishCopy(songs_with_errors_.isEmpty(), error_text);
 
     task_manager_->SetTaskFinished(task_id_);
 

src/core/filesystemmusicstorage.cpp

@@ -36,16 +36,16 @@
 
 FilesystemMusicStorage::FilesystemMusicStorage(const Song::Source source, const QString &root, const std::optional<int> collection_directory_id) : source_(source), root_(root), collection_directory_id_(collection_directory_id) {}
 
-bool FilesystemMusicStorage::CopyToStorage(const CopyJob &job) {
+bool FilesystemMusicStorage::CopyToStorage(const CopyJob &job, QString &error_text) {
 
   const QFileInfo src = QFileInfo(job.source_);
-  const QFileInfo dest = QFileInfo(root_ + "/" + job.destination_);
+  const QFileInfo dest = QFileInfo(root_ + QLatin1Char('/') + job.destination_);
 
   QFileInfo cover_src;
   QFileInfo cover_dest;
   if (job.albumcover_ && !job.cover_source_.isEmpty() && !job.cover_dest_.isEmpty()) {
     cover_src = QFileInfo(job.cover_source_);
-    cover_dest = QFileInfo(root_ + "/" + job.cover_dest_);
+    cover_dest = QFileInfo(root_ + QLatin1Char('/') + job.cover_dest_);
   }
 
   // Don't do anything if the destination is the same as the source
@@ -54,7 +54,8 @@ bool FilesystemMusicStorage::CopyToStorage(const CopyJob &job) {
   // Create directories as required
   QDir dir;
   if (!dir.mkpath(dest.absolutePath())) {
-    qLog(Warning) << "Failed to create directory" << dest.dir().absolutePath();
+    error_text = QObject::tr("Failed to create directory %1.").arg(dest.dir().absolutePath());
+    qLog(Error) << error_text;
     return false;
   }
 
@@ -65,10 +66,12 @@ bool FilesystemMusicStorage::CopyToStorage(const CopyJob &job) {
   }
 
   // Copy or move
-  bool result(true);
+  bool result = true;
   if (job.remove_original_) {
     if (dest.exists() && !job.overwrite_) {
       result = false;
+      error_text = QObject::tr("Destination file %1 exists, but not allowed to overwrite.").arg(dest.absoluteFilePath());
+      qLog(Error) << error_text;
     }
     else {
       result = QFile::rename(src.absoluteFilePath(), dest.absoluteFilePath());
@@ -86,9 +89,15 @@ bool FilesystemMusicStorage::CopyToStorage(const CopyJob &job) {
   else {
     if (dest.exists() && !job.overwrite_) {
       result = false;
+      error_text = QObject::tr("Destination file %1 exists, but not allowed to overwrite").arg(dest.absoluteFilePath());
+      qLog(Error) << error_text;
     }
     else {
       result = QFile::copy(src.absoluteFilePath(), dest.absoluteFilePath());
+      if (!result) {
+        error_text = QObject::tr("Could not copy file %1 to %2.").arg(src.absoluteFilePath(), dest.absoluteFilePath());
+        qLog(Error) << error_text;
+      }
     }
     if ((!cover_dest.exists() || job.overwrite_) && !cover_src.filePath().isEmpty() && !cover_dest.filePath().isEmpty()) {
       QFile::copy(cover_src.absoluteFilePath(), cover_dest.absoluteFilePath());

src/core/filesystemmusicstorage.h

@@ -39,7 +39,7 @@ class FilesystemMusicStorage : public virtual MusicStorage {
   QString LocalPath() const override { return root_; }
   std::optional<int> collection_directory_id() const override { return collection_directory_id_; }
 
-  bool CopyToStorage(const CopyJob &job) override;
+  bool CopyToStorage(const CopyJob &job, QString &error_text) override;
   bool DeleteFromStorage(const DeleteJob &job) override;
 
  private:

src/core/iconloader.cpp

@@ -19,6 +19,8 @@
 
 #include "config.h"
 
+#include <utility>
+
 #include <QDir>
 #include <QFile>
 #include <QList>
@@ -29,6 +31,7 @@
 #include <QSettings>
 
 #include "core/logging.h"
+#include "settings.h"
 #include "iconmapper.h"
 #include "settings/appearancesettingspage.h"
 #include "iconloader.h"
@@ -39,14 +42,14 @@ bool IconLoader::custom_icons_ = false;
 void IconLoader::Init() {
 
 #if !defined(Q_OS_MACOS) && !defined(Q_OS_WIN)
-  QSettings s;
+  Settings s;
   s.beginGroup(AppearanceSettingsPage::kSettingsGroup);
   system_icons_ = s.value("system_icons", false).toBool();
   s.endGroup();
 #endif
 
   QDir dir;
-  if (dir.exists(QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) + "/icons")) {
+  if (dir.exists(QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) + QStringLiteral("/icons"))) {
     custom_icons_ = true;
   }
 
@@ -79,7 +82,8 @@ QIcon IconLoader::Load(const QString &name, const bool system_icon, const int fi
     if (icon_prop.allow_system_icon) {
       ret = QIcon::fromTheme(name);
       if (ret.isNull()) {
-        for (const QString &alt_name : icon_prop.names) {
+        const QStringList alt_names = icon_prop.names;
+        for (const QString &alt_name : alt_names) {
           ret = QIcon::fromTheme(alt_name);
           if (!ret.isNull()) break;
         }
@@ -95,7 +99,8 @@ QIcon IconLoader::Load(const QString &name, const bool system_icon, const int fi
         else {
           int size_smallest = 0;
           int size_largest = 0;
-          for (const QSize &s : ret.availableSizes()) {
+          const QList<QSize> available_sizes = ret.availableSizes();
+          for (const QSize &s : available_sizes) {
             if (s.width() != s.height()) {
               qLog(Warning) << "Can't use system icon for" << name << "icon is not proportional.";
               ret = QIcon();
@@ -118,8 +123,8 @@ QIcon IconLoader::Load(const QString &name, const bool system_icon, const int fi
   }
 
   if (custom_icons_) {
-    QString custom_icon_path = QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) + "/icons/%1x%2/%3.png";
-    for (int s : sizes) {
+    QString custom_icon_path = QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) + QStringLiteral("/icons/%1x%2/%3.png");
+    for (int s : std::as_const(sizes)) {
       QString filename(custom_icon_path.arg(s).arg(s).arg(name));
       if (QFile::exists(filename)) ret.addFile(filename, QSize(s, s));
     }
@@ -127,8 +132,8 @@ QIcon IconLoader::Load(const QString &name, const bool system_icon, const int fi
     qLog(Warning) << "Couldn't load icon" << name << "from custom icons.";
   }
 
-  const QString path(":/icons/%1x%2/%3.png");
-  for (int s : sizes) {
+  const QString path(QStringLiteral(":/icons/%1x%2/%3.png"));
+  for (int s : std::as_const(sizes)) {
     QString filename(path.arg(s).arg(s).arg(name));
     if (QFile::exists(filename)) ret.addFile(filename, QSize(s, s));
   }

src/core/iconmapper.h

@@ -38,100 +38,100 @@ struct IconProperties {
 
 static const QMap<QString, IconProperties> iconmapper_ = {  // clazy:exclude=non-pod-global-static
 
-    { "albums",                        { {"media-optical"}} },
-    { "alsa",                          { {}} },
-    { "application-exit",              { {}} },
-    { "applications-internet",         { {}} },
-    { "bluetooth",                     { {"preferences-system-bluetooth", "bluetooth-active"}} },
-    { "cdcase",                        { {"cdcover", "media-optical"}} },
-    { "media-optical",                 { {"cd"}} },
-    { "configure",                     { {}} },
-    { "device-ipod-nano",              { {}} },
-    { "device-ipod",                   { {}} },
-    { "device-phone",                  { {}} },
-    { "device",                        { {"drive-removable-media-usb-pendrive"}} },
-    { "device-usb-drive",              { {}} },
-    { "device-usb-flash",              { {}} },
-    { "dialog-error",                  { {}} },
-    { "dialog-information",            { {}} },
-    { "dialog-ok-apply",               { {}} },
-    { "dialog-password",               { {}} },
-    { "dialog-warning",                { {}} },
-    { "document-download",             { {"download"}} },
-    { "document-new",                  { {}} },
-    { "document-open-folder",          { {}} },
-    { "document-open",                 { {}} },
-    { "document-save",                 { {}} },
-    { "document-search",               { {}} },
-    { "document-open-remote",          { {}} },
-    { "download",                      { {"applications-internet", "network-workgroup"}} },
-    { "edit-clear-list",               { {"edit-clear-list","edit-clear-all"}} },
-    { "edit-clear-locationbar-ltr",    { {"edit-clear-locationbar-ltr"}} },
-    { "edit-copy",                     { {}} },
-    { "edit-delete",                   { {}} },
-    { "edit-find",                     { {}} },
-    { "edit-redo",                     { {}} },
-    { "edit-rename",                   { {}} },
-    { "edit-undo",                     { {}} },
-    { "electrocompaniet",              { {}} },
-    { "equalizer",                     { {"view-media-equalizer"}} },
-    { "folder-new",                    { {}} },
-    { "folder",                        { {}} },
-    { "folder-sound",                  { {"folder-music"}} },
-    { "footsteps",                     { {"go-jump"}} },
-    { "go-down",                       { {}} },
-    { "go-home",                       { {}} },
-    { "go-jump",                       { {}} },
-    { "go-next",                       { {}} },
-    { "go-previous",                   { {}} },
-    { "go-up",                         { {}} },
-    { "gstreamer",                     { {"phonon-gstreamer"}} },
-    { "headset",                       { {"audio-headset"}} },
-    { "help-hint",                     { {}} },
-    { "intel",                         { {}} },
-    { "jack",                          { {"audio-input-line"}} },
-    { "keyboard",                      { {"input-keyboard"}} },
-    { "list-add",                      { {}} },
-    { "list-remove",                   { {}} },
-    { "love",                          { {"heart", "emblem-favorite"}} },
-    { "mcintosh-player",               { {}} },
-    { "mcintosh",                      { {}} },
-    { "mcintosh-text",                 { {}} },
-    { "media-eject",                   { {}} },
-    { "media-playback-pause",          { {"media-pause"}} },
-    { "media-playlist-repeat",         { {}} },
-    { "media-playlist-shuffle",        { {""}} },
-    { "media-playback-start",          { {"media-play", "media-playback-playing"}} },
-    { "media-seek-backward",           { {}} },
-    { "media-seek-forward",            { {}} },
-    { "media-skip-backward",           { {}} },
-    { "media-skip-forward",            { {}} },
-    { "media-playback-stop",           { {"media-stop"}} },
-    { "moodbar",                       { {"preferences-desktop-icons"}} },
-    { "nvidia",                        { {}} },
-    { "pulseaudio",                    { {}} },
-    { "realtek",                       { {}} },
-    { "scrobble-disabled",             { {}} },
-    { "scrobble",                      { {"love"}} },
-    { "search",                        { {}} },
-    { "soundcard",                     { {"audiocard", "audio-card"}} },
-    { "speaker",                       { {}} },
-    { "star-grey",                     { {}} },
-    { "star",                          { {}} },
-    { "strawberry",                    { {}} },
-    { "subsonic",                      { {}} },
-    { "tidal",                         { {}} },
-    { "tools-wizard",                  { {}} },
-    { "view-choose",                   { {}} },
-    { "view-fullscreen",               { {}} },
-    { "view-media-lyrics",             { {}} },
-    { "view-media-playlist",           { {}} },
-    { "view-media-visualization",      { {"preferences-desktop-theme"}} },
-    { "view-refresh",                  { {}} },
-    { "library-music",                 { {"vinyl"}} },
-    { "vlc",                           { {}} },
-    { "zoom-in",                       { {}} },
-    { "zoom-out",                      { {}, 0, 0 } }
+    { QStringLiteral("albums"),                        { {QStringLiteral("media-optical")}} },
+    { QStringLiteral("alsa"),                          { {}} },
+    { QStringLiteral("application-exit"),              { {}} },
+    { QStringLiteral("applications-internet"),         { {}} },
+    { QStringLiteral("bluetooth"),                     { {QStringLiteral("preferences-system-bluetooth"), QStringLiteral("bluetooth-active")}} },
+    { QStringLiteral("cdcase"),                        { {QStringLiteral("cdcover"), QStringLiteral("media-optical")}} },
+    { QStringLiteral("media-optical"),                 { {QStringLiteral("cd")}} },
+    { QStringLiteral("configure"),                     { {}} },
+    { QStringLiteral("device-ipod-nano"),              { {}} },
+    { QStringLiteral("device-ipod"),                   { {}} },
+    { QStringLiteral("device-phone"),                  { {}} },
+    { QStringLiteral("device"),                        { {QStringLiteral("drive-removable-media-usb-pendrive")}} },
+    { QStringLiteral("device-usb-drive"),              { {}} },
+    { QStringLiteral("device-usb-flash"),              { {}} },
+    { QStringLiteral("dialog-error"),                  { {}} },
+    { QStringLiteral("dialog-information"),            { {}} },
+    { QStringLiteral("dialog-ok-apply"),               { {}} },
+    { QStringLiteral("dialog-password"),               { {}} },
+    { QStringLiteral("dialog-warning"),                { {}} },
+    { QStringLiteral("document-download"),             { {QStringLiteral("download")}} },
+    { QStringLiteral("document-new"),                  { {}} },
+    { QStringLiteral("document-open-folder"),          { {}} },
+    { QStringLiteral("document-open"),                 { {}} },
+    { QStringLiteral("document-save"),                 { {}} },
+    { QStringLiteral("document-search"),               { {}} },
+    { QStringLiteral("document-open-remote"),          { {}} },
+    { QStringLiteral("download"),                      { {QStringLiteral("applications-internet"), QStringLiteral("network-workgroup")}} },
+    { QStringLiteral("edit-clear-list"),               { {QStringLiteral("edit-clear-list"), QStringLiteral("edit-clear-all")}} },
+    { QStringLiteral("edit-clear-locationbar-ltr"),    { {QStringLiteral("edit-clear-locationbar-ltr")}} },
+    { QStringLiteral("edit-copy"),                     { {}} },
+    { QStringLiteral("edit-delete"),                   { {}} },
+    { QStringLiteral("edit-find"),                     { {}} },
+    { QStringLiteral("edit-redo"),                     { {}} },
+    { QStringLiteral("edit-rename"),                   { {}} },
+    { QStringLiteral("edit-undo"),                     { {}} },
+    { QStringLiteral("electrocompaniet"),              { {}} },
+    { QStringLiteral("equalizer"),                     { {QStringLiteral("view-media-equalizer")}} },
+    { QStringLiteral("folder-new"),                    { {}} },
+    { QStringLiteral("folder"),                        { {}} },
+    { QStringLiteral("folder-sound"),                  { {QStringLiteral("folder-music")}} },
+    { QStringLiteral("footsteps"),                     { {QStringLiteral("go-jump")}} },
+    { QStringLiteral("go-down"),                       { {}} },
+    { QStringLiteral("go-home"),                       { {}} },
+    { QStringLiteral("go-jump"),                       { {}} },
+    { QStringLiteral("go-next"),                       { {}} },
+    { QStringLiteral("go-previous"),                   { {}} },
+    { QStringLiteral("go-up"),                         { {}} },
+    { QStringLiteral("gstreamer"),                     { {QStringLiteral("phonon-gstreamer")}} },
+    { QStringLiteral("headset"),                       { {QStringLiteral("audio-headset")}} },
+    { QStringLiteral("help-hint"),                     { {}} },
+    { QStringLiteral("intel"),                         { {}} },
+    { QStringLiteral("jack"),                          { {QStringLiteral("audio-input-line")}} },
+    { QStringLiteral("keyboard"),                      { {QStringLiteral("input-keyboard")}} },
+    { QStringLiteral("list-add"),                      { {}} },
+    { QStringLiteral("list-remove"),                   { {}} },
+    { QStringLiteral("love"),                          { {QStringLiteral("heart"), QStringLiteral("emblem-favorite")}} },
+    { QStringLiteral("mcintosh-player"),               { {}} },
+    { QStringLiteral("mcintosh"),                      { {}} },
+    { QStringLiteral("mcintosh-text"),                 { {}} },
+    { QStringLiteral("media-eject"),                   { {}} },
+    { QStringLiteral("media-playback-pause"),          { {QStringLiteral("media-pause")}} },
+    { QStringLiteral("media-playlist-repeat"),         { {}} },
+    { QStringLiteral("media-playlist-shuffle"),        { {QLatin1String("")}} },
+    { QStringLiteral("media-playback-start"),          { {QStringLiteral("media-play"), QStringLiteral("media-playback-playing")}} },
+    { QStringLiteral("media-seek-backward"),           { {}} },
+    { QStringLiteral("media-seek-forward"),            { {}} },
+    { QStringLiteral("media-skip-backward"),           { {}} },
+    { QStringLiteral("media-skip-forward"),            { {}} },
+    { QStringLiteral("media-playback-stop"),           { {QStringLiteral("media-stop")}} },
+    { QStringLiteral("moodbar"),                       { {QStringLiteral("preferences-desktop-icons")}} },
+    { QStringLiteral("nvidia"),                        { {}} },
+    { QStringLiteral("pulseaudio"),                    { {}} },
+    { QStringLiteral("realtek"),                       { {}} },
+    { QStringLiteral("scrobble-disabled"),             { {}} },
+    { QStringLiteral("scrobble"),                      { {QStringLiteral("love")}} },
+    { QStringLiteral("search"),                        { {}} },
+    { QStringLiteral("soundcard"),                     { {QStringLiteral("audiocard"), QStringLiteral("audio-card")}} },
+    { QStringLiteral("speaker"),                       { {}} },
+    { QStringLiteral("star-grey"),                     { {}} },
+    { QStringLiteral("star"),                          { {}} },
+    { QStringLiteral("strawberry"),                    { {}} },
+    { QStringLiteral("subsonic"),                      { {}} },
+    { QStringLiteral("tidal"),                         { {}} },
+    { QStringLiteral("tools-wizard"),                  { {}} },
+    { QStringLiteral("view-choose"),                   { {}} },
+    { QStringLiteral("view-fullscreen"),               { {}} },
+    { QStringLiteral("view-media-lyrics"),             { {}} },
+    { QStringLiteral("view-media-playlist"),           { {}} },
+    { QStringLiteral("view-media-visualization"),      { {QStringLiteral("preferences-desktop-theme")}} },
+    { QStringLiteral("view-refresh"),                  { {}} },
+    { QStringLiteral("library-music"),                 { {QStringLiteral("vinyl")}} },
+    { QStringLiteral("vlc"),                           { {}} },
+    { QStringLiteral("zoom-in"),                       { {}} },
+    { QStringLiteral("zoom-out"),                      { {}, 0, 0 } }
 
 };
 

src/core/mac_startup.mm

@@ -60,13 +60,12 @@
 #include <QDir>
 #include <QEvent>
 #include <QFile>
-#include <QSettings>
 
 #include <QtDebug>
 
 QDebug operator<<(QDebug dbg, NSObject *object) {
 
-  QString ns_format = [[NSString stringWithFormat:@"%@", object] UTF8String];
+  const QString ns_format = QString::fromUtf8([[NSString stringWithFormat:@"%@", object] UTF8String]);
   dbg.nospace() << ns_format;
   return dbg.space();
 

src/core/macfslistener.mm

@@ -57,7 +57,7 @@ void MacFSListener::EventStreamCallback(ConstFSEventStreamRef stream, void *user
   for (size_t i = 0; i < num_events; ++i) {
     QString path = QString::fromUtf8(paths[i]);
     qLog(Debug) << "Something changed at:" << path;
-    while (path.endsWith('/')) {
+    while (path.endsWith(QLatin1Char('/'))) {
       path.chop(1);
     }
     emit me->PathChanged(path);

src/core/macsystemtrayicon.mm

@@ -70,7 +70,7 @@ class MacSystemTrayIconPrivate {
   MacSystemTrayIconPrivate() {
     dock_menu_ = [[NSMenu alloc] initWithTitle:@"DockMenu"];
 
-    QString title = QT_TR_NOOP("Now Playing");
+    QString title = QT_TR_NOOP(QStringLiteral("Now Playing"));
     NSString *t = [[NSString alloc] initWithUTF8String:title.toUtf8().constData()];
     now_playing_ = [[NSMenuItem alloc] initWithTitle:t action:nullptr keyEquivalent:@""];
     now_playing_artist_ = [[NSMenuItem alloc] initWithTitle:@"Nothing to see here" action:nullptr keyEquivalent:@""];
@@ -89,7 +89,7 @@ class MacSystemTrayIconPrivate {
 
   void AddMenuItem(QAction *action) {
     // Strip accelarators from name.
-    QString text = action->text().remove("&");
+    QString text = action->text().remove(QLatin1Char('&'));
     NSString *title = [[NSString alloc] initWithUTF8String: text.toUtf8().constData()];
     // Create an object that can receive user clicks and pass them on to the QAction.
     Target *target = [[Target alloc] initWithQAction:action];
@@ -152,10 +152,10 @@ class MacSystemTrayIconPrivate {
 
 SystemTrayIcon::SystemTrayIcon(QObject *parent)
     : QObject(parent),
-      normal_icon_(QPixmap(":/pictures/strawberry.png").scaled(128, 128, Qt::KeepAspectRatio, Qt::SmoothTransformation)),
-      grey_icon_(QPixmap(":/pictures/strawberry-grey.png").scaled(128, 128, Qt::KeepAspectRatio, Qt::SmoothTransformation)),
-      playing_icon_(":/pictures/tiny-play.png"),
-      paused_icon_(":/pictures/tiny-pause.png"),
+      normal_icon_(QPixmap(QStringLiteral(":/pictures/strawberry.png")).scaled(128, 128, Qt::KeepAspectRatio, Qt::SmoothTransformation)),
+      grey_icon_(QPixmap(QStringLiteral(":/pictures/strawberry-grey.png")).scaled(128, 128, Qt::KeepAspectRatio, Qt::SmoothTransformation)),
+      playing_icon_(QStringLiteral(":/pictures/tiny-play.png")),
+      paused_icon_(QStringLiteral(":/pictures/tiny-pause.png")),
       trayicon_progress_(false),
       song_progress_(0) {
 

src/core/mainwindow.cpp

@@ -73,6 +73,10 @@
 #include <QToolButton>
 #include <QCheckBox>
 #include <QClipboard>
+#ifdef HAVE_DBUS
+#  include <QDBusConnection>
+#  include <QDBusMessage>
+#endif
 
 #include "core/logging.h"
 
@@ -100,6 +104,7 @@
 #  include "qtsystemtrayicon.h"
 #endif
 #include "networkaccessmanager.h"
+#include "settings.h"
 #include "utilities/envutils.h"
 #include "utilities/filemanagerutils.h"
 #include "utilities/timeconstants.h"
@@ -200,6 +205,8 @@
 
 #include "smartplaylists/smartplaylistsviewcontainer.h"
 
+#include "organize/organizeerrordialog.h"
+
 #ifdef Q_OS_WIN
 #  include "windows7thumbbar.h"
 #endif
@@ -295,13 +302,13 @@ MainWindow::MainWindow(Application *app, SharedPtr<SystemTrayIcon> tray_icon, OS
       }),
       smartplaylists_view_(new SmartPlaylistsViewContainer(app, this)),
 #ifdef HAVE_SUBSONIC
-      subsonic_view_(new InternetSongsView(app_, app->internet_services()->ServiceBySource(Song::Source::Subsonic), SubsonicSettingsPage::kSettingsGroup, SettingsDialog::Page::Subsonic, this)),
+      subsonic_view_(new InternetSongsView(app_, app->internet_services()->ServiceBySource(Song::Source::Subsonic), QLatin1String(SubsonicSettingsPage::kSettingsGroup), SettingsDialog::Page::Subsonic, this)),
 #endif
 #ifdef HAVE_TIDAL
-      tidal_view_(new InternetTabsView(app_, app->internet_services()->ServiceBySource(Song::Source::Tidal), TidalSettingsPage::kSettingsGroup, SettingsDialog::Page::Tidal, this)),
+      tidal_view_(new InternetTabsView(app_, app->internet_services()->ServiceBySource(Song::Source::Tidal), QLatin1String(TidalSettingsPage::kSettingsGroup), SettingsDialog::Page::Tidal, this)),
 #endif
 #ifdef HAVE_QOBUZ
-      qobuz_view_(new InternetTabsView(app_, app->internet_services()->ServiceBySource(Song::Source::Qobuz), QobuzSettingsPage::kSettingsGroup, SettingsDialog::Page::Qobuz, this)),
+      qobuz_view_(new InternetTabsView(app_, app->internet_services()->ServiceBySource(Song::Source::Qobuz), QLatin1String(QobuzSettingsPage::kSettingsGroup), SettingsDialog::Page::Qobuz, this)),
 #endif
       radio_view_(new RadioViewContainer(this)),
       lastfm_import_dialog_(new LastFMImportDialog(app_->lastfm_import(), this)),
@@ -333,6 +340,9 @@ MainWindow::MainWindow(Application *app, SharedPtr<SystemTrayIcon> tray_icon, OS
       track_slider_timer_(new QTimer(this)),
       keep_running_(false),
       playing_widget_(true),
+#ifdef HAVE_DBUS
+      taskbar_progress_(false),
+#endif
       doubleclick_addmode_(BehaviourSettingsPage::AddBehaviour::Append),
       doubleclick_playmode_(BehaviourSettingsPage::PlayBehaviour::Never),
       doubleclick_playlist_addmode_(BehaviourSettingsPage::PlaylistAddBehaviour::Play),
@@ -354,7 +364,7 @@ MainWindow::MainWindow(Application *app, SharedPtr<SystemTrayIcon> tray_icon, OS
   // Initialize the UI
   ui_->setupUi(this);
 
-  setWindowIcon(IconLoader::Load("strawberry"));
+  setWindowIcon(IconLoader::Load(QStringLiteral("strawberry")));
 
   album_cover_choice_controller_->Init(app);
 
@@ -366,30 +376,30 @@ MainWindow::MainWindow(Application *app, SharedPtr<SystemTrayIcon> tray_icon, OS
   StyleHelper::setBaseColor(palette().color(QPalette::Highlight).darker());
 
   // Add tabs to the fancy tab widget
-  ui_->tabs->AddTab(context_view_, "context", IconLoader::Load("strawberry", true, 0, 32), tr("Context"));
-  ui_->tabs->AddTab(collection_view_, "collection", IconLoader::Load("library-music", true, 0, 32), tr("Collection"));
-  ui_->tabs->AddTab(queue_view_, "queue", IconLoader::Load("footsteps", true, 0, 32), tr("Queue"));
-  ui_->tabs->AddTab(playlist_list_, "playlists", IconLoader::Load("view-media-playlist", true, 0, 32), tr("Playlists"));
-  ui_->tabs->AddTab(smartplaylists_view_, "smartplaylists", IconLoader::Load("view-media-playlist", true, 0, 32), tr("Smart playlists"));
-  ui_->tabs->AddTab(file_view_, "files", IconLoader::Load("document-open", true, 0, 32), tr("Files"));
-  ui_->tabs->AddTab(radio_view_, "radios", IconLoader::Load("radio", true, 0, 32), tr("Radios"));
+  ui_->tabs->AddTab(context_view_, QStringLiteral("context"), IconLoader::Load(QStringLiteral("strawberry"), true, 0, 32), tr("Context"));
+  ui_->tabs->AddTab(collection_view_, QStringLiteral("collection"), IconLoader::Load(QStringLiteral("library-music"), true, 0, 32), tr("Collection"));
+  ui_->tabs->AddTab(queue_view_, QStringLiteral("queue"), IconLoader::Load(QStringLiteral("footsteps"), true, 0, 32), tr("Queue"));
+  ui_->tabs->AddTab(playlist_list_, QStringLiteral("playlists"), IconLoader::Load(QStringLiteral("view-media-playlist"), true, 0, 32), tr("Playlists"));
+  ui_->tabs->AddTab(smartplaylists_view_, QStringLiteral("smartplaylists"), IconLoader::Load(QStringLiteral("view-media-playlist"), true, 0, 32), tr("Smart playlists"));
+  ui_->tabs->AddTab(file_view_, QStringLiteral("files"), IconLoader::Load(QStringLiteral("document-open"), true, 0, 32), tr("Files"));
+  ui_->tabs->AddTab(radio_view_, QStringLiteral("radios"), IconLoader::Load(QStringLiteral("radio"), true, 0, 32), tr("Radios"));
 #ifndef Q_OS_WIN
-  ui_->tabs->AddTab(device_view_, "devices", IconLoader::Load("device", true, 0, 32), tr("Devices"));
+  ui_->tabs->AddTab(device_view_, QStringLiteral("devices"), IconLoader::Load(QStringLiteral("device"), true, 0, 32), tr("Devices"));
 #endif
 #ifdef HAVE_SUBSONIC
-  ui_->tabs->AddTab(subsonic_view_, "subsonic", IconLoader::Load("subsonic", true, 0, 32), tr("Subsonic"));
+  ui_->tabs->AddTab(subsonic_view_, QStringLiteral("subsonic"), IconLoader::Load(QStringLiteral("subsonic"), true, 0, 32), tr("Subsonic"));
 #endif
 #ifdef HAVE_TIDAL
-  ui_->tabs->AddTab(tidal_view_, "tidal", IconLoader::Load("tidal", true, 0, 32), tr("Tidal"));
+  ui_->tabs->AddTab(tidal_view_, QStringLiteral("tidal"), IconLoader::Load(QStringLiteral("tidal"), true, 0, 32), tr("Tidal"));
 #endif
 #ifdef HAVE_QOBUZ
-  ui_->tabs->AddTab(qobuz_view_, "qobuz", IconLoader::Load("qobuz", true, 0, 32), tr("Qobuz"));
+  ui_->tabs->AddTab(qobuz_view_, QStringLiteral("qobuz"), IconLoader::Load(QStringLiteral("qobuz"), true, 0, 32), tr("Qobuz"));
 #endif
 
   // Add the playing widget to the fancy tab widget
   ui_->tabs->addBottomWidget(ui_->widget_playing);
-  //ui_->tabs->SetBackgroundPixmap(QPixmap(":/pictures/strawberry-background.png"));
-  ui_->tabs->Load(kSettingsGroup);
+  ui_->tabs->setBackgroundPixmap(QPixmap(QStringLiteral(":/pictures/sidebar-background.png")));
+  ui_->tabs->Load(QLatin1String(kSettingsGroup));
 
   track_position_timer_->setInterval(kTrackPositionUpdateTimeMs);
   QObject::connect(track_position_timer_, &QTimer::timeout, this, &MainWindow::UpdateTrackPosition);
@@ -438,59 +448,59 @@ MainWindow::MainWindow(Application *app, SharedPtr<SystemTrayIcon> tray_icon, OS
 
   // Help menu
 
-  ui_->action_about_strawberry->setIcon(IconLoader::Load("strawberry"));
-  ui_->action_about_qt->setIcon(QIcon(":/qt-project.org/qmessagebox/images/qtlogo-64.png"));
+  ui_->action_about_strawberry->setIcon(IconLoader::Load(QStringLiteral("strawberry")));
+  ui_->action_about_qt->setIcon(QIcon(QStringLiteral(":/qt-project.org/qmessagebox/images/qtlogo-64.png")));
 
   // Music menu
 
-  ui_->action_open_file->setIcon(IconLoader::Load("document-open"));
-  ui_->action_open_cd->setIcon(IconLoader::Load("media-optical"));
-  ui_->action_previous_track->setIcon(IconLoader::Load("media-skip-backward"));
-  ui_->action_play_pause->setIcon(IconLoader::Load("media-playback-start"));
-  ui_->action_stop->setIcon(IconLoader::Load("media-playback-stop"));
-  ui_->action_stop_after_this_track->setIcon(IconLoader::Load("media-playback-stop"));
-  ui_->action_next_track->setIcon(IconLoader::Load("media-skip-forward"));
-  ui_->action_quit->setIcon(IconLoader::Load("application-exit"));
+  ui_->action_open_file->setIcon(IconLoader::Load(QStringLiteral("document-open")));
+  ui_->action_open_cd->setIcon(IconLoader::Load(QStringLiteral("media-optical")));
+  ui_->action_previous_track->setIcon(IconLoader::Load(QStringLiteral("media-skip-backward")));
+  ui_->action_play_pause->setIcon(IconLoader::Load(QStringLiteral("media-playback-start")));
+  ui_->action_stop->setIcon(IconLoader::Load(QStringLiteral("media-playback-stop")));
+  ui_->action_stop_after_this_track->setIcon(IconLoader::Load(QStringLiteral("media-playback-stop")));
+  ui_->action_next_track->setIcon(IconLoader::Load(QStringLiteral("media-skip-forward")));
+  ui_->action_quit->setIcon(IconLoader::Load(QStringLiteral("application-exit")));
 
   // Playlist
 
-  ui_->action_add_file->setIcon(IconLoader::Load("document-open"));
-  ui_->action_add_folder->setIcon(IconLoader::Load("document-open-folder"));
-  ui_->action_add_stream->setIcon(IconLoader::Load("document-open-remote"));
-  ui_->action_shuffle_mode->setIcon(IconLoader::Load("media-playlist-shuffle"));
-  ui_->action_repeat_mode->setIcon(IconLoader::Load("media-playlist-repeat"));
-  ui_->action_new_playlist->setIcon(IconLoader::Load("document-new"));
-  ui_->action_save_playlist->setIcon(IconLoader::Load("document-save"));
-  ui_->action_load_playlist->setIcon(IconLoader::Load("document-open"));
-  ui_->action_jump->setIcon(IconLoader::Load("go-jump"));
-  ui_->action_clear_playlist->setIcon(IconLoader::Load("edit-clear-list"));
-  ui_->action_shuffle->setIcon(IconLoader::Load("media-playlist-shuffle"));
-  ui_->action_remove_duplicates->setIcon(IconLoader::Load("list-remove"));
-  ui_->action_remove_unavailable->setIcon(IconLoader::Load("list-remove"));
-  ui_->action_remove_from_playlist->setIcon(IconLoader::Load("list-remove"));
-  ui_->action_save_all_playlists->setIcon(IconLoader::Load("document-save-all"));
+  ui_->action_add_file->setIcon(IconLoader::Load(QStringLiteral("document-open")));
+  ui_->action_add_folder->setIcon(IconLoader::Load(QStringLiteral("document-open-folder")));
+  ui_->action_add_stream->setIcon(IconLoader::Load(QStringLiteral("document-open-remote")));
+  ui_->action_shuffle_mode->setIcon(IconLoader::Load(QStringLiteral("media-playlist-shuffle")));
+  ui_->action_repeat_mode->setIcon(IconLoader::Load(QStringLiteral("media-playlist-repeat")));
+  ui_->action_new_playlist->setIcon(IconLoader::Load(QStringLiteral("document-new")));
+  ui_->action_save_playlist->setIcon(IconLoader::Load(QStringLiteral("document-save")));
+  ui_->action_load_playlist->setIcon(IconLoader::Load(QStringLiteral("document-open")));
+  ui_->action_jump->setIcon(IconLoader::Load(QStringLiteral("go-jump")));
+  ui_->action_clear_playlist->setIcon(IconLoader::Load(QStringLiteral("edit-clear-list")));
+  ui_->action_shuffle->setIcon(IconLoader::Load(QStringLiteral("media-playlist-shuffle")));
+  ui_->action_remove_duplicates->setIcon(IconLoader::Load(QStringLiteral("list-remove")));
+  ui_->action_remove_unavailable->setIcon(IconLoader::Load(QStringLiteral("list-remove")));
+  ui_->action_remove_from_playlist->setIcon(IconLoader::Load(QStringLiteral("list-remove")));
+  ui_->action_save_all_playlists->setIcon(IconLoader::Load(QStringLiteral("document-save-all")));
 
   // Configure
 
-  ui_->action_cover_manager->setIcon(IconLoader::Load("document-download"));
-  ui_->action_edit_track->setIcon(IconLoader::Load("edit-rename"));
-  ui_->action_edit_value->setIcon(IconLoader::Load("edit-rename"));
-  ui_->action_selection_set_value->setIcon(IconLoader::Load("edit-rename"));
-  ui_->action_equalizer->setIcon(IconLoader::Load("equalizer"));
-  ui_->action_transcoder->setIcon(IconLoader::Load("tools-wizard"));
-  ui_->action_update_collection->setIcon(IconLoader::Load("view-refresh"));
-  ui_->action_full_collection_scan->setIcon(IconLoader::Load("view-refresh"));
-  ui_->action_abort_collection_scan->setIcon(IconLoader::Load("dialog-error"));
-  ui_->action_settings->setIcon(IconLoader::Load("configure"));
-  ui_->action_import_data_from_last_fm->setIcon(IconLoader::Load("scrobble"));
-  ui_->action_console->setIcon(IconLoader::Load("keyboard"));
-  ui_->action_toggle_show_sidebar->setIcon(IconLoader::Load("view-choose"));
-  ui_->action_auto_complete_tags->setIcon(IconLoader::Load("musicbrainz"));
+  ui_->action_cover_manager->setIcon(IconLoader::Load(QStringLiteral("document-download")));
+  ui_->action_edit_track->setIcon(IconLoader::Load(QStringLiteral("edit-rename")));
+  ui_->action_edit_value->setIcon(IconLoader::Load(QStringLiteral("edit-rename")));
+  ui_->action_selection_set_value->setIcon(IconLoader::Load(QStringLiteral("edit-rename")));
+  ui_->action_equalizer->setIcon(IconLoader::Load(QStringLiteral("equalizer")));
+  ui_->action_transcoder->setIcon(IconLoader::Load(QStringLiteral("tools-wizard")));
+  ui_->action_update_collection->setIcon(IconLoader::Load(QStringLiteral("view-refresh")));
+  ui_->action_full_collection_scan->setIcon(IconLoader::Load(QStringLiteral("view-refresh")));
+  ui_->action_abort_collection_scan->setIcon(IconLoader::Load(QStringLiteral("dialog-error")));
+  ui_->action_settings->setIcon(IconLoader::Load(QStringLiteral("configure")));
+  ui_->action_import_data_from_last_fm->setIcon(IconLoader::Load(QStringLiteral("scrobble")));
+  ui_->action_console->setIcon(IconLoader::Load(QStringLiteral("keyboard")));
+  ui_->action_toggle_show_sidebar->setIcon(IconLoader::Load(QStringLiteral("view-choose")));
+  ui_->action_auto_complete_tags->setIcon(IconLoader::Load(QStringLiteral("musicbrainz")));
 
   // Scrobble
 
-  ui_->action_toggle_scrobbling->setIcon(IconLoader::Load("scrobble-disabled"));
-  ui_->action_love->setIcon(IconLoader::Load("love"));
+  ui_->action_toggle_scrobbling->setIcon(IconLoader::Load(QStringLiteral("scrobble-disabled")));
+  ui_->action_love->setIcon(IconLoader::Load(QStringLiteral("love")));
 
   // File view connections
   QObject::connect(file_view_, &FileView::AddToPlaylist, this, &MainWindow::AddToPlaylist);
@@ -549,7 +559,7 @@ MainWindow::MainWindow(Application *app, SharedPtr<SystemTrayIcon> tray_icon, OS
   QObject::connect(ui_->action_abort_collection_scan, &QAction::triggered, &*app_->collection(), &SCollection::AbortScan);
 #if defined(HAVE_GSTREAMER)
   QObject::connect(ui_->action_add_files_to_transcoder, &QAction::triggered, this, &MainWindow::AddFilesToTranscoder);
-  ui_->action_add_files_to_transcoder->setIcon(IconLoader::Load("tools-wizard"));
+  ui_->action_add_files_to_transcoder->setIcon(IconLoader::Load(QStringLiteral("tools-wizard")));
 #else
   ui_->action_add_files_to_transcoder->setDisabled(true);
 #endif
@@ -559,8 +569,8 @@ MainWindow::MainWindow(Application *app, SharedPtr<SystemTrayIcon> tray_icon, OS
   QObject::connect(&*app_->scrobbler(), &AudioScrobbler::ErrorMessage, this, &MainWindow::ShowErrorDialog);
 
   // Playlist view actions
-  ui_->action_next_playlist->setShortcuts(QList<QKeySequence>() << QKeySequence::fromString("Ctrl+Tab") << QKeySequence::fromString("Ctrl+PgDown"));
-  ui_->action_previous_playlist->setShortcuts(QList<QKeySequence>() << QKeySequence::fromString("Ctrl+Shift+Tab") << QKeySequence::fromString("Ctrl+PgUp"));
+  ui_->action_next_playlist->setShortcuts(QList<QKeySequence>() << QKeySequence::fromString(QStringLiteral("Ctrl+Tab")) << QKeySequence::fromString(QStringLiteral("Ctrl+PgDown")));
+  ui_->action_previous_playlist->setShortcuts(QList<QKeySequence>() << QKeySequence::fromString(QStringLiteral("Ctrl+Shift+Tab")) << QKeySequence::fromString(QStringLiteral("Ctrl+PgUp")));
 
   // Actions for switching tabs will be global to the entire window, so adding them here
   addAction(ui_->action_next_playlist);
@@ -679,9 +689,9 @@ MainWindow::MainWindow(Application *app, SharedPtr<SystemTrayIcon> tray_icon, OS
 
   QObject::connect(collection_view_group, &QActionGroup::triggered, this, &MainWindow::ChangeCollectionFilterMode);
 
-  QAction *collection_config_action = new QAction(IconLoader::Load("configure"), tr("Configure collection..."), this);
+  QAction *collection_config_action = new QAction(IconLoader::Load(QStringLiteral("configure")), tr("Configure collection..."), this);
   QObject::connect(collection_config_action, &QAction::triggered, this, &MainWindow::ShowCollectionConfig);
-  collection_view_->filter_widget()->SetSettingsGroup(CollectionSettingsPage::kSettingsGroup);
+  collection_view_->filter_widget()->SetSettingsGroup(QLatin1String(CollectionSettingsPage::kSettingsGroup));
   collection_view_->filter_widget()->Init(app_->collection()->model());
 
   QAction *separator = new QAction(this);
@@ -722,14 +732,14 @@ MainWindow::MainWindow(Application *app, SharedPtr<SystemTrayIcon> tray_icon, OS
   QObject::connect(playlist_menu_, &QMenu::aboutToHide, this, &MainWindow::PlaylistMenuHidden);
   playlist_play_pause_ = playlist_menu_->addAction(tr("Play"), this, &MainWindow::PlaylistPlay);
   playlist_menu_->addAction(ui_->action_stop);
-  playlist_stop_after_ = playlist_menu_->addAction(IconLoader::Load("media-playback-stop"), tr("Stop after this track"), this, &MainWindow::PlaylistStopAfter);
-  playlist_queue_ = playlist_menu_->addAction(IconLoader::Load("go-next"), tr("Toggle queue status"), this, &MainWindow::PlaylistQueue);
-  playlist_queue_->setShortcut(QKeySequence("Ctrl+D"));
+  playlist_stop_after_ = playlist_menu_->addAction(IconLoader::Load(QStringLiteral("media-playback-stop")), tr("Stop after this track"), this, &MainWindow::PlaylistStopAfter);
+  playlist_queue_ = playlist_menu_->addAction(IconLoader::Load(QStringLiteral("go-next")), tr("Toggle queue status"), this, &MainWindow::PlaylistQueue);
+  playlist_queue_->setShortcut(QKeySequence(QStringLiteral("Ctrl+D")));
   ui_->playlist->addAction(playlist_queue_);
-  playlist_queue_play_next_ = playlist_menu_->addAction(IconLoader::Load("go-next"), tr("Queue selected tracks to play next"), this, &MainWindow::PlaylistQueuePlayNext);
-  playlist_queue_play_next_->setShortcut(QKeySequence("Ctrl+Shift+D"));
+  playlist_queue_play_next_ = playlist_menu_->addAction(IconLoader::Load(QStringLiteral("go-next")), tr("Queue selected tracks to play next"), this, &MainWindow::PlaylistQueuePlayNext);
+  playlist_queue_play_next_->setShortcut(QKeySequence(QStringLiteral("Ctrl+Shift+D")));
   ui_->playlist->addAction(playlist_queue_play_next_);
-  playlist_skip_ = playlist_menu_->addAction(IconLoader::Load("media-skip-forward"), tr("Toggle skip status"), this, &MainWindow::PlaylistSkip);
+  playlist_skip_ = playlist_menu_->addAction(IconLoader::Load(QStringLiteral("media-skip-forward")), tr("Toggle skip status"), this, &MainWindow::PlaylistSkip);
   ui_->playlist->addAction(playlist_skip_);
 
   playlist_menu_->addSeparator();
@@ -742,22 +752,22 @@ MainWindow::MainWindow(Application *app, SharedPtr<SystemTrayIcon> tray_icon, OS
 #ifdef HAVE_MUSICBRAINZ
   playlist_menu_->addAction(ui_->action_auto_complete_tags);
 #endif
-  playlist_rescan_songs_ = playlist_menu_->addAction(IconLoader::Load("view-refresh"), tr("Rescan song(s)..."), this, &MainWindow::RescanSongs);
+  playlist_rescan_songs_ = playlist_menu_->addAction(IconLoader::Load(QStringLiteral("view-refresh")), tr("Rescan song(s)..."), this, &MainWindow::RescanSongs);
   playlist_menu_->addAction(playlist_rescan_songs_);
 #ifdef HAVE_GSTREAMER
   playlist_menu_->addAction(ui_->action_add_files_to_transcoder);
 #endif
   playlist_menu_->addSeparator();
-  playlist_copy_url_ = playlist_menu_->addAction(IconLoader::Load("edit-copy"), tr("Copy URL(s)..."), this, &MainWindow::PlaylistCopyUrl);
-  playlist_show_in_collection_ = playlist_menu_->addAction(IconLoader::Load("edit-find"), tr("Show in collection..."), this, &MainWindow::ShowInCollection);
-  playlist_open_in_browser_ = playlist_menu_->addAction(IconLoader::Load("document-open-folder"), tr("Show in file browser..."), this, &MainWindow::PlaylistOpenInBrowser);
-  playlist_organize_ = playlist_menu_->addAction(IconLoader::Load("edit-copy"), tr("Organize files..."), this, &MainWindow::PlaylistMoveToCollection);
-  playlist_copy_to_collection_ = playlist_menu_->addAction(IconLoader::Load("edit-copy"), tr("Copy to collection..."), this, &MainWindow::PlaylistCopyToCollection);
-  playlist_move_to_collection_ = playlist_menu_->addAction(IconLoader::Load("go-jump"), tr("Move to collection..."), this, &MainWindow::PlaylistMoveToCollection);
+  playlist_copy_url_ = playlist_menu_->addAction(IconLoader::Load(QStringLiteral("edit-copy")), tr("Copy URL(s)..."), this, &MainWindow::PlaylistCopyUrl);
+  playlist_show_in_collection_ = playlist_menu_->addAction(IconLoader::Load(QStringLiteral("edit-find")), tr("Show in collection..."), this, &MainWindow::ShowInCollection);
+  playlist_open_in_browser_ = playlist_menu_->addAction(IconLoader::Load(QStringLiteral("document-open-folder")), tr("Show in file browser..."), this, &MainWindow::PlaylistOpenInBrowser);
+  playlist_organize_ = playlist_menu_->addAction(IconLoader::Load(QStringLiteral("edit-copy")), tr("Organize files..."), this, &MainWindow::PlaylistMoveToCollection);
+  playlist_copy_to_collection_ = playlist_menu_->addAction(IconLoader::Load(QStringLiteral("edit-copy")), tr("Copy to collection..."), this, &MainWindow::PlaylistCopyToCollection);
+  playlist_move_to_collection_ = playlist_menu_->addAction(IconLoader::Load(QStringLiteral("go-jump")), tr("Move to collection..."), this, &MainWindow::PlaylistMoveToCollection);
 #if defined(HAVE_GSTREAMER) && !defined(Q_OS_WIN)
-  playlist_copy_to_device_ = playlist_menu_->addAction(IconLoader::Load("device"), tr("Copy to device..."), this, &MainWindow::PlaylistCopyToDevice);
+  playlist_copy_to_device_ = playlist_menu_->addAction(IconLoader::Load(QStringLiteral("device")), tr("Copy to device..."), this, &MainWindow::PlaylistCopyToDevice);
 #endif
-  playlist_delete_ = playlist_menu_->addAction(IconLoader::Load("edit-delete"), tr("Delete from disk..."), this, &MainWindow::PlaylistDelete);
+  playlist_delete_ = playlist_menu_->addAction(IconLoader::Load(QStringLiteral("edit-delete")), tr("Delete from disk..."), this, &MainWindow::PlaylistDelete);
   playlist_menu_->addSeparator();
   playlistitem_actions_separator_ = playlist_menu_->addSeparator();
   playlist_menu_->addAction(ui_->action_clear_playlist);
@@ -845,7 +855,7 @@ MainWindow::MainWindow(Application *app, SharedPtr<SystemTrayIcon> tray_icon, OS
   QObject::connect(ui_->analyzer, &AnalyzerContainer::WheelEvent, this, &MainWindow::VolumeWheelEvent);
 
   // Statusbar widgets
-  ui_->playlist_summary->setMinimumWidth(QFontMetrics(font()).horizontalAdvance("WW selected of WW tracks - [ WW:WW ]"));
+  ui_->playlist_summary->setMinimumWidth(QFontMetrics(font()).horizontalAdvance(QStringLiteral("WW selected of WW tracks - [ WW:WW ]")));
   ui_->status_bar_stack->setCurrentWidget(ui_->playlist_summary_page);
   QObject::connect(ui_->multi_loading_indicator, &MultiLoadingIndicator::TaskCountChange, this, &MainWindow::TaskCountChanged);
 
@@ -872,7 +882,7 @@ MainWindow::MainWindow(Application *app, SharedPtr<SystemTrayIcon> tray_icon, OS
   PlayingWidgetPositionChanged(ui_->widget_playing->show_above_status_bar());
 
   StyleSheetLoader *css_loader = new StyleSheetLoader(this);
-  css_loader->SetStyleSheet(this, ":/style/strawberry.css");
+  css_loader->SetStyleSheet(this, QStringLiteral(":/style/strawberry.css"));
 
   // Load playlists
   app_->playlist_manager()->Init(app_->collection_backend(), app_->playlist_backend(), ui_->playlist_sequence, ui_->playlist);
@@ -943,7 +953,7 @@ MainWindow::MainWindow(Application *app, SharedPtr<SystemTrayIcon> tray_icon, OS
 #else
   BehaviourSettingsPage::StartupBehaviour startupbehaviour = BehaviourSettingsPage::StartupBehaviour::Remember;
   {
-    QSettings s;
+    Settings s;
     s.beginGroup(BehaviourSettingsPage::kSettingsGroup);
     startupbehaviour = static_cast<BehaviourSettingsPage::StartupBehaviour>(s.value("startupbehaviour", static_cast<int>(BehaviourSettingsPage::StartupBehaviour::Remember)).toInt());
     s.endGroup();
@@ -966,7 +976,7 @@ MainWindow::MainWindow(Application *app, SharedPtr<SystemTrayIcon> tray_icon, OS
       }
       [[fallthrough]];
     case BehaviourSettingsPage::StartupBehaviour::Remember:
-    default: {
+    default:{
 
       was_maximized_ = settings_.value("maximized", true).toBool();
       if (was_maximized_) setWindowState(windowState() | Qt::WindowMaximized);
@@ -999,7 +1009,7 @@ MainWindow::MainWindow(Application *app, SharedPtr<SystemTrayIcon> tray_icon, OS
   QObject::connect(close_window_shortcut, &QShortcut::activated, this, &MainWindow::ToggleHide);
 
   QAction *action_focus_search = new QAction(this);
-  action_focus_search->setShortcuts(QList<QKeySequence>() << QKeySequence("Ctrl+F"));
+  action_focus_search->setShortcuts(QList<QKeySequence>() << QKeySequence(QStringLiteral("Ctrl+F")));
   addAction(action_focus_search);
   QObject::connect(action_focus_search, &QAction::triggered, this, &MainWindow::FocusSearchField);
 
@@ -1015,18 +1025,18 @@ MainWindow::MainWindow(Application *app, SharedPtr<SystemTrayIcon> tray_icon, OS
   }
 
 #ifdef HAVE_QTSPARKLE
-  QUrl sparkle_url(QTSPARKLE_URL);
+  QUrl sparkle_url(QString::fromLatin1(QTSPARKLE_URL));
   if (!sparkle_url.isEmpty()) {
     qLog(Debug) << "Creating Qt Sparkle updater";
     qtsparkle::Updater *updater = new qtsparkle::Updater(sparkle_url, this);
-    updater->SetVersion(STRAWBERRY_VERSION_PACKAGE);
+    updater->SetVersion(QStringLiteral(STRAWBERRY_VERSION_PACKAGE));
     QObject::connect(check_updates, &QAction::triggered, updater, &qtsparkle::Updater::CheckNow);
   }
 #endif
 
 #ifdef Q_OS_LINUX
-  if (!Utilities::GetEnv("SNAP").isEmpty() && !Utilities::GetEnv("SNAP_NAME").isEmpty()) {
-    QSettings s;
+  if (!Utilities::GetEnv(QStringLiteral("SNAP")).isEmpty() && !Utilities::GetEnv(QStringLiteral("SNAP_NAME")).isEmpty()) {
+    Settings s;
     s.beginGroup(kSettingsGroup);
     const bool ignore_snap = s.value("ignore_snap", false).toBool();
     s.endGroup();
@@ -1040,32 +1050,32 @@ MainWindow::MainWindow(Application *app, SharedPtr<SystemTrayIcon> tray_icon, OS
 
 #if defined(Q_OS_MACOS)
   if (Utilities::ProcessTranslated()) {
-    QSettings s;
+    Settings s;
     s.beginGroup(kSettingsGroup);
     const bool ignore_rosetta = s.value("ignore_rosetta", false).toBool();
     s.endGroup();
     if (!ignore_rosetta) {
       MessageDialog *rosetta_message = new MessageDialog(this);
-      rosetta_message->set_settings_group(kSettingsGroup);
-      rosetta_message->set_do_not_show_message_again("ignore_rosetta");
+      rosetta_message->set_settings_group(QLatin1String(kSettingsGroup));
+      rosetta_message->set_do_not_show_message_again(QStringLiteral("ignore_rosetta"));
       rosetta_message->setAttribute(Qt::WA_DeleteOnClose);
-      rosetta_message->ShowMessage(tr("Strawberry running under Rosetta"), tr("You are running Strawberry under Rosetta. Running Strawberry under Rosetta is unsupported and known to have issues. You should download Strawberry for the correct CPU architecture from %1").arg("<a href=\"https://downloads.strawberrymusicplayer.org/\">downloads.strawberrymusicplayer.org</a>"), IconLoader::Load("dialog-warning"));
+      rosetta_message->ShowMessage(tr("Strawberry running under Rosetta"), tr("You are running Strawberry under Rosetta. Running Strawberry under Rosetta is unsupported and known to have issues. You should download Strawberry for the correct CPU architecture from %1").arg(QStringLiteral("<a href=\"https://downloads.strawberrymusicplayer.org/\">downloads.strawberrymusicplayer.org</a>")), IconLoader::Load(QStringLiteral("dialog-warning")));
     }
   }
 #endif
 
   {
-    QSettings s;
+    Settings s;
     s.beginGroup(kSettingsGroup);
-    const QString do_not_show_sponsor_message_key = QString("do_not_show_sponsor_message");
+    constexpr char do_not_show_sponsor_message_key[] = "do_not_show_sponsor_message";
     const bool do_not_show_sponsor_message = s.value(do_not_show_sponsor_message_key, false).toBool();
     s.endGroup();
     if (!do_not_show_sponsor_message) {
       MessageDialog *sponsor_message = new MessageDialog(this);
-      sponsor_message->set_settings_group(kSettingsGroup);
-      sponsor_message->set_do_not_show_message_again(do_not_show_sponsor_message_key);
+      sponsor_message->set_settings_group(QLatin1String(kSettingsGroup));
+      sponsor_message->set_do_not_show_message_again(QLatin1String(do_not_show_sponsor_message_key));
       sponsor_message->setAttribute(Qt::WA_DeleteOnClose);
-      sponsor_message->ShowMessage(tr("Sponsoring Strawberry"), tr("Strawberry is free and open source software. If you like Strawberry, please consider sponsoring the project. For more information about sponsorship see our website %1").arg("<a href= \"https://www.strawberrymusicplayer.org/\">www.strawberrymusicplayer.org</a>"), IconLoader::Load("dialog-information"));
+      sponsor_message->ShowMessage(tr("Sponsoring Strawberry"), tr("Strawberry is free and open source software. If you like Strawberry, please consider sponsoring the project. For more information about sponsorship see our website %1").arg(QStringLiteral("<a href= \"https://www.strawberrymusicplayer.org/\">www.strawberrymusicplayer.org</a>")), IconLoader::Load(QStringLiteral("dialog-information")));
     }
   }
 
@@ -1080,7 +1090,7 @@ MainWindow::~MainWindow() {
 
 void MainWindow::ReloadSettings() {
 
-  QSettings s;
+  Settings s;
 
 #ifdef Q_OS_MACOS
   constexpr bool keeprunning_available = true;
@@ -1102,6 +1112,9 @@ void MainWindow::ReloadSettings() {
   keep_running_ = keeprunning_available && s.value("keeprunning", false).toBool();
   playing_widget_ = s.value("playing_widget", true).toBool();
   bool trayicon_progress = s.value("trayicon_progress", false).toBool();
+#ifdef HAVE_DBUS
+  const bool taskbar_progress = s.value("taskbar_progress", true).toBool();
+#endif
   if (playing_widget_ != ui_->widget_playing->IsEnabled()) TabSwitched();
   doubleclick_addmode_ = static_cast<BehaviourSettingsPage::AddBehaviour>(s.value("doubleclick_addmode", static_cast<int>(BehaviourSettingsPage::AddBehaviour::Append)).toInt());
   doubleclick_playmode_ = static_cast<BehaviourSettingsPage::PlayBehaviour>(s.value("doubleclick_playmode", static_cast<int>(BehaviourSettingsPage::PlayBehaviour::Never)).toInt());
@@ -1115,6 +1128,13 @@ void MainWindow::ReloadSettings() {
 
   tray_icon_->SetTrayiconProgress(trayicon_progress);
 
+#ifdef HAVE_DBUS
+  if (taskbar_progress_ && !taskbar_progress) {
+    UpdateTaskbarProgress(false);
+  }
+  taskbar_progress_ = taskbar_progress;
+#endif
+
   ui_->back_button->setIconSize(QSize(iconsize, iconsize));
   ui_->pause_play_button->setIconSize(QSize(iconsize, iconsize));
   ui_->stop_button->setIconSize(QSize(iconsize, iconsize));
@@ -1224,7 +1244,7 @@ void MainWindow::ReloadAllSettings() {
 
 void MainWindow::RefreshStyleSheet() {
   QString contents(styleSheet());
-  setStyleSheet("");
+  setStyleSheet(QLatin1String(""));
   setStyleSheet(contents);
 }
 
@@ -1233,7 +1253,7 @@ void MainWindow::SaveSettings() {
   SaveGeometry();
   SavePlaybackStatus();
   app_->player()->SaveVolume();
-  ui_->tabs->SaveSettings(kSettingsGroup);
+  ui_->tabs->SaveSettings(QLatin1String(kSettingsGroup));
   ui_->playlist->view()->SaveSettings();
   app_->scrobbler()->WriteCache();
 
@@ -1269,6 +1289,13 @@ void MainWindow::Exit() {
         return;  // Don't quit the application now: wait for the fadeout finished signal
       }
     }
+
+#ifdef HAVE_DBUS
+    if (taskbar_progress_) {
+      UpdateTaskbarProgress(false);
+    }
+#endif
+
     DoExit();
   }
 
@@ -1302,11 +1329,11 @@ void MainWindow::EngineChanged(const EngineBase::Type enginetype) {
 
 void MainWindow::MediaStopped() {
 
-  setWindowTitle("Strawberry Music Player");
+  setWindowTitle(QStringLiteral("Strawberry Music Player"));
 
   ui_->action_stop->setEnabled(false);
   ui_->action_stop_after_this_track->setEnabled(false);
-  ui_->action_play_pause->setIcon(IconLoader::Load("media-playback-start"));
+  ui_->action_play_pause->setIcon(IconLoader::Load(QStringLiteral("media-playback-start")));
   ui_->action_play_pause->setText(tr("Play"));
 
   ui_->action_play_pause->setEnabled(true);
@@ -1321,6 +1348,12 @@ void MainWindow::MediaStopped() {
   tray_icon_->SetProgress(0);
   tray_icon_->SetStopped();
 
+#ifdef HAVE_DBUS
+  if (taskbar_progress_) {
+    UpdateTaskbarProgress(false);
+  }
+#endif
+
   song_playing_ = Song();
   song_ = Song();
   album_cover_ = AlbumCoverImageResult();
@@ -1333,7 +1366,7 @@ void MainWindow::MediaPaused() {
 
   ui_->action_stop->setEnabled(true);
   ui_->action_stop_after_this_track->setEnabled(true);
-  ui_->action_play_pause->setIcon(IconLoader::Load("media-playback-start"));
+  ui_->action_play_pause->setIcon(IconLoader::Load(QStringLiteral("media-playback-start")));
   ui_->action_play_pause->setText(tr("Play"));
 
   ui_->action_play_pause->setEnabled(true);
@@ -1349,7 +1382,7 @@ void MainWindow::MediaPlaying() {
 
   ui_->action_stop->setEnabled(true);
   ui_->action_stop_after_this_track->setEnabled(true);
-  ui_->action_play_pause->setIcon(IconLoader::Load("media-playback-pause"));
+  ui_->action_play_pause->setIcon(IconLoader::Load(QStringLiteral("media-playback-pause")));
   ui_->action_play_pause->setText(tr("Pause"));
 
   bool enable_play_pause(false);
@@ -1397,6 +1430,12 @@ void MainWindow::SongChanged(const Song &song) {
   setWindowTitle(song.PrettyTitleWithArtist());
   tray_icon_->SetProgress(0);
 
+#ifdef HAVE_DBUS
+  if (taskbar_progress_) {
+    UpdateTaskbarProgress(false);
+  }
+#endif
+
   SendNowPlaying();
 
   const bool enable_change_art = song.is_collection_song() && !song.effective_albumartist().isEmpty() && !song.album().isEmpty();
@@ -1469,7 +1508,7 @@ void MainWindow::SaveGeometry() {
 
 void MainWindow::SavePlaybackStatus() {
 
-  QSettings s;
+  Settings s;
 
   s.beginGroup(Player::kSettingsGroup);
   s.setValue("playback_state", static_cast<int>(app_->player()->GetState()));
@@ -1488,7 +1527,7 @@ void MainWindow::SavePlaybackStatus() {
 
 void MainWindow::LoadPlaybackStatus() {
 
-  QSettings s;
+  Settings s;
 
   s.beginGroup(BehaviourSettingsPage::kSettingsGroup);
   const bool resume_playback = s.value("resumeplayback", false).toBool();
@@ -1512,7 +1551,7 @@ void MainWindow::ResumePlayback() {
 
   qLog(Debug) << "Resuming playback";
 
-  QSettings s;
+  Settings s;
   s.beginGroup(Player::kSettingsGroup);
   const EngineBase::State playback_state = static_cast<EngineBase::State>(s.value("playback_state", static_cast<int>(EngineBase::State::Empty)).toInt());
   int playback_playlist = s.value("playback_playlist", -1).toInt();
@@ -1686,6 +1725,12 @@ void MainWindow::Seeked(const qint64 microseconds) {
   const qint64 length = app_->player()->GetCurrentItem()->Metadata().length_nanosec() / kNsecPerSec;
   tray_icon_->SetProgress(static_cast<int>(static_cast<double>(position) / static_cast<double>(length) * 100.0));
 
+#ifdef HAVE_DBUS
+  if (taskbar_progress_) {
+    UpdateTaskbarProgress(true, static_cast<double>(position) / static_cast<double>(length));
+  }
+#endif
+
 }
 
 void MainWindow::UpdateTrackPosition() {
@@ -1700,6 +1745,12 @@ void MainWindow::UpdateTrackPosition() {
   // Update the tray icon every 10 seconds
   if (position % 10 == 0) tray_icon_->SetProgress(static_cast<int>(static_cast<double>(position) / static_cast<double>(length) * 100.0));
 
+#ifdef HAVE_DBUS
+  if (taskbar_progress_) {
+    UpdateTaskbarProgress(true, static_cast<double>(position) / static_cast<double>(length));
+  }
+#endif
+
   // Send Scrobble
   if (app_->scrobbler()->enabled() && item->Metadata().is_metadata_good()) {
     Playlist *playlist = app_->playlist_manager()->active();
@@ -1726,6 +1777,21 @@ void MainWindow::UpdateTrackSliderPosition() {
 
 }
 
+#ifdef HAVE_DBUS
+void MainWindow::UpdateTaskbarProgress(const bool visible, const double progress) {
+
+  QVariantMap map;
+  QDBusMessage msg = QDBusMessage::createSignal(QStringLiteral("/org/strawberrymusicplayer/strawberry"), QStringLiteral("com.canonical.Unity.LauncherEntry"), QStringLiteral("Update"));
+
+  map.insert(QStringLiteral("progress-visible"), visible);
+  map.insert(QStringLiteral("progress"), progress);
+  msg << QStringLiteral("application://org.strawberrymusicplayer.strawberry.desktop") << map;
+
+  QDBusConnection::sessionBus().send(msg);
+
+}
+#endif
+
 void MainWindow::ApplyAddBehaviour(const BehaviourSettingsPage::AddBehaviour b, MimeData *mimedata) {
 
   switch (b) {
@@ -1850,11 +1916,11 @@ void MainWindow::PlaylistRightClick(const QPoint global_pos, const QModelIndex &
   // Is this song currently playing?
   if (app_->playlist_manager()->current()->current_row() == source_index.row() && app_->player()->GetState() == EngineBase::State::Playing) {
     playlist_play_pause_->setText(tr("Pause"));
-    playlist_play_pause_->setIcon(IconLoader::Load("media-playback-pause"));
+    playlist_play_pause_->setIcon(IconLoader::Load(QStringLiteral("media-playback-pause")));
   }
   else {
     playlist_play_pause_->setText(tr("Play"));
-    playlist_play_pause_->setIcon(IconLoader::Load("media-playback-start"));
+    playlist_play_pause_->setIcon(IconLoader::Load(QStringLiteral("media-playback-start")));
   }
 
   // Are we allowed to pause?
@@ -1968,11 +2034,11 @@ void MainWindow::PlaylistRightClick(const QPoint global_pos, const QModelIndex &
     else playlist_skip_->setText(tr("Toggle skip status"));
   }
 
-  if (not_in_queue == 0) playlist_queue_->setIcon(IconLoader::Load("go-previous"));
-  else playlist_queue_->setIcon(IconLoader::Load("go-next"));
+  if (not_in_queue == 0) playlist_queue_->setIcon(IconLoader::Load(QStringLiteral("go-previous")));
+  else playlist_queue_->setIcon(IconLoader::Load(QStringLiteral("go-next")));
 
-  if (in_skipped < selected) playlist_skip_->setIcon(IconLoader::Load("media-skip-forward"));
-  else playlist_skip_->setIcon(IconLoader::Load("media-playback-start"));
+  if (in_skipped < selected) playlist_skip_->setIcon(IconLoader::Load(QStringLiteral("media-skip-forward")));
+  else playlist_skip_->setIcon(IconLoader::Load(QStringLiteral("media-playback-start")));
 
 
   if (!index.isValid()) {
@@ -1989,7 +2055,7 @@ void MainWindow::PlaylistRightClick(const QPoint global_pos, const QModelIndex &
 
     QString column_name = Playlist::column_name(column);
     QString column_value = app_->playlist_manager()->current()->data(source_index).toString();
-    if (column_value.length() > 25) column_value = column_value.left(25) + "...";
+    if (column_value.length() > 25) column_value = column_value.left(25) + QStringLiteral("...");
 
     ui_->action_selection_set_value->setText(tr("Set %1 to \"%2\"...").arg(column_name.toLower(), column_value));
     ui_->action_edit_value->setText(tr("Edit tag \"%1\"...").arg(column_name));
@@ -2035,7 +2101,7 @@ void MainWindow::PlaylistRightClick(const QPoint global_pos, const QModelIndex &
   // Create the playlist submenu if songs are selected.
   if (selected > 0) {
     QMenu *add_to_another_menu = new QMenu(tr("Add to another playlist"), this);
-    add_to_another_menu->setIcon(IconLoader::Load("list-add"));
+    add_to_another_menu->setIcon(IconLoader::Load(QStringLiteral("list-add")));
 
     for (const PlaylistBackend::Playlist &playlist : app_->playlist_backend()->GetAllOpenPlaylists()) {
       // don't add the current playlist
@@ -2232,18 +2298,18 @@ void MainWindow::AddFile() {
   PlaylistParser parser(app_->collection_backend());
 
   // Show dialog
-  QStringList file_names = QFileDialog::getOpenFileNames(this, tr("Add file"), directory, QString("%1 (%2);;%3;;%4").arg(tr("Music"), FileView::kFileFilter, parser.filters(PlaylistParser::Type::Load), tr(kAllFilesFilterSpec)));
+  QStringList filenames = QFileDialog::getOpenFileNames(this, tr("Add file"), directory, QStringLiteral("%1 (%2);;%3;;%4").arg(tr("Music"), QLatin1String(FileView::kFileFilter), parser.filters(PlaylistParser::Type::Load), tr(kAllFilesFilterSpec)));
 
-  if (file_names.isEmpty()) return;
+  if (filenames.isEmpty()) return;
 
   // Save last used directory
-  settings_.setValue("add_media_path", file_names[0]);
+  settings_.setValue("add_media_path", filenames[0]);
 
   // Convert to URLs
   QList<QUrl> urls;
-  urls.reserve(file_names.count());
-  for (const QString &path : file_names) {
-    urls << QUrl::fromLocalFile(QFileInfo(path).canonicalFilePath());
+  urls.reserve(filenames.count());
+  for (const QString &path : filenames) {
+    urls << QUrl::fromLocalFile(QDir::cleanPath(path));
   }
 
   MimeData *mimedata = new MimeData;
@@ -2266,7 +2332,7 @@ void MainWindow::AddFolder() {
 
   // Add media
   MimeData *mimedata = new MimeData;
-  mimedata->setUrls(QList<QUrl>() << QUrl::fromLocalFile(QFileInfo(directory).canonicalFilePath()));
+  mimedata->setUrls(QList<QUrl>() << QUrl::fromLocalFile(QDir::cleanPath(directory)));
   AddToPlaylist(mimedata);
 
 }
@@ -2276,7 +2342,7 @@ void MainWindow::AddCDTracks() {
   MimeData *mimedata = new MimeData;
   // We are putting empty data, but we specify cdda mimetype to indicate that we want to load audio cd tracks
   mimedata->open_in_new_playlist_ = true;
-  mimedata->setData(Playlist::kCddaMimeType, QByteArray());
+  mimedata->setData(QLatin1String(Playlist::kCddaMimeType), QByteArray());
   AddToPlaylist(mimedata);
 
 }
@@ -2310,7 +2376,7 @@ void MainWindow::ShowInCollection() {
   }
   QString search;
   if (!songs.isEmpty()) {
-    search = "artist:" + songs.first().artist() + " album:" + songs.first().album();
+    search = QStringLiteral("artist:") + songs.first().artist() + QStringLiteral(" album:") + songs.first().album();
   }
   collection_view_->filter_widget()->ShowInCollection(search);
 
@@ -2403,9 +2469,9 @@ void MainWindow::CommandlineOptionsReceived(const CommandlineOptions &options) {
       break;
 
     case CommandlineOptions::PlayerAction::ResizeWindow:{
-      if (options.window_size().contains('x') && options.window_size().length() >= 4) {
-        QString str_w = options.window_size().left(options.window_size().indexOf('x'));
-        QString str_h = options.window_size().right(options.window_size().length() - options.window_size().indexOf('x') - 1);
+      if (options.window_size().contains(QLatin1Char('x')) && options.window_size().length() >= 4) {
+        QString str_w = options.window_size().left(options.window_size().indexOf(QLatin1Char('x')));
+        QString str_h = options.window_size().right(options.window_size().length() - options.window_size().indexOf(QLatin1Char('x')) - 1);
         bool w_ok = false;
         bool h_ok = false;
         int w = str_w.toInt(&w_ok);
@@ -2444,7 +2510,7 @@ void MainWindow::CommandlineOptionsReceived(const CommandlineOptions &options) {
 
 #ifdef HAVE_TIDAL
     for (const QUrl &url : options.urls()) {
-      if (url.scheme() == "tidal" && url.host() == "login") {
+      if (url.scheme() == QStringLiteral("tidal") && url.host() == QStringLiteral("login")) {
         emit AuthorizationUrlReceived(url);
         return;
       }
@@ -2522,7 +2588,7 @@ bool MainWindow::LoadUrl(const QString &url) {
     return true;
   }
 #ifdef HAVE_TIDAL
-  else if (url.startsWith("tidal://login")) {
+  else if (url.startsWith(QLatin1String("tidal://login"))) {
     emit AuthorizationUrlReceived(QUrl(url));
     return true;
   }
@@ -2886,11 +2952,11 @@ void MainWindow::CheckFullRescanRevisions() {
 
   // if we have any...
   if (!reasons.isEmpty()) {
-    QString message = tr("The version of Strawberry you've just updated to requires a full collection rescan because of the new features listed below:") + "<ul>";
+    QString message = tr("The version of Strawberry you've just updated to requires a full collection rescan because of the new features listed below:") + QStringLiteral("<ul>");
     for (const QString &reason : reasons) {
-      message += ("<li>" + reason + "</li>");
+      message += QStringLiteral("<li>") + reason + QStringLiteral("</li>");
     }
-    message += "</ul>" + tr("Would you like to run a full rescan right now?");
+    message += QStringLiteral("</ul>") + tr("Would you like to run a full rescan right now?");
     if (QMessageBox::question(this, tr("Collection rescan notice"), message, QMessageBox::Yes, QMessageBox::No) == QMessageBox::Yes) {
       app_->collection()->FullScan();
     }
@@ -3001,10 +3067,10 @@ void MainWindow::HandleNotificationPreview(const OSDBase::Behaviour type, const
     qLog(Debug) << "The current playlist is empty, showing a fake song";
     // Create a fake song
     Song fake(Song::Source::LocalFile);
-    fake.Init("Title", "Artist", "Album", 123);
-    fake.set_genre("Classical");
-    fake.set_composer("Anonymous");
-    fake.set_performer("Anonymous");
+    fake.Init(QStringLiteral("Title"), QStringLiteral("Artist"), QStringLiteral("Album"), 123);
+    fake.set_genre(QStringLiteral("Classical"));
+    fake.set_composer(QStringLiteral("Anonymous"));
+    fake.set_performer(QStringLiteral("Anonymous"));
     fake.set_track(1);
     fake.set_disc(1);
     fake.set_year(2011);
@@ -3147,12 +3213,12 @@ void MainWindow::SetToggleScrobblingIcon(const bool value) {
 
   if (value) {
     if (app_->playlist_manager()->active() && app_->playlist_manager()->active()->scrobbled())
-      ui_->action_toggle_scrobbling->setIcon(IconLoader::Load("scrobble", true, 22));
+      ui_->action_toggle_scrobbling->setIcon(IconLoader::Load(QStringLiteral("scrobble"), true, 22));
     else
-      ui_->action_toggle_scrobbling->setIcon(IconLoader::Load("scrobble", true, 22));  // TODO: Create a faint version of the icon
+      ui_->action_toggle_scrobbling->setIcon(IconLoader::Load(QStringLiteral("scrobble"), true, 22));  // TODO: Create a faint version of the icon
   }
   else {
-    ui_->action_toggle_scrobbling->setIcon(IconLoader::Load("scrobble-disabled", true, 22));
+    ui_->action_toggle_scrobbling->setIcon(IconLoader::Load(QStringLiteral("scrobble-disabled"), true, 22));
   }
 
 }
@@ -3197,13 +3263,23 @@ void MainWindow::PlaylistDelete() {
     app_->player()->Next();
   }
 
-  SharedPtr<MusicStorage> storage = make_shared<FilesystemMusicStorage>(Song::Source::LocalFile, "/");
+  SharedPtr<MusicStorage> storage = make_shared<FilesystemMusicStorage>(Song::Source::LocalFile, QStringLiteral("/"));
   DeleteFiles *delete_files = new DeleteFiles(app_->task_manager(), storage, true);
-  //QObject::connect(delete_files, &DeleteFiles::Finished, this, &MainWindow::DeleteFinished);
+  QObject::connect(delete_files, &DeleteFiles::Finished, this, &MainWindow::DeleteFilesFinished);
   delete_files->Start(selected_songs);
 
 }
 
+void MainWindow::DeleteFilesFinished(const SongList &songs_with_errors) {
+
+  if (songs_with_errors.isEmpty()) return;
+
+  OrganizeErrorDialog *dialog = new OrganizeErrorDialog(this);
+  dialog->Show(OrganizeErrorDialog::OperationType::Delete, songs_with_errors);
+  // It deletes itself when the user closes it
+
+}
+
 void MainWindow::FocusSearchField() {
 
   if (ui_->tabs->currentIndex() == ui_->tabs->IndexOfTab(collection_view_) && !collection_view_->filter_widget()->SearchFieldHasFocus()) {

src/core/mainwindow.h

@@ -52,6 +52,7 @@
 #include "platforminterface.h"
 #include "song.h"
 #include "tagreaderclient.h"
+#include "settings.h"
 #include "engine/enginebase.h"
 #include "osd/osdbase.h"
 #include "playlist/playlist.h"
@@ -270,6 +271,8 @@ class MainWindow : public QMainWindow, public PlatformInterface {
 
   void FocusSearchField();
 
+  void DeleteFilesFinished(const SongList &songs_with_errors);
+
  public slots:
   void CommandlineOptionsReceived(const QByteArray &string_options);
   void Raise();
@@ -290,6 +293,10 @@ class MainWindow : public QMainWindow, public PlatformInterface {
 
   void SetToggleScrobblingIcon(const bool value);
 
+#ifdef HAVE_DBUS
+  void UpdateTaskbarProgress(const bool visible, const double progress = 0);
+#endif
+
  private:
   Ui_MainWindow *ui_;
 #ifdef Q_OS_WIN
@@ -373,10 +380,13 @@ class MainWindow : public QMainWindow, public PlatformInterface {
 
   QTimer *track_position_timer_;
   QTimer *track_slider_timer_;
-  QSettings settings_;
+  Settings settings_;
 
   bool keep_running_;
   bool playing_widget_;
+#ifdef HAVE_DBUS
+  bool taskbar_progress_;
+#endif
   BehaviourSettingsPage::AddBehaviour doubleclick_addmode_;
   BehaviourSettingsPage::PlayBehaviour doubleclick_playmode_;
   BehaviourSettingsPage::PlaylistAddBehaviour doubleclick_playlist_addmode_;

src/core/mainwindow.ui

@@ -122,6 +122,9 @@
                 </property>
                 <item>
                  <widget class="QToolButton" name="back_button">
+                  <property name="accessibleName">
+                   <string>MenuPopupToolButton</string>
+                  </property>
                   <property name="iconSize">
                    <size>
                     <width>32</width>
@@ -135,6 +138,9 @@
                 </item>
                 <item>
                  <widget class="QToolButton" name="pause_play_button">
+                  <property name="accessibleName">
+                   <string>MenuPopupToolButton</string>
+                  </property>
                   <property name="iconSize">
                    <size>
                     <width>32</width>
@@ -151,6 +157,9 @@
                   <property name="enabled">
                    <bool>false</bool>
                   </property>
+                  <property name="accessibleName">
+                   <string>MenuPopupToolButton</string>
+                  </property>
                   <property name="iconSize">
                    <size>
                     <width>32</width>
@@ -167,6 +176,9 @@
                 </item>
                 <item>
                  <widget class="QToolButton" name="forward_button">
+                  <property name="accessibleName">
+                   <string>MenuPopupToolButton</string>
+                  </property>
                   <property name="iconSize">
                    <size>
                     <width>32</width>
@@ -205,6 +217,9 @@
                    </item>
                    <item>
                     <widget class="QToolButton" name="button_love">
+                     <property name="accessibleName">
+                      <string>MenuPopupToolButton</string>
+                     </property>
                      <property name="iconSize">
                       <size>
                        <width>32</width>

src/core/mergedproxymodel.cpp

@@ -22,7 +22,6 @@
 #include "config.h"
 
 #include <functional>
-#include <limits>
 
 #include <QObject>
 #include <QMimeData>
@@ -120,13 +119,15 @@ void MergedProxyModel::RemoveSubModel(const QModelIndex &source_parent) {
 
   // Remove all the children of the item that got deleted
   QModelIndex proxy_parent = mapFromSource(source_parent);
-
-  // We can't know how many children it had, since we can't dereference it
-  // FIXME: This is a bad idea.
-  resetting_model_ = submodel;
-  beginRemoveRows(proxy_parent, 0, std::numeric_limits<int>::max() - 1);
-  endRemoveRows();
-  resetting_model_ = nullptr;
+  if (proxy_parent.isValid()) {
+    const int row_count = rowCount(proxy_parent);
+    if (row_count > 0) {
+      resetting_model_ = submodel;
+      beginRemoveRows(proxy_parent, 0, row_count - 1);
+      endRemoveRows();
+      resetting_model_ = nullptr;
+    }
+  }
 
   // Delete all the mappings that reference the submodel
   auto it = p_->mappings_.get<tag_by_pointer>().begin();
@@ -192,10 +193,15 @@ void MergedProxyModel::SubModelAboutToBeReset() {
   QModelIndex source_parent = merge_points_.value(submodel);
   QModelIndex proxy_parent = mapFromSource(source_parent);
 
-  resetting_model_ = submodel;
-  beginRemoveRows(proxy_parent, 0, submodel->rowCount());
-  endRemoveRows();
-  resetting_model_ = nullptr;
+  if (proxy_parent.isValid()) {
+    const int row_count = submodel->rowCount();
+    if (row_count > 0) {
+      resetting_model_ = submodel;
+      beginRemoveRows(proxy_parent, 0, row_count - 1);
+      endRemoveRows();
+      resetting_model_ = nullptr;
+    }
+  }
 
   // Delete all the mappings that reference the submodel
   auto it = p_->mappings_.get<tag_by_pointer>().begin();
@@ -418,7 +424,7 @@ QStringList MergedProxyModel::mimeTypes() const {
   QStringList ret;
   ret << sourceModel()->mimeTypes();
 
-  QList<QAbstractItemModel*> models = merge_points_.keys();
+  const QList<QAbstractItemModel*> models = merge_points_.keys();
   for (const QAbstractItemModel *model : models) {
     ret << model->mimeTypes();
   }
@@ -500,7 +506,7 @@ QAbstractItemModel *MergedProxyModel::GetModel(const QModelIndex &source_index)
   // This is essentially const_cast<QAbstractItemModel*>(source_index.model()), but without the const_cast
   const QAbstractItemModel *const_model = source_index.model();
   if (const_model == sourceModel()) return sourceModel();
-  QList<QAbstractItemModel*> submodels = merge_points_.keys();
+  const QList<QAbstractItemModel*> submodels = merge_points_.keys();
   for (QAbstractItemModel *submodel : submodels) {
     if (submodel == const_model) return submodel;
   }
@@ -516,7 +522,7 @@ void MergedProxyModel::DataChanged(const QModelIndex &top_left, const QModelInde
 void MergedProxyModel::LayoutAboutToBeChanged() {
 
   old_merge_points_.clear();
-  QList<QAbstractItemModel*> models = merge_points_.keys();
+  const QList<QAbstractItemModel*> models = merge_points_.keys();
   for (QAbstractItemModel *model : models) {
     old_merge_points_[model] = merge_points_.value(model);
   }
@@ -525,7 +531,7 @@ void MergedProxyModel::LayoutAboutToBeChanged() {
 
 void MergedProxyModel::LayoutChanged() {
 
-  QList<QAbstractItemModel*> models = merge_points_.keys();
+  const QList<QAbstractItemModel*> models = merge_points_.keys();
   for (QAbstractItemModel *model : models) {
     if (!old_merge_points_.contains(model)) continue;
 

src/core/metatypes.cpp

@@ -88,6 +88,7 @@ void RegisterMetaTypes() {
   qRegisterMetaType<QVector<int>>("QVector<int>");
   qRegisterMetaType<QList<QUrl>>("QList<QUrl>");
   qRegisterMetaType<QFileInfo>("QFileInfo");
+  qRegisterMetaType<QAbstractSocket::SocketState>("QAbstractSocket::SocketState");
   qRegisterMetaType<QNetworkReply*>("QNetworkReply*");
   qRegisterMetaType<QNetworkReply**>("QNetworkReply**");
   qRegisterMetaType<QItemSelection>("QItemSelection");
@@ -110,6 +111,7 @@ void RegisterMetaTypes() {
 #ifdef HAVE_GSTREAMER
   qRegisterMetaType<GstBuffer*>("GstBuffer*");
   qRegisterMetaType<GstElement*>("GstElement*");
+  qRegisterMetaType<GstState>("GstState");
   qRegisterMetaType<GstEnginePipeline*>("GstEnginePipeline*");
 #endif
   qRegisterMetaType<CollectionDirectory>("CollectionDirectory");

src/core/mpris2.cpp

@@ -94,9 +94,9 @@ const QDBusArgument &operator>>(const QDBusArgument &arg, MaybePlaylist &playlis
 
 namespace mpris {
 
-const char *Mpris2::kMprisObjectPath = "/org/mpris/MediaPlayer2";
-const char *Mpris2::kServiceName = "org.mpris.MediaPlayer2.strawberry";
-const char *Mpris2::kFreedesktopPath = "org.freedesktop.DBus.Properties";
+constexpr char kMprisObjectPath[] = "/org/mpris/MediaPlayer2";
+constexpr char kServiceName[] = "org.mpris.MediaPlayer2.strawberry";
+constexpr char kFreedesktopPath[] = "org.freedesktop.DBus.Properties";
 
 Mpris2::Mpris2(Application *app, QObject *parent)
     : QObject(parent),
@@ -108,13 +108,13 @@ Mpris2::Mpris2(Application *app, QObject *parent)
   new Mpris2Player(this);
   new Mpris2Playlists(this);
 
-  if (!QDBusConnection::sessionBus().registerService(kServiceName)) {
-    qLog(Warning) << "Failed to register" << QString(kServiceName) << "on the session bus";
+  if (!QDBusConnection::sessionBus().registerService(QLatin1String(kServiceName))) {
+    qLog(Warning) << "Failed to register" << kServiceName << "on the session bus";
     return;
   }
 
-  if (!QDBusConnection::sessionBus().registerObject(kMprisObjectPath, this)) {
-    qLog(Warning) << "Failed to register" << QString(kMprisObjectPath) << "on the session bus";
+  if (!QDBusConnection::sessionBus().registerObject(QLatin1String(kMprisObjectPath), this)) {
+    qLog(Warning) << "Failed to register" << kMprisObjectPath << "on the session bus";
     return;
   }
 
@@ -131,18 +131,18 @@ Mpris2::Mpris2(Application *app, QObject *parent)
 
   app_name_[0] = app_name_[0].toUpper();
 
-  QStringList data_dirs = QString(qgetenv("XDG_DATA_DIRS")).split(":");
+  QStringList data_dirs = QString::fromUtf8(qgetenv("XDG_DATA_DIRS")).split(QLatin1Char(':'));
 
-  if (!data_dirs.contains("/usr/local/share")) {
-    data_dirs.append("/usr/local/share");
+  if (!data_dirs.contains(QStringLiteral("/usr/local/share"))) {
+    data_dirs.append(QStringLiteral("/usr/local/share"));
   }
 
-  if (!data_dirs.contains("/usr/share")) {
-    data_dirs.append("/usr/share");
+  if (!data_dirs.contains(QStringLiteral("/usr/share"))) {
+    data_dirs.append(QStringLiteral("/usr/share"));
   }
 
   for (const QString &data_dir : data_dirs) {
-    const QString desktopfilepath = QString("%1/applications/%2.desktop").arg(data_dir, QGuiApplication::desktopFileName());
+    const QString desktopfilepath = QStringLiteral("%1/applications/%2.desktop").arg(data_dir, QGuiApplication::desktopFileName());
     if (QFile::exists(desktopfilepath)) {
       desktopfilepath_ = desktopfilepath;
       break;
@@ -150,7 +150,7 @@ Mpris2::Mpris2(Application *app, QObject *parent)
   }
 
   if (desktopfilepath_.isEmpty()) {
-    desktopfilepath_ = QGuiApplication::desktopFileName() + ".desktop";
+    desktopfilepath_ = QGuiApplication::desktopFileName() + QStringLiteral(".desktop");
   }
 
 }
@@ -165,37 +165,37 @@ void Mpris2::EngineStateChanged(EngineBase::State newState) {
 
   if (newState != EngineBase::State::Playing && newState != EngineBase::State::Paused) {
     last_metadata_ = QVariantMap();
-    EmitNotification("Metadata");
+    EmitNotification(QStringLiteral("Metadata"));
   }
 
-  EmitNotification("CanPlay");
-  EmitNotification("CanPause");
-  EmitNotification("PlaybackStatus", PlaybackStatus(newState));
-  if (newState == EngineBase::State::Playing) EmitNotification("CanSeek", CanSeek(newState));
+  EmitNotification(QStringLiteral("CanPlay"));
+  EmitNotification(QStringLiteral("CanPause"));
+  EmitNotification(QStringLiteral("PlaybackStatus"), PlaybackStatus(newState));
+  if (newState == EngineBase::State::Playing) EmitNotification(QStringLiteral("CanSeek"), CanSeek(newState));
 
 }
 
 void Mpris2::VolumeChanged() {
-  EmitNotification("Volume");
+  EmitNotification(QStringLiteral("Volume"));
 }
 
-void Mpris2::ShuffleModeChanged() { EmitNotification("Shuffle"); }
+void Mpris2::ShuffleModeChanged() { EmitNotification(QStringLiteral("Shuffle")); }
 
 void Mpris2::RepeatModeChanged() {
 
-  EmitNotification("LoopStatus");
-  EmitNotification("CanGoNext", CanGoNext());
-  EmitNotification("CanGoPrevious", CanGoPrevious());
+  EmitNotification(QStringLiteral("LoopStatus"));
+  EmitNotification(QStringLiteral("CanGoNext"), CanGoNext());
+  EmitNotification(QStringLiteral("CanGoPrevious"), CanGoPrevious());
 
 }
 
 void Mpris2::EmitNotification(const QString &name, const QVariant &value) {
-  EmitNotification(name, value, "org.mpris.MediaPlayer2.Player");
+  EmitNotification(name, value, QStringLiteral("org.mpris.MediaPlayer2.Player"));
 }
 
 void Mpris2::EmitNotification(const QString &name, const QVariant &value, const QString &mprisEntity) {
 
-  QDBusMessage msg = QDBusMessage::createSignal(kMprisObjectPath, kFreedesktopPath, "PropertiesChanged");
+  QDBusMessage msg = QDBusMessage::createSignal(QLatin1String(kMprisObjectPath), QLatin1String(kFreedesktopPath), QStringLiteral("PropertiesChanged"));
   QVariantMap map;
   map.insert(name, value);
   QVariantList args = QVariantList() << mprisEntity << map << QStringList();
@@ -207,18 +207,18 @@ void Mpris2::EmitNotification(const QString &name, const QVariant &value, const
 void Mpris2::EmitNotification(const QString &name) {
 
   QVariant value;
-  if (name == "PlaybackStatus") value = PlaybackStatus();
-  else if (name == "LoopStatus") value = LoopStatus();
-  else if (name == "Shuffle") value = Shuffle();
-  else if (name == "Metadata") value = Metadata();
-  else if (name == "Rating") value = Rating();
-  else if (name == "Volume") value = Volume();
-  else if (name == "Position") value = Position();
-  else if (name == "CanPlay") value = CanPlay();
-  else if (name == "CanPause") value = CanPause();
-  else if (name == "CanSeek") value = CanSeek();
-  else if (name == "CanGoNext") value = CanGoNext();
-  else if (name == "CanGoPrevious") value = CanGoPrevious();
+  if (name == QStringLiteral("PlaybackStatus")) value = PlaybackStatus();
+  else if (name == QStringLiteral("LoopStatus")) value = LoopStatus();
+  else if (name == QStringLiteral("Shuffle")) value = Shuffle();
+  else if (name == QStringLiteral("Metadata")) value = Metadata();
+  else if (name == QStringLiteral("Rating")) value = Rating();
+  else if (name == QStringLiteral("Volume")) value = Volume();
+  else if (name == QStringLiteral("Position")) value = Position();
+  else if (name == QStringLiteral("CanPlay")) value = CanPlay();
+  else if (name == QStringLiteral("CanPause")) value = CanPause();
+  else if (name == QStringLiteral("CanSeek")) value = CanSeek();
+  else if (name == QStringLiteral("CanGoNext")) value = CanGoNext();
+  else if (name == QStringLiteral("CanGoPrevious")) value = CanGoPrevious();
 
   if (value.isValid()) EmitNotification(name, value);
 
@@ -240,49 +240,49 @@ QString Mpris2::DesktopEntryAbsolutePath() const {
 
 }
 
-QString Mpris2::DesktopEntry() const { return QGuiApplication::desktopFileName() + ".desktop"; }
+QString Mpris2::DesktopEntry() const { return QGuiApplication::desktopFileName() + QStringLiteral(".desktop"); }
 
 QStringList Mpris2::SupportedUriSchemes() const {
 
-  static QStringList res = QStringList() << "file"
-                                         << "http"
-                                         << "cdda"
-                                         << "smb"
-                                         << "sftp";
+  static QStringList res = QStringList() << QStringLiteral("file")
+                                         << QStringLiteral("http")
+                                         << QStringLiteral("cdda")
+                                         << QStringLiteral("smb")
+                                         << QStringLiteral("sftp");
   return res;
 
 }
 
 QStringList Mpris2::SupportedMimeTypes() const {
 
-  static QStringList res = QStringList() << "x-content/audio-player"
-                                         << "application/ogg"
-                                         << "application/x-ogg"
-                                         << "application/x-ogm-audio"
-                                         << "audio/flac"
-                                         << "audio/ogg"
-                                         << "audio/vorbis"
-                                         << "audio/aac"
-                                         << "audio/mp4"
-                                         << "audio/mpeg"
-                                         << "audio/mpegurl"
-                                         << "audio/vnd.rn-realaudio"
-                                         << "audio/x-flac"
-                                         << "audio/x-oggflac"
-                                         << "audio/x-vorbis"
-                                         << "audio/x-vorbis+ogg"
-                                         << "audio/x-speex"
-                                         << "audio/x-wav"
-                                         << "audio/x-wavpack"
-                                         << "audio/x-ape"
-                                         << "audio/x-mp3"
-                                         << "audio/x-mpeg"
-                                         << "audio/x-mpegurl"
-                                         << "audio/x-ms-wma"
-                                         << "audio/x-musepack"
-                                         << "audio/x-pn-realaudio"
-                                         << "audio/x-scpls"
-                                         << "video/x-ms-asf";
+  static QStringList res = QStringList() << QStringLiteral("x-content/audio-player")
+                                         << QStringLiteral("application/ogg")
+                                         << QStringLiteral("application/x-ogg")
+                                         << QStringLiteral("application/x-ogm-audio")
+                                         << QStringLiteral("audio/flac")
+                                         << QStringLiteral("audio/ogg")
+                                         << QStringLiteral("audio/vorbis")
+                                         << QStringLiteral("audio/aac")
+                                         << QStringLiteral("audio/mp4")
+                                         << QStringLiteral("audio/mpeg")
+                                         << QStringLiteral("audio/mpegurl")
+                                         << QStringLiteral("audio/vnd.rn-realaudio")
+                                         << QStringLiteral("audio/x-flac")
+                                         << QStringLiteral("audio/x-oggflac")
+                                         << QStringLiteral("audio/x-vorbis")
+                                         << QStringLiteral("audio/x-vorbis+ogg")
+                                         << QStringLiteral("audio/x-speex")
+                                         << QStringLiteral("audio/x-wav")
+                                         << QStringLiteral("audio/x-wavpack")
+                                         << QStringLiteral("audio/x-ape")
+                                         << QStringLiteral("audio/x-mp3")
+                                         << QStringLiteral("audio/x-mpeg")
+                                         << QStringLiteral("audio/x-mpegurl")
+                                         << QStringLiteral("audio/x-ms-wma")
+                                         << QStringLiteral("audio/x-musepack")
+                                         << QStringLiteral("audio/x-pn-realaudio")
+                                         << QStringLiteral("audio/x-scpls")
+                                         << QStringLiteral("video/x-ms-asf");
 
   return res;
 
@@ -299,9 +299,9 @@ QString Mpris2::PlaybackStatus() const {
 QString Mpris2::PlaybackStatus(EngineBase::State state) const {
 
   switch (state) {
-    case EngineBase::State::Playing: return "Playing";
-    case EngineBase::State::Paused: return "Paused";
-    default: return "Stopped";
+    case EngineBase::State::Playing: return QStringLiteral("Playing");
+    case EngineBase::State::Paused: return QStringLiteral("Paused");
+    default: return QStringLiteral("Stopped");
   }
 
 }
@@ -309,14 +309,14 @@ QString Mpris2::PlaybackStatus(EngineBase::State state) const {
 QString Mpris2::LoopStatus() const {
 
   if (!app_->playlist_manager()->sequence()) {
-    return "None";
+    return QStringLiteral("None");
   }
 
-  switch (app_->playlist_manager()->sequence()->repeat_mode()) {
+  switch (app_->playlist_manager()->active() ? app_->playlist_manager()->active()->RepeatMode() : app_->playlist_manager()->sequence()->repeat_mode()) {
     case PlaylistSequence::RepeatMode::Album:
-    case PlaylistSequence::RepeatMode::Playlist: return "Playlist";
-    case PlaylistSequence::RepeatMode::Track: return "Track";
-    default: return "None";
+    case PlaylistSequence::RepeatMode::Playlist: return QStringLiteral("Playlist");
+    case PlaylistSequence::RepeatMode::Track: return QStringLiteral("Track");
+    default: return QStringLiteral("None");
   }
 
 }
@@ -325,13 +325,13 @@ void Mpris2::SetLoopStatus(const QString &value) {
 
   PlaylistSequence::RepeatMode mode = PlaylistSequence::RepeatMode::Off;
 
-  if (value == "None") {
+  if (value == QStringLiteral("None")) {
     mode = PlaylistSequence::RepeatMode::Off;
   }
-  else if (value == "Track") {
+  else if (value == QStringLiteral("Track")) {
     mode = PlaylistSequence::RepeatMode::Track;
   }
-  else if (value == "Playlist") {
+  else if (value == QStringLiteral("Playlist")) {
     mode = PlaylistSequence::RepeatMode::Playlist;
   }
 
@@ -351,7 +351,8 @@ void Mpris2::SetRate(double rate) {
 
 bool Mpris2::Shuffle() const {
 
-  return app_->playlist_manager()->sequence()->shuffle_mode() != PlaylistSequence::ShuffleMode::Off;
+  const PlaylistSequence::ShuffleMode shuffle_mode = app_->playlist_manager()->active() ? app_->playlist_manager()->active()->ShuffleMode() : app_->playlist_manager()->sequence()->shuffle_mode();
+  return shuffle_mode != PlaylistSequence::ShuffleMode::Off;
 
 }
 
@@ -367,6 +368,7 @@ double Mpris2::Rating() const {
 }
 
 void Mpris2::SetRating(double rating) {
+
   if (rating > 1.0) {
     rating = 1.0;
   }
@@ -374,22 +376,23 @@ void Mpris2::SetRating(double rating) {
     rating = -1.0;
   }
 
-  app_->playlist_manager()->RateCurrentSong(rating);
+  app_->playlist_manager()->RateCurrentSong(static_cast<float>(rating));
+
 }
 
-QString Mpris2::current_track_id() const {
-  return QString("/org/strawberrymusicplayer/strawberry/Track/%1").arg(QString::number(app_->playlist_manager()->active()->current_row()));
+QDBusObjectPath Mpris2::current_track_id() const {
+  return QDBusObjectPath(QStringLiteral("/org/strawberrymusicplayer/strawberry/Track/%1").arg(QString::number(app_->playlist_manager()->active()->current_row())));
 }
 
 // We send Metadata change notification as soon as the process of changing song starts...
 void Mpris2::CurrentSongChanged(const Song &song) {
 
   AlbumCoverLoaded(song);
-  EmitNotification("CanPlay");
-  EmitNotification("CanPause");
-  EmitNotification("CanGoNext", CanGoNext());
-  EmitNotification("CanGoPrevious", CanGoPrevious());
-  EmitNotification("CanSeek", CanSeek());
+  EmitNotification(QStringLiteral("CanPlay"));
+  EmitNotification(QStringLiteral("CanPause"));
+  EmitNotification(QStringLiteral("CanGoNext"), CanGoNext());
+  EmitNotification(QStringLiteral("CanGoPrevious"), CanGoPrevious());
+  EmitNotification(QStringLiteral("CanSeek"), CanSeek());
 
 }
 
@@ -400,7 +403,7 @@ void Mpris2::AlbumCoverLoaded(const Song &song, const AlbumCoverLoaderResult &re
   song.ToXesam(&last_metadata_);
 
   using mpris::AddMetadata;
-  AddMetadata("mpris:trackid", current_track_id(), &last_metadata_);
+  AddMetadata(QStringLiteral("mpris:trackid"), current_track_id(), &last_metadata_);
 
   QUrl cover_url;
   if (result.album_cover.cover_url.isValid() && result.album_cover.cover_url.isLocalFile() && QFile(result.album_cover.cover_url.toLocalFile()).exists()) {
@@ -417,13 +420,13 @@ void Mpris2::AlbumCoverLoaded(const Song &song, const AlbumCoverLoaderResult &re
   }
 
   if (cover_url.isValid()) {
-    AddMetadata("mpris:artUrl", cover_url.toString(), &last_metadata_);
+    AddMetadata(QStringLiteral("mpris:artUrl"), cover_url.toString(), &last_metadata_);
   }
 
-  AddMetadata("year", song.year(), &last_metadata_);
-  AddMetadata("bitrate", song.bitrate(), &last_metadata_);
+  AddMetadata(QStringLiteral("year"), song.year(), &last_metadata_);
+  AddMetadata(QStringLiteral("bitrate"), song.bitrate(), &last_metadata_);
 
-  EmitNotification("Metadata", last_metadata_);
+  EmitNotification(QStringLiteral("Metadata"), last_metadata_);
 
 }
 
@@ -457,7 +460,7 @@ bool Mpris2::CanPlay() const {
 
 // This one's a bit different than MPRIS 1 - we want this to be true even when the song is already paused or stopped.
 bool Mpris2::CanPause() const {
-  return (app_->player()->GetCurrentItem() && app_->player()->GetState() == EngineBase::State::Playing && !(app_->player()->GetCurrentItem()->options() & PlaylistItem::Option::PauseDisabled)) || PlaybackStatus() == "Paused" || PlaybackStatus() == "Stopped";
+  return (app_->player()->GetCurrentItem() && app_->player()->GetState() == EngineBase::State::Playing && !(app_->player()->GetCurrentItem()->options() & PlaylistItem::Option::PauseDisabled)) || PlaybackStatus() == QStringLiteral("Paused") || PlaybackStatus() == QStringLiteral("Stopped");
 }
 
 bool Mpris2::CanSeek() const { return CanSeek(app_->player()->GetState()); }
@@ -510,7 +513,7 @@ void Mpris2::Seek(qint64 offset) {
 
 void Mpris2::SetPosition(const QDBusObjectPath &trackId, qint64 offset) {
 
-  if (CanSeek() && trackId.path() == current_track_id() && offset >= 0) {
+  if (CanSeek() && trackId == current_track_id() && offset >= 0) {
     offset *= kNsecPerUsec;
 
     if (offset < app_->player()->GetCurrentItem()->Metadata().length_nanosec()) {
@@ -564,12 +567,12 @@ quint32 Mpris2::PlaylistCount() const {
   return app_->playlist_manager()->GetAllPlaylists().size();
 }
 
-QStringList Mpris2::Orderings() const { return QStringList() << "User"; }
+QStringList Mpris2::Orderings() const { return QStringList() << QStringLiteral("User"); }
 
 namespace {
 
 QDBusObjectPath MakePlaylistPath(int id) {
-  return QDBusObjectPath(QString("/org/strawberrymusicplayer/strawberry/PlaylistId/%1").arg(id));
+  return QDBusObjectPath(QStringLiteral("/org/strawberrymusicplayer/strawberry/PlaylistId/%1").arg(id));
 }
 
 }  // namespace
@@ -591,7 +594,7 @@ MaybePlaylist Mpris2::ActivePlaylist() const {
 
 void Mpris2::ActivatePlaylist(const QDBusObjectPath &playlist_id) {
 
-  QStringList split_path = playlist_id.path().split('/');
+  QStringList split_path = playlist_id.path().split(QLatin1Char('/'));
   qLog(Debug) << Q_FUNC_INFO << playlist_id.path() << split_path;
   if (split_path.isEmpty()) {
     return;
@@ -645,7 +648,7 @@ void Mpris2::PlaylistChangedSlot(Playlist *playlist) {
 
 void Mpris2::PlaylistCollectionChanged(Playlist *playlist) {
   Q_UNUSED(playlist);
-  EmitNotification("PlaylistCount", "", "org.mpris.MediaPlayer2.Playlists");
+  EmitNotification(QStringLiteral("PlaylistCount"), QLatin1String(""), QStringLiteral("org.mpris.MediaPlayer2.Playlists"));
 }
 
 }  // namespace mpris

src/core/mpris2.h

@@ -225,17 +225,13 @@ class Mpris2 : public QObject {
 
   QString PlaybackStatus(EngineBase::State state) const;
 
-  QString current_track_id() const;
+  QDBusObjectPath current_track_id() const;
 
   bool CanSeek(EngineBase::State state) const;
 
   QString DesktopEntryAbsolutePath() const;
 
  private:
-  static const char *kMprisObjectPath;
-  static const char *kServiceName;
-  static const char *kFreedesktopPath;
-
   Application *app_;
 
   QString app_name_;

src/core/mpris_common.h

@@ -28,6 +28,7 @@
 #include <QDateTime>
 #include <QString>
 #include <QStringList>
+#include <QDBusObjectPath>
 
 namespace mpris {
 
@@ -55,8 +56,12 @@ inline void AddMetadata(const QString &key, const QDateTime &metadata, QVariantM
   if (metadata.isValid()) (*map)[key] = metadata;
 }
 
+inline void AddMetadata(const QString &key, const QDBusObjectPath &metadata, QVariantMap *map) {
+  if (metadata.path().length() > 0) (*map)[key] = QVariant::fromValue<QDBusObjectPath>(metadata);
+}
+
 inline QString AsMPRISDateTimeType(const qint64 time) {
-  return time != -1 ? QDateTime::fromSecsSinceEpoch(time).toString(Qt::ISODate) : "";
+  return time != -1 ? QDateTime::fromSecsSinceEpoch(time).toString(Qt::ISODate) : QLatin1String("");
 }
 
 }  // namespace mpris

src/core/musicstorage.h

@@ -89,12 +89,12 @@ class MusicStorage {
   virtual bool GetSupportedFiletypes(QList<Song::FileType> *ret) { Q_UNUSED(ret); return true; }
 
   virtual bool StartCopy(QList<Song::FileType> *supported_types) { Q_UNUSED(supported_types); return true; }
-  virtual bool CopyToStorage(const CopyJob &job) = 0;
-  virtual void FinishCopy(bool success) { Q_UNUSED(success); }
+  virtual bool CopyToStorage(const CopyJob &job, QString &error_text) = 0;
+  virtual bool FinishCopy(bool success, QString &error_text) { Q_UNUSED(error_text); return success; }
 
   virtual void StartDelete() {}
   virtual bool DeleteFromStorage(const DeleteJob &job) = 0;
-  virtual void FinishDelete(bool success) { Q_UNUSED(success); }
+  virtual bool FinishDelete(bool success, QString &error_text) { Q_UNUSED(error_text); return success; }
 
   virtual void Eject() {}
 

src/core/networkaccessmanager.cpp

@@ -46,18 +46,18 @@ QNetworkReply *NetworkAccessManager::createRequest(Operation op, const QNetworkR
 
   QByteArray user_agent;
   if (request.hasRawHeader("User-Agent")) {
-    user_agent = request.rawHeader("User-Agent");
+    user_agent = request.header(QNetworkRequest::UserAgentHeader).toByteArray();
   }
   else {
-    user_agent = QString("%1 %2").arg(QCoreApplication::applicationName(), QCoreApplication::applicationVersion()).toUtf8();
+    user_agent = QStringLiteral("%1 %2").arg(QCoreApplication::applicationName(), QCoreApplication::applicationVersion()).toUtf8();
   }
 
   QNetworkRequest new_request(request);
   new_request.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy);
-  new_request.setRawHeader("User-Agent", user_agent);
+  new_request.setHeader(QNetworkRequest::UserAgentHeader, user_agent);
 
   if (op == QNetworkAccessManager::PostOperation && !new_request.header(QNetworkRequest::ContentTypeHeader).isValid()) {
-    new_request.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded");
+    new_request.setHeader(QNetworkRequest::ContentTypeHeader, QStringLiteral("application/x-www-form-urlencoded"));
   }
 
   // Prefer the cache unless the caller has changed the setting already

src/core/networkproxyfactory.cpp

@@ -29,6 +29,7 @@
 #include <QSettings>
 
 #include "core/logging.h"
+#include "core/settings.h"
 #include "networkproxyfactory.h"
 
 NetworkProxyFactory *NetworkProxyFactory::sInstance = nullptr;
@@ -43,11 +44,10 @@ NetworkProxyFactory::NetworkProxyFactory()
 #ifdef Q_OS_LINUX
   // Linux uses environment variables to pass proxy configuration information, which systemProxyForQuery doesn't support for some reason.
 
-  QStringList urls;
-  urls << QString::fromLocal8Bit(qgetenv("HTTP_PROXY"));
-  urls << QString::fromLocal8Bit(qgetenv("http_proxy"));
-  urls << QString::fromLocal8Bit(qgetenv("ALL_PROXY"));
-  urls << QString::fromLocal8Bit(qgetenv("all_proxy"));
+  const QStringList urls = QStringList() << QString::fromLocal8Bit(qgetenv("HTTP_PROXY"))
+                                         << QString::fromLocal8Bit(qgetenv("http_proxy"))
+                                         << QString::fromLocal8Bit(qgetenv("ALL_PROXY"))
+                                         << QString::fromLocal8Bit(qgetenv("all_proxy"));
 
   qLog(Debug) << "Detected system proxy URLs:" << urls;
 
@@ -78,7 +78,7 @@ void NetworkProxyFactory::ReloadSettings() {
 
   QMutexLocker l(&mutex_);
 
-  QSettings s;
+  Settings s;
   s.beginGroup(kSettingsGroup);
 
   mode_ = static_cast<Mode>(s.value("mode", static_cast<int>(Mode::System)).toInt());
@@ -112,7 +112,7 @@ QList<QNetworkProxy> NetworkProxyFactory::queryProxy(const QNetworkProxyQuery &q
         ret.setPort(env_url_.port());
         ret.setUser(env_url_.userName());
         ret.setPassword(env_url_.password());
-        if (env_url_.scheme().startsWith("http")) {
+        if (env_url_.scheme().startsWith(QLatin1String("http"))) {
           ret.setType(QNetworkProxy::HttpProxy);
         }
         else {

src/core/player.cpp

@@ -25,6 +25,7 @@
 
 #include <algorithm>
 #include <memory>
+#include <chrono>
 
 #include <QtGlobal>
 #include <QObject>
@@ -36,6 +37,7 @@
 #include <QSettings>
 
 #include "core/logging.h"
+#include "core/settings.h"
 #include "utilities/timeconstants.h"
 
 #include "scoped_ptr.h"
@@ -67,6 +69,8 @@
 #include "settings/behavioursettingspage.h"
 #include "settings/playlistsettingspage.h"
 
+using namespace std::chrono_literals;
+
 using std::make_shared;
 
 const char *Player::kSettingsGroup = "Player";
@@ -80,6 +84,7 @@ Player::Player(Application *app, QObject *parent)
 #endif
       analyzer_(nullptr),
       equalizer_(nullptr),
+      timer_save_volume_(new QTimer(this)),
       stream_change_type_(EngineBase::TrackChangeType::First),
       autoscroll_(Playlist::AutoScroll::Maybe),
       last_state_(EngineBase::State::Empty),
@@ -93,13 +98,17 @@ Player::Player(Application *app, QObject *parent)
       seek_step_sec_(10),
       play_offset_nanosec_(0) {
 
-  QSettings s;
+  Settings s;
   s.beginGroup(BackendSettingsPage::kSettingsGroup);
   EngineBase::Type enginetype = EngineBase::TypeFromName(s.value("engine", EngineBase::Name(EngineBase::Type::GStreamer)).toString().toLower());
   s.endGroup();
 
   CreateEngine(enginetype);
 
+  timer_save_volume_->setSingleShot(true);
+  timer_save_volume_->setInterval(5s);
+  QObject::connect(timer_save_volume_, &QTimer::timeout, this, &Player::SaveVolume);
+
 }
 
 EngineBase::Type Player::CreateEngine(EngineBase::Type enginetype) {
@@ -134,7 +143,7 @@ EngineBase::Type Player::CreateEngine(EngineBase::Type enginetype) {
   }
 
   if (use_enginetype != enginetype) {  // Engine was set to something else. Reset output and device.
-    QSettings s;
+    Settings s;
     s.beginGroup(BackendSettingsPage::kSettingsGroup);
     s.setValue("engine", EngineBase::Name(use_enginetype));
     s.setValue("output", engine_->DefaultOutput());
@@ -154,7 +163,7 @@ EngineBase::Type Player::CreateEngine(EngineBase::Type enginetype) {
 
 void Player::Init() {
 
-  QSettings s;
+  Settings s;
 
   if (!engine_) {
     s.beginGroup(BackendSettingsPage::kSettingsGroup);
@@ -198,7 +207,7 @@ void Player::Init() {
 
 void Player::ReloadSettings() {
 
-  QSettings s;
+  Settings s;
 
   s.beginGroup(PlaylistSettingsPage::kSettingsGroup);
   continue_on_error_ = s.value("continue_on_error", false).toBool();
@@ -216,7 +225,7 @@ void Player::ReloadSettings() {
 
 void Player::LoadVolume() {
 
-  QSettings s;
+  Settings s;
   s.beginGroup(kSettingsGroup);
   const uint volume = s.value("volume", 100).toInt();
   s.endGroup();
@@ -227,7 +236,7 @@ void Player::LoadVolume() {
 
 void Player::SaveVolume() {
 
-  QSettings s;
+  Settings s;
   s.beginGroup(kSettingsGroup);
   s.setValue("volume", volume_);
   s.endGroup();
@@ -278,7 +287,7 @@ void Player::HandleLoadResult(const UrlHandler::LoadResult &result) {
       if (is_current) NextItem(stream_change_type_, autoscroll_);
       break;
 
-    case UrlHandler::LoadResult::Type::TrackAvailable: {
+    case UrlHandler::LoadResult::Type::TrackAvailable:{
 
       qLog(Debug) << "URL handler for" << result.media_url_ << "returned" << result.stream_url_;
 
@@ -385,8 +394,8 @@ void Player::NextItem(const EngineBase::TrackChangeFlags change, const Playlist:
   Playlist *active_playlist = app_->playlist_manager()->active();
 
   // If we received too many errors in auto change, with repeat enabled, we stop
-  if (change == EngineBase::TrackChangeType::Auto) {
-    const PlaylistSequence::RepeatMode repeat_mode = active_playlist->sequence()->repeat_mode();
+  if (change & EngineBase::TrackChangeType::Auto) {
+    const PlaylistSequence::RepeatMode repeat_mode = active_playlist->RepeatMode();
     if (repeat_mode != PlaylistSequence::RepeatMode::Off) {
       if ((repeat_mode == PlaylistSequence::RepeatMode::Track && nb_errors_received_ >= 3) || (nb_errors_received_ >= app_->playlist_manager()->active()->filter()->rowCount())) {
         // We received too many "Error" state changes: probably looping over a playlist which contains only unavailable elements: stop now.
@@ -428,7 +437,8 @@ void Player::PlayPlaylistInternal(const EngineBase::TrackChangeFlags change, con
   play_offset_nanosec_ = 0;
 
   Playlist *playlist = nullptr;
-  for (Playlist *p : app_->playlist_manager()->GetAllPlaylists()) {
+  const QList<Playlist*> playlists = app_->playlist_manager()->GetAllPlaylists();
+  for (Playlist *p : playlists) {
     if (playlist_name == app_->playlist_manager()->GetPlaylistName(p->id())) {
       playlist = p;
       break;
@@ -492,7 +502,7 @@ void Player::PlayPause(const quint64 offset_nanosec, const Playlist::AutoScroll
       emit Resumed();
       break;
 
-    case EngineBase::State::Playing: {
+    case EngineBase::State::Playing:{
       if (current_item_->options() & PlaylistItem::Option::PauseDisabled) {
         Stop();
       }
@@ -506,7 +516,7 @@ void Player::PlayPause(const quint64 offset_nanosec, const Playlist::AutoScroll
 
     case EngineBase::State::Empty:
     case EngineBase::State::Error:
-    case EngineBase::State::Idle: {
+    case EngineBase::State::Idle:{
       pause_time_ = QDateTime();
       play_offset_nanosec_ = offset_nanosec;
       app_->playlist_manager()->SetActivePlaylist(app_->playlist_manager()->current_id());
@@ -526,7 +536,7 @@ void Player::UnPause() {
   if (current_item_ && pause_time_.isValid()) {
     const Song &song = current_item_->Metadata();
     if (url_handlers_.contains(song.url().scheme()) && song.stream_url_can_expire()) {
-      const quint64 time = QDateTime::currentDateTime().toSecsSinceEpoch() - pause_time_.toSecsSinceEpoch();
+      const quint64 time = QDateTime::currentSecsSinceEpoch() - pause_time_.toSecsSinceEpoch();
       if (time >= 30) {  // Stream URL might be expired.
         qLog(Debug) << "Re-requesting stream URL for" << song.url();
         play_offset_nanosec_ = engine_->position_nanosec();
@@ -561,6 +571,7 @@ void Player::Stop(const bool stop_after) {
 
   engine_->Stop(stop_after);
   app_->playlist_manager()->active()->set_current_row(-1);
+  app_->playlist_manager()->active()->reset_played_indexes();
   current_item_.reset();
   pause_time_ = QDateTime();
   play_offset_nanosec_ = 0;
@@ -658,6 +669,7 @@ void Player::SetVolumeFromSlider(const int value) {
     volume_ = volume;
     engine_->SetVolume(volume);
     emit VolumeChanged(volume);
+    timer_save_volume_->start();
   }
 
 }
@@ -668,6 +680,7 @@ void Player::SetVolumeFromEngine(const uint volume) {
   if (new_volume != volume_) {
     volume_ = new_volume;
     emit VolumeChanged(new_volume);
+    timer_save_volume_->start();
   }
 
 }
@@ -679,6 +692,7 @@ void Player::SetVolume(const uint volume) {
     volume_ = new_volume;
     engine_->SetVolume(new_volume);
     emit VolumeChanged(new_volume);
+    timer_save_volume_->start();
   }
 
 }
@@ -706,7 +720,7 @@ void Player::PlayAt(const int index, const quint64 offset_nanosec, EngineBase::T
   pause_time_ = QDateTime();
   play_offset_nanosec_ = offset_nanosec;
 
-  if (current_item_ && change == EngineBase::TrackChangeType::Manual && engine_->position_nanosec() != engine_->length_nanosec()) {
+  if (current_item_ && change & EngineBase::TrackChangeType::Manual && engine_->position_nanosec() != engine_->length_nanosec()) {
     emit TrackSkipped(current_item_);
   }
 
@@ -867,6 +881,9 @@ void Player::TrackAboutToEnd() {
   if (engine_->is_autocrossfade_enabled()) {
     // Crossfade is on, so just start playing the next track.  The current one will fade out, and the new one will fade in
 
+    // If the decoding failed, current_item_ will be null
+    if (!current_item_) return;
+
     // But, if there's no next track, and we don't want to fade out, then do nothing and just let the track finish to completion.
     if (!engine_->is_fadeout_enabled() && !has_next_row) return;
 

src/core/player.h

@@ -39,6 +39,7 @@
 #include "playlist/playlistitem.h"
 #include "settings/behavioursettingspage.h"
 
+class QTimer;
 class Application;
 class Song;
 class AnalyzerContainer;
@@ -223,6 +224,7 @@ class Player : public PlayerInterface {
 #endif
   AnalyzerContainer *analyzer_;
   SharedPtr<Equalizer> equalizer_;
+  QTimer *timer_save_volume_;
 
   PlaylistItemPtr current_item_;