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

List:       kde-commits
Subject:    kdelibs/kdecore
From:       Benjamin Meyer <benjamin () csh ! rit ! edu>
Date:       2003-02-26 17:40:54
[Download RAW message or body]

CVS commit by bmeyer: 

Cleanup of the qsql variable


  M +10 -5     kautoconfig.cpp   1.4
  M +0 -2      kautoconfig.h   1.4


--- kdelibs/kdecore/kautoconfig.cpp  #1.3:1.4
@@ -41,8 +41,10 @@ KAutoConfig::KAutoConfig(QObject *parent
                          QObject(parent, name), config(kconfig) {
   
-  kapp->installKDEPropertyMap ();
-  propertyMap = new QSqlPropertyMap();
-  propertyMap->insert( "KURLRequester", "url" );
-  propertyMap->insert( "KColorButton", "color" );
+  static bool defaultKDEPropertyMapInstalled = false;
+  if ( !defaultKDEPropertyMapInstalled && kapp ) {
+    kapp->installKDEPropertyMap();
+    defaultKDEPropertyMapInstalled = true;
+  }
+  
   d = new KAutoConfigPrivate();
   
@@ -80,4 +82,5 @@ void KAutoConfig::retrieveSettings(){
 
 bool KAutoConfig::saveSettings() {
+  QSqlPropertyMap *propertyMap = QSqlPropertyMap::defaultMap();
   // Go through all of the widgets
   QPtrListIterator<QWidget> it( d->widgets );
@@ -123,4 +126,5 @@ bool KAutoConfig::saveSettings() {
 
 void KAutoConfig::resetSettings(){
+  QSqlPropertyMap *propertyMap = QSqlPropertyMap::defaultMap();
   // Go through all of the widgets
   QPtrListIterator<QWidget> it( d->widgets );
@@ -150,4 +154,5 @@ void KAutoConfig::parseChildren(const QW
     return;
   
+  QSqlPropertyMap *propertyMap = QSqlPropertyMap::defaultMap();
   QPtrListIterator<QObject> it( *listOfChildren );
   QObject *object;

--- kdelibs/kdecore/kautoconfig.h  #1.3:1.4
@@ -8,5 +8,4 @@
 class KConfig;
 class QWidget;
-class QSqlPropertyMap;
 
 /**
@@ -146,5 +145,4 @@ public slots:
 protected:
   KConfig *config;
-  QSqlPropertyMap *propertyMap;
   
   /**


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