diff --git a/src/collection/collectionbackend.cpp b/src/collection/collectionbackend.cpp index 66cc919b6..5d6f830c1 100644 --- a/src/collection/collectionbackend.cpp +++ b/src/collection/collectionbackend.cpp @@ -59,7 +59,7 @@ #include "collectionquery.h" #include "collectiontask.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; CollectionBackend::CollectionBackend(QObject *parent) : CollectionBackendInterface(parent), diff --git a/src/collection/collectionfilterwidget.cpp b/src/collection/collectionfilterwidget.cpp index 743cff2f0..bd3a41be5 100644 --- a/src/collection/collectionfilterwidget.cpp +++ b/src/collection/collectionfilterwidget.cpp @@ -61,7 +61,7 @@ #include "settings/collectionsettingspage.h" #include "settings/appearancesettingspage.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; namespace { constexpr int kFilterDelay = 500; // msec diff --git a/src/collection/collectionmodel.cpp b/src/collection/collectionmodel.cpp index 41b8df869..10178eb84 100644 --- a/src/collection/collectionmodel.cpp +++ b/src/collection/collectionmodel.cpp @@ -77,7 +77,7 @@ #include "settings/collectionsettingspage.h" using namespace std::chrono_literals; -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; const int CollectionModel::kPrettyCoverSize = 32; namespace { diff --git a/src/collection/collectionquery.cpp b/src/collection/collectionquery.cpp index 21c98d27e..2023633d9 100644 --- a/src/collection/collectionquery.cpp +++ b/src/collection/collectionquery.cpp @@ -37,7 +37,7 @@ #include "collectionquery.h" #include "collectionfilteroptions.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; CollectionQuery::CollectionQuery(const QSqlDatabase &db, const QString &songs_table, const CollectionFilterOptions &filter_options) : SqlQuery(db), diff --git a/src/collection/collectionwatcher.cpp b/src/collection/collectionwatcher.cpp index d63f5a714..a1fb8c7ac 100644 --- a/src/collection/collectionwatcher.cpp +++ b/src/collection/collectionwatcher.cpp @@ -71,7 +71,7 @@ #endif using namespace std::chrono_literals; -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; QStringList CollectionWatcher::sValidImages = QStringList() << QStringLiteral("jpg") << QStringLiteral("png") << QStringLiteral("gif") << QStringLiteral("jpeg"); diff --git a/src/collection/collectionwatcher.h b/src/collection/collectionwatcher.h index bc7f3c712..e6a1cdfba 100644 --- a/src/collection/collectionwatcher.h +++ b/src/collection/collectionwatcher.h @@ -47,8 +47,6 @@ class FileSystemWatcherInterface; class TaskManager; class CueParser; -using namespace Qt::Literals::StringLiterals; - class CollectionWatcher : public QObject { Q_OBJECT @@ -260,11 +258,11 @@ class CollectionWatcher : public QObject { }; inline QString CollectionWatcher::NoExtensionPart(const QString &fileName) { - return fileName.contains(u'.') ? fileName.section(u'.', 0, -2) : ""_L1; + return fileName.contains(u'.') ? fileName.section(u'.', 0, -2) : QLatin1String(""); } // Thanks Amarok inline QString CollectionWatcher::ExtensionPart(const QString &fileName) { - return fileName.contains(u'.') ? fileName.mid(fileName.lastIndexOf(u'.') + 1).toLower() : ""_L1; + return fileName.contains(u'.') ? fileName.mid(fileName.lastIndexOf(u'.') + 1).toLower() : QLatin1String(""); } inline QString CollectionWatcher::DirectoryPart(const QString &fileName) { return fileName.section(u'/', 0, -2); diff --git a/src/collection/savedgroupingmanager.cpp b/src/collection/savedgroupingmanager.cpp index 5ed2bb85d..204a79877 100644 --- a/src/collection/savedgroupingmanager.cpp +++ b/src/collection/savedgroupingmanager.cpp @@ -44,7 +44,7 @@ #include "savedgroupingmanager.h" #include "ui_savedgroupingmanager.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; const char *SavedGroupingManager::kSavedGroupingsSettingsGroup = "SavedGroupings"; diff --git a/src/context/contextview.cpp b/src/context/contextview.cpp index 9cabf582d..3a9a82c6a 100644 --- a/src/context/contextview.cpp +++ b/src/context/contextview.cpp @@ -67,7 +67,7 @@ #include "contextview.h" #include "contextalbum.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; namespace { constexpr int kWidgetSpacing = 50; diff --git a/src/core/database.cpp b/src/core/database.cpp index fd95cc092..9a7c4e492 100644 --- a/src/core/database.cpp +++ b/src/core/database.cpp @@ -49,7 +49,7 @@ #include "sqlquery.h" #include "scopedtransaction.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; const int Database::kSchemaVersion = 20; diff --git a/src/core/localredirectserver.cpp b/src/core/localredirectserver.cpp index abc16e517..ac299862f 100644 --- a/src/core/localredirectserver.cpp +++ b/src/core/localredirectserver.cpp @@ -39,7 +39,7 @@ #include #include -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; LocalRedirectServer::LocalRedirectServer(QObject *parent) : QTcpServer(parent), diff --git a/src/core/logging.cpp b/src/core/logging.cpp index 9dafb3cde..8bb737f4d 100644 --- a/src/core/logging.cpp +++ b/src/core/logging.cpp @@ -61,7 +61,7 @@ #include "logging.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; namespace logging { diff --git a/src/core/mainwindow.cpp b/src/core/mainwindow.cpp index 08a0e6e41..98016f7dc 100644 --- a/src/core/mainwindow.cpp +++ b/src/core/mainwindow.cpp @@ -223,7 +223,7 @@ using std::make_unique; using std::make_shared; using namespace std::chrono_literals; -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; const char *MainWindow::kSettingsGroup = "MainWindow"; const char *MainWindow::kAllFilesFilterSpec = QT_TR_NOOP("All Files (*)"); diff --git a/src/core/networkproxyfactory.cpp b/src/core/networkproxyfactory.cpp index 4761e6f25..13a39cb03 100644 --- a/src/core/networkproxyfactory.cpp +++ b/src/core/networkproxyfactory.cpp @@ -32,7 +32,7 @@ #include "core/settings.h" #include "networkproxyfactory.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; NetworkProxyFactory *NetworkProxyFactory::sInstance = nullptr; const char *NetworkProxyFactory::kSettingsGroup = "NetworkProxy"; diff --git a/src/core/song.cpp b/src/core/song.cpp index adfcaa2c8..3b7774c96 100644 --- a/src/core/song.cpp +++ b/src/core/song.cpp @@ -65,7 +65,7 @@ # include "mpris2/mpris_common.h" #endif -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; const QStringList Song::kColumns = QStringList() << u"title"_s << u"album"_s diff --git a/src/core/sqlquery.cpp b/src/core/sqlquery.cpp index f78f1577d..b6e269643 100644 --- a/src/core/sqlquery.cpp +++ b/src/core/sqlquery.cpp @@ -26,7 +26,7 @@ #include "sqlquery.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; void SqlQuery::BindValue(const QString &placeholder, const QVariant &value) { diff --git a/src/core/stylehelper.cpp b/src/core/stylehelper.cpp index c27e6b484..c7552c2dc 100644 --- a/src/core/stylehelper.cpp +++ b/src/core/stylehelper.cpp @@ -34,7 +34,7 @@ #include #include -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; // Clamps float color values within (0, 255) static int clamp(float x) { diff --git a/src/core/stylesheetloader.cpp b/src/core/stylesheetloader.cpp index 5eedcc2a6..61834b550 100644 --- a/src/core/stylesheetloader.cpp +++ b/src/core/stylesheetloader.cpp @@ -39,7 +39,7 @@ #include "core/logging.h" #include "stylesheetloader.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; using std::make_shared; diff --git a/src/core/taskmanager.cpp b/src/core/taskmanager.cpp index 4a3c6dbe5..cc7bb65b6 100644 --- a/src/core/taskmanager.cpp +++ b/src/core/taskmanager.cpp @@ -30,7 +30,7 @@ #include "taskmanager.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; TaskManager::TaskManager(QObject *parent) : QObject(parent), next_task_id_(1) { diff --git a/src/covermanager/albumcoverchoicecontroller.cpp b/src/covermanager/albumcoverchoicecontroller.cpp index b3c9a6290..9d490a04d 100644 --- a/src/covermanager/albumcoverchoicecontroller.cpp +++ b/src/covermanager/albumcoverchoicecontroller.cpp @@ -78,7 +78,7 @@ #include "coverfromurldialog.h" #include "currentalbumcoverloader.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; const char *AlbumCoverChoiceController::kLoadImageFileFilter = QT_TR_NOOP("Images (*.png *.jpg *.jpeg *.bmp *.gif *.xpm *.pbm *.pgm *.ppm *.xbm)"); const char *AlbumCoverChoiceController::kSaveImageFileFilter = QT_TR_NOOP("Images (*.png *.jpg *.jpeg *.bmp *.xpm *.pbm *.ppm *.xbm)"); diff --git a/src/covermanager/albumcoverexport.cpp b/src/covermanager/albumcoverexport.cpp index 602745645..720bad680 100644 --- a/src/covermanager/albumcoverexport.cpp +++ b/src/covermanager/albumcoverexport.cpp @@ -35,7 +35,7 @@ #include "core/settings.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; const char *AlbumCoverExport::kSettingsGroup = "AlbumCoverExport"; diff --git a/src/covermanager/albumcoverfetchersearch.cpp b/src/covermanager/albumcoverfetchersearch.cpp index ea3d64a30..e2d8ed6a0 100644 --- a/src/covermanager/albumcoverfetchersearch.cpp +++ b/src/covermanager/albumcoverfetchersearch.cpp @@ -48,7 +48,7 @@ #include "coverproviders.h" #include "albumcoverimageresult.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; namespace { constexpr int kSearchTimeoutMs = 20000; diff --git a/src/covermanager/albumcoverloaderoptions.cpp b/src/covermanager/albumcoverloaderoptions.cpp index 70be50414..c9a0ab426 100644 --- a/src/covermanager/albumcoverloaderoptions.cpp +++ b/src/covermanager/albumcoverloaderoptions.cpp @@ -24,7 +24,7 @@ #include "core/settings.h" #include "settings/coverssettingspage.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; AlbumCoverLoaderOptions::AlbumCoverLoaderOptions(const Options _options, const QSize _desired_scaled_size, const qreal _device_pixel_ratio, const Types &_types) : options(_options), diff --git a/src/covermanager/albumcovermanager.cpp b/src/covermanager/albumcovermanager.cpp index dfdd3f497..6936ffe2f 100644 --- a/src/covermanager/albumcovermanager.cpp +++ b/src/covermanager/albumcovermanager.cpp @@ -96,7 +96,7 @@ #include "ui_albumcovermanager.h" using namespace std::literals::chrono_literals; -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; namespace { constexpr char kSettingsGroup[] = "CoverManager"; diff --git a/src/covermanager/coverexportrunnable.cpp b/src/covermanager/coverexportrunnable.cpp index 792abf1e2..232c01484 100644 --- a/src/covermanager/coverexportrunnable.cpp +++ b/src/covermanager/coverexportrunnable.cpp @@ -34,7 +34,7 @@ #include "albumcoverexport.h" #include "coverexportrunnable.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; CoverExportRunnable::CoverExportRunnable(const AlbumCoverExport::DialogResult &dialog_result, const AlbumCoverLoaderOptions::Types &cover_types, const Song &song, QObject *parent) : QObject(parent), diff --git a/src/covermanager/coverfromurldialog.cpp b/src/covermanager/coverfromurldialog.cpp index 9418c4404..08605fdca 100644 --- a/src/covermanager/coverfromurldialog.cpp +++ b/src/covermanager/coverfromurldialog.cpp @@ -39,7 +39,7 @@ #include "coverfromurldialog.h" #include "ui_coverfromurldialog.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; CoverFromURLDialog::CoverFromURLDialog(SharedPtr network, QWidget *parent) : QDialog(parent), diff --git a/src/covermanager/deezercoverprovider.cpp b/src/covermanager/deezercoverprovider.cpp index 8b3d3e152..088dac7fa 100644 --- a/src/covermanager/deezercoverprovider.cpp +++ b/src/covermanager/deezercoverprovider.cpp @@ -48,7 +48,7 @@ #include "jsoncoverprovider.h" #include "deezercoverprovider.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; namespace { constexpr char kApiUrl[] = "https://api.deezer.com"; diff --git a/src/covermanager/discogscoverprovider.cpp b/src/covermanager/discogscoverprovider.cpp index b9cc8eb30..7d50d9384 100644 --- a/src/covermanager/discogscoverprovider.cpp +++ b/src/covermanager/discogscoverprovider.cpp @@ -50,7 +50,7 @@ #include "jsoncoverprovider.h" #include "discogscoverprovider.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; using std::make_shared; const char *DiscogsCoverProvider::kUrlSearch = "https://api.discogs.com/database/search"; diff --git a/src/covermanager/lastfmcoverprovider.cpp b/src/covermanager/lastfmcoverprovider.cpp index 5e0dd3b6f..a13dc4a8a 100644 --- a/src/covermanager/lastfmcoverprovider.cpp +++ b/src/covermanager/lastfmcoverprovider.cpp @@ -47,7 +47,7 @@ #include "albumcoverfetcher.h" #include "lastfmcoverprovider.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; namespace { constexpr char kUrl[] = "https://ws.audioscrobbler.com/2.0/"; diff --git a/src/covermanager/musicbrainzcoverprovider.cpp b/src/covermanager/musicbrainzcoverprovider.cpp index 01463d2ba..3f1760ed7 100644 --- a/src/covermanager/musicbrainzcoverprovider.cpp +++ b/src/covermanager/musicbrainzcoverprovider.cpp @@ -44,7 +44,7 @@ #include "jsoncoverprovider.h" #include "musicbrainzcoverprovider.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; namespace { constexpr char kReleaseSearchUrl[] = "https://musicbrainz.org/ws/2/release/"; diff --git a/src/covermanager/musixmatchcoverprovider.cpp b/src/covermanager/musixmatchcoverprovider.cpp index abda0b7d4..2f18ac137 100644 --- a/src/covermanager/musixmatchcoverprovider.cpp +++ b/src/covermanager/musixmatchcoverprovider.cpp @@ -40,7 +40,7 @@ #include "jsoncoverprovider.h" #include "musixmatchcoverprovider.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; MusixmatchCoverProvider::MusixmatchCoverProvider(Application *app, SharedPtr network, QObject *parent) : JsonCoverProvider(QStringLiteral("Musixmatch"), true, false, 1.0, true, false, app, network, parent) {} diff --git a/src/covermanager/opentidalcoverprovider.cpp b/src/covermanager/opentidalcoverprovider.cpp index 1f90f1ab6..4f57e5670 100644 --- a/src/covermanager/opentidalcoverprovider.cpp +++ b/src/covermanager/opentidalcoverprovider.cpp @@ -47,7 +47,7 @@ #include "jsoncoverprovider.h" #include "opentidalcoverprovider.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; namespace { constexpr char kSettingsGroup[] = "OpenTidal"; diff --git a/src/covermanager/qobuzcoverprovider.cpp b/src/covermanager/qobuzcoverprovider.cpp index 35b60cebc..99e594804 100644 --- a/src/covermanager/qobuzcoverprovider.cpp +++ b/src/covermanager/qobuzcoverprovider.cpp @@ -47,7 +47,7 @@ #include "jsoncoverprovider.h" #include "qobuzcoverprovider.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; namespace { constexpr int kLimit = 10; diff --git a/src/covermanager/spotifycoverprovider.cpp b/src/covermanager/spotifycoverprovider.cpp index 76d473ff9..2742fd6d6 100644 --- a/src/covermanager/spotifycoverprovider.cpp +++ b/src/covermanager/spotifycoverprovider.cpp @@ -52,7 +52,7 @@ #include "jsoncoverprovider.h" #include "spotifycoverprovider.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; namespace { constexpr char kApiUrl[] = "https://api.spotify.com/v1"; diff --git a/src/covermanager/tidalcoverprovider.cpp b/src/covermanager/tidalcoverprovider.cpp index 37592f3e6..15e48e915 100644 --- a/src/covermanager/tidalcoverprovider.cpp +++ b/src/covermanager/tidalcoverprovider.cpp @@ -45,7 +45,7 @@ #include "jsoncoverprovider.h" #include "tidalcoverprovider.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; namespace { constexpr int kLimit = 10; diff --git a/src/device/connecteddevice.cpp b/src/device/connecteddevice.cpp index 7d0b26519..d981a087c 100644 --- a/src/device/connecteddevice.cpp +++ b/src/device/connecteddevice.cpp @@ -38,7 +38,7 @@ #include "devicemanager.h" #include "deviceinfo.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; using std::make_shared; ConnectedDevice::ConnectedDevice(const QUrl &url, DeviceLister *lister, const QString &unique_id, SharedPtr manager, Application *app, const int database_id, const bool first_time, QObject *parent) diff --git a/src/device/devicedatabasebackend.cpp b/src/device/devicedatabasebackend.cpp index 3fd1f6b12..efda5cffa 100644 --- a/src/device/devicedatabasebackend.cpp +++ b/src/device/devicedatabasebackend.cpp @@ -38,7 +38,7 @@ #include "core/scopedtransaction.h" #include "devicedatabasebackend.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; namespace { constexpr int kDeviceSchemaVersion = 5; diff --git a/src/device/deviceinfo.cpp b/src/device/deviceinfo.cpp index 5ee3445b8..135b96e5b 100644 --- a/src/device/deviceinfo.cpp +++ b/src/device/deviceinfo.cpp @@ -34,7 +34,7 @@ #include "devicedatabasebackend.h" #include "deviceinfo.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; DeviceDatabaseBackend::Device DeviceInfo::SaveToDb() const { diff --git a/src/device/devicelister.cpp b/src/device/devicelister.cpp index 22f6d8068..a8d7cbd2a 100644 --- a/src/device/devicelister.cpp +++ b/src/device/devicelister.cpp @@ -37,7 +37,7 @@ #include "core/logging.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; DeviceLister::DeviceLister(QObject *parent) : QObject(parent), diff --git a/src/device/devicemanager.cpp b/src/device/devicemanager.cpp index b5453917d..6cd7c6df2 100644 --- a/src/device/devicemanager.cpp +++ b/src/device/devicemanager.cpp @@ -82,7 +82,7 @@ # include "gpoddevice.h" #endif -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; using std::make_unique; const int DeviceManager::kDeviceIconSize = 32; diff --git a/src/device/deviceview.cpp b/src/device/deviceview.cpp index 2d8230ea6..437774662 100644 --- a/src/device/deviceview.cpp +++ b/src/device/deviceview.cpp @@ -67,7 +67,7 @@ #include "deviceproperties.h" #include "deviceview.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; using std::make_unique; const int DeviceItemDelegate::kIconPadding = 6; diff --git a/src/device/giolister.cpp b/src/device/giolister.cpp index a6a067a65..8950566ad 100644 --- a/src/device/giolister.cpp +++ b/src/device/giolister.cpp @@ -47,7 +47,7 @@ #include "devicelister.h" #include "giolister.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; QString GioLister::DeviceInfo::unique_id() const { diff --git a/src/device/mtpdevice.cpp b/src/device/mtpdevice.cpp index 2c98e1b1f..1bacb8df1 100644 --- a/src/device/mtpdevice.cpp +++ b/src/device/mtpdevice.cpp @@ -44,7 +44,7 @@ #include "mtploader.h" #include "mtpconnection.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; class DeviceLister; class DeviceManager; diff --git a/src/device/udisks2lister.cpp b/src/device/udisks2lister.cpp index f62f51415..cf4df7a7a 100644 --- a/src/device/udisks2lister.cpp +++ b/src/device/udisks2lister.cpp @@ -54,7 +54,7 @@ #include "udisks2filesystem.h" #include "udisks2job.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; using std::make_unique; using std::make_shared; diff --git a/src/dialogs/about.cpp b/src/dialogs/about.cpp index a4361f15f..fed737a98 100644 --- a/src/dialogs/about.cpp +++ b/src/dialogs/about.cpp @@ -36,7 +36,7 @@ #include "about.h" #include "ui_about.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; About::About(QWidget *parent) : QDialog(parent), ui_{} { diff --git a/src/dialogs/edittagdialog.cpp b/src/dialogs/edittagdialog.cpp index a066662d2..cb3d308fa 100644 --- a/src/dialogs/edittagdialog.cpp +++ b/src/dialogs/edittagdialog.cpp @@ -100,7 +100,7 @@ #include "edittagdialog.h" #include "ui_edittagdialog.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; namespace { constexpr char kTagsDifferentHintText[] = QT_TR_NOOP("(different across multiple songs)"); diff --git a/src/dialogs/errordialog.cpp b/src/dialogs/errordialog.cpp index abb6d4f5a..5640a5122 100644 --- a/src/dialogs/errordialog.cpp +++ b/src/dialogs/errordialog.cpp @@ -35,7 +35,7 @@ #include "errordialog.h" #include "ui_errordialog.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; ErrorDialog::ErrorDialog(QWidget *parent) : QDialog(parent), diff --git a/src/dialogs/snapdialog.cpp b/src/dialogs/snapdialog.cpp index ea79cf139..ac248eddd 100644 --- a/src/dialogs/snapdialog.cpp +++ b/src/dialogs/snapdialog.cpp @@ -25,7 +25,7 @@ #include "snapdialog.h" #include "ui_messagedialog.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; SnapDialog::SnapDialog(QWidget *parent) : MessageDialog(parent) { diff --git a/src/engine/devicefinders.cpp b/src/engine/devicefinders.cpp index b41687320..bbab7a4f7 100644 --- a/src/engine/devicefinders.cpp +++ b/src/engine/devicefinders.cpp @@ -49,7 +49,7 @@ # endif // _MSC_VER #endif // Q_OS_WIN32 -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; DeviceFinders::DeviceFinders(QObject *parent) : QObject(parent) { diff --git a/src/engine/ebur128analysis.cpp b/src/engine/ebur128analysis.cpp index 434107cca..7d806404b 100644 --- a/src/engine/ebur128analysis.cpp +++ b/src/engine/ebur128analysis.cpp @@ -45,7 +45,7 @@ #include "ebur128analysis.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; using std::unique_ptr; namespace { diff --git a/src/engine/enginebase.cpp b/src/engine/enginebase.cpp index d6f4819f6..8e85c86ad 100644 --- a/src/engine/enginebase.cpp +++ b/src/engine/enginebase.cpp @@ -41,7 +41,7 @@ # include "settings/spotifysettingspage.h" #endif -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; EngineBase::EngineBase(QObject *parent) : QObject(parent), diff --git a/src/engine/enginedevice.cpp b/src/engine/enginedevice.cpp index 133245f79..41715891b 100644 --- a/src/engine/enginedevice.cpp +++ b/src/engine/enginedevice.cpp @@ -19,7 +19,7 @@ #include "enginedevice.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; EngineDevice::EngineDevice() : card(0), device(0) {} diff --git a/src/engine/gstengine.cpp b/src/engine/gstengine.cpp index 825aef107..68e58e301 100644 --- a/src/engine/gstengine.cpp +++ b/src/engine/gstengine.cpp @@ -61,7 +61,7 @@ #include "gstbufferconsumer.h" #include "enginemetadata.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; using std::make_shared; #ifdef __clang__ diff --git a/src/engine/gstenginepipeline.cpp b/src/engine/gstenginepipeline.cpp index 9fd408365..54cf362c5 100644 --- a/src/engine/gstenginepipeline.cpp +++ b/src/engine/gstenginepipeline.cpp @@ -67,7 +67,7 @@ #include "gstenginepipeline.h" #include "gstbufferconsumer.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; #ifdef __clang__ # pragma clang diagnostic push diff --git a/src/filterparser/filterparser.cpp b/src/filterparser/filterparser.cpp index 01112e0e9..93d890f76 100644 --- a/src/filterparser/filterparser.cpp +++ b/src/filterparser/filterparser.cpp @@ -28,7 +28,7 @@ #include "filtertree.h" #include "filterparsersearchcomparators.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; FilterParser::FilterParser(const QString &filter_string) : filter_string_(filter_string), iter_{}, end_{} {} diff --git a/src/filterparser/filtertree.cpp b/src/filterparser/filtertree.cpp index 6e5e6afc6..a8bbb81c9 100644 --- a/src/filterparser/filtertree.cpp +++ b/src/filterparser/filtertree.cpp @@ -23,7 +23,7 @@ #include "filtertree.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; FilterTree::FilterTree() = default; FilterTree::~FilterTree() = default; diff --git a/src/globalshortcuts/globalshortcutgrabber.cpp b/src/globalshortcuts/globalshortcutgrabber.cpp index de3fabf3f..2e1919bb6 100644 --- a/src/globalshortcuts/globalshortcutgrabber.cpp +++ b/src/globalshortcuts/globalshortcutgrabber.cpp @@ -34,7 +34,7 @@ #include "globalshortcutgrabber.h" #include "ui_globalshortcutgrabber.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; GlobalShortcutGrabber::GlobalShortcutGrabber(QWidget *parent) : QDialog(parent), diff --git a/src/globalshortcuts/globalshortcutsbackend-gnome.cpp b/src/globalshortcuts/globalshortcutsbackend-gnome.cpp index 033fec7d9..adfb53efc 100644 --- a/src/globalshortcuts/globalshortcutsbackend-gnome.cpp +++ b/src/globalshortcuts/globalshortcutsbackend-gnome.cpp @@ -37,7 +37,7 @@ #include "gnomesettingsdaemon.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; namespace { constexpr char kService1[] = "org.gnome.SettingsDaemon.MediaKeys"; diff --git a/src/globalshortcuts/globalshortcutsbackend-mate.cpp b/src/globalshortcuts/globalshortcutsbackend-mate.cpp index f45d0d1fa..ed2f8e417 100644 --- a/src/globalshortcuts/globalshortcutsbackend-mate.cpp +++ b/src/globalshortcuts/globalshortcutsbackend-mate.cpp @@ -35,7 +35,7 @@ #include "matesettingsdaemon.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; namespace { constexpr char kService1[] = "org.mate.SettingsDaemon.MediaKeys"; diff --git a/src/globalshortcuts/globalshortcutsbackend-x11.cpp b/src/globalshortcuts/globalshortcutsbackend-x11.cpp index 80257a694..727f44152 100644 --- a/src/globalshortcuts/globalshortcutsbackend-x11.cpp +++ b/src/globalshortcuts/globalshortcutsbackend-x11.cpp @@ -33,7 +33,7 @@ #include "globalshortcutsbackend.h" #include "globalshortcut.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; GlobalShortcutsBackendX11::GlobalShortcutsBackendX11(GlobalShortcutsManager *manager, QObject *parent) : GlobalShortcutsBackend(manager, GlobalShortcutsBackend::Type::X11, parent), diff --git a/src/lyrics/chartlyricsprovider.cpp b/src/lyrics/chartlyricsprovider.cpp index 35384cc10..fefbdd67c 100644 --- a/src/lyrics/chartlyricsprovider.cpp +++ b/src/lyrics/chartlyricsprovider.cpp @@ -38,7 +38,7 @@ #include "lyricssearchresult.h" #include "chartlyricsprovider.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; namespace { constexpr char kUrlSearch[] = "http://api.chartlyrics.com/apiv1.asmx/SearchLyricDirect"; diff --git a/src/lyrics/elyricsnetlyricsprovider.cpp b/src/lyrics/elyricsnetlyricsprovider.cpp index 86606a66c..03b3c081e 100644 --- a/src/lyrics/elyricsnetlyricsprovider.cpp +++ b/src/lyrics/elyricsnetlyricsprovider.cpp @@ -29,7 +29,7 @@ #include "lyricssearchrequest.h" #include "elyricsnetlyricsprovider.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; namespace { constexpr char kUrl[] = "https://www.elyrics.net/read/"; diff --git a/src/lyrics/geniuslyricsprovider.cpp b/src/lyrics/geniuslyricsprovider.cpp index 78c5169f6..d76b0a522 100644 --- a/src/lyrics/geniuslyricsprovider.cpp +++ b/src/lyrics/geniuslyricsprovider.cpp @@ -55,7 +55,7 @@ #include "htmllyricsprovider.h" #include "geniuslyricsprovider.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; using std::make_shared; namespace { diff --git a/src/lyrics/htmllyricsprovider.cpp b/src/lyrics/htmllyricsprovider.cpp index d65b62d46..3674e3d39 100644 --- a/src/lyrics/htmllyricsprovider.cpp +++ b/src/lyrics/htmllyricsprovider.cpp @@ -36,7 +36,7 @@ #include "htmllyricsprovider.h" #include "lyricssearchrequest.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; HtmlLyricsProvider::HtmlLyricsProvider(const QString &name, const bool enabled, const QString &start_tag, const QString &end_tag, const QString &lyrics_start, const bool multiple, SharedPtr network, QObject *parent) : LyricsProvider(name, enabled, false, network, parent), start_tag_(start_tag), end_tag_(end_tag), lyrics_start_(lyrics_start), multiple_(multiple) {} diff --git a/src/lyrics/letraslyricsprovider.cpp b/src/lyrics/letraslyricsprovider.cpp index 05cb65c58..06cdc97c3 100644 --- a/src/lyrics/letraslyricsprovider.cpp +++ b/src/lyrics/letraslyricsprovider.cpp @@ -30,7 +30,7 @@ #include "lyricssearchrequest.h" #include "letraslyricsprovider.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; namespace { constexpr char kUrl[] = "https://www.letras.mus.br/winamp.php"; diff --git a/src/lyrics/lololyricsprovider.cpp b/src/lyrics/lololyricsprovider.cpp index 6593d17e1..0ed710730 100644 --- a/src/lyrics/lololyricsprovider.cpp +++ b/src/lyrics/lololyricsprovider.cpp @@ -38,7 +38,7 @@ #include "lyricssearchresult.h" #include "lololyricsprovider.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; namespace { constexpr char kUrlSearch[] = "http://api.lololyrics.com/0.5/getLyric"; diff --git a/src/lyrics/lyricfindlyricsprovider.cpp b/src/lyrics/lyricfindlyricsprovider.cpp index 784d12ac8..f00a2d9d8 100644 --- a/src/lyrics/lyricfindlyricsprovider.cpp +++ b/src/lyrics/lyricfindlyricsprovider.cpp @@ -37,7 +37,7 @@ #include "utilities/transliterate.h" #include "lyricfindlyricsprovider.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; namespace { constexpr char kUrl[] = "https://lyrics.lyricfind.com/lyrics"; diff --git a/src/lyrics/lyricsfetchersearch.cpp b/src/lyrics/lyricsfetchersearch.cpp index 78afa3cc4..670ff9e8c 100644 --- a/src/lyrics/lyricsfetchersearch.cpp +++ b/src/lyrics/lyricsfetchersearch.cpp @@ -33,7 +33,7 @@ #include "lyricsprovider.h" #include "lyricsproviders.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; namespace { constexpr int kSearchTimeoutMs = 3000; diff --git a/src/lyrics/musixmatchlyricsprovider.cpp b/src/lyrics/musixmatchlyricsprovider.cpp index 0059bc809..d95267c7e 100644 --- a/src/lyrics/musixmatchlyricsprovider.cpp +++ b/src/lyrics/musixmatchlyricsprovider.cpp @@ -45,7 +45,7 @@ #include "musixmatchlyricsprovider.h" #include "providers/musixmatchprovider.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; using std::make_shared; MusixmatchLyricsProvider::MusixmatchLyricsProvider(SharedPtr network, QObject *parent) : JsonLyricsProvider(QStringLiteral("Musixmatch"), true, false, network, parent), use_api_(true) {} diff --git a/src/lyrics/ovhlyricsprovider.cpp b/src/lyrics/ovhlyricsprovider.cpp index ef4ddc979..304bb320c 100644 --- a/src/lyrics/ovhlyricsprovider.cpp +++ b/src/lyrics/ovhlyricsprovider.cpp @@ -37,7 +37,7 @@ #include "jsonlyricsprovider.h" #include "ovhlyricsprovider.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; namespace { constexpr char kUrlSearch[] = "https://api.lyrics.ovh/v1/"; diff --git a/src/lyrics/songlyricscomlyricsprovider.cpp b/src/lyrics/songlyricscomlyricsprovider.cpp index 55302aee5..41d8293d1 100644 --- a/src/lyrics/songlyricscomlyricsprovider.cpp +++ b/src/lyrics/songlyricscomlyricsprovider.cpp @@ -28,7 +28,7 @@ #include "lyricssearchrequest.h" #include "songlyricscomlyricsprovider.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; namespace { constexpr char kUrl[] = "https://www.songlyrics.com/"; diff --git a/src/moodbar/moodbarpipeline.cpp b/src/moodbar/moodbarpipeline.cpp index dca524964..c9f498b8b 100644 --- a/src/moodbar/moodbarpipeline.cpp +++ b/src/moodbar/moodbarpipeline.cpp @@ -42,7 +42,7 @@ #include "gstfastspectrum.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; using std::make_unique; namespace { diff --git a/src/mpris2/mpris2.cpp b/src/mpris2/mpris2.cpp index 133ae00f1..3af791095 100644 --- a/src/mpris2/mpris2.cpp +++ b/src/mpris2/mpris2.cpp @@ -63,7 +63,7 @@ #include "mpris2_root.h" #include "mpris2_tracklist.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; QDBusArgument &operator<<(QDBusArgument &arg, const MprisPlaylist &playlist) { arg.beginStructure(); diff --git a/src/mpris2/mpris_common.h b/src/mpris2/mpris_common.h index f2cf9ee37..adffabde1 100644 --- a/src/mpris2/mpris_common.h +++ b/src/mpris2/mpris_common.h @@ -32,8 +32,6 @@ namespace mpris { -using namespace Qt::Literals::StringLiterals; - inline void AddMetadata(const QString &key, const QString &metadata, QVariantMap *map) { if (!metadata.isEmpty()) (*map)[key] = metadata; } @@ -63,7 +61,7 @@ inline void AddMetadata(const QString &key, const QDBusObjectPath &metadata, QVa } inline QString AsMPRISDateTimeType(const qint64 time) { - return time != -1 ? QDateTime::fromSecsSinceEpoch(time).toString(Qt::ISODate) : ""_L1; + return time != -1 ? QDateTime::fromSecsSinceEpoch(time).toString(Qt::ISODate) : QLatin1String(""); } } // namespace mpris diff --git a/src/musicbrainz/acoustidclient.cpp b/src/musicbrainz/acoustidclient.cpp index dd9ef87ed..cdbbb5dcf 100644 --- a/src/musicbrainz/acoustidclient.cpp +++ b/src/musicbrainz/acoustidclient.cpp @@ -49,7 +49,7 @@ #include "acoustidclient.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; namespace { constexpr char kClientId[] = "0qjUoxbowg"; diff --git a/src/musicbrainz/musicbrainzclient.cpp b/src/musicbrainz/musicbrainzclient.cpp index 6812e6d16..ac109e8db 100644 --- a/src/musicbrainz/musicbrainzclient.cpp +++ b/src/musicbrainz/musicbrainzclient.cpp @@ -50,7 +50,7 @@ #include "utilities/xmlutils.h" #include "musicbrainzclient.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; namespace { constexpr char kTrackUrl[] = "https://musicbrainz.org/ws/2/recording/"; diff --git a/src/musicbrainz/musicbrainzclient.h b/src/musicbrainz/musicbrainzclient.h index ef9de7099..1bb5eab97 100644 --- a/src/musicbrainz/musicbrainzclient.h +++ b/src/musicbrainz/musicbrainzclient.h @@ -35,8 +35,6 @@ #include "core/shared_ptr.h" -using namespace Qt::Literals::StringLiterals; - class QNetworkReply; class QTimer; class QXmlStreamReader; @@ -154,16 +152,16 @@ class MusicBrainzClient : public QObject { } void SetStatusFromString(const QString &s) { - if (s.compare("Official"_L1, Qt::CaseInsensitive) == 0) { + if (s.compare(QLatin1String("Official"), Qt::CaseInsensitive) == 0) { status_ = Status::Official; } - else if (s.compare("Promotion"_L1, Qt::CaseInsensitive) == 0) { + else if (s.compare(QLatin1String("Promotion"), Qt::CaseInsensitive) == 0) { status_ = Status::Promotional; } - else if (s.compare("Bootleg"_L1, Qt::CaseInsensitive) == 0) { + else if (s.compare(QLatin1String("Bootleg"), Qt::CaseInsensitive) == 0) { status_ = Status::Bootleg; } - else if (s.compare("Pseudo-release"_L1, Qt::CaseInsensitive) == 0) { + else if (s.compare(QLatin1String("Pseudo-release"), Qt::CaseInsensitive) == 0) { status_ = Status::PseudoRelease; } else { diff --git a/src/organize/organizeformat.cpp b/src/organize/organizeformat.cpp index df359b92d..154a28285 100644 --- a/src/organize/organizeformat.cpp +++ b/src/organize/organizeformat.cpp @@ -36,7 +36,7 @@ #include "organizeformat.h" #include "organizeformatvalidator.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; const char OrganizeFormat::kBlockPattern[] = "\\{([^{}]+)\\}"; const char OrganizeFormat::kTagPattern[] = "\\%([a-zA-Z]*)"; diff --git a/src/osd/osdbase.cpp b/src/osd/osdbase.cpp index cf5ec3656..5ead6cf51 100644 --- a/src/osd/osdbase.cpp +++ b/src/osd/osdbase.cpp @@ -43,7 +43,7 @@ #include "utilities/strutils.h" #include "covermanager/currentalbumcoverloader.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; const char *OSDBase::kSettingsGroup = "OSD"; diff --git a/src/osd/osdpretty.cpp b/src/osd/osdpretty.cpp index 2387d0faf..408682442 100644 --- a/src/osd/osdpretty.cpp +++ b/src/osd/osdpretty.cpp @@ -60,7 +60,7 @@ #include "osdpretty.h" #include "ui_osdpretty.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; #ifdef Q_OS_WIN # include diff --git a/src/playlist/dynamicplaylistcontrols.cpp b/src/playlist/dynamicplaylistcontrols.cpp index ba59c3698..13a031f10 100644 --- a/src/playlist/dynamicplaylistcontrols.cpp +++ b/src/playlist/dynamicplaylistcontrols.cpp @@ -29,7 +29,7 @@ #include "dynamicplaylistcontrols.h" #include "ui_dynamicplaylistcontrols.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; DynamicPlaylistControls::DynamicPlaylistControls(QWidget *parent) : QWidget(parent), diff --git a/src/playlist/playlist.cpp b/src/playlist/playlist.cpp index e769b9e7a..17e30e832 100644 --- a/src/playlist/playlist.cpp +++ b/src/playlist/playlist.cpp @@ -96,7 +96,7 @@ using std::make_shared; using namespace std::chrono_literals; -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; const char *Playlist::kSettingsGroup = "Playlist"; const char *Playlist::kCddaMimeType = "x-content/audio-cdda"; diff --git a/src/playlist/playlistbackend.cpp b/src/playlist/playlistbackend.cpp index 88246f9db..91a43f07a 100644 --- a/src/playlist/playlistbackend.cpp +++ b/src/playlist/playlistbackend.cpp @@ -53,7 +53,7 @@ #include "playlistparsers/cueparser.h" #include "smartplaylists/playlistgenerator.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; using std::make_shared; namespace { diff --git a/src/playlist/playlistdelegates.cpp b/src/playlist/playlistdelegates.cpp index 10b1f98b1..46aa4512a 100644 --- a/src/playlist/playlistdelegates.cpp +++ b/src/playlist/playlistdelegates.cpp @@ -71,7 +71,7 @@ #include "playlist/playlist.h" #include "playlistdelegates.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; namespace { constexpr int kQueueBoxBorder = 1; diff --git a/src/playlist/playlistlistview.cpp b/src/playlist/playlistlistview.cpp index 9ab1b80ae..af09d69aa 100644 --- a/src/playlist/playlistlistview.cpp +++ b/src/playlist/playlistlistview.cpp @@ -33,7 +33,7 @@ #include "playlistlistview.h" #include "playlist.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; namespace { constexpr int kDragHoverTimeout = 500; diff --git a/src/playlist/playlistmanager.cpp b/src/playlist/playlistmanager.cpp index f4946ee5d..4f03fd38f 100644 --- a/src/playlist/playlistmanager.cpp +++ b/src/playlist/playlistmanager.cpp @@ -61,7 +61,7 @@ #include "playlistparsers/playlistparser.h" #include "dialogs/saveplaylistsdialog.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; class ParserBase; diff --git a/src/playlist/playlisttabbar.cpp b/src/playlist/playlisttabbar.cpp index 1640da5c8..677d7bf86 100644 --- a/src/playlist/playlisttabbar.cpp +++ b/src/playlist/playlisttabbar.cpp @@ -54,7 +54,7 @@ #include "playlistmanager.h" #include "playlisttabbar.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; namespace { constexpr char kSettingsGroup[] = "PlaylistTabBar"; diff --git a/src/playlist/playlistview.cpp b/src/playlist/playlistview.cpp index 18633568a..da88889a5 100644 --- a/src/playlist/playlistview.cpp +++ b/src/playlist/playlistview.cpp @@ -81,7 +81,7 @@ # include "moodbar/moodbaritemdelegate.h" #endif -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; namespace { constexpr int kGlowIntensitySteps = 24; diff --git a/src/playlistparsers/asxiniparser.cpp b/src/playlistparsers/asxiniparser.cpp index ff22c882f..eee51b0c7 100644 --- a/src/playlistparsers/asxiniparser.cpp +++ b/src/playlistparsers/asxiniparser.cpp @@ -31,7 +31,7 @@ #include "parserbase.h" #include "asxiniparser.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; class CollectionBackendInterface; diff --git a/src/playlistparsers/asxiniparser.h b/src/playlistparsers/asxiniparser.h index e0a82274f..25886e49b 100644 --- a/src/playlistparsers/asxiniparser.h +++ b/src/playlistparsers/asxiniparser.h @@ -50,7 +50,7 @@ class AsxIniParser : public ParserBase { bool TryMagic(const QByteArray &data) const override; - SongList Load(QIODevice *device, const QString &playlist_path = ""_L1, const QDir &dir = QDir(), const bool collection_lookup = true) const override; + SongList Load(QIODevice *device, const QString &playlist_path = QLatin1String(""), const QDir &dir = QDir(), const bool collection_lookup = true) const override; void Save(const SongList &songs, QIODevice *device, const QDir &dir = QDir(), const PlaylistSettingsPage::PathType path_type = PlaylistSettingsPage::PathType::Automatic) const override; }; diff --git a/src/playlistparsers/asxparser.cpp b/src/playlistparsers/asxparser.cpp index f18f1d04a..c47d0af09 100644 --- a/src/playlistparsers/asxparser.cpp +++ b/src/playlistparsers/asxparser.cpp @@ -35,7 +35,7 @@ #include "xmlparser.h" #include "asxparser.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; class CollectionBackendInterface; diff --git a/src/playlistparsers/asxparser.h b/src/playlistparsers/asxparser.h index fb3026b12..095ab8357 100644 --- a/src/playlistparsers/asxparser.h +++ b/src/playlistparsers/asxparser.h @@ -52,7 +52,7 @@ class ASXParser : public XMLParser { bool TryMagic(const QByteArray &data) const override; - SongList Load(QIODevice *device, const QString &playlist_path = ""_L1, const QDir &dir = QDir(), const bool collection_lookup = true) const override; + SongList Load(QIODevice *device, const QString &playlist_path = QLatin1String(""), const QDir &dir = QDir(), const bool collection_lookup = true) const override; void Save(const SongList &songs, QIODevice *device, const QDir &dir = QDir(), const PlaylistSettingsPage::PathType path_type = PlaylistSettingsPage::PathType::Automatic) const override; private: diff --git a/src/playlistparsers/cueparser.cpp b/src/playlistparsers/cueparser.cpp index 3b4ab1b00..8e1b8dca9 100644 --- a/src/playlistparsers/cueparser.cpp +++ b/src/playlistparsers/cueparser.cpp @@ -40,7 +40,7 @@ #include "parserbase.h" #include "cueparser.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; class CollectionBackendInterface; diff --git a/src/playlistparsers/cueparser.h b/src/playlistparsers/cueparser.h index b517de628..35c30ed71 100644 --- a/src/playlistparsers/cueparser.h +++ b/src/playlistparsers/cueparser.h @@ -36,8 +36,6 @@ #include "settings/playlistsettingspage.h" #include "parserbase.h" -using namespace Qt::Literals::StringLiterals; - class QIODevice; class CollectionBackendInterface; @@ -57,7 +55,7 @@ class CueParser : public ParserBase { bool TryMagic(const QByteArray &data) const override; - SongList Load(QIODevice *device, const QString &playlist_path = ""_L1, const QDir &dir = QDir(), const bool collection_lookup = true) const override; + SongList Load(QIODevice *device, const QString &playlist_path = QLatin1String(""), const QDir &dir = QDir(), const bool collection_lookup = true) const override; void Save(const SongList &songs, QIODevice *device, const QDir &dir = QDir(), const PlaylistSettingsPage::PathType path_type = PlaylistSettingsPage::PathType::Automatic) const override; static QString FindCueFilename(const QString &filename); diff --git a/src/playlistparsers/m3uparser.cpp b/src/playlistparsers/m3uparser.cpp index f4ad09369..9900a4a86 100644 --- a/src/playlistparsers/m3uparser.cpp +++ b/src/playlistparsers/m3uparser.cpp @@ -35,7 +35,7 @@ #include "parserbase.h" #include "m3uparser.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; class CollectionBackendInterface; diff --git a/src/playlistparsers/m3uparser.h b/src/playlistparsers/m3uparser.h index 048a3b88f..c270d7136 100644 --- a/src/playlistparsers/m3uparser.h +++ b/src/playlistparsers/m3uparser.h @@ -52,7 +52,7 @@ class M3UParser : public ParserBase { bool TryMagic(const QByteArray &data) const override; - SongList Load(QIODevice *device, const QString &playlist_path = ""_L1, const QDir &dir = QDir(), const bool collection_lookup = true) const override; + SongList Load(QIODevice *device, const QString &playlist_path = QLatin1String(""), const QDir &dir = QDir(), const bool collection_lookup = true) const override; void Save(const SongList &songs, QIODevice *device, const QDir &dir = QDir(), const PlaylistSettingsPage::PathType path_type = PlaylistSettingsPage::PathType::Automatic) const override; private: diff --git a/src/playlistparsers/parserbase.cpp b/src/playlistparsers/parserbase.cpp index cb43069ba..51b7d15a1 100644 --- a/src/playlistparsers/parserbase.cpp +++ b/src/playlistparsers/parserbase.cpp @@ -34,7 +34,7 @@ #include "settings/playlistsettingspage.h" #include "parserbase.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; ParserBase::ParserBase(SharedPtr collection_backend, QObject *parent) : QObject(parent), collection_backend_(collection_backend) {} diff --git a/src/playlistparsers/parserbase.h b/src/playlistparsers/parserbase.h index 2a32e1cd6..a0cd2d97f 100644 --- a/src/playlistparsers/parserbase.h +++ b/src/playlistparsers/parserbase.h @@ -36,8 +36,6 @@ #include "core/song.h" #include "settings/playlistsettingspage.h" -using namespace Qt::Literals::StringLiterals; - class QIODevice; class CollectionBackendInterface; @@ -60,7 +58,7 @@ class ParserBase : public QObject { // This method might not return all the songs found in the playlist. // Any playlist parser may decide to leave out some entries if it finds them incomplete or invalid. // This means that the final resulting SongList should be considered valid (at least from the parser's point of view). - virtual SongList Load(QIODevice *device, const QString &playlist_path = ""_L1, const QDir &dir = QDir(), const bool collection_lookup = true) const = 0; + virtual SongList Load(QIODevice *device, const QString &playlist_path = QLatin1String(""), const QDir &dir = QDir(), const bool collection_lookup = true) const = 0; virtual void Save(const SongList &songs, QIODevice *device, const QDir &dir = QDir(), const PlaylistSettingsPage::PathType path_type = PlaylistSettingsPage::PathType::Automatic) const = 0; Q_SIGNALS: diff --git a/src/playlistparsers/playlistparser.cpp b/src/playlistparsers/playlistparser.cpp index d8d9053ce..f95a94aee 100644 --- a/src/playlistparsers/playlistparser.cpp +++ b/src/playlistparsers/playlistparser.cpp @@ -42,7 +42,7 @@ #include "wplparser.h" #include "xspfparser.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; const int PlaylistParser::kMagicSize = 512; diff --git a/src/playlistparsers/plsparser.cpp b/src/playlistparsers/plsparser.cpp index 5da707b88..58d86dc5f 100644 --- a/src/playlistparsers/plsparser.cpp +++ b/src/playlistparsers/plsparser.cpp @@ -34,7 +34,7 @@ #include "parserbase.h" #include "plsparser.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; class CollectionBackendInterface; diff --git a/src/playlistparsers/plsparser.h b/src/playlistparsers/plsparser.h index 429047b83..efca35033 100644 --- a/src/playlistparsers/plsparser.h +++ b/src/playlistparsers/plsparser.h @@ -51,7 +51,7 @@ class PLSParser : public ParserBase { bool TryMagic(const QByteArray &data) const override; - SongList Load(QIODevice *device, const QString &playlist_path = ""_L1, const QDir &dir = QDir(), const bool collection_lookup = true) const override; + SongList Load(QIODevice *device, const QString &playlist_path = QLatin1String(""), const QDir &dir = QDir(), const bool collection_lookup = true) const override; void Save(const SongList &songs, QIODevice *device, const QDir &dir = QDir(), const PlaylistSettingsPage::PathType path_type = PlaylistSettingsPage::PathType::Automatic) const override; }; diff --git a/src/playlistparsers/wplparser.cpp b/src/playlistparsers/wplparser.cpp index d7c2258f5..5167a7758 100644 --- a/src/playlistparsers/wplparser.cpp +++ b/src/playlistparsers/wplparser.cpp @@ -35,7 +35,7 @@ #include "xmlparser.h" #include "wplparser.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; class CollectionBackendInterface; diff --git a/src/playlistparsers/xspfparser.cpp b/src/playlistparsers/xspfparser.cpp index a990709ef..544a4536d 100644 --- a/src/playlistparsers/xspfparser.cpp +++ b/src/playlistparsers/xspfparser.cpp @@ -37,7 +37,7 @@ #include "xmlparser.h" #include "xspfparser.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; class CollectionBackendInterface; diff --git a/src/playlistparsers/xspfparser.h b/src/playlistparsers/xspfparser.h index e65ff35cd..84a3014d1 100644 --- a/src/playlistparsers/xspfparser.h +++ b/src/playlistparsers/xspfparser.h @@ -51,7 +51,7 @@ class XSPFParser : public XMLParser { bool TryMagic(const QByteArray &data) const override; - SongList Load(QIODevice *device, const QString &playlist_path = ""_L1, const QDir &dir = QDir(), const bool collection_lookup = true) const override; + SongList Load(QIODevice *device, const QString &playlist_path = QLatin1String(""), const QDir &dir = QDir(), const bool collection_lookup = true) const override; void Save(const SongList &songs, QIODevice *device, const QDir &dir = QDir(), const PlaylistSettingsPage::PathType path_type = PlaylistSettingsPage::PathType::Automatic) const override; private: diff --git a/src/qobuz/qobuzbaserequest.cpp b/src/qobuz/qobuzbaserequest.cpp index a0780018d..09b1703c0 100644 --- a/src/qobuz/qobuzbaserequest.cpp +++ b/src/qobuz/qobuzbaserequest.cpp @@ -43,7 +43,7 @@ #include "qobuzservice.h" #include "qobuzbaserequest.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; QobuzBaseRequest::QobuzBaseRequest(QobuzService *service, SharedPtr network, QObject *parent) : QObject(parent), diff --git a/src/qobuz/qobuzrequest.cpp b/src/qobuz/qobuzrequest.cpp index d2204dbaa..21af81f4a 100644 --- a/src/qobuz/qobuzrequest.cpp +++ b/src/qobuz/qobuzrequest.cpp @@ -49,7 +49,7 @@ #include "qobuzbaserequest.h" #include "qobuzrequest.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; namespace { constexpr int kMaxConcurrentArtistsRequests = 3; diff --git a/src/qobuz/qobuzservice.cpp b/src/qobuz/qobuzservice.cpp index 2c3846830..601891716 100644 --- a/src/qobuz/qobuzservice.cpp +++ b/src/qobuz/qobuzservice.cpp @@ -60,7 +60,7 @@ #include "settings/settingsdialog.h" #include "settings/qobuzsettingspage.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; using std::make_shared; const Song::Source QobuzService::kSource = Song::Source::Qobuz; diff --git a/src/qobuz/qobuzstreamurlrequest.cpp b/src/qobuz/qobuzstreamurlrequest.cpp index 272ede1a0..e317e3adf 100644 --- a/src/qobuz/qobuzstreamurlrequest.cpp +++ b/src/qobuz/qobuzstreamurlrequest.cpp @@ -43,7 +43,7 @@ #include "qobuzbaserequest.h" #include "qobuzstreamurlrequest.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; QobuzStreamURLRequest::QobuzStreamURLRequest(QobuzService *service, SharedPtr network, const QUrl &media_url, const uint id, QObject *parent) : QobuzBaseRequest(service, network, parent), diff --git a/src/queue/queue.cpp b/src/queue/queue.cpp index 0fbb67b56..1eb9a3532 100644 --- a/src/queue/queue.cpp +++ b/src/queue/queue.cpp @@ -40,7 +40,7 @@ #include "playlist/playlist.h" #include "queue.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; namespace { constexpr char kRowsMimetype[] = "application/x-strawberry-queue-rows"; diff --git a/src/radios/radiomodel.cpp b/src/radios/radiomodel.cpp index 2390c6c85..7fedcb927 100644 --- a/src/radios/radiomodel.cpp +++ b/src/radios/radiomodel.cpp @@ -39,7 +39,7 @@ #include "radiomimedata.h" #include "radiochannel.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; namespace { constexpr int kTreeIconSize = 22; diff --git a/src/radios/radioparadiseservice.cpp b/src/radios/radioparadiseservice.cpp index 021d94d9d..7d30c977d 100644 --- a/src/radios/radioparadiseservice.cpp +++ b/src/radios/radioparadiseservice.cpp @@ -32,7 +32,7 @@ #include "radioparadiseservice.h" #include "radiochannel.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; namespace { constexpr char kApiChannelsUrl[] = "https://api.radioparadise.com/api/list_streams"; diff --git a/src/radios/somafmservice.cpp b/src/radios/somafmservice.cpp index 90c477c9d..081bf68bf 100644 --- a/src/radios/somafmservice.cpp +++ b/src/radios/somafmservice.cpp @@ -36,7 +36,7 @@ #include "somafmservice.h" #include "radiochannel.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; namespace { constexpr char kApiChannelsUrl[] = "https://somafm.com/channels.json"; diff --git a/src/scrobbler/lastfmimport.cpp b/src/scrobbler/lastfmimport.cpp index e74da508f..5dee93a78 100644 --- a/src/scrobbler/lastfmimport.cpp +++ b/src/scrobbler/lastfmimport.cpp @@ -48,7 +48,7 @@ #include "scrobblingapi20.h" #include "lastfmscrobbler.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; namespace { constexpr int kRequestsDelay = 2000; diff --git a/src/scrobbler/listenbrainzscrobbler.cpp b/src/scrobbler/listenbrainzscrobbler.cpp index 77f8337d8..9ab2f0156 100644 --- a/src/scrobbler/listenbrainzscrobbler.cpp +++ b/src/scrobbler/listenbrainzscrobbler.cpp @@ -57,7 +57,7 @@ #include "scrobblemetadata.h" #include "listenbrainzscrobbler.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; const char *ListenBrainzScrobbler::kName = "ListenBrainz"; const char *ListenBrainzScrobbler::kSettingsGroup = "ListenBrainz"; diff --git a/src/scrobbler/scrobblercache.cpp b/src/scrobbler/scrobblercache.cpp index 9407f5e1d..48fba1629 100644 --- a/src/scrobbler/scrobblercache.cpp +++ b/src/scrobbler/scrobblercache.cpp @@ -43,7 +43,7 @@ #include "scrobblercacheitem.h" using namespace std::chrono_literals; -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; using std::make_shared; ScrobblerCache::ScrobblerCache(const QString &filename, QObject *parent) diff --git a/src/scrobbler/scrobblingapi20.cpp b/src/scrobbler/scrobblingapi20.cpp index 735c8a1e3..1bb201bb7 100644 --- a/src/scrobbler/scrobblingapi20.cpp +++ b/src/scrobbler/scrobblingapi20.cpp @@ -61,7 +61,7 @@ #include "scrobblercacheitem.h" #include "scrobblemetadata.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; const char *ScrobblingAPI20::kApiKey = "211990b4c96782c05d1536e7219eb56e"; diff --git a/src/settings/behavioursettingspage.cpp b/src/settings/behavioursettingspage.cpp index 87e1a5d2d..91d26d6a9 100644 --- a/src/settings/behavioursettingspage.cpp +++ b/src/settings/behavioursettingspage.cpp @@ -46,7 +46,7 @@ #include "behavioursettingspage.h" #include "ui_behavioursettingspage.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; class SettingsDialog; diff --git a/src/settings/coverssettingspage.cpp b/src/settings/coverssettingspage.cpp index de520abc1..f3017e16e 100644 --- a/src/settings/coverssettingspage.cpp +++ b/src/settings/coverssettingspage.cpp @@ -46,7 +46,7 @@ #include "covermanager/coverprovider.h" #include "widgets/loginstatewidget.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; const char *CoversSettingsPage::kSettingsGroup = "Covers"; const char *CoversSettingsPage::kProviders = "providers"; diff --git a/src/settings/globalshortcutssettingspage.cpp b/src/settings/globalshortcutssettingspage.cpp index 3b1a11094..acafde807 100644 --- a/src/settings/globalshortcutssettingspage.cpp +++ b/src/settings/globalshortcutssettingspage.cpp @@ -49,7 +49,7 @@ #include "globalshortcutssettingspage.h" #include "ui_globalshortcutssettingspage.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; const char *GlobalShortcutsSettingsPage::kSettingsGroup = "GlobalShortcuts"; diff --git a/src/smartplaylists/smartplaylistsearch.cpp b/src/smartplaylists/smartplaylistsearch.cpp index b18b068c6..b9a724876 100644 --- a/src/smartplaylists/smartplaylistsearch.cpp +++ b/src/smartplaylists/smartplaylistsearch.cpp @@ -28,7 +28,7 @@ #include "smartplaylistsearch.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; SmartPlaylistSearch::SmartPlaylistSearch() : search_type_(SearchType::And), sort_type_(SortType::Random), sort_field_(SmartPlaylistSearchTerm::Field::Title), limit_(-1), first_item_(0) { Reset(); } diff --git a/src/smartplaylists/smartplaylistsearchterm.cpp b/src/smartplaylists/smartplaylistsearchterm.cpp index 789127a71..026fd4519 100644 --- a/src/smartplaylists/smartplaylistsearchterm.cpp +++ b/src/smartplaylists/smartplaylistsearchterm.cpp @@ -29,7 +29,7 @@ #include "smartplaylistsearchterm.h" #include "playlist/playlist.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; SmartPlaylistSearchTerm::SmartPlaylistSearchTerm() : field_(Field::Title), operator_(Operator::Equals), datetype_(DateType::Hour) {} diff --git a/src/smartplaylists/smartplaylistsearchtermwidget.cpp b/src/smartplaylists/smartplaylistsearchtermwidget.cpp index 7ff7e8d9c..69e340019 100644 --- a/src/smartplaylists/smartplaylistsearchtermwidget.cpp +++ b/src/smartplaylists/smartplaylistsearchtermwidget.cpp @@ -41,7 +41,7 @@ #include "smartplaylistsearchtermwidgetoverlay.h" #include "ui_smartplaylistsearchtermwidget.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; SmartPlaylistSearchTermWidget::SmartPlaylistSearchTermWidget(SharedPtr collection_backend, QWidget *parent) : QWidget(parent), diff --git a/src/spotify/spotifybaserequest.cpp b/src/spotify/spotifybaserequest.cpp index a3095e833..38eff02e9 100644 --- a/src/spotify/spotifybaserequest.cpp +++ b/src/spotify/spotifybaserequest.cpp @@ -39,7 +39,7 @@ #include "spotifyservice.h" #include "spotifybaserequest.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; SpotifyBaseRequest::SpotifyBaseRequest(SpotifyService *service, NetworkAccessManager *network, QObject *parent) : QObject(parent), diff --git a/src/spotify/spotifyrequest.cpp b/src/spotify/spotifyrequest.cpp index 829a390b5..3fb677c93 100644 --- a/src/spotify/spotifyrequest.cpp +++ b/src/spotify/spotifyrequest.cpp @@ -45,7 +45,7 @@ #include "spotifybaserequest.h" #include "spotifyrequest.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; namespace { const int kMaxConcurrentArtistsRequests = 1; diff --git a/src/spotify/spotifyservice.cpp b/src/spotify/spotifyservice.cpp index beabc52e2..d2fa30b49 100644 --- a/src/spotify/spotifyservice.cpp +++ b/src/spotify/spotifyservice.cpp @@ -65,7 +65,7 @@ #include "settings/settingsdialog.h" #include "settings/spotifysettingspage.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; const Song::Source SpotifyService::kSource = Song::Source::Spotify; const char SpotifyService::kApiUrl[] = "https://api.spotify.com/v1"; diff --git a/src/streaming/streamingsearchmodel.cpp b/src/streaming/streamingsearchmodel.cpp index 320d3de8b..4955cfe84 100644 --- a/src/streaming/streamingsearchmodel.cpp +++ b/src/streaming/streamingsearchmodel.cpp @@ -37,7 +37,7 @@ #include "streamingsearchmodel.h" #include "streamingsearchview.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; StreamingSearchModel::StreamingSearchModel(StreamingServicePtr service, QObject *parent) : QStandardItemModel(parent), diff --git a/src/streaming/streamingtabsview.cpp b/src/streaming/streamingtabsview.cpp index 59bb0be57..c48c5dc23 100644 --- a/src/streaming/streamingtabsview.cpp +++ b/src/streaming/streamingtabsview.cpp @@ -46,7 +46,7 @@ #include "streamingcollectionviewcontainer.h" #include "ui_streamingtabsview.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; StreamingTabsView::StreamingTabsView(Application *app, StreamingServicePtr service, const QString &settings_group, const SettingsDialog::Page settings_page, QWidget *parent) : QWidget(parent), diff --git a/src/subsonic/subsonicbaserequest.cpp b/src/subsonic/subsonicbaserequest.cpp index 34a004f0c..0c9e893ed 100644 --- a/src/subsonic/subsonicbaserequest.cpp +++ b/src/subsonic/subsonicbaserequest.cpp @@ -45,7 +45,7 @@ #include "settings/subsonicsettingspage.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; SubsonicBaseRequest::SubsonicBaseRequest(SubsonicService *service, QObject *parent) : QObject(parent), diff --git a/src/subsonic/subsonicrequest.cpp b/src/subsonic/subsonicrequest.cpp index 2c48fecdf..4405b162c 100644 --- a/src/subsonic/subsonicrequest.cpp +++ b/src/subsonic/subsonicrequest.cpp @@ -50,7 +50,7 @@ #include "subsonicbaserequest.h" #include "subsonicrequest.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; namespace { constexpr int kMaxConcurrentAlbumsRequests = 3; diff --git a/src/subsonic/subsonicscrobblerequest.cpp b/src/subsonic/subsonicscrobblerequest.cpp index 5cdc480d1..b00a25b7b 100644 --- a/src/subsonic/subsonicscrobblerequest.cpp +++ b/src/subsonic/subsonicscrobblerequest.cpp @@ -35,7 +35,7 @@ #include "subsonicbaserequest.h" #include "subsonicscrobblerequest.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; namespace { constexpr int kMaxConcurrentScrobbleRequests = 3; diff --git a/src/subsonic/subsonicservice.cpp b/src/subsonic/subsonicservice.cpp index 9af5b12d3..22e80eed0 100644 --- a/src/subsonic/subsonicservice.cpp +++ b/src/subsonic/subsonicservice.cpp @@ -60,7 +60,7 @@ #include "settings/settingsdialog.h" #include "settings/subsonicsettingspage.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; using std::make_unique; using std::make_shared; diff --git a/src/tagreader/tagreaderbase.cpp b/src/tagreader/tagreaderbase.cpp index c14b00a64..90fb48aae 100644 --- a/src/tagreader/tagreaderbase.cpp +++ b/src/tagreader/tagreaderbase.cpp @@ -31,7 +31,7 @@ #include "core/logging.h" #include "tagreaderbase.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; TagReaderBase::TagReaderBase() = default; TagReaderBase::~TagReaderBase() = default; diff --git a/src/tagreader/tagreaderclient.cpp b/src/tagreader/tagreaderclient.cpp index 1aa17b812..292f8c23b 100644 --- a/src/tagreader/tagreaderclient.cpp +++ b/src/tagreader/tagreaderclient.cpp @@ -49,7 +49,7 @@ #include "tagreaderloadcoverimagereply.h" using std::dynamic_pointer_cast; -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; TagReaderClient *TagReaderClient::sInstance = nullptr; diff --git a/src/tagreader/tagreadergme.cpp b/src/tagreader/tagreadergme.cpp index 3a8cd8dbe..fda05118a 100644 --- a/src/tagreader/tagreadergme.cpp +++ b/src/tagreader/tagreadergme.cpp @@ -33,7 +33,7 @@ #include "tagreaderbase.h" #include "tagreadertaglib.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; #undef TStringToQString #undef QStringToTString diff --git a/src/tagreader/tagreadertaglib.cpp b/src/tagreader/tagreadertaglib.cpp index 7ffd4135d..8b43ac45d 100644 --- a/src/tagreader/tagreadertaglib.cpp +++ b/src/tagreader/tagreadertaglib.cpp @@ -101,7 +101,7 @@ #include "albumcovertagdata.h" using std::unique_ptr; -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; #undef TStringToQString #undef QStringToTString diff --git a/src/tidal/tidalbaserequest.cpp b/src/tidal/tidalbaserequest.cpp index 9fef9d4bf..8ba39daeb 100644 --- a/src/tidal/tidalbaserequest.cpp +++ b/src/tidal/tidalbaserequest.cpp @@ -40,7 +40,7 @@ #include "tidalservice.h" #include "tidalbaserequest.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; TidalBaseRequest::TidalBaseRequest(TidalService *service, SharedPtr network, QObject *parent) : QObject(parent), diff --git a/src/tidal/tidalfavoriterequest.cpp b/src/tidal/tidalfavoriterequest.cpp index bdc358619..3e968e17f 100644 --- a/src/tidal/tidalfavoriterequest.cpp +++ b/src/tidal/tidalfavoriterequest.cpp @@ -39,7 +39,7 @@ #include "tidalbaserequest.h" #include "tidalfavoriterequest.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; TidalFavoriteRequest::TidalFavoriteRequest(TidalService *service, SharedPtr network, QObject *parent) : TidalBaseRequest(service, network, parent), diff --git a/src/tidal/tidalrequest.cpp b/src/tidal/tidalrequest.cpp index 581b67f78..54c94848c 100644 --- a/src/tidal/tidalrequest.cpp +++ b/src/tidal/tidalrequest.cpp @@ -49,7 +49,7 @@ #include "tidalbaserequest.h" #include "tidalrequest.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; namespace { constexpr char kResourcesUrl[] = "https://resources.tidal.com"; diff --git a/src/tidal/tidalservice.cpp b/src/tidal/tidalservice.cpp index 2378b19f0..13aab995b 100644 --- a/src/tidal/tidalservice.cpp +++ b/src/tidal/tidalservice.cpp @@ -66,7 +66,7 @@ #include "settings/tidalsettingspage.h" using namespace std::chrono_literals; -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; using std::make_shared; const Song::Source TidalService::kSource = Song::Source::Tidal; diff --git a/src/tidal/tidalstreamurlrequest.cpp b/src/tidal/tidalstreamurlrequest.cpp index 117185549..e294ecb4e 100644 --- a/src/tidal/tidalstreamurlrequest.cpp +++ b/src/tidal/tidalstreamurlrequest.cpp @@ -42,7 +42,7 @@ #include "tidalbaserequest.h" #include "tidalstreamurlrequest.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; TidalStreamURLRequest::TidalStreamURLRequest(TidalService *service, SharedPtr network, const QUrl &media_url, const uint id, QObject *parent) : TidalBaseRequest(service, network, parent), diff --git a/src/transcoder/transcodedialog.cpp b/src/transcoder/transcodedialog.cpp index ab52aa28c..d8d93de77 100644 --- a/src/transcoder/transcodedialog.cpp +++ b/src/transcoder/transcodedialog.cpp @@ -67,7 +67,7 @@ #include "ui_transcodedialog.h" #include "ui_transcodelogdialog.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; // winspool.h defines this :( #ifdef AddJob diff --git a/src/transcoder/transcoder.cpp b/src/transcoder/transcoder.cpp index 561b59694..482b01d8c 100644 --- a/src/transcoder/transcoder.cpp +++ b/src/transcoder/transcoder.cpp @@ -48,7 +48,7 @@ #include "core/settings.h" #include "transcoder.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; using std::make_shared; int Transcoder::JobFinishedEvent::sEventType = -1; diff --git a/src/transcoder/transcoder.h b/src/transcoder/transcoder.h index 0d12cbd75..45de3a441 100644 --- a/src/transcoder/transcoder.h +++ b/src/transcoder/transcoder.h @@ -39,8 +39,6 @@ #include "core/shared_ptr.h" #include "core/song.h" -using namespace Qt::Literals::StringLiterals; - struct TranscoderPreset { explicit TranscoderPreset() : filetype_(Song::FileType::Unknown) {} TranscoderPreset(const Song::FileType filetype, const QString &name, const QString &extension, const QString &codec_mimetype, const QString &muxer_mimetype_ = QString()); @@ -57,7 +55,7 @@ class Transcoder : public QObject { Q_OBJECT public: - explicit Transcoder(QObject *parent = nullptr, const QString &settings_postfix = ""_L1); + explicit Transcoder(QObject *parent = nullptr, const QString &settings_postfix = QLatin1String("")); static TranscoderPreset PresetForFileType(const Song::FileType filetype); static QList GetAllPresets(); diff --git a/src/utilities/coverutils.cpp b/src/utilities/coverutils.cpp index b9a029f61..0e6ad81e3 100644 --- a/src/utilities/coverutils.cpp +++ b/src/utilities/coverutils.cpp @@ -31,7 +31,7 @@ #include "coverutils.h" #include "core/logging.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; QByteArray CoverUtils::Sha1CoverHash(const QString &artist, const QString &album) { diff --git a/src/utilities/envutils.cpp b/src/utilities/envutils.cpp index bc1b51ccf..46b668854 100644 --- a/src/utilities/envutils.cpp +++ b/src/utilities/envutils.cpp @@ -26,7 +26,7 @@ #include "envutils.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; namespace Utilities { diff --git a/src/utilities/filemanagerutils.cpp b/src/utilities/filemanagerutils.cpp index 0b7098b18..bcca3aea6 100644 --- a/src/utilities/filemanagerutils.cpp +++ b/src/utilities/filemanagerutils.cpp @@ -34,7 +34,7 @@ #include "filemanagerutils.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; namespace Utilities { diff --git a/src/utilities/macaddrutils.cpp b/src/utilities/macaddrutils.cpp index 1c7ec45ed..9e5c9eed3 100644 --- a/src/utilities/macaddrutils.cpp +++ b/src/utilities/macaddrutils.cpp @@ -23,7 +23,7 @@ #include "macaddrutils.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; namespace Utilities { diff --git a/src/utilities/strutils.cpp b/src/utilities/strutils.cpp index f3d4b4afe..d315bbe61 100644 --- a/src/utilities/strutils.cpp +++ b/src/utilities/strutils.cpp @@ -27,7 +27,7 @@ #include "strutils.h" #include "core/song.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; namespace Utilities { diff --git a/src/widgets/fancytabbar.cpp b/src/widgets/fancytabbar.cpp index f8e0b67a5..9cd21762a 100644 --- a/src/widgets/fancytabbar.cpp +++ b/src/widgets/fancytabbar.cpp @@ -37,7 +37,7 @@ #include "fancytabwidget.h" #include "fancytabdata.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; namespace { constexpr int TabSize_LargeSidebarMinWidth = 70; diff --git a/src/widgets/fancytabwidget.cpp b/src/widgets/fancytabwidget.cpp index e208411c0..c2fe4ab91 100644 --- a/src/widgets/fancytabwidget.cpp +++ b/src/widgets/fancytabwidget.cpp @@ -49,7 +49,7 @@ #include "settings/appearancesettingspage.h" using namespace std::chrono_literals; -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; namespace { constexpr int IconSize_LargeSidebar = 40; diff --git a/src/widgets/multiloadingindicator.cpp b/src/widgets/multiloadingindicator.cpp index daec78e72..b7cbea23a 100644 --- a/src/widgets/multiloadingindicator.cpp +++ b/src/widgets/multiloadingindicator.cpp @@ -34,7 +34,7 @@ #include "multiloadingindicator.h" #include "widgets/busyindicator.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; namespace { constexpr int kVerticalPadding = 4; diff --git a/src/widgets/playingwidget.cpp b/src/widgets/playingwidget.cpp index 008d374d7..eec2da735 100644 --- a/src/widgets/playingwidget.cpp +++ b/src/widgets/playingwidget.cpp @@ -45,7 +45,7 @@ #include "covermanager/albumcoverchoicecontroller.h" #include "playingwidget.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; using std::make_unique; namespace { diff --git a/tests/src/collectionbackend_test.cpp b/tests/src/collectionbackend_test.cpp index 5fc6c4d0c..eb2729bbc 100644 --- a/tests/src/collectionbackend_test.cpp +++ b/tests/src/collectionbackend_test.cpp @@ -36,7 +36,7 @@ #include "collection/collectionbackend.h" #include "collection/collection.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; using std::make_unique; using std::make_shared; diff --git a/tests/src/collectionmodel_test.cpp b/tests/src/collectionmodel_test.cpp index 78c68b974..daaf6241a 100644 --- a/tests/src/collectionmodel_test.cpp +++ b/tests/src/collectionmodel_test.cpp @@ -39,7 +39,7 @@ #include "collection/collectionmodel.h" #include "collection/collectionfilter.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; using std::make_unique; using std::make_shared; diff --git a/tests/src/organizeformat_test.cpp b/tests/src/organizeformat_test.cpp index 65f491c39..c032547e5 100644 --- a/tests/src/organizeformat_test.cpp +++ b/tests/src/organizeformat_test.cpp @@ -29,7 +29,7 @@ #include -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; // clazy:excludeall=returning-void-expression diff --git a/tests/src/tagreader_test.cpp b/tests/src/tagreader_test.cpp index b4cf4a751..8616986fa 100644 --- a/tests/src/tagreader_test.cpp +++ b/tests/src/tagreader_test.cpp @@ -35,7 +35,7 @@ #include "test_utils.h" using std::make_shared; -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; // clazy:excludeall=non-pod-global-static diff --git a/tests/src/utilities_test.cpp b/tests/src/utilities_test.cpp index 01e0888de..17803d09b 100644 --- a/tests/src/utilities_test.cpp +++ b/tests/src/utilities_test.cpp @@ -38,7 +38,7 @@ #include "core/logging.h" #include "core/temporaryfile.h" -using namespace Qt::StringLiterals; +using namespace Qt::Literals::StringLiterals; TEST(UtilitiesTest, PrettyTimeDelta) {