summaryrefslogtreecommitdiffstats
path: root/src/corelib/mimetypes
diff options
context:
space:
mode:
authorVolker Krause <volker.krause@kdab.com>2015-05-11 10:45:38 +0200
committerVolker Krause <volker.krause@kdab.com>2015-05-14 12:06:41 +0000
commit7d1ec1ae9e263df1a655e13f8feea7b5a5c7d9ed (patch)
tree5e9efe4a9677d82ae0765e1afbe4dcc1a280f6d8 /src/corelib/mimetypes
parenta4cba90e194a65930c0e66469cd2ef2cc5c1f5ed (diff)
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 <marc.mutz@kdab.com>
Diffstat (limited to 'src/corelib/mimetypes')
-rw-r--r--src/corelib/mimetypes/qmimetype.cpp6
-rw-r--r--src/corelib/mimetypes/qmimetype_p.h2
2 files changed, 4 insertions, 4 deletions
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