summaryrefslogtreecommitdiffstats
path: root/kopete/protocols
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-27 21:38:57 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-27 21:38:57 +0000
commit52c719697a3a46d48fa618d68b84d7d6bd7c524c (patch)
tree410544d599787f6a602d2069f2ab31c90a5c4585 /kopete/protocols
parentd7c69d672cd5b014eac2349c4f52e042ffa7e1ab (diff)
downloadtdenetwork-52c719697a3a46d48fa618d68b84d7d6bd7c524c.tar.gz
tdenetwork-52c719697a3a46d48fa618d68b84d7d6bd7c524c.zip
Fix a number of accidental tqStatus string conversions
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1249829 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kopete/protocols')
-rw-r--r--kopete/protocols/gadu/gadusession.cpp2
-rw-r--r--kopete/protocols/irc/ircprotocol.cpp2
-rw-r--r--kopete/protocols/jabber/jabberaccount.cpp2
-rw-r--r--kopete/protocols/meanwhile/meanwhileprotocol.cpp2
-rw-r--r--kopete/protocols/msn/msnprotocol.cpp2
5 files changed, 5 insertions, 5 deletions
diff --git a/kopete/protocols/gadu/gadusession.cpp b/kopete/protocols/gadu/gadusession.cpp
index 345fdd07..a9a84691 100644
--- a/kopete/protocols/gadu/gadusession.cpp
+++ b/kopete/protocols/gadu/gadusession.cpp
@@ -62,7 +62,7 @@ GaduSession::isConnected() const
int
GaduSession::status() const
{
- kdDebug(14100)<<"tqStatus = " << session_->status <<", initial = "<< session_->initial_status <<endl;
+ kdDebug(14100)<<"Status = " << session_->status <<", initial = "<< session_->initial_status <<endl;
if ( session_ ) {
return session_->status & ( ~GG_STATUS_FRIENDS_MASK );
}
diff --git a/kopete/protocols/irc/ircprotocol.cpp b/kopete/protocols/irc/ircprotocol.cpp
index a3906164..b60f5a58 100644
--- a/kopete/protocols/irc/ircprotocol.cpp
+++ b/kopete/protocols/irc/ircprotocol.cpp
@@ -147,7 +147,7 @@ IRCProtocol::IRCProtocol( TQObject *parent, const char *name, const TQStringList
0, this, Offline, TQString(), i18n("Offline"), i18n("Offline"), Kopete::OnlineStatusManager::Offline),
m_StatusUnknown(Kopete::OnlineStatus::Unknown,
- 999, this, 999, "status_unknown", i18n("tqStatus not available")),
+ 999, this, 999, "status_unknown", i18n("Status not available")),
propChannelTopic(TQString::tqfromLatin1("channelTopic"), i18n("Topic"), TQString(), false, true ),
propChannelMembers(TQString::tqfromLatin1("channelMembers"), i18n("Members")),
diff --git a/kopete/protocols/jabber/jabberaccount.cpp b/kopete/protocols/jabber/jabberaccount.cpp
index f3212f93..a86fc490 100644
--- a/kopete/protocols/jabber/jabberaccount.cpp
+++ b/kopete/protocols/jabber/jabberaccount.cpp
@@ -1017,7 +1017,7 @@ void JabberAccount::slotCSError ( int error )
/* Set presence (usually called by dialog widget). */
void JabberAccount::setPresence ( const XMPP::tqStatus &status )
{
- kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << "tqStatus: " << status.show () << ", Reason: " << status.status () << endl;
+ kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << "Status: " << status.show () << ", Reason: " << status.status () << endl;
// fetch input status
XMPP::tqStatus newtqStatus = status;
diff --git a/kopete/protocols/meanwhile/meanwhileprotocol.cpp b/kopete/protocols/meanwhile/meanwhileprotocol.cpp
index 5f9b4ce7..3347f6da 100644
--- a/kopete/protocols/meanwhile/meanwhileprotocol.cpp
+++ b/kopete/protocols/meanwhile/meanwhileprotocol.cpp
@@ -60,7 +60,7 @@ MeanwhileProtocol::MeanwhileProtocol(TQObject* parent, const char *name,
TQString(), i18n("Account Offline")),
statusMessage(TQString::tqfromLatin1("statusMessage"),
- i18n("tqStatus Message"), TQString(), false, true),
+ i18n("Status Message"), TQString(), false, true),
awayMessage(Kopete::Global::Properties::self()->awayMessage())
{
diff --git a/kopete/protocols/msn/msnprotocol.cpp b/kopete/protocols/msn/msnprotocol.cpp
index 26869ea7..407550f3 100644
--- a/kopete/protocols/msn/msnprotocol.cpp
+++ b/kopete/protocols/msn/msnprotocol.cpp
@@ -58,7 +58,7 @@ MSNProtocol::MSNProtocol( TQObject *parent, const char *name, const TQStringList
FLN( Kopete::OnlineStatus::Offline, 0, this, 7, TQString(), i18n( "Offline" ) , i18n( "&Offline" ), Kopete::OnlineStatusManager::Offline,Kopete::OnlineStatusManager::DisabledIfOffline ),
HDN( Kopete::OnlineStatus::Invisible, 3, this, 8, "contact_invisible_overlay", i18n( "Invisible" ) , i18n( "&Invisible" ), Kopete::OnlineStatusManager::Invisible ),
IDL( Kopete::OnlineStatus::Away, 10, this, 9, "contact_away_overlay", i18n( "Idle" ) , i18n( "&Idle" ), Kopete::OnlineStatusManager::Idle , Kopete::OnlineStatusManager::HideFromMenu ),
- UNK( Kopete::OnlineStatus::Unknown, 25, this, 0, "status_unknown", i18n( "tqStatus not available" ) ),
+ UNK( Kopete::OnlineStatus::Unknown, 25, this, 0, "status_unknown", i18n( "Status not available" ) ),
CNT( Kopete::OnlineStatus::Connecting, 2, this, 10,"msn_connecting", i18n( "Connecting" ) ),
propEmail(Kopete::Global::Properties::self()->emailAddress()),
propPhoneHome(Kopete::Global::Properties::self()->privatePhone()),