From fe52f8f3b0e2c7116b8c7b186a4466651d9bd869 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Mon, 8 Jan 2024 11:54:07 +0900 Subject: [PATCH] Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines Signed-off-by: Michele Calgaro (cherry picked from commit afbc1b43ec2ba8f3c1b0ace9116d913ca2aa9f74) --- connection.cpp | 2 +- integrator.cpp | 12 ++++++------ server.cpp | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/connection.cpp b/connection.cpp index 5c818f1..5b3d7d1 100644 --- a/connection.cpp +++ b/connection.cpp @@ -54,7 +54,7 @@ void Connection::Private::setConnection( DBusConnection *c ) } connection = c; 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 ) diff --git a/integrator.cpp b/integrator.cpp index e49cf7e..085f2a0 100644 --- a/integrator.cpp +++ b/integrator.cpp @@ -104,8 +104,8 @@ Timeout::Timeout( TQObject *parent, DBusTimeout *t ) : TQObject( parent ), m_timeout( t ) { m_timer = new TQTimer( this ); - connect( m_timer, TQT_SIGNAL(timeout()), - TQT_SLOT(slotTimeout()) ); + connect( m_timer, TQ_SIGNAL(timeout()), + TQ_SLOT(slotTimeout()) ); } void Timeout::slotTimeout() @@ -193,12 +193,12 @@ void Integrator::addWatch( DBusWatch *watch ) if ( flags & DBUS_WATCH_READABLE ) { 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) { 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 ); @@ -221,8 +221,8 @@ void Integrator::addTimeout( DBusTimeout *timeout ) { Timeout *mt = new Timeout( this, timeout ); m_timeouts.insert( timeout, mt ); - connect( mt, TQT_SIGNAL(timeout(DBusTimeout*)), - TQT_SLOT(slotTimeout(DBusTimeout*)) ); + connect( mt, TQ_SIGNAL(timeout(DBusTimeout*)), + TQ_SLOT(slotTimeout(DBusTimeout*)) ); mt->start(); } diff --git a/server.cpp b/server.cpp index d1cc821..dc8badd 100644 --- a/server.cpp +++ b/server.cpp @@ -79,8 +79,8 @@ void Server::init( const TQString& addr ) { d->server = dbus_server_listen( addr.ascii(), &d->error ); d->integrator = new Integrator( d->server, this ); - connect( d->integrator, TQT_SIGNAL(newConnection(Connection*)), - TQT_SIGNAL(newConnection(Connection*)) ); + connect( d->integrator, TQ_SIGNAL(newConnection(Connection*)), + TQ_SIGNAL(newConnection(Connection*)) ); } }