summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/irc
diff options
context:
space:
mode:
Diffstat (limited to 'kopete/protocols/irc')
-rw-r--r--kopete/protocols/irc/ircaccount.cpp4
-rw-r--r--kopete/protocols/irc/irccontactmanager.cpp2
-rw-r--r--kopete/protocols/irc/irctransferhandler.cpp12
-rw-r--r--kopete/protocols/irc/irctransferhandler.h2
-rw-r--r--kopete/protocols/irc/libkirc/ksslsocket.cpp12
-rw-r--r--kopete/protocols/irc/libkirc/ksslsocket.h2
-rw-r--r--kopete/protocols/irc/ui/irceditaccountwidget.cpp4
7 files changed, 19 insertions, 19 deletions
diff --git a/kopete/protocols/irc/ircaccount.cpp b/kopete/protocols/irc/ircaccount.cpp
index ffede29f..46e325ac 100644
--- a/kopete/protocols/irc/ircaccount.cpp
+++ b/kopete/protocols/irc/ircaccount.cpp
@@ -115,7 +115,7 @@ IRCAccount::IRCAccount(IRCProtocol *protocol, const TQString &accountId, const T
currentHost = 0;
- KConfigGroup *config = configGroup();
+ TDEConfigGroup *config = configGroup();
TQString networkName = netName;
if (networkName.isNull())
@@ -402,7 +402,7 @@ const TQStringList IRCAccount::connectCommands() const
void IRCAccount::setMessageDestinations( int serverNotices, int serverMessages,
int informationReplies, int errorMessages )
{
- KConfigGroup *config = configGroup();
+ TDEConfigGroup *config = configGroup();
config->writeEntry( "ServerNotices", serverNotices );
config->writeEntry( "ServerMessages", serverMessages );
config->writeEntry( "InformationReplies", informationReplies );
diff --git a/kopete/protocols/irc/irccontactmanager.cpp b/kopete/protocols/irc/irccontactmanager.cpp
index fb49e08e..84c88f39 100644
--- a/kopete/protocols/irc/irccontactmanager.cpp
+++ b/kopete/protocols/irc/irccontactmanager.cpp
@@ -70,7 +70,7 @@ IRCContactManager::IRCContactManager(const TQString &nickName, IRCAccount *accou
TQString timeoutPath = locate( "config", "kioslaverc" );
if( !timeoutPath.isEmpty() )
{
- KConfig config( timeoutPath );
+ TDEConfig config( timeoutPath );
socketTimeout = config.readNumEntry( "ReadTimeout", 15 ) * 1000;
}
diff --git a/kopete/protocols/irc/irctransferhandler.cpp b/kopete/protocols/irc/irctransferhandler.cpp
index e579e94a..5c676e52 100644
--- a/kopete/protocols/irc/irctransferhandler.cpp
+++ b/kopete/protocols/irc/irctransferhandler.cpp
@@ -138,14 +138,14 @@ void IRCTransferHandler::connectKopeteTransfer(Kopete::Transfer *kt, KIRC::Trans
// connect(kt, TQT_SIGNAL(destroyed()),
// t, TQT_SLOT(slotKopeteTransferDestroyed()));
- connect(kt, TQT_SIGNAL(result(KIO::Job *)),
- this , TQT_SLOT(kioresult(KIO::Job *)));
+ connect(kt, TQT_SIGNAL(result(TDEIO::Job *)),
+ this , TQT_SLOT(kioresult(TDEIO::Job *)));
t->initiate();
}
}
-void IRCTransferHandler::kioresult(KIO::Job *job)
+void IRCTransferHandler::kioresult(TDEIO::Job *job)
{
Kopete::Transfer *kt= (Kopete::Transfer *)job; // FIXME: move to *_cast
if(!kt)
@@ -158,9 +158,9 @@ void IRCTransferHandler::kioresult(KIO::Job *job)
{
case 0: // 0 means no error
break;
- case KIO::ERR_USER_CANCELED:
+ case TDEIO::ERR_USER_CANCELED:
kdDebug(14120) << k_funcinfo << "User canceled transfer." << endl;
- // KIO::buildErrorString form error don't provide a result string ...
+ // TDEIO::buildErrorString form error don't provide a result string ...
// if (t->)
// kt->userAbort(i18n("User canceled transfer."));
// else
@@ -168,7 +168,7 @@ void IRCTransferHandler::kioresult(KIO::Job *job)
break;
default:
kdDebug(14120) << k_funcinfo << "Transfer halted:" << kt->error() << endl;
-// kt->userAbort(KIO::buildErrorString(kt->error(), kt->fileName()));
+// kt->userAbort(TDEIO::buildErrorString(kt->error(), kt->fileName()));
break;
}
}
diff --git a/kopete/protocols/irc/irctransferhandler.h b/kopete/protocols/irc/irctransferhandler.h
index 60235e57..32618120 100644
--- a/kopete/protocols/irc/irctransferhandler.h
+++ b/kopete/protocols/irc/irctransferhandler.h
@@ -47,7 +47,7 @@ private slots:
void transferAccepted(Kopete::Transfer *kt, const TQString&file);
void transferRefused(const Kopete::FileTransferInfo &info);
- void kioresult(KIO::Job *job);
+ void kioresult(TDEIO::Job *job);
private:
IRCTransferHandler();
diff --git a/kopete/protocols/irc/libkirc/ksslsocket.cpp b/kopete/protocols/irc/libkirc/ksslsocket.cpp
index dbe0bfb2..153b8ba8 100644
--- a/kopete/protocols/irc/libkirc/ksslsocket.cpp
+++ b/kopete/protocols/irc/libkirc/ksslsocket.cpp
@@ -194,7 +194,7 @@ void KSSLSocket::showInfoDialog()
TQDataStream arg(data, IO_WriteOnly);
arg << "irc://" + peerAddress()->pretty() + ":" + port() << d->metaData;
d->dcc->call("kio_uiserver", "UIServer",
- "showSSLInfoDialog(TQString,KIO::MetaData)", data, ignoretype, ignore);
+ "showSSLInfoDialog(TQString,TDEIO::MetaData)", data, ignoretype, ignore);
}
}
@@ -217,14 +217,14 @@ TQString KSSLSocket::metaData( const TQString &key )
}
/*
-I basically copied the below from tcpKIO::SlaveBase.hpp, with some modificaions and formatting.
+I basically copied the below from tcpTDEIO::SlaveBase.hpp, with some modificaions and formatting.
* Copyright (C) 2000 Alex Zepeda <zipzippy@sonic.net
* Copyright (C) 2001-2003 George Staikos <staikos@kde.org>
* Copyright (C) 2001 Dawit Alemayehu <adawit@kde.org>
*/
-int KSSLSocket::messageBox( KIO::SlaveBase::MessageBoxType type, const TQString &text, const TQString &caption,
+int KSSLSocket::messageBox( TDEIO::SlaveBase::MessageBoxType type, const TQString &text, const TQString &caption,
const TQString &buttonYes, const TQString &buttonNo )
{
kdDebug(14120) << "messageBox " << type << " " << text << " - " << caption << buttonYes << buttonNo << endl;
@@ -371,7 +371,7 @@ int KSSLSocket::verifyCertificate()
TQString msg = i18n("The IP address of the host %1 "
"does not match the one the "
"certificate was issued to.");
- result = messageBox( KIO::SlaveBase::WarningYesNoCancel,
+ result = messageBox( TDEIO::SlaveBase::WarningYesNoCancel,
msg.arg(ourHost),
i18n("Server Authentication"),
i18n("&Details"),
@@ -381,7 +381,7 @@ int KSSLSocket::verifyCertificate()
{
TQString msg = i18n("The server certificate failed the "
"authenticity test (%1).");
- result = messageBox( KIO::SlaveBase::WarningYesNoCancel,
+ result = messageBox( TDEIO::SlaveBase::WarningYesNoCancel,
msg.arg(ourHost),
i18n("Server Authentication"),
i18n("&Details"),
@@ -400,7 +400,7 @@ int KSSLSocket::verifyCertificate()
rc = 1;
cp = KSSLCertificateCache::Accept;
doAddHost = true;
- result = messageBox( KIO::SlaveBase::WarningYesNo,
+ result = messageBox( TDEIO::SlaveBase::WarningYesNo,
i18n("Would you like to accept this "
"certificate forever without "
"being prompted?"),
diff --git a/kopete/protocols/irc/libkirc/ksslsocket.h b/kopete/protocols/irc/libkirc/ksslsocket.h
index 68196538..a036a71d 100644
--- a/kopete/protocols/irc/libkirc/ksslsocket.h
+++ b/kopete/protocols/irc/libkirc/ksslsocket.h
@@ -58,7 +58,7 @@ class KSSLSocket : public KExtendedSocket
private:
int verifyCertificate();
- int messageBox( KIO::SlaveBase::MessageBoxType type, const TQString &text,
+ int messageBox( TDEIO::SlaveBase::MessageBoxType type, const TQString &text,
const TQString &caption, const TQString &buttonYes, const TQString &buttonNo );
diff --git a/kopete/protocols/irc/ui/irceditaccountwidget.cpp b/kopete/protocols/irc/ui/irceditaccountwidget.cpp
index 1b268027..f09ea21e 100644
--- a/kopete/protocols/irc/ui/irceditaccountwidget.cpp
+++ b/kopete/protocols/irc/ui/irceditaccountwidget.cpp
@@ -75,7 +75,7 @@ IRCEditAccountWidget::IRCEditAccountWidget(IRCProtocol *proto, IRCAccount *ident
autoShowServerWindow->setChecked( account()->configGroup()->readBoolEntry("AutoShowServerWindow") );
autoConnect->setChecked( static_cast<Kopete::Account*>(account())->excludeConnect() );
- KConfigGroup *config = account()->configGroup();
+ TDEConfigGroup *config = account()->configGroup();
serverNotices->setCurrentItem( config->readNumEntry( "ServerNotices", IRCAccount::ServerWindow ) - 1 );
serverMessages->setCurrentItem( config->readNumEntry( "ServerMessages", IRCAccount::ServerWindow ) - 1 );
@@ -208,7 +208,7 @@ void IRCEditAccountWidget::slotAddCtcp()
TQString IRCEditAccountWidget::generateAccountId( const TQString &network )
{
- KConfig *config = TDEGlobal::config();
+ TDEConfig *config = TDEGlobal::config();
TQString nextId = network;
uint accountNumber = 1;