summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/jabber/jabberbasecontact.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:59:34 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:59:34 -0600
commit83677e35509b4dafac63b76995652bdf3b49f209 (patch)
tree591f1dc22278addb439726c42896376b17bb42bd /kopete/protocols/jabber/jabberbasecontact.cpp
parent808e453c56036211f57482ed847d54aca01bba68 (diff)
downloadtdenetwork-83677e35509b4dafac63b76995652bdf3b49f209.tar.gz
tdenetwork-83677e35509b4dafac63b76995652bdf3b49f209.zip
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 808e453c56036211f57482ed847d54aca01bba68.
Diffstat (limited to 'kopete/protocols/jabber/jabberbasecontact.cpp')
-rw-r--r--kopete/protocols/jabber/jabberbasecontact.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/kopete/protocols/jabber/jabberbasecontact.cpp b/kopete/protocols/jabber/jabberbasecontact.cpp
index 5dac2e18..2ee8423e 100644
--- a/kopete/protocols/jabber/jabberbasecontact.cpp
+++ b/kopete/protocols/jabber/jabberbasecontact.cpp
@@ -129,19 +129,19 @@ void JabberBaseContact::updateContact ( const XMPP::RosterItem & item )
switch ( item.subscription().type () )
{
case XMPP::Subscription::None:
- setProperty ( protocol()->propSubscriptionStatus,
+ setProperty ( protocol()->propSubscriptiontqStatus,
i18n ( "You cannot see each others' status." ) );
break;
case XMPP::Subscription::To:
- setProperty ( protocol()->propSubscriptionStatus,
+ setProperty ( protocol()->propSubscriptiontqStatus,
i18n ( "You can see this contact's status but they cannot see your status." ) );
break;
case XMPP::Subscription::From:
- setProperty ( protocol()->propSubscriptionStatus,
+ setProperty ( protocol()->propSubscriptiontqStatus,
i18n ( "This contact can see your status but you cannot see their status." ) );
break;
case XMPP::Subscription::Both:
- setProperty ( protocol()->propSubscriptionStatus,
+ setProperty ( protocol()->propSubscriptiontqStatus,
i18n ( "You can see each others' status." ) );
break;
}
@@ -217,7 +217,7 @@ void JabberBaseContact::updateContact ( const XMPP::RosterItem & item )
setDontSync ( false );
//can't do it now because it's called from contructor at a point some virtual function are not available
- TQTimer::singleShot(0, this, TQT_SLOT(reevaluateStatus()));
+ TQTimer::singleShot(0, this, TQT_SLOT(reevaluatetqStatus()));
}
@@ -295,7 +295,7 @@ void JabberBaseContact::updateResourceList ()
setProperty ( protocol()->propAvailableResources, resourceListStr );
}
-void JabberBaseContact::reevaluateStatus ()
+void JabberBaseContact::reevaluatetqStatus ()
{
kdDebug (JABBER_DEBUG_GLOBAL) << k_funcinfo << "Determining new status for " << contactId () << endl;
@@ -390,7 +390,7 @@ void JabberBaseContact::serialize (TQMap < TQString, TQString > &serializedData,
// Contact id and display name are already set for us, only add the rest
serializedData["JID"] = mRosterItem.jid().full();
- serializedData["groups"] = mRosterItem.groups ().join (TQString::fromLatin1 (","));
+ serializedData["groups"] = mRosterItem.groups ().join (TQString::tqfromLatin1 (","));
}
void JabberBaseContact::slotUserInfo( )
@@ -414,7 +414,7 @@ void JabberBaseContact::setPropertiesFromVCard ( const XMPP::VCard &vCard )
// update vCard cache timestamp if this is not a temporary contact
if ( metaContact() && !metaContact()->isTemporary () )
{
- setProperty ( protocol()->propVCardCacheTimeStamp, TQDateTime::currentDateTime().toString ( Qt::ISODate ) );
+ setProperty ( protocol()->propVCardCacheTimeStamp, TQDateTime::tqcurrentDateTime().toString ( Qt::ISODate ) );
}