diff options
Diffstat (limited to 'kopete/libkopete/kopeteaccount.cpp')
| -rw-r--r-- | kopete/libkopete/kopeteaccount.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/kopete/libkopete/kopeteaccount.cpp b/kopete/libkopete/kopeteaccount.cpp index ab9d7624..e0f7cfd2 100644 --- a/kopete/libkopete/kopeteaccount.cpp +++ b/kopete/libkopete/kopeteaccount.cpp @@ -79,21 +79,21 @@ public: KConfigGroup *configGroup; uint connectionTry; TQString customIcon; - Kopete::OnlineStatus restoretqStatus; + Kopete::OnlineStatus restoreStatus; TQString restoreMessage; }; Account::Account( Protocol *parent, const TQString &accountId, const char *name ) : TQObject( parent, name ), d( new Private( parent, accountId ) ) { - d->configGroup=new KConfigGroup(KGlobal::config(), TQString::tqfromLatin1( "Account_%1_%2" ).tqarg( d->protocol->pluginId(), d->id )); + d->configGroup=new KConfigGroup(KGlobal::config(), TQString::fromLatin1( "Account_%1_%2" ).tqarg( d->protocol->pluginId(), d->id )); d->excludeconnect = d->configGroup->readBoolEntry( "ExcludeConnect", false ); d->color = d->configGroup->readColorEntry( "Color", &d->color ); d->customIcon = d->configGroup->readEntry( "Icon", TQString() ); d->priority = d->configGroup->readNumEntry( "Priority", 0 ); - d->restoretqStatus = Kopete::OnlineStatus::Online; + d->restoreStatus = Kopete::OnlineStatus::Online; d->restoreMessage = ""; TQObject::connect( &d->suppressStatusTimer, TQT_SIGNAL( timeout() ), @@ -118,8 +118,8 @@ Account::~Account() void Account::reconnect() { - kdDebug( 14010 ) << k_funcinfo << "account " << d->id << " restoreStatus " << d->restoretqStatus.status() << " restoreMessage " << d->restoreMessage << endl; - setOnlineStatus( d->restoretqStatus, d->restoreMessage ); + kdDebug( 14010 ) << k_funcinfo << "account " << d->id << " restoreStatus " << d->restoreStatus.status() << " restoreMessage " << d->restoreMessage << endl; + setOnlineStatus( d->restoreStatus, d->restoreMessage ); } void Account::disconnected( DisconnectReason reason ) @@ -361,10 +361,10 @@ bool Account::addContact(const TQString &contactId , MetaContact *parent, AddMod KActionMenu * Account::actionMenu() { //default implementation - KActionMenu *menu = new KActionMenu( accountId(), myself()->onlinetqStatus().iconFor( this ), this ); + KActionMenu *menu = new KActionMenu( accountId(), myself()->onlineStatus().iconFor( this ), this ); TQString nick = myself()->property( Kopete::Global::Properties::self()->nickName()).value().toString(); - menu->popupMenu()->insertTitle( myself()->onlinetqStatus().iconFor( myself() ), + menu->popupMenu()->insertTitle( myself()->onlineStatus().iconFor( myself() ), nick.isNull() ? accountLabel() : i18n( "%2 <%1>" ).tqarg( accountLabel(), nick ) ); @@ -383,7 +383,7 @@ bool Account::isConnected() const bool Account::isAway() const { - return d->myself && ( d->myself->onlinetqStatus().status() == Kopete::OnlineStatus::Away ); + return d->myself && ( d->myself->onlineStatus().status() == Kopete::OnlineStatus::Away ); } Contact * Account::myself() const @@ -417,12 +417,12 @@ void Account::setMyself( Contact *myself ) } void Account::slotOnlineStatusChanged( Contact * /* contact */, - const OnlineStatus &newtqStatus, const OnlineStatus &oldtqStatus ) + const OnlineStatus &newStatus, const OnlineStatus &oldStatus ) { - bool wasOffline = !oldtqStatus.isDefinitelyOnline(); - bool isOffline = !newtqStatus.isDefinitelyOnline(); + bool wasOffline = !oldStatus.isDefinitelyOnline(); + bool isOffline = !newStatus.isDefinitelyOnline(); - if ( wasOffline || newtqStatus.status() == OnlineStatus::Offline ) + if ( wasOffline || newStatus.status() == OnlineStatus::Offline ) { // Wait for five seconds until we treat status notifications for contacts // as unrelated to our own status change. @@ -437,19 +437,19 @@ void Account::slotOnlineStatusChanged( Contact * /* contact */, if ( !isOffline ) { - d->restoretqStatus = newtqStatus; + d->restoreStatus = newStatus; d->restoreMessage = myself()->property( Kopete::Global::Properties::self()->awayMessage() ).value().toString(); // kdDebug( 14010 ) << k_funcinfo << "account " << d->id << " restoreStatus " << d->restoreStatus.status() << " restoreMessage " << d->restoreMessage << endl; } /* kdDebug(14010) << k_funcinfo << "account " << d->id << " changed status. was " - << Kopete::OnlineStatus::statusTypeToString(oldtqStatus.status()) << ", is " - << Kopete::OnlineStatus::statusTypeToString(newtqStatus.status()) << endl;*/ + << Kopete::OnlineStatus::statusTypeToString(oldStatus.status()) << ", is " + << Kopete::OnlineStatus::statusTypeToString(newStatus.status()) << endl;*/ if ( wasOffline != isOffline ) emit isConnectedChanged(); } -void Account::setAllContactstqStatus( const Kopete::OnlineStatus &status ) +void Account::setAllContactsStatus( const Kopete::OnlineStatus &status ) { d->suppressStatusNotification = true; d->suppressStatusTimer.start( 5000, true ); @@ -462,7 +462,7 @@ void Account::setAllContactstqStatus( const Kopete::OnlineStatus &status ) void Account::slotContactPropertyChanged( Contact * /* contact */, const TQString &key, const TQVariant &old, const TQVariant &newVal ) { - if ( key == TQString::tqfromLatin1("awayMessage") && old != newVal && isConnected() ) + if ( key == TQString::fromLatin1("awayMessage") && old != newVal && isConnected() ) { d->restoreMessage = newVal.toString(); // kdDebug( 14010 ) << k_funcinfo << "account " << d->id << " restoreMessage " << d->restoreMessage << endl; @@ -550,7 +550,7 @@ TQString Account::pluginData( Plugin* /*plugin*/, const TQString &key ) const void Account::setAway(bool away, const TQString& reason) { - setOnlineStatus( OnlineStatusManager::self()->onlinetqStatus(protocol() , away ? OnlineStatusManager::Away : OnlineStatusManager::Online) , reason ); + setOnlineStatus( OnlineStatusManager::self()->onlineStatus(protocol() , away ? OnlineStatusManager::Away : OnlineStatusManager::Online) , reason ); } void Account::setCustomIcon( const TQString & i) |