TQt4 convert k9copy

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k9copy@1233843 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 16 insertions, 16 deletions

diff --git a/k9devices/k9dbusdispatch.cpp b/k9devices/k9dbusdispatch.cpp
index 71d8a2f..c8c6a09 100644
--- a/k9devices/k9dbusdispatch.cpp
+++ b/k9devices/k9dbusdispatch.cpp
@@ -29,20 +29,20 @@ static dbus_bool_t qDBusAddWatch(DBusWatch *watch, void *data)
         bool enabled = dbus_watch_get_enabled(watch);
         //qDebug("addReadWatch %d %s", fd, (enabled ? "enabled" : "disabled"));
         watcher.watch = watch;
-            watcher.read = new QSocketNotifier(fd, QSocketNotifier::Read, d);
+            watcher.read = new TQSocketNotifier(fd, TQSocketNotifier::Read, d);
             if (!enabled) watcher.read->setEnabled(false);
-            d->connect(watcher.read, SIGNAL(activated(int)), SLOT(socketRead(int)));
+            d->connect(watcher.read, TQT_SIGNAL(activated(int)), TQT_SLOT(socketRead(int)));
     }
     if (flags & DBUS_WATCH_WRITABLE) {
         bool enabled = dbus_watch_get_enabled(watch);
         //qDebug("addWriteWatch %d %s", fd, (enabled ? "enabled" : "disabled"));
         watcher.watch = watch;
-            watcher.write = new QSocketNotifier(fd, QSocketNotifier::Write, d);
+            watcher.write = new TQSocketNotifier(fd, TQSocketNotifier::Write, d);
             if (!enabled) watcher.write->setEnabled(false);
-            d->connect(watcher.write, SIGNAL(activated(int)), SLOT(socketWrite(int)));
+            d->connect(watcher.write, TQT_SIGNAL(activated(int)), TQT_SLOT(socketWrite(int)));
     }
     // FIXME-QT4 d->watchers.insertMulti(fd, watcher);
-    K9DBusDispatch::WatcherHash::iterator it = d->watchers.find(fd);
+    K9DBusDispatch::WatcherHash::iterator it = d->watchers.tqfind(fd);
     if (it == d->watchers.end())
     {
         it = d->watchers.insert(fd, K9DBusDispatch::WatcherList());
@@ -58,7 +58,7 @@ static void qDBusRemoveWatch(DBusWatch *watch, void *data)
     
     int fd = dbus_watch_get_fd(watch);
 
-    K9DBusDispatch::WatcherHash::iterator it = d->watchers.find(fd);
+    K9DBusDispatch::WatcherHash::iterator it = d->watchers.tqfind(fd);
     if (it != d->watchers.end())
     {
         K9DBusDispatch::WatcherList& list = *it;
@@ -87,7 +87,7 @@ static void qDBusRemoveWatch(DBusWatch *watch, void *data)
     }
 
     if (d->removedWatches.count() > 0)
-        QTimer::singleShot(0, d, SLOT(purgeRemovedWatches()));
+        TQTimer::singleShot(0, d, TQT_SLOT(purgeRemovedWatches()));
 
 }
 
@@ -96,7 +96,7 @@ static void qDBusToggleWatch(DBusWatch *watch, void *data)
     K9DBusDispatch *d=(K9DBusDispatch*)data;
     int fd = dbus_watch_get_fd(watch);
 
-    K9DBusDispatch::WatcherHash::iterator it = d->watchers.find(fd);
+    K9DBusDispatch::WatcherHash::iterator it = d->watchers.tqfind(fd);
     if (it != d->watchers.end()) {
         K9DBusDispatch::WatcherList& list = *it;
         for (K9DBusDispatch::WatcherList::iterator wit = list.begin(); wit != list.end();
@@ -162,8 +162,8 @@ void K9DBusDispatch::purgeRemovedWatches()
 
 void K9DBusDispatch::socketRead(int fd)
 {
-    // FIXME-QT4 QHashIterator<int, QDBusConnectionPrivate::Watcher> it(watchers);
-    WatcherHash::const_iterator it = watchers.find(fd);
+    // FIXME-QT4 TQHashIterator<int, TQDBusConnectionPrivate::Watcher> it(watchers);
+    WatcherHash::const_iterator it = watchers.tqfind(fd);
     if (it != watchers.end()) {
         const WatcherList& list = *it;
         for (WatcherList::const_iterator wit = list.begin(); wit != list.end(); ++wit) {
@@ -178,8 +178,8 @@ void K9DBusDispatch::socketRead(int fd)
 
 void K9DBusDispatch::socketWrite(int fd)
 {
-    // FIXME-QT4 QHashIterator<int, QDBusConnectionPrivate::Watcher> it(watchers);
-    WatcherHash::const_iterator it = watchers.find(fd);
+    // FIXME-QT4 TQHashIterator<int, TQDBusConnectionPrivate::Watcher> it(watchers);
+    WatcherHash::const_iterator it = watchers.tqfind(fd);
     if (it != watchers.end()) {
         const WatcherList& list = *it;
         for (WatcherList::const_iterator wit = list.begin(); wit != list.end(); ++wit) {
@@ -205,11 +205,11 @@ void K9DBusDispatch::dispatch()
         }
 }
 
-K9DBusDispatch::K9DBusDispatch(QObject *parent, const char *name)
- : QObject(parent, name)
+K9DBusDispatch::K9DBusDispatch(TQObject *tqparent, const char *name)
+ : TQObject(tqparent, name)
 {
-    m_dispatcher = new QTimer(this);
-    QObject::connect(m_dispatcher, SIGNAL(timeout()), this, SLOT(dispatch()));
+    m_dispatcher = new TQTimer(this);
+    TQObject::connect(m_dispatcher, TQT_SIGNAL(timeout()), this, TQT_SLOT(dispatch()));
 }