Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-23 10:22:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

use QStdVector<T> instead of QVector<T> for metatype and font database cache

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2022-01-29 02:00:30 +02:00
parent 58f2734108
commit d4785c2987
3 changed files with 22 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/core/kernel/qmetatype.cpp
View file

@ -28,6 +28,7 @@
#include "qstringlist.h"
#include "qvector.h"
#include "qlocale.h"
#include "qstdcontainers_p.h"
#ifndef QT_BOOTSTRAPPED
# include "qeasingcurve.h"
@ -335,7 +336,7 @@ public:
};
Q_DECLARE_TYPEINFO(QCustomTypeInfo, Q_MOVABLE_TYPE);
Q_GLOBAL_STATIC(QVector<QCustomTypeInfo>, customTypes)
Q_GLOBAL_STATIC(QStdVector<QCustomTypeInfo>, customTypes)
Q_GLOBAL_STATIC(QReadWriteLock, customTypesLock)
#ifndef QT_NO_DATASTREAM
@ -358,7 +359,7 @@ void QMetaType::registerStreamOperators(int idx, SaveOperator saveOp,
if (idx < User)
return; //builtin types should not be registered;
QWriteLocker locker(customTypesLock());
QVector<QCustomTypeInfo> *ct = customTypes();
QStdVector<QCustomTypeInfo> *ct = customTypes();
if (!ct)
return;
QCustomTypeInfo &inf = (*ct)[idx - User];
@ -385,7 +386,7 @@ const char *QMetaType::typeName(int type)
return MetaTypeTbl[type - FirstCoreExtType + GuiTypeCount + LastCoreType + 2].typeName;
} else if (type >= User) {
QReadLocker locker(customTypesLock());
const QVector<QCustomTypeInfo> * const ct = customTypes();
const QStdVector<QCustomTypeInfo> * const ct = customTypes();
return ct && ct->count() > type - User && !ct->at(type - User).typeName.isEmpty()
? ct->at(type - User).typeName.constData() : nullptr;
}
@ -412,7 +413,7 @@ static inline int qMetaTypeStaticType(const char *typeName, int length)
*/
static int qMetaTypeCustomType_unlocked(const char *typeName, int length)
{
const QVector<QCustomTypeInfo> * const ct = customTypes();
const QStdVector<QCustomTypeInfo> * const ct = customTypes();
if (!ct)
return 0;
@ -451,7 +452,7 @@ int QMetaType::registerType(const char *typeName, Destructor destructor,
if (!idx) {
QWriteLocker locker(customTypesLock());
QVector<QCustomTypeInfo> *ct = customTypes();
QStdVector<QCustomTypeInfo> *ct = customTypes();
idx = qMetaTypeCustomType_unlocked(normalizedTypeName.constData(),
normalizedTypeName.size());
if (!idx) {
@ -492,7 +493,7 @@ int QMetaType::registerTypedef(const char* typeName, int aliasId)
}
QWriteLocker locker(customTypesLock());
QVector<QCustomTypeInfo> *ct = customTypes();
QStdVector<QCustomTypeInfo> *ct = customTypes();
idx = qMetaTypeCustomType_unlocked(normalizedTypeName.constData(),
normalizedTypeName.size());
@ -526,7 +527,7 @@ void QMetaType::unregisterType(const char *typeName)
NS(QByteArray) normalizedTypeName = QMetaObject::normalizedType(typeName);
#endif
QWriteLocker locker(customTypesLock());
QVector<QCustomTypeInfo> *ct = customTypes();
QStdVector<QCustomTypeInfo> *ct = customTypes();
for (int v = 0; v < ct->count(); ++v) {
if (ct->at(v).typeName == typeName) {
QCustomTypeInfo &inf = (*ct)[v];
@ -553,7 +554,7 @@ bool QMetaType::isRegistered(int type)
return false;
}
QReadLocker locker(customTypesLock());
const QVector<QCustomTypeInfo> * const ct = customTypes();
const QStdVector<QCustomTypeInfo> * const ct = customTypes();
return (ct && (ct->count() > type - User) && !ct->at(type - User).typeName.isEmpty());
}
@ -767,7 +768,7 @@ bool QMetaType::save(QDataStream &stream, int type, const void *data)
break;
default: {
QReadLocker locker(customTypesLock());
const QVector<QCustomTypeInfo> * const ct = customTypes();
const QStdVector<QCustomTypeInfo> * const ct = customTypes();
if (!ct)
return false;
@ -965,7 +966,7 @@ bool QMetaType::load(QDataStream &stream, int type, void *data)
break;
default: {
QReadLocker locker(customTypesLock());
const QVector<QCustomTypeInfo> * const ct = customTypes();
const QStdVector<QCustomTypeInfo> * const ct = customTypes();
if (!ct)
return false;
@ -1193,7 +1194,7 @@ void *QMetaType::construct(int type, const void *copy)
constr = qMetaTypeGuiHelper[type - FirstGuiType].constr;
} else {
QReadLocker locker(customTypesLock());
const QVector<QCustomTypeInfo> * const ct = customTypes();
const QStdVector<QCustomTypeInfo> * const ct = customTypes();
if (type < User || !ct || ct->count() <= type - User)
return 0;
if (ct->at(type - User).typeName.isEmpty())
@ -1357,7 +1358,7 @@ void QMetaType::destroy(int type, void *data)
destr = qMetaTypeGuiHelper[type - FirstGuiType].destr;
} else {
QReadLocker locker(customTypesLock());
const QVector<QCustomTypeInfo> * const ct = customTypes();
const QStdVector<QCustomTypeInfo> * const ct = customTypes();
if (type < User || !ct || ct->count() <= type - User)
break;
if (ct->at(type - User).typeName.isEmpty())

13
src/dbus/qdbusmetatype.cpp
View file

@ -28,6 +28,7 @@
#include "qdbusutil_p.h"
#include "qdbusmetatype_p.h"
#include "qdbusargument_p.h"
#include "qstdcontainers_p.h"
#include <dbus/dbus.h>
#include <string.h>
@ -109,7 +110,7 @@ static int QDBusMetaTypeIdInit()
}
Q_CONSTRUCTOR_FUNCTION(QDBusMetaTypeIdInit);
Q_GLOBAL_STATIC(QVector<QDBusCustomTypeInfo>, customTypes)
Q_GLOBAL_STATIC(QStdVector<QDBusCustomTypeInfo>, customTypes)
Q_GLOBAL_STATIC(QReadWriteLock, customTypesLock)
/*!
@ -180,7 +181,7 @@ void QDBusMetaType::registerMarshallOperators(int id, MarshallFunction mf,
DemarshallFunction df)
{
QWriteLocker locker(customTypesLock());
QVector<QDBusCustomTypeInfo> *ct = customTypes();
QStdVector<QDBusCustomTypeInfo> *ct = customTypes();
if (id < 0 || !mf || !df || !ct)
return; // error!
@ -202,7 +203,7 @@ bool QDBusMetaType::marshall(QDBusArgument &arg, int id, const void *data)
MarshallFunction mf;
{
QReadLocker locker(customTypesLock());
QVector<QDBusCustomTypeInfo> *ct = customTypes();
QStdVector<QDBusCustomTypeInfo> *ct = customTypes();
if (id >= ct->size())
return false; // non-existent
@ -229,7 +230,7 @@ bool QDBusMetaType::demarshall(const QDBusArgument &arg, int id, void *data)
DemarshallFunction df;
{
QReadLocker locker(customTypesLock());
QVector<QDBusCustomTypeInfo> *ct = customTypes();
QStdVector<QDBusCustomTypeInfo> *ct = customTypes();
if (id >= ct->size())
return false; // non-existent
@ -395,7 +396,7 @@ const char *QDBusMetaType::typeToSignature(int type)
// try the database
{
QReadLocker locker(customTypesLock());
QVector<QDBusCustomTypeInfo> *ct = customTypes();
QStdVector<QDBusCustomTypeInfo> *ct = customTypes();
if (type >= ct->size())
return nullptr; // type not registered with us
@ -415,7 +416,7 @@ const char *QDBusMetaType::typeToSignature(int type)
// re-acquire lock
QWriteLocker locker(customTypesLock());
QVector<QDBusCustomTypeInfo> *ct = customTypes();
QStdVector<QDBusCustomTypeInfo> *ct = customTypes();
QDBusCustomTypeInfo *info = &(*ct)[type];
info->signature = signature;

3
src/gui/text/qfontdatabase.cpp
View file

@ -25,6 +25,7 @@
#include "qapplication.h"
#include "qthread.h"
#include "qmutex.h"
#include "qstdcontainers_p.h"
#include "qunicodetables_p.h"
#include "qfontengine_p.h"
#include "qfontinfo.h"
@ -77,7 +78,7 @@ bool QtFontFamily::operator<(const QtFontFamily &other) const
return (preference >= other.preference);
}
typedef QVector<QtFontFamily> QtFontFamilyList;
typedef QStdVector<QtFontFamily> QtFontFamilyList;
Q_GLOBAL_STATIC(QtFontFamilyList, qGlobalFontDatabase)
Q_GLOBAL_STATIC(QMutex, qGlobalFontDatabaseMutex)