Merge branch '2.3' into column-cache-fix

10 files changed, 26 insertions, 29 deletions

diff --git a/src/library/dao/analysisdao.cpp b/src/library/dao/analysisdao.cpp
index ff7ca74783..1e8d2faa2d 100644
--- a/src/library/dao/analysisdao.cpp
+++ b/src/library/dao/analysisdao.cpp
@@ -103,7 +103,7 @@ QList<AnalysisDao::AnalysisInfo> AnalysisDao::loadAnalysesFromQuery(TrackId trac
 }
 
 bool AnalysisDao::saveAnalysis(AnalysisDao::AnalysisInfo* info) {
-    if (!m_database.isOpen() || info == NULL) {
+    if (!m_database.isOpen() || info == nullptr) {
         return false;
     }
 
diff --git a/src/library/dao/analysisdao.h b/src/library/dao/analysisdao.h
index 3a7992832d..1519b30f22 100644
--- a/src/library/dao/analysisdao.h
+++ b/src/library/dao/analysisdao.h
@@ -1,5 +1,4 @@
-#ifndef ANALYSISDAO_H
-#define ANALYSISDAO_H
+#pragma once
 
 #include <QObject>
 #include <QDir>
@@ -67,5 +66,3 @@ class AnalysisDao : public DAO {
 
     const UserSettingsPointer m_pConfig;
 };
-
-#endif // ANALYSISDAO_H
diff --git a/src/library/dao/autodjcratesdao.cpp b/src/library/dao/autodjcratesdao.cpp
index 90c745f91c..fd0a702eeb 100644
--- a/src/library/dao/autodjcratesdao.cpp
+++ b/src/library/dao/autodjcratesdao.cpp
@@ -1,5 +1,7 @@
 #include "library/dao/autodjcratesdao.h"
 
+#include "moc_autodjcratesdao.cpp"
+
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0))
 #include <QRandomGenerator>
 #endif
@@ -197,8 +199,9 @@ void AutoDJCratesDAO::createAndConnectAutoDjCratesDatabase() {
                  PLAYLISTTABLE_HIDDEN, // %2
                  QString::number(PlaylistDAO::PLHT_SET_LOG))); // %3
     if (oQuery.exec()) {
-        while (oQuery.next())
+        while (oQuery.next()) {
             m_lstSetLogPlaylistIds.append(oQuery.value(0).toInt());
+        }
     } else {
         LOG_FAILED_QUERY(oQuery);
         return;
@@ -1075,7 +1078,7 @@ void AutoDJCratesDAO::slotPlaylistTrackRemoved(int playlistId,
 void AutoDJCratesDAO::slotPlayerInfoTrackLoaded(const QString& a_strGroup,
         TrackPointer a_pTrack) {
     // This gets called with a null track during an unload.  Filter that out.
-    if (a_pTrack == NULL) {
+    if (a_pTrack == nullptr) {
         return;
     }
 
diff --git a/src/library/dao/cuedao.cpp b/src/library/dao/cuedao.cpp
index a65d08711f..7405303739 100644
--- a/src/library/dao/cuedao.cpp
+++ b/src/library/dao/cuedao.cpp
@@ -1,6 +1,3 @@
-// cuedao.cpp
-// Created 10/26/2009 by RJ Ryan (rryan@mit.edu)
-
 #include "library/dao/cuedao.h"
 
 #include <QVariant>
diff --git a/src/library/dao/libraryhashdao.cpp b/src/library/dao/libraryhashdao.cpp
index 32cc824cb0..4e0e1347e9 100644
--- a/src/library/dao/libraryhashdao.cpp
+++ b/src/library/dao/libraryhashdao.cpp
@@ -1,4 +1,3 @@
-
 #include <QtSql>
 #include <QString>
 #include <QtDebug>
diff --git a/src/library/dao/libraryhashdao.h b/src/library/dao/libraryhashdao.h
index e3e4b4bf47..0f16cefa5b 100644
--- a/src/library/dao/libraryhashdao.h
+++ b/src/library/dao/libraryhashdao.h
@@ -1,5 +1,4 @@
-#ifndef LIBRARYHASHDAO_H
-#define LIBRARYHASHDAO_H
+#pragma once
 
 #include <QObject>
 #include <QHash>
@@ -26,5 +25,3 @@ class LibraryHashDAO : public DAO {
                                  const bool deleted, const bool verified);
     QStringList getDeletedDirectories();
 };
-
-#endif //LIBRARYHASHDAO_H
diff --git a/src/library/dao/playlistdao.cpp b/src/library/dao/playlistdao.cpp
index 34e1368755..69f572a2e8 100644
--- a/src/library/dao/playlistdao.cpp
+++ b/src/library/dao/playlistdao.cpp
@@ -1,5 +1,7 @@
 #include "library/dao/playlistdao.h"
 
+#include "moc_playlistdao.cpp"
+
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0))
 #include <QRandomGenerator>
 #endif
@@ -517,8 +519,9 @@ void PlaylistDAO::removeTracksFromPlaylistInner(int playlistId, int position) {
 
 
 bool PlaylistDAO::insertTrackIntoPlaylist(TrackId trackId, const int playlistId, int position) {
-    if (playlistId < 0 || !trackId.isValid() || position < 0)
+    if (playlistId < 0 || !trackId.isValid() || position < 0) {
         return false;
+    }
 
     ScopedTransaction transaction(m_database);
 
@@ -850,8 +853,9 @@ void PlaylistDAO::searchForDuplicateTrack(const int fromPosition,
                 pos != excludePosition) {
             int tempTrackDistance =
                     (otherTrackPosition - pos) * (otherTrackPosition - pos);
-            if (tempTrackDistance < *pTrackDistance || *pTrackDistance == -1)
+            if (tempTrackDistance < *pTrackDistance || *pTrackDistance == -1) {
                 *pTrackDistance = tempTrackDistance;
+            }
         }
     }
 }
@@ -1012,8 +1016,9 @@ void PlaylistDAO::shuffleTracks(const int playlistId, const QList<int>& position
                                  QString::number(-1),
                                  QString::number(playlistId)));
 
-        if (query.lastError().isValid())
+        if (query.lastError().isValid()) {
             qDebug() << query.lastError();
+        }
     }
 
     transaction.commit();
diff --git a/src/library/dao/playlistdao.h b/src/library/dao/playlistdao.h
index d161706bb1..2d4fcabeb4 100644
--- a/src/library/dao/playlistdao.h
+++ b/src/library/dao/playlistdao.h
@@ -1,5 +1,4 @@
-#ifndef PLAYLISTDAO_H
-#define PLAYLISTDAO_H
+#pragma once
 
 #include <QHash>
 #include <QObject>
@@ -146,5 +145,3 @@ class PlaylistDAO : public QObject, public virtual DAO {
     AutoDJProcessor* m_pAutoDJProcessor;
     DISALLOW_COPY_AND_ASSIGN(PlaylistDAO);
 };
-
-#endif //PLAYLISTDAO_H
diff --git a/src/library/dao/trackdao.cpp b/src/library/dao/trackdao.cpp
index e51ee5fbfd..9b66cb4341 100644
--- a/src/library/dao/trackdao.cpp
+++ b/src/library/dao/trackdao.cpp
@@ -18,6 +18,7 @@
 #include "library/dao/playlistdao.h"
 #include "library/dao/trackschema.h"
 #include "library/queryutil.h"
+#include "moc_trackdao.cpp"
 #include "sources/soundsourceproxy.h"
 #include "track/beatfactory.h"
 #include "track/beats.h"
@@ -1126,10 +1127,14 @@ bool setTrackCoverInfo(const QSqlRecord& record, const int column,
     bool ok = false;
     coverInfo.source = static_cast<CoverInfo::Source>(
             record.value(column).toInt(&ok));
-    if (!ok) coverInfo.source = CoverInfo::UNKNOWN;
+    if (!ok) {
+        coverInfo.source = CoverInfo::UNKNOWN;
+    }
     coverInfo.type = static_cast<CoverInfo::Type>(
             record.value(column + 1).toInt(&ok));
-    if (!ok) coverInfo.type = CoverInfo::NONE;
+    if (!ok) {
+        coverInfo.type = CoverInfo::NONE;
+    }
     coverInfo.coverLocation = record.value(column + 2).toString();
     coverInfo.hash = record.value(column + 3).toUInt();
     pTrack->setCoverInfo(coverInfo);
@@ -1573,7 +1578,7 @@ namespace {
         }
         return matchLength;
     }
-}
+    } // namespace
 
 // Look for moved files. Look for files that have been marked as
 // "deleted on disk" and see if another "file" with the same name and
diff --git a/src/library/dao/trackdao.h b/src/library/dao/trackdao.h
index 9df042b977..18582cc967 100644
--- a/src/library/dao/trackdao.h
+++ b/src/library/dao/trackdao.h
@@ -1,5 +1,4 @@
-#ifndef TRACKDAO_H
-#define TRACKDAO_H
+#pragma once
 
 #include <QFileInfo>
 #include <QObject>
@@ -178,5 +177,3 @@ class TrackDAO : public QObject, public virtual DAO, public virtual GlobalTrackC
 };
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(TrackDAO::ResolveTrackIdFlags)
-
-#endif //TRACKDAO_H