From d283d81c1c65b945662f90403f58124cb7fb8f47 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Wed, 11 Jul 2018 18:23:37 +0200 Subject: Supply locale to QCollatorPrivate via its constructor Both places that new'd it were then setting its locale themselves; they might as well do it tidily by passing it to the constructor. There's also no need to cleanup() in the constructor; every back-end is a no-op when collator has its initial value. Tidied up the class declaration in the process: * moved {con,de}structor to be first methods * comment on the two methods back-ends provide Change-Id: I041669637935e68141e002156552af8b475ba36e Reviewed-by: Thiago Macieira --- src/corelib/tools/qcollator.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/corelib/tools/qcollator.cpp') diff --git a/src/corelib/tools/qcollator.cpp b/src/corelib/tools/qcollator.cpp index a198208966..1cf223aae6 100644 --- a/src/corelib/tools/qcollator.cpp +++ b/src/corelib/tools/qcollator.cpp @@ -77,9 +77,8 @@ QT_BEGIN_NAMESPACE \sa setLocale() */ QCollator::QCollator(const QLocale &locale) - : d(new QCollatorPrivate) + : d(new QCollatorPrivate(locale)) { - d->locale = locale; d->init(); } @@ -158,8 +157,7 @@ QCollator &QCollator::operator=(const QCollator &other) void QCollator::detach() { if (d->ref.load() != 1) { - QCollatorPrivate *x = new QCollatorPrivate; - x->locale = d->locale; + QCollatorPrivate *x = new QCollatorPrivate(d->locale); if (!d->ref.deref()) delete d; d = x; -- cgit v1.2.3