summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kabc/distributionlist.cpp5
-rw-r--r--kabc/distributionlist.h2
-rw-r--r--kabc/kabc.pro2
-rw-r--r--kabc/kabcE.pro2
-rw-r--r--kabc/plugins/dir/dir.pro4
-rw-r--r--kabc/plugins/dir/dirE.pro2
-rw-r--r--kabc/plugins/dir/resourcedir.cpp9
-rw-r--r--kabc/plugins/file/file.pro4
-rw-r--r--kabc/plugins/file/fileE.pro2
-rw-r--r--kabc/plugins/file/resourcefile.cpp14
-rw-r--r--kabc/plugins/opie/opieE.pro2
-rw-r--r--kaddressbook/kaddressbook.pro2
-rw-r--r--kaddressbook/kaddressbookE.pro2
-rw-r--r--microkde/microkde.pro7
-rw-r--r--microkde/microkdeE.pro6
15 files changed, 27 insertions, 38 deletions
diff --git a/kabc/distributionlist.cpp b/kabc/distributionlist.cpp
index 0735aba..1fb186e 100644
--- a/kabc/distributionlist.cpp
+++ b/kabc/distributionlist.cpp
@@ -141,155 +141,152 @@ void DistributionListManager::insert( DistributionList *l )
141void DistributionListManager::remove( DistributionList *l ) 141void DistributionListManager::remove( DistributionList *l )
142{ 142{
143 DistributionList *list; 143 DistributionList *list;
144 for( list = mLists.first(); list; list = mLists.next() ) { 144 for( list = mLists.first(); list; list = mLists.next() ) {
145 if ( list->name() == l->name() ) { 145 if ( list->name() == l->name() ) {
146 mLists.remove( list ); 146 mLists.remove( list );
147 return; 147 return;
148 } 148 }
149 } 149 }
150} 150}
151 151
152QStringList DistributionListManager::listNames() 152QStringList DistributionListManager::listNames()
153{ 153{
154 QStringList names; 154 QStringList names;
155 155
156 DistributionList *list; 156 DistributionList *list;
157 for( list = mLists.first(); list; list = mLists.next() ) { 157 for( list = mLists.first(); list; list = mLists.next() ) {
158 names.append( list->name() ); 158 names.append( list->name() );
159 } 159 }
160 160
161 return names; 161 return names;
162} 162}
163 163
164bool DistributionListManager::load() 164bool DistributionListManager::load()
165{ 165{
166 KSimpleConfig cfg( locateLocal( "data", "kabc/distlists" ) ); 166 KSimpleConfig cfg( locateLocal( "data", "kabc/distlists" ) );
167 167
168/*US 168/*US
169 QMap<QString,QString> entryMap = cfg.entryMap( mAddressBook->identifier() ); 169 QMap<QString,QString> entryMap = cfg.entryMap( mAddressBook->identifier() );
170 if ( entryMap.isEmpty() ) { 170 if ( entryMap.isEmpty() ) {
171 kdDebug(5700) << "No distlists for '" << mAddressBook->identifier() << "'" << endl; 171 kdDebug(5700) << "No distlists for '" << mAddressBook->identifier() << "'" << endl;
172 return false; 172 return false;
173 } 173 }
174 174
175 cfg.setGroup( mAddressBook->identifier() ); 175 cfg.setGroup( mAddressBook->identifier() );
176 176
177 QMap<QString,QString>::ConstIterator it; 177 QMap<QString,QString>::ConstIterator it;
178 for( it = entryMap.begin(); it != entryMap.end(); ++it ) { 178 for( it = entryMap.begin(); it != entryMap.end(); ++it ) {
179 QString name = it.key(); 179 QString name = it.key();
180*/ 180*/
181 cfg.setGroup( mAddressBook->identifier() ); 181 cfg.setGroup( mAddressBook->identifier() );
182 //US we work in microkde with a list of distributionlists 182 //US we work in microkde with a list of distributionlists
183 QStringList distlists = cfg.readListEntry( "__Lists__List__" ); 183 QStringList distlists = cfg.readListEntry( "__Lists__List__" );
184 if ( distlists.isEmpty() ) { 184 if ( distlists.isEmpty() ) {
185 qDebug("no distlist for AB "); 185 qDebug("no distlist for AB ");
186 return false; 186 return false;
187 } 187 }
188 188
189 QStringList::ConstIterator it; 189 QStringList::ConstIterator it;
190 for( it = distlists.begin(); it != distlists.end(); ++it ) { 190 for( it = distlists.begin(); it != distlists.end(); ++it ) {
191 QString name = *it; 191 QString name = *it;
192 192
193 193
194 QStringList value = cfg.readListEntry( name ); 194 QStringList value = cfg.readListEntry( name );
195 195
196 196
197 197
198 DistributionList *list = new DistributionList( this, name ); 198 DistributionList *list = new DistributionList( this, name );
199 199
200 QStringList::ConstIterator it2 = value.begin(); 200 QStringList::ConstIterator it2 = value.begin();
201 while( it2 != value.end() ) { 201 while( it2 != value.end() ) {
202 QString id = *it2++; 202 QString id = *it2++;
203 QString email = *it2; 203 QString email = *it2;
204 204
205 205
206 206
207 Addressee a = mAddressBook->findByUid( id ); 207 Addressee a = mAddressBook->findByUid( id );
208 if ( !a.isEmpty() ) { 208 if ( !a.isEmpty() ) {
209 list->insertEntry( a, email ); 209 list->insertEntry( a, email );
210 } 210 }
211 211
212 if ( it2 == value.end() ) break; 212 if ( it2 == value.end() ) break;
213 ++it2; 213 ++it2;
214 } 214 }
215 } 215 }
216 216
217 return true; 217 return true;
218} 218}
219 219
220bool DistributionListManager::save() 220bool DistributionListManager::save()
221{ 221{
222 222
223 223
224 KSimpleConfig cfg( locateLocal( "data", "kabc/distlists" ) ); 224 KSimpleConfig cfg( locateLocal( "data", "kabc/distlists" ) );
225 225
226 cfg.deleteGroup( mAddressBook->identifier() ); 226 cfg.deleteGroup( mAddressBook->identifier() );
227 cfg.setGroup( mAddressBook->identifier() ); 227 cfg.setGroup( mAddressBook->identifier() );
228 228
229 DistributionList *list; 229 DistributionList *list;
230 for( list = mLists.first(); list; list = mLists.next() ) { 230 for( list = mLists.first(); list; list = mLists.next() ) {
231 kdDebug(5700) << " Saving '" << list->name() << "'" << endl; 231 kdDebug(5700) << " Saving '" << list->name() << "'" << endl;
232 QStringList value; 232 QStringList value;
233 DistributionList::Entry::List entries = list->entries(); 233 DistributionList::Entry::List entries = list->entries();
234 DistributionList::Entry::List::ConstIterator it; 234 DistributionList::Entry::List::ConstIterator it;
235 for( it = entries.begin(); it != entries.end(); ++it ) { 235 for( it = entries.begin(); it != entries.end(); ++it ) {
236 value.append( (*it).addressee.uid() ); 236 value.append( (*it).addressee.uid() );
237 if (( *it).email.isEmpty()) 237 if (( *it).email.isEmpty())
238 value.append( " " ); 238 value.append( " " );
239 else 239 else
240 value.append( (*it).email ); 240 value.append( (*it).email );
241 // qDebug("uid *%s* email *%s* ", (*it).addressee.uid().latin1(),(*it).email.latin1() ); 241 // qDebug("uid *%s* email *%s* ", (*it).addressee.uid().latin1(),(*it).email.latin1() );
242 } 242 }
243 cfg.writeEntry( list->name(), value ); 243 cfg.writeEntry( list->name(), value );
244 } 244 }
245 245
246//US for microKDE we have not yet sophisticated methods to load maps. 246//US for microKDE we have not yet sophisticated methods to load maps.
247// Because of that we store also a list of all distributionlists. 247// Because of that we store also a list of all distributionlists.
248 QStringList namelist; 248 QStringList namelist;
249 for( list = mLists.first(); list; list = mLists.next() ) { 249 for( list = mLists.first(); list; list = mLists.next() ) {
250 namelist.append( list->name() ); 250 namelist.append( list->name() );
251 } 251 }
252 cfg.writeEntry( "__Lists__List__", namelist ); 252 cfg.writeEntry( "__Lists__List__", namelist );
253 253
254 254
255 255
256 256
257 257
258 258
259 cfg.sync(); 259 cfg.sync();
260 260
261 return true; 261 return true;
262} 262}
263 263
264DistributionListWatcher* DistributionListWatcher::mSelf = 0; 264DistributionListWatcher* DistributionListWatcher::mSelf = 0;
265 265
266DistributionListWatcher::DistributionListWatcher() 266DistributionListWatcher::DistributionListWatcher()
267 : QObject( 0, "DistributionListWatcher" ) 267 : QObject( 0, "DistributionListWatcher" )
268{ 268{
269/*US 269
270 mDirWatch = new KDirWatch; 270 mDirWatch = new KDirWatch;
271 mDirWatch->addFile( locateLocal( "data", "kabc/distlists" ) ); 271 mDirWatch->addFile( locateLocal( "data", "kabc/distlists" ) );
272 272
273 connect( mDirWatch, SIGNAL( dirty( const QString& ) ), SIGNAL( changed() ) ); 273 connect( mDirWatch, SIGNAL( dirty( const QString& ) ), SIGNAL( changed() ) );
274 mDirWatch->startScan(); 274 mDirWatch->startScan();
275*/
276} 275}
277 276
278DistributionListWatcher::~DistributionListWatcher() 277DistributionListWatcher::~DistributionListWatcher()
279{ 278{
280/*US
281 delete mDirWatch; 279 delete mDirWatch;
282 mDirWatch = 0; 280 mDirWatch = 0;
283*/
284} 281}
285 282
286DistributionListWatcher *DistributionListWatcher::self() 283DistributionListWatcher *DistributionListWatcher::self()
287{ 284{
288 if ( !mSelf ) 285 if ( !mSelf )
289 mSelf = new DistributionListWatcher(); 286 mSelf = new DistributionListWatcher();
290 287
291 return mSelf; 288 return mSelf;
292} 289}
293 290
294//US #include "distributionlist.moc" 291//US #include "distributionlist.moc"
295 292
diff --git a/kabc/distributionlist.h b/kabc/distributionlist.h
index 5f091b1..584f287 100644
--- a/kabc/distributionlist.h
+++ b/kabc/distributionlist.h
@@ -85,133 +85,133 @@ class DistributionList
85 /** 85 /**
86 Insert an entry into this distribution list. If the entry already exists 86 Insert an entry into this distribution list. If the entry already exists
87 nothing happens. 87 nothing happens.
88 */ 88 */
89 void insertEntry( const Addressee &, const QString &email=QString::null ); 89 void insertEntry( const Addressee &, const QString &email=QString::null );
90 90
91 /** 91 /**
92 Remove an entry from this distribution list. If the entry doesn't exist 92 Remove an entry from this distribution list. If the entry doesn't exist
93 nothing happens. 93 nothing happens.
94 */ 94 */
95 void removeEntry( const Addressee &, const QString &email=QString::null ); 95 void removeEntry( const Addressee &, const QString &email=QString::null );
96 96
97 /** 97 /**
98 Return list of email addresses, which belong to this distributon list. 98 Return list of email addresses, which belong to this distributon list.
99 These addresses can be directly used by e.g. a mail client. 99 These addresses can be directly used by e.g. a mail client.
100 */ 100 */
101 QStringList emails() const; 101 QStringList emails() const;
102 102
103 /** 103 /**
104 Return list of entries belonging to this distribution list. This function 104 Return list of entries belonging to this distribution list. This function
105 is mainly useful for a distribution list editor. 105 is mainly useful for a distribution list editor.
106 */ 106 */
107 Entry::List entries() const; 107 Entry::List entries() const;
108 108
109 private: 109 private:
110 DistributionListManager *mManager; 110 DistributionListManager *mManager;
111 QString mName; 111 QString mName;
112 112
113 Entry::List mEntries; 113 Entry::List mEntries;
114}; 114};
115 115
116/** 116/**
117 @short Manager of distribution lists 117 @short Manager of distribution lists
118 118
119 This class represents a collection of distribution lists, which are associated 119 This class represents a collection of distribution lists, which are associated
120 with a given address book. 120 with a given address book.
121*/ 121*/
122class DistributionListManager 122class DistributionListManager
123{ 123{
124 public: 124 public:
125 /** 125 /**
126 Create manager for given address book. 126 Create manager for given address book.
127 */ 127 */
128 DistributionListManager( AddressBook * ); 128 DistributionListManager( AddressBook * );
129 129
130 /** 130 /**
131 Destructor. 131 Destructor.
132 */ 132 */
133 ~DistributionListManager(); 133 ~DistributionListManager();
134 134
135 /** 135 /**
136 Return distribution list with given name. 136 Return distribution list with given name.
137 */ 137 */
138 DistributionList *list( const QString &name ); 138 DistributionList *list( const QString &name );
139 139
140 /** 140 /**
141 Insert distribution list. If a list with this name already exists, nothing 141 Insert distribution list. If a list with this name already exists, nothing
142 happens. 142 happens.
143 */ 143 */
144 void insert( DistributionList * ); 144 void insert( DistributionList * );
145 145
146 /** 146 /**
147 Remove distribution list. If a list with this name doesn't exist, nothing 147 Remove distribution list. If a list with this name doesn't exist, nothing
148 happens. 148 happens.
149 */ 149 */
150 void remove( DistributionList * ); 150 void remove( DistributionList * );
151 151
152 /** 152 /**
153 Return names of all distribution lists managed by this manager. 153 Return names of all distribution lists managed by this manager.
154 */ 154 */
155 QStringList listNames(); 155 QStringList listNames();
156 156
157 /** 157 /**
158 Load distribution lists form disk. 158 Load distribution lists form disk.
159 */ 159 */
160 bool load(); 160 bool load();
161 161
162 /** 162 /**
163 Save distribution lists to disk. 163 Save distribution lists to disk.
164 */ 164 */
165 bool save(); 165 bool save();
166 166
167 private: 167 private:
168 AddressBook *mAddressBook; 168 AddressBook *mAddressBook;
169 169
170 QPtrList<DistributionList> mLists; 170 QPtrList<DistributionList> mLists;
171}; 171};
172 172
173/** 173/**
174 @short Watchdog for distribution lists 174 @short Watchdog for distribution lists
175 175
176 This class provides a @ref changed() signal that i emitted when the 176 This class provides a @ref changed() signal that i emitted when the
177 distribution lists has changed in some way. 177 distribution lists has changed in some way.
178 178
179 Exapmle: 179 Exapmle:
180 180
181 <pre> 181 <pre>
182 KABC::DistributionListWatcher *watchdog = KABC::DistributionListWatcher::self() 182 KABC::DistributionListWatcher *watchdog = KABC::DistributionListWatcher::self()
183 183
184 connect( watchdog, SIGNAL( changed() ), SLOT( doSomething() ) ); 184 connect( watchdog, SIGNAL( changed() ), SLOT( doSomething() ) );
185 </pre> 185 </pre>
186*/ 186*/
187 187
188class DistributionListWatcher : public QObject 188class DistributionListWatcher : public QObject
189{ 189{
190 Q_OBJECT 190 Q_OBJECT
191 191
192 public: 192 public:
193 /** 193 /**
194 * Returns the watcher object. 194 * Returns the watcher object.
195 */ 195 */
196 static DistributionListWatcher *self(); 196 static DistributionListWatcher *self();
197 197
198 198
199 signals: 199 signals:
200 /** 200 /**
201 * This signal is emmitted whenever the distribution lists has 201 * This signal is emmitted whenever the distribution lists has
202 * changed (if a list was added or removed, when a list was 202 * changed (if a list was added or removed, when a list was
203 * renamed or the entries of the list changed). 203 * renamed or the entries of the list changed).
204 */ 204 */
205 void changed(); 205 void changed();
206 206
207 protected: 207 protected:
208 DistributionListWatcher(); 208 DistributionListWatcher();
209 ~DistributionListWatcher(); 209 ~DistributionListWatcher();
210 210
211 private: 211 private:
212 static DistributionListWatcher* mSelf; 212 static DistributionListWatcher* mSelf;
213//US KDirWatch *mDirWatch; 213 KDirWatch *mDirWatch;
214}; 214};
215 215
216} 216}
217#endif 217#endif
diff --git a/kabc/kabc.pro b/kabc/kabc.pro
index 4a8d73a..a8cd695 100644
--- a/kabc/kabc.pro
+++ b/kabc/kabc.pro
@@ -1,138 +1,138 @@
1 TEMPLATE= lib 1 TEMPLATE= lib
2CONFIG += qt warn_on 2CONFIG += qt warn_on
3#release debug 3#release debug
4DESTDIR=../bin 4DESTDIR=../bin
5 5
6TARGET = microkabc 6TARGET = microkabc
7 7
8include( ../variables.pri ) 8include( ../variables.pri )
9 9
10INCLUDEPATH += . ./vcard/include ./vcard/include/generated ../microkde ../microkde/kdecore ../microkde/kio/kfile ../qtcompat ../microkde/kdeui 10INCLUDEPATH += . ./vcard/include ./vcard/include/generated ../microkde ../microkde/kdecore ../microkde/kio/kfile ../microkde/kio/kio ../qtcompat ../microkde/kdeui
11 11
12#LIBS += -lmicrokde -lldap 12#LIBS += -lmicrokde -lldap
13LIBS += -L$(QPEDIR)/lib 13LIBS += -L$(QPEDIR)/lib
14DEFINES += KAB_EMBEDDED DESKTOP_VERSION 14DEFINES += KAB_EMBEDDED DESKTOP_VERSION
15unix : { 15unix : {
16 16
17OBJECTS_DIR = obj/unix 17OBJECTS_DIR = obj/unix
18MOC_DIR = moc/unix 18MOC_DIR = moc/unix
19} 19}
20win32: { 20win32: {
21DEFINES += _WIN32_ 21DEFINES += _WIN32_
22OBJECTS_DIR = obj/win 22OBJECTS_DIR = obj/win
23MOC_DIR = moc/win 23MOC_DIR = moc/win
24} 24}
25INTERFACES = \ 25INTERFACES = \
26 26
27 27
28HEADERS = \ 28HEADERS = \
29 resource.h \ 29 resource.h \
30 stdaddressbook.h \ 30 stdaddressbook.h \
31 agent.h \ 31 agent.h \
32 geo.h \ 32 geo.h \
33 key.h \ 33 key.h \
34 field.h \ 34 field.h \
35 plugin.h \ 35 plugin.h \
36 address.h \ 36 address.h \
37 addresseelist.h \ 37 addresseelist.h \
38formatfactory.h \ 38formatfactory.h \
39 formatplugin.h \ 39 formatplugin.h \
40 phonenumber.h \ 40 phonenumber.h \
41distributionlist.h \ 41distributionlist.h \
42distributionlistdialog.h \ 42distributionlistdialog.h \
43distributionlisteditor.h \ 43distributionlisteditor.h \
44vcardformatplugin.h \ 44vcardformatplugin.h \
45formats/vcardformatplugin2.h \ 45formats/vcardformatplugin2.h \
46 picture.h \ 46 picture.h \
47 secrecy.h \ 47 secrecy.h \
48 sound.h \ 48 sound.h \
49 addressbook.h \ 49 addressbook.h \
50 timezone.h \ 50 timezone.h \
51 addressee.h \ 51 addressee.h \
52 addresseedialog.h \ 52 addresseedialog.h \
53 vcardconverter.h \ 53 vcardconverter.h \
54 vcard21parser.h \ 54 vcard21parser.h \
55 vcardformatimpl.h \ 55 vcardformatimpl.h \
56 plugins/file/resourcefile.h \ 56 plugins/file/resourcefile.h \
57 plugins/file/resourcefileconfig.h \ 57 plugins/file/resourcefileconfig.h \
58 plugins/dir/resourcedir.h \ 58 plugins/dir/resourcedir.h \
59 plugins/dir/resourcedirconfig.h \ 59 plugins/dir/resourcedirconfig.h \
60 vcardparser/vcardline.h \ 60 vcardparser/vcardline.h \
61 vcardparser/vcard.h \ 61 vcardparser/vcard.h \
62 vcardparser/vcardtool.h \ 62 vcardparser/vcardtool.h \
63 vcardparser/vcardparser.h \ 63 vcardparser/vcardparser.h \
64vcard/include/VCardAdrParam.h \ 64vcard/include/VCardAdrParam.h \
65vcard/include/VCardAdrValue.h \ 65vcard/include/VCardAdrValue.h \
66vcard/include/VCardAgentParam.h \ 66vcard/include/VCardAgentParam.h \
67vcard/include/VCardContentLine.h \ 67vcard/include/VCardContentLine.h \
68vcard/include/VCardDateParam.h \ 68vcard/include/VCardDateParam.h \
69vcard/include/VCardDateValue.h \ 69vcard/include/VCardDateValue.h \
70vcard/include/VCardEmailParam.h \ 70vcard/include/VCardEmailParam.h \
71vcard/include/VCardGeoValue.h \ 71vcard/include/VCardGeoValue.h \
72vcard/include/VCardGroup.h \ 72vcard/include/VCardGroup.h \
73vcard/include/VCardImageParam.h \ 73vcard/include/VCardImageParam.h \
74vcard/include/VCardImageValue.h \ 74vcard/include/VCardImageValue.h \
75vcard/include/VCardLangValue.h \ 75vcard/include/VCardLangValue.h \
76vcard/include/VCardNValue.h \ 76vcard/include/VCardNValue.h \
77vcard/include/VCardParam.h \ 77vcard/include/VCardParam.h \
78vcard/include/VCardPhoneNumberValue.h \ 78vcard/include/VCardPhoneNumberValue.h \
79vcard/include/VCardSourceParam.h \ 79vcard/include/VCardSourceParam.h \
80vcard/include/VCardTelParam.h \ 80vcard/include/VCardTelParam.h \
81vcard/include/VCardTextParam.h \ 81vcard/include/VCardTextParam.h \
82vcard/include/VCardTextNSParam.h \ 82vcard/include/VCardTextNSParam.h \
83vcard/include/VCardTextValue.h \ 83vcard/include/VCardTextValue.h \
84vcard/include/VCardTextBinParam.h \ 84vcard/include/VCardTextBinParam.h \
85vcard/include/VCardURIValue.h \ 85vcard/include/VCardURIValue.h \
86vcard/include/VCardVCard.h \ 86vcard/include/VCardVCard.h \
87vcard/include/VCardEntity.h \ 87vcard/include/VCardEntity.h \
88vcard/include/VCardValue.h \ 88vcard/include/VCardValue.h \
89vcard/include/VCardSoundValue.h \ 89vcard/include/VCardSoundValue.h \
90vcard/include/VCardAgentValue.h \ 90vcard/include/VCardAgentValue.h \
91vcard/include/VCardTelValue.h \ 91vcard/include/VCardTelValue.h \
92vcard/include/VCardTextBinValue.h \ 92vcard/include/VCardTextBinValue.h \
93vcard/include/VCardOrgValue.h \ 93vcard/include/VCardOrgValue.h \
94vcard/include/VCardUTCValue.h \ 94vcard/include/VCardUTCValue.h \
95vcard/include/VCardClassValue.h \ 95vcard/include/VCardClassValue.h \
96vcard/include/VCardFloatValue.h \ 96vcard/include/VCardFloatValue.h \
97vcard/include/VCardTextListValue.h \ 97vcard/include/VCardTextListValue.h \
98vcard/include/generated/AdrParam-generated.h \ 98vcard/include/generated/AdrParam-generated.h \
99vcard/include/generated/AdrValue-generated.h \ 99vcard/include/generated/AdrValue-generated.h \
100vcard/include/generated/AgentParam-generated.h \ 100vcard/include/generated/AgentParam-generated.h \
101vcard/include/generated/ContentLine-generated.h \ 101vcard/include/generated/ContentLine-generated.h \
102vcard/include/generated/DateParam-generated.h \ 102vcard/include/generated/DateParam-generated.h \
103vcard/include/generated/DateValue-generated.h \ 103vcard/include/generated/DateValue-generated.h \
104vcard/include/generated/EmailParam-generated.h \ 104vcard/include/generated/EmailParam-generated.h \
105vcard/include/generated/GeoValue-generated.h \ 105vcard/include/generated/GeoValue-generated.h \
106vcard/include/generated/Group-generated.h \ 106vcard/include/generated/Group-generated.h \
107vcard/include/generated/ImageParam-generated.h \ 107vcard/include/generated/ImageParam-generated.h \
108vcard/include/generated/ImageValue-generated.h \ 108vcard/include/generated/ImageValue-generated.h \
109vcard/include/generated/LangValue-generated.h \ 109vcard/include/generated/LangValue-generated.h \
110vcard/include/generated/NValue-generated.h \ 110vcard/include/generated/NValue-generated.h \
111vcard/include/generated/Param-generated.h \ 111vcard/include/generated/Param-generated.h \
112vcard/include/generated/PhoneNumberValue-generated.h \ 112vcard/include/generated/PhoneNumberValue-generated.h \
113vcard/include/generated/SourceParam-generated.h \ 113vcard/include/generated/SourceParam-generated.h \
114vcard/include/generated/TelParam-generated.h \ 114vcard/include/generated/TelParam-generated.h \
115vcard/include/generated/TextParam-generated.h \ 115vcard/include/generated/TextParam-generated.h \
116vcard/include/generated/TextNSParam-generated.h \ 116vcard/include/generated/TextNSParam-generated.h \
117vcard/include/generated/TextValue-generated.h \ 117vcard/include/generated/TextValue-generated.h \
118vcard/include/generated/TextBinParam-generated.h \ 118vcard/include/generated/TextBinParam-generated.h \
119vcard/include/generated/URIValue-generated.h \ 119vcard/include/generated/URIValue-generated.h \
120vcard/include/generated/VCard-generated.h \ 120vcard/include/generated/VCard-generated.h \
121vcard/include/generated/VCardEntity-generated.h \ 121vcard/include/generated/VCardEntity-generated.h \
122vcard/include/generated/Value-generated.h \ 122vcard/include/generated/Value-generated.h \
123vcard/include/generated/SoundValue-generated.h \ 123vcard/include/generated/SoundValue-generated.h \
124vcard/include/generated/AgentValue-generated.h \ 124vcard/include/generated/AgentValue-generated.h \
125vcard/include/generated/TelValue-generated.h \ 125vcard/include/generated/TelValue-generated.h \
126vcard/include/generated/TextBinValue-generated.h \ 126vcard/include/generated/TextBinValue-generated.h \
127vcard/include/generated/OrgValue-generated.h \ 127vcard/include/generated/OrgValue-generated.h \
128vcard/include/generated/UTCValue-generated.h \ 128vcard/include/generated/UTCValue-generated.h \
129vcard/include/generated/ClassValue-generated.h \ 129vcard/include/generated/ClassValue-generated.h \
130vcard/include/generated/FloatValue-generated.h \ 130vcard/include/generated/FloatValue-generated.h \
131vcard/include/generated/TextListValue-generated.h 131vcard/include/generated/TextListValue-generated.h
132 132
133 133
134# plugins/ldap/resourceldap.h \ 134# plugins/ldap/resourceldap.h \
135# plugins/ldap/resourceldapconfig.h \ 135# plugins/ldap/resourceldapconfig.h \
136#formats/binary/binaryformat.h \ 136#formats/binary/binaryformat.h \
137 137
138 138
diff --git a/kabc/kabcE.pro b/kabc/kabcE.pro
index 840afb9..bc1c0ed 100644
--- a/kabc/kabcE.pro
+++ b/kabc/kabcE.pro
@@ -1,134 +1,134 @@
1 TEMPLATE= lib 1 TEMPLATE= lib
2CONFIG += qt warn_on 2CONFIG += qt warn_on
3TARGET = microkabc 3TARGET = microkabc
4 4
5 5
6INCLUDEPATH += . ./vcard/include ./vcard/include/generated ../microkde ../microkde/kdecore ../microkde/kdeui ../microkde/kio/kfile ../qtcompat $(QPEDIR)/include 6INCLUDEPATH += . ./vcard/include ./vcard/include/generated ../microkde ../microkde/kdecore ../microkde/kdeui ../microkde/kio/kfile ../microkde/kio/kio ../qtcompat $(QPEDIR)/include
7OBJECTS_DIR = obj/$(PLATFORM) 7OBJECTS_DIR = obj/$(PLATFORM)
8MOC_DIR = moc/$(PLATFORM) 8MOC_DIR = moc/$(PLATFORM)
9DESTDIR = $(QPEDIR)/lib 9DESTDIR = $(QPEDIR)/lib
10LIBS += -lmicrokde 10LIBS += -lmicrokde
11#LIBS += -lldap 11#LIBS += -lldap
12LIBS += -L$(QPEDIR)/lib 12LIBS += -L$(QPEDIR)/lib
13DEFINES += KAB_EMBEDDED 13DEFINES += KAB_EMBEDDED
14 14
15INTERFACES = \ 15INTERFACES = \
16 16
17HEADERS = \ 17HEADERS = \
18 address.h \ 18 address.h \
19 addressbook.h \ 19 addressbook.h \
20 addressee.h \ 20 addressee.h \
21 addresseedialog.h \ 21 addresseedialog.h \
22 addresseelist.h \ 22 addresseelist.h \
23 agent.h \ 23 agent.h \
24 distributionlist.h \ 24 distributionlist.h \
25 distributionlistdialog.h \ 25 distributionlistdialog.h \
26 distributionlisteditor.h \ 26 distributionlisteditor.h \
27 field.h \ 27 field.h \
28 formatfactory.h \ 28 formatfactory.h \
29 formatplugin.h \ 29 formatplugin.h \
30 geo.h \ 30 geo.h \
31 key.h \ 31 key.h \
32 phonenumber.h \ 32 phonenumber.h \
33 picture.h \ 33 picture.h \
34 plugin.h \ 34 plugin.h \
35 resource.h \ 35 resource.h \
36 secrecy.h \ 36 secrecy.h \
37 sound.h \ 37 sound.h \
38 stdaddressbook.h \ 38 stdaddressbook.h \
39 timezone.h \ 39 timezone.h \
40 vcardconverter.h \ 40 vcardconverter.h \
41 vcard21parser.h \ 41 vcard21parser.h \
42 vcardformatimpl.h \ 42 vcardformatimpl.h \
43 vcardformatplugin.h \ 43 vcardformatplugin.h \
44 vcardparser/vcardline.h \ 44 vcardparser/vcardline.h \
45 vcardparser/vcard.h \ 45 vcardparser/vcard.h \
46 vcardparser/vcardtool.h \ 46 vcardparser/vcardtool.h \
47 vcardparser/vcardparser.h \ 47 vcardparser/vcardparser.h \
48 vcard/include/VCardAdrParam.h \ 48 vcard/include/VCardAdrParam.h \
49 vcard/include/VCardAdrValue.h \ 49 vcard/include/VCardAdrValue.h \
50 vcard/include/VCardAgentParam.h \ 50 vcard/include/VCardAgentParam.h \
51 vcard/include/VCardContentLine.h \ 51 vcard/include/VCardContentLine.h \
52 vcard/include/VCardDateParam.h \ 52 vcard/include/VCardDateParam.h \
53 vcard/include/VCardDateValue.h \ 53 vcard/include/VCardDateValue.h \
54 vcard/include/VCardEmailParam.h \ 54 vcard/include/VCardEmailParam.h \
55 vcard/include/VCardGeoValue.h \ 55 vcard/include/VCardGeoValue.h \
56 vcard/include/VCardGroup.h \ 56 vcard/include/VCardGroup.h \
57 vcard/include/VCardImageParam.h \ 57 vcard/include/VCardImageParam.h \
58 vcard/include/VCardImageValue.h \ 58 vcard/include/VCardImageValue.h \
59 vcard/include/VCardLangValue.h \ 59 vcard/include/VCardLangValue.h \
60 vcard/include/VCardNValue.h \ 60 vcard/include/VCardNValue.h \
61 vcard/include/VCardParam.h \ 61 vcard/include/VCardParam.h \
62 vcard/include/VCardPhoneNumberValue.h \ 62 vcard/include/VCardPhoneNumberValue.h \
63 vcard/include/VCardSourceParam.h \ 63 vcard/include/VCardSourceParam.h \
64 vcard/include/VCardTelParam.h \ 64 vcard/include/VCardTelParam.h \
65 vcard/include/VCardTextParam.h \ 65 vcard/include/VCardTextParam.h \
66 vcard/include/VCardTextNSParam.h \ 66 vcard/include/VCardTextNSParam.h \
67 vcard/include/VCardTextValue.h \ 67 vcard/include/VCardTextValue.h \
68 vcard/include/VCardTextBinParam.h \ 68 vcard/include/VCardTextBinParam.h \
69 vcard/include/VCardURIValue.h \ 69 vcard/include/VCardURIValue.h \
70 vcard/include/VCardVCard.h \ 70 vcard/include/VCardVCard.h \
71 vcard/include/VCardEntity.h \ 71 vcard/include/VCardEntity.h \
72 vcard/include/VCardValue.h \ 72 vcard/include/VCardValue.h \
73 vcard/include/VCardSoundValue.h \ 73 vcard/include/VCardSoundValue.h \
74 vcard/include/VCardAgentValue.h \ 74 vcard/include/VCardAgentValue.h \
75 vcard/include/VCardTelValue.h \ 75 vcard/include/VCardTelValue.h \
76 vcard/include/VCardTextBinValue.h \ 76 vcard/include/VCardTextBinValue.h \
77 vcard/include/VCardOrgValue.h \ 77 vcard/include/VCardOrgValue.h \
78 vcard/include/VCardUTCValue.h \ 78 vcard/include/VCardUTCValue.h \
79 vcard/include/VCardClassValue.h \ 79 vcard/include/VCardClassValue.h \
80 vcard/include/VCardFloatValue.h \ 80 vcard/include/VCardFloatValue.h \
81 vcard/include/VCardTextListValue.h \ 81 vcard/include/VCardTextListValue.h \
82 vcard/include/generated/AdrParam-generated.h \ 82 vcard/include/generated/AdrParam-generated.h \
83 vcard/include/generated/AdrValue-generated.h \ 83 vcard/include/generated/AdrValue-generated.h \
84 vcard/include/generated/AgentParam-generated.h \ 84 vcard/include/generated/AgentParam-generated.h \
85 vcard/include/generated/ContentLine-generated.h \ 85 vcard/include/generated/ContentLine-generated.h \
86 vcard/include/generated/DateParam-generated.h \ 86 vcard/include/generated/DateParam-generated.h \
87 vcard/include/generated/DateValue-generated.h \ 87 vcard/include/generated/DateValue-generated.h \
88 vcard/include/generated/EmailParam-generated.h \ 88 vcard/include/generated/EmailParam-generated.h \
89 vcard/include/generated/GeoValue-generated.h \ 89 vcard/include/generated/GeoValue-generated.h \
90 vcard/include/generated/Group-generated.h \ 90 vcard/include/generated/Group-generated.h \
91 vcard/include/generated/ImageParam-generated.h \ 91 vcard/include/generated/ImageParam-generated.h \
92 vcard/include/generated/ImageValue-generated.h \ 92 vcard/include/generated/ImageValue-generated.h \
93 vcard/include/generated/LangValue-generated.h \ 93 vcard/include/generated/LangValue-generated.h \
94 vcard/include/generated/NValue-generated.h \ 94 vcard/include/generated/NValue-generated.h \
95 vcard/include/generated/Param-generated.h \ 95 vcard/include/generated/Param-generated.h \
96 vcard/include/generated/PhoneNumberValue-generated.h \ 96 vcard/include/generated/PhoneNumberValue-generated.h \
97 vcard/include/generated/SourceParam-generated.h \ 97 vcard/include/generated/SourceParam-generated.h \
98 vcard/include/generated/TelParam-generated.h \ 98 vcard/include/generated/TelParam-generated.h \
99 vcard/include/generated/TextParam-generated.h \ 99 vcard/include/generated/TextParam-generated.h \
100 vcard/include/generated/TextNSParam-generated.h \ 100 vcard/include/generated/TextNSParam-generated.h \
101 vcard/include/generated/TextValue-generated.h \ 101 vcard/include/generated/TextValue-generated.h \
102 vcard/include/generated/TextBinParam-generated.h \ 102 vcard/include/generated/TextBinParam-generated.h \
103 vcard/include/generated/URIValue-generated.h \ 103 vcard/include/generated/URIValue-generated.h \
104 vcard/include/generated/VCard-generated.h \ 104 vcard/include/generated/VCard-generated.h \
105 vcard/include/generated/VCardEntity-generated.h \ 105 vcard/include/generated/VCardEntity-generated.h \
106 vcard/include/generated/Value-generated.h \ 106 vcard/include/generated/Value-generated.h \
107 vcard/include/generated/SoundValue-generated.h \ 107 vcard/include/generated/SoundValue-generated.h \
108 vcard/include/generated/AgentValue-generated.h \ 108 vcard/include/generated/AgentValue-generated.h \
109 vcard/include/generated/TelValue-generated.h \ 109 vcard/include/generated/TelValue-generated.h \
110 vcard/include/generated/TextBinValue-generated.h \ 110 vcard/include/generated/TextBinValue-generated.h \
111 vcard/include/generated/OrgValue-generated.h \ 111 vcard/include/generated/OrgValue-generated.h \
112 vcard/include/generated/UTCValue-generated.h \ 112 vcard/include/generated/UTCValue-generated.h \
113 vcard/include/generated/ClassValue-generated.h \ 113 vcard/include/generated/ClassValue-generated.h \
114 vcard/include/generated/FloatValue-generated.h \ 114 vcard/include/generated/FloatValue-generated.h \
115 vcard/include/generated/TextListValue-generated.h 115 vcard/include/generated/TextListValue-generated.h
116 116
117 117
118 118
119 119
120SOURCES = \ 120SOURCES = \
121 address.cpp \ 121 address.cpp \
122 addressbook.cpp \ 122 addressbook.cpp \
123 addressee.cpp \ 123 addressee.cpp \
124 addresseedialog.cpp \ 124 addresseedialog.cpp \
125 addresseelist.cpp \ 125 addresseelist.cpp \
126 agent.cpp \ 126 agent.cpp \
127 distributionlist.cpp \ 127 distributionlist.cpp \
128 distributionlistdialog.cpp \ 128 distributionlistdialog.cpp \
129 distributionlisteditor.cpp \ 129 distributionlisteditor.cpp \
130 field.cpp \ 130 field.cpp \
131 formatfactory.cpp \ 131 formatfactory.cpp \
132 geo.cpp \ 132 geo.cpp \
133 key.cpp \ 133 key.cpp \
134 phonenumber.cpp \ 134 phonenumber.cpp \
diff --git a/kabc/plugins/dir/dir.pro b/kabc/plugins/dir/dir.pro
index 0023029..0555484 100644
--- a/kabc/plugins/dir/dir.pro
+++ b/kabc/plugins/dir/dir.pro
@@ -1,34 +1,34 @@
1 TEMPLATE= lib 1 TEMPLATE= lib
2CONFIG += qt warn_on release 2CONFIG += qt warn_on release
3#release debug 3#release debug
4 4
5TARGET = microkabc_dir 5TARGET = microkabc_dir
6INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../qtcompat 6INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../qtcompat
7DESTDIR = ../../../bin 7DESTDIR = ../../../bin
8#LIBS += -lmicrokde -lmicrokabc 8#LIBS += -lmicrokde -lmicrokabc
9#LIBS += -L$(QPEDIR)/lib 9#LIBS += -L$(QPEDIR)/lib
10 10
11INTERFACES = \ 11INTERFACES = \
12 12
13HEADERS = \ 13HEADERS = \
14 resourcedir.h \ 14 resourcedir.h \
15 resourcedirconfig.h 15 resourcedirconfig.h
16 16
17SOURCES = \ 17SOURCES = \
18 resourcedir.cpp \ 18 resourcedir.cpp \
19 resourcedirconfig.cpp 19 resourcedirconfig.cpp
20 20
21unix : { 21unix : {
22OBJECTS_DIR = obj/unix 22OBJECTS_DIR = obj/unix
23MOC_DIR = moc/unix 23MOC_DIR = moc/unix
24} 24}
25win32: { 25win32: {
26CONFIG += dll 26CONFIG += dll
27DEFINES += _WIN32_ 27DEFINES += _WIN32_
28OBJECTS_DIR = obj/win 28OBJECTS_DIR = obj/win
29MOC_DIR = moc/win 29MOC_DIR = moc/win
30LIBS += ../../../bin/microkdepim.lib 30LIBS += ../../../bin/microkdepim.lib
31LIBS += ../../../bin/microkcal.lib 31LIBS += ../../../bin/microkcal.lib
32LIBS += ../../../bin/microkde.lib 32LIBS += ../../../bin/microkde.lib
33LIBS += ../../../bin/microkabc.lib 33LIBS += ../../../bin/microkabc.lib
34} \ No newline at end of file 34}
diff --git a/kabc/plugins/dir/dirE.pro b/kabc/plugins/dir/dirE.pro
index aceb28a..729f4ce 100644
--- a/kabc/plugins/dir/dirE.pro
+++ b/kabc/plugins/dir/dirE.pro
@@ -1,21 +1,21 @@
1 TEMPLATE= lib 1 TEMPLATE= lib
2CONFIG += qt warn_on release 2CONFIG += qt warn_on release
3#release debug 3#release debug
4 4
5TARGET = microkabc_dir 5TARGET = microkabc_dir
6INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../qtcompat 6INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../qtcompat
7OBJECTS_DIR = obj/$(PLATFORM) 7OBJECTS_DIR = obj/$(PLATFORM)
8MOC_DIR = moc/$(PLATFORM) 8MOC_DIR = moc/$(PLATFORM)
9DESTDIR = $(QPEDIR)/lib 9DESTDIR = $(QPEDIR)/lib
10LIBS += -lmicrokde -lmicrokabc 10LIBS += -lmicrokde -lmicrokabc
11LIBS += -L$(QPEDIR)/lib 11LIBS += -L$(QPEDIR)/lib
12 12
13INTERFACES = \ 13INTERFACES = \
14 14
15HEADERS = \ 15HEADERS = \
16 resourcedir.h \ 16 resourcedir.h \
17 resourcedirconfig.h 17 resourcedirconfig.h
18 18
19SOURCES = \ 19SOURCES = \
20 resourcedir.cpp \ 20 resourcedir.cpp \
21 resourcedirconfig.cpp 21 resourcedirconfig.cpp
diff --git a/kabc/plugins/dir/resourcedir.cpp b/kabc/plugins/dir/resourcedir.cpp
index 3cb5179..7825c6f 100644
--- a/kabc/plugins/dir/resourcedir.cpp
+++ b/kabc/plugins/dir/resourcedir.cpp
@@ -1,367 +1,362 @@
1/* 1/*
2 This file is part of libkabc. 2 This file is part of libkabc.
3 Copyright (c) 2002 Tobias Koenig <tokoe@kde.org> 3 Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
4 4
5 This library is free software; you can redistribute it and/or 5 This library is free software; you can redistribute it and/or
6 modify it under the terms of the GNU Library General Public 6 modify it under the terms of the GNU Library General Public
7 License as published by the Free Software Foundation; either 7 License as published by the Free Software Foundation; either
8 version 2 of the License, or (at your option) any later version. 8 version 2 of the License, or (at your option) any later version.
9 9
10 This library is distributed in the hope that it will be useful, 10 This library is distributed in the hope that it will be useful,
11 but WITHOUT ANY WARRANTY; without even the implied warranty of 11 but WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13 Library General Public License for more details. 13 Library General Public License for more details.
14 14
15 You should have received a copy of the GNU Library General Public License 15 You should have received a copy of the GNU Library General Public License
16 along with this library; see the file COPYING.LIB. If not, write to 16 along with this library; see the file COPYING.LIB. If not, write to
17 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, 17 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
18 Boston, MA 02111-1307, USA. 18 Boston, MA 02111-1307, USA.
19*/ 19*/
20 20
21/* 21/*
22Enhanced Version of the file for platform independent KDE tools. 22Enhanced Version of the file for platform independent KDE tools.
23Copyright (c) 2004 Ulf Schenk 23Copyright (c) 2004 Ulf Schenk
24 24
25$Id$ 25$Id$
26*/ 26*/
27 27
28 28
29#include <sys/types.h> 29#include <sys/types.h>
30#include <sys/stat.h> 30#include <sys/stat.h>
31#ifndef _WIN32_ 31#ifndef _WIN32_
32#include <unistd.h> 32#include <unistd.h>
33#endif 33#endif
34 34
35#include <qregexp.h> 35#include <qregexp.h>
36#include <qtimer.h> 36#include <qtimer.h>
37#include <qwidget.h> 37#include <qwidget.h>
38 38
39#include <kapplication.h> 39#include <kapplication.h>
40#include <kconfig.h> 40#include <kconfig.h>
41#include <kdebug.h> 41#include <kdebug.h>
42//US #include <kgenericfactory.h> 42//US #include <kgenericfactory.h>
43#include <kglobal.h> 43#include <kglobal.h>
44#include <klocale.h> 44#include <klocale.h>
45#include <kstandarddirs.h> 45#include <kstandarddirs.h>
46#include <kurlrequester.h> 46#include <kurlrequester.h>
47 47
48#include "addressbook.h" 48#include "addressbook.h"
49 49
50#include "formatfactory.h" 50#include "formatfactory.h"
51 51
52#include "resourcedirconfig.h" 52#include "resourcedirconfig.h"
53#include "stdaddressbook.h" 53#include "stdaddressbook.h"
54 54
55//US 55//US
56#include <qdir.h> 56#include <qdir.h>
57//US #include "../../formats/vcardformatplugin2.h" 57//US #include "../../formats/vcardformatplugin2.h"
58//US #include "../../formats/binaryformat.h" 58//US #include "../../formats/binaryformat.h"
59 59
60#include "resourcedir.h" 60#include "resourcedir.h"
61 61
62using namespace KABC; 62using namespace KABC;
63 63
64extern "C" 64extern "C"
65#ifdef _WIN32_ 65#ifdef _WIN32_
66__declspec(dllexport) 66__declspec(dllexport)
67#else 67#else
68{ 68{
69#endif 69#endif
70 70
71//US void *init_kabc_dir() 71//US void *init_kabc_dir()
72 void *init_microkabc_dir() 72 void *init_microkabc_dir()
73 { 73 {
74 return new KRES::PluginFactory<ResourceDir,ResourceDirConfig>(); 74 return new KRES::PluginFactory<ResourceDir,ResourceDirConfig>();
75 } 75 }
76#ifndef _WIN32_ 76#ifndef _WIN32_
77} 77}
78#endif 78#endif
79 79
80ResourceDir::ResourceDir( const KConfig *config ) 80ResourceDir::ResourceDir( const KConfig *config )
81 : Resource( config ) 81 : Resource( config )
82{ 82{
83 QString path; 83 QString path;
84 84
85 KConfig *cfg = (KConfig *)config; 85 KConfig *cfg = (KConfig *)config;
86 if ( cfg ) { 86 if ( cfg ) {
87//US path = config->readEntry( "FilePath" ); 87//US path = config->readEntry( "FilePath" );
88 path = cfg->readEntry( "FilePath", StdAddressBook::directoryName() ); 88 path = cfg->readEntry( "FilePath", StdAddressBook::directoryName() );
89//US mFormatName = config->readEntry( "FileFormat" ); 89//US mFormatName = config->readEntry( "FileFormat" );
90 mFormatName = cfg->readEntry( "FileFormat", "vcard" ); 90 mFormatName = cfg->readEntry( "FileFormat", "vcard" );
91 } else { 91 } else {
92 path = StdAddressBook::directoryName(); 92 path = StdAddressBook::directoryName();
93 mFormatName = "vcard"; 93 mFormatName = "vcard";
94 } 94 }
95 95
96 96
97 FormatFactory *factory = FormatFactory::self(); 97 FormatFactory *factory = FormatFactory::self();
98 mFormat = factory->format( mFormatName ); 98 mFormat = factory->format( mFormatName );
99 99
100 if ( !mFormat ) { 100 if ( !mFormat ) {
101 mFormatName = "vcard"; 101 mFormatName = "vcard";
102 mFormat = factory->format( mFormatName ); 102 mFormat = factory->format( mFormatName );
103 } 103 }
104 104
105/*US 105/*US
106//US qDebug("ResourceDir::ResourceDir initialized with format %s ", mFormatName.latin1()); 106//US qDebug("ResourceDir::ResourceDir initialized with format %s ", mFormatName.latin1());
107 if (mFormatName == "vcard") 107 if (mFormatName == "vcard")
108 mFormat = new VCardFormatPlugin2(); 108 mFormat = new VCardFormatPlugin2();
109 else if (mFormatName == "binary") 109 else if (mFormatName == "binary")
110 mFormat = new BinaryFormat(); 110 mFormat = new BinaryFormat();
111 else 111 else
112 qDebug("ResourceFile::init format unknown !!! %s ", mFormatName.latin1()); 112 qDebug("ResourceFile::init format unknown !!! %s ", mFormatName.latin1());
113*/ 113*/
114 114
115/*US we have no KDirWatch. SO simulate the signals from inside the apropriate methods
116 connect( &mDirWatch, SIGNAL( dirty(const QString&) ), SLOT( pathChanged() ) ); 115 connect( &mDirWatch, SIGNAL( dirty(const QString&) ), SLOT( pathChanged() ) );
117 connect( &mDirWatch, SIGNAL( created(const QString&) ), SLOT( pathChanged() ) ); 116 connect( &mDirWatch, SIGNAL( created(const QString&) ), SLOT( pathChanged() ) );
118 connect( &mDirWatch, SIGNAL( deleted(const QString&) ), SLOT( pathChanged() ) ); 117 connect( &mDirWatch, SIGNAL( deleted(const QString&) ), SLOT( pathChanged() ) );
119*/
120 118
121 setPath( path ); 119 setPath( path );
122} 120}
123 121
124ResourceDir::~ResourceDir() 122ResourceDir::~ResourceDir()
125{ 123{
126 delete mFormat; 124 delete mFormat;
127 mFormat = 0; 125 mFormat = 0;
128} 126}
129 127
130void ResourceDir::writeConfig( KConfig *config ) 128void ResourceDir::writeConfig( KConfig *config )
131{ 129{
132 config->setGroup( "Resource_" + identifier() ); 130 config->setGroup( "Resource_" + identifier() );
133 Resource::writeConfig( config ); 131 Resource::writeConfig( config );
134 132
135 config->writeEntry( "FilePath", mPath ); 133 config->writeEntry( "FilePath", mPath );
136 config->writeEntry( "FileFormat", mFormatName ); 134 config->writeEntry( "FileFormat", mFormatName );
137} 135}
138 136
139Ticket *ResourceDir::requestSaveTicket() 137Ticket *ResourceDir::requestSaveTicket()
140{ 138{
141 kdDebug(5700) << "ResourceDir::requestSaveTicket()" << endl; 139 kdDebug(5700) << "ResourceDir::requestSaveTicket()" << endl;
142 140
143 if ( !addressBook() ) return 0; 141 if ( !addressBook() ) return 0;
144 142
145 if ( !lock( mPath ) ) { 143 if ( !lock( mPath ) ) {
146 kdDebug(5700) << "ResourceDir::requestSaveTicket(): Unable to lock path '" 144 kdDebug(5700) << "ResourceDir::requestSaveTicket(): Unable to lock path '"
147 << mPath << "'" << endl; 145 << mPath << "'" << endl;
148 return 0; 146 return 0;
149 } 147 }
150 return createTicket( this ); 148 return createTicket( this );
151} 149}
152 150
153 151
154bool ResourceDir::doOpen() 152bool ResourceDir::doOpen()
155{ 153{
156 QDir dir( mPath ); 154 QDir dir( mPath );
157 if ( !dir.exists() ) { // no directory available 155 if ( !dir.exists() ) { // no directory available
158 return dir.mkdir( dir.path() ); 156 return dir.mkdir( dir.path() );
159 } else { 157 } else {
160 QString testName = dir.entryList( QDir::Files )[0]; 158 QString testName = dir.entryList( QDir::Files )[0];
161 if ( testName.isNull() || testName.isEmpty() ) // no file in directory 159 if ( testName.isNull() || testName.isEmpty() ) // no file in directory
162 return true; 160 return true;
163 161
164 QFile file( mPath + "/" + testName ); 162 QFile file( mPath + "/" + testName );
165 if ( file.open( IO_ReadOnly ) ) 163 if ( file.open( IO_ReadOnly ) )
166 return true; 164 return true;
167 165
168 if ( file.size() == 0 ) 166 if ( file.size() == 0 )
169 return true; 167 return true;
170 168
171 bool ok = mFormat->checkFormat( &file ); 169 bool ok = mFormat->checkFormat( &file );
172 file.close(); 170 file.close();
173 return ok; 171 return ok;
174 } 172 }
175} 173}
176 174
177void ResourceDir::doClose() 175void ResourceDir::doClose()
178{ 176{
179} 177}
180 178
181bool ResourceDir::load() 179bool ResourceDir::load()
182{ 180{
183 kdDebug(5700) << "ResourceDir::load(): '" << mPath << "'" << endl; 181 kdDebug(5700) << "ResourceDir::load(): '" << mPath << "'" << endl;
184 182
185 QDir dir( mPath ); 183 QDir dir( mPath );
186 QStringList files = dir.entryList( QDir::Files ); 184 QStringList files = dir.entryList( QDir::Files );
187 185
188 QStringList::Iterator it; 186 QStringList::Iterator it;
189 bool ok = true; 187 bool ok = true;
190 for ( it = files.begin(); it != files.end(); ++it ) { 188 for ( it = files.begin(); it != files.end(); ++it ) {
191 QFile file( mPath + "/" + (*it) ); 189 QFile file( mPath + "/" + (*it) );
192 190
193 if ( !file.open( IO_ReadOnly ) ) { 191 if ( !file.open( IO_ReadOnly ) ) {
194 addressBook()->error( i18n( "Unable to open file '%1' for reading" ).arg( file.name() ) ); 192 addressBook()->error( i18n( "Unable to open file '%1' for reading" ).arg( file.name() ) );
195 ok = false; 193 ok = false;
196 continue; 194 continue;
197 } 195 }
198 196
199 if ( !mFormat->loadAll( addressBook(), this, &file ) ) 197 if ( !mFormat->loadAll( addressBook(), this, &file ) )
200 ok = false; 198 ok = false;
201 199
202 file.close(); 200 file.close();
203 } 201 }
204 202
205 return ok; 203 return ok;
206} 204}
207 205
208bool ResourceDir::save( Ticket *ticket ) 206bool ResourceDir::save( Ticket *ticket )
209{ 207{
210 kdDebug(5700) << "ResourceDir::save(): '" << mPath << "'" << endl; 208 kdDebug(5700) << "ResourceDir::save(): '" << mPath << "'" << endl;
211 209
212 AddressBook::Iterator it; 210 AddressBook::Iterator it;
213 bool ok = true; 211 bool ok = true;
214 212
215 for ( it = addressBook()->begin(); it != addressBook()->end(); ++it ) { 213 for ( it = addressBook()->begin(); it != addressBook()->end(); ++it ) {
216 if ( (*it).resource() != this || !(*it).changed() ) 214 if ( (*it).resource() != this || !(*it).changed() )
217 continue; 215 continue;
218 216
219 QFile file( mPath + "/" + (*it).uid() ); 217 QFile file( mPath + "/" + (*it).uid() );
220 if ( !file.open( IO_WriteOnly ) ) { 218 if ( !file.open( IO_WriteOnly ) ) {
221 addressBook()->error( i18n( "Unable to open file '%1' for writing" ).arg( file.name() ) ); 219 addressBook()->error( i18n( "Unable to open file '%1' for writing" ).arg( file.name() ) );
222 continue; 220 continue;
223 } 221 }
224 222
225 mFormat->save( *it, &file ); 223 mFormat->save( *it, &file );
226 224
227 // mark as unchanged 225 // mark as unchanged
228 (*it).setChanged( false ); 226 (*it).setChanged( false );
229 227
230 file.close(); 228 file.close();
231 } 229 }
232 230
233 delete ticket; 231 delete ticket;
234 unlock( mPath ); 232 unlock( mPath );
235 233
236 return ok; 234 return ok;
237} 235}
238 236
239bool ResourceDir::lock( const QString &path ) 237bool ResourceDir::lock( const QString &path )
240{ 238{
241 kdDebug(5700) << "ResourceDir::lock()" << endl; 239 kdDebug(5700) << "ResourceDir::lock()" << endl;
242 240
243 QString p = path; 241 QString p = path;
244//US change the implementation how the lockfilename is getting created 242//US change the implementation how the lockfilename is getting created
245//US p.replace( QRegExp("/"), "_" ); 243//US p.replace( QRegExp("/"), "_" );
246//US QString lockName = locateLocal( "data", "kabc/lock/" + p + ".lock" ); 244//US QString lockName = locateLocal( "data", "kabc/lock/" + p + ".lock" );
247 KURL url(p); 245 KURL url(p);
248 QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" ); 246 QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" );
249 247
250 248
251 kdDebug(5700) << "-- lock name: " << lockName << endl; 249 kdDebug(5700) << "-- lock name: " << lockName << endl;
252 250
253 if ( QFile::exists( lockName ) ) return false; 251 if ( QFile::exists( lockName ) ) return false;
254 252
255 QString lockUniqueName; 253 QString lockUniqueName;
256 lockUniqueName = p + KApplication::randomString( 8 ); 254 lockUniqueName = p + KApplication::randomString( 8 );
257 255
258 url = lockUniqueName; 256 url = lockUniqueName;
259//US mLockUniqueName = locateLocal( "data", "kabc/lock/" + lockUniqueName ); 257//US mLockUniqueName = locateLocal( "data", "kabc/lock/" + lockUniqueName );
260 mLockUniqueName = locateLocal( "data", "kabc/lock/" + url.fileName() ); 258 mLockUniqueName = locateLocal( "data", "kabc/lock/" + url.fileName() );
261 259
262 kdDebug(5700) << "-- lock unique name: " << mLockUniqueName << endl; 260 kdDebug(5700) << "-- lock unique name: " << mLockUniqueName << endl;
263 261
264 // Create unique file 262 // Create unique file
265 QFile file( mLockUniqueName ); 263 QFile file( mLockUniqueName );
266 file.open( IO_WriteOnly ); 264 file.open( IO_WriteOnly );
267 file.close(); 265 file.close();
268 266
269 // Create lock file 267 // Create lock file
270 int result = 0; 268 int result = 0;
271#ifndef _WIN32_ 269#ifndef _WIN32_
272 result = ::link( QFile::encodeName( mLockUniqueName ), 270 result = ::link( QFile::encodeName( mLockUniqueName ),
273 QFile::encodeName( lockName ) ); 271 QFile::encodeName( lockName ) );
274#endif 272#endif
275 if ( result == 0 ) { 273 if ( result == 0 ) {
276 addressBook()->emitAddressBookLocked(); 274 addressBook()->emitAddressBookLocked();
277 return true; 275 return true;
278 } 276 }
279 277
280 // TODO: check stat 278 // TODO: check stat
281 279
282 return false; 280 return false;
283} 281}
284 282
285void ResourceDir::unlock( const QString &path ) 283void ResourceDir::unlock( const QString &path )
286{ 284{
287 QString p = path; 285 QString p = path;
288//US change the implementation how the lockfilename is getting created 286//US change the implementation how the lockfilename is getting created
289//US p.replace( QRegExp( "/" ), "_" ); 287//US p.replace( QRegExp( "/" ), "_" );
290//US QString lockName = locate( "data", "kabc/lock/" + p + ".lock" ); 288//US QString lockName = locate( "data", "kabc/lock/" + p + ".lock" );
291 KURL url(p); 289 KURL url(p);
292 QString lockName = locate( "data", "kabc/lock/" + url.fileName() + ".lock" ); 290 QString lockName = locate( "data", "kabc/lock/" + url.fileName() + ".lock" );
293 291
294 ::unlink( QFile::encodeName( lockName ) ); 292 ::unlink( QFile::encodeName( lockName ) );
295 QFile::remove( mLockUniqueName ); 293 QFile::remove( mLockUniqueName );
296 addressBook()->emitAddressBookUnlocked(); 294 addressBook()->emitAddressBookUnlocked();
297} 295}
298 296
299void ResourceDir::setPath( const QString &path ) 297void ResourceDir::setPath( const QString &path )
300{ 298{
301/*US ToDo: no synchronization so far. Has to be changed in the future
302 mDirWatch.stopScan(); 299 mDirWatch.stopScan();
303 mDirWatch.removeDir( mPath ); 300 mDirWatch.removeDir( mPath );
304*/ 301
305 mPath = path; 302 mPath = path;
306 303
307/*US ToDo: no synchronization so far. Has to be changed in the future
308 mDirWatch.addDir( mPath, true ); 304 mDirWatch.addDir( mPath, true );
309 mDirWatch.startScan(); 305 mDirWatch.startScan();
310*/
311 306
312//US simulate KDirWatch event 307//US simulate KDirWatch event
313 pathChanged(); 308//US pathChanged();
314 309
315} 310}
316 311
317QString ResourceDir::path() const 312QString ResourceDir::path() const
318{ 313{
319 return mPath; 314 return mPath;
320} 315}
321 316
322void ResourceDir::setFormat( const QString &format ) 317void ResourceDir::setFormat( const QString &format )
323{ 318{
324 mFormatName = format; 319 mFormatName = format;
325 320
326 if ( mFormat ) 321 if ( mFormat )
327 delete mFormat; 322 delete mFormat;
328 323
329 FormatFactory *factory = FormatFactory::self(); 324 FormatFactory *factory = FormatFactory::self();
330 mFormat = factory->format( mFormatName ); 325 mFormat = factory->format( mFormatName );
331/*US 326/*US
332qDebug("ResourceDir::setFormat initialized with format %s ", format.latin1()); 327qDebug("ResourceDir::setFormat initialized with format %s ", format.latin1());
333 if (mFormatName == "vcard") 328 if (mFormatName == "vcard")
334 mFormat = new VCardFormatPlugin2(); 329 mFormat = new VCardFormatPlugin2();
335 else if (mFormatName == "binary") 330 else if (mFormatName == "binary")
336 mFormat = new BinaryFormat(); 331 mFormat = new BinaryFormat();
337 else 332 else
338 qDebug("ResourceDir::setFormat format unknown !!! %s ", format.latin1()); 333 qDebug("ResourceDir::setFormat format unknown !!! %s ", format.latin1());
339*/ 334*/
340 335
341} 336}
342 337
343QString ResourceDir::format() const 338QString ResourceDir::format() const
344{ 339{
345 return mFormatName; 340 return mFormatName;
346} 341}
347 342
348void ResourceDir::pathChanged() 343void ResourceDir::pathChanged()
349{ 344{
350 if ( !addressBook() ) 345 if ( !addressBook() )
351 return; 346 return;
352 347
353 load(); 348 load();
354 addressBook()->emitAddressBookChanged(); 349 addressBook()->emitAddressBookChanged();
355} 350}
356 351
357void ResourceDir::removeAddressee( const Addressee& addr ) 352void ResourceDir::removeAddressee( const Addressee& addr )
358{ 353{
359 QFile::remove( mPath + "/" + addr.uid() ); 354 QFile::remove( mPath + "/" + addr.uid() );
360} 355}
361 356
362void ResourceDir::cleanUp() 357void ResourceDir::cleanUp()
363{ 358{
364 unlock( mPath ); 359 unlock( mPath );
365} 360}
366 361
367//US #include "resourcedir.moc" 362//US #include "resourcedir.moc"
diff --git a/kabc/plugins/file/file.pro b/kabc/plugins/file/file.pro
index 7cf7c58..32555a2 100644
--- a/kabc/plugins/file/file.pro
+++ b/kabc/plugins/file/file.pro
@@ -1,35 +1,35 @@
1 TEMPLATE= lib 1 TEMPLATE= lib
2CONFIG += qt warn_on release 2CONFIG += qt warn_on release
3#release debug 3#release debug
4 4
5TARGET = microkabc_file 5TARGET = microkabc_file
6INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../qtcompat 6INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../qtcompat
7 7
8DESTDIR = ../../../bin 8DESTDIR = ../../../bin
9#LIBS += -lmicrokde -lmicrokabc 9#LIBS += -lmicrokde -lmicrokabc
10#LIBS += -L$(QPEDIR)/lib 10#LIBS += -L$(QPEDIR)/lib
11 11
12INTERFACES = \ 12INTERFACES = \
13 13
14HEADERS = \ 14HEADERS = \
15 resourcefile.h \ 15 resourcefile.h \
16 resourcefileconfig.h 16 resourcefileconfig.h
17 17
18SOURCES = \ 18SOURCES = \
19 resourcefile.cpp \ 19 resourcefile.cpp \
20 resourcefileconfig.cpp 20 resourcefileconfig.cpp
21 21
22unix : { 22unix : {
23OBJECTS_DIR = obj/unix 23OBJECTS_DIR = obj/unix
24MOC_DIR = moc/unix 24MOC_DIR = moc/unix
25} 25}
26win32: { 26win32: {
27CONFIG += dll 27CONFIG += dll
28DEFINES += _WIN32_ 28DEFINES += _WIN32_
29OBJECTS_DIR = obj/win 29OBJECTS_DIR = obj/win
30MOC_DIR = moc/win 30MOC_DIR = moc/win
31LIBS += ../../../bin/microkdepim.lib 31LIBS += ../../../bin/microkdepim.lib
32LIBS += ../../../bin/microkcal.lib 32LIBS += ../../../bin/microkcal.lib
33LIBS += ../../../bin/microkde.lib 33LIBS += ../../../bin/microkde.lib
34LIBS += ../../../bin/microkabc.lib 34LIBS += ../../../bin/microkabc.lib
35} \ No newline at end of file 35}
diff --git a/kabc/plugins/file/fileE.pro b/kabc/plugins/file/fileE.pro
index 2d17a8f..d19a26d 100644
--- a/kabc/plugins/file/fileE.pro
+++ b/kabc/plugins/file/fileE.pro
@@ -1,21 +1,21 @@
1 TEMPLATE= lib 1 TEMPLATE= lib
2CONFIG += qt warn_on release 2CONFIG += qt warn_on release
3#release debug 3#release debug
4 4
5TARGET = microkabc_file 5TARGET = microkabc_file
6INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../qtcompat 6INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../qtcompat
7OBJECTS_DIR = obj/$(PLATFORM) 7OBJECTS_DIR = obj/$(PLATFORM)
8MOC_DIR = moc/$(PLATFORM) 8MOC_DIR = moc/$(PLATFORM)
9DESTDIR = $(QPEDIR)/lib 9DESTDIR = $(QPEDIR)/lib
10LIBS += -lmicrokde -lmicrokabc 10LIBS += -lmicrokde -lmicrokabc
11LIBS += -L$(QPEDIR)/lib 11LIBS += -L$(QPEDIR)/lib
12 12
13INTERFACES = \ 13INTERFACES = \
14 14
15HEADERS = \ 15HEADERS = \
16 resourcefile.h \ 16 resourcefile.h \
17 resourcefileconfig.h 17 resourcefileconfig.h
18 18
19SOURCES = \ 19SOURCES = \
20 resourcefile.cpp \ 20 resourcefile.cpp \
21 resourcefileconfig.cpp 21 resourcefileconfig.cpp
diff --git a/kabc/plugins/file/resourcefile.cpp b/kabc/plugins/file/resourcefile.cpp
index 2d20706..9f9b00f 100644
--- a/kabc/plugins/file/resourcefile.cpp
+++ b/kabc/plugins/file/resourcefile.cpp
@@ -1,399 +1,391 @@
1/* 1/*
2 This file is part of libkabc. 2 This file is part of libkabc.
3 Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org> 3 Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
4 4
5 This library is free software; you can redistribute it and/or 5 This library is free software; you can redistribute it and/or
6 modify it under the terms of the GNU Library General Public 6 modify it under the terms of the GNU Library General Public
7 License as published by the Free Software Foundation; either 7 License as published by the Free Software Foundation; either
8 version 2 of the License, or (at your option) any later version. 8 version 2 of the License, or (at your option) any later version.
9 9
10 This library is distributed in the hope that it will be useful, 10 This library is distributed in the hope that it will be useful,
11 but WITHOUT ANY WARRANTY; without even the implied warranty of 11 but WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13 Library General Public License for more details. 13 Library General Public License for more details.
14 14
15 You should have received a copy of the GNU Library General Public License 15 You should have received a copy of the GNU Library General Public License
16 along with this library; see the file COPYING.LIB. If not, write to 16 along with this library; see the file COPYING.LIB. If not, write to
17 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, 17 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
18 Boston, MA 02111-1307, USA. 18 Boston, MA 02111-1307, USA.
19*/ 19*/
20 20
21/* 21/*
22Enhanced Version of the file for platform independent KDE tools. 22Enhanced Version of the file for platform independent KDE tools.
23Copyright (c) 2004 Ulf Schenk 23Copyright (c) 2004 Ulf Schenk
24 24
25$Id$ 25$Id$
26*/ 26*/
27 27
28#include <sys/types.h> 28#include <sys/types.h>
29#include <sys/stat.h> 29#include <sys/stat.h>
30#ifndef _WIN32_ 30#ifndef _WIN32_
31#include <unistd.h> 31#include <unistd.h>
32#endif 32#endif
33 33
34#include <qfile.h> 34#include <qfile.h>
35#include <qfileinfo.h> 35#include <qfileinfo.h>
36#include <qregexp.h> 36#include <qregexp.h>
37#include <qtimer.h> 37#include <qtimer.h>
38 38
39#include <kapplication.h> 39#include <kapplication.h>
40#include <kconfig.h> 40#include <kconfig.h>
41#include <kdebug.h> 41#include <kdebug.h>
42#include <klocale.h> 42#include <klocale.h>
43//US #include <ksavefile.h> 43//US #include <ksavefile.h>
44#include <kstandarddirs.h> 44#include <kstandarddirs.h>
45 45
46#include "formatfactory.h" 46#include "formatfactory.h"
47 47
48#include "resource.h" 48#include "resource.h"
49#include "resourcefileconfig.h" 49#include "resourcefileconfig.h"
50#include "stdaddressbook.h" 50#include "stdaddressbook.h"
51 51
52//US #include "../../formats/vcardformatplugin2.h"
53//US #include "../../formats/binaryformat.h"
54
55
56#include "resourcefile.h" 52#include "resourcefile.h"
57 53
58using namespace KABC; 54using namespace KABC;
59 55
60extern "C" 56extern "C"
61#ifdef _WIN32_ 57#ifdef _WIN32_
62__declspec(dllexport) 58__declspec(dllexport)
63#else 59#else
64{ 60{
65#endif 61#endif
66 62
67//US void *init_kabc_file() 63//US void *init_kabc_file()
68 void *init_microkabc_file() 64 void *init_microkabc_file()
69 { 65 {
70 return new KRES::PluginFactory<ResourceFile,ResourceFileConfig>(); 66 return new KRES::PluginFactory<ResourceFile,ResourceFileConfig>();
71 } 67 }
72#ifndef _WIN32_ 68#ifndef _WIN32_
73} 69}
74#endif 70#endif
75 71
76ResourceFile::ResourceFile( const KConfig *config ) 72ResourceFile::ResourceFile( const KConfig *config )
77 : Resource( config ) , mFormat( 0 ) 73 : Resource( config ) , mFormat( 0 )
78{ 74{
79 QString fileName, formatName; 75 QString fileName, formatName;
80 76
81 KConfig *cfg = (KConfig *)config; 77 KConfig *cfg = (KConfig *)config;
82 if ( cfg ) { 78 if ( cfg ) {
83 fileName = cfg->readEntry( "FileName", StdAddressBook::fileName() ); 79 fileName = cfg->readEntry( "FileName", StdAddressBook::fileName() );
84 formatName = cfg->readEntry( "FileFormat", "vcard" ); 80 formatName = cfg->readEntry( "FileFormat", "vcard" );
85// qDebug("ResourceFile::ResourceFile : 1 %s, %s", fileName.latin1(), formatName.latin1() ); 81// qDebug("ResourceFile::ResourceFile : 1 %s, %s", fileName.latin1(), formatName.latin1() );
86 } else { 82 } else {
87 fileName = StdAddressBook::fileName(); 83 fileName = StdAddressBook::fileName();
88 formatName = "vcard"; 84 formatName = "vcard";
89// qDebug("ResourceFile::ResourceFile : 2 %s, %s", fileName.latin1(), formatName.latin1() ); 85// qDebug("ResourceFile::ResourceFile : 2 %s, %s", fileName.latin1(), formatName.latin1() );
90 } 86 }
91 87
92 init( fileName, formatName ); 88 init( fileName, formatName );
93} 89}
94 90
95ResourceFile::ResourceFile( const QString &fileName, 91ResourceFile::ResourceFile( const QString &fileName,
96 const QString &formatName ) 92 const QString &formatName )
97 : Resource( 0 ) 93 : Resource( 0 )
98{ 94{
99// qDebug("ResourceFile::ResourceFile : 3 %s, %s", fileName.latin1(), formatName.latin1()); 95// qDebug("ResourceFile::ResourceFile : 3 %s, %s", fileName.latin1(), formatName.latin1());
100 init( fileName, formatName ); 96 init( fileName, formatName );
101} 97}
102 98
103void ResourceFile::init( const QString &fileName, const QString &formatName ) 99void ResourceFile::init( const QString &fileName, const QString &formatName )
104{ 100{
105 mFormatName = formatName; 101 mFormatName = formatName;
106 102
107 FormatFactory *factory = FormatFactory::self(); 103 FormatFactory *factory = FormatFactory::self();
108 mFormat = factory->format( mFormatName ); 104 mFormat = factory->format( mFormatName );
109 105
110 if ( !mFormat ) { 106 if ( !mFormat ) {
111 mFormatName = "vcard"; 107 mFormatName = "vcard";
112 mFormat = factory->format( mFormatName ); 108 mFormat = factory->format( mFormatName );
113 } 109 }
114 110
115/*US 111/*US
116//US qDebug("ResourceFile::init initialized with format %s ", formatName.latin1()); 112//US qDebug("ResourceFile::init initialized with format %s ", formatName.latin1());
117 if (mFormatName == "vcard") { 113 if (mFormatName == "vcard") {
118 mFormat = new VCardFormatPlugin2(); 114 mFormat = new VCardFormatPlugin2();
119// qDebug("ResourceFile::init format VCardFormatPlugin2"); 115// qDebug("ResourceFile::init format VCardFormatPlugin2");
120 } 116 }
121 else if (mFormatName == "binary") { 117 else if (mFormatName == "binary") {
122 mFormat = new BinaryFormat(); 118 mFormat = new BinaryFormat();
123// qDebug("ResourceFile::init format BinaryFormat"); 119// qDebug("ResourceFile::init format BinaryFormat");
124 } 120 }
125 else 121 else
126 qDebug("ResourceFile::init format unknown !!! %s ", formatName.latin1()); 122 qDebug("ResourceFile::init format unknown !!! %s ", formatName.latin1());
127*/ 123*/
128 124
129/*US we have no KDirWatch. SO simulate the signals from inside the apropriate methods
130 connect( &mDirWatch, SIGNAL( dirty(const QString&) ), SLOT( fileChanged() ) ); 125 connect( &mDirWatch, SIGNAL( dirty(const QString&) ), SLOT( fileChanged() ) );
131 connect( &mDirWatch, SIGNAL( created(const QString&) ), SLOT( fileChanged() ) ); 126 connect( &mDirWatch, SIGNAL( created(const QString&) ), SLOT( fileChanged() ) );
132 connect( &mDirWatch, SIGNAL( deleted(const QString&) ), SLOT( fileChanged() ) ); 127 connect( &mDirWatch, SIGNAL( deleted(const QString&) ), SLOT( fileChanged() ) );
133*/
134 128
135 setFileName( fileName ); 129 setFileName( fileName );
136} 130}
137 131
138ResourceFile::~ResourceFile() 132ResourceFile::~ResourceFile()
139{ 133{
140 delete mFormat; 134 delete mFormat;
141 mFormat = 0; 135 mFormat = 0;
142} 136}
143 137
144void ResourceFile::writeConfig( KConfig *config ) 138void ResourceFile::writeConfig( KConfig *config )
145{ 139{
146 140
147 config->setGroup( "Resource_" + identifier() ); 141 config->setGroup( "Resource_" + identifier() );
148 Resource::writeConfig( config ); 142 Resource::writeConfig( config );
149 143
150 config->writeEntry( "FileName", mFileName ); 144 config->writeEntry( "FileName", mFileName );
151 config->writeEntry( "FileFormat", mFormatName ); 145 config->writeEntry( "FileFormat", mFormatName );
152 146
153// qDebug("ResourceFile::writeConfig format %s, %s", mFileName.latin1(), mFormatName.latin1()); 147// qDebug("ResourceFile::writeConfig format %s, %s", mFileName.latin1(), mFormatName.latin1());
154 148
155} 149}
156 150
157Ticket *ResourceFile::requestSaveTicket() 151Ticket *ResourceFile::requestSaveTicket()
158{ 152{
159 kdDebug(5700) << "ResourceFile::requestSaveTicket()" << endl; 153 kdDebug(5700) << "ResourceFile::requestSaveTicket()" << endl;
160 154
161 if ( !addressBook() ) return 0; 155 if ( !addressBook() ) return 0;
162 156
163 if ( !lock( mFileName ) ) { 157 if ( !lock( mFileName ) ) {
164 kdDebug(5700) << "ResourceFile::requestSaveTicket(): Unable to lock file '" 158 kdDebug(5700) << "ResourceFile::requestSaveTicket(): Unable to lock file '"
165 << mFileName << "'" << endl; 159 << mFileName << "'" << endl;
166 return 0; 160 return 0;
167 } 161 }
168 return createTicket( this ); 162 return createTicket( this );
169} 163}
170 164
171 165
172bool ResourceFile::doOpen() 166bool ResourceFile::doOpen()
173{ 167{
174 QFile file( mFileName ); 168 QFile file( mFileName );
175 169
176 if ( !file.exists() ) { 170 if ( !file.exists() ) {
177 // try to create the file 171 // try to create the file
178 bool ok = file.open( IO_WriteOnly ); 172 bool ok = file.open( IO_WriteOnly );
179 if ( ok ) 173 if ( ok )
180 file.close(); 174 file.close();
181 175
182 return ok; 176 return ok;
183 } else { 177 } else {
184 if ( !file.open( IO_ReadWrite ) ) 178 if ( !file.open( IO_ReadWrite ) )
185 return false; 179 return false;
186 180
187 if ( file.size() == 0 ) { 181 if ( file.size() == 0 ) {
188 file.close(); 182 file.close();
189 return true; 183 return true;
190 } 184 }
191 185
192 bool ok = mFormat->checkFormat( &file ); 186 bool ok = mFormat->checkFormat( &file );
193 file.close(); 187 file.close();
194 188
195 return ok; 189 return ok;
196 } 190 }
197} 191}
198 192
199void ResourceFile::doClose() 193void ResourceFile::doClose()
200{ 194{
201} 195}
202 196
203bool ResourceFile::load() 197bool ResourceFile::load()
204{ 198{
205 199
206 200
207 QFile file( mFileName ); 201 QFile file( mFileName );
208 if ( !file.open( IO_ReadOnly ) ) { 202 if ( !file.open( IO_ReadOnly ) ) {
209 addressBook()->error( i18n( "Unable to open file '%1'." ).arg( mFileName ) ); 203 addressBook()->error( i18n( "Unable to open file '%1'." ).arg( mFileName ) );
210 return false; 204 return false;
211 } 205 }
212 206
213// qDebug("ResourceFile::load format %s, %s", mFileName.latin1(), mFormatName.latin1()); 207// qDebug("ResourceFile::load format %s, %s", mFileName.latin1(), mFormatName.latin1());
214 208
215 return mFormat->loadAll( addressBook(), this, &file ); 209 return mFormat->loadAll( addressBook(), this, &file );
216} 210}
217 211
218bool ResourceFile::save( Ticket *ticket ) 212bool ResourceFile::save( Ticket *ticket )
219{ 213{
220// qDebug("ResourceFile::save format %s, %s", mFileName.latin1(), mFormatName.latin1()); 214// qDebug("ResourceFile::save format %s, %s", mFileName.latin1(), mFormatName.latin1());
221 215
222 216
223 // create backup file 217 // create backup file
224 QString extension = "_" + QString::number( QDate::currentDate().dayOfWeek() ); 218 QString extension = "_" + QString::number( QDate::currentDate().dayOfWeek() );
225 219
226/*US we use a simpler method to create a backupfile 220/*US we use a simpler method to create a backupfile
227 221
228 (void) KSaveFile::backupFile( mFileName, QString::null 222 (void) KSaveFile::backupFile( mFileName, QString::null
229 ,extension ); 223 ,extension );
230 224
231 KSaveFile saveFile( mFileName ); 225 KSaveFile saveFile( mFileName );
232 bool ok = false; 226 bool ok = false;
233 if ( saveFile.status() == 0 && saveFile.file() ) 227 if ( saveFile.status() == 0 && saveFile.file() )
234 { 228 {
235 mFormat->saveAll( addressBook(), this, saveFile.file() ); 229 mFormat->saveAll( addressBook(), this, saveFile.file() );
236 ok = saveFile.close(); 230 ok = saveFile.close();
237 } 231 }
238*/ 232*/
239 233
240//US ToDo: write backupfile 234//US ToDo: write backupfile
241 QFile info; 235 QFile info;
242 info.setName( mFileName ); 236 info.setName( mFileName );
243 bool ok = info.open( IO_WriteOnly ); 237 bool ok = info.open( IO_WriteOnly );
244 if ( ok ) { 238 if ( ok ) {
245 mFormat->saveAll( addressBook(), this, &info ); 239 mFormat->saveAll( addressBook(), this, &info );
246 240
247 info.close(); 241 info.close();
248 ok = true; 242 ok = true;
249 } 243 }
250 else { 244 else {
251 245
252 } 246 }
253 247
254 if ( !ok ) 248 if ( !ok )
255 addressBook()->error( i18n( "Unable to save file '%1'." ).arg( mFileName ) ); 249 addressBook()->error( i18n( "Unable to save file '%1'." ).arg( mFileName ) );
256 250
257 delete ticket; 251 delete ticket;
258 unlock( mFileName ); 252 unlock( mFileName );
259 253
260 return ok; 254 return ok;
261 255
262 qDebug("ResourceFile::save has to be changed"); 256 qDebug("ResourceFile::save has to be changed");
263 return true; 257 return true;
264} 258}
265 259
266bool ResourceFile::lock( const QString &fileName ) 260bool ResourceFile::lock( const QString &fileName )
267{ 261{
268 262
269 263
270 QString fn = fileName; 264 QString fn = fileName;
271 265
272//US change the implementation how the lockfilename is getting created 266//US change the implementation how the lockfilename is getting created
273//US fn.replace( QRegExp("/"), "_" ); 267//US fn.replace( QRegExp("/"), "_" );
274//US QString lockName = locateLocal( "data", "kabc/lock/" + fn + ".lock" ); 268//US QString lockName = locateLocal( "data", "kabc/lock/" + fn + ".lock" );
275 269
276 KURL url(fn); 270 KURL url(fn);
277 QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" ); 271 QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" );
278 272
279 273
280 274
281 if (QFile::exists( lockName )) return false; 275 if (QFile::exists( lockName )) return false;
282 276
283 QString lockUniqueName; 277 QString lockUniqueName;
284 lockUniqueName = fn + KApplication::randomString( 8 ); 278 lockUniqueName = fn + KApplication::randomString( 8 );
285 279
286 url = lockUniqueName; 280 url = lockUniqueName;
287//US mLockUniqueName = locateLocal( "data", "kabc/lock/" + lockUniqueName ); 281//US mLockUniqueName = locateLocal( "data", "kabc/lock/" + lockUniqueName );
288 mLockUniqueName = locateLocal( "data", "kabc/lock/" + url.fileName() ); 282 mLockUniqueName = locateLocal( "data", "kabc/lock/" + url.fileName() );
289 kdDebug(5700) << "-- lock unique name: " << mLockUniqueName << endl; 283 kdDebug(5700) << "-- lock unique name: " << mLockUniqueName << endl;
290 284
291 // Create unique file 285 // Create unique file
292 QFile file( mLockUniqueName ); 286 QFile file( mLockUniqueName );
293 file.open( IO_WriteOnly ); 287 file.open( IO_WriteOnly );
294 file.close(); 288 file.close();
295 289
296 // Create lock file 290 // Create lock file
297 int result = 0; 291 int result = 0;
298#ifndef _WIN32_ 292#ifndef _WIN32_
299 result = ::link( QFile::encodeName( mLockUniqueName ), 293 result = ::link( QFile::encodeName( mLockUniqueName ),
300 QFile::encodeName( lockName ) ); 294 QFile::encodeName( lockName ) );
301#endif 295#endif
302 if ( result == 0 ) { 296 if ( result == 0 ) {
303 addressBook()->emitAddressBookLocked(); 297 addressBook()->emitAddressBookLocked();
304 return true; 298 return true;
305 } 299 }
306 300
307 // TODO: check stat 301 // TODO: check stat
308 302
309 return false; 303 return false;
310} 304}
311 305
312void ResourceFile::unlock( const QString &fileName ) 306void ResourceFile::unlock( const QString &fileName )
313{ 307{
314 QString fn = fileName; 308 QString fn = fileName;
315//US change the implementation how the lockfilename is getting created 309//US change the implementation how the lockfilename is getting created
316//US fn.replace( QRegExp( "/" ), "_" ); 310//US fn.replace( QRegExp( "/" ), "_" );
317//US QString lockName = locateLocal( "data", "kabc/lock/" + fn + ".lock" ); 311//US QString lockName = locateLocal( "data", "kabc/lock/" + fn + ".lock" );
318//US QString lockName = fn + ".lock"; 312//US QString lockName = fn + ".lock";
319 KURL url(fn); 313 KURL url(fn);
320 QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" ); 314 QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" );
321 315
322 QFile::remove( lockName ); 316 QFile::remove( lockName );
323 QFile::remove( mLockUniqueName ); 317 QFile::remove( mLockUniqueName );
324 addressBook()->emitAddressBookUnlocked(); 318 addressBook()->emitAddressBookUnlocked();
325} 319}
326 320
327void ResourceFile::setFileName( const QString &fileName ) 321void ResourceFile::setFileName( const QString &fileName )
328{ 322{
329/*US ToDo: no synchronization so far. Has to be changed in the future
330 mDirWatch.stopScan(); 323 mDirWatch.stopScan();
331 mDirWatch.removeFile( mFileName ); 324 mDirWatch.removeFile( mFileName );
332*/ 325
333 mFileName = fileName; 326 mFileName = fileName;
334 327
335 328
336/*US ToDo: no synchronization so far. Has to be changed in the future
337 mDirWatch.addFile( mFileName ); 329 mDirWatch.addFile( mFileName );
338 mDirWatch.startScan(); 330 mDirWatch.startScan();
339*/ 331
340//US simulate KDirWatch event 332//US simulate KDirWatch event
341 fileChanged(); 333//US fileChanged();
342} 334}
343 335
344QString ResourceFile::fileName() const 336QString ResourceFile::fileName() const
345{ 337{
346 return mFileName; 338 return mFileName;
347} 339}
348 340
349void ResourceFile::setFormat( const QString &format ) 341void ResourceFile::setFormat( const QString &format )
350{ 342{
351 mFormatName = format; 343 mFormatName = format;
352 delete mFormat; 344 delete mFormat;
353 345
354 FormatFactory *factory = FormatFactory::self(); 346 FormatFactory *factory = FormatFactory::self();
355 mFormat = factory->format( mFormatName ); 347 mFormat = factory->format( mFormatName );
356/*US 348/*US
357//qDebug("ResourceFile::setFormat initialized with format %s ", format.latin1()); 349//qDebug("ResourceFile::setFormat initialized with format %s ", format.latin1());
358 if (mFormatName == "vcard") { 350 if (mFormatName == "vcard") {
359 mFormat = new VCardFormatPlugin2(); 351 mFormat = new VCardFormatPlugin2();
360// qDebug("ResourceFile::setFormat format %s", mFormatName.latin1()); 352// qDebug("ResourceFile::setFormat format %s", mFormatName.latin1());
361 } 353 }
362 else if (mFormatName == "binary") { 354 else if (mFormatName == "binary") {
363 mFormat = new BinaryFormat(); 355 mFormat = new BinaryFormat();
364// qDebug("ResourceFile::setFormat format %s", mFormatName.latin1()); 356// qDebug("ResourceFile::setFormat format %s", mFormatName.latin1());
365 } 357 }
366 else 358 else
367 qDebug("ResourceFile::setFormat format unknown !!! %s ", format.latin1()); 359 qDebug("ResourceFile::setFormat format unknown !!! %s ", format.latin1());
368*/ 360*/
369 361
370} 362}
371 363
372QString ResourceFile::format() const 364QString ResourceFile::format() const
373{ 365{
374 return mFormatName; 366 return mFormatName;
375} 367}
376 368
377void ResourceFile::fileChanged() 369void ResourceFile::fileChanged()
378{ 370{
379 // There is a small theoretical chance that KDirWatch calls us before 371 // There is a small theoretical chance that KDirWatch calls us before
380 // we are fully constructed 372 // we are fully constructed
381 if (!addressBook()) 373 if (!addressBook())
382 return; 374 return;
383 load(); 375 load();
384 addressBook()->emitAddressBookChanged(); 376 addressBook()->emitAddressBookChanged();
385} 377}
386 378
387void ResourceFile::removeAddressee( const Addressee &addr ) 379void ResourceFile::removeAddressee( const Addressee &addr )
388{ 380{
389 QFile::remove( QFile::encodeName( locateLocal( "data", "kabc/photos/" ) + addr.uid() ) ); 381 QFile::remove( QFile::encodeName( locateLocal( "data", "kabc/photos/" ) + addr.uid() ) );
390 QFile::remove( QFile::encodeName( locateLocal( "data", "kabc/logos/" ) + addr.uid() ) ); 382 QFile::remove( QFile::encodeName( locateLocal( "data", "kabc/logos/" ) + addr.uid() ) );
391 QFile::remove( QFile::encodeName( locateLocal( "data", "kabc/sounds/" ) + addr.uid() ) ); 383 QFile::remove( QFile::encodeName( locateLocal( "data", "kabc/sounds/" ) + addr.uid() ) );
392} 384}
393 385
394void ResourceFile::cleanUp() 386void ResourceFile::cleanUp()
395{ 387{
396 unlock( mFileName ); 388 unlock( mFileName );
397} 389}
398 390
399//US #include "resourcefile.moc" 391//US #include "resourcefile.moc"
diff --git a/kabc/plugins/opie/opieE.pro b/kabc/plugins/opie/opieE.pro
index 75a5dab..4048cc0 100644
--- a/kabc/plugins/opie/opieE.pro
+++ b/kabc/plugins/opie/opieE.pro
@@ -1,32 +1,32 @@
1 TEMPLATE= lib 1 TEMPLATE= lib
2CONFIG += qt warn_on 2CONFIG += qt warn_on
3#release debug 3#release debug
4TARGET = microkabc_opie 4TARGET = microkabc_opie
5 5
6INCLUDEPATH += ../.. ../../converter/opie ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../qtcompat $(QPEDIR)/include $(OPIEDIR)/include 6INCLUDEPATH += ../.. ../../converter/opie ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../qtcompat $(QPEDIR)/include $(OPIEDIR)/include
7 7
8 8
9OBJECTS_DIR = obj/$(PLATFORM) 9OBJECTS_DIR = obj/$(PLATFORM)
10MOC_DIR = moc/$(PLATFORM) 10MOC_DIR = moc/$(PLATFORM)
11DESTDIR = $(QPEDIR)/lib 11DESTDIR = $(QPEDIR)/lib
12LIBS += -lmicrokde 12LIBS += -lmicrokde
13LIBS += -lmicrokabc 13LIBS += -lmicrokabc
14LIBS += -L$(QPEDIR)/lib 14LIBS += -L$(QPEDIR)/lib
15LIBS += -L$(OPIEDIR)/lib 15LIBS += -L$(OPIEDIR)/lib
16LIBS += -lopie 16LIBS += -lopie
17LIBS += -lqpe 17LIBS += -lqpe
18LIBS += -lqte 18LIBS += -lqte
19LIBS += -lmicrokabc_opieconverter 19LIBS += -lmicrokabc_opieconverter
20#LIBS += -L../../lib/$(PLATFORM) 20#LIBS += -L../../lib/$(PLATFORM)
21 21
22 22
23INTERFACES = \ 23INTERFACES = \
24 24
25HEADERS = \ 25HEADERS = \
26 resourceopie.h \ 26 resourceopie.h \
27 resourceopieconfig.h \ 27 resourceopieconfig.h \
28 28
29SOURCES = \ 29SOURCES = \
30 resourceopie.cpp \ 30 resourceopie.cpp \
31 resourceopieconfig.cpp \ 31 resourceopieconfig.cpp \
32 32
diff --git a/kaddressbook/kaddressbook.pro b/kaddressbook/kaddressbook.pro
index bc14e68..77fce1b 100644
--- a/kaddressbook/kaddressbook.pro
+++ b/kaddressbook/kaddressbook.pro
@@ -1,137 +1,137 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 CONFIG = qt warn_on 2 CONFIG = qt warn_on
3 TARGET = kapi 3 TARGET = kapi
4DESTDIR= ../bin 4DESTDIR= ../bin
5 5
6include( ../variables.pri ) 6include( ../variables.pri )
7 7
8 8
9INCLUDEPATH += . ./details ./features ./kcmconfigs ./xxport ../microkde ../microkde/kdecore ../microkde/kutils ../microkde/kio/kfile ../microkde/kdeui ../kabc ../ interfaces 9INCLUDEPATH += . ./details ./features ./kcmconfigs ./xxport ../microkde ../microkde/kdecore ../microkde/kutils ../microkde/kio/kfile ../microkde/kio/kio ../microkde/kdeui ../kabc ../ interfaces
10DEFINES += KAB_EMBEDDED KAB_NOSPLITTER DESKTOP_VERSION 10DEFINES += KAB_EMBEDDED KAB_NOSPLITTER DESKTOP_VERSION
11 11
12unix : { 12unix : {
13LIBS += ../bin/libmicrokdepim.so 13LIBS += ../bin/libmicrokdepim.so
14LIBS += ../bin/libmicrokde.so 14LIBS += ../bin/libmicrokde.so
15LIBS += ../bin/libmicrokabc.so 15LIBS += ../bin/libmicrokabc.so
16LIBS += ../bin/libmicrokcal.so 16LIBS += ../bin/libmicrokcal.so
17LIBS += -lldap 17LIBS += -lldap
18OBJECTS_DIR = obj/unix 18OBJECTS_DIR = obj/unix
19MOC_DIR = moc/unix 19MOC_DIR = moc/unix
20} 20}
21win32: { 21win32: {
22DEFINES += _WIN32_ 22DEFINES += _WIN32_
23LIBS += ../bin/microkdepim.lib 23LIBS += ../bin/microkdepim.lib
24LIBS += ../bin/microkcal.lib 24LIBS += ../bin/microkcal.lib
25LIBS += ../bin/microkde.lib 25LIBS += ../bin/microkde.lib
26LIBS += ../bin/microkabc.lib 26LIBS += ../bin/microkabc.lib
27QMAKE_LINK += /NODEFAULTLIB:LIBC 27QMAKE_LINK += /NODEFAULTLIB:LIBC
28OBJECTS_DIR = obj/win 28OBJECTS_DIR = obj/win
29MOC_DIR = moc/win 29MOC_DIR = moc/win
30LIBS += mfc71u.lib 30LIBS += mfc71u.lib
31} 31}
32 32
33 33
34 34
35 35
36 36
37 37
38 38
39 39
40INTERFACES = \ 40INTERFACES = \
41# filteredit_base.ui \ 41# filteredit_base.ui \
42# kofilterview_base.ui \ 42# kofilterview_base.ui \
43 43
44HEADERS = \ 44HEADERS = \
45features/mergewidget.h \ 45features/mergewidget.h \
46features/distributionlistwidget.h \ 46features/distributionlistwidget.h \
47kcmconfigs/addresseewidget.h \ 47kcmconfigs/addresseewidget.h \
48kcmconfigs/extensionconfigdialog.h \ 48kcmconfigs/extensionconfigdialog.h \
49kcmconfigs/kcmkabconfig.h \ 49kcmconfigs/kcmkabconfig.h \
50kcmconfigs/kabconfigwidget.h \ 50kcmconfigs/kabconfigwidget.h \
51addresseeeditordialog.h \ 51addresseeeditordialog.h \
52addresseeeditorwidget.h \ 52addresseeeditorwidget.h \
53addresseditwidget.h \ 53addresseditwidget.h \
54addresseeconfig.h \ 54addresseeconfig.h \
55addresseeutil.h \ 55addresseeutil.h \
56emaileditwidget.h \ 56emaileditwidget.h \
57filtereditdialog.h \ 57filtereditdialog.h \
58kaddressbookmain.h \ 58kaddressbookmain.h \
59kabprefs.h \ 59kabprefs.h \
60kabcore.h \ 60kabcore.h \
61viewmanager.h \ 61viewmanager.h \
62extensionmanager.h \ 62extensionmanager.h \
63extensionwidget.h \ 63extensionwidget.h \
64kaddressbookview.h \ 64kaddressbookview.h \
65geowidget.h \ 65geowidget.h \
66imagewidget.h \ 66imagewidget.h \
67incsearchwidget.h \ 67incsearchwidget.h \
68jumpbuttonbar.h \ 68jumpbuttonbar.h \
69phoneeditwidget.h \ 69phoneeditwidget.h \
70secrecywidget.h \ 70secrecywidget.h \
71keywidget.h \ 71keywidget.h \
72nameeditdialog.h \ 72nameeditdialog.h \
73filter.h \ 73filter.h \
74addviewdialog.h \ 74addviewdialog.h \
75configurewidget.h \ 75configurewidget.h \
76viewconfigurewidget.h \ 76viewconfigurewidget.h \
77viewconfigurefieldspage.h \ 77viewconfigurefieldspage.h \
78viewconfigurefilterpage.h \ 78viewconfigurefilterpage.h \
79typecombo.h \ 79typecombo.h \
80undo.h \ 80undo.h \
81undocmds.h \ 81undocmds.h \
82xxportmanager.h \ 82xxportmanager.h \
83xxportobject.h \ 83xxportobject.h \
84xxportselectdialog.h \ 84xxportselectdialog.h \
85details/detailsviewcontainer.h \ 85details/detailsviewcontainer.h \
86details/look_basic.h \ 86details/look_basic.h \
87details/look_html.h \ 87details/look_html.h \
88views/kaddressbookiconview.h \ 88views/kaddressbookiconview.h \
89views/kaddressbooktableview.h \ 89views/kaddressbooktableview.h \
90views/kaddressbookcardview.h \ 90views/kaddressbookcardview.h \
91views/configuretableviewdialog.h \ 91views/configuretableviewdialog.h \
92views/configurecardviewdialog.h \ 92views/configurecardviewdialog.h \
93views/cardview.h \ 93views/cardview.h \
94views/colorlistbox.h \ 94views/colorlistbox.h \
95views/contactlistview.h \ 95views/contactlistview.h \
96xxport/vcard_xxport.h \ 96xxport/vcard_xxport.h \
97xxport/kde2_xxport.h \ 97xxport/kde2_xxport.h \
98xxport/csv_xxport.h \ 98xxport/csv_xxport.h \
99xxport/csvimportdialog.h \ 99xxport/csvimportdialog.h \
100#details/look_details.h \ 100#details/look_details.h \
101#mainwindoiw.h \ 101#mainwindoiw.h \
102# alarmclient.h \ 102# alarmclient.h \
103# calendarview.h \ 103# calendarview.h \
104# customlistviewitem.h \ 104# customlistviewitem.h \
105# datenavigator.h 105# datenavigator.h
106 106
107SOURCES = \ 107SOURCES = \
108addresseeeditordialog.cpp \ 108addresseeeditordialog.cpp \
109addresseeeditorwidget.cpp \ 109addresseeeditorwidget.cpp \
110addresseditwidget.cpp \ 110addresseditwidget.cpp \
111addresseeconfig.cpp \ 111addresseeconfig.cpp \
112addresseeutil.cpp \ 112addresseeutil.cpp \
113extensionmanager.cpp \ 113extensionmanager.cpp \
114features/mergewidget.cpp \ 114features/mergewidget.cpp \
115features/distributionlistwidget.cpp \ 115features/distributionlistwidget.cpp \
116kcmconfigs/addresseewidget.cpp \ 116kcmconfigs/addresseewidget.cpp \
117kcmconfigs/extensionconfigdialog.cpp \ 117kcmconfigs/extensionconfigdialog.cpp \
118kcmconfigs/kcmkabconfig.cpp \ 118kcmconfigs/kcmkabconfig.cpp \
119kcmconfigs/kabconfigwidget.cpp \ 119kcmconfigs/kabconfigwidget.cpp \
120emaileditwidget.cpp \ 120emaileditwidget.cpp \
121filtereditdialog.cpp \ 121filtereditdialog.cpp \
122mainembedded.cpp \ 122mainembedded.cpp \
123kaddressbookmain.cpp \ 123kaddressbookmain.cpp \
124kabcore.cpp \ 124kabcore.cpp \
125kabprefs.cpp \ 125kabprefs.cpp \
126viewmanager.cpp \ 126viewmanager.cpp \
127kaddressbookview.cpp \ 127kaddressbookview.cpp \
128extensionwidget.cpp \ 128extensionwidget.cpp \
129geowidget.cpp \ 129geowidget.cpp \
130imagewidget.cpp \ 130imagewidget.cpp \
131incsearchwidget.cpp \ 131incsearchwidget.cpp \
132jumpbuttonbar.cpp \ 132jumpbuttonbar.cpp \
133phoneeditwidget.cpp \ 133phoneeditwidget.cpp \
134secrecywidget.cpp \ 134secrecywidget.cpp \
135keywidget.cpp \ 135keywidget.cpp \
136nameeditdialog.cpp \ 136nameeditdialog.cpp \
137filter.cpp \ 137filter.cpp \
diff --git a/kaddressbook/kaddressbookE.pro b/kaddressbook/kaddressbookE.pro
index 9451f52..dc4a2f2 100644
--- a/kaddressbook/kaddressbookE.pro
+++ b/kaddressbook/kaddressbookE.pro
@@ -1,141 +1,141 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 CONFIG += qt warn_on 2 CONFIG += qt warn_on
3 3
4 4
5 TARGET = kapi 5 TARGET = kapi
6OBJECTS_DIR = obj/$(PLATFORM) 6OBJECTS_DIR = obj/$(PLATFORM)
7MOC_DIR = moc/$(PLATFORM) 7MOC_DIR = moc/$(PLATFORM)
8DESTDIR=$(QPEDIR)/bin 8DESTDIR=$(QPEDIR)/bin
9 9
10#LFLAGS += -Wl,-export-dynamic 10#LFLAGS += -Wl,-export-dynamic
11 11
12 12
13INCLUDEPATH += . ./details ./features ./kcmconfigs ./xxport ../microkde ../microkde/kdecore ../microkde/kutils ../microkde/kio/kfile ../microkde/kdeui ../kabc ../qtcompat ../ interfaces $(QPEDIR)/include 13INCLUDEPATH += . ./details ./features ./kcmconfigs ./xxport ../microkde ../microkde/kdecore ../microkde/kutils ../microkde/kio/kfile ../microkde/kio/kio ../microkde/kdeui ../kabc ../qtcompat ../ interfaces $(QPEDIR)/include
14DEFINES += KAB_EMBEDDED KAB_NOSPLITTER 14DEFINES += KAB_EMBEDDED KAB_NOSPLITTER
15#DEFINES += KORG_NODND KORG_NOPLUGINS KORG_NOKABC KORG_NOARCHIVE KORG_NOMAIL 15#DEFINES += KORG_NODND KORG_NOPLUGINS KORG_NOKABC KORG_NOARCHIVE KORG_NOMAIL
16#DEFINES += KORG_NOPRINTER KORG_NODCOP KORG_NOKALARMD KORG_NORESOURCEVIEW KORG_NOSPLITTER 16#DEFINES += KORG_NOPRINTER KORG_NODCOP KORG_NOKALARMD KORG_NORESOURCEVIEW KORG_NOSPLITTER
17#DEFINES += KORG_NOLVALTERNATION 17#DEFINES += KORG_NOLVALTERNATION
18LIBS += -lmicrokdepim 18LIBS += -lmicrokdepim
19#LIBS += -lmicrokcal 19#LIBS += -lmicrokcal
20LIBS += -lmicrokde 20LIBS += -lmicrokde
21LIBS += -lmicrokcal 21LIBS += -lmicrokcal
22LIBS += -lmicroqtcompat 22LIBS += -lmicroqtcompat
23LIBS += -lmicrokabc 23LIBS += -lmicrokabc
24LIBS += -lqpe 24LIBS += -lqpe
25LIBS += -ljpeg 25LIBS += -ljpeg
26LIBS += $(QTOPIALIB) 26LIBS += $(QTOPIALIB)
27LIBS += -L$(QPEDIR)/lib 27LIBS += -L$(QPEDIR)/lib
28LIBS += -Wl,-export-dynamic 28LIBS += -Wl,-export-dynamic
29 29
30INTERFACES = \ 30INTERFACES = \
31# filteredit_base.ui \ 31# filteredit_base.ui \
32# kofilterview_base.ui \ 32# kofilterview_base.ui \
33 33
34HEADERS = \ 34HEADERS = \
35features/mergewidget.h \ 35features/mergewidget.h \
36features/distributionlistwidget.h \ 36features/distributionlistwidget.h \
37kcmconfigs/addresseewidget.h \ 37kcmconfigs/addresseewidget.h \
38kcmconfigs/extensionconfigdialog.h \ 38kcmconfigs/extensionconfigdialog.h \
39kcmconfigs/kcmkabconfig.h \ 39kcmconfigs/kcmkabconfig.h \
40kcmconfigs/kabconfigwidget.h \ 40kcmconfigs/kabconfigwidget.h \
41addresseeeditordialog.h \ 41addresseeeditordialog.h \
42addresseeeditorwidget.h \ 42addresseeeditorwidget.h \
43addresseditwidget.h \ 43addresseditwidget.h \
44addresseeconfig.h \ 44addresseeconfig.h \
45addresseeutil.h \ 45addresseeutil.h \
46emaileditwidget.h \ 46emaileditwidget.h \
47filtereditdialog.h \ 47filtereditdialog.h \
48kaddressbookmain.h \ 48kaddressbookmain.h \
49kabprefs.h \ 49kabprefs.h \
50kabcore.h \ 50kabcore.h \
51viewmanager.h \ 51viewmanager.h \
52extensionmanager.h \ 52extensionmanager.h \
53extensionwidget.h \ 53extensionwidget.h \
54kaddressbookview.h \ 54kaddressbookview.h \
55geowidget.h \ 55geowidget.h \
56imagewidget.h \ 56imagewidget.h \
57incsearchwidget.h \ 57incsearchwidget.h \
58jumpbuttonbar.h \ 58jumpbuttonbar.h \
59phoneeditwidget.h \ 59phoneeditwidget.h \
60secrecywidget.h \ 60secrecywidget.h \
61keywidget.h \ 61keywidget.h \
62nameeditdialog.h \ 62nameeditdialog.h \
63filter.h \ 63filter.h \
64addviewdialog.h \ 64addviewdialog.h \
65configurewidget.h \ 65configurewidget.h \
66viewconfigurewidget.h \ 66viewconfigurewidget.h \
67viewconfigurefieldspage.h \ 67viewconfigurefieldspage.h \
68viewconfigurefilterpage.h \ 68viewconfigurefilterpage.h \
69typecombo.h \ 69typecombo.h \
70undo.h \ 70undo.h \
71undocmds.h \ 71undocmds.h \
72xxportmanager.h \ 72xxportmanager.h \
73xxportobject.h \ 73xxportobject.h \
74xxportselectdialog.h \ 74xxportselectdialog.h \
75details/detailsviewcontainer.h \ 75details/detailsviewcontainer.h \
76details/look_basic.h \ 76details/look_basic.h \
77details/look_html.h \ 77details/look_html.h \
78views/kaddressbookiconview.h \ 78views/kaddressbookiconview.h \
79views/kaddressbooktableview.h \ 79views/kaddressbooktableview.h \
80views/kaddressbookcardview.h \ 80views/kaddressbookcardview.h \
81views/configuretableviewdialog.h \ 81views/configuretableviewdialog.h \
82views/configurecardviewdialog.h \ 82views/configurecardviewdialog.h \
83views/cardview.h \ 83views/cardview.h \
84views/colorlistbox.h \ 84views/colorlistbox.h \
85views/contactlistview.h \ 85views/contactlistview.h \
86xxport/vcard_xxport.h \ 86xxport/vcard_xxport.h \
87xxport/kde2_xxport.h \ 87xxport/kde2_xxport.h \
88xxport/csv_xxport.h \ 88xxport/csv_xxport.h \
89xxport/csvimportdialog.h \ 89xxport/csvimportdialog.h \
90#details/look_details.h \ 90#details/look_details.h \
91#mainwindoiw.h \ 91#mainwindoiw.h \
92# alarmclient.h \ 92# alarmclient.h \
93# calendarview.h \ 93# calendarview.h \
94# customlistviewitem.h \ 94# customlistviewitem.h \
95# datenavigator.h 95# datenavigator.h
96 96
97SOURCES = \ 97SOURCES = \
98addresseeeditordialog.cpp \ 98addresseeeditordialog.cpp \
99addresseeeditorwidget.cpp \ 99addresseeeditorwidget.cpp \
100addresseditwidget.cpp \ 100addresseditwidget.cpp \
101addresseeconfig.cpp \ 101addresseeconfig.cpp \
102addresseeutil.cpp \ 102addresseeutil.cpp \
103extensionmanager.cpp \ 103extensionmanager.cpp \
104features/mergewidget.cpp \ 104features/mergewidget.cpp \
105features/distributionlistwidget.cpp \ 105features/distributionlistwidget.cpp \
106kcmconfigs/addresseewidget.cpp \ 106kcmconfigs/addresseewidget.cpp \
107kcmconfigs/extensionconfigdialog.cpp \ 107kcmconfigs/extensionconfigdialog.cpp \
108kcmconfigs/kcmkabconfig.cpp \ 108kcmconfigs/kcmkabconfig.cpp \
109kcmconfigs/kabconfigwidget.cpp \ 109kcmconfigs/kabconfigwidget.cpp \
110emaileditwidget.cpp \ 110emaileditwidget.cpp \
111filtereditdialog.cpp \ 111filtereditdialog.cpp \
112mainembedded.cpp \ 112mainembedded.cpp \
113kaddressbookmain.cpp \ 113kaddressbookmain.cpp \
114kabcore.cpp \ 114kabcore.cpp \
115kabprefs.cpp \ 115kabprefs.cpp \
116viewmanager.cpp \ 116viewmanager.cpp \
117kaddressbookview.cpp \ 117kaddressbookview.cpp \
118extensionwidget.cpp \ 118extensionwidget.cpp \
119geowidget.cpp \ 119geowidget.cpp \
120imagewidget.cpp \ 120imagewidget.cpp \
121incsearchwidget.cpp \ 121incsearchwidget.cpp \
122jumpbuttonbar.cpp \ 122jumpbuttonbar.cpp \
123phoneeditwidget.cpp \ 123phoneeditwidget.cpp \
124secrecywidget.cpp \ 124secrecywidget.cpp \
125keywidget.cpp \ 125keywidget.cpp \
126nameeditdialog.cpp \ 126nameeditdialog.cpp \
127filter.cpp \ 127filter.cpp \
128addviewdialog.cpp \ 128addviewdialog.cpp \
129configurewidget.cpp \ 129configurewidget.cpp \
130viewconfigurewidget.cpp \ 130viewconfigurewidget.cpp \
131viewconfigurefieldspage.cpp \ 131viewconfigurefieldspage.cpp \
132viewconfigurefilterpage.cpp \ 132viewconfigurefilterpage.cpp \
133undo.cpp \ 133undo.cpp \
134undocmds.cpp \ 134undocmds.cpp \
135xxportmanager.cpp \ 135xxportmanager.cpp \
136xxportobject.cpp \ 136xxportobject.cpp \
137xxportselectdialog.cpp \ 137xxportselectdialog.cpp \
138details/detailsviewcontainer.cpp \ 138details/detailsviewcontainer.cpp \
139details/look_basic.cpp \ 139details/look_basic.cpp \
140details/look_html.cpp \ 140details/look_html.cpp \
141views/kaddressbookiconview.cpp \ 141views/kaddressbookiconview.cpp \
diff --git a/microkde/microkde.pro b/microkde/microkde.pro
index 05833a9..4ebf53c 100644
--- a/microkde/microkde.pro
+++ b/microkde/microkde.pro
@@ -1,168 +1,171 @@
1 TEMPLATE= lib 1 TEMPLATE= lib
2 CONFIG += qt warn_on 2 CONFIG += qt warn_on
3#INCLUDEPATH += $(QTDIR)/include . 3#INCLUDEPATH += $(QTDIR)/include .
4#DEPENDPATH += $(QTDIR)/include 4#DEPENDPATH += $(QTDIR)/include
5INCLUDEPATH += . ../ ../kabc ./kdecore ./kdeui ./kio/kfile 5INCLUDEPATH += . ../ ../kabc ./kdecore ./kdeui ./kio/kfile ./kio/kio
6#LIBS += -lqtcompat 6#LIBS += -lqtcompat
7 7
8 TARGET = microkde 8 TARGET = microkde
9DESTDIR= ../bin 9DESTDIR= ../bin
10DEFINES += DESKTOP_VERSION KDE_QT_ONLY 10DEFINES += DESKTOP_VERSION KDE_QT_ONLY
11unix : { 11unix : {
12OBJECTS_DIR = obj/unix 12OBJECTS_DIR = obj/unix
13MOC_DIR = moc/unix 13MOC_DIR = moc/unix
14} 14}
15win32: { 15win32: {
16DEFINES += _WIN32_ 16DEFINES += _WIN32_
17OBJECTS_DIR = obj/win 17OBJECTS_DIR = obj/win
18MOC_DIR = moc/win 18MOC_DIR = moc/win
19} 19}
20include( ../variables.pri ) 20include( ../variables.pri )
21 21
22 22
23 23
24HEADERS = \ 24HEADERS = \
25qlayoutengine_p.h \ 25qlayoutengine_p.h \
26KDGanttMinimizeSplitter.h \ 26KDGanttMinimizeSplitter.h \
27 kapplication.h \ 27 kapplication.h \
28 kaudioplayer.h \ 28 kaudioplayer.h \
29 kcalendarsystem.h \ 29 kcalendarsystem.h \
30 kcalendarsystemgregorian.h \ 30 kcalendarsystemgregorian.h \
31 kcolorbutton.h \ 31 kcolorbutton.h \
32 kcolordialog.h \ 32 kcolordialog.h \
33 kcombobox.h \ 33 kcombobox.h \
34 kconfig.h \ 34 kconfig.h \
35 kdatetbl.h \ 35 kdatetbl.h \
36 kdebug.h \ 36 kdebug.h \
37 kdialog.h \ 37 kdialog.h \
38 kdialogbase.h \ 38 kdialogbase.h \
39 kdirwatch.h \ 39 kdirwatch.h \
40 keditlistbox.h \ 40 keditlistbox.h \
41 kemailsettings.h \ 41 kemailsettings.h \
42 kfiledialog.h \ 42 kfiledialog.h \
43 kfontdialog.h \ 43 kfontdialog.h \
44 kglobal.h \ 44 kglobal.h \
45 kglobalsettings.h \ 45 kglobalsettings.h \
46 kiconloader.h \ 46 kiconloader.h \
47 klineedit.h \ 47 klineedit.h \
48 klineeditdlg.h \ 48 klineeditdlg.h \
49 kmessagebox.h \ 49 kmessagebox.h \
50 knotifyclient.h \ 50 knotifyclient.h \
51 kprinter.h \ 51 kprinter.h \
52 kprocess.h \ 52 kprocess.h \
53 krestrictedline.h \ 53 krestrictedline.h \
54 krun.h \ 54 krun.h \
55 ksimpleconfig.h \ 55 ksimpleconfig.h \
56 kstaticdeleter.h \ 56 kstaticdeleter.h \
57 ksystemtray.h \ 57 ksystemtray.h \
58 ktempfile.h \ 58 ktempfile.h \
59 ktextedit.h \ 59 ktextedit.h \
60 kunload.h \ 60 kunload.h \
61 kurl.h \ 61 kurl.h \
62 kdeui/kguiitem.h \ 62 kdeui/kguiitem.h \
63 kdeui/kcmodule.h \ 63 kdeui/kcmodule.h \
64 kdeui/kbuttonbox.h \ 64 kdeui/kbuttonbox.h \
65 kdeui/klistbox.h \ 65 kdeui/klistbox.h \
66 kdeui/klistview.h \ 66 kdeui/klistview.h \
67 kdeui/kjanuswidget.h \ 67 kdeui/kjanuswidget.h \
68 kdeui/kseparator.h \ 68 kdeui/kseparator.h \
69 kdeui/knuminput.h \ 69 kdeui/knuminput.h \
70 kdeui/knumvalidator.h \ 70 kdeui/knumvalidator.h \
71 kdeui/ksqueezedtextlabel.h \ 71 kdeui/ksqueezedtextlabel.h \
72 kio/job.h \ 72 kio/job.h \
73 kio/kio/kdirwatch.h \
74 kio/kio/kdirwatch_p.h \
73 kio/kfile/kurlrequester.h \ 75 kio/kfile/kurlrequester.h \
74 kresources/resource.h \ 76 kresources/resource.h \
75 kresources/factory.h \ 77 kresources/factory.h \
76 kresources/managerimpl.h \ 78 kresources/managerimpl.h \
77 kresources/manager.h \ 79 kresources/manager.h \
78 kresources/selectdialog.h \ 80 kresources/selectdialog.h \
79 kresources/configpage.h \ 81 kresources/configpage.h \
80 kresources/configwidget.h \ 82 kresources/configwidget.h \
81 kresources/configdialog.h \ 83 kresources/configdialog.h \
82 kresources/kcmkresources.h \ 84 kresources/kcmkresources.h \
83 kdecore/kmdcodec.h \ 85 kdecore/kmdcodec.h \
84 kdecore/kconfigbase.h \ 86 kdecore/kconfigbase.h \
85 kdecore/klocale.h \ 87 kdecore/klocale.h \
86 kdecore/kcatalogue.h \ 88 kdecore/kcatalogue.h \
87 kdecore/ksharedptr.h \ 89 kdecore/ksharedptr.h \
88 kdecore/kshell.h \ 90 kdecore/kshell.h \
89 kdecore/kstandarddirs.h \ 91 kdecore/kstandarddirs.h \
90 kdecore/kstringhandler.h \ 92 kdecore/kstringhandler.h \
91 kdecore/kshortcut.h \ 93 kdecore/kshortcut.h \
92 kutils/kcmultidialog.h \ 94 kutils/kcmultidialog.h \
93 kdeui/kxmlguiclient.h \ 95 kdeui/kxmlguiclient.h \
94 kdeui/kstdaction.h \ 96 kdeui/kstdaction.h \
95 kdeui/kmainwindow.h \ 97 kdeui/kmainwindow.h \
96 kdeui/ktoolbar.h \ 98 kdeui/ktoolbar.h \
97 kdeui/ktoolbarbutton.h \ 99 kdeui/ktoolbarbutton.h \
98 kdeui/ktoolbarhandler.h \ 100 kdeui/ktoolbarhandler.h \
99 kdeui/kaction.h \ 101 kdeui/kaction.h \
100 kdeui/kactionclasses.h \ 102 kdeui/kactionclasses.h \
101 kdeui/kactioncollection.h \ 103 kdeui/kactioncollection.h \
102 kdecore/klibloader.h 104 kdecore/klibloader.h
103 105
104 106
105# kdecore/klibloader.h \ 107# kdecore/klibloader.h \
106 108
107 109
108SOURCES = \ 110SOURCES = \
109KDGanttMinimizeSplitter.cpp \ 111KDGanttMinimizeSplitter.cpp \
110 kapplication.cpp \ 112 kapplication.cpp \
111 kcalendarsystem.cpp \ 113 kcalendarsystem.cpp \
112 kcalendarsystemgregorian.cpp \ 114 kcalendarsystemgregorian.cpp \
113 kcolorbutton.cpp \ 115 kcolorbutton.cpp \
114 kcolordialog.cpp \ 116 kcolordialog.cpp \
115 kconfig.cpp \ 117 kconfig.cpp \
116 kdatetbl.cpp \ 118 kdatetbl.cpp \
117 kdialog.cpp \ 119 kdialog.cpp \
118 kdialogbase.cpp \ 120 kdialogbase.cpp \
119 keditlistbox.cpp \ 121 keditlistbox.cpp \
120 kemailsettings.cpp \ 122 kemailsettings.cpp \
121 kfontdialog.cpp \ 123 kfontdialog.cpp \
122 kfiledialog.cpp \ 124 kfiledialog.cpp \
123 kglobal.cpp \ 125 kglobal.cpp \
124 kglobalsettings.cpp \ 126 kglobalsettings.cpp \
125 kiconloader.cpp \ 127 kiconloader.cpp \
126 kmessagebox.cpp \ 128 kmessagebox.cpp \
127 ktextedit.cpp \ 129 ktextedit.cpp \
128 kprocess.cpp \ 130 kprocess.cpp \
129 krun.cpp \ 131 krun.cpp \
130 ksystemtray.cpp \ 132 ksystemtray.cpp \
131 ktempfile.cpp \ 133 ktempfile.cpp \
132 kurl.cpp \ 134 kurl.cpp \
133 kdecore/kcatalogue.cpp \ 135 kdecore/kcatalogue.cpp \
134 kdecore/klocale.cpp \ 136 kdecore/klocale.cpp \
135 kdecore/kmdcodec.cpp \ 137 kdecore/kmdcodec.cpp \
136 kdecore/kshell.cpp \ 138 kdecore/kshell.cpp \
137 kdecore/kstandarddirs.cpp \ 139 kdecore/kstandarddirs.cpp \
138 kdecore/kstringhandler.cpp \ 140 kdecore/kstringhandler.cpp \
139 kdeui/kbuttonbox.cpp \ 141 kdeui/kbuttonbox.cpp \
140 kdeui/kcmodule.cpp \ 142 kdeui/kcmodule.cpp \
141 kdeui/kguiitem.cpp \ 143 kdeui/kguiitem.cpp \
142 kdeui/kjanuswidget.cpp \ 144 kdeui/kjanuswidget.cpp \
143 kdeui/klistbox.cpp \ 145 kdeui/klistbox.cpp \
144 kdeui/klistview.cpp \ 146 kdeui/klistview.cpp \
145 kdeui/knuminput.cpp \ 147 kdeui/knuminput.cpp \
146 kdeui/knumvalidator.cpp \ 148 kdeui/knumvalidator.cpp \
147 kdeui/kseparator.cpp \ 149 kdeui/kseparator.cpp \
148 kdeui/ksqueezedtextlabel.cpp \ 150 kdeui/ksqueezedtextlabel.cpp \
151 kio/kio/kdirwatch.cpp \
149 kio/kfile/kurlrequester.cpp \ 152 kio/kfile/kurlrequester.cpp \
150 kresources/configpage.cpp \ 153 kresources/configpage.cpp \
151 kresources/configdialog.cpp \ 154 kresources/configdialog.cpp \
152 kresources/configwidget.cpp \ 155 kresources/configwidget.cpp \
153 kresources/factory.cpp \ 156 kresources/factory.cpp \
154 kresources/kcmkresources.cpp \ 157 kresources/kcmkresources.cpp \
155 kresources/managerimpl.cpp \ 158 kresources/managerimpl.cpp \
156 kresources/resource.cpp \ 159 kresources/resource.cpp \
157 kresources/selectdialog.cpp \ 160 kresources/selectdialog.cpp \
158 kutils/kcmultidialog.cpp \ 161 kutils/kcmultidialog.cpp \
159 kdeui/kaction.cpp \ 162 kdeui/kaction.cpp \
160 kdeui/kactionclasses.cpp \ 163 kdeui/kactionclasses.cpp \
161 kdeui/kactioncollection.cpp \ 164 kdeui/kactioncollection.cpp \
162 kdeui/kmainwindow.cpp \ 165 kdeui/kmainwindow.cpp \
163 kdeui/ktoolbar.cpp \ 166 kdeui/ktoolbar.cpp \
164 kdeui/ktoolbarbutton.cpp \ 167 kdeui/ktoolbarbutton.cpp \
165 kdeui/ktoolbarhandler.cpp \ 168 kdeui/ktoolbarhandler.cpp \
166 kdeui/kstdaction.cpp \ 169 kdeui/kstdaction.cpp \
167 kdeui/kxmlguiclient.cpp \ 170 kdeui/kxmlguiclient.cpp \
168 kdecore/klibloader.cpp \ No newline at end of file 171 kdecore/klibloader.cpp
diff --git a/microkde/microkdeE.pro b/microkde/microkdeE.pro
index 4ee4dd7..ec2b1f7 100644
--- a/microkde/microkdeE.pro
+++ b/microkde/microkdeE.pro
@@ -1,171 +1,173 @@
1 TEMPLATE= lib 1 TEMPLATE= lib
2CONFIG += qt warn_on 2CONFIG += qt warn_on
3INCLUDEPATH += . ../qtcompat ../kabc ./kdecore ./kdeui ./kio/kfile $(QPEDIR)/include 3INCLUDEPATH += . ../qtcompat ../kabc ./kdecore ./kdeui ./kio/kfile ./kio/kio $(QPEDIR)/include
4 4
5DEPENDPATH += $(QPEDIR)/include 5DEPENDPATH += $(QPEDIR)/include
6LIBS += -lmicroqtcompat -L$(QPEDIR)/lib 6LIBS += -lmicroqtcompat -L$(QPEDIR)/lib
7 7
8DEFINES += KDE_QT_ONLY 8DEFINES += KDE_QT_ONLY
9 9
10 TARGET = microkde 10 TARGET = microkde
11OBJECTS_DIR = obj/$(PLATFORM) 11OBJECTS_DIR = obj/$(PLATFORM)
12MOC_DIR = moc/$(PLATFORM) 12MOC_DIR = moc/$(PLATFORM)
13DESTDIR=$(QPEDIR)/lib 13DESTDIR=$(QPEDIR)/lib
14 14
15 15
16INTERFACES = \ 16INTERFACES = \
17 17
18HEADERS = \ 18HEADERS = \
19qlayoutengine_p.h \ 19qlayoutengine_p.h \
20KDGanttMinimizeSplitter.h \ 20KDGanttMinimizeSplitter.h \
21 kapplication.h \ 21 kapplication.h \
22 kaudioplayer.h \ 22 kaudioplayer.h \
23 kcalendarsystem.h \ 23 kcalendarsystem.h \
24 kcalendarsystemgregorian.h \ 24 kcalendarsystemgregorian.h \
25 kcolorbutton.h \ 25 kcolorbutton.h \
26 kcolordialog.h \ 26 kcolordialog.h \
27 kcombobox.h \ 27 kcombobox.h \
28 kconfig.h \ 28 kconfig.h \
29 kdatetbl.h \ 29 kdatetbl.h \
30 kdebug.h \ 30 kdebug.h \
31 kdialog.h \ 31 kdialog.h \
32 kdialogbase.h \ 32 kdialogbase.h \
33 kdirwatch.h \
34 keditlistbox.h \ 33 keditlistbox.h \
35 kemailsettings.h \ 34 kemailsettings.h \
36 kfiledialog.h \ 35 kfiledialog.h \
37 kfontdialog.h \ 36 kfontdialog.h \
38 kglobal.h \ 37 kglobal.h \
39 kglobalsettings.h \ 38 kglobalsettings.h \
40 kiconloader.h \ 39 kiconloader.h \
41 klineedit.h \ 40 klineedit.h \
42 klineeditdlg.h \ 41 klineeditdlg.h \
43 kmessagebox.h \ 42 kmessagebox.h \
44 knotifyclient.h \ 43 knotifyclient.h \
45 kprinter.h \ 44 kprinter.h \
46 kprocess.h \ 45 kprocess.h \
47 krestrictedline.h \ 46 krestrictedline.h \
48 krun.h \ 47 krun.h \
49 ksimpleconfig.h \ 48 ksimpleconfig.h \
50 kstaticdeleter.h \ 49 kstaticdeleter.h \
51 ksystemtray.h \ 50 ksystemtray.h \
52 ktempfile.h \ 51 ktempfile.h \
53 ktextedit.h \ 52 ktextedit.h \
54 kunload.h \ 53 kunload.h \
55 kurl.h \ 54 kurl.h \
56 ofileselector_p.h \ 55 ofileselector_p.h \
57 ofontselector.h \ 56 ofontselector.h \
58oprocctrl.h \ 57oprocctrl.h \
59oprocess.h \ 58oprocess.h \
60osmartpointer.h \ 59osmartpointer.h \
61 kdeui/kguiitem.h \ 60 kdeui/kguiitem.h \
62 kdeui/kaction.h \ 61 kdeui/kaction.h \
63 kdeui/kactionclasses.h \ 62 kdeui/kactionclasses.h \
64 kdeui/kactioncollection.h \ 63 kdeui/kactioncollection.h \
65 kdeui/kcmodule.h \ 64 kdeui/kcmodule.h \
66 kdeui/kstdaction.h \ 65 kdeui/kstdaction.h \
67 kdeui/kbuttonbox.h \ 66 kdeui/kbuttonbox.h \
68 kdeui/klistbox.h \ 67 kdeui/klistbox.h \
69 kdeui/klistview.h \ 68 kdeui/klistview.h \
70 kdeui/kjanuswidget.h \ 69 kdeui/kjanuswidget.h \
71 kdeui/kseparator.h \ 70 kdeui/kseparator.h \
72 kdeui/kmainwindow.h \ 71 kdeui/kmainwindow.h \
73 kdeui/knuminput.h \ 72 kdeui/knuminput.h \
74 kdeui/knumvalidator.h \ 73 kdeui/knumvalidator.h \
75 kdeui/ksqueezedtextlabel.h \ 74 kdeui/ksqueezedtextlabel.h \
76 kdeui/ktoolbar.h \ 75 kdeui/ktoolbar.h \
77 kdeui/ktoolbarbutton.h \ 76 kdeui/ktoolbarbutton.h \
78 kdeui/ktoolbarhandler.h \ 77 kdeui/ktoolbarhandler.h \
79 kdeui/kxmlguiclient.h \ 78 kdeui/kxmlguiclient.h \
80 kio/job.h \ 79 kio/job.h \
80 kio/kio/kdirwatch.h \
81 kio/kio/kdirwatch_p.h \
81 kio/kfile/kurlrequester.h \ 82 kio/kfile/kurlrequester.h \
82 kresources/resource.h \ 83 kresources/resource.h \
83 kresources/factory.h \ 84 kresources/factory.h \
84 kresources/managerimpl.h \ 85 kresources/managerimpl.h \
85 kresources/manager.h \ 86 kresources/manager.h \
86 kresources/selectdialog.h \ 87 kresources/selectdialog.h \
87 kresources/configpage.h \ 88 kresources/configpage.h \
88 kresources/configwidget.h \ 89 kresources/configwidget.h \
89 kresources/configdialog.h \ 90 kresources/configdialog.h \
90 kresources/kcmkresources.h \ 91 kresources/kcmkresources.h \
91 kdecore/kmdcodec.h \ 92 kdecore/kmdcodec.h \
92 kdecore/kconfigbase.h \ 93 kdecore/kconfigbase.h \
93 kdecore/klocale.h \ 94 kdecore/klocale.h \
94 kdecore/klibloader.h \ 95 kdecore/klibloader.h \
95 kdecore/kcatalogue.h \ 96 kdecore/kcatalogue.h \
96 kdecore/ksharedptr.h \ 97 kdecore/ksharedptr.h \
97 kdecore/kshell.h \ 98 kdecore/kshell.h \
98 kdecore/kstandarddirs.h \ 99 kdecore/kstandarddirs.h \
99 kdecore/kstringhandler.h \ 100 kdecore/kstringhandler.h \
100 kdecore/kshortcut.h \ 101 kdecore/kshortcut.h \
101 kutils/kcmultidialog.h 102 kutils/kcmultidialog.h
102 103
103 104
104 105
105 106
106SOURCES = \ 107SOURCES = \
107KDGanttMinimizeSplitter.cpp \ 108KDGanttMinimizeSplitter.cpp \
108 kapplication.cpp \ 109 kapplication.cpp \
109 kcalendarsystem.cpp \ 110 kcalendarsystem.cpp \
110 kcalendarsystemgregorian.cpp \ 111 kcalendarsystemgregorian.cpp \
111 kcolorbutton.cpp \ 112 kcolorbutton.cpp \
112 kcolordialog.cpp \ 113 kcolordialog.cpp \
113 kconfig.cpp \ 114 kconfig.cpp \
114 kdatetbl.cpp \ 115 kdatetbl.cpp \
115 kdialog.cpp \ 116 kdialog.cpp \
116 kdialogbase.cpp \ 117 kdialogbase.cpp \
117 keditlistbox.cpp \ 118 keditlistbox.cpp \
118 kemailsettings.cpp \ 119 kemailsettings.cpp \
119 kfontdialog.cpp \ 120 kfontdialog.cpp \
120 kfiledialog.cpp \ 121 kfiledialog.cpp \
121 kglobal.cpp \ 122 kglobal.cpp \
122 kglobalsettings.cpp \ 123 kglobalsettings.cpp \
123 kiconloader.cpp \ 124 kiconloader.cpp \
124 kmessagebox.cpp \ 125 kmessagebox.cpp \
125 kprocess.cpp \ 126 kprocess.cpp \
126 krun.cpp \ 127 krun.cpp \
127 ksystemtray.cpp \ 128 ksystemtray.cpp \
128 ktempfile.cpp \ 129 ktempfile.cpp \
129 kurl.cpp \ 130 kurl.cpp \
130 ktextedit.cpp \ 131 ktextedit.cpp \
131 ofileselector_p.cpp \ 132 ofileselector_p.cpp \
132 ofontselector.cpp \ 133 ofontselector.cpp \
133oprocctrl.cpp \ 134oprocctrl.cpp \
134oprocess.cpp \ 135oprocess.cpp \
135 kdecore/kcatalogue.cpp \ 136 kdecore/kcatalogue.cpp \
136 kdecore/klibloader.cpp \ 137 kdecore/klibloader.cpp \
137 kdecore/klocale.cpp \ 138 kdecore/klocale.cpp \
138 kdecore/kmdcodec.cpp \ 139 kdecore/kmdcodec.cpp \
139 kdecore/kshell.cpp \ 140 kdecore/kshell.cpp \
140 kdecore/kstandarddirs.cpp \ 141 kdecore/kstandarddirs.cpp \
141 kdecore/kstringhandler.cpp \ 142 kdecore/kstringhandler.cpp \
142 kdeui/kaction.cpp \ 143 kdeui/kaction.cpp \
143 kdeui/kactionclasses.cpp \ 144 kdeui/kactionclasses.cpp \
144 kdeui/kactioncollection.cpp \ 145 kdeui/kactioncollection.cpp \
145 kdeui/kbuttonbox.cpp \ 146 kdeui/kbuttonbox.cpp \
146 kdeui/kcmodule.cpp \ 147 kdeui/kcmodule.cpp \
147 kdeui/kguiitem.cpp \ 148 kdeui/kguiitem.cpp \
148 kdeui/kjanuswidget.cpp \ 149 kdeui/kjanuswidget.cpp \
149 kdeui/klistbox.cpp \ 150 kdeui/klistbox.cpp \
150 kdeui/klistview.cpp \ 151 kdeui/klistview.cpp \
151 kdeui/kmainwindow.cpp \ 152 kdeui/kmainwindow.cpp \
152 kdeui/knuminput.cpp \ 153 kdeui/knuminput.cpp \
153 kdeui/knumvalidator.cpp \ 154 kdeui/knumvalidator.cpp \
154 kdeui/kseparator.cpp \ 155 kdeui/kseparator.cpp \
155 kdeui/kstdaction.cpp \ 156 kdeui/kstdaction.cpp \
156 kdeui/ksqueezedtextlabel.cpp \ 157 kdeui/ksqueezedtextlabel.cpp \
157 kdeui/ktoolbar.cpp \ 158 kdeui/ktoolbar.cpp \
158 kdeui/ktoolbarbutton.cpp \ 159 kdeui/ktoolbarbutton.cpp \
159 kdeui/ktoolbarhandler.cpp \ 160 kdeui/ktoolbarhandler.cpp \
160 kdeui/kxmlguiclient.cpp \ 161 kdeui/kxmlguiclient.cpp \
161 kio/kfile/kurlrequester.cpp \ 162 kio/kfile/kurlrequester.cpp \
163 kio/kio/kdirwatch.cpp \
162 kresources/configpage.cpp \ 164 kresources/configpage.cpp \
163 kresources/configdialog.cpp \ 165 kresources/configdialog.cpp \
164 kresources/configwidget.cpp \ 166 kresources/configwidget.cpp \
165 kresources/factory.cpp \ 167 kresources/factory.cpp \
166 kresources/kcmkresources.cpp \ 168 kresources/kcmkresources.cpp \
167 kresources/managerimpl.cpp \ 169 kresources/managerimpl.cpp \
168 kresources/resource.cpp \ 170 kresources/resource.cpp \
169 kresources/selectdialog.cpp \ 171 kresources/selectdialog.cpp \
170 kutils/kcmultidialog.cpp 172 kutils/kcmultidialog.cpp
171 173