+/* $Id$ */
+
/***
This file is part of avahi.
#include <qobject.h>
#include <qtimer.h>
#endif
+#include <avahi-common/timeval.h>
#include "qt-watch.h"
class AvahiWatch : public QObject
m_callback(callback), m_userdata(userdata)
{
connect(&m_timer, SIGNAL(timeout()), this, SLOT(timeout()));
+#ifdef QT4
+ m_timer.setSingleShot(true);
+#endif
update(tv);
}
{
m_timer.stop();
if (tv) {
- struct timeval now;
- gettimeofday(&now, 0);
- m_timer.start((tv->tv_sec-now.tv_sec)*1000+(tv->tv_usec-now.tv_usec)/1000);
+ AvahiUsec u = avahi_age(tv)/1000;
+#ifdef QT4
+ m_timer.start( (u>0) ? 0 : -u);
+#else
+ m_timer.start( (u>0) ? 0 : -u,true);
+#endif
}
}
static AvahiPoll qt_poll;
-const AvahiPoll* avahi_qt_poll_get()
+const AvahiPoll* avahi_qt_poll_get(void)
{
qt_poll.userdata=0;
qt_poll.watch_new = q_watch_new;
return &qt_poll;
}
-#include "qt-watch.moc"
+#ifdef QT4
+#include "qt-watch.moc4"
+#else
+#include "qt-watch.moc3"
+#endif