diff options
| author | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2019-10-19 18:01:08 +0200 |
|---|---|---|
| committer | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2019-10-24 19:41:16 +0200 |
| commit | 9ae0fa4d4977ef1eb28eff2f95b429e9455ba748 (patch) | |
| tree | e30634a589fddcfd8cd5241faeed94670803857e /tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.h | |
| parent | 31cbda4833aaea6cead58a9a3281059c27393433 (diff) | |
cleanup QSortFilterProxyModel tests
Cleanup QSortFilterProxyModel tests:
- adjust includes
- use nullptr
- use override
- avoid unneeded casts
- use new signal/slot syntax
Change-Id: I05f7c18cd2642bc8251bf1560803e7635684d24d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.h')
| -rw-r--r-- | tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.h | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.h b/tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.h index 8ae97165b8..71662bda07 100644 --- a/tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.h +++ b/tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.h @@ -29,19 +29,10 @@ #ifndef TST_QSORTFILTERPROXYMODEL_H #define TST_QSORTFILTERPROXYMODEL_H -#include <QtTest/QtTest> #include "dynamictreemodel.h" - -#include <QtCore/QCoreApplication> -#include <QtGui/QStandardItem> -#include <QtWidgets/QTreeView> -#include <QtWidgets/QTableView> - -#include <qdebug.h> - -typedef QList<int> IntList; -typedef QPair<int, int> IntPair; -typedef QList<IntPair> IntPairList; +#include <QLoggingCategory> +#include <QSortFilterProxyModel> +#include <QStandardItemModel> enum class FilterType { RegExp, @@ -53,10 +44,6 @@ Q_DECLARE_METATYPE(QList<QPersistentModelIndex>) class tst_QSortFilterProxyModel : public QObject { Q_OBJECT - -public: - tst_QSortFilterProxyModel(); - public slots: void initTestCase(); void cleanupTestCase(); @@ -181,8 +168,8 @@ protected: FilterType m_filterType; private: - QStandardItemModel *m_model; - QSortFilterProxyModel *m_proxy; + QStandardItemModel *m_model = nullptr; + QSortFilterProxyModel *m_proxy = nullptr; }; Q_DECLARE_METATYPE(QAbstractItemModel::LayoutChangeHint) |