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

List:       kde-commits
Subject:    kdelibs/kabc
From:       Szombathelyi György <gyurco () freemail ! hu>
Date:       2004-03-27 18:03:10
Message-ID: 20040327180310.903A29098 () office ! kde ! org
[Download RAW message or body]

CVS commit by gyurco: 

-Don't reload the addressbook after destruction
-Don't load and save the addressbook if it's not loaded already


  M +19 -11    stdaddressbook.cpp   1.60
  M +1 -0      stdaddressbook.h   1.35


--- kdelibs/kabc/stdaddressbook.h  #1.34:1.35
@@ -141,4 +141,5 @@ class StdAddressBook : public AddressBoo
 
     void init( bool asynchronous );
+    bool saveAll();
 
   private:

--- kdelibs/kabc/stdaddressbook.cpp  #1.59:1.60
@@ -94,5 +94,5 @@ StdAddressBook::~StdAddressBook()
 {
   if ( mAutomaticSave )
-    save();
+    saveAll();
 }
 
@@ -137,27 +137,25 @@ void StdAddressBook::init( bool asynchro
 }
 
-bool StdAddressBook::save()
+bool StdAddressBook::saveAll()
 {
-  kdDebug(5700) << "StdAddressBook::save()" << endl;
-
+  kdDebug(5700) << "StdAddressBook::saveAll()" << endl;
   bool ok = true;
-  AddressBook *ab = self();
 
-  ab->deleteRemovedAddressees();
+  deleteRemovedAddressees();
 
   KRES::Manager<Resource>::ActiveIterator it;
-  KRES::Manager<Resource> *manager = ab->resourceManager();
+  KRES::Manager<Resource> *manager = resourceManager();
   for ( it = manager->activeBegin(); it != manager->activeEnd(); ++it ) {
     if ( !(*it)->readOnly() && (*it)->isOpen() ) {
-      Ticket *ticket = ab->requestSaveTicket( *it );
+      Ticket *ticket = requestSaveTicket( *it );
       if ( !ticket ) {
-        ab->error( i18n( "Unable to save to resource '%1'. It is locked." )
+        error( i18n( "Unable to save to resource '%1'. It is locked." )
                    .arg( (*it)->resourceName() ) );
         return false;
       }
 
-      if ( !ab->save( ticket ) ) {
+      if ( !AddressBook::save( ticket ) ) {
         ok = false;
-        ab->releaseSaveTicket( ticket );
+        releaseSaveTicket( ticket );
       }
     }
@@ -167,4 +165,14 @@ bool StdAddressBook::save()
 }
 
+bool StdAddressBook::save()
+{
+  kdDebug(5700) << "StdAddressBook::save()" << endl;
+
+  if ( mSelf ) 
+    return mSelf->saveAll();
+  else
+    return true;  
+}
+
 void StdAddressBook::close()
 {


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