author | ulf69 <ulf69> | 2004-08-04 22:45:22 (UTC) |
---|---|---|
committer | ulf69 <ulf69> | 2004-08-04 22:45:22 (UTC) |
commit | c3a704f5acda9cf9fee66e5c0b1b864f3b7dd852 (patch) (side-by-side diff) | |
tree | dc59744a6d59ba241e793ce051da485d0bf16d06 /kabc/stdaddressbook.cpp | |
parent | b83866e08ddcc5cb2734801977927f48b53a2e1c (diff) | |
download | kdepimpi-c3a704f5acda9cf9fee66e5c0b1b864f3b7dd852.zip kdepimpi-c3a704f5acda9cf9fee66e5c0b1b864f3b7dd852.tar.gz kdepimpi-c3a704f5acda9cf9fee66e5c0b1b864f3b7dd852.tar.bz2 |
final changes for addressbook sync config dialog
-rw-r--r-- | kabc/stdaddressbook.cpp | 36 |
1 files changed, 17 insertions, 19 deletions
diff --git a/kabc/stdaddressbook.cpp b/kabc/stdaddressbook.cpp index 1e00cc6..760820e 100644 --- a/kabc/stdaddressbook.cpp +++ b/kabc/stdaddressbook.cpp @@ -60,7 +60,7 @@ void StdAddressBook::handleCrash() StdAddressBook *StdAddressBook::self() { - + if ( !mSelf ) - { + { QString appdir = StdAddressBook::setTempAppDir(); @@ -71,6 +71,6 @@ StdAddressBook *StdAddressBook::self() #else //KAB_EMBEDDED addressBookDeleter.setObject( mSelf, new StdAddressBook ); -#endif //KAB_EMBEDDED - KStandardDirs::setAppDir( appdir ); +#endif //KAB_EMBEDDED + KStandardDirs::setAppDir( appdir ); } @@ -90,6 +90,6 @@ QString StdAddressBook::setTempAppDir() #else QString appdir = QDir::homeDirPath() + "/kdepim/apps/kaddressbook"; - - KStandardDirs::setAppDir( appdir ); + + KStandardDirs::setAppDir( appdir ); #endif @@ -98,7 +98,7 @@ QString StdAddressBook::setTempAppDir() StdAddressBook *StdAddressBook::self( bool onlyFastResources ) { - + if ( !mSelf ) - { + { QString appdir =StdAddressBook::setTempAppDir(); #ifdef KAB_EMBEDDED @@ -106,6 +106,6 @@ StdAddressBook *StdAddressBook::self( bool onlyFastResources ) #else //KAB_EMBEDDED addressBookDeleter.setObject( mSelf, new StdAddressBook( onlyFastResources ) ); -#endif //KAB_EMBEDDED - KStandardDirs::setAppDir( appdir ); +#endif //KAB_EMBEDDED + KStandardDirs::setAppDir( appdir ); } return mSelf; @@ -113,16 +113,14 @@ StdAddressBook *StdAddressBook::self( bool onlyFastResources ) StdAddressBook::StdAddressBook() -//US : AddressBook( "kabcrc" ) - : AddressBook( locateLocal( "config", "kabcrc") ) + : AddressBook( "kabcrc" ) { - + init( false ); } StdAddressBook::StdAddressBook( bool onlyFastResources ) -//US : AddressBook( "kabcrc" ) - : AddressBook( locateLocal( "config", "kabcrc") ) + : AddressBook( "kabcrc" ) { - + init( onlyFastResources ); } @@ -144,5 +142,5 @@ void StdAddressBook::init( bool ) error( QString( "Unable to open resource '%1'!" ).arg( (*it)->resourceName() ) ); } - + Resource *res = standardResource(); if ( !res ) { @@ -187,5 +185,5 @@ bool StdAddressBook::save() } } - + return ok; } @@ -196,5 +194,5 @@ void StdAddressBook::close() //US addressBookDeleter.destructObject(); addressBookDeleter.setObject(0); - + } |