From 7d1ec1ae9e263df1a655e13f8feea7b5a5c7d9ed Mon Sep 17 00:00:00 2001 From: Volker Krause Date: Mon, 11 May 2015 10:45:38 +0200 Subject: Reorder member variables to avoid padding. Saves 8 byte in each case on 64bit systems, no change on 32bit systems. Change-Id: I2a2e8786fc7914ee9ae369ba05bedfc9e5e0ca5c Reviewed-by: Marc Mutz --- src/corelib/mimetypes/qmimetype.cpp | 6 +++--- src/corelib/mimetypes/qmimetype_p.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/corelib/mimetypes') diff --git a/src/corelib/mimetypes/qmimetype.cpp b/src/corelib/mimetypes/qmimetype.cpp index 70df9868b6..a5f9cb70d5 100644 --- a/src/corelib/mimetypes/qmimetype.cpp +++ b/src/corelib/mimetypes/qmimetype.cpp @@ -53,12 +53,12 @@ QMimeTypePrivate::QMimeTypePrivate() {} QMimeTypePrivate::QMimeTypePrivate(const QMimeType &other) - : name(other.d->name), + : loaded(other.d->loaded), + name(other.d->name), localeComments(other.d->localeComments), genericIconName(other.d->genericIconName), iconName(other.d->iconName), - globPatterns(other.d->globPatterns), - loaded(other.d->loaded) + globPatterns(other.d->globPatterns) {} void QMimeTypePrivate::clear() diff --git a/src/corelib/mimetypes/qmimetype_p.h b/src/corelib/mimetypes/qmimetype_p.h index bf533bbcb0..2161dd8901 100644 --- a/src/corelib/mimetypes/qmimetype_p.h +++ b/src/corelib/mimetypes/qmimetype_p.h @@ -66,12 +66,12 @@ public: void addGlobPattern(const QString &pattern); + bool loaded; // QSharedData leaves a 4 byte gap, so don't put 8 byte members first QString name; LocaleHash localeComments; QString genericIconName; QString iconName; QStringList globPatterns; - bool loaded; }; QT_END_NAMESPACE -- cgit v1.2.3