Diffstat (limited to 'kaddressbook/views/kaddressbooktableview.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | kaddressbook/views/kaddressbooktableview.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/kaddressbook/views/kaddressbooktableview.cpp b/kaddressbook/views/kaddressbooktableview.cpp index b73ceaa..f4b008c 100644 --- a/kaddressbook/views/kaddressbooktableview.cpp +++ b/kaddressbook/views/kaddressbooktableview.cpp | |||
@@ -134,29 +134,25 @@ void KAddressBookTableView::reconstructListView() | |||
134 | mainLayout->addWidget( mListView ); | 134 | mainLayout->addWidget( mListView ); |
135 | mainLayout->activate(); | 135 | mainLayout->activate(); |
136 | mListView->show(); | 136 | mListView->show(); |
137 | } | 137 | } |
138 | 138 | ||
139 | void KAddressBookTableView::doSearch( const QString& s, KABC::Field *field ) | 139 | void KAddressBookTableView::doSearch( const QString& s, KABC::Field *field ) |
140 | { | 140 | { |
141 | mListView->clear(); | 141 | mListView->clear(); |
142 | if ( s.isEmpty() || s == "*" ) { | 142 | if ( s.isEmpty() || s == "*" ) { |
143 | refresh(); | 143 | refresh(); |
144 | return; | 144 | return; |
145 | } | 145 | } |
146 | QString pattern = s.lower()+"*"; | 146 | QRegExp re = getRegExp( s ); |
147 | QRegExp re; | ||
148 | re.setWildcard(true); // most people understand these better. | ||
149 | re.setCaseSensitive(false); | ||
150 | re.setPattern( pattern ); | ||
151 | if (!re.isValid()) | 147 | if (!re.isValid()) |
152 | return; | 148 | return; |
153 | KABC::Addressee::List addresseeList = addressees(); | 149 | KABC::Addressee::List addresseeList = addressees(); |
154 | KABC::Addressee::List::Iterator it; | 150 | KABC::Addressee::List::Iterator it; |
155 | if ( field ) { | 151 | if ( field ) { |
156 | for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) { | 152 | for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) { |
157 | if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") ) | 153 | if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") ) |
158 | continue; | 154 | continue; |
159 | #if QT_VERSION >= 0x030000 | 155 | #if QT_VERSION >= 0x030000 |
160 | if (re.search(field->value( *it ).lower()) == 0) | 156 | if (re.search(field->value( *it ).lower()) == 0) |
161 | #else | 157 | #else |
162 | if (re.match(field->value( *it ).lower()) != -1) | 158 | if (re.match(field->value( *it ).lower()) != -1) |