-rw-r--r-- | kabc/stdaddressbook.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/kabc/stdaddressbook.cpp b/kabc/stdaddressbook.cpp index 1e00cc6..760820e 100644 --- a/kabc/stdaddressbook.cpp +++ b/kabc/stdaddressbook.cpp | |||
@@ -103,34 +103,32 @@ StdAddressBook *StdAddressBook::self( bool onlyFastResources ) | |||
103 | QString appdir =StdAddressBook::setTempAppDir(); | 103 | QString appdir =StdAddressBook::setTempAppDir(); |
104 | #ifdef KAB_EMBEDDED | 104 | #ifdef KAB_EMBEDDED |
105 | mSelf = addressBookDeleter.setObject( new StdAddressBook( onlyFastResources ) ); | 105 | mSelf = addressBookDeleter.setObject( new StdAddressBook( onlyFastResources ) ); |
106 | #else //KAB_EMBEDDED | 106 | #else //KAB_EMBEDDED |
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 | } |
111 | return mSelf; | 111 | return mSelf; |
112 | } | 112 | } |
113 | 113 | ||
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 ); |
120 | } | 119 | } |
121 | 120 | ||
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 ); |
128 | } | 126 | } |
129 | 127 | ||
130 | StdAddressBook::~StdAddressBook() | 128 | StdAddressBook::~StdAddressBook() |
131 | { | 129 | { |
132 | if ( mAutomaticSave ) | 130 | if ( mAutomaticSave ) |
133 | save(); | 131 | save(); |
134 | } | 132 | } |
135 | 133 | ||
136 | void StdAddressBook::init( bool ) | 134 | void StdAddressBook::init( bool ) |