Diffstat (limited to 'kaddressbook/views/kaddressbookiconview.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | kaddressbook/views/kaddressbookiconview.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kaddressbook/views/kaddressbookiconview.cpp b/kaddressbook/views/kaddressbookiconview.cpp index 3bdfd1a..4bbdf1d 100644 --- a/kaddressbook/views/kaddressbookiconview.cpp +++ b/kaddressbook/views/kaddressbookiconview.cpp | |||
@@ -248,67 +248,67 @@ void KAddressBookIconView::readConfig(KConfig *config) | |||
248 | this, SLOT(addresseeExecuted(QIconViewItem *))); | 248 | this, SLOT(addresseeExecuted(QIconViewItem *))); |
249 | */ | 249 | */ |
250 | connect(mIconView, SIGNAL(selectionChanged(QIconViewItem *)), | 250 | connect(mIconView, SIGNAL(selectionChanged(QIconViewItem *)), |
251 | this, SLOT(addresseeExecuted(QIconViewItem *))); | 251 | this, SLOT(addresseeExecuted(QIconViewItem *))); |
252 | 252 | ||
253 | } | 253 | } |
254 | void KAddressBookIconView::doSearch( const QString& s ,KABC::Field *field ) | 254 | void KAddressBookIconView::doSearch( const QString& s ,KABC::Field *field ) |
255 | { | 255 | { |
256 | mIconView->clear(); | 256 | mIconView->clear(); |
257 | mIconList.clear(); | 257 | mIconList.clear(); |
258 | if ( s.isEmpty() || s == "*" ) { | 258 | if ( s.isEmpty() || s == "*" ) { |
259 | refresh(); | 259 | refresh(); |
260 | return; | 260 | return; |
261 | } | 261 | } |
262 | QRegExp re = getRegExp( s ); | 262 | QRegExp re = getRegExp( s ); |
263 | if (!re.isValid()) | 263 | if (!re.isValid()) |
264 | return; | 264 | return; |
265 | KABC::Addressee::List addresseeList = addressees(); | 265 | KABC::Addressee::List addresseeList = addressees(); |
266 | KABC::Addressee::List::Iterator it; | 266 | KABC::Addressee::List::Iterator it; |
267 | if ( field ) { | 267 | if ( field ) { |
268 | for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) { | 268 | for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) { |
269 | if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") ) | 269 | if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") ) |
270 | continue; | 270 | continue; |
271 | #if QT_VERSION >= 0x030000 | 271 | #if QT_VERSION >= 0x030000 |
272 | if (re.search(field->value( *it ).lower()) != -1) | 272 | if (re.search(field->value( *it ).lower()) == 0) |
273 | #else | 273 | #else |
274 | if (re.match(field->value( *it ).lower()) != -1) | 274 | if (re.match(field->value( *it ).lower()) == 0) |
275 | #endif | 275 | #endif |
276 | mIconList.append(new AddresseeIconViewItem( fields(), addressBook(), *it, mIconView )); | 276 | mIconList.append(new AddresseeIconViewItem( fields(), addressBook(), *it, mIconView )); |
277 | 277 | ||
278 | 278 | ||
279 | } | 279 | } |
280 | } else { | 280 | } else { |
281 | KABC::Field::List fieldList = allFields(); | 281 | KABC::Field::List fieldList = allFields(); |
282 | KABC::Field::List::ConstIterator fieldIt; | 282 | KABC::Field::List::ConstIterator fieldIt; |
283 | for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) { | 283 | for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) { |
284 | if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") ) | 284 | if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") ) |
285 | continue; | 285 | continue; |
286 | for ( fieldIt = fieldList.begin(); fieldIt != fieldList.end(); ++fieldIt ) { | 286 | for ( fieldIt = fieldList.begin(); fieldIt != fieldList.end(); ++fieldIt ) { |
287 | #if QT_VERSION >= 0x030000 | 287 | #if QT_VERSION >= 0x030000 |
288 | if (re.search((*fieldIt)->value( *it ).lower()) != -1) | 288 | if (re.search((*fieldIt)->value( *it ).lower()) == 0) |
289 | #else | 289 | #else |
290 | if (re.match((*fieldIt)->value( *it ).lower()) != -1) | 290 | if (re.match((*fieldIt)->value( *it ).lower()) == 0) |
291 | #endif | 291 | #endif |
292 | { | 292 | { |
293 | mIconList.append( new AddresseeIconViewItem( fields(), addressBook(), *it, mIconView )); | 293 | mIconList.append( new AddresseeIconViewItem( fields(), addressBook(), *it, mIconView )); |
294 | break; | 294 | break; |
295 | } | 295 | } |
296 | } | 296 | } |
297 | } | 297 | } |
298 | } | 298 | } |
299 | mIconView->arrangeItemsInGrid( true ); | 299 | mIconView->arrangeItemsInGrid( true ); |
300 | if ( mIconView->firstItem() ) { | 300 | if ( mIconView->firstItem() ) { |
301 | mIconView->setCurrentItem ( mIconView->firstItem() ); | 301 | mIconView->setCurrentItem ( mIconView->firstItem() ); |
302 | mIconView->setSelected ( mIconView->firstItem() , true ); | 302 | mIconView->setSelected ( mIconView->firstItem() , true ); |
303 | } | 303 | } |
304 | else | 304 | else |
305 | emit selected(QString::null); | 305 | emit selected(QString::null); |
306 | } | 306 | } |
307 | QStringList KAddressBookIconView::selectedUids() | 307 | QStringList KAddressBookIconView::selectedUids() |
308 | { | 308 | { |
309 | QStringList uidList; | 309 | QStringList uidList; |
310 | QIconViewItem *item; | 310 | QIconViewItem *item; |
311 | AddresseeIconViewItem *aItem; | 311 | AddresseeIconViewItem *aItem; |
312 | 312 | ||
313 | for (item = mIconView->firstItem(); item; item = item->nextItem()) | 313 | for (item = mIconView->firstItem(); item; item = item->nextItem()) |
314 | { | 314 | { |