diff options
Diffstat (limited to 'src/tqdbusintegrator.cpp')
| -rw-r--r-- | src/tqdbusintegrator.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/tqdbusintegrator.cpp b/src/tqdbusintegrator.cpp index 5e50dd7..2d3322a 100644 --- a/src/tqdbusintegrator.cpp +++ b/src/tqdbusintegrator.cpp @@ -131,7 +131,7 @@ static dbus_bool_t qDBusAddWatch(DBusWatch *watch, void *data) if (tqApp) { watcher.read = new TQSocketNotifier(fd, TQSocketNotifier::Read, d); if (!enabled) watcher.read->setEnabled(false); - d->connect(watcher.read, TQT_SIGNAL(activated(int)), TQT_SLOT(socketRead(int))); + d->connect(watcher.read, TQ_SIGNAL(activated(int)), TQ_SLOT(socketRead(int))); } } if (flags & DBUS_WATCH_WRITABLE) { @@ -141,7 +141,7 @@ static dbus_bool_t qDBusAddWatch(DBusWatch *watch, void *data) if (tqApp) { watcher.write = new TQSocketNotifier(fd, TQSocketNotifier::Write, d); if (!enabled) watcher.write->setEnabled(false); - d->connect(watcher.write, TQT_SIGNAL(activated(int)), TQT_SLOT(socketWrite(int))); + d->connect(watcher.write, TQ_SIGNAL(activated(int)), TQ_SLOT(socketWrite(int))); } } // FIXME-QT4 d->watchers.insertMulti(fd, watcher); @@ -194,7 +194,7 @@ static void qDBusRemoveWatch(DBusWatch *watch, void *data) } if (d->removedWatches.count() > 0) - TQTimer::singleShot(0, d, TQT_SLOT(purgeRemovedWatches())); + TQTimer::singleShot(0, d, TQ_SLOT(purgeRemovedWatches())); } static void qDBusToggleWatch(DBusWatch *watch, void *data) @@ -281,12 +281,12 @@ TQT_DBusConnectionPrivate::TQT_DBusConnectionPrivate(TQObject *parent) dbus_error_init(&error); dispatcher = new TQTimer(this); - TQObject::connect(dispatcher, TQT_SIGNAL(timeout()), this, TQT_SLOT(dispatch())); + TQObject::connect(dispatcher, TQ_SIGNAL(timeout()), this, TQ_SLOT(dispatch())); m_resultEmissionQueueTimer = new TQTimer(this); - TQObject::connect(m_resultEmissionQueueTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(transmitResultEmissionQueue())); + TQObject::connect(m_resultEmissionQueueTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(transmitResultEmissionQueue())); m_messageEmissionQueueTimer = new TQTimer(this); - TQObject::connect(m_messageEmissionQueueTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(transmitMessageEmissionQueue())); + TQObject::connect(m_messageEmissionQueueTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(transmitMessageEmissionQueue())); } TQT_DBusConnectionPrivate::~TQT_DBusConnectionPrivate() @@ -652,8 +652,8 @@ int TQT_DBusConnectionPrivate::sendWithReplyAsync(const TQT_DBusMessage &message if (!receiver || !method) return 0; - if (!TQObject::connect(receiver, TQT_SIGNAL(destroyed(TQObject*)), - this, TQT_SLOT(objectDestroyed(TQObject*)))) + if (!TQObject::connect(receiver, TQ_SIGNAL(destroyed(TQObject*)), + this, TQ_SLOT(objectDestroyed(TQObject*)))) return false; DBusMessage *msg = message.toDBusMessage(); @@ -700,9 +700,9 @@ void TQT_DBusConnectionPrivate::transmitResultEmissionQueue() m_resultEmissionQueue.remove(it); it = m_resultEmissionQueue.begin(); - TQObject::connect(this, TQT_SIGNAL(dbusPendingCallReply(const TQT_DBusMessage&)), dbusResult.receiver, dbusResult.method.data()); + TQObject::connect(this, TQ_SIGNAL(dbusPendingCallReply(const TQT_DBusMessage&)), dbusResult.receiver, dbusResult.method.data()); emitPendingCallReply(dbusResult.message); - TQObject::disconnect(this, TQT_SIGNAL(dbusPendingCallReply(const TQT_DBusMessage&)), dbusResult.receiver, dbusResult.method.data()); + TQObject::disconnect(this, TQ_SIGNAL(dbusPendingCallReply(const TQT_DBusMessage&)), dbusResult.receiver, dbusResult.method.data()); } } } |