Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit afbc1b43ec)
r14.1.x
Michele Calgaro 11 months ago
parent 3173650793
commit fe52f8f3b0
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -54,7 +54,7 @@ void Connection::Private::setConnection( DBusConnection *c )
} }
connection = c; connection = c;
integrator = new Integrator( c, q ); integrator = new Integrator( c, q );
connect( integrator, TQT_SIGNAL(readReady()), q, TQT_SLOT(dispatchRead()) ); connect( integrator, TQ_SIGNAL(readReady()), q, TQ_SLOT(dispatchRead()) );
} }
Connection::Connection( TQObject *parent ) Connection::Connection( TQObject *parent )

@ -104,8 +104,8 @@ Timeout::Timeout( TQObject *parent, DBusTimeout *t )
: TQObject( parent ), m_timeout( t ) : TQObject( parent ), m_timeout( t )
{ {
m_timer = new TQTimer( this ); m_timer = new TQTimer( this );
connect( m_timer, TQT_SIGNAL(timeout()), connect( m_timer, TQ_SIGNAL(timeout()),
TQT_SLOT(slotTimeout()) ); TQ_SLOT(slotTimeout()) );
} }
void Timeout::slotTimeout() void Timeout::slotTimeout()
@ -193,12 +193,12 @@ void Integrator::addWatch( DBusWatch *watch )
if ( flags & DBUS_WATCH_READABLE ) { if ( flags & DBUS_WATCH_READABLE ) {
qtwatch->readSocket = new TQSocketNotifier( fd, TQSocketNotifier::Read, this ); qtwatch->readSocket = new TQSocketNotifier( fd, TQSocketNotifier::Read, this );
TQObject::connect( qtwatch->readSocket, TQT_SIGNAL(activated(int)), TQT_SLOT(slotRead(int)) ); TQObject::connect( qtwatch->readSocket, TQ_SIGNAL(activated(int)), TQ_SLOT(slotRead(int)) );
} }
if (flags & DBUS_WATCH_WRITABLE) { if (flags & DBUS_WATCH_WRITABLE) {
qtwatch->writeSocket = new TQSocketNotifier( fd, TQSocketNotifier::Write, this ); qtwatch->writeSocket = new TQSocketNotifier( fd, TQSocketNotifier::Write, this );
TQObject::connect( qtwatch->writeSocket, TQT_SIGNAL(activated(int)), TQT_SLOT(slotWrite(int)) ); TQObject::connect( qtwatch->writeSocket, TQ_SIGNAL(activated(int)), TQ_SLOT(slotWrite(int)) );
} }
m_watches.insert( fd, qtwatch ); m_watches.insert( fd, qtwatch );
@ -221,8 +221,8 @@ void Integrator::addTimeout( DBusTimeout *timeout )
{ {
Timeout *mt = new Timeout( this, timeout ); Timeout *mt = new Timeout( this, timeout );
m_timeouts.insert( timeout, mt ); m_timeouts.insert( timeout, mt );
connect( mt, TQT_SIGNAL(timeout(DBusTimeout*)), connect( mt, TQ_SIGNAL(timeout(DBusTimeout*)),
TQT_SLOT(slotTimeout(DBusTimeout*)) ); TQ_SLOT(slotTimeout(DBusTimeout*)) );
mt->start(); mt->start();
} }

@ -79,8 +79,8 @@ void Server::init( const TQString& addr )
{ {
d->server = dbus_server_listen( addr.ascii(), &d->error ); d->server = dbus_server_listen( addr.ascii(), &d->error );
d->integrator = new Integrator( d->server, this ); d->integrator = new Integrator( d->server, this );
connect( d->integrator, TQT_SIGNAL(newConnection(Connection*)), connect( d->integrator, TQ_SIGNAL(newConnection(Connection*)),
TQT_SIGNAL(newConnection(Connection*)) ); TQ_SIGNAL(newConnection(Connection*)) );
} }
} }

Loading…
Cancel
Save