summaryrefslogtreecommitdiffstats
path: root/src/corelib/kernel
diff options
context:
space:
mode:
authorDavid Faure <faure@kde.org>2012-02-17 09:05:39 +0100
committerQt by Nokia <qt-info@nokia.com>2012-02-17 16:42:28 +0100
commit7e970eb58c71dc08981575c648a04d258dbf0684 (patch)
treedb556d2d066b61297025aafe1426d667a917ae62 /src/corelib/kernel
parent77172b25fe18c8c9e1578e2c0caeb63cb674513a (diff)
Ensure that Qt public headers compile with strict flags
Those from http://wiki.qt-project.org/Coding_Conventions#Conventions_for_public_header_files (unfortunatey -Wold-style-cast cannot be used due to the glibc macro bswap_16) and many Qt defines that disable casts. Change-Id: I97ac707a101df9819e8c031fa75a31b30e20247f Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/kernel')
-rw-r--r--src/corelib/kernel/qmetatype.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h
index 1473231d64..4af77fcedc 100644
--- a/src/corelib/kernel/qmetatype.h
+++ b/src/corelib/kernel/qmetatype.h
@@ -284,7 +284,7 @@ private:
Constructor constructor,
Destructor destructor,
uint sizeOf,
- uint typeFlags,
+ uint theTypeFlags,
int typeId);
QMetaType(const QMetaType &other);
QMetaType &operator =(const QMetaType &);
@@ -621,7 +621,7 @@ inline QMetaType::QMetaType(const ExtensionFlag extensionFlags, const QMetaTypeI
Constructor constructor,
Destructor destructor,
uint size,
- uint typeFlags,
+ uint theTypeFlags,
int typeId)
: m_creator(creator)
, m_deleter(deleter)
@@ -630,7 +630,7 @@ inline QMetaType::QMetaType(const ExtensionFlag extensionFlags, const QMetaTypeI
, m_constructor(constructor)
, m_destructor(destructor)
, m_size(size)
- , m_typeFlags(typeFlags)
+ , m_typeFlags(theTypeFlags)
, m_extensionFlags(extensionFlags)
, m_typeId(typeId)
{