Skip to content

Commit e8139f3

Browse files
committed
fixup RoomPanel
1 parent ae4682a commit e8139f3

2 files changed

Lines changed: 15 additions & 11 deletions

File tree

src/roompanel/RoomWidget.cpp

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -209,24 +209,25 @@ void RoomModel::update()
209209
// ------------------------------- RoomWidget ----------------------------------
210210
RoomWidget::RoomWidget(RoomManager &rm, QWidget *const parent)
211211
: QWidget{parent}
212-
, m_model{this, rm.getRoom()}
213212
, m_roomManager{rm}
214213
{
215214
auto *layout = new QVBoxLayout(this);
216215
layout->setAlignment(Qt::AlignTop);
217216
layout->setContentsMargins(0, 0, 0, 0);
218217
layout->setSpacing(0);
219218

220-
auto *table = new QTableView(this);
221-
table->setSelectionMode(QAbstractItemView::ContiguousSelection);
222-
table->setSelectionBehavior(QAbstractItemView::SelectRows);
223-
table->horizontalHeader()->setStretchLastSection(false);
224-
table->horizontalHeader()->setSectionResizeMode(QHeaderView::Interactive);
225-
table->setModel(&m_model);
226-
layout->addWidget(table);
219+
m_table = new QTableView(this);
220+
m_model = new RoomModel(m_table, rm.getRoom());
221+
m_table->setSelectionMode(QAbstractItemView::ContiguousSelection);
222+
m_table->setSelectionBehavior(QAbstractItemView::SelectRows);
223+
m_table->horizontalHeader()->setStretchLastSection(false);
224+
m_table->horizontalHeader()->setSectionResizeMode(QHeaderView::Interactive);
225+
m_table->setModel(m_model);
226+
layout->addWidget(m_table);
227227

228228
// Minimize row height
229-
table->verticalHeader()->setDefaultSectionSize(table->verticalHeader()->minimumSectionSize());
229+
m_table->verticalHeader()->setDefaultSectionSize(
230+
m_table->verticalHeader()->minimumSectionSize());
230231

231232
connect(&m_roomManager, &RoomManager::sig_updateWidget, this, &RoomWidget::slot_update);
232233

@@ -240,7 +241,7 @@ RoomWidget::~RoomWidget()
240241

241242
void RoomWidget::slot_update()
242243
{
243-
m_model.update();
244+
deref(m_model).update();
244245
}
245246

246247
void RoomWidget::readSettings()

src/roompanel/RoomWidget.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,15 @@ class NODISCARD_QOBJECT RoomModel final : public QAbstractTableModel
6262

6363
}; // class RoomModel
6464

65+
class QTableView;
66+
6567
class NODISCARD_QOBJECT RoomWidget final : public QWidget
6668
{
6769
Q_OBJECT
6870

6971
private:
70-
RoomModel m_model;
72+
RoomModel *m_model = nullptr;
73+
QTableView *m_table = nullptr;
7174
RoomManager &m_roomManager;
7275

7376
public:

0 commit comments

Comments
 (0)