author | zautrix <zautrix> | 2005-10-28 03:41:01 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-10-28 03:41:01 (UTC) |
commit | d934f3fe2a62f6a696992335124c4434cd77d990 (patch) (unidiff) | |
tree | 88d33c54e3f8d08b09cf81f4cdbaeb7eb6a4bb9b /kabc/plugins | |
parent | f83a59cf4f9d0cff4111b6f5c88e88e6dc96e79e (diff) | |
download | kdepimpi-d934f3fe2a62f6a696992335124c4434cd77d990.zip kdepimpi-d934f3fe2a62f6a696992335124c4434cd77d990.tar.gz kdepimpi-d934f3fe2a62f6a696992335124c4434cd77d990.tar.bz2 |
and some bugs fixed
-rw-r--r-- | kabc/plugins/qtopia/qtopiaconverter.cpp | 8 | ||||
-rw-r--r-- | kabc/plugins/sharpdtm/sharpdtmconverter.cpp | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/kabc/plugins/qtopia/qtopiaconverter.cpp b/kabc/plugins/qtopia/qtopiaconverter.cpp index 39d366b..9693a68 100644 --- a/kabc/plugins/qtopia/qtopiaconverter.cpp +++ b/kabc/plugins/qtopia/qtopiaconverter.cpp | |||
@@ -202,11 +202,11 @@ bool QtopiaConverter::qtopiaToAddressee( const QDomElement& el, Addressee &adr ) | |||
202 | 202 | ||
203 | KABC::PhoneNumber businessPhoneNum( el.attribute( "BusinessPhone" ), | 203 | KABC::PhoneNumber businessPhoneNum( el.attribute( "BusinessPhone" ), |
204 | KABC::PhoneNumber::Work ); | 204 | KABC::PhoneNumber::Work | KABC::PhoneNumber::Pref ); |
205 | KABC::PhoneNumber businessFaxNum( el.attribute( "BusinessFax" ), | 205 | KABC::PhoneNumber businessFaxNum( el.attribute( "BusinessFax" ), |
206 | KABC::PhoneNumber::Work | KABC::PhoneNumber::Fax ); | 206 | KABC::PhoneNumber::Work | KABC::PhoneNumber::Fax ); |
207 | KABC::PhoneNumber businessMobile( el.attribute( "BusinessMobile" ), | 207 | KABC::PhoneNumber businessMobile( el.attribute( "BusinessMobile" ), |
208 | KABC::PhoneNumber::Work | KABC::PhoneNumber::Cell ); | 208 | KABC::PhoneNumber::Car ); |
209 | KABC::PhoneNumber businessPager( el.attribute( "BusinessPager" ), | 209 | KABC::PhoneNumber businessPager( el.attribute( "BusinessPager" ), |
210 | KABC::PhoneNumber::Work | KABC::PhoneNumber::Pager ); | 210 | KABC::PhoneNumber::Pager ); |
211 | if ( !businessPhoneNum.number().isEmpty() ) | 211 | if ( !businessPhoneNum.number().isEmpty() ) |
212 | adr.insertPhoneNumber( businessPhoneNum ); | 212 | adr.insertPhoneNumber( businessPhoneNum ); |
@@ -231,5 +231,5 @@ bool QtopiaConverter::qtopiaToAddressee( const QDomElement& el, Addressee &adr ) | |||
231 | 231 | ||
232 | KABC::PhoneNumber homePhoneNum( el.attribute( "HomePhone" ), | 232 | KABC::PhoneNumber homePhoneNum( el.attribute( "HomePhone" ), |
233 | KABC::PhoneNumber::Home ); | 233 | KABC::PhoneNumber::Home | KABC::PhoneNumber::Pref); |
234 | KABC::PhoneNumber homeFax( el.attribute( "HomeFax" ), | 234 | KABC::PhoneNumber homeFax( el.attribute( "HomeFax" ), |
235 | KABC::PhoneNumber::Home | KABC::PhoneNumber::Fax ); | 235 | KABC::PhoneNumber::Home | KABC::PhoneNumber::Fax ); |
diff --git a/kabc/plugins/sharpdtm/sharpdtmconverter.cpp b/kabc/plugins/sharpdtm/sharpdtmconverter.cpp index 4adcae4..3d429fa 100644 --- a/kabc/plugins/sharpdtm/sharpdtmconverter.cpp +++ b/kabc/plugins/sharpdtm/sharpdtmconverter.cpp | |||
@@ -133,5 +133,5 @@ bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBa | |||
133 | { | 133 | { |
134 | PhoneNumber homephone; | 134 | PhoneNumber homephone; |
135 | homephone.setType( PhoneNumber::Home ); | 135 | homephone.setType( PhoneNumber::Home | PhoneNumber::Pref ); |
136 | homephone.setNumber( db->readField(ZdbAdrs::HomePhone) ); | 136 | homephone.setNumber( db->readField(ZdbAdrs::HomePhone) ); |
137 | addr.insertPhoneNumber( homephone ); | 137 | addr.insertPhoneNumber( homephone ); |
@@ -149,5 +149,5 @@ bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBa | |||
149 | { | 149 | { |
150 | PhoneNumber homemobile; | 150 | PhoneNumber homemobile; |
151 | homemobile.setType( PhoneNumber::Home | PhoneNumber::Cell ); | 151 | homemobile.setType( PhoneNumber::Cell ); |
152 | homemobile.setNumber( db->readField(ZdbAdrs::HomeMobile) ); | 152 | homemobile.setNumber( db->readField(ZdbAdrs::HomeMobile) ); |
153 | addr.insertPhoneNumber( homemobile ); | 153 | addr.insertPhoneNumber( homemobile ); |
@@ -181,5 +181,5 @@ bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBa | |||
181 | { | 181 | { |
182 | PhoneNumber businessphone; | 182 | PhoneNumber businessphone; |
183 | businessphone.setType( PhoneNumber::Work ); | 183 | businessphone.setType( PhoneNumber::Work | PhoneNumber::Pref ); |
184 | businessphone.setNumber( db->readField(ZdbAdrs::BusinessPhone) ); | 184 | businessphone.setNumber( db->readField(ZdbAdrs::BusinessPhone) ); |
185 | addr.insertPhoneNumber( businessphone ); | 185 | addr.insertPhoneNumber( businessphone ); |
@@ -197,5 +197,5 @@ bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBa | |||
197 | { | 197 | { |
198 | PhoneNumber businessmobile; | 198 | PhoneNumber businessmobile; |
199 | businessmobile.setType( PhoneNumber::Work | PhoneNumber::Cell ); | 199 | businessmobile.setType( PhoneNumber::Car ); |
200 | businessmobile.setNumber( db->readField(ZdbAdrs::BusinessMobile) ); | 200 | businessmobile.setNumber( db->readField(ZdbAdrs::BusinessMobile) ); |
201 | addr.insertPhoneNumber( businessmobile ); | 201 | addr.insertPhoneNumber( businessmobile ); |
@@ -205,5 +205,5 @@ bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBa | |||
205 | { | 205 | { |
206 | PhoneNumber businesspager; | 206 | PhoneNumber businesspager; |
207 | businesspager.setType( PhoneNumber::Work | PhoneNumber::Pager ); | 207 | businesspager.setType( PhoneNumber::Pager ); |
208 | businesspager.setNumber( db->readField(ZdbAdrs::BusinessPager) ); | 208 | businesspager.setNumber( db->readField(ZdbAdrs::BusinessPager) ); |
209 | addr.insertPhoneNumber( businesspager ); | 209 | addr.insertPhoneNumber( businesspager ); |