author | zautrix <zautrix> | 2005-08-23 13:59:59 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-08-23 13:59:59 (UTC) |
commit | 02fa432f183ad2b18380de0e41399efe3b867dba (patch) (unidiff) | |
tree | d13d3941ef4d6abc90790d5b6039a92787ea7987 /kabc/stdaddressbook.cpp | |
parent | 72d600e2c3b3405e5f37615a56560811c0cf9a78 (diff) | |
download | kdepimpi-02fa432f183ad2b18380de0e41399efe3b867dba.zip kdepimpi-02fa432f183ad2b18380de0e41399efe3b867dba.tar.gz kdepimpi-02fa432f183ad2b18380de0e41399efe3b867dba.tar.bz2 |
fixx
-rw-r--r-- | kabc/stdaddressbook.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/kabc/stdaddressbook.cpp b/kabc/stdaddressbook.cpp index f17f366..a14ae20 100644 --- a/kabc/stdaddressbook.cpp +++ b/kabc/stdaddressbook.cpp | |||
@@ -68,104 +68,105 @@ StdAddressBook *StdAddressBook::self() | |||
68 | mSelf = addressBookDeleter.setObject( new StdAddressBook ); | 68 | mSelf = addressBookDeleter.setObject( new StdAddressBook ); |
69 | #else //KAB_EMBEDDED | 69 | #else //KAB_EMBEDDED |
70 | addressBookDeleter.setObject( mSelf, new StdAddressBook ); | 70 | addressBookDeleter.setObject( mSelf, new StdAddressBook ); |
71 | #endif //KAB_EMBEDDED | 71 | #endif //KAB_EMBEDDED |
72 | KStandardDirs::setAppDir( appdir ); | 72 | KStandardDirs::setAppDir( appdir ); |
73 | } | 73 | } |
74 | 74 | ||
75 | return mSelf; | 75 | return mSelf; |
76 | } | 76 | } |
77 | 77 | ||
78 | QString StdAddressBook::setTempAppDir() | 78 | QString StdAddressBook::setTempAppDir() |
79 | { | 79 | { |
80 | QString appDIR = KStandardDirs::appDir(); | 80 | QString appDIR = KStandardDirs::appDir(); |
81 | #ifdef DESKTOP_VERSION | 81 | #ifdef DESKTOP_VERSION |
82 | QString appdir = QDir::homeDirPath(); | 82 | QString appdir = QDir::homeDirPath(); |
83 | if ( appdir.right(1) == "\\" || appdir.right(1) == "/" ) | 83 | if ( appdir.right(1) == "\\" || appdir.right(1) == "/" ) |
84 | appdir += "kaddressbook/"; | 84 | appdir += "kaddressbook/"; |
85 | else | 85 | else |
86 | appdir += "/kaddressbook/"; | 86 | appdir += "/kaddressbook/"; |
87 | KStandardDirs::setAppDir( QDir::convertSeparators( appdir )); | 87 | KStandardDirs::setAppDir( QDir::convertSeparators( appdir )); |
88 | #else | 88 | #else |
89 | QString appdir = QDir::homeDirPath() + "/kdepim/apps/kaddressbook"; | 89 | QString appdir = QDir::homeDirPath() + "/kdepim/apps/kaddressbook"; |
90 | 90 | ||
91 | KStandardDirs::setAppDir( appdir ); | 91 | KStandardDirs::setAppDir( appdir ); |
92 | #endif | 92 | #endif |
93 | 93 | ||
94 | return appDIR; | 94 | return appDIR; |
95 | } | 95 | } |
96 | StdAddressBook *StdAddressBook::self( bool onlyFastResources ) | 96 | StdAddressBook *StdAddressBook::self( bool onlyFastResources ) |
97 | { | 97 | { |
98 | 98 | ||
99 | if ( !mSelf ) | 99 | if ( !mSelf ) |
100 | { | 100 | { |
101 | QString appdir =StdAddressBook::setTempAppDir(); | 101 | QString appdir =StdAddressBook::setTempAppDir(); |
102 | #ifdef KAB_EMBEDDED | 102 | #ifdef KAB_EMBEDDED |
103 | mSelf = addressBookDeleter.setObject( new StdAddressBook( onlyFastResources ) ); | 103 | mSelf = addressBookDeleter.setObject( new StdAddressBook( onlyFastResources ) ); |
104 | #else //KAB_EMBEDDED | 104 | #else //KAB_EMBEDDED |
105 | addressBookDeleter.setObject( mSelf, new StdAddressBook( onlyFastResources ) ); | 105 | addressBookDeleter.setObject( mSelf, new StdAddressBook( onlyFastResources ) ); |
106 | #endif //KAB_EMBEDDED | 106 | #endif //KAB_EMBEDDED |
107 | KStandardDirs::setAppDir( appdir ); | 107 | KStandardDirs::setAppDir( appdir ); |
108 | } | 108 | } |
109 | return mSelf; | 109 | return mSelf; |
110 | } | 110 | } |
111 | 111 | ||
112 | StdAddressBook::StdAddressBook() | 112 | StdAddressBook::StdAddressBook() |
113 | : AddressBook( "kabcrc" ) | 113 | : AddressBook( "kabcrc" ) |
114 | { | 114 | { |
115 | 115 | ||
116 | init( false ); | 116 | //init( false ); |
117 | } | 117 | } |
118 | 118 | ||
119 | StdAddressBook::StdAddressBook( bool onlyFastResources ) | 119 | StdAddressBook::StdAddressBook( bool onlyFastResources ) |
120 | : AddressBook( "kabcrc" ) | 120 | : AddressBook( "kabcrc" ) |
121 | { | 121 | { |
122 | 122 | ||
123 | init( onlyFastResources ); | 123 | if ( onlyFastResources ) |
124 | init( onlyFastResources ); | ||
124 | } | 125 | } |
125 | 126 | ||
126 | StdAddressBook::~StdAddressBook() | 127 | StdAddressBook::~StdAddressBook() |
127 | { | 128 | { |
128 | if ( mAutomaticSave ) | 129 | if ( mAutomaticSave ) |
129 | save(); | 130 | save(); |
130 | } | 131 | } |
131 | 132 | ||
132 | void StdAddressBook::init( bool ) | 133 | void StdAddressBook::init( bool ) |
133 | { | 134 | { |
134 | KRES::Manager<Resource> *manager = resourceManager(); | 135 | KRES::Manager<Resource> *manager = resourceManager(); |
135 | KRES::Manager<Resource>::ActiveIterator it; | 136 | KRES::Manager<Resource>::ActiveIterator it; |
136 | 137 | ||
137 | for ( it = manager->activeBegin(); it != manager->activeEnd(); ++it ) { | 138 | for ( it = manager->activeBegin(); it != manager->activeEnd(); ++it ) { |
138 | (*it)->setAddressBook( this ); | 139 | (*it)->setAddressBook( this ); |
139 | if ( !(*it)->open() ) | 140 | if ( !(*it)->open() ) |
140 | error( QString( "Unable to open resource '%1'!" ).arg( (*it)->resourceName() ) ); | 141 | error( QString( "Unable to open resource '%1'!" ).arg( (*it)->resourceName() ) ); |
141 | } | 142 | } |
142 | 143 | ||
143 | Resource *res = standardResource(); | 144 | Resource *res = standardResource(); |
144 | if ( !res ) { | 145 | if ( !res ) { |
145 | res = manager->createResource( "file" ); | 146 | res = manager->createResource( "file" ); |
146 | if ( res ) | 147 | if ( res ) |
147 | { | 148 | { |
148 | addResource( res ); | 149 | addResource( res ); |
149 | } | 150 | } |
150 | else | 151 | else |
151 | qDebug(" No resource available!!!"); | 152 | qDebug(" No resource available!!!"); |
152 | } | 153 | } |
153 | 154 | ||
154 | setStandardResource( res ); | 155 | setStandardResource( res ); |
155 | manager->writeConfig(); | 156 | manager->writeConfig(); |
156 | 157 | ||
157 | load(); | 158 | load(); |
158 | } | 159 | } |
159 | 160 | ||
160 | bool StdAddressBook::save() | 161 | bool StdAddressBook::save() |
161 | { | 162 | { |
162 | kdDebug(5700) << "StdAddressBook::save()" << endl; | 163 | kdDebug(5700) << "StdAddressBook::save()" << endl; |
163 | 164 | ||
164 | bool ok = true; | 165 | bool ok = true; |
165 | AddressBook *ab = self(); | 166 | AddressBook *ab = self(); |
166 | 167 | ||
167 | ab->deleteRemovedAddressees(); | 168 | ab->deleteRemovedAddressees(); |
168 | Iterator ait; | 169 | Iterator ait; |
169 | for ( ait = ab->begin(); ait != ab->end(); ++ait ) { | 170 | for ( ait = ab->begin(); ait != ab->end(); ++ait ) { |
170 | if ( !(*ait).IDStr().isEmpty() ) { | 171 | if ( !(*ait).IDStr().isEmpty() ) { |
171 | (*ait).insertCustom( "KADDRESSBOOK", "X-ExternalID", (*ait).IDStr() ); | 172 | (*ait).insertCustom( "KADDRESSBOOK", "X-ExternalID", (*ait).IDStr() ); |