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

List:       kde-commits
Subject:    branches/work/kdelibs4_snapshot/kdecore
From:       Adam Treat <treat () kde ! org>
Date:       2006-07-08 20:12:52
Message-ID: 1152389572.095637.24199.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 559985 by treat:

Apply 559982 to snapshot


 M  +9 -4      kconfigskeleton.cpp  
 M  +5 -0      kconfigskeleton.h  


--- branches/work/kdelibs4_snapshot/kdecore/kconfigskeleton.cpp #559984:559985
@@ -65,7 +65,7 @@
   {
     mReference = config->readPathEntry( mKey, mDefault );
   }
-  else if ( mType == Password ) 
+  else if ( mType == Password )
   {
     QString val = config->readEntry( mKey,
                                        KStringHandler::obscure( mDefault ) );
@@ -752,7 +752,7 @@
 QVariant KConfigSkeleton::ItemIntList::property() const
 {
   // TODO: Not yet supported
-  return QVariant();  
+  return QVariant();
 }
 
 
@@ -803,6 +803,11 @@
   return mConfig.data();
 }
 
+void KConfigSkeleton::setSharedConfig(KSharedConfig::Ptr pConfig)
+{
+    mConfig = pConfig;
+}
+
 bool KConfigSkeleton::useDefaults(bool b)
 {
   if (b == mUseDefaults)
@@ -832,7 +837,7 @@
 void KConfigSkeleton::readConfig()
 {
   kDebug(177) << "KConfigSkeleton::readConfig()" << endl;
-  
+
   QString origGroup = mConfig->group();
 
   mConfig->reparseConfiguration();
@@ -843,7 +848,7 @@
   }
 
   usrReadConfig();
-  
+
   mConfig->setGroup(origGroup);
 }
 
--- branches/work/kdelibs4_snapshot/kdecore/kconfigskeleton.h #559984:559985
@@ -1259,6 +1259,11 @@
   const KConfig *config() const;
 
   /**
+   * Set the @ref KSharedConfig object used for reading and writing the settings.
+   */
+  void setSharedConfig(KSharedConfig::Ptr pConfig);
+
+  /**
    * Return list of items managed by this KConfigSkeleton object.
    */
   KConfigSkeletonItem::List items() const
[prev in list] [next in list] [prev in thread] [next in thread]