From 211e434a05c666e172b2f1e2f72c7695adac52a1 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Sat, 10 Dec 2011 19:13:51 +0100 Subject: [PATCH] Move proxy and selection models to QtCore. Change-Id: I71097855cb9e28105238e496778f29f99f7fc84e Reviewed-by: Thiago Macieira Reviewed-by: Lars Knoll --- src/corelib/itemmodels/itemmodels.pri | 16 ++++++++++++++-- .../itemmodels}/qabstractproxymodel.cpp | 2 +- .../itemmodels}/qabstractproxymodel.h | 4 ++-- .../itemmodels}/qabstractproxymodel_p.h | 2 +- .../itemmodels}/qidentityproxymodel.cpp | 2 +- .../itemmodels}/qidentityproxymodel.h | 6 +++--- .../itemmodels}/qitemselectionmodel.cpp | 6 +++--- .../itemmodels}/qitemselectionmodel.h | 10 +++++----- .../itemmodels}/qitemselectionmodel_p.h | 0 .../itemmodels}/qsortfilterproxymodel.cpp | 2 +- .../itemmodels}/qsortfilterproxymodel.h | 6 +++--- .../itemmodels}/qstringlistmodel.cpp | 2 +- .../itemviews => corelib/itemmodels}/qstringlistmodel.h | 4 ++-- src/widgets/itemviews/itemviews.pri | 12 ------------ src/widgets/itemviews/qabstractitemview.h | 2 +- src/widgets/itemviews/qlistwidget.h | 2 +- src/widgets/util/qcompleter.cpp | 2 +- src/widgets/util/qcompleter_p.h | 2 +- tests/auto/corelib/itemmodels/itemmodels.pro | 7 ++++++- .../qabstractitemmodel/tst_qabstractitemmodel.cpp | 4 ++-- .../itemmodels}/qabstractproxymodel/.gitignore | 0 .../qabstractproxymodel/qabstractproxymodel.pro | 0 .../qabstractproxymodel/tst_qabstractproxymodel.cpp | 0 .../qidentityproxymodel/qidentityproxymodel.pro | 0 .../qidentityproxymodel/tst_qidentityproxymodel.cpp | 0 .../itemmodels}/qitemselectionmodel/.gitignore | 0 .../qitemselectionmodel/qitemselectionmodel.pro | 0 .../qitemselectionmodel/tst_qitemselectionmodel.cpp | 0 .../itemmodels}/qsortfilterproxymodel/.gitignore | 0 .../qsortfilterproxymodel/qsortfilterproxymodel.pro | 0 .../qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp | 0 .../itemmodels}/qstringlistmodel/.gitignore | 0 .../itemmodels}/qstringlistmodel/qmodellistener.h | 0 .../itemmodels}/qstringlistmodel/qstringlistmodel.pro | 0 .../qstringlistmodel/tst_qstringlistmodel.cpp | 0 tests/auto/widgets/itemviews/itemviews.pro | 5 ----- 36 files changed, 49 insertions(+), 49 deletions(-) rename src/{widgets/itemviews => corelib/itemmodels}/qabstractproxymodel.cpp (99%) rename src/{widgets/itemviews => corelib/itemmodels}/qabstractproxymodel.h (97%) rename src/{widgets/itemviews => corelib/itemmodels}/qabstractproxymodel_p.h (96%) rename src/{widgets/itemviews => corelib/itemmodels}/qidentityproxymodel.cpp (99%) rename src/{widgets/itemviews => corelib/itemmodels}/qidentityproxymodel.h (97%) rename src/{widgets/itemviews => corelib/itemmodels}/qitemselectionmodel.cpp (99%) rename src/{widgets/itemviews => corelib/itemmodels}/qitemselectionmodel.h (97%) rename src/{widgets/itemviews => corelib/itemmodels}/qitemselectionmodel_p.h (100%) rename src/{widgets/itemviews => corelib/itemmodels}/qsortfilterproxymodel.cpp (99%) rename src/{widgets/itemviews => corelib/itemmodels}/qsortfilterproxymodel.h (98%) rename src/{widgets/itemviews => corelib/itemmodels}/qstringlistmodel.cpp (99%) rename src/{widgets/itemviews => corelib/itemmodels}/qstringlistmodel.h (97%) rename tests/auto/{widgets/itemviews => corelib/itemmodels}/qabstractproxymodel/.gitignore (100%) rename tests/auto/{widgets/itemviews => corelib/itemmodels}/qabstractproxymodel/qabstractproxymodel.pro (100%) rename tests/auto/{widgets/itemviews => corelib/itemmodels}/qabstractproxymodel/tst_qabstractproxymodel.cpp (100%) rename tests/auto/{widgets/itemviews => corelib/itemmodels}/qidentityproxymodel/qidentityproxymodel.pro (100%) rename tests/auto/{widgets/itemviews => corelib/itemmodels}/qidentityproxymodel/tst_qidentityproxymodel.cpp (100%) rename tests/auto/{widgets/itemviews => corelib/itemmodels}/qitemselectionmodel/.gitignore (100%) rename tests/auto/{widgets/itemviews => corelib/itemmodels}/qitemselectionmodel/qitemselectionmodel.pro (100%) rename tests/auto/{widgets/itemviews => corelib/itemmodels}/qitemselectionmodel/tst_qitemselectionmodel.cpp (100%) rename tests/auto/{widgets/itemviews => corelib/itemmodels}/qsortfilterproxymodel/.gitignore (100%) rename tests/auto/{widgets/itemviews => corelib/itemmodels}/qsortfilterproxymodel/qsortfilterproxymodel.pro (100%) rename tests/auto/{widgets/itemviews => corelib/itemmodels}/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp (100%) rename tests/auto/{widgets/itemviews => corelib/itemmodels}/qstringlistmodel/.gitignore (100%) rename tests/auto/{widgets/itemviews => corelib/itemmodels}/qstringlistmodel/qmodellistener.h (100%) rename tests/auto/{widgets/itemviews => corelib/itemmodels}/qstringlistmodel/qstringlistmodel.pro (100%) rename tests/auto/{widgets/itemviews => corelib/itemmodels}/qstringlistmodel/tst_qstringlistmodel.cpp (100%) diff --git a/src/corelib/itemmodels/itemmodels.pri b/src/corelib/itemmodels/itemmodels.pri index 618c748..83ec4c5 100644 --- a/src/corelib/itemmodels/itemmodels.pri +++ b/src/corelib/itemmodels/itemmodels.pri @@ -2,7 +2,19 @@ HEADERS += \ itemmodels/qabstractitemmodel.h \ - itemmodels/qabstractitemmodel_p.h + itemmodels/qabstractitemmodel_p.h \ + itemmodels/qabstractproxymodel.h \ + itemmodels/qabstractproxymodel_p.h \ + itemmodels/qitemselectionmodel.h \ + itemmodels/qitemselectionmodel_p.h \ + itemmodels/qidentityproxymodel.h \ + itemmodels/qsortfilterproxymodel.h \ + itemmodels/qstringlistmodel.h SOURCES += \ - itemmodels/qabstractitemmodel.cpp + itemmodels/qabstractitemmodel.cpp \ + itemmodels/qabstractproxymodel.cpp \ + itemmodels/qitemselectionmodel.cpp \ + itemmodels/qidentityproxymodel.cpp \ + itemmodels/qsortfilterproxymodel.cpp \ + itemmodels/qstringlistmodel.cpp diff --git a/src/widgets/itemviews/qabstractproxymodel.cpp b/src/corelib/itemmodels/qabstractproxymodel.cpp similarity index 99% rename from src/widgets/itemviews/qabstractproxymodel.cpp rename to src/corelib/itemmodels/qabstractproxymodel.cpp index 47810d6..4beea7b 100644 --- a/src/widgets/itemviews/qabstractproxymodel.cpp +++ b/src/corelib/itemmodels/qabstractproxymodel.cpp @@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE \brief The QAbstractProxyModel class provides a base class for proxy item models that can do sorting, filtering or other data processing tasks. \ingroup model-view - \inmodule QtWidgets + \inmodule QtCore This class defines the standard interface that proxy models must use to be able to interoperate correctly with other model/view components. It is not diff --git a/src/widgets/itemviews/qabstractproxymodel.h b/src/corelib/itemmodels/qabstractproxymodel.h similarity index 97% rename from src/widgets/itemviews/qabstractproxymodel.h rename to src/corelib/itemmodels/qabstractproxymodel.h index a24755b..655ea1d 100644 --- a/src/widgets/itemviews/qabstractproxymodel.h +++ b/src/corelib/itemmodels/qabstractproxymodel.h @@ -48,14 +48,14 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) +QT_MODULE(Core) #ifndef QT_NO_PROXYMODEL class QAbstractProxyModelPrivate; class QItemSelection; -class Q_WIDGETS_EXPORT QAbstractProxyModel : public QAbstractItemModel +class Q_CORE_EXPORT QAbstractProxyModel : public QAbstractItemModel { Q_OBJECT diff --git a/src/widgets/itemviews/qabstractproxymodel_p.h b/src/corelib/itemmodels/qabstractproxymodel_p.h similarity index 96% rename from src/widgets/itemviews/qabstractproxymodel_p.h rename to src/corelib/itemmodels/qabstractproxymodel_p.h index 9bd38d1..cb798e0 100644 --- a/src/widgets/itemviews/qabstractproxymodel_p.h +++ b/src/corelib/itemmodels/qabstractproxymodel_p.h @@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE -class QAbstractProxyModelPrivate : public QAbstractItemModelPrivate +class Q_CORE_EXPORT QAbstractProxyModelPrivate : public QAbstractItemModelPrivate { Q_DECLARE_PUBLIC(QAbstractProxyModel) public: diff --git a/src/widgets/itemviews/qidentityproxymodel.cpp b/src/corelib/itemmodels/qidentityproxymodel.cpp similarity index 99% rename from src/widgets/itemviews/qidentityproxymodel.cpp rename to src/corelib/itemmodels/qidentityproxymodel.cpp index c891565..6edb5df 100644 --- a/src/widgets/itemviews/qidentityproxymodel.cpp +++ b/src/corelib/itemmodels/qidentityproxymodel.cpp @@ -90,7 +90,7 @@ class QIdentityProxyModelPrivate : public QAbstractProxyModelPrivate \brief The QIdentityProxyModel class proxies its source model unmodified \ingroup model-view - \inmodule QtWidgets + \inmodule QtCore QIdentityProxyModel can be used to forward the structure of a source model exactly, with no sorting, filtering or other transformation. This is similar in concept to an identity matrix where A.I = A. diff --git a/src/widgets/itemviews/qidentityproxymodel.h b/src/corelib/itemmodels/qidentityproxymodel.h similarity index 97% rename from src/widgets/itemviews/qidentityproxymodel.h rename to src/corelib/itemmodels/qidentityproxymodel.h index 8a84222..9d3c085 100644 --- a/src/widgets/itemviews/qidentityproxymodel.h +++ b/src/corelib/itemmodels/qidentityproxymodel.h @@ -43,7 +43,7 @@ #ifndef QIDENTITYPROXYMODEL_H #define QIDENTITYPROXYMODEL_H -#include +#include #ifndef QT_NO_IDENTITYPROXYMODEL @@ -51,11 +51,11 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) +QT_MODULE(Core) class QIdentityProxyModelPrivate; -class Q_WIDGETS_EXPORT QIdentityProxyModel : public QAbstractProxyModel +class Q_CORE_EXPORT QIdentityProxyModel : public QAbstractProxyModel { Q_OBJECT public: diff --git a/src/widgets/itemviews/qitemselectionmodel.cpp b/src/corelib/itemmodels/qitemselectionmodel.cpp similarity index 99% rename from src/widgets/itemviews/qitemselectionmodel.cpp rename to src/corelib/itemmodels/qitemselectionmodel.cpp index 08470a4..d4a2efd 100644 --- a/src/widgets/itemviews/qitemselectionmodel.cpp +++ b/src/corelib/itemmodels/qitemselectionmodel.cpp @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE range of selected items in a model. \ingroup model-view - \inmodule QtWidgets + \inmodule QtCore A QItemSelectionRange contains information about a range of selected items in a model. A range of items is a contiguous array @@ -331,7 +331,7 @@ QModelIndexList QItemSelectionRange::indexes() const \brief The QItemSelection class manages information about selected items in a model. \ingroup model-view - \inmodule QtWidgets + \inmodule QtCore A QItemSelection describes the items in a model that have been selected by the user. A QItemSelection is basically a list of @@ -921,7 +921,7 @@ void QItemSelectionModelPrivate::_q_layoutChanged() \brief The QItemSelectionModel class keeps track of a view's selected items. \ingroup model-view - \inmodule QtWidgets + \inmodule QtCore A QItemSelectionModel keeps track of the selected items in a view, or in several views onto the same model. It also keeps track of the diff --git a/src/widgets/itemviews/qitemselectionmodel.h b/src/corelib/itemmodels/qitemselectionmodel.h similarity index 97% rename from src/widgets/itemviews/qitemselectionmodel.h rename to src/corelib/itemmodels/qitemselectionmodel.h index ea0528a..be1f34f 100644 --- a/src/widgets/itemviews/qitemselectionmodel.h +++ b/src/corelib/itemmodels/qitemselectionmodel.h @@ -51,11 +51,11 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) +QT_MODULE(Core) #ifndef QT_NO_ITEMVIEWS -class Q_WIDGETS_EXPORT QItemSelectionRange +class Q_CORE_EXPORT QItemSelectionRange { public: @@ -148,7 +148,7 @@ inline QItemSelectionRange::QItemSelectionRange(const QModelIndex &atopLeft, class QItemSelection; class QItemSelectionModelPrivate; -class Q_WIDGETS_EXPORT QItemSelectionModel : public QObject +class Q_CORE_EXPORT QItemSelectionModel : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(QItemSelectionModel) @@ -229,7 +229,7 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QItemSelectionModel::SelectionFlags) // dummy implentation of qHash() necessary for instantiating QList::toSet() with MSVC inline uint qHash(const QItemSelectionRange &) { return 0; } -class Q_WIDGETS_EXPORT QItemSelection : public QList +class Q_CORE_EXPORT QItemSelection : public QList { public: QItemSelection() {} @@ -244,7 +244,7 @@ public: }; #ifndef QT_NO_DEBUG_STREAM -Q_WIDGETS_EXPORT QDebug operator<<(QDebug, const QItemSelectionRange &); +Q_CORE_EXPORT QDebug operator<<(QDebug, const QItemSelectionRange &); #endif #endif // QT_NO_ITEMVIEWS diff --git a/src/widgets/itemviews/qitemselectionmodel_p.h b/src/corelib/itemmodels/qitemselectionmodel_p.h similarity index 100% rename from src/widgets/itemviews/qitemselectionmodel_p.h rename to src/corelib/itemmodels/qitemselectionmodel_p.h diff --git a/src/widgets/itemviews/qsortfilterproxymodel.cpp b/src/corelib/itemmodels/qsortfilterproxymodel.cpp similarity index 99% rename from src/widgets/itemviews/qsortfilterproxymodel.cpp rename to src/corelib/itemmodels/qsortfilterproxymodel.cpp index f29ad7b..71f68f2 100644 --- a/src/widgets/itemviews/qsortfilterproxymodel.cpp +++ b/src/corelib/itemmodels/qsortfilterproxymodel.cpp @@ -1496,7 +1496,7 @@ void QSortFilterProxyModelPrivate::_q_sourceColumnsMoved( filtering data passed between another model and a view. \ingroup model-view - \inmodule QtWidgets + \inmodule QtCore QSortFilterProxyModel can be used for sorting items, filtering out items, or both. The model transforms the structure of a source model by mapping diff --git a/src/widgets/itemviews/qsortfilterproxymodel.h b/src/corelib/itemmodels/qsortfilterproxymodel.h similarity index 98% rename from src/widgets/itemviews/qsortfilterproxymodel.h rename to src/corelib/itemmodels/qsortfilterproxymodel.h index bbeec14..80f49e4 100644 --- a/src/widgets/itemviews/qsortfilterproxymodel.h +++ b/src/corelib/itemmodels/qsortfilterproxymodel.h @@ -42,7 +42,7 @@ #ifndef QSORTFILTERPROXYMODEL_H #define QSORTFILTERPROXYMODEL_H -#include +#include #ifndef QT_NO_SORTFILTERPROXYMODEL @@ -52,13 +52,13 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) +QT_MODULE(Core) class QSortFilterProxyModelPrivate; class QSortFilterProxyModelLessThan; class QSortFilterProxyModelGreaterThan; -class Q_WIDGETS_EXPORT QSortFilterProxyModel : public QAbstractProxyModel +class Q_CORE_EXPORT QSortFilterProxyModel : public QAbstractProxyModel { friend class QSortFilterProxyModelLessThan; friend class QSortFilterProxyModelGreaterThan; diff --git a/src/widgets/itemviews/qstringlistmodel.cpp b/src/corelib/itemmodels/qstringlistmodel.cpp similarity index 99% rename from src/widgets/itemviews/qstringlistmodel.cpp rename to src/corelib/itemmodels/qstringlistmodel.cpp index 95c0456..434f790 100644 --- a/src/widgets/itemviews/qstringlistmodel.cpp +++ b/src/corelib/itemmodels/qstringlistmodel.cpp @@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE \brief The QStringListModel class provides a model that supplies strings to views. \ingroup model-view - \inmodule QtWidgets + \inmodule QtCore QStringListModel is an editable model that can be used for simple cases where you need to display a number of strings in a view diff --git a/src/widgets/itemviews/qstringlistmodel.h b/src/corelib/itemmodels/qstringlistmodel.h similarity index 97% rename from src/widgets/itemviews/qstringlistmodel.h rename to src/corelib/itemmodels/qstringlistmodel.h index c2b8042..3d13314 100644 --- a/src/widgets/itemviews/qstringlistmodel.h +++ b/src/corelib/itemmodels/qstringlistmodel.h @@ -49,11 +49,11 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) +QT_MODULE(Core) #ifndef QT_NO_STRINGLISTMODEL -class Q_WIDGETS_EXPORT QStringListModel : public QAbstractListModel +class Q_CORE_EXPORT QStringListModel : public QAbstractListModel { Q_OBJECT public: diff --git a/src/widgets/itemviews/itemviews.pri b/src/widgets/itemviews/itemviews.pri index 7ef7045..d5a5012 100644 --- a/src/widgets/itemviews/itemviews.pri +++ b/src/widgets/itemviews/itemviews.pri @@ -4,7 +4,6 @@ HEADERS += \ itemviews/qabstractitemview.h \ itemviews/qabstractitemview_p.h \ itemviews/qheaderview.h \ - itemviews/qidentityproxymodel.h \ itemviews/qlistview.h \ itemviews/qlistview_p.h \ itemviews/qbsptree_p.h \ @@ -14,8 +13,6 @@ HEADERS += \ itemviews/qtreeview_p.h \ itemviews/qabstractitemdelegate.h \ itemviews/qitemdelegate.h \ - itemviews/qitemselectionmodel.h \ - itemviews/qitemselectionmodel_p.h \ itemviews/qdirmodel.h \ itemviews/qlistwidget.h \ itemviews/qlistwidget_p.h \ @@ -26,14 +23,10 @@ HEADERS += \ itemviews/qwidgetitemdata_p.h \ itemviews/qproxymodel.h \ itemviews/qproxymodel_p.h \ - itemviews/qabstractproxymodel.h \ - itemviews/qabstractproxymodel_p.h \ - itemviews/qsortfilterproxymodel.h \ itemviews/qitemeditorfactory.h \ itemviews/qitemeditorfactory_p.h \ itemviews/qstandarditemmodel.h \ itemviews/qstandarditemmodel_p.h \ - itemviews/qstringlistmodel.h \ itemviews/qtreewidgetitemiterator.h \ itemviews/qdatawidgetmapper.h \ itemviews/qfileiconprovider.h \ @@ -45,24 +38,19 @@ HEADERS += \ SOURCES += \ itemviews/qabstractitemview.cpp \ itemviews/qheaderview.cpp \ - itemviews/qidentityproxymodel.cpp \ itemviews/qlistview.cpp \ itemviews/qbsptree.cpp \ itemviews/qtableview.cpp \ itemviews/qtreeview.cpp \ itemviews/qabstractitemdelegate.cpp \ itemviews/qitemdelegate.cpp \ - itemviews/qitemselectionmodel.cpp \ itemviews/qdirmodel.cpp \ itemviews/qlistwidget.cpp \ itemviews/qtablewidget.cpp \ itemviews/qtreewidget.cpp \ itemviews/qproxymodel.cpp \ - itemviews/qabstractproxymodel.cpp \ - itemviews/qsortfilterproxymodel.cpp \ itemviews/qitemeditorfactory.cpp \ itemviews/qstandarditemmodel.cpp \ - itemviews/qstringlistmodel.cpp \ itemviews/qtreewidgetitemiterator.cpp \ itemviews/qdatawidgetmapper.cpp \ itemviews/qfileiconprovider.cpp \ diff --git a/src/widgets/itemviews/qabstractitemview.h b/src/widgets/itemviews/qabstractitemview.h index 25501e6..00b19cf 100644 --- a/src/widgets/itemviews/qabstractitemview.h +++ b/src/widgets/itemviews/qabstractitemview.h @@ -44,7 +44,7 @@ #include #include -#include +#include #include QT_BEGIN_HEADER diff --git a/src/widgets/itemviews/qlistwidget.h b/src/widgets/itemviews/qlistwidget.h index 750b85b..6eb2ab7 100644 --- a/src/widgets/itemviews/qlistwidget.h +++ b/src/widgets/itemviews/qlistwidget.h @@ -45,7 +45,7 @@ #include #include #include -#include +#include QT_BEGIN_HEADER diff --git a/src/widgets/util/qcompleter.cpp b/src/widgets/util/qcompleter.cpp index e99dd9f..34db1b3 100644 --- a/src/widgets/util/qcompleter.cpp +++ b/src/widgets/util/qcompleter.cpp @@ -147,7 +147,7 @@ #ifndef QT_NO_COMPLETER #include "QtWidgets/qscrollbar.h" -#include "QtWidgets/qstringlistmodel.h" +#include "QtCore/qstringlistmodel.h" #include "QtWidgets/qdirmodel.h" #include "QtWidgets/qfilesystemmodel.h" #include "QtWidgets/qheaderview.h" diff --git a/src/widgets/util/qcompleter_p.h b/src/widgets/util/qcompleter_p.h index 639c875..78e201b 100644 --- a/src/widgets/util/qcompleter_p.h +++ b/src/widgets/util/qcompleter_p.h @@ -59,7 +59,7 @@ #ifndef QT_NO_COMPLETER #include "QtWidgets/qtreeview.h" -#include "QtWidgets/qabstractproxymodel.h" +#include "QtCore/qabstractproxymodel.h" #include "qcompleter.h" #include "QtWidgets/qitemdelegate.h" #include "QtGui/qpainter.h" diff --git a/tests/auto/corelib/itemmodels/itemmodels.pro b/tests/auto/corelib/itemmodels/itemmodels.pro index c11a1f1..c5124c3 100644 --- a/tests/auto/corelib/itemmodels/itemmodels.pro +++ b/tests/auto/corelib/itemmodels/itemmodels.pro @@ -1,5 +1,10 @@ TEMPLATE=subdirs -SUBDIRS = qabstractitemmodel +SUBDIRS = qabstractitemmodel \ + qabstractproxymodel \ + qidentityproxymodel \ + qitemselectionmodel \ + qsortfilterproxymodel \ + qstringlistmodel mac: qabstractitemmodel.CONFIG = no_check_target # QTBUG-22748 diff --git a/tests/auto/corelib/itemmodels/qabstractitemmodel/tst_qabstractitemmodel.cpp b/tests/auto/corelib/itemmodels/qabstractitemmodel/tst_qabstractitemmodel.cpp index 2340c86..199d96c 100644 --- a/tests/auto/corelib/itemmodels/qabstractitemmodel/tst_qabstractitemmodel.cpp +++ b/tests/auto/corelib/itemmodels/qabstractitemmodel/tst_qabstractitemmodel.cpp @@ -42,8 +42,8 @@ #include #include -#include -#include +#include +#include #include "dynamictreemodel.h" diff --git a/tests/auto/widgets/itemviews/qabstractproxymodel/.gitignore b/tests/auto/corelib/itemmodels/qabstractproxymodel/.gitignore similarity index 100% rename from tests/auto/widgets/itemviews/qabstractproxymodel/.gitignore rename to tests/auto/corelib/itemmodels/qabstractproxymodel/.gitignore diff --git a/tests/auto/widgets/itemviews/qabstractproxymodel/qabstractproxymodel.pro b/tests/auto/corelib/itemmodels/qabstractproxymodel/qabstractproxymodel.pro similarity index 100% rename from tests/auto/widgets/itemviews/qabstractproxymodel/qabstractproxymodel.pro rename to tests/auto/corelib/itemmodels/qabstractproxymodel/qabstractproxymodel.pro diff --git a/tests/auto/widgets/itemviews/qabstractproxymodel/tst_qabstractproxymodel.cpp b/tests/auto/corelib/itemmodels/qabstractproxymodel/tst_qabstractproxymodel.cpp similarity index 100% rename from tests/auto/widgets/itemviews/qabstractproxymodel/tst_qabstractproxymodel.cpp rename to tests/auto/corelib/itemmodels/qabstractproxymodel/tst_qabstractproxymodel.cpp diff --git a/tests/auto/widgets/itemviews/qidentityproxymodel/qidentityproxymodel.pro b/tests/auto/corelib/itemmodels/qidentityproxymodel/qidentityproxymodel.pro similarity index 100% rename from tests/auto/widgets/itemviews/qidentityproxymodel/qidentityproxymodel.pro rename to tests/auto/corelib/itemmodels/qidentityproxymodel/qidentityproxymodel.pro diff --git a/tests/auto/widgets/itemviews/qidentityproxymodel/tst_qidentityproxymodel.cpp b/tests/auto/corelib/itemmodels/qidentityproxymodel/tst_qidentityproxymodel.cpp similarity index 100% rename from tests/auto/widgets/itemviews/qidentityproxymodel/tst_qidentityproxymodel.cpp rename to tests/auto/corelib/itemmodels/qidentityproxymodel/tst_qidentityproxymodel.cpp diff --git a/tests/auto/widgets/itemviews/qitemselectionmodel/.gitignore b/tests/auto/corelib/itemmodels/qitemselectionmodel/.gitignore similarity index 100% rename from tests/auto/widgets/itemviews/qitemselectionmodel/.gitignore rename to tests/auto/corelib/itemmodels/qitemselectionmodel/.gitignore diff --git a/tests/auto/widgets/itemviews/qitemselectionmodel/qitemselectionmodel.pro b/tests/auto/corelib/itemmodels/qitemselectionmodel/qitemselectionmodel.pro similarity index 100% rename from tests/auto/widgets/itemviews/qitemselectionmodel/qitemselectionmodel.pro rename to tests/auto/corelib/itemmodels/qitemselectionmodel/qitemselectionmodel.pro diff --git a/tests/auto/widgets/itemviews/qitemselectionmodel/tst_qitemselectionmodel.cpp b/tests/auto/corelib/itemmodels/qitemselectionmodel/tst_qitemselectionmodel.cpp similarity index 100% rename from tests/auto/widgets/itemviews/qitemselectionmodel/tst_qitemselectionmodel.cpp rename to tests/auto/corelib/itemmodels/qitemselectionmodel/tst_qitemselectionmodel.cpp diff --git a/tests/auto/widgets/itemviews/qsortfilterproxymodel/.gitignore b/tests/auto/corelib/itemmodels/qsortfilterproxymodel/.gitignore similarity index 100% rename from tests/auto/widgets/itemviews/qsortfilterproxymodel/.gitignore rename to tests/auto/corelib/itemmodels/qsortfilterproxymodel/.gitignore diff --git a/tests/auto/widgets/itemviews/qsortfilterproxymodel/qsortfilterproxymodel.pro b/tests/auto/corelib/itemmodels/qsortfilterproxymodel/qsortfilterproxymodel.pro similarity index 100% rename from tests/auto/widgets/itemviews/qsortfilterproxymodel/qsortfilterproxymodel.pro rename to tests/auto/corelib/itemmodels/qsortfilterproxymodel/qsortfilterproxymodel.pro diff --git a/tests/auto/widgets/itemviews/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp b/tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp similarity index 100% rename from tests/auto/widgets/itemviews/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp rename to tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp diff --git a/tests/auto/widgets/itemviews/qstringlistmodel/.gitignore b/tests/auto/corelib/itemmodels/qstringlistmodel/.gitignore similarity index 100% rename from tests/auto/widgets/itemviews/qstringlistmodel/.gitignore rename to tests/auto/corelib/itemmodels/qstringlistmodel/.gitignore diff --git a/tests/auto/widgets/itemviews/qstringlistmodel/qmodellistener.h b/tests/auto/corelib/itemmodels/qstringlistmodel/qmodellistener.h similarity index 100% rename from tests/auto/widgets/itemviews/qstringlistmodel/qmodellistener.h rename to tests/auto/corelib/itemmodels/qstringlistmodel/qmodellistener.h diff --git a/tests/auto/widgets/itemviews/qstringlistmodel/qstringlistmodel.pro b/tests/auto/corelib/itemmodels/qstringlistmodel/qstringlistmodel.pro similarity index 100% rename from tests/auto/widgets/itemviews/qstringlistmodel/qstringlistmodel.pro rename to tests/auto/corelib/itemmodels/qstringlistmodel/qstringlistmodel.pro diff --git a/tests/auto/widgets/itemviews/qstringlistmodel/tst_qstringlistmodel.cpp b/tests/auto/corelib/itemmodels/qstringlistmodel/tst_qstringlistmodel.cpp similarity index 100% rename from tests/auto/widgets/itemviews/qstringlistmodel/tst_qstringlistmodel.cpp rename to tests/auto/corelib/itemmodels/qstringlistmodel/tst_qstringlistmodel.cpp diff --git a/tests/auto/widgets/itemviews/itemviews.pro b/tests/auto/widgets/itemviews/itemviews.pro index fc338fd..e13a5a8 100644 --- a/tests/auto/widgets/itemviews/itemviews.pro +++ b/tests/auto/widgets/itemviews/itemviews.pro @@ -1,23 +1,18 @@ TEMPLATE=subdirs SUBDIRS=\ qabstractitemview \ - qabstractproxymodel \ qcolumnview \ qdatawidgetmapper \ qdirmodel \ qfileiconprovider \ qheaderview \ - qidentityproxymodel \ qitemdelegate \ qitemeditorfactory \ - qitemselectionmodel \ qitemview \ qlistview \ qlistwidget \ - qsortfilterproxymodel \ qstandarditem \ qstandarditemmodel \ - qstringlistmodel \ qtableview \ qtablewidget \ qtreeview \ -- 2.7.4