From c03872d3d0ef1a2cb0b6e0727d4daa9a6fd8737c Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Fri, 5 Jan 2024 10:36:32 +0900 Subject: Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines Signed-off-by: Michele Calgaro (cherry picked from commit 9b171f8e1773c29be3ceab2c5ae8b760d78a1b54) --- src/dbusInterface.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/dbusInterface.cpp') diff --git a/src/dbusInterface.cpp b/src/dbusInterface.cpp index fccafbc..b388a47 100644 --- a/src/dbusInterface.cpp +++ b/src/dbusInterface.cpp @@ -144,19 +144,19 @@ bool dbusInterface::initDBUS(){ if( !dBusConn.isConnected() ) { kdError() << "Failed to open connection to system message bus: " << dBusConn.lastError().message() << endl; - TQTimer::singleShot(4000, this, TQT_SLOT(reconnect())); + TQTimer::singleShot(4000, this, TQ_SLOT(reconnect())); return false; } // watcher for NameOwnerChanged signals dBusWatch = new TQT_DBusProxy(DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS, dBusConn); - TQObject::connect(dBusWatch, TQT_SIGNAL(dbusSignal(const TQT_DBusMessage&)), - this, TQT_SLOT(handleDBusSignal(const TQT_DBusMessage&))); + TQObject::connect(dBusWatch, TQ_SIGNAL(dbusSignal(const TQT_DBusMessage&)), + this, TQ_SLOT(handleDBusSignal(const TQT_DBusMessage&))); // watcher for Disconnect signal dBusLocal = new TQT_DBusProxy(DBUS_SERVICE_DBUS, DBUS_PATH_LOCAL, DBUS_INTERFACE_LOCAL, dBusConn); - TQObject::connect(dBusLocal, TQT_SIGNAL(dbusSignal(const TQT_DBusMessage&)), - this, TQT_SLOT(handleDBusSignal(const TQT_DBusMessage&))); + TQObject::connect(dBusLocal, TQ_SIGNAL(dbusSignal(const TQT_DBusMessage&)), + this, TQ_SLOT(handleDBusSignal(const TQT_DBusMessage&))); // find already running SystemD TQT_DBusProxy checkSystemD(DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS, dBusConn); @@ -193,7 +193,7 @@ void dbusInterface::handleDBusSignal(const TQT_DBusMessage& msg) { && msg.interface() == DBUS_INTERFACE_LOCAL && msg.member() == "Disconnected" ) { close(); - TQTimer::singleShot(1000, this, TQT_SLOT(reconnect())); + TQTimer::singleShot(1000, this, TQ_SLOT(reconnect())); return; } @@ -290,8 +290,8 @@ void dbusInterface::onServiceRegistered(const TQString& service) { // watch session changes systemdSeat = new TQT_DBusProxy(SYSTEMD_LOGIN1_SERVICE, seat, DBUS_INTERFACE_PROPERTIES, dBusConn); - TQObject::connect(systemdSeat, TQT_SIGNAL(dbusSignal(const TQT_DBusMessage&)), - this, TQT_SLOT(handleDBusSignal(const TQT_DBusMessage&))); + TQObject::connect(systemdSeat, TQ_SIGNAL(dbusSignal(const TQT_DBusMessage&)), + this, TQ_SLOT(handleDBusSignal(const TQT_DBusMessage&))); // inhibit systemd handling of power/sleep/hibernate/lid buttons // http://www.freedesktop.org/wiki/Software/systemd/inhibit @@ -342,8 +342,8 @@ void dbusInterface::onServiceRegistered(const TQString& service) { // watch session changes consolekitSeat = new TQT_DBusProxy(CK_SERVICE, seat, CK_SEAT_IFACE, dBusConn); - TQObject::connect(consolekitSeat, TQT_SIGNAL(dbusSignal(const TQT_DBusMessage&)), - this, TQT_SLOT(handleDBusSignal(const TQT_DBusMessage&))); + TQObject::connect(consolekitSeat, TQ_SIGNAL(dbusSignal(const TQT_DBusMessage&)), + this, TQ_SLOT(handleDBusSignal(const TQT_DBusMessage&))); return; } } -- cgit v1.2.3