summaryrefslogtreecommitdiffstats
path: root/kopete/protocols
diff options
context:
space:
mode:
Diffstat (limited to 'kopete/protocols')
-rw-r--r--kopete/protocols/groupwise/gwaccount.cpp2
-rw-r--r--kopete/protocols/groupwise/ui/gwcontactproperties.cpp2
-rw-r--r--kopete/protocols/groupwise/ui/gweditaccountwidget.cpp2
-rw-r--r--kopete/protocols/irc/ircaccount.cpp6
-rw-r--r--kopete/protocols/irc/libkirc/ksslsocket.cpp2
-rw-r--r--kopete/protocols/jabber/jabberaccount.cpp4
-rw-r--r--kopete/protocols/msn/msnnotifysocket.cpp2
-rw-r--r--kopete/protocols/msn/msnswitchboardsocket.cpp4
-rw-r--r--kopete/protocols/oscar/liboscar/chatservicetask.cpp2
9 files changed, 13 insertions, 13 deletions
diff --git a/kopete/protocols/groupwise/gwaccount.cpp b/kopete/protocols/groupwise/gwaccount.cpp
index 14489141..4820a0ff 100644
--- a/kopete/protocols/groupwise/gwaccount.cpp
+++ b/kopete/protocols/groupwise/gwaccount.cpp
@@ -346,7 +346,7 @@ void GroupWiseAccount::performConnectWithPassword( const TQString &password )
struct utsname utsBuf;
uname (&utsBuf);
m_client->setClientName ("Kopete");
- m_client->setClientVersion ( kapp->aboutData ()->version () );
+ m_client->setClientVersion ( tdeApp->aboutData ()->version () );
m_client->setOSName (TQString ("%1 %2").arg (utsBuf.sysname, 1).arg (utsBuf.release, 2));
kdDebug ( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << "Connecting to GroupWise server " << server() << ":" << port() << endl;
diff --git a/kopete/protocols/groupwise/ui/gwcontactproperties.cpp b/kopete/protocols/groupwise/ui/gwcontactproperties.cpp
index a9336845..d46c147c 100644
--- a/kopete/protocols/groupwise/ui/gwcontactproperties.cpp
+++ b/kopete/protocols/groupwise/ui/gwcontactproperties.cpp
@@ -137,7 +137,7 @@ void GroupWiseContactProperties::slotCopy()
kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << endl;
if ( m_propsWidget->m_propsView->currentItem() )
{
- TQClipboard *cb = kapp->clipboard();
+ TQClipboard *cb = tdeApp->clipboard();
cb->setText( m_propsWidget->m_propsView->currentItem()->text( 1 ) );
}
}
diff --git a/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp b/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp
index 64c638d9..7d2458cb 100644
--- a/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp
+++ b/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp
@@ -55,7 +55,7 @@ GroupWiseEditAccountWidget::GroupWiseEditAccountWidget( TQWidget* parent, Kopete
else
{
// look for a default server and port setting
- TDEConfig *config = kapp->config();
+ TDEConfig *config = tdeApp->config();
config->setGroup("GroupWise Messenger");
m_preferencesDialog->m_server->setText( config->readEntry( "DefaultServer" ) );
m_preferencesDialog->m_port->setValue( config->readNumEntry( "DefaultPort", 8300 ) );
diff --git a/kopete/protocols/irc/ircaccount.cpp b/kopete/protocols/irc/ircaccount.cpp
index 5175865a..f3a10f60 100644
--- a/kopete/protocols/irc/ircaccount.cpp
+++ b/kopete/protocols/irc/ircaccount.cpp
@@ -79,7 +79,7 @@ IRCAccount::IRCAccount(IRCProtocol *protocol, const TQString &accountId, const T
for( TQMap< TQString, TQString >::ConstIterator it = replies.begin(); it != replies.end(); ++it )
m_engine->addCustomCtcp( it.key(), it.data() );
- TQString version=i18n("Kopete IRC Plugin %1 [http://trinitydesktop.org]").arg(kapp->aboutData()->version());
+ TQString version=i18n("Kopete IRC Plugin %1 [http://trinitydesktop.org]").arg(tdeApp->aboutData()->version());
m_engine->setVersionString( version );
TQObject::connect(m_engine, TQ_SIGNAL(successfullyChangedNick(const TQString &, const TQString &)),
@@ -352,7 +352,7 @@ const TQString IRCAccount::defaultPart() const
{
TQString partMsg = configGroup()->readEntry(TQString::fromLatin1("defaultPart"));
if( partMsg.isEmpty() )
- return TQString::fromLatin1("Kopete %1 : http://trinitydesktop.org").arg( kapp->aboutData()->version() );
+ return TQString::fromLatin1("Kopete %1 : http://trinitydesktop.org").arg( tdeApp->aboutData()->version() );
return partMsg;
}
@@ -360,7 +360,7 @@ const TQString IRCAccount::defaultQuit() const
{
TQString quitMsg = configGroup()->readEntry(TQString::fromLatin1("defaultQuit"));
if( quitMsg.isEmpty() )
- return TQString::fromLatin1("Kopete %1 : http://trinitydesktop.org").arg(kapp->aboutData()->version());
+ return TQString::fromLatin1("Kopete %1 : http://trinitydesktop.org").arg(tdeApp->aboutData()->version());
return quitMsg;
}
diff --git a/kopete/protocols/irc/libkirc/ksslsocket.cpp b/kopete/protocols/irc/libkirc/ksslsocket.cpp
index 82440bbb..27e64b40 100644
--- a/kopete/protocols/irc/libkirc/ksslsocket.cpp
+++ b/kopete/protocols/irc/libkirc/ksslsocket.cpp
@@ -44,7 +44,7 @@ KSSLSocket::KSSLSocket() : KExtendedSocket()
{
d = new KSSLSocketPrivate;
d->kssl = 0;
- d->dcc = TDEApplication::kApplication()->dcopClient();
+ d->dcc = tdeApp->dcopClient();
d->cc = new KSSLCertificateCache;
d->cc->reload();
diff --git a/kopete/protocols/jabber/jabberaccount.cpp b/kopete/protocols/jabber/jabberaccount.cpp
index 4117bb3c..7616b925 100644
--- a/kopete/protocols/jabber/jabberaccount.cpp
+++ b/kopete/protocols/jabber/jabberaccount.cpp
@@ -366,13 +366,13 @@ void JabberAccount::connectWithPassword ( const TQString &password )
uname (&utsBuf);
m_jabberClient->setClientName ("Kopete");
- m_jabberClient->setClientVersion (kapp->aboutData ()->version ());
+ m_jabberClient->setClientVersion (tdeApp->aboutData ()->version ());
m_jabberClient->setOSName (TQString ("%1 %2").arg (utsBuf.sysname, 1).arg (utsBuf.release, 2));
}
// Set caps node information
m_jabberClient->setCapsNode(KOPETE_CAPS_NODE);
- m_jabberClient->setCapsVersion(kapp->aboutData()->version());
+ m_jabberClient->setCapsVersion(tdeApp->aboutData()->version());
// Set Disco Identity information
DiscoItem::Identity identity;
diff --git a/kopete/protocols/msn/msnnotifysocket.cpp b/kopete/protocols/msn/msnnotifysocket.cpp
index c29e6d8c..0ce7b95a 100644
--- a/kopete/protocols/msn/msnnotifysocket.cpp
+++ b/kopete/protocols/msn/msnnotifysocket.cpp
@@ -275,7 +275,7 @@ void MSNNotifySocket::parseCommand( const TQString &cmd, uint id, const TQString
sendCommand( "CVR", i18n( "MS Local code, see http://www.microsoft.com/globaldev/reference/oslocversion.mspx", "0x0409" ) +
" " + escape( utsBuf.sysname ) + " " + escape( utsBuf.release ) + " " + escape( utsBuf.machine ) + " Kopete " +
- escape( kapp->aboutData()->version() ) + " Kopete " + m_msnId );
+ escape( tdeApp->aboutData()->version() ) + " Kopete " + m_msnId );
*/
}
else if ( cmd == "CVR" ) //else if ( cmd == "INF" )
diff --git a/kopete/protocols/msn/msnswitchboardsocket.cpp b/kopete/protocols/msn/msnswitchboardsocket.cpp
index e60c01aa..4a77d907 100644
--- a/kopete/protocols/msn/msnswitchboardsocket.cpp
+++ b/kopete/protocols/msn/msnswitchboardsocket.cpp
@@ -481,7 +481,7 @@ void MSNSwitchBoardSocket::slotReadMessage( const TQByteArray &bytes )
TQCString message = TQString( "MIME-Version: 1.0\r\n"
"Content-Type: text/x-clientcaps\r\n"
- "Client-Name: Kopete/"+escape(kapp->aboutData()->version())+"\r\n"
+ "Client-Name: Kopete/"+escape(tdeApp->aboutData()->version())+"\r\n"
+JabberID+
"\r\n" ).utf8();
@@ -699,7 +699,7 @@ int MSNSwitchBoardSocket::sendMsg( const Kopete::Message &msg )
TQString UA;
if( config->readBoolEntry("SendClientInfo", true) )
{
- UA="User-Agent: Kopete/"+escape(kapp->aboutData()->version())+"\r\n";
+ UA="User-Agent: Kopete/"+escape(tdeApp->aboutData()->version())+"\r\n";
}
TQString head =
diff --git a/kopete/protocols/oscar/liboscar/chatservicetask.cpp b/kopete/protocols/oscar/liboscar/chatservicetask.cpp
index 3fb180d2..0eb9fb6c 100644
--- a/kopete/protocols/oscar/liboscar/chatservicetask.cpp
+++ b/kopete/protocols/oscar/liboscar/chatservicetask.cpp
@@ -63,7 +63,7 @@ void ChatServiceTask::onGo()
kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "sending '" << m_message.textArray() << "' to the "
<< m_room << " room" << endl;
Buffer* b = new Buffer();
- b->addDWord( TDEApplication::random() ); //use kapp since it's convenient
+ b->addDWord( TDEApplication::random() ); //use tdeApp since it's convenient
b->addDWord( TDEApplication::random() );
b->addWord( 0x0003 ); //this be message channel 3 mateys! arrr!!
b->addDWord( 0x00010000 ); //TLV 1 - this means it's a public message