summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/jabber/jabberprotocol.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2011-12-18 18:33:51 -0600
committerTimothy Pearson <[email protected]>2011-12-18 18:33:51 -0600
commit089118c18533dfa3e6ce5065dbebdd4db94051f1 (patch)
treece014fb2326a80fcfafa2362b7ff88486aa17c96 /kopete/protocols/jabber/jabberprotocol.cpp
parent83677e35509b4dafac63b76995652bdf3b49f209 (diff)
downloadtdenetwork-089118c18533dfa3e6ce5065dbebdd4db94051f1.tar.gz
tdenetwork-089118c18533dfa3e6ce5065dbebdd4db94051f1.zip
Rename old tq methods that no longer need a unique name
Diffstat (limited to 'kopete/protocols/jabber/jabberprotocol.cpp')
-rw-r--r--kopete/protocols/jabber/jabberprotocol.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/kopete/protocols/jabber/jabberprotocol.cpp b/kopete/protocols/jabber/jabberprotocol.cpp
index 0b73f38b..a7cf3a78 100644
--- a/kopete/protocols/jabber/jabberprotocol.cpp
+++ b/kopete/protocols/jabber/jabberprotocol.cpp
@@ -90,8 +90,8 @@ JabberProtocol::JabberProtocol (TQObject * parent, const char *name, const TQStr
propWorkPhone(Kopete::Global::Properties::self()->workPhone()),
propWorkMobilePhone(Kopete::Global::Properties::self()->workMobilePhone()),
propNickName(Kopete::Global::Properties::self()->nickName()),
- propSubscriptiontqStatus("jabberSubscriptionStatus", i18n ("Subscription"), TQString(), true, false),
- propAuthorizationtqStatus("jabberAuthorizationStatus", i18n ("Authorization Status"), TQString(), true, false),
+ propSubscriptionStatus("jabberSubscriptionStatus", i18n ("Subscription"), TQString(), true, false),
+ propAuthorizationStatus("jabberAuthorizationStatus", i18n ("Authorization Status"), TQString(), true, false),
propAvailableResources("jabberAvailableResources", i18n ("Available Resources"), "jabber_chatty", false, true),
propVCardCacheTimeStamp("jabberVCardCacheTimeStamp", i18n ("vCard Cache Timestamp"), TQString(), true, false, true),
propPhoto(Kopete::Global::Properties::self()->photo()),
@@ -304,42 +304,42 @@ Kopete::Contact *JabberProtocol::deserializeContact (Kopete::MetaContact * metaC
return account->contacts()[contactId];
}
-XMPP::tqStatus JabberProtocol::kosTotqStatus( const Kopete::OnlineStatus & status , const TQString & message )
+XMPP::Status JabberProtocol::kosToStatus( const Kopete::OnlineStatus & status , const TQString & message )
{
- XMPP::tqStatus xmpptqStatus ( "", message );
+ XMPP::Status xmppStatus ( "", message );
if( status.status() == Kopete::OnlineStatus::Offline )
{
- xmpptqStatus.setIsAvailable( false );
+ xmppStatus.setIsAvailable( false );
}
switch ( status.internalStatus () )
{
case JabberProtocol::JabberFreeForChat:
- xmpptqStatus.setShow ( "chat" );
+ xmppStatus.setShow ( "chat" );
break;
case JabberProtocol::JabberOnline:
- xmpptqStatus.setShow ( "" );
+ xmppStatus.setShow ( "" );
break;
case JabberProtocol::JabberAway:
- xmpptqStatus.setShow ( "away" );
+ xmppStatus.setShow ( "away" );
break;
case JabberProtocol::JabberXA:
- xmpptqStatus.setShow ( "xa" );
+ xmppStatus.setShow ( "xa" );
break;
case JabberProtocol::JabberDND:
- xmpptqStatus.setShow ( "dnd" );
+ xmppStatus.setShow ( "dnd" );
break;
case JabberProtocol::JabberInvisible:
- xmpptqStatus.setIsInvisible ( true );
+ xmppStatus.setIsInvisible ( true );
break;
}
- return xmpptqStatus;
+ return xmppStatus;
}
#include "jabberprotocol.moc"