From 47c8a359c5276062c4bc17f0e82410f29081b502 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:48:06 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1157648 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kopete/protocols/jabber/kioslave/jabberdisco.cpp | 32 ++++++++++++------------ kopete/protocols/jabber/kioslave/jabberdisco.h | 16 ++++++------ 2 files changed, 24 insertions(+), 24 deletions(-) (limited to 'kopete/protocols/jabber/kioslave') diff --git a/kopete/protocols/jabber/kioslave/jabberdisco.cpp b/kopete/protocols/jabber/kioslave/jabberdisco.cpp index a6775320..4ceeca09 100644 --- a/kopete/protocols/jabber/kioslave/jabberdisco.cpp +++ b/kopete/protocols/jabber/kioslave/jabberdisco.cpp @@ -22,8 +22,8 @@ #include "jabberdisco.h" #include -#include -#include +#include +#include #include #include #include @@ -32,7 +32,7 @@ #include #include "jabberclient.h" -JabberDiscoProtocol::JabberDiscoProtocol ( const QCString &pool_socket, const QCString &app_socket ) +JabberDiscoProtocol::JabberDiscoProtocol ( const TQCString &pool_socket, const TQCString &app_socket ) : KIO::SlaveBase ( "kio_jabberdisco", pool_socket, app_socket ) { kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << "Slave launched." << endl; @@ -51,13 +51,13 @@ JabberDiscoProtocol::~JabberDiscoProtocol () } -void JabberDiscoProtocol::setHost ( const QString &host, int port, const QString &user, const QString &pass ) +void JabberDiscoProtocol::setHost ( const TQString &host, int port, const TQString &user, const TQString &pass ) { kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << " Host " << host << ", port " << port << ", user " << user << endl; m_host = host; m_port = !port ? 5222 : port; - m_user = QString(user).replace ( "%", "@" ); + m_user = TQString(user).replace ( "%", "@" ); m_password = pass; } @@ -76,14 +76,14 @@ void JabberDiscoProtocol::openConnection () { m_jabberClient = new JabberClient; - QObject::connect ( m_jabberClient, SIGNAL ( csDisconnected () ), this, SLOT ( slotCSDisconnected () ) ); - QObject::connect ( m_jabberClient, SIGNAL ( csError ( int ) ), this, SLOT ( slotCSError ( int ) ) ); - QObject::connect ( m_jabberClient, SIGNAL ( tlsWarning ( int ) ), this, SLOT ( slotHandleTLSWarning ( int ) ) ); - QObject::connect ( m_jabberClient, SIGNAL ( connected () ), this, SLOT ( slotConnected () ) ); - QObject::connect ( m_jabberClient, SIGNAL ( error ( JabberClient::ErrorCode ) ), this, SLOT ( slotClientError ( JabberClient::ErrorCode ) ) ); - - QObject::connect ( m_jabberClient, SIGNAL ( debugMessage ( const QString & ) ), - this, SLOT ( slotClientDebugMessage ( const QString & ) ) ); + TQObject::connect ( m_jabberClient, TQT_SIGNAL ( csDisconnected () ), this, TQT_SLOT ( slotCSDisconnected () ) ); + TQObject::connect ( m_jabberClient, TQT_SIGNAL ( csError ( int ) ), this, TQT_SLOT ( slotCSError ( int ) ) ); + TQObject::connect ( m_jabberClient, TQT_SIGNAL ( tlsWarning ( int ) ), this, TQT_SLOT ( slotHandleTLSWarning ( int ) ) ); + TQObject::connect ( m_jabberClient, TQT_SIGNAL ( connected () ), this, TQT_SLOT ( slotConnected () ) ); + TQObject::connect ( m_jabberClient, TQT_SIGNAL ( error ( JabberClient::ErrorCode ) ), this, TQT_SLOT ( slotClientError ( JabberClient::ErrorCode ) ) ); + + TQObject::connect ( m_jabberClient, TQT_SIGNAL ( debugMessage ( const TQString & ) ), + this, TQT_SLOT ( slotClientDebugMessage ( const TQString & ) ) ); } else { @@ -102,7 +102,7 @@ void JabberDiscoProtocol::openConnection () // allow plaintext password authentication or not? m_jabberClient->setAllowPlainTextPassword ( false ); - switch ( m_jabberClient->connect ( XMPP::Jid ( m_user + QString("/") + "JabberBrowser" ), m_password ) ) + switch ( m_jabberClient->connect ( XMPP::Jid ( m_user + TQString("/") + "JabberBrowser" ), m_password ) ) { case JabberClient::NoTLS: // no SSL support, at the connecting stage this means the problem is client-side @@ -173,7 +173,7 @@ void JabberDiscoProtocol::mimetype ( const KURL &/*url*/ ) } -void JabberDiscoProtocol::slotClientDebugMessage ( const QString &msg ) +void JabberDiscoProtocol::slotClientDebugMessage ( const TQString &msg ) { kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << msg << endl; @@ -228,7 +228,7 @@ void JabberDiscoProtocol::slotConnected () case ListDir: // list a directory kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << "Listing directory..." << endl; discoTask = new XMPP::JT_DiscoItems ( m_jabberClient->rootTask () ); - connect ( discoTask, SIGNAL ( finished () ), this, SLOT ( slotQueryFinished () ) ); + connect ( discoTask, TQT_SIGNAL ( finished () ), this, TQT_SLOT ( slotQueryFinished () ) ); discoTask->get ( m_host ); discoTask->go ( true ); break; diff --git a/kopete/protocols/jabber/kioslave/jabberdisco.h b/kopete/protocols/jabber/kioslave/jabberdisco.h index f2f6d78d..ef6e75fa 100644 --- a/kopete/protocols/jabber/kioslave/jabberdisco.h +++ b/kopete/protocols/jabber/kioslave/jabberdisco.h @@ -20,9 +20,9 @@ #ifndef _JABBERDISCO_H_ #define _JABBERDISCO_H_ -#include -#include -#include +#include +#include +#include #include #include @@ -33,16 +33,16 @@ class JabberClient; -class JabberDiscoProtocol : public QObject, public KIO::SlaveBase +class JabberDiscoProtocol : public TQObject, public KIO::SlaveBase { Q_OBJECT public: - JabberDiscoProtocol ( const QCString &pool_socket, const QCString &app_socket ); + JabberDiscoProtocol ( const TQCString &pool_socket, const TQCString &app_socket ); virtual ~JabberDiscoProtocol (); - void setHost ( const QString &host, int port, const QString &user, const QString &pass ); + void setHost ( const TQString &host, int port, const TQString &user, const TQString &pass ); void openConnection (); void closeConnection (); @@ -56,7 +56,7 @@ public: void dispatchLoop (); private slots: - void slotClientDebugMessage ( const QString &msg ); + void slotClientDebugMessage ( const TQString &msg ); void slotHandleTLSWarning ( int validityResult ); void slotClientError ( JabberClient::ErrorCode errorCode ); void slotConnected (); @@ -68,7 +68,7 @@ private slots: private: enum CommandType { Get, ListDir }; - QString m_host, m_user, m_password; + TQString m_host, m_user, m_password; int m_port; KURL m_url; bool m_connected; -- cgit v1.2.1