Merge branch '2.3' of github.com:mixxxdj/mixxx into main

2 files changed, 5 insertions, 5 deletions

diff --git a/src/library/banshee/bansheefeature.cpp b/src/library/banshee/bansheefeature.cpp
index faed634666..182cee18f6 100644
--- a/src/library/banshee/bansheefeature.cpp
+++ b/src/library/banshee/bansheefeature.cpp
@@ -72,19 +72,19 @@ void BansheeFeature::activate() {
 
         if (!QFile::exists(m_databaseFile)) {
             QMessageBox::warning(
-                    NULL,
+                    nullptr,
                     tr("Error loading Banshee database"),
                     tr("Banshee database file not found at\n") +
-                    m_databaseFile);
+                            m_databaseFile);
             qDebug() << m_databaseFile << "does not exist";
         }
 
         if (!m_connection.open(m_databaseFile)) {
             QMessageBox::warning(
-                    NULL,
+                    nullptr,
                     tr("Error loading Banshee database"),
                     tr("There was an error loading your Banshee database at\n") +
-                    m_databaseFile);
+                            m_databaseFile);
             return;
         }
 
diff --git a/src/library/banshee/bansheeplaylistmodel.cpp b/src/library/banshee/bansheeplaylistmodel.cpp
index 3633d2ae83..be7f8c85d3 100644
--- a/src/library/banshee/bansheeplaylistmodel.cpp
+++ b/src/library/banshee/bansheeplaylistmodel.cpp
@@ -39,7 +39,7 @@ namespace {
 
 QAtomicInt sTableNumber;
 
-}
+} // namespace
 
 BansheePlaylistModel::BansheePlaylistModel(QObject* pParent, TrackCollectionManager* pTrackCollectionManager, BansheeDbConnection* pConnection)
         : BaseSqlTableModel(pParent, pTrackCollectionManager, "mixxx.db.model.banshee_playlist"),