From 46b8f2eb1a2ef9655c963b567a517352facd307c Mon Sep 17 00:00:00 2001 From: Oleksii Zbykovskyi Date: Tue, 19 Aug 2025 10:05:29 +0200 Subject: [PATCH] Widgets snippets: Use the header file instead of a new class each time In several snippets, the TableModel class is created and used. I included a header file to avoid code repetition. Change-Id: Ie6318606cc89a2f5f1c137a36195fe290b6c1be6 Reviewed-by: Volker Hilsheimer --- .../doc/snippets/itemselection/main.cpp | 24 +------------------ .../snippets/reading-selections/window.cpp | 20 +--------------- .../doc/snippets/sharedtablemodel/main.cpp | 20 +--------------- .../snippets/updating-selections/window.cpp | 21 +--------------- 4 files changed, 4 insertions(+), 81 deletions(-) diff --git a/src/widgets/doc/snippets/itemselection/main.cpp b/src/widgets/doc/snippets/itemselection/main.cpp index 31908076055..ce277432100 100644 --- a/src/widgets/doc/snippets/itemselection/main.cpp +++ b/src/widgets/doc/snippets/itemselection/main.cpp @@ -13,29 +13,7 @@ #include #include -class TableModel : public QAbstractTableModel -{ - Q_OBJECT -public: - TableModel(int rows, int columns, QObject *parent = nullptr) - : QAbstractTableModel(parent), m_rows(rows), m_columns(columns) {} - - int rowCount(const QModelIndex &parent = QModelIndex()) const override { - return m_rows; - } - - int columnCount(const QModelIndex &parent = QModelIndex()) const override { - return m_columns; - } - - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override { - return QVariant(); - } - -private: - int m_rows, m_columns; - -}; +#include "../common-table-model/model.h" int main(int argc, char *argv[]) { diff --git a/src/widgets/doc/snippets/reading-selections/window.cpp b/src/widgets/doc/snippets/reading-selections/window.cpp index c0c3bcbe6f4..1f219c861e1 100644 --- a/src/widgets/doc/snippets/reading-selections/window.cpp +++ b/src/widgets/doc/snippets/reading-selections/window.cpp @@ -17,25 +17,7 @@ #include #include "../include/mainwindow.h" - -class TableModel : public QAbstractTableModel -{ - Q_OBJECT -public: - TableModel(int rows, int columns, QObject *parent = nullptr) {} - - int rowCount(const QModelIndex &parent = QModelIndex()) const override { - return 0; - } - - int columnCount(const QModelIndex &parent = QModelIndex()) const override { - return 0; - } - - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override { - return QVariant(); - } -}; +#include "../common-table-model/model.h" MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) diff --git a/src/widgets/doc/snippets/sharedtablemodel/main.cpp b/src/widgets/doc/snippets/sharedtablemodel/main.cpp index ab02094595d..76a4ebc6670 100644 --- a/src/widgets/doc/snippets/sharedtablemodel/main.cpp +++ b/src/widgets/doc/snippets/sharedtablemodel/main.cpp @@ -13,25 +13,7 @@ #include #include -class TableModel : public QAbstractTableModel -{ - Q_OBJECT -public: - TableModel(int rows, int columns, QObject *parent = nullptr) - : QAbstractTableModel(parent), rowCount(rows), columnCount(columns) {} - - int rowCount(const QModelIndex &parent = QModelIndex()) const override { - return rowCount; - } - - int columnCount(const QModelIndex &parent = QModelIndex()) const override { - return columnCount; - } - - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override { - return QVariant(); - } -}; +#include "../common-table-model/model.h" int main(int argc, char *argv[]) { diff --git a/src/widgets/doc/snippets/updating-selections/window.cpp b/src/widgets/doc/snippets/updating-selections/window.cpp index d03a36d5fc3..a2dc44d1088 100644 --- a/src/widgets/doc/snippets/updating-selections/window.cpp +++ b/src/widgets/doc/snippets/updating-selections/window.cpp @@ -15,26 +15,7 @@ #include #include "../include/mainwindow.h" - -class TableModel : public QAbstractTableModel -{ - Q_OBJECT -public: - TableModel(int rows, int columns, QObject *parent = nullptr) - : QAbstractTableModel(parent) {} - - int rowCount(const QModelIndex &parent = QModelIndex()) const override { - return 0; - } - - int columnCount(const QModelIndex &parent = QModelIndex()) const override { - return 0; - } - - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override { - return QVariant(); - } -}; +#include "../common-table-model/model.h" MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)