| -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 @@ -61,5 +61,5 @@ StdAddressBook *StdAddressBook::self() { - + if ( !mSelf ) - { + { QString appdir = StdAddressBook::setTempAppDir(); @@ -72,4 +72,4 @@ StdAddressBook *StdAddressBook::self() addressBookDeleter.setObject( mSelf, new StdAddressBook ); -#endif //KAB_EMBEDDED - KStandardDirs::setAppDir( appdir ); +#endif //KAB_EMBEDDED + KStandardDirs::setAppDir( appdir ); } @@ -91,4 +91,4 @@ QString StdAddressBook::setTempAppDir() QString appdir = QDir::homeDirPath() + "/kdepim/apps/kaddressbook"; - - KStandardDirs::setAppDir( appdir ); + + KStandardDirs::setAppDir( appdir ); #endif @@ -99,5 +99,5 @@ StdAddressBook *StdAddressBook::self( bool onlyFastResources ) { - + if ( !mSelf ) - { + { QString appdir =StdAddressBook::setTempAppDir(); @@ -107,4 +107,4 @@ StdAddressBook *StdAddressBook::self( bool onlyFastResources ) addressBookDeleter.setObject( mSelf, new StdAddressBook( onlyFastResources ) ); -#endif //KAB_EMBEDDED - KStandardDirs::setAppDir( appdir ); +#endif //KAB_EMBEDDED + KStandardDirs::setAppDir( appdir ); } @@ -114,6 +114,5 @@ StdAddressBook *StdAddressBook::self( bool onlyFastResources ) StdAddressBook::StdAddressBook() -//US : AddressBook( "kabcrc" ) - : AddressBook( locateLocal( "config", "kabcrc") ) + : AddressBook( "kabcrc" ) { - + init( false ); @@ -122,6 +121,5 @@ StdAddressBook::StdAddressBook() StdAddressBook::StdAddressBook( bool onlyFastResources ) -//US : AddressBook( "kabcrc" ) - : AddressBook( locateLocal( "config", "kabcrc") ) + : AddressBook( "kabcrc" ) { - + init( onlyFastResources ); @@ -145,3 +143,3 @@ void StdAddressBook::init( bool ) } - + Resource *res = standardResource(); @@ -188,3 +186,3 @@ bool StdAddressBook::save() } - + return ok; @@ -197,3 +195,3 @@ void StdAddressBook::close() addressBookDeleter.setObject(0); - + } |