-rw-r--r-- | kabc/addresseedialog.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/kabc/addresseedialog.cpp b/kabc/addresseedialog.cpp index eb9bfc9..ae67968 100644 --- a/kabc/addresseedialog.cpp +++ b/kabc/addresseedialog.cpp | |||
@@ -121,36 +121,40 @@ AddresseeDialog::AddresseeDialog( QWidget *parent, bool multiple ) : | |||
121 | 121 | ||
122 | AddresseeDialog::~AddresseeDialog() | 122 | AddresseeDialog::~AddresseeDialog() |
123 | { | 123 | { |
124 | } | 124 | } |
125 | 125 | ||
126 | void AddresseeDialog::loadAddressBook() | 126 | void AddresseeDialog::loadAddressBook() |
127 | { | 127 | { |
128 | mAddresseeList->clear(); | 128 | mAddresseeList->clear(); |
129 | mItemDict.clear(); | 129 | mItemDict.clear(); |
130 | if ( mAddresseeEdit->text().isEmpty() ) { | 130 | if ( mAddresseeEdit->text().isEmpty() ) { |
131 | AddressBook::Iterator it; | 131 | AddressBook::Iterator it; |
132 | for( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) { | 132 | for( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) { |
133 | if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") ) | ||
134 | continue; | ||
133 | new AddresseeItem( mAddresseeList, (*it) ); | 135 | new AddresseeItem( mAddresseeList, (*it) ); |
134 | } | 136 | } |
135 | return; | 137 | return; |
136 | } | 138 | } |
137 | //mAddresseeEdit->completionObject()->clear(); | 139 | //mAddresseeEdit->completionObject()->clear(); |
138 | QRegExp re; | 140 | QRegExp re; |
139 | re.setWildcard(true); // most people understand these better. | 141 | re.setWildcard(true); // most people understand these better. |
140 | re.setCaseSensitive(false); | 142 | re.setCaseSensitive(false); |
141 | re.setPattern( "*"+ mAddresseeEdit->text() + "*"); | 143 | re.setPattern( "*"+ mAddresseeEdit->text() + "*"); |
142 | 144 | ||
143 | AddressBook::Iterator it; | 145 | AddressBook::Iterator it; |
144 | for( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) { | 146 | for( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) { |
147 | if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") ) | ||
148 | continue; | ||
145 | QString name = (*it).familyName()+", "+ (*it).givenName(); | 149 | QString name = (*it).familyName()+", "+ (*it).givenName(); |
146 | if ( name.length() == 2 ) | 150 | if ( name.length() == 2 ) |
147 | name = (*it).realName(); | 151 | name = (*it).realName(); |
148 | name += (*it).preferredEmail(); | 152 | name += (*it).preferredEmail(); |
149 | #if QT_VERSION >= 300 | 153 | #if QT_VERSION >= 300 |
150 | if (re.search(name) != -1) | 154 | if (re.search(name) != -1) |
151 | #else | 155 | #else |
152 | if (re.match(name) != -1) | 156 | if (re.match(name) != -1) |
153 | #endif | 157 | #endif |
154 | AddresseeItem *item = new AddresseeItem( mAddresseeList, (*it) ); | 158 | AddresseeItem *item = new AddresseeItem( mAddresseeList, (*it) ); |
155 | } | 159 | } |
156 | } | 160 | } |