summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChristian Ehrlicher <ch.ehrlicher@gmx.de>2018-03-04 20:44:37 +0100
committerChristian Ehrlicher <ch.ehrlicher@gmx.de>2018-03-07 18:36:33 +0000
commit808adeb7bc53208a1c30f425fce6359a17f00170 (patch)
treea5c41000a0214cecf56ea2b129947c929398777d /src
parent80693f171c9e904007137f109a83fb456c9cae48 (diff)
QSqlField: rearrange QSqlFieldPrivate members
Rearrange QSqlFieldPrivate members to only need 64Byte instead 72 in an 64bit environment. Change-Id: I620c18aca06a11b7ab4bd8e99b377b9d823da7f4 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/sql/kernel/qsqlfield.cpp34
1 files changed, 17 insertions, 17 deletions
diff --git a/src/sql/kernel/qsqlfield.cpp b/src/sql/kernel/qsqlfield.cpp
index 782ab0d71c..5a6d173b3b 100644
--- a/src/sql/kernel/qsqlfield.cpp
+++ b/src/sql/kernel/qsqlfield.cpp
@@ -48,52 +48,52 @@ class QSqlFieldPrivate
public:
QSqlFieldPrivate(const QString &name,
QVariant::Type type, const QString &tableName) :
- ref(1), nm(name), ro(false), type(type), req(QSqlField::Unknown),
- len(-1), prec(-1), tp(-1), gen(true), autoval(false), table(tableName)
- {
- }
+ ref(1), nm(name), table(tableName), def(QVariant()), type(type),
+ req(QSqlField::Unknown), len(-1), prec(-1), tp(-1),
+ ro(false), gen(true), autoval(false)
+ {}
QSqlFieldPrivate(const QSqlFieldPrivate &other)
: ref(1),
nm(other.nm),
- ro(other.ro),
+ table(other.table),
+ def(other.def),
type(other.type),
req(other.req),
len(other.len),
prec(other.prec),
- def(other.def),
tp(other.tp),
+ ro(other.ro),
gen(other.gen),
- autoval(other.autoval),
- table(other.table)
+ autoval(other.autoval)
{}
bool operator==(const QSqlFieldPrivate& other) const
{
return (nm == other.nm
- && ro == other.ro
+ && table == other.table
+ && def == other.def
&& type == other.type
&& req == other.req
&& len == other.len
&& prec == other.prec
- && def == other.def
+ && ro == other.ro
&& gen == other.gen
- && autoval == other.autoval
- && table == other.table);
+ && autoval == other.autoval);
}
QAtomicInt ref;
QString nm;
- uint ro: 1;
+ QString table;
+ QVariant def;
QVariant::Type type;
QSqlField::RequiredStatus req;
int len;
int prec;
- QVariant def;
int tp;
- uint gen: 1;
- uint autoval: 1;
- QString table;
+ bool ro: 1;
+ bool gen: 1;
+ bool autoval: 1;
};