summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/groupwise/libgroupwise
diff options
context:
space:
mode:
Diffstat (limited to 'kopete/protocols/groupwise/libgroupwise')
-rw-r--r--kopete/protocols/groupwise/libgroupwise/chatroommanager.cpp6
-rw-r--r--kopete/protocols/groupwise/libgroupwise/client.cpp86
-rw-r--r--kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp26
-rw-r--r--kopete/protocols/groupwise/libgroupwise/privacymanager.cpp12
-rw-r--r--kopete/protocols/groupwise/libgroupwise/qcatlshandler.cpp12
-rw-r--r--kopete/protocols/groupwise/libgroupwise/safedelete.cpp2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/securestream.cpp40
-rw-r--r--kopete/protocols/groupwise/libgroupwise/task.cpp6
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.cpp4
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.cpp2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.cpp8
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp4
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.cpp2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.cpp6
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.cpp8
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.cpp6
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tests/clientstream_test.cpp10
-rw-r--r--kopete/protocols/groupwise/libgroupwise/userdetailsmanager.cpp4
18 files changed, 122 insertions, 122 deletions
diff --git a/kopete/protocols/groupwise/libgroupwise/chatroommanager.cpp b/kopete/protocols/groupwise/libgroupwise/chatroommanager.cpp
index 3ee9b947..bedf8d64 100644
--- a/kopete/protocols/groupwise/libgroupwise/chatroommanager.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/chatroommanager.cpp
@@ -52,7 +52,7 @@ void ChatroomManager::getChatrooms( bool refresh )
m_replace = !refresh;
SearchChatTask * sct = new SearchChatTask( m_client->rootTask() );
sct->search( ( refresh ? SearchChatTask::SinceLastSearch : SearchChatTask::FetchAll ) );
- connect( sct, TQT_SIGNAL( finished() ), TQT_SLOT( slotGotChatroomList() ) );
+ connect( sct, TQ_SIGNAL( finished() ), TQ_SLOT( slotGotChatroomList() ) );
sct->go( true );
}
@@ -80,7 +80,7 @@ void ChatroomManager::slotGotChatroomList()
void ChatroomManager::updateCounts()
{
ChatCountsTask * cct = new ChatCountsTask( m_client->rootTask() );
- connect( cct, TQT_SIGNAL( finished() ), TQT_SLOT( slotGotChatCounts() ) );
+ connect( cct, TQ_SIGNAL( finished() ), TQ_SLOT( slotGotChatCounts() ) );
cct->go( true );
}
@@ -108,7 +108,7 @@ void ChatroomManager::requestProperties( const TQString & displayName )
{
ChatPropertiesTask * cpt = new ChatPropertiesTask( m_client->rootTask() );
cpt->setChat( displayName );
- connect ( cpt, TQT_SIGNAL( finished() ), TQT_SLOT( slotGotChatProperties() ) );
+ connect ( cpt, TQ_SIGNAL( finished() ), TQ_SLOT( slotGotChatProperties() ) );
cpt->go( true );
}
}
diff --git a/kopete/protocols/groupwise/libgroupwise/client.cpp b/kopete/protocols/groupwise/libgroupwise/client.cpp
index 21c1b1d0..d9b5b385 100644
--- a/kopete/protocols/groupwise/libgroupwise/client.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/client.cpp
@@ -86,7 +86,7 @@ Client::Client(TQObject *par, uint protocolVersion )
d->protocolVersion = protocolVersion;
// Sends regular keepalives so the server knows we are still running
d->keepAliveTimer = new TQTimer( this );
- connect( d->keepAliveTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( sendKeepAlive() ) );
+ connect( d->keepAliveTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( sendKeepAlive() ) );
}
Client::~Client()
@@ -100,12 +100,12 @@ Client::~Client()
void Client::connectToServer( ClientStream *s, const NovellDN &server, bool auth )
{
d->stream = s;
- //connect(d->stream, TQT_SIGNAL(connected()), TQT_SLOT(streamConnected()));
- //connect(d->stream, TQT_SIGNAL(handshaken()), TQT_SLOT(streamHandshaken()));
- connect(d->stream, TQT_SIGNAL(error(int)), TQT_SLOT(streamError(int)));
- //connect(d->stream, TQT_SIGNAL(sslCertificateReady(const TQSSLCert &)), TQT_SLOT(streamSSLCertificateReady(const TQSSLCert &)));
- connect(d->stream, TQT_SIGNAL(readyRead()), TQT_SLOT(streamReadyRead()));
- //connect(d->stream, TQT_SIGNAL(closeFinished()), TQT_SLOT(streamCloseFinished()));
+ //connect(d->stream, TQ_SIGNAL(connected()), TQ_SLOT(streamConnected()));
+ //connect(d->stream, TQ_SIGNAL(handshaken()), TQ_SLOT(streamHandshaken()));
+ connect(d->stream, TQ_SIGNAL(error(int)), TQ_SLOT(streamError(int)));
+ //connect(d->stream, TQ_SIGNAL(sslCertificateReady(const TQSSLCert &)), TQ_SLOT(streamSSLCertificateReady(const TQSSLCert &)));
+ connect(d->stream, TQ_SIGNAL(readyRead()), TQ_SLOT(streamReadyRead()));
+ //connect(d->stream, TQ_SIGNAL(closeFinished()), TQ_SLOT(streamCloseFinished()));
d->stream->connectToServer(server, auth);
}
@@ -136,27 +136,27 @@ void Client::start( const TQString &host, const uint port, const TQString &userI
LoginTask * login = new LoginTask( d->root );
- connect( login, TQT_SIGNAL( gotMyself( const GroupWise::ContactDetails & ) ),
- this, TQT_SIGNAL( accountDetailsReceived( const GroupWise::ContactDetails & ) ) );
+ connect( login, TQ_SIGNAL( gotMyself( const GroupWise::ContactDetails & ) ),
+ this, TQ_SIGNAL( accountDetailsReceived( const GroupWise::ContactDetails & ) ) );
- connect( login, TQT_SIGNAL( gotFolder( const FolderItem & ) ),
- this, TQT_SIGNAL( folderReceived( const FolderItem & ) ) );
+ connect( login, TQ_SIGNAL( gotFolder( const FolderItem & ) ),
+ this, TQ_SIGNAL( folderReceived( const FolderItem & ) ) );
- connect( login, TQT_SIGNAL( gotContact( const ContactItem & ) ),
- this, TQT_SIGNAL( contactReceived( const ContactItem & ) ) );
+ connect( login, TQ_SIGNAL( gotContact( const ContactItem & ) ),
+ this, TQ_SIGNAL( contactReceived( const ContactItem & ) ) );
- connect( login, TQT_SIGNAL( gotContactUserDetails( const GroupWise::ContactDetails & ) ),
- this, TQT_SIGNAL( contactUserDetailsReceived( const GroupWise::ContactDetails & ) ) ) ;
+ connect( login, TQ_SIGNAL( gotContactUserDetails( const GroupWise::ContactDetails & ) ),
+ this, TQ_SIGNAL( contactUserDetailsReceived( const GroupWise::ContactDetails & ) ) ) ;
- connect( login, TQT_SIGNAL( gotPrivacySettings( bool, bool, const TQStringList &, const TQStringList & ) ),
- privacyManager(), TQT_SLOT( slotGotPrivacySettings( bool, bool, const TQStringList &, const TQStringList & ) ) );
+ connect( login, TQ_SIGNAL( gotPrivacySettings( bool, bool, const TQStringList &, const TQStringList & ) ),
+ privacyManager(), TQ_SLOT( slotGotPrivacySettings( bool, bool, const TQStringList &, const TQStringList & ) ) );
- connect( login, TQT_SIGNAL( gotCustomStatus( const GroupWise::CustomStatus & ) ),
- TQT_SLOT( lt_gotCustomStatus( const GroupWise::CustomStatus & ) ) );
+ connect( login, TQ_SIGNAL( gotCustomStatus( const GroupWise::CustomStatus & ) ),
+ TQ_SLOT( lt_gotCustomStatus( const GroupWise::CustomStatus & ) ) );
- connect( login, TQT_SIGNAL( gotKeepalivePeriod( int ) ), TQT_SLOT( lt_gotKeepalivePeriod( int ) ) );
+ connect( login, TQ_SIGNAL( gotKeepalivePeriod( int ) ), TQ_SLOT( lt_gotKeepalivePeriod( int ) ) );
- connect( login, TQT_SIGNAL( finished() ), this, TQT_SLOT( lt_loginFinished() ) );
+ connect( login, TQ_SIGNAL( finished() ), this, TQ_SLOT( lt_loginFinished() ) );
login->initialise();
login->go( true );
@@ -194,26 +194,26 @@ void Client::initialiseEventTasks()
{
// The StatusTask handles incoming status changes
StatusTask * st = new StatusTask( d->root ); // FIXME - add an additional EventRoot?
- connect( st, TQT_SIGNAL( gotStatus( const TQString &, TQ_UINT16, const TQString & ) ), TQT_SIGNAL( statusReceived( const TQString &, TQ_UINT16, const TQString & ) ) );
+ connect( st, TQ_SIGNAL( gotStatus( const TQString &, TQ_UINT16, const TQString & ) ), TQ_SIGNAL( statusReceived( const TQString &, TQ_UINT16, const TQString & ) ) );
// The ConferenceTask handles incoming conference events, messages, joins, leaves, etc
ConferenceTask * ct = new ConferenceTask( d->root );
- connect( ct, TQT_SIGNAL( message( const ConferenceEvent & ) ), TQT_SLOT( ct_messageReceived( const ConferenceEvent & ) ) );
- connect( ct, TQT_SIGNAL( typing( const ConferenceEvent & ) ), TQT_SIGNAL( contactTyping( const ConferenceEvent & ) ) );
- connect( ct, TQT_SIGNAL( notTyping( const ConferenceEvent & ) ), TQT_SIGNAL( contactNotTyping( const ConferenceEvent & ) ) );
- connect( ct, TQT_SIGNAL( joined( const ConferenceEvent & ) ), TQT_SIGNAL( conferenceJoinNotifyReceived( const ConferenceEvent & ) ) );
- connect( ct, TQT_SIGNAL( left( const ConferenceEvent & ) ), TQT_SIGNAL( conferenceLeft( const ConferenceEvent & ) ) );
- connect( ct, TQT_SIGNAL( invited( const ConferenceEvent & ) ), TQT_SIGNAL( invitationReceived( const ConferenceEvent & ) ) );
- connect( ct, TQT_SIGNAL( otherInvited( const ConferenceEvent & ) ), TQT_SIGNAL( inviteNotifyReceived( const ConferenceEvent & ) ) );
- connect( ct, TQT_SIGNAL( invitationDeclined( const ConferenceEvent & ) ), TQT_SIGNAL( invitationDeclined( const ConferenceEvent & ) ) );
- connect( ct, TQT_SIGNAL( closed( const ConferenceEvent & ) ), TQT_SIGNAL( conferenceClosed( const ConferenceEvent & ) ) );
- connect( ct, TQT_SIGNAL( autoReply( const ConferenceEvent & ) ), TQT_SIGNAL( autoReplyReceived( const ConferenceEvent & ) ) );
- connect( ct, TQT_SIGNAL( broadcast( const ConferenceEvent & ) ), TQT_SIGNAL( broadcastReceived( const ConferenceEvent & ) ) );
- connect( ct, TQT_SIGNAL( systemBroadcast( const ConferenceEvent & ) ), TQT_SIGNAL( systemBroadcastReceived( const ConferenceEvent & ) ) );
+ connect( ct, TQ_SIGNAL( message( const ConferenceEvent & ) ), TQ_SLOT( ct_messageReceived( const ConferenceEvent & ) ) );
+ connect( ct, TQ_SIGNAL( typing( const ConferenceEvent & ) ), TQ_SIGNAL( contactTyping( const ConferenceEvent & ) ) );
+ connect( ct, TQ_SIGNAL( notTyping( const ConferenceEvent & ) ), TQ_SIGNAL( contactNotTyping( const ConferenceEvent & ) ) );
+ connect( ct, TQ_SIGNAL( joined( const ConferenceEvent & ) ), TQ_SIGNAL( conferenceJoinNotifyReceived( const ConferenceEvent & ) ) );
+ connect( ct, TQ_SIGNAL( left( const ConferenceEvent & ) ), TQ_SIGNAL( conferenceLeft( const ConferenceEvent & ) ) );
+ connect( ct, TQ_SIGNAL( invited( const ConferenceEvent & ) ), TQ_SIGNAL( invitationReceived( const ConferenceEvent & ) ) );
+ connect( ct, TQ_SIGNAL( otherInvited( const ConferenceEvent & ) ), TQ_SIGNAL( inviteNotifyReceived( const ConferenceEvent & ) ) );
+ connect( ct, TQ_SIGNAL( invitationDeclined( const ConferenceEvent & ) ), TQ_SIGNAL( invitationDeclined( const ConferenceEvent & ) ) );
+ connect( ct, TQ_SIGNAL( closed( const ConferenceEvent & ) ), TQ_SIGNAL( conferenceClosed( const ConferenceEvent & ) ) );
+ connect( ct, TQ_SIGNAL( autoReply( const ConferenceEvent & ) ), TQ_SIGNAL( autoReplyReceived( const ConferenceEvent & ) ) );
+ connect( ct, TQ_SIGNAL( broadcast( const ConferenceEvent & ) ), TQ_SIGNAL( broadcastReceived( const ConferenceEvent & ) ) );
+ connect( ct, TQ_SIGNAL( systemBroadcast( const ConferenceEvent & ) ), TQ_SIGNAL( systemBroadcastReceived( const ConferenceEvent & ) ) );
// The ConnectionTask handles incoming connection events
ConnectionTask* cont = new ConnectionTask( d->root );
- connect( cont, TQT_SIGNAL( connectedElsewhere() ), TQT_SIGNAL( connectedElsewhere() ) );
+ connect( cont, TQ_SIGNAL( connectedElsewhere() ), TQ_SIGNAL( connectedElsewhere() ) );
}
void Client::setStatus( GroupWise::Status status, const TQString & reason, const TQString & autoReply )
@@ -221,7 +221,7 @@ void Client::setStatus( GroupWise::Status status, const TQString & reason, const
debug( TQString("Setting status to %1").arg( status ) );;
SetStatusTask * sst = new SetStatusTask( d->root );
sst->status( status, reason, autoReply );
- connect( sst, TQT_SIGNAL( finished() ), this, TQT_SLOT( sst_statusChanged() ) );
+ connect( sst, TQ_SIGNAL( finished() ), this, TQ_SLOT( sst_statusChanged() ) );
sst->go( true );
// TODO: set status change in progress flag
}
@@ -230,7 +230,7 @@ void Client::requestStatus( const TQString & userDN )
{
GetStatusTask * gst = new GetStatusTask( d->root );
gst->userDN( userDN );
- connect( gst, TQT_SIGNAL( gotStatus( const TQString &, TQ_UINT16, const TQString & ) ), TQT_SIGNAL( statusReceived( const TQString &, TQ_UINT16, const TQString & ) ) );
+ connect( gst, TQ_SIGNAL( gotStatus( const TQString &, TQ_UINT16, const TQString & ) ), TQ_SIGNAL( statusReceived( const TQString &, TQ_UINT16, const TQString & ) ) );
gst->go( true );
}
@@ -238,7 +238,7 @@ void Client::sendMessage( const TQStringList & addresseeDNs, const OutgoingMessa
{
SendMessageTask * smt = new SendMessageTask( d->root );
smt->message( addresseeDNs, message );
- connect( smt, TQT_SIGNAL( finished() ), TQT_SLOT( smt_messageSent() ) );
+ connect( smt, TQ_SIGNAL( finished() ), TQ_SLOT( smt_messageSent() ) );
smt->go( true );
}
@@ -259,15 +259,15 @@ void Client::createConference( const int clientId, const TQStringList & particip
{
CreateConferenceTask * cct = new CreateConferenceTask( d->root );
cct->conference( clientId, participants );
- connect( cct, TQT_SIGNAL( finished() ), TQT_SLOT( cct_conferenceCreated() ) );
+ connect( cct, TQ_SIGNAL( finished() ), TQ_SLOT( cct_conferenceCreated() ) );
cct->go( true );
}
void Client::requestDetails( const TQStringList & userDNs )
{
GetDetailsTask * gdt = new GetDetailsTask( d->root );
gdt->userDNs( userDNs );
- connect( gdt, TQT_SIGNAL( gotContactUserDetails( const GroupWise::ContactDetails & ) ),
- this, TQT_SIGNAL( contactUserDetailsReceived( const GroupWise::ContactDetails & ) ) );
+ connect( gdt, TQ_SIGNAL( gotContactUserDetails( const GroupWise::ContactDetails & ) ),
+ this, TQ_SIGNAL( contactUserDetailsReceived( const GroupWise::ContactDetails & ) ) );
gdt->go( true );
}
@@ -275,7 +275,7 @@ void Client::joinConference( const GroupWise::ConferenceGuid & guid )
{
JoinConferenceTask * jct = new JoinConferenceTask( d->root );
jct->join( guid );
- connect( jct, TQT_SIGNAL( finished() ), TQT_SLOT( jct_joinConfCompleted() ) );
+ connect( jct, TQ_SIGNAL( finished() ), TQ_SLOT( jct_joinConfCompleted() ) );
jct->go( true );
}
@@ -291,7 +291,7 @@ void Client::leaveConference( const GroupWise::ConferenceGuid & guid )
{
LeaveConferenceTask * lct = new LeaveConferenceTask( d->root );
lct->leave( guid );
- //connect( lct, TQT_SIGNAL( finished() ), TQT_SLOT( lct_leftConference() ) );
+ //connect( lct, TQ_SIGNAL( finished() ), TQ_SLOT( lct_leftConference() ) );
lct->go( true );
}
diff --git a/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp b/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp
index 0c395159..5dce23a6 100644
--- a/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp
@@ -149,13 +149,13 @@ ClientStream::ClientStream(Connector *conn, TLSHandler *tlsHandler, TQObject *pa
d = new Private;
d->mode = Client;
d->conn = conn;
- connect( d->conn, TQT_SIGNAL(connected()), TQT_SLOT(cr_connected()) );
- connect( d->conn, TQT_SIGNAL(error()), TQT_SLOT(cr_error()) );
- connect( &d->client, TQT_SIGNAL( outgoingData( const TQByteArray& ) ), TQT_SLOT ( cp_outgoingData( const TQByteArray & ) ) );
- connect( &d->client, TQT_SIGNAL( incomingData() ), TQT_SLOT ( cp_incomingData() ) );
+ connect( d->conn, TQ_SIGNAL(connected()), TQ_SLOT(cr_connected()) );
+ connect( d->conn, TQ_SIGNAL(error()), TQ_SLOT(cr_error()) );
+ connect( &d->client, TQ_SIGNAL( outgoingData( const TQByteArray& ) ), TQ_SLOT ( cp_outgoingData( const TQByteArray & ) ) );
+ connect( &d->client, TQ_SIGNAL( incomingData() ), TQ_SLOT ( cp_incomingData() ) );
d->noop_time = 0;
- connect(&d->noopTimer, TQT_SIGNAL(timeout()), TQT_SLOT(doNoop()));
+ connect(&d->noopTimer, TQ_SIGNAL(timeout()), TQ_SLOT(doNoop()));
d->tlsHandler = tlsHandler; // all the extra stuff happening in the larger ctor happens at connect time :)
}
@@ -446,17 +446,17 @@ void ClientStream::cp_incomingData()
void ClientStream::cr_connected()
{
d->bs = d->conn->stream();
- connect(d->bs, TQT_SIGNAL(connectionClosed()), TQT_SLOT(bs_connectionClosed()));
- connect(d->bs, TQT_SIGNAL(delayedCloseFinished()), TQT_SLOT(bs_delayedCloseFinished()));
+ connect(d->bs, TQ_SIGNAL(connectionClosed()), TQ_SLOT(bs_connectionClosed()));
+ connect(d->bs, TQ_SIGNAL(delayedCloseFinished()), TQ_SLOT(bs_delayedCloseFinished()));
TQByteArray spare = d->bs->read();
d->ss = new SecureStream(d->bs);
- connect(d->ss, TQT_SIGNAL(readyRead()), TQT_SLOT(ss_readyRead()));
- connect(d->ss, TQT_SIGNAL(bytesWritten(int)), TQT_SLOT(ss_bytesWritten(int)));
- connect(d->ss, TQT_SIGNAL(tlsHandshaken()), TQT_SLOT(ss_tlsHandshaken()));
- connect(d->ss, TQT_SIGNAL(tlsClosed()), TQT_SLOT(ss_tlsClosed()));
- connect(d->ss, TQT_SIGNAL(error(int)), TQT_SLOT(ss_error(int)));
+ connect(d->ss, TQ_SIGNAL(readyRead()), TQ_SLOT(ss_readyRead()));
+ connect(d->ss, TQ_SIGNAL(bytesWritten(int)), TQ_SLOT(ss_bytesWritten(int)));
+ connect(d->ss, TQ_SIGNAL(tlsHandshaken()), TQ_SLOT(ss_tlsHandshaken()));
+ connect(d->ss, TQ_SIGNAL(tlsClosed()), TQ_SLOT(ss_tlsClosed()));
+ connect(d->ss, TQ_SIGNAL(error(int)), TQ_SLOT(ss_error(int)));
//d->client.startDialbackOut("andbit.net", "im.pyxa.org");
//d->client.startServerOut(d->server);
@@ -585,7 +585,7 @@ void ClientStream::processNext()
{
if( !d->in.isEmpty() ) {
//d->in_rrsig = true;
- TQTimer::singleShot(0, this, TQT_SLOT(doReadyRead()));
+ TQTimer::singleShot(0, this, TQ_SLOT(doReadyRead()));
}
}
diff --git a/kopete/protocols/groupwise/libgroupwise/privacymanager.cpp b/kopete/protocols/groupwise/libgroupwise/privacymanager.cpp
index 4960310a..7d81b7ea 100644
--- a/kopete/protocols/groupwise/libgroupwise/privacymanager.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/privacymanager.cpp
@@ -97,7 +97,7 @@ void PrivacyManager::setDefaultAllow( bool allow )
{
PrivacyItemTask * pit = new PrivacyItemTask( m_client->rootTask() );
pit->defaultPolicy( !allow );
- connect( pit, TQT_SIGNAL( finished() ), TQT_SLOT( slotDefaultPolicyChanged() ) );
+ connect( pit, TQ_SIGNAL( finished() ), TQ_SLOT( slotDefaultPolicyChanged() ) );
pit->go( true );
}
@@ -105,7 +105,7 @@ void PrivacyManager::setDefaultDeny( bool deny )
{
PrivacyItemTask * pit = new PrivacyItemTask( m_client->rootTask() );
pit->defaultPolicy( deny);
- connect( pit, TQT_SIGNAL( finished() ), TQT_SLOT( slotDefaultPolicyChanged() ) );
+ connect( pit, TQ_SIGNAL( finished() ), TQ_SLOT( slotDefaultPolicyChanged() ) );
pit->go( true );
}
@@ -114,7 +114,7 @@ void PrivacyManager::addAllow( const TQString & dn )
// start off a CreatePrivacyItemTask
PrivacyItemTask * pit = new PrivacyItemTask( m_client->rootTask() );
pit->allow( dn );
- connect( pit, TQT_SIGNAL( finished() ), TQT_SLOT( slotAllowAdded() ) );
+ connect( pit, TQ_SIGNAL( finished() ), TQ_SLOT( slotAllowAdded() ) );
pit->go( true );
}
@@ -123,7 +123,7 @@ void PrivacyManager::addDeny( const TQString & dn )
// start off a CreatePrivacyItemTask
PrivacyItemTask * pit = new PrivacyItemTask( m_client->rootTask() );
pit->deny( dn );
- connect( pit, TQT_SIGNAL( finished() ), TQT_SLOT( slotDenyAdded() ) );
+ connect( pit, TQ_SIGNAL( finished() ), TQ_SLOT( slotDenyAdded() ) );
pit->go( true );
}
@@ -131,7 +131,7 @@ void PrivacyManager::removeAllow( const TQString & dn )
{
PrivacyItemTask * pit = new PrivacyItemTask( m_client->rootTask() );
pit->removeAllow( dn );
- connect( pit, TQT_SIGNAL( finished() ), TQT_SLOT( slotAllowRemoved() ) );
+ connect( pit, TQ_SIGNAL( finished() ), TQ_SLOT( slotAllowRemoved() ) );
pit->go( true );
}
@@ -140,7 +140,7 @@ void PrivacyManager::removeDeny( const TQString & dn )
// start off a CreatePrivacyItemTask
PrivacyItemTask * pit = new PrivacyItemTask( m_client->rootTask() );
pit->removeDeny( dn );
- connect( pit, TQT_SIGNAL( finished() ), TQT_SLOT( slotDenyRemoved() ) );
+ connect( pit, TQ_SIGNAL( finished() ), TQ_SLOT( slotDenyRemoved() ) );
pit->go( true );
}
diff --git a/kopete/protocols/groupwise/libgroupwise/qcatlshandler.cpp b/kopete/protocols/groupwise/libgroupwise/qcatlshandler.cpp
index 372d7d9a..d5d7aaa6 100644
--- a/kopete/protocols/groupwise/libgroupwise/qcatlshandler.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/qcatlshandler.cpp
@@ -35,11 +35,11 @@ TQCATLSHandler::TQCATLSHandler(TQCA::TLS *parent)
{
d = new Private;
d->tls = parent;
- connect(d->tls, TQT_SIGNAL(handshaken()), TQT_SLOT(tls_handshaken()));
- connect(d->tls, TQT_SIGNAL(readyRead()), TQT_SLOT(tls_readyRead()));
- connect(d->tls, TQT_SIGNAL(readyReadOutgoing(int)), TQT_SLOT(tls_readyReadOutgoing(int)));
- connect(d->tls, TQT_SIGNAL(closed()), TQT_SLOT(tls_closed()));
- connect(d->tls, TQT_SIGNAL(error(int)), TQT_SLOT(tls_error(int)));
+ connect(d->tls, TQ_SIGNAL(handshaken()), TQ_SLOT(tls_handshaken()));
+ connect(d->tls, TQ_SIGNAL(readyRead()), TQ_SLOT(tls_readyRead()));
+ connect(d->tls, TQ_SIGNAL(readyReadOutgoing(int)), TQ_SLOT(tls_readyReadOutgoing(int)));
+ connect(d->tls, TQ_SIGNAL(closed()), TQ_SLOT(tls_closed()));
+ connect(d->tls, TQ_SIGNAL(error(int)), TQ_SLOT(tls_error(int)));
d->state = 0;
d->err = -1;
}
@@ -70,7 +70,7 @@ void TQCATLSHandler::startClient(const TQString &host)
d->state = 0;
d->err = -1;
if(!d->tls->startClient(host))
- TQTimer::singleShot(0, this, TQT_SIGNAL(fail()));
+ TQTimer::singleShot(0, this, TQ_SIGNAL(fail()));
}
void TQCATLSHandler::write(const TQByteArray &a)
diff --git a/kopete/protocols/groupwise/libgroupwise/safedelete.cpp b/kopete/protocols/groupwise/libgroupwise/safedelete.cpp
index 9de147f0..2b466e68 100644
--- a/kopete/protocols/groupwise/libgroupwise/safedelete.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/safedelete.cpp
@@ -110,7 +110,7 @@ SafeDeleteLater::SafeDeleteLater()
{
list.setAutoDelete(true);
self = this;
- TQTimer::singleShot(0, this, TQT_SLOT(explode()));
+ TQTimer::singleShot(0, this, TQ_SLOT(explode()));
}
SafeDeleteLater::~SafeDeleteLater()
diff --git a/kopete/protocols/groupwise/libgroupwise/securestream.cpp b/kopete/protocols/groupwise/libgroupwise/securestream.cpp
index 656f7e43..10784d1c 100644
--- a/kopete/protocols/groupwise/libgroupwise/securestream.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/securestream.cpp
@@ -91,11 +91,11 @@ SecureLayer::SecureLayer(TQCA::TLS *t)
type = TLS;
p.tls = t;
init();
- connect(p.tls, TQT_SIGNAL(handshaken()), TQT_SLOT(tls_handshaken()));
- connect(p.tls, TQT_SIGNAL(readyRead()), TQT_SLOT(tls_readyRead()));
- connect(p.tls, TQT_SIGNAL(readyReadOutgoing(int)), TQT_SLOT(tls_readyReadOutgoing(int)));
- connect(p.tls, TQT_SIGNAL(closed()), TQT_SLOT(tls_closed()));
- connect(p.tls, TQT_SIGNAL(error(int)), TQT_SLOT(tls_error(int)));
+ connect(p.tls, TQ_SIGNAL(handshaken()), TQ_SLOT(tls_handshaken()));
+ connect(p.tls, TQ_SIGNAL(readyRead()), TQ_SLOT(tls_readyRead()));
+ connect(p.tls, TQ_SIGNAL(readyReadOutgoing(int)), TQ_SLOT(tls_readyReadOutgoing(int)));
+ connect(p.tls, TQ_SIGNAL(closed()), TQ_SLOT(tls_closed()));
+ connect(p.tls, TQ_SIGNAL(error(int)), TQ_SLOT(tls_error(int)));
}
SecureLayer::SecureLayer(TQCA::SASL *s)
@@ -103,9 +103,9 @@ SecureLayer::SecureLayer(TQCA::SASL *s)
type = SASL;
p.sasl = s;
init();
- connect(p.sasl, TQT_SIGNAL(readyRead()), TQT_SLOT(sasl_readyRead()));
- connect(p.sasl, TQT_SIGNAL(readyReadOutgoing(int)), TQT_SLOT(sasl_readyReadOutgoing(int)));
- connect(p.sasl, TQT_SIGNAL(error(int)), TQT_SLOT(sasl_error(int)));
+ connect(p.sasl, TQ_SIGNAL(readyRead()), TQ_SLOT(sasl_readyRead()));
+ connect(p.sasl, TQ_SIGNAL(readyReadOutgoing(int)), TQ_SLOT(sasl_readyReadOutgoing(int)));
+ connect(p.sasl, TQ_SIGNAL(error(int)), TQ_SLOT(sasl_error(int)));
}
#ifdef USE_TLSHANDLER
@@ -114,11 +114,11 @@ SecureLayer::SecureLayer(TLSHandler *t)
type = TLSH;
p.tlsHandler = t;
init();
- connect(p.tlsHandler, TQT_SIGNAL(success()), TQT_SLOT(tlsHandler_success()));
- connect(p.tlsHandler, TQT_SIGNAL(fail()), TQT_SLOT(tlsHandler_fail()));
- connect(p.tlsHandler, TQT_SIGNAL(closed()), TQT_SLOT(tlsHandler_closed()));
- connect(p.tlsHandler, TQT_SIGNAL(readyRead(const TQByteArray &)), TQT_SLOT(tlsHandler_readyRead(const TQByteArray &)));
- connect(p.tlsHandler, TQT_SIGNAL(readyReadOutgoing(const TQByteArray &, int)), TQT_SLOT(tlsHandler_readyReadOutgoing(const TQByteArray &, int)));
+ connect(p.tlsHandler, TQ_SIGNAL(success()), TQ_SLOT(tlsHandler_success()));
+ connect(p.tlsHandler, TQ_SIGNAL(fail()), TQ_SLOT(tlsHandler_fail()));
+ connect(p.tlsHandler, TQ_SIGNAL(closed()), TQ_SLOT(tlsHandler_closed()));
+ connect(p.tlsHandler, TQ_SIGNAL(readyRead(const TQByteArray &)), TQ_SLOT(tlsHandler_readyRead(const TQByteArray &)));
+ connect(p.tlsHandler, TQ_SIGNAL(readyReadOutgoing(const TQByteArray &, int)), TQ_SLOT(tlsHandler_readyReadOutgoing(const TQByteArray &, int)));
}
#endif
@@ -297,8 +297,8 @@ SecureStream::SecureStream(ByteStream *s)
d = new Private;
d->bs = s;
- connect(d->bs, TQT_SIGNAL(readyRead()), TQT_SLOT(bs_readyRead()));
- connect(d->bs, TQT_SIGNAL(bytesWritten(int)), TQT_SLOT(bs_bytesWritten(int)));
+ connect(d->bs, TQ_SIGNAL(readyRead()), TQ_SLOT(bs_readyRead()));
+ connect(d->bs, TQ_SIGNAL(bytesWritten(int)), TQ_SLOT(bs_bytesWritten(int)));
d->layers.setAutoDelete(true);
d->pending = 0;
@@ -313,11 +313,11 @@ SecureStream::~SecureStream()
void SecureStream::linkLayer(TQObject *s)
{
- connect(s, TQT_SIGNAL(tlsHandshaken()), TQT_SLOT(layer_tlsHandshaken()));
- connect(s, TQT_SIGNAL(tlsClosed(const TQByteArray &)), TQT_SLOT(layer_tlsClosed(const TQByteArray &)));
- connect(s, TQT_SIGNAL(readyRead(const TQByteArray &)), TQT_SLOT(layer_readyRead(const TQByteArray &)));
- connect(s, TQT_SIGNAL(needWrite(const TQByteArray &)), TQT_SLOT(layer_needWrite(const TQByteArray &)));
- connect(s, TQT_SIGNAL(error(int)), TQT_SLOT(layer_error(int)));
+ connect(s, TQ_SIGNAL(tlsHandshaken()), TQ_SLOT(layer_tlsHandshaken()));
+ connect(s, TQ_SIGNAL(tlsClosed(const TQByteArray &)), TQ_SLOT(layer_tlsClosed(const TQByteArray &)));
+ connect(s, TQ_SIGNAL(readyRead(const TQByteArray &)), TQ_SLOT(layer_readyRead(const TQByteArray &)));
+ connect(s, TQ_SIGNAL(needWrite(const TQByteArray &)), TQ_SLOT(layer_needWrite(const TQByteArray &)));
+ connect(s, TQ_SIGNAL(error(int)), TQ_SLOT(layer_error(int)));
}
int SecureStream::calcPrebytes() const
diff --git a/kopete/protocols/groupwise/libgroupwise/task.cpp b/kopete/protocols/groupwise/libgroupwise/task.cpp
index 547844d9..f206b6bb 100644
--- a/kopete/protocols/groupwise/libgroupwise/task.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/task.cpp
@@ -48,7 +48,7 @@ Task::Task(Task *parent)
d->transfer = 0;
d->client = parent->client();
d->id = client()->genUniqueId();
- connect(d->client, TQT_SIGNAL(disconnected()), TQT_SLOT(clientDisconnected()));
+ connect(d->client, TQ_SIGNAL(disconnected()), TQ_SLOT(clientDisconnected()));
}
Task::Task(Client *parent, bool)
@@ -57,7 +57,7 @@ Task::Task(Client *parent, bool)
init();
d->client = parent;
- connect(d->client, TQT_SIGNAL(disconnected()), TQT_SLOT(clientDisconnected()));
+ connect(d->client, TQ_SIGNAL(disconnected()), TQ_SLOT(clientDisconnected()));
}
Task::~Task()
@@ -173,7 +173,7 @@ void Task::onDisconnect()
d->statusString = tr("Disconnected");
// delay this so that tasks that react don't block the shutdown
- TQTimer::singleShot(0, this, TQT_SLOT(done()));
+ TQTimer::singleShot(0, this, TQ_SLOT(done()));
}
}
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.cpp
index c88e22b4..496af2cc 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.cpp
@@ -42,8 +42,8 @@ ConferenceTask::ConferenceTask( Task* parent )
registerEvent( GroupWise::ReceivedSystemBroadcast );
// listen to the UserDetailsManager telling us that user details are available
- connect( client()->userDetailsManager(), TQT_SIGNAL( gotContactDetails( const GroupWise::ContactDetails & ) ),
- TQT_SLOT( slotReceiveUserDetails( const GroupWise::ContactDetails & ) ) );
+ connect( client()->userDetailsManager(), TQ_SIGNAL( gotContactDetails( const GroupWise::ContactDetails & ) ),
+ TQ_SLOT( slotReceiveUserDetails( const GroupWise::ContactDetails & ) ) );
}
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.cpp
index d41db4a9..31c077f7 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.cpp
@@ -24,7 +24,7 @@
CreateContactInstanceTask::CreateContactInstanceTask(Task* parent) : NeedFolderTask(parent)
{
// make the client tell the client app (Kopete) when we receive a contact
- connect( this, TQT_SIGNAL( gotContactAdded( const ContactItem & ) ), client(), TQT_SIGNAL( contactReceived( const ContactItem & ) ) );
+ connect( this, TQ_SIGNAL( gotContactAdded( const ContactItem & ) ), client(), TQ_SIGNAL( contactReceived( const ContactItem & ) ) );
}
CreateContactInstanceTask::~CreateContactInstanceTask()
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.cpp
index 0d167236..2c3daf55 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.cpp
@@ -76,8 +76,8 @@ void CreateContactTask::onGo()
// the add contact action may cause other contacts' sequence numbers to change
// CreateContactInstanceTask signals these changes, so we propagate the signal via the Client, to the GroupWiseAccount
// This updates our local versions of those contacts using the same mechanism by which they are updated at login.
- connect( ccit, TQT_SIGNAL( gotContactAdded( const ContactItem & ) ), TQT_SLOT( slotContactAdded( const ContactItem & ) ) );
- connect( ccit, TQT_SIGNAL( finished() ), TQT_SLOT( slotCheckContactInstanceCreated() ) );
+ connect( ccit, TQ_SIGNAL( gotContactAdded( const ContactItem & ) ), TQ_SLOT( slotContactAdded( const ContactItem & ) ) );
+ connect( ccit, TQ_SIGNAL( finished() ), TQ_SLOT( slotCheckContactInstanceCreated() ) );
if ( (*it).id == 0 ) // caller asserts that this isn't on the server...
{
ccit->contactFromDNAndFolder( m_userId, m_displayName, m_firstSequenceNumber++, ( *it ).name );
@@ -92,8 +92,8 @@ void CreateContactTask::onGo()
{
client()->debug( " - contact is in top level folder " );
CreateContactInstanceTask * ccit = new CreateContactInstanceTask( client()->rootTask() );
- connect( ccit, TQT_SIGNAL( gotContactAdded( const ContactItem & ) ), TQT_SLOT( slotContactAdded( const ContactItem & ) ) );
- connect( ccit, TQT_SIGNAL( finished() ), TQT_SLOT( slotCheckContactInstanceCreated() ) );
+ connect( ccit, TQ_SIGNAL( gotContactAdded( const ContactItem & ) ), TQ_SLOT( slotContactAdded( const ContactItem & ) ) );
+ connect( ccit, TQ_SIGNAL( finished() ), TQ_SLOT( slotCheckContactInstanceCreated() ) );
ccit->contactFromDN( m_userId, m_displayName, 0 );
ccit->go( true );
}
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp
index b7b1f1cc..a606008e 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp
@@ -113,8 +113,8 @@ bool JoinConferenceTask::take( Transfer * transfer )
{
client()->debug( "JoinConferenceTask::slotReceiveUserDetails(), requesting details" );
connect( client()->userDetailsManager(),
- TQT_SIGNAL( gotContactDetails( const GroupWise::ContactDetails & ) ),
- TQT_SLOT( slotReceiveUserDetails( const GroupWise::ContactDetails & ) ) );
+ TQ_SIGNAL( gotContactDetails( const GroupWise::ContactDetails & ) ),
+ TQ_SLOT( slotReceiveUserDetails( const GroupWise::ContactDetails & ) ) );
client()->userDetailsManager()->requestDetails( m_unknowns );
}
}
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.cpp
index 4a24f44f..c70eb37e 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.cpp
@@ -25,7 +25,7 @@
MoveContactTask::MoveContactTask(Task* parent): NeedFolderTask(parent)
{
// make the client tell the client app (Kopete) when we receive a contact
- connect( this, TQT_SIGNAL( gotContactAdded( const ContactItem & ) ), client(), TQT_SIGNAL( contactReceived( const ContactItem & ) ) );
+ connect( this, TQ_SIGNAL( gotContactAdded( const ContactItem & ) ), client(), TQ_SIGNAL( contactReceived( const ContactItem & ) ) );
}
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.cpp
index 12c7382a..c1cb696c 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.cpp
@@ -27,9 +27,9 @@ void NeedFolderTask::createFolder()
{
CreateFolderTask * cct = new CreateFolderTask( client()->rootTask() );
cct->folder( 0, m_folderSequence, m_folderDisplayName );
- connect( cct, TQT_SIGNAL( gotFolderAdded( const FolderItem & ) ), client(), TQT_SIGNAL( folderReceived( const FolderItem & ) ) );
- connect( cct, TQT_SIGNAL( gotFolderAdded( const FolderItem & ) ), TQT_SLOT( slotFolderAdded( const FolderItem & ) ) );
- connect( cct, TQT_SIGNAL( finished() ), TQT_SLOT( slotFolderTaskFinished() ) );
+ connect( cct, TQ_SIGNAL( gotFolderAdded( const FolderItem & ) ), client(), TQ_SIGNAL( folderReceived( const FolderItem & ) ) );
+ connect( cct, TQ_SIGNAL( gotFolderAdded( const FolderItem & ) ), TQ_SLOT( slotFolderAdded( const FolderItem & ) ) );
+ connect( cct, TQ_SIGNAL( finished() ), TQ_SLOT( slotFolderTaskFinished() ) );
cct->go( true );
}
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.cpp
index 87694eb4..10a1ba82 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.cpp
@@ -75,7 +75,7 @@ bool SearchChatTask::take( Transfer * transfer )
m_objectId = sf->value().toInt();
// now start the results poll timer
- TQTimer::singleShot( GW_POLL_INITIAL_DELAY, this, TQT_SLOT( slotPollForResults() ) );
+ TQTimer::singleShot( GW_POLL_INITIAL_DELAY, this, TQ_SLOT( slotPollForResults() ) );
return true;
}
@@ -84,7 +84,7 @@ void SearchChatTask::slotPollForResults()
//create a PollSearchResultsTask
GetChatSearchResultsTask * gcsrt = new GetChatSearchResultsTask( client()->rootTask() );
gcsrt->poll( m_objectId );
- connect( gcsrt, TQT_SIGNAL( finished() ), TQT_SLOT( slotGotPollResults() ) );
+ connect( gcsrt, TQ_SIGNAL( finished() ), TQ_SLOT( slotGotPollResults() ) );
gcsrt->go( true );
}
@@ -97,14 +97,14 @@ void SearchChatTask::slotGotPollResults()
{
case GetChatSearchResultsTask::GettingData:
if ( m_polls < GW_POLL_MAXIMUM ) // restart timer
- TQTimer::singleShot( GW_POLL_FREQUENCY_MS, this, TQT_SLOT( slotPollForResults() ) );
+ TQTimer::singleShot( GW_POLL_FREQUENCY_MS, this, TQ_SLOT( slotPollForResults() ) );
else
setSuccess( gcsrt->statusCode() );
break;
case GetChatSearchResultsTask::DataRetrieved:
// got some results, there may be more.
m_results += gcsrt->results();
- TQTimer::singleShot( 0, this, TQT_SLOT( slotPollForResults() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( slotPollForResults() ) );
break;
case GetChatSearchResultsTask::Completed:
m_results += gcsrt->results();
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.cpp
index 1b64c47d..e968c75c 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.cpp
@@ -86,7 +86,7 @@ bool SearchUserTask::take( Transfer * transfer )
return true;
}
// now start the results poll timer
- TQTimer::singleShot( GW_POLL_INITIAL_DELAY, this, TQT_SLOT( slotPollForResults() ) );
+ TQTimer::singleShot( GW_POLL_INITIAL_DELAY, this, TQ_SLOT( slotPollForResults() ) );
return true;
}
@@ -95,7 +95,7 @@ void SearchUserTask::slotPollForResults()
//create a PollSearchResultsTask
PollSearchResultsTask * psrt = new PollSearchResultsTask( client()->rootTask() );
psrt->poll( m_queryHandle );
- connect( psrt, TQT_SIGNAL( finished() ), TQT_SLOT( slotGotPollResults() ) );
+ connect( psrt, TQ_SIGNAL( finished() ), TQ_SLOT( slotGotPollResults() ) );
psrt->go( true );
}
@@ -109,7 +109,7 @@ void SearchUserTask::slotGotPollResults()
case PollSearchResultsTask::Pending:
case PollSearchResultsTask::InProgess:
if ( m_polls < GW_POLL_MAXIMUM ) // restart timer
- TQTimer::singleShot( GW_POLL_FREQUENCY_MS, this, TQT_SLOT( slotPollForResults() ) );
+ TQTimer::singleShot( GW_POLL_FREQUENCY_MS, this, TQ_SLOT( slotPollForResults() ) );
else
setSuccess( psrt->statusCode() );
break;
diff --git a/kopete/protocols/groupwise/libgroupwise/tests/clientstream_test.cpp b/kopete/protocols/groupwise/libgroupwise/tests/clientstream_test.cpp
index aae0205c..0bb0ed1a 100644
--- a/kopete/protocols/groupwise/libgroupwise/tests/clientstream_test.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tests/clientstream_test.cpp
@@ -12,15 +12,15 @@ ClientStreamTest::ClientStreamTest(int argc, char ** argv) : TQApplication( argc
myTLSHandler = new TQCATLSHandler( myTLS );
myTestObject = new ClientStream( myConnector, myTLSHandler, 0);
// notify when the transport layer is connected
- connect( myTestObject, TQT_SIGNAL( connected() ), TQT_SLOT( slotConnected() ) );
+ connect( myTestObject, TQ_SIGNAL( connected() ), TQ_SLOT( slotConnected() ) );
// it's necessary to catch this signal and tell the TLS handler to proceed, even if we don't check cert validity
- connect( myTLSHandler, TQT_SIGNAL(tlsHandshaken()), TQT_SLOT(slotTLSHandshaken()) );
+ connect( myTLSHandler, TQ_SIGNAL(tlsHandshaken()), TQ_SLOT(slotTLSHandshaken()) );
// notify and start sending
- connect( myTestObject, TQT_SIGNAL( securityLayerActivated(int) ), TQT_SLOT( slotSend(int) ) );
- connect( myTestObject, TQT_SIGNAL( warning(int) ), TQT_SLOT( slotWarning(int) ) );
+ connect( myTestObject, TQ_SIGNAL( securityLayerActivated(int) ), TQ_SLOT( slotSend(int) ) );
+ connect( myTestObject, TQ_SIGNAL( warning(int) ), TQ_SLOT( slotWarning(int) ) );
// do test once the event loop is running
- TQTimer::singleShot( 0, this, TQT_SLOT( slotDoTest() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( slotDoTest() ) );
}
ClientStreamTest::~ClientStreamTest()
diff --git a/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.cpp b/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.cpp
index d0605239..ae52ca84 100644
--- a/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.cpp
@@ -97,8 +97,8 @@ void UserDetailsManager::requestDetails( const TQStringList & dnList, bool onlyU
{
GetDetailsTask * gdt = new GetDetailsTask( m_client->rootTask() );
gdt->userDNs( requestList );
- connect( gdt, TQT_SIGNAL( gotContactUserDetails( const GroupWise::ContactDetails & ) ),
- TQT_SLOT( slotReceiveContactDetails( const GroupWise::ContactDetails & ) ) );
+ connect( gdt, TQ_SIGNAL( gotContactUserDetails( const GroupWise::ContactDetails & ) ),
+ TQ_SLOT( slotReceiveContactDetails( const GroupWise::ContactDetails & ) ) );
// TODO: connect to gdt's finished() signal, check for failures, expand gdt to maintain a list of not found DNs?
gdt->go( true );
}