Sprinkle Q_DECLARE_TYPEINFO on types used in containers

Change-Id: I6c71ed8c20cd5e785037ad25c2d3da8994e8e3a0
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Giuseppe D'Angelo 2017-02-22 11:58:43 +00:00
parent 30da659af5
commit f526aa725d
7 changed files with 13 additions and 0 deletions

View File

@ -1802,6 +1802,8 @@ struct QSettingsIniSection
inline QSettingsIniSection() : position(-1) {}
};
Q_DECLARE_TYPEINFO(QSettingsIniSection, Q_MOVABLE_TYPE);
typedef QMap<QString, QSettingsIniSection> IniMap;
/*

View File

@ -109,6 +109,8 @@ private:
};
#endif
Q_DECLARE_TYPEINFO(QSettingsKey, Q_MOVABLE_TYPE);
typedef QMap<QSettingsKey, QByteArray> UnparsedSettingsMap;
typedef QMap<QSettingsKey, QVariant> ParsedSettingsMap;

View File

@ -124,6 +124,8 @@ protected:
QObject *parent);
};
Q_DECLARE_TYPEINFO(QAbstractEventDispatcher::TimerInfo, (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) ? Q_PRIMITIVE_TYPE : Q_RELOCATABLE_TYPE));
QT_END_NAMESPACE
#endif // QABSTRACTEVENTDISPATCHER_H

View File

@ -103,6 +103,8 @@ struct sockaddr;
QT_BEGIN_NAMESPACE
Q_DECLARE_TYPEINFO(pollfd, Q_PRIMITIVE_TYPE);
// Internal operator functions for timespecs
inline timespec &normalizedTimespec(timespec &t)
{

View File

@ -243,6 +243,7 @@ public:
QAtomicPointer<QtSharedPointer::ExternalRefCountData> sharedRefcount;
};
Q_DECLARE_TYPEINFO(QObjectPrivate::ConnectionList, Q_MOVABLE_TYPE);
/*! \internal

View File

@ -228,6 +228,8 @@ public:
} // namespace QtPrivate
Q_DECLARE_TYPEINFO(QtPrivate::ResultItem, Q_PRIMITIVE_TYPE);
#endif //Q_QDOC
QT_END_NAMESPACE

View File

@ -159,6 +159,8 @@ private:
qint64 bufferSize;
};
Q_DECLARE_TYPEINFO(QRingBuffer, Q_MOVABLE_TYPE);
QT_END_NAMESPACE
#endif // QRINGBUFFER_P_H