clang-format

xeruf · May 27, 2020 · 4f032f7 · 4f032f7
1 parent 9eb5ec6
commit 4f032f7
Show file tree

Hide file tree

Showing 25 changed files with 453 additions and 355 deletions.
diff --git a/src/library/autodj/autodjfeature.cpp b/src/library/autodj/autodjfeature.cpp
@@ -2,20 +2,20 @@
 // FORK FORK FORK on 11/1/2009 by Albert Santoni (alberts@mixxx.org)
 // Created 8/23/2009 by RJ Ryan (rryan@mit.edu)
 
-#include <QtDebug>
-#include <QMetaObject>
-#include <QMenu>
-
 #include "library/autodj/autodjfeature.h"
 
+#include <QMenu>
+#include <QMetaObject>
+#include <QtDebug>
+
 #include "controllers/keyboard/keyboardeventfilter.h"
 #include "library/autodj/autodjprocessor.h"
 #include "library/autodj/dlgautodj.h"
-#include "library/trackset/crate/cratestorage.h"
 #include "library/library.h"
 #include "library/parser.h"
 #include "library/trackcollection.h"
 #include "library/trackcollectionmanager.h"
+#include "library/trackset/crate/cratestorage.h"
 #include "library/treeitem.h"
 #include "mixer/playermanager.h"
 #include "sources/soundsourceproxy.h"

diff --git a/src/library/autodj/autodjfeature.h b/src/library/autodj/autodjfeature.h
@@ -5,22 +5,22 @@
 #ifndef AUTODJFEATURE_H
 #define AUTODJFEATURE_H
 
-#include <QObject>
-#include <QStringListModel>
-#include <QVariant>
+#include <QAction>
 #include <QIcon>
-#include <QUrl>
 #include <QList>
 #include <QModelIndex>
+#include <QObject>
 #include <QPoint>
-#include <QAction>
 #include <QPointer>
+#include <QStringListModel>
+#include <QUrl>
+#include <QVariant>
 
+#include "library/dao/autodjcratesdao.h"
 #include "library/libraryfeature.h"
-#include "preferences/usersettings.h"
-#include "library/treeitemmodel.h"
 #include "library/trackset/crate/crate.h"
-#include "library/dao/autodjcratesdao.h"
+#include "library/treeitemmodel.h"
+#include "preferences/usersettings.h"
 
 class DlgAutoDJ;
 class Library;

diff --git a/src/library/banshee/bansheeplaylistmodel.cpp b/src/library/banshee/bansheeplaylistmodel.cpp
@@ -195,7 +195,11 @@ void BansheePlaylistModel::setTableModel(int playlistId) {
             << CLM_COMPOSER;
 
     QSharedPointer<BaseTrackCache> trackSource(
-            new BaseTrackCache(m_pTrackCollectionManager->internalCollection(), m_tempTableName, CLM_TRACK_ID, trackSourceColumns, false));
+            new BaseTrackCache(m_pTrackCollectionManager->internalCollection(),
+                    m_tempTableName,
+                    CLM_TRACK_ID,
+                    trackSourceColumns,
+                    false));
 
     setTable(m_tempTableName, CLM_TRACK_ID, tableColumns, trackSource);
     setSearch("");

diff --git a/src/library/browse/browsetablemodel.cpp b/src/library/browse/browsetablemodel.cpp
@@ -159,10 +159,11 @@ TrackPointer BrowseTableModel::getTrack(const QModelIndex& index) const {
 
 TrackPointer BrowseTableModel::getTrackByRef(const TrackRef& trackRef) const {
     if (m_pRecordingManager->getRecordingLocation() == trackRef.getLocation()) {
-        QMessageBox::critical(
-                0,
+        QMessageBox::critical(0,
                 tr("Mixxx Library"),
-                tr("Could not load the following file because it is in use by Mixxx or another application.") + "\n" + trackRef.getLocation());
+                tr("Could not load the following file because it is in use by "
+                   "Mixxx or another application.") +
+                        "\n" + trackRef.getLocation());
         return TrackPointer();
     }
     // NOTE(uklotzde, 2015-12-08): Accessing tracks from the browse view

diff --git a/src/library/dao/autodjcratesdao.cpp b/src/library/dao/autodjcratesdao.cpp
@@ -1,16 +1,16 @@
+#include "library/dao/autodjcratesdao.h"
+
 #include <QtDebug>
 #include <QtSql>
 
-#include "library/dao/autodjcratesdao.h"
-
-#include "mixer/playerinfo.h"
-#include "mixer/playermanager.h"
-#include "library/trackset/crate/crateschema.h"
 #include "library/dao/settingsdao.h"
 #include "library/dao/trackdao.h"
 #include "library/dao/trackschema.h"
 #include "library/queryutil.h"
 #include "library/trackcollection.h"
+#include "library/trackset/crate/crateschema.h"
+#include "mixer/playerinfo.h"
+#include "mixer/playermanager.h"
 
 #define AUTODJCRATESTABLE_TRACKID "track_id"
 #define AUTODJCRATESTABLE_CRATEREFS "craterefs"

diff --git a/src/library/dao/autodjcratesdao.h b/src/library/dao/autodjcratesdao.h
@@ -4,8 +4,8 @@
 #include <QObject>
 #include <QSqlDatabase>
 
-#include "preferences/usersettings.h"
 #include "library/trackset/crate/crateid.h"
+#include "preferences/usersettings.h"
 #include "track/track.h"
 #include "util/class.h"
 

diff --git a/src/library/dao/playlistdao.cpp b/src/library/dao/playlistdao.cpp
@@ -876,7 +876,9 @@ void PlaylistDAO::searchForDuplicateTrack(const int fromPosition,
     }
 }
 
-void PlaylistDAO::shuffleTracks(const int playlistId, const QList<int>& positions, const QHash<int, TrackId>& allIds) {
+void PlaylistDAO::shuffleTracks(const int playlistId,
+        const QList<int>& positions,
+        const QHash<int, TrackId>& allIds) {
     ScopedTransaction transaction(m_database);
     QSqlQuery query(m_database);
 

diff --git a/src/library/dao/trackdao.cpp b/src/library/dao/trackdao.cpp
@@ -1,43 +1,42 @@
 #include "library/dao/trackdao.h"
 
-#include <QtDebug>
+#include <QChar>
 #include <QDir>
 #include <QDirIterator>
 #include <QFileInfo>
-#include <QtSql>
 #include <QImage>
 #include <QRegExp>
-#include <QChar>
+#include <QtDebug>
+#include <QtSql>
 
-#include "sources/soundsourceproxy.h"
-#include "track/track.h"
-#include "library/queryutil.h"
-#include "util/db/sqlstringformatter.h"
-#include "util/db/sqllikewildcards.h"
-#include "util/db/sqllikewildcardescaper.h"
-#include "util/db/sqltransaction.h"
 #include "library/coverart.h"
 #include "library/coverartutils.h"
-#include "library/dao/trackschema.h"
-#include "library/trackset/crate/cratestorage.h"
-#include "library/dao/cuedao.h"
-#include "library/dao/playlistdao.h"
 #include "library/dao/analysisdao.h"
+#include "library/dao/cuedao.h"
 #include "library/dao/libraryhashdao.h"
+#include "library/dao/playlistdao.h"
+#include "library/dao/trackschema.h"
+#include "library/queryutil.h"
+#include "library/trackset/crate/cratestorage.h"
+#include "sources/soundsourceproxy.h"
 #include "track/beatfactory.h"
 #include "track/beats.h"
+#include "track/globaltrackcache.h"
 #include "track/keyfactory.h"
 #include "track/keyutils.h"
-#include "track/globaltrackcache.h"
+#include "track/track.h"
 #include "track/tracknumbers.h"
 #include "util/assert.h"
 #include "util/compatibility.h"
 #include "util/datetime.h"
+#include "util/db/sqllikewildcardescaper.h"
+#include "util/db/sqllikewildcards.h"
+#include "util/db/sqlstringformatter.h"
+#include "util/db/sqltransaction.h"
 #include "util/file.h"
 #include "util/logger.h"
-#include "util/timer.h"
 #include "util/math.h"
-
+#include "util/timer.h"
 
 namespace {
 

diff --git a/src/library/hiddentablemodel.cpp b/src/library/hiddentablemodel.cpp
@@ -38,7 +38,10 @@ void HiddenTableModel::setTableModel() {
 
     QStringList tableColumns;
     tableColumns << LIBRARYTABLE_ID;
-    setTable(tableName, LIBRARYTABLE_ID, tableColumns, m_pTrackCollectionManager->internalCollection()->getTrackSource());
+    setTable(tableName,
+            LIBRARYTABLE_ID,
+            tableColumns,
+            m_pTrackCollectionManager->internalCollection()->getTrackSource());
     setDefaultSort(fieldIndex("artist"), Qt::AscendingOrder);
     setSearch("");
 }