From 45f3927b0ffec2599bc0e1ce361c5386474a85f4 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 20 Feb 2013 16:26:45 -0600 Subject: Rename KABC namespace --- tdeabc/scripts/addressee.src.cpp | 10 +++++----- tdeabc/scripts/addressee.src.h | 6 +++--- tdeabc/scripts/field.src.cpp | 32 ++++++++++++++++---------------- 3 files changed, 24 insertions(+), 24 deletions(-) (limited to 'tdeabc/scripts') diff --git a/tdeabc/scripts/addressee.src.cpp b/tdeabc/scripts/addressee.src.cpp index 7514b4a1d..c090f7e4e 100644 --- a/tdeabc/scripts/addressee.src.cpp +++ b/tdeabc/scripts/addressee.src.cpp @@ -34,7 +34,7 @@ #include "addressee.h" -using namespace KABC; +using namespace TDEABC; static bool matchBinaryPattern( int value, int pattern ); @@ -42,7 +42,7 @@ template static bool listEquals( const TQValueList&, const TQValueList& ); static bool emailsEquals( const TQStringList&, const TQStringList& ); -KABC::SortMode *Addressee::mSortMode = 0; +TDEABC::SortMode *Addressee::mSortMode = 0; struct Addressee::AddresseeData : public TDEShared { @@ -1032,7 +1032,7 @@ bool Addressee::changed() const return mData->changed; } -void Addressee::setSortMode( KABC::SortMode *mode ) +void Addressee::setSortMode( TDEABC::SortMode *mode ) { mSortMode = mode; } @@ -1045,7 +1045,7 @@ bool Addressee::operator< ( const Addressee &addr ) return mSortMode->lesser( *this, addr ); } -TQDataStream &KABC::operator<<( TQDataStream &s, const Addressee &a ) +TQDataStream &TDEABC::operator<<( TQDataStream &s, const Addressee &a ) { if (!a.mData) return s; @@ -1061,7 +1061,7 @@ TQDataStream &KABC::operator<<( TQDataStream &s, const Addressee &a ) return s; } -TQDataStream &KABC::operator>>( TQDataStream &s, Addressee &a ) +TQDataStream &TDEABC::operator>>( TQDataStream &s, Addressee &a ) { if (!a.mData) return s; diff --git a/tdeabc/scripts/addressee.src.h b/tdeabc/scripts/addressee.src.h index 9cadfd41e..aa449112e 100644 --- a/tdeabc/scripts/addressee.src.h +++ b/tdeabc/scripts/addressee.src.h @@ -39,7 +39,7 @@ #include "sound.h" #include "timezone.h" -namespace KABC { +namespace TDEABC { class Resource; class Field; @@ -383,7 +383,7 @@ class KABC_EXPORT Addressee */ bool changed() const; - static void setSortMode( KABC::SortMode *mode ); + static void setSortMode( TDEABC::SortMode *mode ); bool operator< ( const Addressee &addr ); @@ -396,7 +396,7 @@ class KABC_EXPORT Addressee private: static AddresseeData* shared_null; static AddresseeData* makeSharedNull(); - static KABC::SortMode *mSortMode; + static TDEABC::SortMode *mSortMode; }; KABC_EXPORT TQDataStream &operator<<( TQDataStream &, const Addressee & ); diff --git a/tdeabc/scripts/field.src.cpp b/tdeabc/scripts/field.src.cpp index bec318880..a87d00679 100644 --- a/tdeabc/scripts/field.src.cpp +++ b/tdeabc/scripts/field.src.cpp @@ -25,7 +25,7 @@ #include "field.h" #include "address.h" -using namespace KABC; +using namespace TDEABC; class Field::FieldImpl { @@ -113,7 +113,7 @@ TQString Field::categoryLabel( int category ) } } -TQString Field::value( const KABC::Addressee &a ) +TQString Field::value( const TDEABC::Addressee &a ) { switch ( mImpl->fieldId() ) { --CASEVALUE-- @@ -213,7 +213,7 @@ TQString Field::value( const KABC::Addressee &a ) } } -bool Field::setValue( KABC::Addressee &a, const TQString &value ) +bool Field::setValue( TDEABC::Addressee &a, const TQString &value ) { switch ( mImpl->fieldId() ) { --CASESETVALUE-- @@ -261,84 +261,84 @@ bool Field::setValue( KABC::Addressee &a, const TQString &value ) } case FieldImpl::HomeAddressStreet: { - KABC::Address address = a.address( Address::Home ); + TDEABC::Address address = a.address( Address::Home ); address.setStreet( value ); a.insertAddress( address ); return true; } case FieldImpl::HomeAddressLocality: { - KABC::Address address = a.address( Address::Home ); + TDEABC::Address address = a.address( Address::Home ); address.setLocality( value ); a.insertAddress( address ); return true; } case FieldImpl::HomeAddressRegion: { - KABC::Address address = a.address( Address::Home ); + TDEABC::Address address = a.address( Address::Home ); address.setRegion( value ); a.insertAddress( address ); return true; } case FieldImpl::HomeAddressPostalCode: { - KABC::Address address = a.address( Address::Home ); + TDEABC::Address address = a.address( Address::Home ); address.setPostalCode( value ); a.insertAddress( address ); return true; } case FieldImpl::HomeAddressCountry: { - KABC::Address address = a.address( Address::Home ); + TDEABC::Address address = a.address( Address::Home ); address.setCountry( value ); a.insertAddress( address ); return true; } case FieldImpl::HomeAddressLabel: { - KABC::Address address = a.address( Address::Home ); + TDEABC::Address address = a.address( Address::Home ); address.setLabel( value ); a.insertAddress( address ); return true; } case FieldImpl::BusinessAddressStreet: { - KABC::Address address = a.address( Address::Work ); + TDEABC::Address address = a.address( Address::Work ); address.setStreet( value ); a.insertAddress( address ); return true; } case FieldImpl::BusinessAddressLocality: { - KABC::Address address = a.address( Address::Work ); + TDEABC::Address address = a.address( Address::Work ); address.setLocality( value ); a.insertAddress( address ); return true; } case FieldImpl::BusinessAddressRegion: { - KABC::Address address = a.address( Address::Work ); + TDEABC::Address address = a.address( Address::Work ); address.setRegion( value ); a.insertAddress( address ); return true; } case FieldImpl::BusinessAddressPostalCode: { - KABC::Address address = a.address( Address::Work ); + TDEABC::Address address = a.address( Address::Work ); address.setPostalCode( value ); a.insertAddress( address ); return true; } case FieldImpl::BusinessAddressCountry: { - KABC::Address address = a.address( Address::Work ); + TDEABC::Address address = a.address( Address::Work ); address.setCountry( value ); a.insertAddress( address ); return true; } case FieldImpl::BusinessAddressLabel: { - KABC::Address address = a.address( Address::Work ); + TDEABC::Address address = a.address( Address::Work ); address.setLabel( value ); a.insertAddress( address ); return true; @@ -354,7 +354,7 @@ bool Field::setValue( KABC::Addressee &a, const TQString &value ) } } -TQString Field::sortKey( const KABC::Addressee &a ) +TQString Field::sortKey( const TDEABC::Addressee &a ) { switch ( mImpl->fieldId() ) { --CASEVALUE-- -- cgit v1.2.1