Skip to content

Commit

Permalink
Library: move table item delegates to src/library/tabledelegates
Browse files Browse the repository at this point in the history
  • Loading branch information
ronso0 committed Mar 12, 2024
1 parent be541ea commit 12aa4df
Show file tree
Hide file tree
Showing 23 changed files with 40 additions and 41 deletions.
20 changes: 10 additions & 10 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -905,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
Expand Down Expand Up @@ -948,22 +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/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
Expand All @@ -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
Expand Down
16 changes: 8 additions & 8 deletions src/library/basetracktablemodel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/library/browse/browsetablemodel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "library/bpmdelegate.h"
#include "library/tabledelegates/bpmdelegate.h"

#include <QCheckBox>
#include <QDoubleSpinBox>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "library/tableitemdelegate.h"
#include "library/tabledelegates/tableitemdelegate.h"

class QCheckBox;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "library/colordelegate.h"
#include "library/tabledelegates/colordelegate.h"

#include <QPainter>
#include <QStyle>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "library/tableitemdelegate.h"
#include "library/tabledelegates/tableitemdelegate.h"

class QModelIndex;
class QPainter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "library/coverartdelegate.h"
#include "library/tabledelegates/coverartdelegate.h"

#include <QPainter>
#include <QTableView>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "library/locationdelegate.h"
#include "library/tabledelegates/locationdelegate.h"

#include <QPainter>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#pragma once

#include "library/tableitemdelegate.h"

#include "library/tabledelegates/tableitemdelegate.h"

class LocationDelegate : public TableItemDelegate {
Q_OBJECT
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "library/multilineeditdelegate.h"
#include "library/tabledelegates/multilineeditdelegate.h"

#include <QAbstractTextDocumentLayout>
#include <QScrollBar>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "library/playcountdelegate.h"
#include "library/tabledelegates/playcountdelegate.h"

#include <QCheckBox>
#include <QPainter>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "library/tableitemdelegate.h"
#include "library/tabledelegates/tableitemdelegate.h"

class QCheckBox;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "library/previewbuttondelegate.h"
#include "library/tabledelegates/previewbuttondelegate.h"

#include <QPainter>
#include <QPushButton>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "library/tableitemdelegate.h"
#include "library/tabledelegates/tableitemdelegate.h"

class StarDelegate : public TableItemDelegate {
Q_OBJECT
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "library/tableitemdelegate.h"
#include "library/tabledelegates/tableitemdelegate.h"

#include <QPainter>

Expand Down
File renamed without changes.

0 comments on commit 12aa4df

Please sign in to comment.