summaryrefslogtreecommitdiffstats
path: root/kopete/protocols
diff options
context:
space:
mode:
Diffstat (limited to 'kopete/protocols')
-rw-r--r--kopete/protocols/gadu/gaduaccount.cpp4
-rw-r--r--kopete/protocols/groupwise/gwmessagemanager.cpp8
-rw-r--r--kopete/protocols/groupwise/gwprotocol.cpp2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.cpp2
-rw-r--r--kopete/protocols/irc/libkirc/kircengine.cpp6
-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
-rw-r--r--kopete/protocols/meanwhile/meanwhileaccount.cpp4
-rw-r--r--kopete/protocols/oscar/icq/icqaccount.cpp2
-rw-r--r--kopete/protocols/oscar/icq/icqcontact.cpp2
-rw-r--r--kopete/protocols/yahoo/libkyahoo/client.cpp2
-rw-r--r--kopete/protocols/yahoo/libkyahoo/ymsgprotocol.cpp6
-rw-r--r--kopete/protocols/yahoo/yahooaccount.cpp4
15 files changed, 26 insertions, 26 deletions
diff --git a/kopete/protocols/gadu/gaduaccount.cpp b/kopete/protocols/gadu/gaduaccount.cpp
index 8575aeed..52f13e08 100644
--- a/kopete/protocols/gadu/gaduaccount.cpp
+++ b/kopete/protocols/gadu/gaduaccount.cpp
@@ -395,8 +395,8 @@ GaduAccount::changetqStatus( const Kopete::OnlineStatus& status, const TQString&
unsigned int ns;
kdDebug(14100) << "##### change status #####" << endl;
- kdDebug(14100) << "### tqStatus = " << p->session_->isConnected() << endl;
- kdDebug(14100) << "### tqStatus description = \"" << descr << "\"" << endl;
+ kdDebug(14100) << "### Status = " << p->session_->isConnected() << endl;
+ kdDebug(14100) << "### Status description = \"" << descr << "\"" << endl;
// if change to not available, log off
if ( GG_S_NA( status.internalStatus() ) ) {
diff --git a/kopete/protocols/groupwise/gwmessagemanager.cpp b/kopete/protocols/groupwise/gwmessagemanager.cpp
index a9f0c816..424a1545 100644
--- a/kopete/protocols/groupwise/gwmessagemanager.cpp
+++ b/kopete/protocols/groupwise/gwmessagemanager.cpp
@@ -65,10 +65,10 @@ GroupWiseChatSession::GroupWiseChatSession(const Kopete::Contact* user, Kopete::
m_actionInvite = new KActionMenu( i18n( "&Invite" ), actionCollection() , "gwInvite" );
connect( m_actionInvite->popupMenu(), TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT(slotActionInviteAboutToShow() ) ) ;
- m_secure = new KAction( i18n( "Security tqStatus" ), "encrypted", KShortcut(), this, TQT_SLOT( slotShowSecurity() ), actionCollection(), "gwSecureChat" );
+ m_secure = new KAction( i18n( "Security Status" ), "encrypted", KShortcut(), this, TQT_SLOT( slotShowSecurity() ), actionCollection(), "gwSecureChat" );
m_secure->setToolTip( i18n( "Conversation is secure" ) );
- m_logging = new KAction( i18n( "Archiving tqStatus" ), "logchat", KShortcut(), this, TQT_SLOT( slotShowArchiving() ), actionCollection(), "gwLoggingChat" );
+ m_logging = new KAction( i18n( "Archiving Status" ), "logchat", KShortcut(), this, TQT_SLOT( slotShowArchiving() ), actionCollection(), "gwLoggingChat" );
updateArchiving();
setXMLFile("gwchatui.rc");
@@ -503,14 +503,14 @@ void GroupWiseChatSession::slotShowSecurity()
{
TQWidget * w = ( view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->tqtopLevelWidget() ) :
Kopete::UI::Global::mainWidget() );
- KMessageBox::queuedMessageBox( w, KMessageBox::Information, i18n( "This conversation is secured with SSL security." ), i18n("Security tqStatus" ) );
+ KMessageBox::queuedMessageBox( w, KMessageBox::Information, i18n( "This conversation is secured with SSL security." ), i18n("Security Status" ) );
}
void GroupWiseChatSession::slotShowArchiving()
{
TQWidget * w = ( view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->tqtopLevelWidget() ) :
Kopete::UI::Global::mainWidget() );
- KMessageBox::queuedMessageBox( w, KMessageBox::Information, i18n( "This conversation is being logged administratively." ), i18n("Archiving tqStatus" ) );
+ KMessageBox::queuedMessageBox( w, KMessageBox::Information, i18n( "This conversation is being logged administratively." ), i18n("Archiving Status" ) );
}
#include "gwmessagemanager.moc"
diff --git a/kopete/protocols/groupwise/gwprotocol.cpp b/kopete/protocols/groupwise/gwprotocol.cpp
index 4e139ce0..0b4d351a 100644
--- a/kopete/protocols/groupwise/gwprotocol.cpp
+++ b/kopete/protocols/groupwise/gwprotocol.cpp
@@ -61,7 +61,7 @@ GroupWiseProtocol::GroupWiseProtocol( TQObject* parent, const char *name, const
groupwiseUnknown ( Kopete::OnlineStatus::Unknown, 25, this, GroupWise::Unknown, "status_unknown",
i18n( "Unknown" ) ),
groupwiseInvalid ( Kopete::OnlineStatus::Unknown, 25, this, GroupWise::Invalid, "status_unknown",
- i18n( "Invalid tqStatus" ) ),
+ i18n( "Invalid Status" ) ),
groupwiseConnecting ( Kopete::OnlineStatus::Connecting, 25, this, 99, "groupwise_connecting",
i18n( "Connecting" ) ),
propGivenName( Kopete::Global::Properties::self()->firstName() ),
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.cpp
index 6feecc88..817df4a6 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.cpp
@@ -34,7 +34,7 @@ void SetStatusTask::status( tqStatus newtqStatus, const TQString &awayMessage, c
{
if ( newtqStatus > GroupWise::Invalid )
{
- setError( 1, "Invalid tqStatus" );
+ setError( 1, "Invalid Status" );
return;
}
diff --git a/kopete/protocols/irc/libkirc/kircengine.cpp b/kopete/protocols/irc/libkirc/kircengine.cpp
index da32d591..ac1fd698 100644
--- a/kopete/protocols/irc/libkirc/kircengine.cpp
+++ b/kopete/protocols/irc/libkirc/kircengine.cpp
@@ -195,16 +195,16 @@ void Engine::connectToServer(const TQString &host, TQ_UINT16 port, const TQStrin
kdDebug(14120) << "Sock status: " << m_sock->socketStatus() << endl;
if( !m_sock->setAddress(m_Host, m_Port) )
- kdDebug(14120) << k_funcinfo << "setAddress failed. tqStatus: " << m_sock->socketStatus() << endl;
+ kdDebug(14120) << k_funcinfo << "setAddress failed. Status: " << m_sock->socketStatus() << endl;
if( m_sock->startAsyncConnect() == 0 )
{
- kdDebug(14120) << k_funcinfo << "Success!. tqStatus: " << m_sock->socketStatus() << endl;
+ kdDebug(14120) << k_funcinfo << "Success!. Status: " << m_sock->socketStatus() << endl;
settqStatus(Connecting);
}
else
{
- kdDebug(14120) << k_funcinfo << "Failed. tqStatus: " << m_sock->socketStatus() << endl;
+ kdDebug(14120) << k_funcinfo << "Failed. Status: " << m_sock->socketStatus() << endl;
settqStatus(Disconnected);
}
}
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>
diff --git a/kopete/protocols/meanwhile/meanwhileaccount.cpp b/kopete/protocols/meanwhile/meanwhileaccount.cpp
index 805cba1b..d0fe10bc 100644
--- a/kopete/protocols/meanwhile/meanwhileaccount.cpp
+++ b/kopete/protocols/meanwhile/meanwhileaccount.cpp
@@ -138,9 +138,9 @@ KActionMenu * MeanwhileAccount::actionMenu()
menu->popupMenu()->insertSeparator();
#if 0
- menu->insert(new KAction(i18n("&Change tqStatus Message"), TQString(), 0,
+ menu->insert(new KAction(i18n("&Change Status Message"), TQString(), 0,
this, TQT_SLOT(meanwhileChangetqStatus()), this,
- "meanwhileChangetqStatus"));
+ "meanwhileChangeStatus"));
//infoPlugin->addCustomMenus(theMenu);
#endif
return menu;
diff --git a/kopete/protocols/oscar/icq/icqaccount.cpp b/kopete/protocols/oscar/icq/icqaccount.cpp
index ca53a294..245e365c 100644
--- a/kopete/protocols/oscar/icq/icqaccount.cpp
+++ b/kopete/protocols/oscar/icq/icqaccount.cpp
@@ -51,7 +51,7 @@ ICQMyselfContact::ICQMyselfContact( ICQAccount *acct ) : OscarMyselfContact( acc
void ICQMyselfContact::userInfoUpdated()
{
DWORD extendedtqStatus = details().extendedtqStatus();
- kdDebug( OSCAR_ICQ_DEBUG ) << k_funcinfo << "extendedtqStatus is " << TQString::number( extendedtqStatus, 16 ) << endl;
+ kdDebug( OSCAR_ICQ_DEBUG ) << k_funcinfo << "extendedStatus is " << TQString::number( extendedtqStatus, 16 ) << endl;
ICQ::Presence presence = ICQ::Presence::fromOscartqStatus( extendedtqStatus & 0xffff );
setOnlineStatus( presence.toOnlineStatus() );
setProperty( Kopete::Global::Properties::self()->awayMessage(), static_cast<ICQAccount*>( account() )->engine()->statusMessage() );
diff --git a/kopete/protocols/oscar/icq/icqcontact.cpp b/kopete/protocols/oscar/icq/icqcontact.cpp
index d5163db7..30563ae0 100644
--- a/kopete/protocols/oscar/icq/icqcontact.cpp
+++ b/kopete/protocols/oscar/icq/icqcontact.cpp
@@ -121,7 +121,7 @@ void ICQContact::userInfoUpdated( const TQString& contact, const UserDetails& de
if ( !isOnline() )
removeProperty( mProtocol->awayMessage );
- kdDebug( OSCAR_ICQ_DEBUG ) << k_funcinfo << "extendedtqStatus is " << details.extendedtqStatus() << endl;
+ kdDebug( OSCAR_ICQ_DEBUG ) << k_funcinfo << "extendedStatus is " << details.extendedtqStatus() << endl;
ICQ::Presence presence = ICQ::Presence::fromOscartqStatus( details.extendedtqStatus() & 0xffff );
setOnlineStatus( presence.toOnlineStatus() );
diff --git a/kopete/protocols/yahoo/libkyahoo/client.cpp b/kopete/protocols/yahoo/libkyahoo/client.cpp
index df261869..366b256e 100644
--- a/kopete/protocols/yahoo/libkyahoo/client.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/client.cpp
@@ -580,7 +580,7 @@ void Client::setPicturetqStatus( Yahoo::PicturetqStatus status )
if( d->pictureFlag == status )
return;
- kdDebug(YAHOO_RAW_DEBUG) << "Setting PicturetqStatus to: " << status << endl;
+ kdDebug(YAHOO_RAW_DEBUG) << "Setting PictureStatus to: " << status << endl;
d->pictureFlag = status;
SendPictureTask *spt = new SendPictureTask( d->root );
spt->setType( SendPictureTask::SendtqStatus );
diff --git a/kopete/protocols/yahoo/libkyahoo/ymsgprotocol.cpp b/kopete/protocols/yahoo/libkyahoo/ymsgprotocol.cpp
index d7a13b85..6cc99f24 100644
--- a/kopete/protocols/yahoo/libkyahoo/ymsgprotocol.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/ymsgprotocol.cpp
@@ -150,7 +150,7 @@ Transfer* YMSGProtocol::parse( const TQByteArray & packet, uint& bytes )
service = Yahoo::ServiceIddeAct;
break;
case (Yahoo::ServicetqStatus) :
- kdDebug(YAHOO_RAW_DEBUG) << " Parsed packet service - This means ServicetqStatus " << servicenum << endl;
+ kdDebug(YAHOO_RAW_DEBUG) << " Parsed packet service - This means ServiceStatus " << servicenum << endl;
service = Yahoo::ServicetqStatus;
break;
case (Yahoo::ServiceMessage) :
@@ -178,7 +178,7 @@ Transfer* YMSGProtocol::parse( const TQByteArray & packet, uint& bytes )
service = Yahoo::ServicePictureChecksum;
break;
case (Yahoo::ServicePicturetqStatus) :
- kdDebug(YAHOO_RAW_DEBUG) << " Parsed packet service - This means ServicePicturetqStatus " << servicenum << endl;
+ kdDebug(YAHOO_RAW_DEBUG) << " Parsed packet service - This means ServicePictureStatus " << servicenum << endl;
service = Yahoo::ServicePicturetqStatus;
break;
case (Yahoo::ServicePicture) :
@@ -298,7 +298,7 @@ Transfer* YMSGProtocol::parse( const TQByteArray & packet, uint& bytes )
service = Yahoo::ServiceComment;
break;
case (Yahoo::ServiceBuddytqStatus) :
- kdDebug(YAHOO_RAW_DEBUG) << " Parsed packet service - This means ServiceBuddytqStatus " << servicenum << endl;
+ kdDebug(YAHOO_RAW_DEBUG) << " Parsed packet service - This means ServiceBuddyStatus " << servicenum << endl;
service = Yahoo::ServiceBuddytqStatus;
break;
case (Yahoo::ServiceBuddyList) :
diff --git a/kopete/protocols/yahoo/yahooaccount.cpp b/kopete/protocols/yahoo/yahooaccount.cpp
index ecfb8139..eabf6fdd 100644
--- a/kopete/protocols/yahoo/yahooaccount.cpp
+++ b/kopete/protocols/yahoo/yahooaccount.cpp
@@ -140,7 +140,7 @@ void YahooAccount::setPort( int port )
void YahooAccount::slotGotqStatus( int status, const TQString &awayMessage)
{
- kdDebug(YAHOO_GEN_DEBUG) << "GotqStatus: " << status << " msg: " << awayMessage << endl;
+ kdDebug(YAHOO_GEN_DEBUG) << "GoStatus: " << status << " msg: " << awayMessage << endl;
if( !isConnected() )
{
connect( m_protocol->statusFromYahoo( status ) );
@@ -1034,7 +1034,7 @@ void YahooAccount::slotStatusChanged( const TQString &who, int stat, const TQStr
void YahooAccount::slotStealthStatusChanged( const TQString &who, Yahoo::StealthtqStatus state )
{
- //kdDebug(YAHOO_GEN_DEBUG) << "Stealth tqStatus of " << who << "changed to " << state;
+ //kdDebug(YAHOO_GEN_DEBUG) << "Stealth Status of " << who << "changed to " << state;
YahooContact* kc = contact( who );
if ( kc == NULL ) {
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-06 09:41:42 +0000