author | zautrix <zautrix> | 2005-01-26 12:45:38 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-01-26 12:45:38 (UTC) |
commit | 96fc3903cf690957d0242d7aa2894bd64800edcc (patch) (unidiff) | |
tree | 6d4f6f565ffc2a0e72a55a5e4ff3c7d6bb08cbe0 /kaddressbook/views | |
parent | ebe38bec081a9ab226ea0de7e38ac2377d6bd1c0 (diff) | |
download | kdepimpi-96fc3903cf690957d0242d7aa2894bd64800edcc.zip kdepimpi-96fc3903cf690957d0242d7aa2894bd64800edcc.tar.gz kdepimpi-96fc3903cf690957d0242d7aa2894bd64800edcc.tar.bz2 |
small fixes
-rw-r--r-- | kaddressbook/views/kaddressbooktableview.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kaddressbook/views/kaddressbooktableview.cpp b/kaddressbook/views/kaddressbooktableview.cpp index 69802a4..b73ceaa 100644 --- a/kaddressbook/views/kaddressbooktableview.cpp +++ b/kaddressbook/views/kaddressbooktableview.cpp | |||
@@ -156,48 +156,49 @@ 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()) != -1) |
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()) != -1) |
176 | #else | 176 | #else |
177 | if (re.match((*fieldIt)->value( *it ).lower()) != -1) | 177 | if (re.match((*fieldIt)->value( *it ).lower()) != -1) |
178 | #endif | 178 | #endif |
179 | { | 179 | { |
180 | //qDebug("match %s %s %s", pattern.latin1(), (*fieldIt)->value( *it ).latin1(), (*fieldIt)->label().latin1() ); | ||
180 | ContactListViewItem *item = new ContactListViewItem(*it, mListView, addressBook(), fields()); | 181 | ContactListViewItem *item = new ContactListViewItem(*it, mListView, addressBook(), fields()); |
181 | break; | 182 | break; |
182 | } | 183 | } |
183 | } | 184 | } |
184 | } | 185 | } |
185 | } | 186 | } |
186 | // Sometimes the background pixmap gets messed up when we add lots | 187 | // Sometimes the background pixmap gets messed up when we add lots |
187 | // of items. | 188 | // of items. |
188 | mListView->repaint(); | 189 | mListView->repaint(); |
189 | if ( mListView->firstChild() ) { | 190 | if ( mListView->firstChild() ) { |
190 | mListView->setCurrentItem ( mListView->firstChild() ); | 191 | mListView->setCurrentItem ( mListView->firstChild() ); |
191 | mListView->setSelected ( mListView->firstChild(), true ); | 192 | mListView->setSelected ( mListView->firstChild(), true ); |
192 | } | 193 | } |
193 | else | 194 | else |
194 | emit selected(QString::null); | 195 | emit selected(QString::null); |
195 | 196 | ||
196 | } | 197 | } |
197 | void KAddressBookTableView::writeConfig(KConfig *config) | 198 | void KAddressBookTableView::writeConfig(KConfig *config) |
198 | { | 199 | { |
199 | KAddressBookView::writeConfig(config); | 200 | KAddressBookView::writeConfig(config); |
200 | 201 | ||
201 | mListView->saveLayout(config, config->group()); | 202 | mListView->saveLayout(config, config->group()); |
202 | } | 203 | } |
203 | 204 | ||