[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/runtime/kcontrol/locale
From:       Albert Astals Cid <tsdgeos () terra ! es>
Date:       2008-06-28 14:42:15
Message-ID: 1214664135.362854.16004.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 825527 by aacid:

all that deleteEntry need to be persistent too


 M  +8 -8      localemon.cpp  
 M  +4 -4      localenum.cpp  
 M  +2 -2      localeother.cpp  


--- trunk/KDE/kdebase/runtime/kcontrol/locale/localemon.cpp #825526:825527
@@ -104,20 +104,20 @@
   bool b;
 
   str = entGrp.readEntry("CurrencySymbol", QString::fromLatin1("$"));
-  group.deleteEntry("CurrencySymbol", KConfig::Global);
+  group.deleteEntry("CurrencySymbol", KConfig::Persistent | KConfig::Global);
   if (str != m_locale->currencySymbol())
     group.writeEntry("CurrencySymbol",
                        m_locale->currencySymbol(), KConfig::Persistent|KConfig::Global);
 
   str = entGrp.readEntry("MonetaryDecimalSymbol", QString::fromLatin1("."));
-  group.deleteEntry("MonetaryDecimalSymbol", KConfig::Global);
+  group.deleteEntry("MonetaryDecimalSymbol", KConfig::Persistent | KConfig::Global);
   if (str != m_locale->monetaryDecimalSymbol())
     group.writeEntry("MonetaryDecimalSymbol",
                        m_locale->monetaryDecimalSymbol(), KConfig::Persistent|KConfig::Global);
 
   str = entGrp.readEntry("MonetaryThousandsSeparator", QString::fromLatin1(","));
   str.replace(QString::fromLatin1("$0"), QString());
-  group.deleteEntry("MonetaryThousandsSeparator", KConfig::Global);
+  group.deleteEntry("MonetaryThousandsSeparator", KConfig::Persistent | KConfig::Global);
   if (str != m_locale->monetaryThousandsSeparator())
     group.writeEntry("MonetaryThousandsSeparator",
                        QString::fromLatin1("$0%1$0")
@@ -125,25 +125,25 @@
                        KConfig::Persistent|KConfig::Global);
 
   i = entGrp.readEntry("FracDigits", 2);
-  group.deleteEntry("FracDigits", KConfig::Global);
+  group.deleteEntry("FracDigits", KConfig::Persistent | KConfig::Global);
   if (i != m_locale->fracDigits())
     group.writeEntry("FracDigits", m_locale->fracDigits(), KConfig::Persistent|KConfig::Global);
 
   b = entGrp.readEntry("PositivePrefixCurrencySymbol", true);
-  group.deleteEntry("PositivePrefixCurrencySymbol", KConfig::Global);
+  group.deleteEntry("PositivePrefixCurrencySymbol", KConfig::Persistent | KConfig::Global);
   if (b != m_locale->positivePrefixCurrencySymbol())
     group.writeEntry("PositivePrefixCurrencySymbol",
                        m_locale->positivePrefixCurrencySymbol(), KConfig::Persistent|KConfig::Global);
 
   b = entGrp.readEntry("NegativePrefixCurrencySymbol", true);
-  group.deleteEntry("NegativePrefixCurrencySymbol", KConfig::Global);
+  group.deleteEntry("NegativePrefixCurrencySymbol", KConfig::Persistent | KConfig::Global);
   if (b != m_locale->negativePrefixCurrencySymbol())
     group.writeEntry("NegativePrefixCurrencySymbol",
                        m_locale->negativePrefixCurrencySymbol(), KConfig::Persistent|KConfig::Global);
 
   i = entGrp.readEntry("PositiveMonetarySignPosition",
                        (int)KLocale::BeforeQuantityMoney);
-  group.deleteEntry("PositiveMonetarySignPosition", KConfig::Global);
+  group.deleteEntry("PositiveMonetarySignPosition", KConfig::Persistent | KConfig::Global);
   if (i != m_locale->positiveMonetarySignPosition())
     group.writeEntry("PositiveMonetarySignPosition",
                        (int)m_locale->positiveMonetarySignPosition(),
@@ -151,7 +151,7 @@
 
   i = entGrp.readEntry("NegativeMonetarySignPosition",
                        (int)KLocale::ParensAround);
-  group.deleteEntry("NegativeMonetarySignPosition", KConfig::Global);
+  group.deleteEntry("NegativeMonetarySignPosition", KConfig::Persistent | KConfig::Global);
   if (i != m_locale->negativeMonetarySignPosition())
     group.writeEntry("NegativeMonetarySignPosition",
                        (int)m_locale->negativeMonetarySignPosition(),
--- trunk/KDE/kdebase/runtime/kcontrol/locale/localenum.cpp #825526:825527
@@ -105,14 +105,14 @@
 
   str = entGrp.readEntry("DecimalSymbol",
 		      QString::fromLatin1("."));
-  group.deleteEntry("DecimalSymbol", KConfig::Global);
+  group.deleteEntry("DecimalSymbol", KConfig::Persistent | KConfig::Global);
   if (str != m_locale->decimalSymbol())
     group.writeEntry("DecimalSymbol",
 		       m_locale->decimalSymbol(), KConfig::Persistent|KConfig::Global);
 
   str = entGrp.readEntry("ThousandsSeparator",
 		      QString::fromLatin1(","));
-  group.deleteEntry("ThousandsSeparator", KConfig::Global);
+  group.deleteEntry("ThousandsSeparator", KConfig::Persistent | KConfig::Global);
   str.replace(QString::fromLatin1("$0"), QString());
   if (str != m_locale->thousandsSeparator())
     group.writeEntry("ThousandsSeparator",
@@ -120,12 +120,12 @@
 		       .arg(m_locale->thousandsSeparator()), KConfig::Persistent|KConfig::Global);
 
   str = entGrp.readEntry("PositiveSign");
-  group.deleteEntry("PositiveSign", KConfig::Global);
+  group.deleteEntry("PositiveSign", KConfig::Persistent | KConfig::Global);
   if (str != m_locale->positiveSign())
     group.writeEntry("PositiveSign", m_locale->positiveSign(), KConfig::Persistent|KConfig::Global);
 
   str = entGrp.readEntry("NegativeSign", QString::fromLatin1("-"));
-  group.deleteEntry("NegativeSign", KConfig::Global);
+  group.deleteEntry("NegativeSign", KConfig::Persistent | KConfig::Global);
   if (str != m_locale->negativeSign())
     group.writeEntry("NegativeSign", m_locale->negativeSign(), KConfig::Persistent|KConfig::Global);
 }
--- trunk/KDE/kdebase/runtime/kcontrol/locale/localeother.cpp #825526:825527
@@ -89,13 +89,13 @@
   // ### HPB: Add code here
   int i;
   i = entGrp.readEntry("PageSize", (int)QPrinter::A4);
-  group.deleteEntry("PageSize", KConfig::Global);
+  group.deleteEntry("PageSize", KConfig::Persistent | KConfig::Global);
   if (i != m_locale->pageSize())
     group.writeEntry("PageSize",
                        m_locale->pageSize(), KConfig::Persistent|KConfig::Global);
 
   i = entGrp.readEntry("MeasureSystem", (int)KLocale::Metric);
-  group.deleteEntry("MeasureSystem", KConfig::Global);
+  group.deleteEntry("MeasureSystem", KConfig::Persistent | KConfig::Global);
   if (i != m_locale->measureSystem())
     group.writeEntry("MeasureSystem",
                        int(m_locale->measureSystem()), KConfig::Persistent|KConfig::Global);
[prev in list] [next in list] [prev in thread] [next in thread]