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

List:       kde-commits
Subject:    KDE/kdegames/libkdegames/highscore
From:       Albert Astals Cid <tsdgeos () terra ! es>
Date:       2005-10-31 22:05:46
Message-ID: 1130796346.464609.31544.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 476220 by aacid:

KConfigGroupSaver -> KConfigGroup
I think i did the correct things but having a review will not hurt


 M  +3 -3      kexthighscore.cpp  
 M  +15 -15    kexthighscore_internal.cpp  
 M  +2 -2      kexthighscore_internal.h  
 M  +14 -14    khighscore.cpp  


--- trunk/KDE/kdegames/libkdegames/highscore/kexthighscore.cpp #476219:476220
@@ -148,9 +148,9 @@
     internal->serverURL = url;
     const char *HS_WW_URL = "ww hs url";
     ConfigGroup cg;
-    if ( cg.config()->hasKey(HS_WW_URL) )
-        internal->serverURL = cg.config()->readEntry(HS_WW_URL);
-    else cg.config()->writeEntry(HS_WW_URL, url.url());
+    if ( cg.hasKey(HS_WW_URL) )
+        internal->serverURL = cg.readEntry(HS_WW_URL);
+    else cg.writeEntry(HS_WW_URL, url.url());
     internal->version = version;
 }
 
--- trunk/KDE/kdegames/libkdegames/highscore/kexthighscore_internal.cpp #476219:476220
@@ -312,8 +312,8 @@
 #endif
 
     ConfigGroup cg;
-    _oldLocalPlayer = cg.config()->hasKey(HS_ID);
-    _oldLocalId = cg.config()->readUnsignedNumEntry(HS_ID);
+    _oldLocalPlayer = cg.hasKey(HS_ID);
+    _oldLocalId = cg.readUnsignedNumEntry(HS_ID);
 #ifdef HIGHSCORE_DIRECTORY
     if (_oldLocalPlayer) { // player already exists in local config file
         // copy player data
@@ -335,7 +335,7 @@
     if (_oldLocalPlayer) _id = _oldLocalId;
     else {
         _id = nbEntries();
-        cg.config()->writeEntry(HS_ID, _id);
+        cg.writeEntry(HS_ID, _id);
         item("name")->write(_id, name);
     }
 #endif
@@ -366,13 +366,13 @@
 QString PlayerInfos::key() const
 {
     ConfigGroup cg;
-    return cg.config()->readEntry(HS_KEY, QString::null);
+    return cg.readEntry(HS_KEY, QString::null);
 }
 
 bool PlayerInfos::isWWEnabled() const
 {
     ConfigGroup cg;
-    return cg.config()->readBoolEntry(HS_WW_ENABLED, false);
+    return cg.readBoolEntry(HS_WW_ENABLED, false);
 }
 
 QString PlayerInfos::histoName(uint i) const
@@ -478,15 +478,15 @@
     modifyName(newName);
     item("comment")->write(_id, comment);
     ConfigGroup cg;
-    cg.config()->writeEntry(HS_WW_ENABLED, WWEnabled);
-    if ( !newKey.isEmpty() ) cg.config()->writeEntry(HS_KEY, newKey);
-    if (WWEnabled) cg.config()->writeEntry(HS_REGISTERED_NAME, newName);
+    cg.writeEntry(HS_WW_ENABLED, WWEnabled);
+    if ( !newKey.isEmpty() ) cg.writeEntry(HS_KEY, newKey);
+    if (WWEnabled) cg.writeEntry(HS_REGISTERED_NAME, newName);
 }
 
 QString PlayerInfos::registeredName() const
 {
     ConfigGroup cg;
-    return cg.config()->readEntry(HS_REGISTERED_NAME, QString::null);
+    return cg.readEntry(HS_REGISTERED_NAME, QString::null);
 }
 
 void PlayerInfos::removeKey()
@@ -500,15 +500,15 @@
     do {
         i++;
         sk = str.arg(HS_KEY).arg(i);
-    } while ( !cg.config()->readEntry(sk, QString::null).isEmpty() );
-    cg.config()->writeEntry(sk, key());
-    cg.config()->writeEntry(str.arg(HS_REGISTERED_NAME).arg(i),
+    } while ( !cg.readEntry(sk, QString::null).isEmpty() );
+    cg.writeEntry(sk, key());
+    cg.writeEntry(str.arg(HS_REGISTERED_NAME).arg(i),
                             registeredName());
 
     // clear current key/nickname
-    cg.config()->deleteEntry(HS_KEY);
-    cg.config()->deleteEntry(HS_REGISTERED_NAME);
-    cg.config()->writeEntry(HS_WW_ENABLED, false);
+    cg.deleteEntry(HS_KEY);
+    cg.deleteEntry(HS_REGISTERED_NAME);
+    cg.writeEntry(HS_WW_ENABLED, false);
 }
 
 //-----------------------------------------------------------------------------
--- trunk/KDE/kdegames/libkdegames/highscore/kexthighscore_internal.h #476219:476220
@@ -178,11 +178,11 @@
 };
 
 //-----------------------------------------------------------------------------
-class ConfigGroup : public KConfigGroupSaver
+class ConfigGroup : public KConfigGroup
 {
  public:
     ConfigGroup(const QString &group = QString::null)
-        : KConfigGroupSaver(kapp->config(), group) {}
+        : KConfigGroup(kapp->config(), group) {}
 };
 
 //-----------------------------------------------------------------------------
--- trunk/KDE/kdegames/libkdegames/highscore/khighscore.cpp #476219:476220
@@ -165,53 +165,53 @@
 void KHighscore::writeEntry(int entry, const QString& key, const QVariant& value)
 {
  Q_ASSERT( isLocked() );
- KConfigGroupSaver cg(config(), group());
+ KConfigGroup cg(config(), group());
  QString confKey = QString("%1_%2").arg(entry).arg(key);
- cg.config()->writeEntry(confKey, value);
+ cg.writeEntry(confKey, value);
 }
 
 void KHighscore::writeEntry(int entry, const QString& key, int value)
 {
  Q_ASSERT( isLocked() );
- KConfigGroupSaver cg(config(), group());
+ KConfigGroup cg(config(), group());
  QString confKey = QString("%1_%2").arg(entry).arg(key);
- cg.config()->writeEntry(confKey, value);
+ cg.writeEntry(confKey, value);
 }
 
 void KHighscore::writeEntry(int entry, const QString& key, const QString &value)
 {
  Q_ASSERT (isLocked() );
- KConfigGroupSaver cg(config(), group());
+ KConfigGroup cg(config(), group());
  QString confKey = QString("%1_%2").arg(entry).arg(key);
- cg.config()->writeEntry(confKey, value);
+ cg.writeEntry(confKey, value);
 }
 
 QVariant KHighscore::readPropertyEntry(int entry, const QString& key, const QVariant& pDefault) const
 {
- KConfigGroupSaver cg(config(), group());
+ KConfigGroup cg(config(), group());
  QString confKey = QString("%1_%2").arg(entry).arg(key);
- return cg.config()->readPropertyEntry(confKey, pDefault);
+ return cg.readPropertyEntry(confKey, pDefault);
 }
 
 QString KHighscore::readEntry(int entry, const QString& key, const QString& pDefault) const
 {
- KConfigGroupSaver cg(config(), group());
+ KConfigGroup cg(config(), group());
  QString confKey = QString("%1_%2").arg(entry).arg(key);
- return cg.config()->readEntry(confKey, pDefault);
+ return cg.readEntry(confKey, pDefault);
 }
 
 int KHighscore::readNumEntry(int entry, const QString& key, int pDefault) const
 {
- KConfigGroupSaver cg(config(), group());
+ KConfigGroup cg(config(), group());
  QString confKey = QString("%1_%2").arg(entry).arg(key);
- return cg.config()->readNumEntry(confKey, pDefault);
+ return cg.readNumEntry(confKey, pDefault);
 }
 
 bool KHighscore::hasEntry(int entry, const QString& key) const
 {
- KConfigGroupSaver cg(config(), group());
+ KConfigGroup cg(config(), group());
  QString confKey = QString("%1_%2").arg(entry).arg(key);
- return cg.config()->hasKey(confKey);
+ return cg.hasKey(confKey);
 }
 
 QStringList KHighscore::readList(const QString& key, int lastEntry) const
[prev in list] [next in list] [prev in thread] [next in thread]