diff options
author | Marc Mutz <marc.mutz@kdab.com> | 2015-07-10 22:56:13 +0200 |
---|---|---|
committer | Marc Mutz <marc.mutz@kdab.com> | 2015-07-13 22:27:08 +0000 |
commit | f5243c0591469dd876acef2fbcbe1837d5bf648a (patch) | |
tree | 09c5301e083e8836d8b360a127dc38890e65e5ad | |
parent | c19e67eb73c8db6a2d30a1260779d3221083382c (diff) |
QtWidgets: mark some private types movable or primitive
They are held in Qt containers or QVariant.
Change-Id: Ida1b904120d4fb53a5596f1c3cbc973bd2ca315e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
-rw-r--r-- | src/widgets/dialogs/qfilesystemmodel_p.h | 1 | ||||
-rw-r--r-- | src/widgets/dialogs/qwizard.cpp | 2 | ||||
-rw-r--r-- | src/widgets/graphicsview/qgraphicsanchorlayout_p.h | 1 | ||||
-rw-r--r-- | src/widgets/itemviews/qheaderview_p.h | 1 | ||||
-rw-r--r-- | src/widgets/itemviews/qlistview_p.h | 2 | ||||
-rw-r--r-- | src/widgets/itemviews/qwidgetitemdata_p.h | 1 | ||||
-rw-r--r-- | src/widgets/util/qscroller_p.h | 3 | ||||
-rw-r--r-- | src/widgets/widgets/qtextbrowser.cpp | 1 |
8 files changed, 12 insertions, 0 deletions
diff --git a/src/widgets/dialogs/qfilesystemmodel_p.h b/src/widgets/dialogs/qfilesystemmodel_p.h index dd4b25d59c..f749080548 100644 --- a/src/widgets/dialogs/qfilesystemmodel_p.h +++ b/src/widgets/dialogs/qfilesystemmodel_p.h @@ -318,6 +318,7 @@ public: QList<Fetching> toFetch; }; +Q_DECLARE_TYPEINFO(QFileSystemModelPrivate::Fetching, Q_MOVABLE_TYPE); #endif // QT_NO_FILESYSTEMMODEL QT_END_NAMESPACE diff --git a/src/widgets/dialogs/qwizard.cpp b/src/widgets/dialogs/qwizard.cpp index 680d29443d..6a1c0eb592 100644 --- a/src/widgets/dialogs/qwizard.cpp +++ b/src/widgets/dialogs/qwizard.cpp @@ -170,6 +170,7 @@ public: const char *changedSignal) : className(className), property(property), changedSignal(changedSignal) {} }; +Q_DECLARE_TYPEINFO(QWizardDefaultProperty, Q_MOVABLE_TYPE); class QWizardField { @@ -189,6 +190,7 @@ public: QByteArray changedSignal; QVariant initialValue; }; +Q_DECLARE_TYPEINFO(QWizardField, Q_MOVABLE_TYPE); QWizardField::QWizardField(QWizardPage *page, const QString &spec, QObject *object, const char *property, const char *changedSignal) diff --git a/src/widgets/graphicsview/qgraphicsanchorlayout_p.h b/src/widgets/graphicsview/qgraphicsanchorlayout_p.h index c0bb8ef63a..a5c7f1e2ce 100644 --- a/src/widgets/graphicsview/qgraphicsanchorlayout_p.h +++ b/src/widgets/graphicsview/qgraphicsanchorlayout_p.h @@ -317,6 +317,7 @@ public: QSet<AnchorData *> positives; QSet<AnchorData *> negatives; }; +Q_DECLARE_TYPEINFO(GraphPath, Q_MOVABLE_TYPE); class QGraphicsAnchorLayoutPrivate; /*! diff --git a/src/widgets/itemviews/qheaderview_p.h b/src/widgets/itemviews/qheaderview_p.h index 621c3c990e..7f92d2a81b 100644 --- a/src/widgets/itemviews/qheaderview_p.h +++ b/src/widgets/itemviews/qheaderview_p.h @@ -369,6 +369,7 @@ public: #endif }; +Q_DECLARE_TYPEINFO(QHeaderViewPrivate::SectionItem, Q_PRIMITIVE_TYPE); QT_END_NAMESPACE diff --git a/src/widgets/itemviews/qlistview_p.h b/src/widgets/itemviews/qlistview_p.h index fe059d73dd..c1b5b8772c 100644 --- a/src/widgets/itemviews/qlistview_p.h +++ b/src/widgets/itemviews/qlistview_p.h @@ -93,6 +93,7 @@ private: mutable int indexHint; uint visited; }; +Q_DECLARE_TYPEINFO(QListViewItem, Q_PRIMITIVE_TYPE); struct QListViewLayoutInfo { @@ -105,6 +106,7 @@ struct QListViewLayoutInfo QListView::Flow flow; int max; }; +Q_DECLARE_TYPEINFO(QListViewLayoutInfo, Q_PRIMITIVE_TYPE); class QListView; class QListViewPrivate; diff --git a/src/widgets/itemviews/qwidgetitemdata_p.h b/src/widgets/itemviews/qwidgetitemdata_p.h index 307d228c74..d8c1fc2ff7 100644 --- a/src/widgets/itemviews/qwidgetitemdata_p.h +++ b/src/widgets/itemviews/qwidgetitemdata_p.h @@ -58,6 +58,7 @@ public: QVariant value; inline bool operator==(const QWidgetItemData &other) const { return role == other.role && value == other.value; } }; +Q_DECLARE_TYPEINFO(QWidgetItemData, Q_MOVABLE_TYPE); #ifndef QT_NO_DATASTREAM diff --git a/src/widgets/util/qscroller_p.h b/src/widgets/util/qscroller_p.h index bb00c12905..d09f78d130 100644 --- a/src/widgets/util/qscroller_p.h +++ b/src/widgets/util/qscroller_p.h @@ -196,6 +196,9 @@ public: QScroller *q_ptr; }; +template <> +class QTypeInfo<QScrollerPrivate::ScrollSegment> + : public QTypeInfoMerger<QScrollerPrivate::ScrollSegment, QEasingCurve> {}; QT_END_NAMESPACE diff --git a/src/widgets/widgets/qtextbrowser.cpp b/src/widgets/widgets/qtextbrowser.cpp index 9bf305a055..2c073342b0 100644 --- a/src/widgets/widgets/qtextbrowser.cpp +++ b/src/widgets/widgets/qtextbrowser.cpp @@ -139,6 +139,7 @@ public: int lastKeypadScrollValue; #endif }; +Q_DECLARE_TYPEINFO(QTextBrowserPrivate::HistoryEntry, Q_MOVABLE_TYPE); QString QTextBrowserPrivate::findFile(const QUrl &name) const { |