diff --git a/CMakeLists.txt b/CMakeLists.txt index e375afd2d93..7c67775d256 100644 --- a/CMakeLists.txt +++ b/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 diff --git a/src/library/analysisfeature.cpp b/src/library/analysis/analysisfeature.cpp similarity index 98% rename from src/library/analysisfeature.cpp rename to src/library/analysis/analysisfeature.cpp index ebe954c551d..a713f57ddfc 100644 --- a/src/library/analysisfeature.cpp +++ b/src/library/analysis/analysisfeature.cpp @@ -1,11 +1,11 @@ -#include "library/analysisfeature.h" +#include "library/analysis/analysisfeature.h" #include #include #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" diff --git a/src/library/analysisfeature.h b/src/library/analysis/analysisfeature.h similarity index 100% rename from src/library/analysisfeature.h rename to src/library/analysis/analysisfeature.h diff --git a/src/library/analysislibrarytablemodel.cpp b/src/library/analysis/analysislibrarytablemodel.cpp similarity index 93% rename from src/library/analysislibrarytablemodel.cpp rename to src/library/analysis/analysislibrarytablemodel.cpp index 4eeccbf5e1b..574c1545b98 100644 --- a/src/library/analysislibrarytablemodel.cpp +++ b/src/library/analysis/analysislibrarytablemodel.cpp @@ -1,4 +1,4 @@ -#include "library/analysislibrarytablemodel.h" +#include "library/analysis/analysislibrarytablemodel.h" #include "moc_analysislibrarytablemodel.cpp" diff --git a/src/library/analysislibrarytablemodel.h b/src/library/analysis/analysislibrarytablemodel.h similarity index 100% rename from src/library/analysislibrarytablemodel.h rename to src/library/analysis/analysislibrarytablemodel.h diff --git a/src/library/dlganalysis.cpp b/src/library/analysis/dlganalysis.cpp similarity index 98% rename from src/library/dlganalysis.cpp rename to src/library/analysis/dlganalysis.cpp index 36bb12953b6..3f67fe0bbd8 100644 --- a/src/library/dlganalysis.cpp +++ b/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" diff --git a/src/library/dlganalysis.h b/src/library/analysis/dlganalysis.h similarity index 95% rename from src/library/dlganalysis.h rename to src/library/analysis/dlganalysis.h index c4d90c56521..ca32cc02f84 100644 --- a/src/library/dlganalysis.h +++ b/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; diff --git a/src/library/dlganalysis.ui b/src/library/analysis/dlganalysis.ui similarity index 100% rename from src/library/dlganalysis.ui rename to src/library/analysis/dlganalysis.ui diff --git a/src/library/basetracktablemodel.cpp b/src/library/basetracktablemodel.cpp index 285891605b3..b90bab1aea3 100644 --- a/src/library/basetracktablemodel.cpp +++ b/src/library/basetracktablemodel.cpp @@ -3,17 +3,17 @@ #include #include -#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" diff --git a/src/library/browse/browsetablemodel.cpp b/src/library/browse/browsetablemodel.cpp index f6399267f70..f6245926421 100644 --- a/src/library/browse/browsetablemodel.cpp +++ b/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" diff --git a/src/library/library.cpp b/src/library/library.cpp index 48c2ca4bc63..d1f73fee806 100644 --- a/src/library/library.cpp +++ b/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" diff --git a/src/library/dlghidden.cpp b/src/library/missing_hidden/dlghidden.cpp similarity index 97% rename from src/library/dlghidden.cpp rename to src/library/missing_hidden/dlghidden.cpp index a43bd67ce10..0943a182eb3 100644 --- a/src/library/dlghidden.cpp +++ b/src/library/missing_hidden/dlghidden.cpp @@ -1,10 +1,10 @@ -#include "library/dlghidden.h" +#include "library/missing_hidden/dlghidden.h" #include #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" diff --git a/src/library/dlghidden.h b/src/library/missing_hidden/dlghidden.h similarity index 100% rename from src/library/dlghidden.h rename to src/library/missing_hidden/dlghidden.h diff --git a/src/library/dlghidden.ui b/src/library/missing_hidden/dlghidden.ui similarity index 100% rename from src/library/dlghidden.ui rename to src/library/missing_hidden/dlghidden.ui diff --git a/src/library/dlgmissing.cpp b/src/library/missing_hidden/dlgmissing.cpp similarity index 97% rename from src/library/dlgmissing.cpp rename to src/library/missing_hidden/dlgmissing.cpp index 24b4b3a42ee..736fb4842cd 100644 --- a/src/library/dlgmissing.cpp +++ b/src/library/missing_hidden/dlgmissing.cpp @@ -1,10 +1,10 @@ -#include "library/dlgmissing.h" +#include "library/missing_hidden/dlgmissing.h" #include #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" diff --git a/src/library/dlgmissing.h b/src/library/missing_hidden/dlgmissing.h similarity index 100% rename from src/library/dlgmissing.h rename to src/library/missing_hidden/dlgmissing.h diff --git a/src/library/dlgmissing.ui b/src/library/missing_hidden/dlgmissing.ui similarity index 100% rename from src/library/dlgmissing.ui rename to src/library/missing_hidden/dlgmissing.ui diff --git a/src/library/hiddentablemodel.cpp b/src/library/missing_hidden/hiddentablemodel.cpp similarity index 98% rename from src/library/hiddentablemodel.cpp rename to src/library/missing_hidden/hiddentablemodel.cpp index f54fc17ca0e..ff87e84387d 100644 --- a/src/library/hiddentablemodel.cpp +++ b/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" diff --git a/src/library/hiddentablemodel.h b/src/library/missing_hidden/hiddentablemodel.h similarity index 100% rename from src/library/hiddentablemodel.h rename to src/library/missing_hidden/hiddentablemodel.h diff --git a/src/library/missingtablemodel.cpp b/src/library/missing_hidden/missingtablemodel.cpp similarity index 98% rename from src/library/missingtablemodel.cpp rename to src/library/missing_hidden/missingtablemodel.cpp index 5906196c3b1..1b6c077e509 100644 --- a/src/library/missingtablemodel.cpp +++ b/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" diff --git a/src/library/missingtablemodel.h b/src/library/missing_hidden/missingtablemodel.h similarity index 100% rename from src/library/missingtablemodel.h rename to src/library/missing_hidden/missingtablemodel.h diff --git a/src/library/mixxxlibraryfeature.cpp b/src/library/mixxxlibraryfeature.cpp index 84400b7a939..4ea52b1e6a1 100644 --- a/src/library/mixxxlibraryfeature.cpp +++ b/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" diff --git a/src/library/bpmdelegate.cpp b/src/library/tabledelegates/bpmdelegate.cpp similarity index 99% rename from src/library/bpmdelegate.cpp rename to src/library/tabledelegates/bpmdelegate.cpp index 1c05f578218..9b54cde6027 100644 --- a/src/library/bpmdelegate.cpp +++ b/src/library/tabledelegates/bpmdelegate.cpp @@ -1,4 +1,4 @@ -#include "library/bpmdelegate.h" +#include "library/tabledelegates/bpmdelegate.h" #include #include diff --git a/src/library/bpmdelegate.h b/src/library/tabledelegates/bpmdelegate.h similarity index 88% rename from src/library/bpmdelegate.h rename to src/library/tabledelegates/bpmdelegate.h index f0251199255..38a398898dc 100644 --- a/src/library/bpmdelegate.h +++ b/src/library/tabledelegates/bpmdelegate.h @@ -1,6 +1,6 @@ #pragma once -#include "library/tableitemdelegate.h" +#include "library/tabledelegates/tableitemdelegate.h" class QCheckBox; diff --git a/src/library/colordelegate.cpp b/src/library/tabledelegates/colordelegate.cpp similarity index 94% rename from src/library/colordelegate.cpp rename to src/library/tabledelegates/colordelegate.cpp index 4808a0ee9ca..76400bd6ee8 100644 --- a/src/library/colordelegate.cpp +++ b/src/library/tabledelegates/colordelegate.cpp @@ -1,4 +1,4 @@ -#include "library/colordelegate.h" +#include "library/tabledelegates/colordelegate.h" #include #include diff --git a/src/library/colordelegate.h b/src/library/tabledelegates/colordelegate.h similarity index 86% rename from src/library/colordelegate.h rename to src/library/tabledelegates/colordelegate.h index e0b0b9889e1..7309b560a0e 100644 --- a/src/library/colordelegate.h +++ b/src/library/tabledelegates/colordelegate.h @@ -1,6 +1,6 @@ #pragma once -#include "library/tableitemdelegate.h" +#include "library/tabledelegates/tableitemdelegate.h" class QModelIndex; class QPainter; diff --git a/src/library/coverartdelegate.cpp b/src/library/tabledelegates/coverartdelegate.cpp similarity index 99% rename from src/library/coverartdelegate.cpp rename to src/library/tabledelegates/coverartdelegate.cpp index 7dbeeff33b5..781dbc48292 100644 --- a/src/library/coverartdelegate.cpp +++ b/src/library/tabledelegates/coverartdelegate.cpp @@ -1,4 +1,4 @@ -#include "library/coverartdelegate.h" +#include "library/tabledelegates/coverartdelegate.h" #include #include diff --git a/src/library/coverartdelegate.h b/src/library/tabledelegates/coverartdelegate.h similarity index 97% rename from src/library/coverartdelegate.h rename to src/library/tabledelegates/coverartdelegate.h index 84c69c5604a..f2e5b338915 100644 --- a/src/library/coverartdelegate.h +++ b/src/library/tabledelegates/coverartdelegate.h @@ -3,7 +3,7 @@ #include #include "library/coverart.h" -#include "library/tableitemdelegate.h" +#include "library/tabledelegates/tableitemdelegate.h" #include "track/track_decl.h" #include "util/cache.h" diff --git a/src/library/locationdelegate.cpp b/src/library/tabledelegates/locationdelegate.cpp similarity index 94% rename from src/library/locationdelegate.cpp rename to src/library/tabledelegates/locationdelegate.cpp index 43438d58e6e..9fa79339c8e 100644 --- a/src/library/locationdelegate.cpp +++ b/src/library/tabledelegates/locationdelegate.cpp @@ -1,4 +1,4 @@ -#include "library/locationdelegate.h" +#include "library/tabledelegates/locationdelegate.h" #include diff --git a/src/library/locationdelegate.h b/src/library/tabledelegates/locationdelegate.h similarity index 86% rename from src/library/locationdelegate.h rename to src/library/tabledelegates/locationdelegate.h index 9fb698dab21..43fd03cc79d 100644 --- a/src/library/locationdelegate.h +++ b/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 diff --git a/src/library/multilineeditdelegate.cpp b/src/library/tabledelegates/multilineeditdelegate.cpp similarity index 99% rename from src/library/multilineeditdelegate.cpp rename to src/library/tabledelegates/multilineeditdelegate.cpp index e7c0fa7ae10..3dd6904fc8d 100644 --- a/src/library/multilineeditdelegate.cpp +++ b/src/library/tabledelegates/multilineeditdelegate.cpp @@ -1,4 +1,4 @@ -#include "library/multilineeditdelegate.h" +#include "library/tabledelegates/multilineeditdelegate.h" #include #include diff --git a/src/library/multilineeditdelegate.h b/src/library/tabledelegates/multilineeditdelegate.h similarity index 96% rename from src/library/multilineeditdelegate.h rename to src/library/tabledelegates/multilineeditdelegate.h index 692598cc422..d46bd048c26 100644 --- a/src/library/multilineeditdelegate.h +++ b/src/library/tabledelegates/multilineeditdelegate.h @@ -2,7 +2,7 @@ #include -#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 diff --git a/src/library/playcountdelegate.cpp b/src/library/tabledelegates/playcountdelegate.cpp similarity index 95% rename from src/library/playcountdelegate.cpp rename to src/library/tabledelegates/playcountdelegate.cpp index 4f25aaf8833..53bac452dc1 100644 --- a/src/library/playcountdelegate.cpp +++ b/src/library/tabledelegates/playcountdelegate.cpp @@ -1,4 +1,4 @@ -#include "library/playcountdelegate.h" +#include "library/tabledelegates/playcountdelegate.h" #include #include diff --git a/src/library/playcountdelegate.h b/src/library/tabledelegates/playcountdelegate.h similarity index 87% rename from src/library/playcountdelegate.h rename to src/library/tabledelegates/playcountdelegate.h index 87f3705ed57..ce791f733c2 100644 --- a/src/library/playcountdelegate.h +++ b/src/library/tabledelegates/playcountdelegate.h @@ -1,6 +1,6 @@ #pragma once -#include "library/tableitemdelegate.h" +#include "library/tabledelegates/tableitemdelegate.h" class QCheckBox; diff --git a/src/library/previewbuttondelegate.cpp b/src/library/tabledelegates/previewbuttondelegate.cpp similarity index 99% rename from src/library/previewbuttondelegate.cpp rename to src/library/tabledelegates/previewbuttondelegate.cpp index ca565cb185b..110b84d69fa 100644 --- a/src/library/previewbuttondelegate.cpp +++ b/src/library/tabledelegates/previewbuttondelegate.cpp @@ -1,4 +1,4 @@ -#include "library/previewbuttondelegate.h" +#include "library/tabledelegates/previewbuttondelegate.h" #include #include diff --git a/src/library/previewbuttondelegate.h b/src/library/tabledelegates/previewbuttondelegate.h similarity index 97% rename from src/library/previewbuttondelegate.h rename to src/library/tabledelegates/previewbuttondelegate.h index fdd1f0f06d2..6bb37e514f9 100644 --- a/src/library/previewbuttondelegate.h +++ b/src/library/tabledelegates/previewbuttondelegate.h @@ -2,7 +2,7 @@ #include -#include "library/tableitemdelegate.h" +#include "library/tabledelegates/tableitemdelegate.h" #include "track/track_decl.h" #include "util/parented_ptr.h" diff --git a/src/library/stardelegate.cpp b/src/library/tabledelegates/stardelegate.cpp similarity index 95% rename from src/library/stardelegate.cpp rename to src/library/tabledelegates/stardelegate.cpp index 2b1a2fb0c22..62743016af8 100644 --- a/src/library/stardelegate.cpp +++ b/src/library/tabledelegates/stardelegate.cpp @@ -1,10 +1,10 @@ -#include "library/stardelegate.h" +#include "library/tabledelegates/stardelegate.h" #include -#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) diff --git a/src/library/stardelegate.h b/src/library/tabledelegates/stardelegate.h similarity index 95% rename from src/library/stardelegate.h rename to src/library/tabledelegates/stardelegate.h index 3ac6bd7fd3a..39d0f1457d9 100644 --- a/src/library/stardelegate.h +++ b/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 diff --git a/src/library/stareditor.cpp b/src/library/tabledelegates/stareditor.cpp similarity index 98% rename from src/library/stareditor.cpp rename to src/library/tabledelegates/stareditor.cpp index 42abedd7609..a4e1ba78a6c 100644 --- a/src/library/stareditor.cpp +++ b/src/library/tabledelegates/stareditor.cpp @@ -1,4 +1,4 @@ -#include "library/stareditor.h" +#include "library/tabledelegates/stareditor.h" #include #include @@ -6,7 +6,7 @@ #include #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 diff --git a/src/library/stareditor.h b/src/library/tabledelegates/stareditor.h similarity index 100% rename from src/library/stareditor.h rename to src/library/tabledelegates/stareditor.h diff --git a/src/library/tableitemdelegate.cpp b/src/library/tabledelegates/tableitemdelegate.cpp similarity index 98% rename from src/library/tableitemdelegate.cpp rename to src/library/tabledelegates/tableitemdelegate.cpp index f044e4a664c..229b08caa81 100644 --- a/src/library/tableitemdelegate.cpp +++ b/src/library/tabledelegates/tableitemdelegate.cpp @@ -1,4 +1,4 @@ -#include "library/tableitemdelegate.h" +#include "library/tabledelegates/tableitemdelegate.h" #include diff --git a/src/library/tableitemdelegate.h b/src/library/tabledelegates/tableitemdelegate.h similarity index 100% rename from src/library/tableitemdelegate.h rename to src/library/tabledelegates/tableitemdelegate.h diff --git a/src/library/traktor/traktorfeature.cpp b/src/library/traktor/traktorfeature.cpp index 0cb61d2dd6d..d6773cf5fc3 100644 --- a/src/library/traktor/traktorfeature.cpp +++ b/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"