diff options
author | Marc Mutz <marc.mutz@kdab.com> | 2015-07-19 21:46:15 +0200 |
---|---|---|
committer | Marc Mutz <marc.mutz@kdab.com> | 2015-07-22 21:13:13 +0000 |
commit | 14dde164dc0d69baf5af0efeb6703a7878b7d3da (patch) | |
tree | dd0791b80e19e07e4fdbfcf82475b276b1a09dca /src/tools | |
parent | 47e6ddb2c0dd9071840d29a39c770ad61634b069 (diff) |
tools: mark some types movable/primitive
They are held in QList or QVector.
Change-Id: Ic0e379560e554e5cd3de4319e402ec1655e77874
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Diffstat (limited to 'src/tools')
-rw-r--r-- | src/tools/moc/symbols.h | 1 | ||||
-rw-r--r-- | src/tools/qdoc/config.cpp | 1 | ||||
-rw-r--r-- | src/tools/qdoc/doc.h | 1 | ||||
-rw-r--r-- | src/tools/qdoc/node.h | 1 | ||||
-rw-r--r-- | src/tools/qdoc/openedlist.h | 1 | ||||
-rw-r--r-- | src/tools/qdoc/qmlmarkupvisitor.h | 1 | ||||
-rw-r--r-- | src/tools/qlalr/lalr.h | 6 | ||||
-rw-r--r-- | src/tools/rcc/rcc.cpp | 1 |
8 files changed, 13 insertions, 0 deletions
diff --git a/src/tools/moc/symbols.h b/src/tools/moc/symbols.h index 0368a75793..5f442e75ed 100644 --- a/src/tools/moc/symbols.h +++ b/src/tools/moc/symbols.h @@ -133,6 +133,7 @@ struct SafeSymbols { QSet<QByteArray> excludedSymbols; int index; }; +Q_DECLARE_TYPEINFO(SafeSymbols, Q_MOVABLE_TYPE); class SymbolStack : public QStack<SafeSymbols> { diff --git a/src/tools/qdoc/config.cpp b/src/tools/qdoc/config.cpp index 13add73322..4842c68c92 100644 --- a/src/tools/qdoc/config.cpp +++ b/src/tools/qdoc/config.cpp @@ -134,6 +134,7 @@ public: QStringList accum; QStringList next; }; +Q_DECLARE_TYPEINFO(MetaStackEntry, Q_MOVABLE_TYPE); /*! Start accumulating values in a list by appending an empty diff --git a/src/tools/qdoc/doc.h b/src/tools/qdoc/doc.h index 80d47287bb..dd14e73e91 100644 --- a/src/tools/qdoc/doc.h +++ b/src/tools/qdoc/doc.h @@ -188,6 +188,7 @@ private: DocPrivate *priv; static const Config* config_; }; +Q_DECLARE_TYPEINFO(Doc, Q_MOVABLE_TYPE); typedef QList<Doc> DocList; QT_END_NAMESPACE diff --git a/src/tools/qdoc/node.h b/src/tools/qdoc/node.h index 27edfd1156..f8ae314d31 100644 --- a/src/tools/qdoc/node.h +++ b/src/tools/qdoc/node.h @@ -366,6 +366,7 @@ private: static int propertyGroupCount_; static QMap<QString,Node::NodeType> goals_; }; +Q_DECLARE_TYPEINFO(Node::DocSubtype, Q_PRIMITIVE_TYPE); class Aggregate : public Node { diff --git a/src/tools/qdoc/openedlist.h b/src/tools/qdoc/openedlist.h index ee45714cfd..3a564b018d 100644 --- a/src/tools/qdoc/openedlist.h +++ b/src/tools/qdoc/openedlist.h @@ -79,6 +79,7 @@ private: QString pref; QString suff; }; +Q_DECLARE_TYPEINFO(OpenedList, Q_MOVABLE_TYPE); QT_END_NAMESPACE diff --git a/src/tools/qdoc/qmlmarkupvisitor.h b/src/tools/qdoc/qmlmarkupvisitor.h index 34d18d6868..e336f32929 100644 --- a/src/tools/qdoc/qmlmarkupvisitor.h +++ b/src/tools/qdoc/qmlmarkupvisitor.h @@ -164,6 +164,7 @@ private: quint32 cursor; int extraIndex; }; +Q_DECLARE_TYPEINFO(QmlMarkupVisitor::ExtraType, Q_PRIMITIVE_TYPE); QT_END_NAMESPACE diff --git a/src/tools/qlalr/lalr.h b/src/tools/qlalr/lalr.h index 138b1bb876..bdd6609ba6 100644 --- a/src/tools/qlalr/lalr.h +++ b/src/tools/qlalr/lalr.h @@ -396,6 +396,9 @@ public: StatePointer state; Name nt; }; +QT_BEGIN_NAMESPACE +Q_DECLARE_TYPEINFO(OrderedSet<Node<Read> >::const_iterator, Q_PRIMITIVE_TYPE); +QT_END_NAMESPACE class Include { @@ -417,6 +420,9 @@ public: StatePointer state; Name nt; }; +QT_BEGIN_NAMESPACE +Q_DECLARE_TYPEINFO(OrderedSet<Node<Include> >::const_iterator, Q_PRIMITIVE_TYPE); +QT_END_NAMESPACE class Automaton { diff --git a/src/tools/rcc/rcc.cpp b/src/tools/rcc/rcc.cpp index 6f00168b72..40e77c9876 100644 --- a/src/tools/rcc/rcc.cpp +++ b/src/tools/rcc/rcc.cpp @@ -366,6 +366,7 @@ enum RCCXmlTag { ResourceTag, FileTag }; +Q_DECLARE_TYPEINFO(RCCXmlTag, Q_PRIMITIVE_TYPE); bool RCCResourceLibrary::interpretResourceFile(QIODevice *inputDevice, const QString &fname, QString currentPath, bool ignoreErrors) |