From 9b5c6ee170d7f1b52026ffd27f8fe65f3704af9e Mon Sep 17 00:00:00 2001 From: Silas Dohm <silas.dohm@stud.hs-bochum.de> Date: Thu, 18 Aug 2022 12:42:41 +0200 Subject: [PATCH] clean up --- cell.cpp | 18 +++++++++--------- cell.h | 6 ++++++ 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/cell.cpp b/cell.cpp index f73dfc1..a8cbec5 100644 --- a/cell.cpp +++ b/cell.cpp @@ -9,27 +9,27 @@ Cell::Cell(QWidget *parent) : QWidget(parent) { - QSignalMapper *mapper = new QSignalMapper(this); - connect(mapper, SIGNAL(mapped(int)), this, SLOT(collapse(int))); + m_mapper = new QSignalMapper(this); + connect(m_mapper, SIGNAL(mapped(int)), this, SLOT(collapse(int))); - QGroupBox *groupBox = new QGroupBox(); - QGridLayout *layout = new QGridLayout(); + m_groupBox = new QGroupBox(); + m_gridLayout = new QGridLayout(); setStyleSheet("border: 1px solid #1e282c; border-radius: 0px;background-color:#52585d;"); for (char i = 0; i < 9; i++) { m_states[i] = new QPushButton(QString::number(i + 1), this); - layout->addWidget(m_states[i], i / 3, i % 3); + m_gridLayout->addWidget(m_states[i], i / 3, i % 3); m_states[i]->setStyleSheet("border:none"); - connect(m_states[i], SIGNAL(clicked()), mapper, SLOT(map())); - mapper->setMapping(m_states[i], i); + connect(m_states[i], SIGNAL(clicked()), m_mapper, SLOT(map())); + m_mapper->setMapping(m_states[i], i); m_blocked[i] = 0; } - groupBox->setLayout(layout); + m_groupBox->setLayout(m_gridLayout); m_number = new QPushButton(this); connect(m_number, SIGNAL(clicked()), this, SLOT(un())); m_stackedWidget = new QStackedWidget(this); - m_stackedWidget->addWidget(groupBox); + m_stackedWidget->addWidget(m_groupBox); m_stackedWidget->addWidget(m_number); setMinimumSize(70, 70); } diff --git a/cell.h b/cell.h index bd7c76b..cf4fcb4 100644 --- a/cell.h +++ b/cell.h @@ -4,6 +4,9 @@ #include <QWidget> class QPushButton; class QStackedWidget; +class QSignalMapper; +class QGroupBox; +class QGridLayout; class Cell : public QWidget { Q_OBJECT @@ -15,6 +18,9 @@ public: std::vector<int> index = {0, 1, 2, 3, 4, 5, 6, 7, 8}; private: + QSignalMapper *m_mapper; + QGroupBox *m_groupBox; + QGridLayout *m_gridLayout; QPushButton *m_states[9]; QPushButton *m_number; std::array<int, 9> m_blocked; -- GitLab