diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp index c914c65126c..fa3398b6bfb 100644 --- a/src/corelib/kernel/qmetatype.cpp +++ b/src/corelib/kernel/qmetatype.cpp @@ -79,40 +79,40 @@ QT_BEGIN_NAMESPACE namespace { template -struct TypeDefiniton { +struct TypeDefinition { static const bool IsAvailable = true; }; struct DefinedTypesFilter { template struct Acceptor { - static const bool IsAccepted = TypeDefiniton::IsAvailable && QTypeModuleInfo::IsCore; + static const bool IsAccepted = TypeDefinition::IsAvailable && QTypeModuleInfo::IsCore; }; }; // Ignore these types, as incomplete #ifdef QT_NO_GEOM_VARIANT -template<> struct TypeDefiniton { static const bool IsAvailable = false; }; -template<> struct TypeDefiniton { static const bool IsAvailable = false; }; -template<> struct TypeDefiniton { static const bool IsAvailable = false; }; -template<> struct TypeDefiniton { static const bool IsAvailable = false; }; -template<> struct TypeDefiniton { static const bool IsAvailable = false; }; -template<> struct TypeDefiniton { static const bool IsAvailable = false; }; -template<> struct TypeDefiniton { static const bool IsAvailable = false; }; -template<> struct TypeDefiniton { static const bool IsAvailable = false; }; +template<> struct TypeDefinition { static const bool IsAvailable = false; }; +template<> struct TypeDefinition { static const bool IsAvailable = false; }; +template<> struct TypeDefinition { static const bool IsAvailable = false; }; +template<> struct TypeDefinition { static const bool IsAvailable = false; }; +template<> struct TypeDefinition { static const bool IsAvailable = false; }; +template<> struct TypeDefinition { static const bool IsAvailable = false; }; +template<> struct TypeDefinition { static const bool IsAvailable = false; }; +template<> struct TypeDefinition { static const bool IsAvailable = false; }; #endif #ifdef QT_BOOTSTRAPPED -template<> struct TypeDefiniton { static const bool IsAvailable = false; }; -template<> struct TypeDefiniton { static const bool IsAvailable = false; }; -template<> struct TypeDefiniton { static const bool IsAvailable = false; }; -template<> struct TypeDefiniton { static const bool IsAvailable = false; }; -template<> struct TypeDefiniton { static const bool IsAvailable = false; }; -template<> struct TypeDefiniton { static const bool IsAvailable = false; }; -template<> struct TypeDefiniton { static const bool IsAvailable = false; }; -template<> struct TypeDefiniton { static const bool IsAvailable = false; }; +template<> struct TypeDefinition { static const bool IsAvailable = false; }; +template<> struct TypeDefinition { static const bool IsAvailable = false; }; +template<> struct TypeDefinition { static const bool IsAvailable = false; }; +template<> struct TypeDefinition { static const bool IsAvailable = false; }; +template<> struct TypeDefinition { static const bool IsAvailable = false; }; +template<> struct TypeDefinition { static const bool IsAvailable = false; }; +template<> struct TypeDefinition { static const bool IsAvailable = false; }; +template<> struct TypeDefinition { static const bool IsAvailable = false; }; #endif #ifdef QT_NO_REGEXP -template<> struct TypeDefiniton { static const bool IsAvailable = false; }; +template<> struct TypeDefinition { static const bool IsAvailable = false; }; #endif } // namespace diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp index c8db27515cb..cfaf22c1464 100644 --- a/src/corelib/kernel/qvariant.cpp +++ b/src/corelib/kernel/qvariant.cpp @@ -98,33 +98,33 @@ public: namespace { template -struct TypeDefiniton { +struct TypeDefinition { static const bool IsAvailable = true; }; // Ignore these types, as incomplete #ifdef QT_BOOTSTRAPPED -template<> struct TypeDefiniton { static const bool IsAvailable = false; }; -template<> struct TypeDefiniton { static const bool IsAvailable = false; }; +template<> struct TypeDefinition { static const bool IsAvailable = false; }; +template<> struct TypeDefinition { static const bool IsAvailable = false; }; #endif #ifdef QT_NO_GEOM_VARIANT -template<> struct TypeDefiniton { static const bool IsAvailable = false; }; -template<> struct TypeDefiniton { static const bool IsAvailable = false; }; -template<> struct TypeDefiniton { static const bool IsAvailable = false; }; -template<> struct TypeDefiniton { static const bool IsAvailable = false; }; -template<> struct TypeDefiniton { static const bool IsAvailable = false; }; -template<> struct TypeDefiniton { static const bool IsAvailable = false; }; -template<> struct TypeDefiniton { static const bool IsAvailable = false; }; -template<> struct TypeDefiniton { static const bool IsAvailable = false; }; +template<> struct TypeDefinition { static const bool IsAvailable = false; }; +template<> struct TypeDefinition { static const bool IsAvailable = false; }; +template<> struct TypeDefinition { static const bool IsAvailable = false; }; +template<> struct TypeDefinition { static const bool IsAvailable = false; }; +template<> struct TypeDefinition { static const bool IsAvailable = false; }; +template<> struct TypeDefinition { static const bool IsAvailable = false; }; +template<> struct TypeDefinition { static const bool IsAvailable = false; }; +template<> struct TypeDefinition { static const bool IsAvailable = false; }; #endif struct CoreTypesFilter { template struct Acceptor { - static const bool IsAccepted = QTypeModuleInfo::IsCore && TypeDefiniton::IsAvailable; + static const bool IsAccepted = QTypeModuleInfo::IsCore && TypeDefinition::IsAvailable; }; }; -} // annonymous used to hide TypeDefiniton +} // annonymous used to hide TypeDefinition namespace { // annonymous used to hide QVariant handlers diff --git a/src/gui/kernel/qguivariant.cpp b/src/gui/kernel/qguivariant.cpp index 752c1dc082d..8378650dcb4 100644 --- a/src/gui/kernel/qguivariant.cpp +++ b/src/gui/kernel/qguivariant.cpp @@ -99,46 +99,46 @@ Q_CORE_EXPORT const QVariant::Handler *qcoreVariantHandler(); namespace { template -struct TypeDefiniton { +struct TypeDefinition { static const bool IsAvailable = true; }; // Ignore these types, as incomplete #ifdef QT_NO_GEOM_VARIANT -template<> struct TypeDefiniton { static const bool IsAvailable = false; }; -template<> struct TypeDefiniton { static const bool IsAvailable = false; }; -template<> struct TypeDefiniton { static const bool IsAvailable = false; }; -template<> struct TypeDefiniton { static const bool IsAvailable = false; }; -template<> struct TypeDefiniton { static const bool IsAvailable = false; }; -template<> struct TypeDefiniton { static const bool IsAvailable = false; }; -template<> struct TypeDefiniton { static const bool IsAvailable = false; }; -template<> struct TypeDefiniton { static const bool IsAvailable = false; }; +template<> struct TypeDefinition { static const bool IsAvailable = false; }; +template<> struct TypeDefinition { static const bool IsAvailable = false; }; +template<> struct TypeDefinition { static const bool IsAvailable = false; }; +template<> struct TypeDefinition { static const bool IsAvailable = false; }; +template<> struct TypeDefinition { static const bool IsAvailable = false; }; +template<> struct TypeDefinition { static const bool IsAvailable = false; }; +template<> struct TypeDefinition { static const bool IsAvailable = false; }; +template<> struct TypeDefinition { static const bool IsAvailable = false; }; #endif #ifdef QT_NO_SHORTCUT -template<> struct TypeDefiniton { static const bool IsAvailable = false; }; +template<> struct TypeDefinition { static const bool IsAvailable = false; }; #endif #ifdef QT_NO_CURSOR -template<> struct TypeDefiniton { static const bool IsAvailable = false; }; +template<> struct TypeDefinition { static const bool IsAvailable = false; }; #endif #ifdef QT_NO_MATRIX4X4 -template<> struct TypeDefiniton { static const bool IsAvailable = false; }; +template<> struct TypeDefinition { static const bool IsAvailable = false; }; #endif #ifdef QT_NO_VECTOR2D -template<> struct TypeDefiniton { static const bool IsAvailable = false; }; +template<> struct TypeDefinition { static const bool IsAvailable = false; }; #endif #ifdef QT_NO_VECTOR3D -template<> struct TypeDefiniton { static const bool IsAvailable = false; }; +template<> struct TypeDefinition { static const bool IsAvailable = false; }; #endif #ifdef QT_NO_VECTOR4D -template<> struct TypeDefiniton { static const bool IsAvailable = false; }; +template<> struct TypeDefinition { static const bool IsAvailable = false; }; #endif #ifdef QT_NO_QUATERNION -template<> struct TypeDefiniton { static const bool IsAvailable = false; }; +template<> struct TypeDefinition { static const bool IsAvailable = false; }; #endif struct GuiTypesFilter { template struct Acceptor { - static const bool IsAccepted = QTypeModuleInfo::IsGui && TypeDefiniton::IsAvailable; + static const bool IsAccepted = QTypeModuleInfo::IsGui && TypeDefinition::IsAvailable; }; }; } // namespace used to hide TypeDefinition