From kde-commits  Fri Jul 10 07:52:45 2009
From: Chusslove Illich <caslav.ilic () gmx ! net>
Date: Fri, 10 Jul 2009 07:52:45 +0000
To: kde-commits
Subject: branches/KDE/4.3/kdelibs/kdecore/localization
Message-Id: <1247212365.284174.14535.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=124722770831536

SVN commit 994105 by ilic:

Exclusively modify the copy in subs() methods. (bport: 994104)

 M  +30 -36    klocalizedstring.cpp  


--- branches/KDE/4.3/kdelibs/kdecore/localization/klocalizedstring.cpp #994104:994105
@@ -795,13 +795,12 @@
 KLocalizedString KLocalizedString::subs (int a, int fieldWidth, int base,
                                          const QChar &fillChar) const
 {
-    if (!d->plural.isEmpty() && !d->numberSet)
-    {
-        d->number = static_cast<pluraln>(abs(a));
-        d->numberSet = true;
-        d->numberOrd = d->args.size();
-    }
     KLocalizedString kls(*this);
+    if (!kls.d->plural.isEmpty() && !kls.d->numberSet) {
+        kls.d->number = static_cast<pluraln>(abs(a));
+        kls.d->numberSet = true;
+        kls.d->numberOrd = d->args.size();
+    }
     kls.d->args.append(wrapInt(QString("%1").arg(a, fieldWidth, base, fillChar)));
     kls.d->vals.append(static_cast<intn>(a));
     return kls;
@@ -810,13 +809,12 @@
 KLocalizedString KLocalizedString::subs (uint a, int fieldWidth, int base,
                                          const QChar &fillChar) const
 {
-    if (!d->plural.isEmpty() && !d->numberSet)
-    {
-        d->number = static_cast<pluraln>(a);
-        d->numberSet = true;
-        d->numberOrd = d->args.size();
-    }
     KLocalizedString kls(*this);
+    if (!kls.d->plural.isEmpty() && !kls.d->numberSet) {
+        kls.d->number = static_cast<pluraln>(a);
+        kls.d->numberSet = true;
+        kls.d->numberOrd = d->args.size();
+    }
     kls.d->args.append(wrapInt(QString("%1").arg(a, fieldWidth, base, fillChar)));
     kls.d->vals.append(static_cast<uintn>(a));
     return kls;
@@ -825,13 +823,12 @@
 KLocalizedString KLocalizedString::subs (long a, int fieldWidth, int base,
                                          const QChar &fillChar) const
 {
-    if (!d->plural.isEmpty() && !d->numberSet)
-    {
-        d->number = static_cast<pluraln>(abs(a));
-        d->numberSet = true;
-        d->numberOrd = d->args.size();
-    }
     KLocalizedString kls(*this);
+    if (!kls.d->plural.isEmpty() && !kls.d->numberSet) {
+        kls.d->number = static_cast<pluraln>(abs(a));
+        kls.d->numberSet = true;
+        kls.d->numberOrd = d->args.size();
+    }
     kls.d->args.append(wrapInt(QString("%1").arg(a, fieldWidth, base, fillChar)));
     kls.d->vals.append(static_cast<intn>(a));
     return kls;
@@ -840,13 +837,12 @@
 KLocalizedString KLocalizedString::subs (ulong a, int fieldWidth, int base,
                                          const QChar &fillChar) const
 {
-    if (!d->plural.isEmpty() && !d->numberSet)
-    {
-        d->number = static_cast<pluraln>(a);
-        d->numberSet = true;
-        d->numberOrd = d->args.size();
-    }
     KLocalizedString kls(*this);
+    if (!kls.d->plural.isEmpty() && !kls.d->numberSet) {
+        kls.d->number = static_cast<pluraln>(a);
+        kls.d->numberSet = true;
+        kls.d->numberOrd = d->args.size();
+    }
     kls.d->args.append(wrapInt(QString("%1").arg(a, fieldWidth, base, fillChar)));
     kls.d->vals.append(static_cast<uintn>(a));
     return kls;
@@ -855,13 +851,12 @@
 KLocalizedString KLocalizedString::subs (qlonglong a, int fieldWidth, int base,
                                          const QChar &fillChar) const
 {
-    if (!d->plural.isEmpty() && !d->numberSet)
-    {
-        d->number = static_cast<pluraln>(qAbs(a));
-        d->numberSet = true;
-        d->numberOrd = d->args.size();
-    }
     KLocalizedString kls(*this);
+    if (!kls.d->plural.isEmpty() && !kls.d->numberSet) {
+        kls.d->number = static_cast<pluraln>(qAbs(a));
+        kls.d->numberSet = true;
+        kls.d->numberOrd = d->args.size();
+    }
     kls.d->args.append(wrapInt(QString("%1").arg(a, fieldWidth, base, fillChar)));
     kls.d->vals.append(static_cast<intn>(a));
     return kls;
@@ -870,13 +865,12 @@
 KLocalizedString KLocalizedString::subs (qulonglong a, int fieldWidth, int base,
                                          const QChar &fillChar) const
 {
-    if (!d->plural.isEmpty() && !d->numberSet)
-    {
-        d->number = static_cast<pluraln>(a);
-        d->numberSet = true;
-        d->numberOrd = d->args.size();
-    }
     KLocalizedString kls(*this);
+    if (!kls.d->plural.isEmpty() && !kls.d->numberSet) {
+        kls.d->number = static_cast<pluraln>(a);
+        kls.d->numberSet = true;
+        kls.d->numberOrd = d->args.size();
+    }
     kls.d->args.append(wrapInt(QString("%1").arg(a, fieldWidth, base, fillChar)));
     kls.d->vals.append(static_cast<uintn>(a));
     return kls;