From 6f0065944dc3c638553519bc7d4883f2cca6e04f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= Date: Mon, 26 Mar 2012 10:04:21 +0200 Subject: Hide QTypeModuleInfo in a private namespace. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The class is private and shouldn't pollute global namespace. Change-Id: Ib44473fd72e5a70096eeff1662e88b29263d19c6 Reviewed-by: João Abecasis --- src/corelib/kernel/qmetatype.cpp | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'src/corelib/kernel/qmetatype.cpp') diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp index fba1aaf9b6..1207d995b0 100644 --- a/src/corelib/kernel/qmetatype.cpp +++ b/src/corelib/kernel/qmetatype.cpp @@ -82,7 +82,7 @@ namespace { struct DefinedTypesFilter { template struct Acceptor { - static const bool IsAccepted = QtMetaTypePrivate::TypeDefinition::IsAvailable && QTypeModuleInfo::IsCore; + static const bool IsAccepted = QtMetaTypePrivate::TypeDefinition::IsAvailable && QModulesPrivate::QTypeModuleInfo::IsCore; }; }; } // namespace @@ -1061,11 +1061,11 @@ class TypeCreator { struct CreatorImpl { static void *Create(const int type, const void *copy) { - if (QTypeModuleInfo::IsGui) { + if (QModulesPrivate::QTypeModuleInfo::IsGui) { if (Q_LIKELY(qMetaTypeGuiHelper)) return qMetaTypeGuiHelper[type - QMetaType::FirstGuiType].creator(copy); } - if (QTypeModuleInfo::IsWidget) { + if (QModulesPrivate::QTypeModuleInfo::IsWidget) { if (Q_LIKELY(qMetaTypeWidgetsHelper)) return qMetaTypeWidgetsHelper[type - QMetaType::FirstWidgetsType].creator(copy); } @@ -1123,12 +1123,12 @@ class TypeDestroyer { struct DestroyerImpl { static void Destroy(const int type, void *where) { - if (QTypeModuleInfo::IsGui) { + if (QModulesPrivate::QTypeModuleInfo::IsGui) { if (Q_LIKELY(qMetaTypeGuiHelper)) qMetaTypeGuiHelper[type - QMetaType::FirstGuiType].deleter(where); return; } - if (QTypeModuleInfo::IsWidget) { + if (QModulesPrivate::QTypeModuleInfo::IsWidget) { if (Q_LIKELY(qMetaTypeWidgetsHelper)) qMetaTypeWidgetsHelper[type - QMetaType::FirstWidgetsType].deleter(where); return; @@ -1189,10 +1189,10 @@ class TypeConstructor { struct ConstructorImpl { static void *Construct(const int type, void *where, const void *copy) { - if (QTypeModuleInfo::IsGui) + if (QModulesPrivate::QTypeModuleInfo::IsGui) return Q_LIKELY(qMetaTypeGuiHelper) ? qMetaTypeGuiHelper[type - QMetaType::FirstGuiType].constructor(where, copy) : 0; - if (QTypeModuleInfo::IsWidget) + if (QModulesPrivate::QTypeModuleInfo::IsWidget) return Q_LIKELY(qMetaTypeWidgetsHelper) ? qMetaTypeWidgetsHelper[type - QMetaType::FirstWidgetsType].constructor(where, copy) : 0; // This point can be reached only for known types that definition is not available, for example @@ -1277,12 +1277,12 @@ class TypeDestructor { struct DestructorImpl { static void Destruct(const int type, void *where) { - if (QTypeModuleInfo::IsGui) { + if (QModulesPrivate::QTypeModuleInfo::IsGui) { if (Q_LIKELY(qMetaTypeGuiHelper)) qMetaTypeGuiHelper[type - QMetaType::FirstGuiType].destructor(where); return; } - if (QTypeModuleInfo::IsWidget) { + if (QModulesPrivate::QTypeModuleInfo::IsWidget) { if (Q_LIKELY(qMetaTypeWidgetsHelper)) qMetaTypeWidgetsHelper[type - QMetaType::FirstWidgetsType].destructor(where); return; @@ -1350,10 +1350,10 @@ class SizeOf { struct SizeOfImpl { static int Size(const int type) { - if (QTypeModuleInfo::IsGui) + if (QModulesPrivate::QTypeModuleInfo::IsGui) return Q_LIKELY(qMetaTypeGuiHelper) ? qMetaTypeGuiHelper[type - QMetaType::FirstGuiType].size : 0; - if (QTypeModuleInfo::IsWidget) + if (QModulesPrivate::QTypeModuleInfo::IsWidget) return Q_LIKELY(qMetaTypeWidgetsHelper) ? qMetaTypeWidgetsHelper[type - QMetaType::FirstWidgetsType].size : 0; // This point can be reached only for known types that definition is not available, for example @@ -1418,10 +1418,10 @@ class Flags { static quint32 Flags(const int type) { - if (QTypeModuleInfo::IsGui) + if (QModulesPrivate::QTypeModuleInfo::IsGui) return Q_LIKELY(qMetaTypeGuiHelper) ? qMetaTypeGuiHelper[type - QMetaType::FirstGuiType].flags : 0; - if (QTypeModuleInfo::IsWidget) + if (QModulesPrivate::QTypeModuleInfo::IsWidget) return Q_LIKELY(qMetaTypeWidgetsHelper) ? qMetaTypeWidgetsHelper[type - QMetaType::FirstWidgetsType].flags : 0; // This point can be reached only for known types that definition is not available, for example @@ -1601,12 +1601,12 @@ class TypeInfo { { TypeInfoImpl(const uint type, QMetaTypeInterface &info) { - if (QTypeModuleInfo::IsGui) { + if (QModulesPrivate::QTypeModuleInfo::IsGui) { if (Q_LIKELY(qMetaTypeGuiHelper)) info = qMetaTypeGuiHelper[type - QMetaType::FirstGuiType]; return; } - if (QTypeModuleInfo::IsWidget) { + if (QModulesPrivate::QTypeModuleInfo::IsWidget) { if (Q_LIKELY(qMetaTypeWidgetsHelper)) info = qMetaTypeWidgetsHelper[type - QMetaType::FirstWidgetsType]; return; -- cgit v1.2.3 From 9ecce11261e35686afa736bd31431386c89f59ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= Date: Tue, 3 Apr 2012 15:33:47 +0200 Subject: Remove redundant check in QMetaType::typeInfo The check was introduced when void was not a fully defined type. Change-Id: I4df8607999436f8db92be77fc8fd203fc66c2816 Reviewed-by: Stephen Kelly --- src/corelib/kernel/qmetatype.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/corelib/kernel/qmetatype.cpp') diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp index 1207d995b0..53b22958c3 100644 --- a/src/corelib/kernel/qmetatype.cpp +++ b/src/corelib/kernel/qmetatype.cpp @@ -1623,7 +1623,6 @@ public: } template void delegate(const T*) { TypeInfoImpl(m_type, info); } - void delegate(const void*) {} void delegate(const QMetaTypeSwitcher::UnknownType*) {} void delegate(const QMetaTypeSwitcher::NotBuiltinType*) { customTypeInfo(m_type); } private: @@ -1645,7 +1644,7 @@ QMetaType QMetaType::typeInfo(const int type) { TypeInfo typeInfo(type); QMetaTypeSwitcher::switcher(typeInfo, type, 0); - return typeInfo.info.creator || type == Void ? QMetaType(QMetaType::NoExtensionFlags + return typeInfo.info.creator ? QMetaType(QMetaType::NoExtensionFlags , static_cast(0) // typeInfo::info is a temporary variable, we can't return address of it. , typeInfo.info.creator , typeInfo.info.deleter -- cgit v1.2.3