summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/jabber
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-31 04:15:04 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-31 04:15:04 +0000
commit7c879109a2117273f834ea194f8ddd55733cb737 (patch)
tree8239d760fdd52026c37d5fab10684cbb1c8fd5c1 /kopete/protocols/jabber
parent52c719697a3a46d48fa618d68b84d7d6bd7c524c (diff)
downloadtdenetwork-7c879109a2117273f834ea194f8ddd55733cb737.tar.gz
tdenetwork-7c879109a2117273f834ea194f8ddd55733cb737.zip
Fix remaining instances of tqStatus embedded in user visible strings
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1250385 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kopete/protocols/jabber')
-rw-r--r--kopete/protocols/jabber/jabberprotocol.cpp4
-rw-r--r--kopete/protocols/jabber/jabberresourcepool.cpp2
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/examples/call/status.h2
-rw-r--r--kopete/protocols/jabber/ui/dlgjabbersendraw.h2
4 files changed, 5 insertions, 5 deletions
diff --git a/kopete/protocols/jabber/jabberprotocol.cpp b/kopete/protocols/jabber/jabberprotocol.cpp
index abb119df..0b73f38b 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("jabberSubscriptiontqStatus", i18n ("Subscription"), TQString(), true, false),
- propAuthorizationtqStatus("jabberAuthorizationtqStatus", i18n ("Authorization tqStatus"), TQString(), true, false),
+ propSubscriptiontqStatus("jabberSubscriptionStatus", i18n ("Subscription"), TQString(), true, false),
+ propAuthorizationtqStatus("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()),
diff --git a/kopete/protocols/jabber/jabberresourcepool.cpp b/kopete/protocols/jabber/jabberresourcepool.cpp
index 4c84d535..cddffd64 100644
--- a/kopete/protocols/jabber/jabberresourcepool.cpp
+++ b/kopete/protocols/jabber/jabberresourcepool.cpp
@@ -32,7 +32,7 @@
* for a given JID can be found. It's an empty offline
* resource.
*/
-XMPP::Resource JabberResourcePool::EmptyResource ( "", XMPP::tqStatus ( "", "", 0, false ) );
+XMPP::Resource JabberResourcePool::EmptyResource ( "", XMPP::Status ( "", "", 0, false ) );
class JabberResourcePool::Private
{
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/status.h b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/status.h
index 2cb80ae2..264ed725 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/status.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/status.h
@@ -116,7 +116,7 @@ public:
std::string QuiettqStatus() const {
if (jid_.resource().find("Psi") != std::string::npos) {
if (status_ == "Online" ||
- status_.find("Auto tqStatus") != std::string::npos)
+ status_.find("Auto Status") != std::string::npos)
return STR_EMPTY;
}
if (jid_.resource().find("Gaim") != std::string::npos) {
diff --git a/kopete/protocols/jabber/ui/dlgjabbersendraw.h b/kopete/protocols/jabber/ui/dlgjabbersendraw.h
index cafd9b94..898ba739 100644
--- a/kopete/protocols/jabber/ui/dlgjabbersendraw.h
+++ b/kopete/protocols/jabber/ui/dlgjabbersendraw.h
@@ -28,7 +28,7 @@ class JabberClient;
* A dialog to send raw strings to the jabber server.
*
* It comes with a TQComboBox to choose some "template" strings
- * like "Availability tqStatus", "Subscription",...
+ * like "Availability Status", "Subscription",...
*
* @author Till Gerken <till@tantalo.net>
* @author Chris TenHarmsel <tenharmsel@users.sf.net>