diff options
Diffstat (limited to 'kmobile/devices/gnokii')
| -rw-r--r-- | kmobile/devices/gnokii/gnokii_mobile.cpp | 28 | ||||
| -rw-r--r-- | kmobile/devices/gnokii/gnokii_mobile.h | 6 |
2 files changed, 17 insertions, 17 deletions
diff --git a/kmobile/devices/gnokii/gnokii_mobile.cpp b/kmobile/devices/gnokii/gnokii_mobile.cpp index e5629f872..ceadf2416 100644 --- a/kmobile/devices/gnokii/gnokii_mobile.cpp +++ b/kmobile/devices/gnokii/gnokii_mobile.cpp @@ -357,12 +357,12 @@ static int gn_error2tdeio_error( gn_error err ) } } -static gn_error read_phone_entry_highlevel( int index, const gn_memory_type memtype, KABC::Addressee *a ) +static gn_error read_phone_entry_highlevel( int index, const gn_memory_type memtype, TDEABC::Addressee *a ) { gn_phonebook_entry entry; TQStringList addrlist; TQString s, country; - KABC::Address *addr; + TDEABC::Address *addr; gn_error error; // if (index > (memstat.used + memstat.free)) @@ -411,7 +411,7 @@ static gn_error read_phone_entry_highlevel( int index, const gn_memory_type memt a->setRevision(datetime); if (!entry.subentries_count) - a->insertPhoneNumber(KABC::PhoneNumber(entry.number, KABC::PhoneNumber::Work | KABC::PhoneNumber::Pref)); + a->insertPhoneNumber(TDEABC::PhoneNumber(entry.number, TDEABC::PhoneNumber::Work | TDEABC::PhoneNumber::Pref)); /* scan sub-entries */ if (entry.subentries_count) @@ -431,7 +431,7 @@ static gn_error read_phone_entry_highlevel( int index, const gn_memory_type memt break; case GN_PHONEBOOK_ENTRY_Postal: addrlist = TQStringList::split(',', s, true); - addr = new KABC::Address(KABC::Address::Work); + addr = new TDEABC::Address(TDEABC::Address::Work); switch (addrlist.count()) { case 4: addr->setStreet(addrlist[0].simplifyWhiteSpace()); addr->setLocality(addrlist[1].simplifyWhiteSpace()); @@ -457,18 +457,18 @@ static gn_error read_phone_entry_highlevel( int index, const gn_memory_type memt a->setNote(a->note()+s); break; case GN_PHONEBOOK_ENTRY_Number: - enum KABC::PhoneNumber::Types phonetype; + enum TDEABC::PhoneNumber::Types phonetype; switch (entry.subentries[n].number_type) { - case GN_PHONEBOOK_NUMBER_Mobile: phonetype = KABC::PhoneNumber::Cell; break; - case GN_PHONEBOOK_NUMBER_Fax: phonetype = KABC::PhoneNumber::Fax; break; + case GN_PHONEBOOK_NUMBER_Mobile: phonetype = TDEABC::PhoneNumber::Cell; break; + case GN_PHONEBOOK_NUMBER_Fax: phonetype = TDEABC::PhoneNumber::Fax; break; case GN_PHONEBOOK_NUMBER_General: - case GN_PHONEBOOK_NUMBER_Work: phonetype = KABC::PhoneNumber::Work; break; + case GN_PHONEBOOK_NUMBER_Work: phonetype = TDEABC::PhoneNumber::Work; break; default: - case GN_PHONEBOOK_NUMBER_Home: phonetype = KABC::PhoneNumber::Home; break; + case GN_PHONEBOOK_NUMBER_Home: phonetype = TDEABC::PhoneNumber::Home; break; } //if (s == entry.number) - // type = (KABC::PhoneNumber::Types) (phonetype | KABC::PhoneNumber::Pref); - a->insertPhoneNumber(KABC::PhoneNumber(s, phonetype)); + // type = (TDEABC::PhoneNumber::Types) (phonetype | TDEABC::PhoneNumber::Pref); + a->insertPhoneNumber(TDEABC::PhoneNumber(s, phonetype)); break; case GN_PHONEBOOK_ENTRY_URL: a->setUrl(s); @@ -577,7 +577,7 @@ int KMobileGnokii::numAddresses() if (m_numAddresses>0) { // initialize the addrList array m_addrList.clear(); - KABC::Addressee addr; + TDEABC::Addressee addr; for (int i=0; i<=m_numAddresses; i++) m_addrList.append(addr); } @@ -585,7 +585,7 @@ int KMobileGnokii::numAddresses() return m_numAddresses; } -int KMobileGnokii::readAddress( int index, KABC::Addressee &addr ) +int KMobileGnokii::readAddress( int index, TDEABC::Addressee &addr ) { PRINT_DEBUG << TQString("############ GET ADDRESS #%1\n").arg(index); // index is zero-based, but in gnokii the first address starts at 1 @@ -607,7 +607,7 @@ int KMobileGnokii::readAddress( int index, KABC::Addressee &addr ) return gn_error2tdeio_error(err); } -int KMobileGnokii::storeAddress( int, const KABC::Addressee &, bool ) +int KMobileGnokii::storeAddress( int, const TDEABC::Addressee &, bool ) { /* XXX: this is a read-only device */ return TDEIO::ERR_WRITE_ACCESS_DENIED; diff --git a/kmobile/devices/gnokii/gnokii_mobile.h b/kmobile/devices/gnokii/gnokii_mobile.h index 5ace3e0b9..cc55911c1 100644 --- a/kmobile/devices/gnokii/gnokii_mobile.h +++ b/kmobile/devices/gnokii/gnokii_mobile.h @@ -55,8 +55,8 @@ public: * Addressbook / Phonebook support */ int numAddresses(); - int readAddress( int index, KABC::Addressee &adr ); - int storeAddress( int index, const KABC::Addressee &adr, bool append = false ); + int readAddress( int index, TDEABC::Addressee &adr ); + int storeAddress( int index, const TDEABC::Addressee &adr, bool append = false ); /* * Calendar support @@ -88,7 +88,7 @@ private: TQString m_modelnr, m_connection, m_port, m_baud; int m_numAddresses; - KABC::Addressee::List m_addrList; + TDEABC::Addressee::List m_addrList; }; #endif |