diff --git a/src/daemon/NotificationDaemon.cpp b/src/daemon/NotificationDaemon.cpp index cb3c4fa..2b3979d 100644 --- a/src/daemon/NotificationDaemon.cpp +++ b/src/daemon/NotificationDaemon.cpp @@ -39,7 +39,7 @@ NotificationDaemon::NotificationDaemon() : KUniqueApplication() // init session connection to dbus if (!initDBUS()) { tqDebug("Failed to initialize the connection to DBus"); - TQTimer::singleShot(DBUS_CONNECTION_TIMEOUT, this, TQT_SLOT(slotReconnect())); + TQTimer::singleShot(DBUS_CONNECTION_TIMEOUT, this, TQ_SLOT(slotReconnect())); retryCount++; } } @@ -73,16 +73,16 @@ bool NotificationDaemon::initDBUS(){ return false; mConnection.scheduleDispatch(); - mConnection.connect(this, TQT_SLOT(slotDbusSignal(const TQT_DBusMessage&))); + mConnection.connect(this, TQ_SLOT(slotDbusSignal(const TQT_DBusMessage&))); - TQTimer::singleShot(10, this, TQT_SLOT(slotConnectionCheck())); + TQTimer::singleShot(10, this, TQ_SLOT(slotConnectionCheck())); return true; } void NotificationDaemon::close() { if(mConnection.isConnected()) { - mConnection.disconnect(this, TQT_SLOT(slotDbusSignal(const TQT_DBusMessage&))); + mConnection.disconnect(this, TQ_SLOT(slotDbusSignal(const TQT_DBusMessage&))); mConnection.closeConnection(NOTIFICATIONS_DBUS_SRVC); } } @@ -95,7 +95,7 @@ void NotificationDaemon::slotReconnect() { if (DBUS_CONNECTION_RETRY > retryCount) { tqFatal("Failed to initialize the connection to DBus"); } - TQTimer::singleShot(DBUS_CONNECTION_TIMEOUT, this, TQT_SLOT(slotReconnect())); + TQTimer::singleShot(DBUS_CONNECTION_TIMEOUT, this, TQ_SLOT(slotReconnect())); retryCount++; } } diff --git a/src/daemon/NotifyWidget.cpp b/src/daemon/NotifyWidget.cpp index fee959b..558a80c 100644 --- a/src/daemon/NotifyWidget.cpp +++ b/src/daemon/NotifyWidget.cpp @@ -38,7 +38,7 @@ NotifyWidget::NotifyWidget(TQWidget *parent, const char *name, NotificationsServ TQDesktopWidget *d = TQApplication::desktop(); mPosition=TQPoint(d->width()-50, d->height()-20); move(mPosition); - TQTimer::singleShot(100, this, TQT_SLOT(fadeAway())); + TQTimer::singleShot(100, this, TQ_SLOT(fadeAway())); } NotifyWidget::~NotifyWidget() @@ -64,7 +64,7 @@ void NotifyWidget::fadeAway() { mPosition.setY(mPosition.y()-1); move(mPosition); - TQTimer::singleShot(FADE_SPEED, this, TQT_SLOT(fadeAway())); + TQTimer::singleShot(FADE_SPEED, this, TQ_SLOT(fadeAway())); } void NotifyWidget::setAutoMask(bool b) @@ -100,7 +100,7 @@ void NotifyWidget::setHints(const TQMap< TQString, TQT_DBusVariant >& hints) { void NotifyWidget::setTimeout(TQ_INT32 t) { TDEApplication::kApplication()->setTopWidget(this); - TQTimer::singleShot(t, this, TQT_SLOT(timeout())); + TQTimer::singleShot(t, this, TQ_SLOT(timeout())); } #include "NotifyWidget.moc"