Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions framework/extensions/qml/Muse/Extensions/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,7 @@ qt_add_qml_module(muse_extensions_qml

fixup_qml_module_dependencies(muse_extensions_qml)

target_link_libraries(muse_extensions_qml PRIVATE muse::uicomponents_qml)

# Necessary for the auto-generated sources
target_include_directories(muse_extensions_qml PRIVATE devtools)
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,6 @@

using namespace muse::uicomponents;

SelectableItemListModel::Item::Item(QObject* parent)
: QObject(parent)
{
}

SelectableItemListModel::SelectableItemListModel(QObject* parent)
: QAbstractListModel(parent), m_selection(new ItemMultiSelectionModel(this))
{
Expand Down Expand Up @@ -238,7 +233,7 @@ const SelectableItemListModel::ItemList& SelectableItemListModel::items() const
return m_items;
}

SelectableItemListModel::Item* SelectableItemListModel::item(const QModelIndex& index) const
QObject* SelectableItemListModel::item(const QModelIndex& index) const
{
int row = index.row();

Expand All @@ -263,7 +258,7 @@ void SelectableItemListModel::setItems(const ItemList& items)
emit countChanged();
}

void SelectableItemListModel::insertItem(int row, Item* item)
void SelectableItemListModel::insertItem(int row, QObject* item)
{
TRACEFUNC;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,7 @@ class SelectableItemListModel : public QAbstractListModel
Q_PROPERTY(bool hasSelection READ hasSelection NOTIFY selectionChanged)

public:
class Item : public QObject
{
public:
virtual ~Item() = default;

explicit Item(QObject* parent = nullptr);
};

using ItemList = QList<Item*>;
using ItemList = QList<QObject*>;

explicit SelectableItemListModel(QObject* parent = nullptr);

Expand Down Expand Up @@ -89,10 +81,10 @@ class SelectableItemListModel : public QAbstractListModel
virtual void onRowsRemoved();

const ItemList& items() const;
Item* item(const QModelIndex& index) const;
QObject* item(const QModelIndex& index) const;

void setItems(const ItemList& items);
void insertItem(int row, Item* item);
void insertItem(int row, QObject* item);

void setIsMovingUpAvailable(bool isMovingUpAvailable);
void setIsMovingDownAvailable(bool isMovingDownAvailable);
Expand Down
2 changes: 2 additions & 0 deletions framework/workspace/qml/Muse/Workspace/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,5 @@ qt_add_qml_module(muse_workspace_qml
)

fixup_qml_module_dependencies(muse_workspace_qml)

target_link_libraries(muse_workspace_qml PRIVATE muse::uicomponents_qml)