diff options
Diffstat (limited to 'kopete/libkopete/kopeteprotocol.cpp')
| -rw-r--r-- | kopete/libkopete/kopeteprotocol.cpp | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/kopete/libkopete/kopeteprotocol.cpp b/kopete/libkopete/kopeteprotocol.cpp index e361abf6..3677cbe3 100644 --- a/kopete/libkopete/kopeteprotocol.cpp +++ b/kopete/libkopete/kopeteprotocol.cpp @@ -47,18 +47,18 @@ public: ContactPropertyTmpl mStickLastSeen; ContactPropertyTmpl mStickFullName; - Kopete::OnlineStatus accountNotConnectedStatus; + Kopete::OnlineStatus accountNotConnectedtqStatus; }; -Protocol::Protocol( KInstance *instance, TQObject *parent, const char *name ) -: Plugin( instance, parent, name ) +Protocol::Protocol( KInstance *instance, TQObject *tqparent, const char *name ) +: Plugin( instance, tqparent, name ) { d = new Private; d->mStickLastSeen = Global::Properties::self()->lastSeen(); d->mStickFullName = Global::Properties::self()->fullName(); d->unloading = false; d->capabilities = 0; - d->accountNotConnectedStatus = Kopete::OnlineStatus( Kopete::OnlineStatus::Unknown, 0, this, Kopete::OnlineStatus::AccountOffline, TQString::fromLatin1( "account_offline_overlay" ), i18n( "Account Offline" ) ); + d->accountNotConnectedtqStatus = Kopete::OnlineStatus( Kopete::OnlineStatus::Unknown, 0, this, Kopete::OnlineStatus::AccountOffline, TQString::tqfromLatin1( "account_offline_overlay" ), i18n( "Account Offline" ) ); } Protocol::~Protocol() @@ -87,9 +87,9 @@ void Protocol::setCapabilities( unsigned int capabilities ) } -Kopete::OnlineStatus Protocol::accountOfflineStatus() const +Kopete::OnlineStatus Protocol::accountOfflinetqStatus() const { - return d->accountNotConnectedStatus; + return d->accountNotConnectedtqStatus; } void Protocol::slotAccountOnlineStatusChanged( Contact *self ) @@ -174,11 +174,11 @@ void Protocol::slotMetaContactAboutToSave( MetaContact *metaContact ) // Preset the contactId and displayName, if the plugin doesn't want to save // them, or use its own format, it can call clear() on the provided list - sd[ TQString::fromLatin1( "contactId" ) ] = c->contactId(); + sd[ TQString::tqfromLatin1( "contactId" ) ] = c->contactId(); //TODO(nick) remove - sd[ TQString::fromLatin1( "displayName" ) ] = c->property(Global::Properties::self()->nickName()).value().toString(); + sd[ TQString::tqfromLatin1( "displayName" ) ] = c->property(Global::Properties::self()->nickName()).value().toString(); if(c->account()) - sd[ TQString::fromLatin1( "accountId" ) ] = c->account()->accountId(); + sd[ TQString::tqfromLatin1( "accountId" ) ] = c->account()->accountId(); // If there's an index field preset it too TQString index = c->protocol()->addressBookIndexField(); @@ -193,11 +193,11 @@ void Protocol::slotMetaContactAboutToSave( MetaContact *metaContact ) { // The Unicode chars E000-F800 are non-printable and reserved for // private use in applications. For more details, see also - // http://www.unicode.org/charts/PDF/UE000.pdf. + // http://www.tqunicode.org/charts/PDF/UE000.pdf. // Inside libkabc the use of TQChar( 0xE000 ) has been standardized // as separator for the string lists, use this also for the 'normal' // serialized data. - if( serializedData.contains( it.key() ) ) + if( serializedData.tqcontains( it.key() ) ) serializedData[ it.key() ] = serializedData[ it.key() ] + TQChar( 0xE000 ) + it.data(); else serializedData[ it.key() ] = it.data(); @@ -205,7 +205,7 @@ void Protocol::slotMetaContactAboutToSave( MetaContact *metaContact ) for( it = ad.begin(); it != ad.end(); ++it ) { - if( addressBookData.contains( it.key() ) ) + if( addressBookData.tqcontains( it.key() ) ) addressBookData[ it.key() ] = addressBookData[ it.key() ] + TQChar( 0xE000 ) + it.data(); else addressBookData[ it.key() ] = it.data(); @@ -226,13 +226,13 @@ void Protocol::slotMetaContactAboutToSave( MetaContact *metaContact ) // we can devise a better API, but with the constantly changing // requirements every time I learn more about kabc I'd better no touch // the API yet - Martijn - if( it.key().startsWith( TQString::fromLatin1( "messaging/" ) ) ) + if( it.key().startsWith( TQString::tqfromLatin1( "messaging/" ) ) ) { - metaContact->setAddressBookField( this, it.key(), TQString::fromLatin1( "All" ), it.data() ); + metaContact->setAddressBookField( this, it.key(), TQString::tqfromLatin1( "All" ), it.data() ); // kdDebug(14010) << k_funcinfo << "metaContact->setAddressBookField( " << this << ", " << it.key() << ", \"All\", " << it.data() << " );" << endl; } else - metaContact->setAddressBookField( this, TQString::fromLatin1( "kopete" ), it.key(), it.data() ); + metaContact->setAddressBookField( this, TQString::tqfromLatin1( "kopete" ), it.key(), it.data() ); } } @@ -250,7 +250,7 @@ void Protocol::deserialize( MetaContact *metaContact, const TQMap<TQString, TQSt serializedDataIterators[ it.key() ] = serializedData[ it.key() ].begin(); } - uint count = serializedData[TQString::fromLatin1("contactId")].count(); + uint count = serializedData[TQString::tqfromLatin1("contactId")].count(); // Prepare the independent entries to pass to the plugin's implementation for( uint i = 0; i < count ; i++ ) @@ -263,11 +263,11 @@ void Protocol::deserialize( MetaContact *metaContact, const TQMap<TQString, TQSt ++( serializedDataIt.data() ); } - const TQString& accountId=sd[ TQString::fromLatin1( "accountId" ) ]; + const TQString& accountId=sd[ TQString::tqfromLatin1( "accountId" ) ]; // myself was allowed in the contactlist in old version of kopete. // But if one keep it on the contactlist now, it may conflict witht he myself metacontact. // So ignore it - if(accountId == sd[ TQString::fromLatin1( "contactId" ) ] ) + if(accountId == sd[ TQString::tqfromLatin1( "contactId" ) ] ) { kdDebug( 14010 ) << k_funcinfo << "Myself contact was on the contactlist.xml for account " << accountId << ". Ignore it" << endl; continue; @@ -290,10 +290,10 @@ void Protocol::deserialize( MetaContact *metaContact, const TQMap<TQString, TQSt // hack in the serialize code. // Once this code is actually capable of talking to kabc this hack // should be removed ASAP! - Martijn - if( ( *fieldIt ).startsWith( TQString::fromLatin1( "messaging/" ) ) ) - ad[ *fieldIt ] = metaContact->addressBookField( this, *fieldIt, TQString::fromLatin1( "All" ) ); + if( ( *fieldIt ).startsWith( TQString::tqfromLatin1( "messaging/" ) ) ) + ad[ *fieldIt ] = metaContact->addressBookField( this, *fieldIt, TQString::tqfromLatin1( "All" ) ); else - ad[ *fieldIt ] = metaContact->addressBookField( this, TQString::fromLatin1( "kopete" ), *fieldIt ); + ad[ *fieldIt ] = metaContact->addressBookField( this, TQString::tqfromLatin1( "kopete" ), *fieldIt ); } // Check if we have an account id. If not we're deserializing a Kopete 0.6 contact @@ -305,7 +305,7 @@ void Protocol::deserialize( MetaContact *metaContact, const TQMap<TQString, TQSt TQDict<Account> accounts = AccountManager::self()->accounts( this ); if ( accounts.count() > 0 ) { - sd[ TQString::fromLatin1( "accountId" ) ] = TQDictIterator<Account>( accounts ).currentKey(); + sd[ TQString::tqfromLatin1( "accountId" ) ] = TQDictIterator<Account>( accounts ).currentKey(); } else { |