kapi search fix

author: zautrix <zautrix> 2005-07-03 14:46:21 (UTC)
committer: zautrix <zautrix> 2005-07-03 14:46:21 (UTC)
commit: 0c632bafd2d058504118dc8957fc4808a784f548 (patch) (unidiff)
tree: 5d726f0b4c480ac253f5c0b89907a2b624e9812d /kaddressbook
parent: 3be76edf08827e1e00206399469904fe69887854 (diff)
download: kdepimpi-0c632bafd2d058504118dc8957fc4808a784f548.zip
kdepimpi-0c632bafd2d058504118dc8957fc4808a784f548.tar.gz
kdepimpi-0c632bafd2d058504118dc8957fc4808a784f548.tar.bz2
3 files changed, 11 insertions, 11 deletions
diff --git a/kaddressbook/views/kaddressbookcardview.cpp b/kaddressbook/views/kaddressbookcardview.cpp
index 9c35fd6..ca21016 100644
--- a/kaddressbook/views/kaddressbookcardview.cpp
+++ b/kaddressbook/views/kaddressbookcardview.cpp
@@ -312,15 +312,15 @@ void KAddressBookCardView::doSearch( const QString&  s,KABC::Field *field  )
    KABC::Addressee::List::Iterator it;  
    if (  field ) {
        for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) {
            if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") )
                continue;
 #if QT_VERSION >= 0x030000
-            if (re.search(field->value( *it ).lower()) != -1)
+            if (re.search(field->value( *it ).lower()) == 0)
 #else
-                if (re.match(field->value( *it ).lower()) != -1)
+                if (re.match(field->value( *it ).lower()) == 0)
 #endif
                  new AddresseeCardViewItem(fields(), mShowEmptyFields,
                                              addressBook(), *it, mCardView);
        }
    } else {
@@ -328,15 +328,15 @@ void KAddressBookCardView::doSearch( const QString&  s,KABC::Field *field  )
        KABC::Field::List::ConstIterator fieldIt;
        for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) {
            if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") )
                continue;
            for ( fieldIt = fieldList.begin(); fieldIt != fieldList.end(); ++fieldIt ) {
 #if QT_VERSION >= 0x030000
-                if (re.search((*fieldIt)->value( *it ).lower()) != -1)
+                if (re.search((*fieldIt)->value( *it ).lower()) == 0)
 #else
-                    if (re.match((*fieldIt)->value( *it ).lower()) != -1)
+                    if (re.match((*fieldIt)->value( *it ).lower()) == 0)
 #endif   
                        { 
                           new AddresseeCardViewItem(fields(), mShowEmptyFields,
                                              addressBook(), *it, mCardView);
                            break;
                        }
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
@@ -266,15 +266,15 @@ void KAddressBookIconView::doSearch( const QString&  s ,KABC::Field *field )
    KABC::Addressee::List::Iterator it;  
    if (  field ) {
        for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) {
            if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") )
                continue;
 #if QT_VERSION >= 0x030000
-            if (re.search(field->value( *it ).lower()) != -1)
+            if (re.search(field->value( *it ).lower()) == 0)
 #else
-                if (re.match(field->value( *it ).lower()) != -1)
+                if (re.match(field->value( *it ).lower()) == 0)
 #endif
                    mIconList.append(new AddresseeIconViewItem( fields(), addressBook(), *it, mIconView ));
                 
        }
    } else {
@@ -282,15 +282,15 @@ void KAddressBookIconView::doSearch( const QString&  s ,KABC::Field *field )
        KABC::Field::List::ConstIterator fieldIt;
        for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) {
            if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") )
                continue;
            for ( fieldIt = fieldList.begin(); fieldIt != fieldList.end(); ++fieldIt ) {
 #if QT_VERSION >= 0x030000
-                if (re.search((*fieldIt)->value( *it ).lower()) != -1)
+                if (re.search((*fieldIt)->value( *it ).lower()) == 0)
 #else
-                    if (re.match((*fieldIt)->value( *it ).lower()) != -1)
+                    if (re.match((*fieldIt)->value( *it ).lower()) == 0)
 #endif   
                        { 
                            mIconList.append( new AddresseeIconViewItem( fields(), addressBook(), *it, mIconView ));
                            break;
                        }
            }
diff --git a/kaddressbook/views/kaddressbooktableview.cpp b/kaddressbook/views/kaddressbooktableview.cpp
index 565cd1d..348f491 100644
--- a/kaddressbook/views/kaddressbooktableview.cpp
+++ b/kaddressbook/views/kaddressbooktableview.cpp
@@ -156,28 +156,28 @@ void KAddressBookTableView::doSearch( const QString&  s, KABC::Field *field  )
        for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) { 
            if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") )
                continue;
 #if QT_VERSION >= 0x030000
            if (re.search(field->value( *it ).lower()) == 0)
 #else
-                if (re.match(field->value( *it ).lower()) != -1)
+                if (re.match(field->value( *it ).lower()) == 0)
 #endif
                    ContactListViewItem *item = new ContactListViewItem(*it, mListView, addressBook(), fields());
        }
    } else {
        KABC::Field::List fieldList = allFields();
        KABC::Field::List::ConstIterator fieldIt;
        for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) {
            if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") )
                continue;
            for ( fieldIt = fieldList.begin(); fieldIt != fieldList.end(); ++fieldIt ) {
 #if QT_VERSION >= 0x030000
-                if (re.search((*fieldIt)->value( *it ).lower()) != -1)
+                if (re.search((*fieldIt)->value( *it ).lower()) == 0)
 #else
-                    if (re.match((*fieldIt)->value( *it ).lower()) != -1)
+                    if (re.match((*fieldIt)->value( *it ).lower()) == 0)
 #endif   
                        { 
                            //qDebug("match %s %s %s", pattern.latin1(), (*fieldIt)->value( *it ).latin1(), (*fieldIt)->label().latin1()  );
                            ContactListViewItem *item = new ContactListViewItem(*it, mListView, addressBook(), fields());
                            break;
                        }
author	zautrix <zautrix>	2005-07-03 14:46:21 (UTC)
committer	zautrix <zautrix>	2005-07-03 14:46:21 (UTC)
commit	0c632bafd2d058504118dc8957fc4808a784f548 (patch) (unidiff)
tree	5d726f0b4c480ac253f5c0b89907a2b624e9812d /kaddressbook
parent	3be76edf08827e1e00206399469904fe69887854 (diff)
download	kdepimpi-0c632bafd2d058504118dc8957fc4808a784f548.zip kdepimpi-0c632bafd2d058504118dc8957fc4808a784f548.tar.gz kdepimpi-0c632bafd2d058504118dc8957fc4808a784f548.tar.bz2

diff --git a/kaddressbook/views/kaddressbookcardview.cpp b/kaddressbook/views/kaddressbookcardview.cpp index 9c35fd6..ca21016 100644 --- a/kaddressbook/views/kaddressbookcardview.cpp +++ b/kaddressbook/views/kaddressbookcardview.cpp
@@ -312,15 +312,15 @@ void KAddressBookCardView::doSearch( const QString& s,KABC::Field *field )
312	KABC::Addressee::List::Iterator it;	312	KABC::Addressee::List::Iterator it;
313	if ( field ) {	313	if ( field ) {
314	for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) {	314	for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) {
315	if ( (it).uid().left(2) == "la" && (it).uid().left(19) == QString("last-syncAddressee-") )	315	if ( (it).uid().left(2) == "la" && (it).uid().left(19) == QString("last-syncAddressee-") )
316	continue;	316	continue;
317	#if QT_VERSION >= 0x030000	317	#if QT_VERSION >= 0x030000
318	if (re.search(field->value( *it ).lower()) != -1)	318	if (re.search(field->value( *it ).lower()) == 0)
319	#else	319	#else
320	if (re.match(field->value( *it ).lower()) != -1)	320	if (re.match(field->value( *it ).lower()) == 0)
321	#endif	321	#endif
322	new AddresseeCardViewItem(fields(), mShowEmptyFields,	322	new AddresseeCardViewItem(fields(), mShowEmptyFields,
323	addressBook(), *it, mCardView);	323	addressBook(), *it, mCardView);
324		324
325	}	325	}
326	} else {	326	} else {
@@ -328,15 +328,15 @@ void KAddressBookCardView::doSearch( const QString& s,KABC::Field *field )
328	KABC::Field::List::ConstIterator fieldIt;	328	KABC::Field::List::ConstIterator fieldIt;
329	for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) {	329	for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) {
330	if ( (it).uid().left(2) == "la" && (it).uid().left(19) == QString("last-syncAddressee-") )	330	if ( (it).uid().left(2) == "la" && (it).uid().left(19) == QString("last-syncAddressee-") )
331	continue;	331	continue;
332	for ( fieldIt = fieldList.begin(); fieldIt != fieldList.end(); ++fieldIt ) {	332	for ( fieldIt = fieldList.begin(); fieldIt != fieldList.end(); ++fieldIt ) {
333	#if QT_VERSION >= 0x030000	333	#if QT_VERSION >= 0x030000
334	if (re.search((fieldIt)->value( it ).lower()) != -1)	334	if (re.search((fieldIt)->value( it ).lower()) == 0)
335	#else	335	#else
336	if (re.match((fieldIt)->value( it ).lower()) != -1)	336	if (re.match((fieldIt)->value( it ).lower()) == 0)
337	#endif	337	#endif
338	{	338	{
339	new AddresseeCardViewItem(fields(), mShowEmptyFields,	339	new AddresseeCardViewItem(fields(), mShowEmptyFields,
340	addressBook(), *it, mCardView);	340	addressBook(), *it, mCardView);
341	break;	341	break;
342	}	342	}


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
@@ -266,15 +266,15 @@ void KAddressBookIconView::doSearch( const QString& s ,KABC::Field *field )
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 {
@@ -282,15 +282,15 @@ void KAddressBookIconView::doSearch( const QString& s ,KABC::Field *field )
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	}


diff --git a/kaddressbook/views/kaddressbooktableview.cpp b/kaddressbook/views/kaddressbooktableview.cpp index 565cd1d..348f491 100644 --- a/kaddressbook/views/kaddressbooktableview.cpp +++ b/kaddressbook/views/kaddressbooktableview.cpp
@@ -156,28 +156,28 @@ void KAddressBookTableView::doSearch( const QString& s, KABC::Field *field )
156	for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) {	156	for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) {
157	if ( (it).uid().left(2) == "la" && (it).uid().left(19) == QString("last-syncAddressee-") )	157	if ( (it).uid().left(2) == "la" && (it).uid().left(19) == QString("last-syncAddressee-") )
158	continue;	158	continue;
159	#if QT_VERSION >= 0x030000	159	#if QT_VERSION >= 0x030000
160	if (re.search(field->value( *it ).lower()) == 0)	160	if (re.search(field->value( *it ).lower()) == 0)
161	#else	161	#else
162	if (re.match(field->value( *it ).lower()) != -1)	162	if (re.match(field->value( *it ).lower()) == 0)
163	#endif	163	#endif
164	ContactListViewItem item = new ContactListViewItem(it, mListView, addressBook(), fields());	164	ContactListViewItem item = new ContactListViewItem(it, mListView, addressBook(), fields());
165		165
166	}	166	}
167	} else {	167	} else {
168	KABC::Field::List fieldList = allFields();	168	KABC::Field::List fieldList = allFields();
169	KABC::Field::List::ConstIterator fieldIt;	169	KABC::Field::List::ConstIterator fieldIt;
170	for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) {	170	for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) {
171	if ( (it).uid().left(2) == "la" && (it).uid().left(19) == QString("last-syncAddressee-") )	171	if ( (it).uid().left(2) == "la" && (it).uid().left(19) == QString("last-syncAddressee-") )
172	continue;	172	continue;
173	for ( fieldIt = fieldList.begin(); fieldIt != fieldList.end(); ++fieldIt ) {	173	for ( fieldIt = fieldList.begin(); fieldIt != fieldList.end(); ++fieldIt ) {
174	#if QT_VERSION >= 0x030000	174	#if QT_VERSION >= 0x030000
175	if (re.search((fieldIt)->value( it ).lower()) != -1)	175	if (re.search((fieldIt)->value( it ).lower()) == 0)
176	#else	176	#else
177	if (re.match((fieldIt)->value( it ).lower()) != -1)	177	if (re.match((fieldIt)->value( it ).lower()) == 0)
178	#endif	178	#endif
179	{	179	{
180	//qDebug("match %s %s %s", pattern.latin1(), (fieldIt)->value( it ).latin1(), (*fieldIt)->label().latin1() );	180	//qDebug("match %s %s %s", pattern.latin1(), (fieldIt)->value( it ).latin1(), (*fieldIt)->label().latin1() );
181	ContactListViewItem item = new ContactListViewItem(it, mListView, addressBook(), fields());	181	ContactListViewItem item = new ContactListViewItem(it, mListView, addressBook(), fields());
182	break;	182	break;
183	}	183	}