From 99419f9a8265221faab895f8f7d9b500b1789f4e Mon Sep 17 00:00:00 2001 From: xerus2000 <27jf@pm.me> Date: Thu, 13 Aug 2020 13:47:36 +0200 Subject: Use #pragma once everywhere --- src/library/dao/analysisdao.h | 5 +---- src/library/dao/libraryhashdao.h | 5 +---- src/library/dao/playlistdao.h | 5 +---- src/library/dao/trackdao.h | 5 +---- 4 files changed, 4 insertions(+), 16 deletions(-) (limited to 'src/library/dao') 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 #include @@ -67,5 +66,3 @@ class AnalysisDao : public DAO { const UserSettingsPointer m_pConfig; }; - -#endif // ANALYSISDAO_H 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 #include @@ -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.h b/src/library/dao/playlistdao.h index fba4602c3e..6062c19a15 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 #include @@ -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.h b/src/library/dao/trackdao.h index 76d0721aeb..6af30b65d3 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 #include @@ -178,5 +177,3 @@ class TrackDAO : public QObject, public virtual DAO, public virtual GlobalTrackC }; Q_DECLARE_OPERATORS_FOR_FLAGS(TrackDAO::ResolveTrackIdFlags) - -#endif //TRACKDAO_H -- cgit v1.2.3 From 59a2a7d90a02e92f3895f6712d989355719013b2 Mon Sep 17 00:00:00 2001 From: xerus2000 <27jf@pm.me> Date: Thu, 13 Aug 2020 14:18:17 +0200 Subject: Remove filename headers --- src/library/dao/cuedao.cpp | 3 --- 1 file changed, 3 deletions(-) (limited to 'src/library/dao') diff --git a/src/library/dao/cuedao.cpp b/src/library/dao/cuedao.cpp index f8c8740f6d..bc48e3ae79 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 -- cgit v1.2.3 From 6bac62651147ff2a902347522a629aea13d81f17 Mon Sep 17 00:00:00 2001 From: Jan Holthuis Date: Wed, 2 Dec 2020 21:17:16 +0100 Subject: Delete trailing/leading blank lines --- src/library/dao/libraryhashdao.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'src/library/dao') 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 #include #include -- cgit v1.2.3 From e77124c39828cbc120f6bf566db084869a04b42d Mon Sep 17 00:00:00 2001 From: Daniel Poelzleithner Date: Mon, 7 Dec 2020 12:10:56 +0100 Subject: Slimdown moc_compilation.cpp The moc_compilation file became unbearable large, easily taking 10 minutes to compile whenever a Q_OBJECT changes. AUTOMOC scans for _moc.cpp includes and does not add the file to the moc_compilation whenever it is included in the propper cpp file. After this patch, moc_compilation.cpp is empty and the mocs are compiled with the approptial cpp, increasing recompile speeds by a factor of 10 when just a header file changed. --- src/library/dao/autodjcratesdao.cpp | 2 ++ src/library/dao/playlistdao.cpp | 2 ++ src/library/dao/trackdao.cpp | 1 + 3 files changed, 5 insertions(+) (limited to 'src/library/dao') diff --git a/src/library/dao/autodjcratesdao.cpp b/src/library/dao/autodjcratesdao.cpp index 90c745f91c..149e7a1e89 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 #endif diff --git a/src/library/dao/playlistdao.cpp b/src/library/dao/playlistdao.cpp index 34e1368755..8a0248717f 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 #endif diff --git a/src/library/dao/trackdao.cpp b/src/library/dao/trackdao.cpp index e51ee5fbfd..2888750d14 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" -- cgit v1.2.3 From 63b858b5d827797eec959d009ad0b970de167dc5 Mon Sep 17 00:00:00 2001 From: Jan Holthuis Date: Tue, 15 Dec 2020 00:09:51 +0100 Subject: Add missing namespace comments --- src/library/dao/trackdao.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/library/dao') diff --git a/src/library/dao/trackdao.cpp b/src/library/dao/trackdao.cpp index 2888750d14..1f5020bb7c 100644 --- a/src/library/dao/trackdao.cpp +++ b/src/library/dao/trackdao.cpp @@ -1574,7 +1574,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 -- cgit v1.2.3 From 0471998e13aada9a76e92b13ab3885c2d1c2fb84 Mon Sep 17 00:00:00 2001 From: Jan Holthuis Date: Tue, 15 Dec 2020 01:05:33 +0100 Subject: Add missing braces around single-line statements --- src/library/dao/autodjcratesdao.cpp | 3 ++- src/library/dao/playlistdao.cpp | 9 ++++++--- src/library/dao/trackdao.cpp | 8 ++++++-- 3 files changed, 14 insertions(+), 6 deletions(-) (limited to 'src/library/dao') diff --git a/src/library/dao/autodjcratesdao.cpp b/src/library/dao/autodjcratesdao.cpp index 149e7a1e89..02bacbca90 100644 --- a/src/library/dao/autodjcratesdao.cpp +++ b/src/library/dao/autodjcratesdao.cpp @@ -199,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; diff --git a/src/library/dao/playlistdao.cpp b/src/library/dao/playlistdao.cpp index 8a0248717f..69f572a2e8 100644 --- a/src/library/dao/playlistdao.cpp +++ b/src/library/dao/playlistdao.cpp @@ -519,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); @@ -852,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; + } } } } @@ -1014,8 +1016,9 @@ void PlaylistDAO::shuffleTracks(const int playlistId, const QList& 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/trackdao.cpp b/src/library/dao/trackdao.cpp index 1f5020bb7c..9b66cb4341 100644 --- a/src/library/dao/trackdao.cpp +++ b/src/library/dao/trackdao.cpp @@ -1127,10 +1127,14 @@ bool setTrackCoverInfo(const QSqlRecord& record, const int column, bool ok = false; coverInfo.source = static_cast( record.value(column).toInt(&ok)); - if (!ok) coverInfo.source = CoverInfo::UNKNOWN; + if (!ok) { + coverInfo.source = CoverInfo::UNKNOWN; + } coverInfo.type = static_cast( 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); -- cgit v1.2.3 From 73c750df852e7b6336154acd65bd39de975feadc Mon Sep 17 00:00:00 2001 From: Jan Holthuis Date: Tue, 15 Dec 2020 01:43:38 +0100 Subject: Replace null pointer constants (e.g. NULL, 0) with nullptr --- src/library/dao/analysisdao.cpp | 2 +- src/library/dao/autodjcratesdao.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/library/dao') 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::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/autodjcratesdao.cpp b/src/library/dao/autodjcratesdao.cpp index 02bacbca90..fd0a702eeb 100644 --- a/src/library/dao/autodjcratesdao.cpp +++ b/src/library/dao/autodjcratesdao.cpp @@ -1078,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; } -- cgit v1.2.3