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>
This commit is contained in:
Marc Mutz 2015-07-19 21:46:15 +02:00
parent 47e6ddb2c0
commit 14dde164dc
8 changed files with 13 additions and 0 deletions

View File

@ -133,6 +133,7 @@ struct SafeSymbols {
QSet<QByteArray> excludedSymbols;
int index;
};
Q_DECLARE_TYPEINFO(SafeSymbols, Q_MOVABLE_TYPE);
class SymbolStack : public QStack<SafeSymbols>
{

View File

@ -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

View File

@ -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

View File

@ -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
{

View File

@ -79,6 +79,7 @@ private:
QString pref;
QString suff;
};
Q_DECLARE_TYPEINFO(OpenedList, Q_MOVABLE_TYPE);
QT_END_NAMESPACE

View File

@ -164,6 +164,7 @@ private:
quint32 cursor;
int extraIndex;
};
Q_DECLARE_TYPEINFO(QmlMarkupVisitor::ExtraType, Q_PRIMITIVE_TYPE);
QT_END_NAMESPACE

View File

@ -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
{

View File

@ -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)