Merge pull request mixxxdj#12956 from ronso0/lib-src-subdirectories

src/library: sort files into sub-directories

CMakeLists.txt

@@ -888,8 +888,10 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL
   src/engine/sync/internalclock.cpp
   src/engine/sync/synccontrol.cpp
   src/errordialoghandler.cpp
-  src/library/analysisfeature.cpp
-  src/library/analysislibrarytablemodel.cpp
+  src/library/analysis/analysisfeature.cpp
+  src/library/analysis/analysislibrarytablemodel.cpp
+  src/library/analysis/dlganalysis.cpp
+  src/library/analysis/dlganalysis.ui
   src/library/autodj/autodjfeature.cpp
   src/library/autodj/autodjprocessor.cpp
   src/library/autodj/dlgautodj.cpp
@@ -903,16 +905,13 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL
   src/library/basesqltablemodel.cpp
   src/library/basetrackcache.cpp
   src/library/basetracktablemodel.cpp
-  src/library/bpmdelegate.cpp
   src/library/browse/browsefeature.cpp
   src/library/browse/browsetablemodel.cpp
   src/library/browse/browsethread.cpp
   src/library/browse/foldertreemodel.cpp
-  src/library/colordelegate.cpp
   src/library/columncache.cpp
   src/library/coverart.cpp
   src/library/coverartcache.cpp
-  src/library/coverartdelegate.cpp
   src/library/coverartutils.cpp
   src/library/dao/analysisdao.cpp
   src/library/dao/autodjcratesdao.cpp
@@ -923,14 +922,8 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL
   src/library/dao/settingsdao.cpp
   src/library/dao/trackdao.cpp
   src/library/dao/trackschema.cpp
-  src/library/dlganalysis.cpp
-  src/library/dlganalysis.ui
   src/library/dlgcoverartfullsize.cpp
   src/library/dlgcoverartfullsize.ui
-  src/library/dlghidden.cpp
-  src/library/dlghidden.ui
-  src/library/dlgmissing.cpp
-  src/library/dlgmissing.ui
   src/library/dlgtagfetcher.cpp
   src/library/dlgtagfetcher.ui
   src/library/dlgtrackinfo.cpp
@@ -942,7 +935,6 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL
   src/library/export/trackexportwizard.cpp
   src/library/export/trackexportworker.cpp
   src/library/externaltrackcollection.cpp
-  src/library/hiddentablemodel.cpp
   src/library/itunes/itunesdao.cpp
   src/library/itunes/itunesfeature.cpp
   src/library/itunes/itunesimporter.cpp
@@ -953,17 +945,18 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL
   src/library/librarycontrol.cpp
   src/library/libraryfeature.cpp
   src/library/librarytablemodel.cpp
-  src/library/locationdelegate.cpp
-  src/library/missingtablemodel.cpp
+  src/library/missing_hidden/dlghidden.cpp
+  src/library/missing_hidden/dlghidden.ui
+  src/library/missing_hidden/dlgmissing.cpp
+  src/library/missing_hidden/dlgmissing.ui
+  src/library/missing_hidden/hiddentablemodel.cpp
+  src/library/missing_hidden/missingtablemodel.cpp
   src/library/mixxxlibraryfeature.cpp
-  src/library/multilineeditdelegate.cpp
   src/library/parser.cpp
   src/library/parsercsv.cpp
   src/library/parserm3u.cpp
   src/library/parserpls.cpp
-  src/library/playcountdelegate.cpp
   src/library/playlisttablemodel.cpp
-  src/library/previewbuttondelegate.cpp
   src/library/proxytrackmodel.cpp
   src/library/recording/dlgrecording.cpp
   src/library/recording/dlgrecording.ui
@@ -982,10 +975,17 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL
   src/library/serato/seratofeature.cpp
   src/library/serato/seratoplaylistmodel.cpp
   src/library/sidebarmodel.cpp
-  src/library/stardelegate.cpp
-  src/library/stareditor.cpp
   src/library/starrating.cpp
-  src/library/tableitemdelegate.cpp
+  src/library/tabledelegates/bpmdelegate.cpp
+  src/library/tabledelegates/colordelegate.cpp
+  src/library/tabledelegates/coverartdelegate.cpp
+  src/library/tabledelegates/locationdelegate.cpp
+  src/library/tabledelegates/multilineeditdelegate.cpp
+  src/library/tabledelegates/playcountdelegate.cpp
+  src/library/tabledelegates/previewbuttondelegate.cpp
+  src/library/tabledelegates/stardelegate.cpp
+  src/library/tabledelegates/stareditor.cpp
+  src/library/tabledelegates/tableitemdelegate.cpp
   src/library/trackcollection.cpp
   src/library/trackcollectioniterator.cpp
   src/library/trackcollectionmanager.cpp

src/library/analysisfeature.cpp → src/library/analysis/analysisfeature.cpp

@@ -1,11 +1,11 @@
-#include "library/analysisfeature.h"
+#include "library/analysis/analysisfeature.h"
 
 #include <QList>
 #include <QtDebug>
 
 #include "analyzer/analyzerscheduledtrack.h"
 #include "controllers/keyboard/keyboardeventfilter.h"
-#include "library/dlganalysis.h"
+#include "library/analysis/dlganalysis.h"
 #include "library/library.h"
 #include "library/trackcollectionmanager.h"
 #include "moc_analysisfeature.cpp"

src/library/analysislibrarytablemodel.cpp → src/library/analysis/analysislibrarytablemodel.cpp

@@ -1,4 +1,4 @@
-#include "library/analysislibrarytablemodel.h"
+#include "library/analysis/analysislibrarytablemodel.h"
 
 #include "moc_analysislibrarytablemodel.cpp"
 

src/library/dlganalysis.cpp → src/library/analysis/dlganalysis.cpp

@@ -1,7 +1,8 @@
-#include "library/dlganalysis.h"
+#include "library/analysis/dlganalysis.h"
 
 #include "analyzer/analyzerprogress.h"
 #include "analyzer/analyzerscheduledtrack.h"
+#include "library/analysis/ui_dlganalysis.h"
 #include "library/dao/trackschema.h"
 #include "library/library.h"
 #include "moc_dlganalysis.cpp"

src/library/dlganalysis.h → src/library/analysis/dlganalysis.h

@@ -4,13 +4,13 @@
 
 #include "analyzer/analyzerprogress.h"
 #include "analyzer/analyzerscheduledtrack.h"
-#include "library/analysislibrarytablemodel.h"
+#include "library/analysis/analysislibrarytablemodel.h"
+#include "library/analysis/ui_dlganalysis.h"
 #include "library/libraryview.h"
-#include "library/ui_dlganalysis.h"
 #include "preferences/usersettings.h"
 
-class WAnalysisLibraryTableView;
 class Library;
+class WAnalysisLibraryTableView;
 class WLibrary;
 class QItemSelection;
 

src/library/basetracktablemodel.cpp

@@ -3,17 +3,17 @@
 #include <QGuiApplication>
 #include <QScreen>
 
-#include "library/bpmdelegate.h"
-#include "library/colordelegate.h"
 #include "library/coverartcache.h"
-#include "library/coverartdelegate.h"
 #include "library/dao/trackschema.h"
-#include "library/locationdelegate.h"
-#include "library/multilineeditdelegate.h"
-#include "library/playcountdelegate.h"
-#include "library/previewbuttondelegate.h"
-#include "library/stardelegate.h"
 #include "library/starrating.h"
+#include "library/tabledelegates/bpmdelegate.h"
+#include "library/tabledelegates/colordelegate.h"
+#include "library/tabledelegates/coverartdelegate.h"
+#include "library/tabledelegates/locationdelegate.h"
+#include "library/tabledelegates/multilineeditdelegate.h"
+#include "library/tabledelegates/playcountdelegate.h"
+#include "library/tabledelegates/previewbuttondelegate.h"
+#include "library/tabledelegates/stardelegate.h"
 #include "library/trackcollection.h"
 #include "library/trackcollectionmanager.h"
 #include "mixer/playerinfo.h"

src/library/browse/browsetablemodel.cpp

@@ -6,7 +6,7 @@
 
 #include "library/browse/browsetablemodel.h"
 #include "library/browse/browsethread.h"
-#include "library/previewbuttondelegate.h"
+#include "library/tabledelegates/previewbuttondelegate.h"
 #include "library/trackcollection.h"
 #include "library/trackcollectionmanager.h"
 #include "mixer/playerinfo.h"

src/library/library.cpp

@@ -6,7 +6,7 @@
 
 #include "control/controlobject.h"
 #include "controllers/keyboard/keyboardeventfilter.h"
-#include "library/analysisfeature.h"
+#include "library/analysis/analysisfeature.h"
 #include "library/autodj/autodjfeature.h"
 #include "library/banshee/bansheefeature.h"
 #include "library/browse/browsefeature.h"

src/library/dlghidden.cpp → src/library/missing_hidden/dlghidden.cpp

@@ -1,10 +1,10 @@
-#include "library/dlghidden.h"
+#include "library/missing_hidden/dlghidden.h"
 
 #include <QItemSelection>
 
 #include "controllers/keyboard/keyboardeventfilter.h"
-#include "library/hiddentablemodel.h"
 #include "library/library.h"
+#include "library/missing_hidden/hiddentablemodel.h"
 #include "moc_dlghidden.cpp"
 #include "util/assert.h"
 #include "widget/wlibrary.h"

src/library/dlgmissing.cpp → src/library/missing_hidden/dlgmissing.cpp

@@ -1,10 +1,10 @@
-#include "library/dlgmissing.h"
+#include "library/missing_hidden/dlgmissing.h"
 
 #include <QItemSelection>
 
 #include "controllers/keyboard/keyboardeventfilter.h"
 #include "library/library.h"
-#include "library/missingtablemodel.h"
+#include "library/missing_hidden/missingtablemodel.h"
 #include "moc_dlgmissing.cpp"
 #include "util/assert.h"
 #include "widget/wlibrary.h"

src/library/hiddentablemodel.cpp → src/library/missing_hidden/hiddentablemodel.cpp

@@ -1,4 +1,4 @@
-#include "library/hiddentablemodel.h"
+#include "library/missing_hidden/hiddentablemodel.h"
 
 #include "library/dao/trackschema.h"
 #include "library/trackcollection.h"

src/library/missingtablemodel.cpp → src/library/missing_hidden/missingtablemodel.cpp

@@ -1,4 +1,4 @@
-#include "library/missingtablemodel.h"
+#include "library/missing_hidden/missingtablemodel.h"
 
 #include "library/dao/trackschema.h"
 #include "library/trackcollection.h"

src/library/mixxxlibraryfeature.cpp

@@ -7,10 +7,10 @@
 
 #include "library/basetrackcache.h"
 #include "library/dao/trackschema.h"
-#include "library/dlghidden.h"
-#include "library/dlgmissing.h"
 #include "library/library.h"
 #include "library/librarytablemodel.h"
+#include "library/missing_hidden/dlghidden.h"
+#include "library/missing_hidden/dlgmissing.h"
 #include "library/parser.h"
 #include "library/queryutil.h"
 #include "library/trackcollection.h"

src/library/bpmdelegate.cpp → src/library/tabledelegates/bpmdelegate.cpp

@@ -1,4 +1,4 @@
-#include "library/bpmdelegate.h"
+#include "library/tabledelegates/bpmdelegate.h"
 
 #include <QCheckBox>
 #include <QDoubleSpinBox>

src/library/bpmdelegate.h → src/library/tabledelegates/bpmdelegate.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "library/tableitemdelegate.h"
+#include "library/tabledelegates/tableitemdelegate.h"
 
 class QCheckBox;
 

src/library/colordelegate.cpp → src/library/tabledelegates/colordelegate.cpp

@@ -1,4 +1,4 @@
-#include "library/colordelegate.h"
+#include "library/tabledelegates/colordelegate.h"
 
 #include <QPainter>
 #include <QStyle>

src/library/colordelegate.h → src/library/tabledelegates/colordelegate.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "library/tableitemdelegate.h"
+#include "library/tabledelegates/tableitemdelegate.h"
 
 class QModelIndex;
 class QPainter;

src/library/coverartdelegate.cpp → src/library/tabledelegates/coverartdelegate.cpp

@@ -1,4 +1,4 @@
-#include "library/coverartdelegate.h"
+#include "library/tabledelegates/coverartdelegate.h"
 
 #include <QPainter>
 #include <QTableView>

src/library/coverartdelegate.h → src/library/tabledelegates/coverartdelegate.h

@@ -3,7 +3,7 @@
 #include <QList>
 
 #include "library/coverart.h"
-#include "library/tableitemdelegate.h"
+#include "library/tabledelegates/tableitemdelegate.h"
 #include "track/track_decl.h"
 #include "util/cache.h"
 

src/library/locationdelegate.cpp → src/library/tabledelegates/locationdelegate.cpp

@@ -1,4 +1,4 @@
-#include "library/locationdelegate.h"
+#include "library/tabledelegates/locationdelegate.h"
 
 #include <QPainter>
 

src/library/locationdelegate.h → src/library/tabledelegates/locationdelegate.h

@@ -1,7 +1,6 @@
 #pragma once
 
-#include "library/tableitemdelegate.h"
-
+#include "library/tabledelegates/tableitemdelegate.h"
 
 class LocationDelegate : public TableItemDelegate {
     Q_OBJECT

src/library/multilineeditdelegate.cpp → src/library/tabledelegates/multilineeditdelegate.cpp

@@ -1,4 +1,4 @@
-#include "library/multilineeditdelegate.h"
+#include "library/tabledelegates/multilineeditdelegate.h"
 
 #include <QAbstractTextDocumentLayout>
 #include <QScrollBar>

src/library/multilineeditdelegate.h → src/library/tabledelegates/multilineeditdelegate.h

@@ -2,7 +2,7 @@
 
 #include <QPlainTextEdit>
 
-#include "library/tableitemdelegate.h"
+#include "library/tabledelegates/tableitemdelegate.h"
 
 /// A QPlainTextEdit to show all content lines in a scrollable view.
 /// * finish editing with Return key, like QLineEdit used for other text columns

src/library/playcountdelegate.cpp → src/library/tabledelegates/playcountdelegate.cpp

@@ -1,4 +1,4 @@
-#include "library/playcountdelegate.h"
+#include "library/tabledelegates/playcountdelegate.h"
 
 #include <QCheckBox>
 #include <QPainter>

src/library/playcountdelegate.h → src/library/tabledelegates/playcountdelegate.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "library/tableitemdelegate.h"
+#include "library/tabledelegates/tableitemdelegate.h"
 
 class QCheckBox;
 

src/library/previewbuttondelegate.cpp → src/library/tabledelegates/previewbuttondelegate.cpp

@@ -1,4 +1,4 @@
-#include "library/previewbuttondelegate.h"
+#include "library/tabledelegates/previewbuttondelegate.h"
 
 #include <QPainter>
 #include <QPushButton>

src/library/previewbuttondelegate.h → src/library/tabledelegates/previewbuttondelegate.h

@@ -2,7 +2,7 @@
 
 #include <QPushButton>
 
-#include "library/tableitemdelegate.h"
+#include "library/tabledelegates/tableitemdelegate.h"
 #include "track/track_decl.h"
 #include "util/parented_ptr.h"
 

src/library/stardelegate.cpp → src/library/tabledelegates/stardelegate.cpp

@@ -1,10 +1,10 @@
-#include "library/stardelegate.h"
+#include "library/tabledelegates/stardelegate.h"
 
 #include <QTableView>
 
-#include "library/stareditor.h"
 #include "library/starrating.h"
-#include "library/tableitemdelegate.h"
+#include "library/tabledelegates/stareditor.h"
+#include "library/tabledelegates/tableitemdelegate.h"
 #include "moc_stardelegate.cpp"
 
 StarDelegate::StarDelegate(QTableView* pTableView)

src/library/stardelegate.h → src/library/tabledelegates/stardelegate.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "library/tableitemdelegate.h"
+#include "library/tabledelegates/tableitemdelegate.h"
 
 class StarDelegate : public TableItemDelegate {
     Q_OBJECT

src/library/stareditor.cpp → src/library/tabledelegates/stareditor.cpp

@@ -1,12 +1,12 @@
-#include "library/stareditor.h"
+#include "library/tabledelegates/stareditor.h"
 
 #include <QItemSelectionModel>
 #include <QMouseEvent>
 #include <QPainter>
 #include <QTableView>
 
 #include "library/starrating.h"
-#include "library/tableitemdelegate.h"
+#include "library/tabledelegates/tableitemdelegate.h"
 #include "moc_stareditor.cpp"
 
 // We enable mouse tracking on the widget so we can follow the cursor even

src/library/tableitemdelegate.cpp → src/library/tabledelegates/tableitemdelegate.cpp

@@ -1,4 +1,4 @@
-#include "library/tableitemdelegate.h"
+#include "library/tabledelegates/tableitemdelegate.h"
 
 #include <QPainter>
 

src/library/traktor/traktorfeature.cpp

@@ -10,7 +10,7 @@
 
 #include "library/library.h"
 #include "library/librarytablemodel.h"
-#include "library/missingtablemodel.h"
+#include "library/missing_hidden/missingtablemodel.h"
 #include "library/queryutil.h"
 #include "library/trackcollection.h"
 #include "library/trackcollectionmanager.h"