stdab fix

2 files changed, 26 insertions, 3 deletions

diff --git a/kabc/stdaddressbook.cpp b/kabc/stdaddressbook.cpp
index a14ae20..43d9fde 100644
--- a/kabc/stdaddressbook.cpp
+++ b/kabc/stdaddressbook.cpp
@@ -35,48 +35,65 @@ $Id$
 
 #include "stdaddressbook.h"
 
 using namespace KABC;
 
 StdAddressBook *StdAddressBook::mSelf = 0;
 bool StdAddressBook::mAutomaticSave = false;
 
 static KStaticDeleter<StdAddressBook> addressBookDeleter;
 
 QString StdAddressBook::fileName()
 {
   return locateLocal( "data", "kabc/std.vcf" );
 }
 
 QString StdAddressBook::directoryName()
 {
   return locateLocal( "data", "kabc/stdvcf" );
 }
 
 void StdAddressBook::handleCrash()
 {
   StdAddressBook::self()->cleanUp();
 }
+StdAddressBook *StdAddressBook::selfNoLoad()
+{
+
+  if ( !mSelf )
+  {
+      QString appdir = StdAddressBook::setTempAppDir();
+// US im am not sure why I have to use the other format here??
+#ifdef KAB_EMBEDDED
+      mSelf = addressBookDeleter.setObject( new StdAddressBook ( QString() ) );
+#else //KAB_EMBEDDED
+    addressBookDeleter.setObject( mSelf, new StdAddressBook( QString() ) );
+#endif //KAB_EMBEDDED
+    KStandardDirs::setAppDir( appdir );
+  }
+
+  return mSelf;
+}
 
 StdAddressBook *StdAddressBook::self()
 {
 
   if ( !mSelf )
   {
       QString appdir = StdAddressBook::setTempAppDir();
 // US im am not sure why I have to use the other format here??
 #ifdef KAB_EMBEDDED
     mSelf = addressBookDeleter.setObject( new StdAddressBook );
 #else //KAB_EMBEDDED
     addressBookDeleter.setObject( mSelf, new StdAddressBook );
 #endif //KAB_EMBEDDED
     KStandardDirs::setAppDir( appdir );
   }
 
   return mSelf;
 }
 
 QString StdAddressBook::setTempAppDir()
 {
     QString appDIR = KStandardDirs::appDir();
 #ifdef DESKTOP_VERSION
     QString appdir = QDir::homeDirPath();
@@ -87,62 +104,66 @@ QString StdAddressBook::setTempAppDir()
       KStandardDirs::setAppDir( QDir::convertSeparators( appdir ));
 #else
       QString appdir = QDir::homeDirPath() + "/kdepim/apps/kaddressbook";
 
       KStandardDirs::setAppDir( appdir );
 #endif
 
     return appDIR;
 }
 StdAddressBook *StdAddressBook::self( bool onlyFastResources )
 {
 
    if ( !mSelf )
   {
       QString appdir =StdAddressBook::setTempAppDir();
 #ifdef KAB_EMBEDDED
     mSelf = addressBookDeleter.setObject( new StdAddressBook( onlyFastResources ) );
 #else //KAB_EMBEDDED
     addressBookDeleter.setObject( mSelf, new StdAddressBook( onlyFastResources ) );
 #endif //KAB_EMBEDDED
     KStandardDirs::setAppDir( appdir );
   }
   return mSelf;
 }
+StdAddressBook::StdAddressBook( QString )
+  : AddressBook( "kabcrc" )
+{
+
+}
 
 StdAddressBook::StdAddressBook()
   : AddressBook( "kabcrc" )
 {
 
-    //init( false );
+    init( false );
 }
 
 StdAddressBook::StdAddressBook( bool onlyFastResources )
   : AddressBook( "kabcrc" )
 {
 
-    if ( onlyFastResources )
-        init( onlyFastResources );
+    init( onlyFastResources );
 }
 
 StdAddressBook::~StdAddressBook()
 {
   if ( mAutomaticSave )
     save();
 }
 
 void StdAddressBook::init( bool )
 {
   KRES::Manager<Resource> *manager = resourceManager();
   KRES::Manager<Resource>::ActiveIterator it;
 
   for ( it = manager->activeBegin(); it != manager->activeEnd(); ++it ) {
     (*it)->setAddressBook( this );
     if ( !(*it)->open() )
       error( QString( "Unable to open resource '%1'!" ).arg( (*it)->resourceName() ) );
   }
 
   Resource *res = standardResource();
   if ( !res ) {
     res = manager->createResource( "file" );
     if ( res )
     {
diff --git a/kabc/stdaddressbook.h b/kabc/stdaddressbook.h
index cf130b3..3cd6363 100644
--- a/kabc/stdaddressbook.h
+++ b/kabc/stdaddressbook.h
@@ -49,48 +49,49 @@ namespace KABC {
   KABC::AddressBook::Iterator it;
   for ( it = ab->begin(); it != ab->end(); ++it ) {
     kdDebug() << "UID=" << (*it).uid() << endl;
  
     // do some other stuff
   }
  
   KABC::StdAddressBook::save();
   </pre>
 */
 class StdAddressBook : public AddressBook
 {
   public:
 
     /**
       Destructor.
      */
     ~StdAddressBook();
 
     /**
       Return the standard addressbook object. It also loads slow resources.
       It is the same as self(false); .
     */
     static StdAddressBook *self();
+    static StdAddressBook *selfNoLoad();
 
     /**
       This is the same as above, but with specified
       behaviour of resource loading.
 
       @param onlyFastResource Only resources marked as 'fast' should be loaded
     */
     // FIXME for KDE4 return StdAddressBook and merge with the metod above -zecke
     static StdAddressBook *self( bool onlyFastResources );
 
     /**
       Save the standard address book to disk.
     */
     static bool save();
 
     /**
       Call this method in your crash handler to allow the library clean up
       possible locks.
      */
     static void handleCrash();
 
     /**
       Returns the default file name for vcard-based addressbook
     */
@@ -117,35 +118,36 @@ class StdAddressBook : public AddressBook
 
     /**
       Returns whether the address book is saved at destruction time.
       See also @ref setAutomaticSave().
      */
     static bool automaticSave();
 
     /**
       Returns the contact, that is associated with the owner of the
       address book. This contact should be used by other programs
       to access user specific data.
      */
     Addressee whoAmI();
 
     /**
       Sets the users contact. See @ref whoAmI() for more information.
 
       @param uid The uid of the users contact.
      */
     void setWhoAmI( const Addressee &addr );
     void init( bool onlyFastResources );
 
   protected:
     StdAddressBook();
+    StdAddressBook( QString );
     StdAddressBook( bool onlyFastResources );
 
 
   private:
     static  QString setTempAppDir();
     static StdAddressBook *mSelf;
     static bool mAutomaticSave;
 };
 
 }
 #endif