-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() | |||
61 | { | 61 | { |
62 | 62 | ||
63 | if ( !mSelf ) | 63 | if ( !mSelf ) |
64 | { | 64 | { |
65 | QString appdir = StdAddressBook::setTempAppDir(); | 65 | QString appdir = StdAddressBook::setTempAppDir(); |
@@ -72,4 +72,4 @@ StdAddressBook *StdAddressBook::self() | |||
72 | addressBookDeleter.setObject( mSelf, new StdAddressBook ); | 72 | addressBookDeleter.setObject( mSelf, new StdAddressBook ); |
73 | #endif //KAB_EMBEDDED | 73 | #endif //KAB_EMBEDDED |
74 | KStandardDirs::setAppDir( appdir ); | 74 | KStandardDirs::setAppDir( appdir ); |
75 | } | 75 | } |
@@ -91,4 +91,4 @@ QString StdAddressBook::setTempAppDir() | |||
91 | QString appdir = QDir::homeDirPath() + "/kdepim/apps/kaddressbook"; | 91 | QString appdir = QDir::homeDirPath() + "/kdepim/apps/kaddressbook"; |
92 | 92 | ||
93 | KStandardDirs::setAppDir( appdir ); | 93 | KStandardDirs::setAppDir( appdir ); |
94 | #endif | 94 | #endif |
@@ -99,5 +99,5 @@ StdAddressBook *StdAddressBook::self( bool onlyFastResources ) | |||
99 | { | 99 | { |
100 | 100 | ||
101 | if ( !mSelf ) | 101 | if ( !mSelf ) |
102 | { | 102 | { |
103 | QString appdir =StdAddressBook::setTempAppDir(); | 103 | QString appdir =StdAddressBook::setTempAppDir(); |
@@ -107,4 +107,4 @@ StdAddressBook *StdAddressBook::self( bool onlyFastResources ) | |||
107 | addressBookDeleter.setObject( mSelf, new StdAddressBook( onlyFastResources ) ); | 107 | addressBookDeleter.setObject( mSelf, new StdAddressBook( onlyFastResources ) ); |
108 | #endif //KAB_EMBEDDED | 108 | #endif //KAB_EMBEDDED |
109 | KStandardDirs::setAppDir( appdir ); | 109 | KStandardDirs::setAppDir( appdir ); |
110 | } | 110 | } |
@@ -114,6 +114,5 @@ StdAddressBook *StdAddressBook::self( bool onlyFastResources ) | |||
114 | StdAddressBook::StdAddressBook() | 114 | StdAddressBook::StdAddressBook() |
115 | //US : AddressBook( "kabcrc" ) | 115 | : AddressBook( "kabcrc" ) |
116 | : AddressBook( locateLocal( "config", "kabcrc") ) | ||
117 | { | 116 | { |
118 | 117 | ||
119 | init( false ); | 118 | init( false ); |
@@ -122,6 +121,5 @@ StdAddressBook::StdAddressBook() | |||
122 | StdAddressBook::StdAddressBook( bool onlyFastResources ) | 121 | StdAddressBook::StdAddressBook( bool onlyFastResources ) |
123 | //US : AddressBook( "kabcrc" ) | 122 | : AddressBook( "kabcrc" ) |
124 | : AddressBook( locateLocal( "config", "kabcrc") ) | ||
125 | { | 123 | { |
126 | 124 | ||
127 | init( onlyFastResources ); | 125 | init( onlyFastResources ); |
@@ -145,3 +143,3 @@ void StdAddressBook::init( bool ) | |||
145 | } | 143 | } |
146 | 144 | ||
147 | Resource *res = standardResource(); | 145 | Resource *res = standardResource(); |
@@ -188,3 +186,3 @@ bool StdAddressBook::save() | |||
188 | } | 186 | } |
189 | 187 | ||
190 | return ok; | 188 | return ok; |
@@ -197,3 +195,3 @@ void StdAddressBook::close() | |||
197 | addressBookDeleter.setObject(0); | 195 | addressBookDeleter.setObject(0); |
198 | 196 | ||
199 | } | 197 | } |