diff options
Diffstat (limited to 'k9devices')
| -rw-r--r-- | k9devices/k9cddrive.cpp | 4 | ||||
| -rw-r--r-- | k9devices/k9dbusdispatch.cpp | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/k9devices/k9cddrive.cpp b/k9devices/k9cddrive.cpp index 5fdf0bf..954bd36 100644 --- a/k9devices/k9cddrive.cpp +++ b/k9devices/k9cddrive.cpp @@ -157,10 +157,10 @@ void k9CdDrives::readConfig() { TQStringList::Iterator it3=lIO.at(i); drive->name=(*it2); TQString c=(*it3); - if (c.tqcontains("I")) { + if (c.contains("I")) { drive->canReadDVD=true; } - if (c.tqcontains("O")) { + if (c.contains("O")) { drive->canWriteCDR=true; drive->canWriteDVD=true; } diff --git a/k9devices/k9dbusdispatch.cpp b/k9devices/k9dbusdispatch.cpp index c8c6a09..32f8df8 100644 --- a/k9devices/k9dbusdispatch.cpp +++ b/k9devices/k9dbusdispatch.cpp @@ -42,7 +42,7 @@ static dbus_bool_t qDBusAddWatch(DBusWatch *watch, void *data) 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.tqfind(fd); + K9DBusDispatch::WatcherHash::iterator it = d->watchers.find(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.tqfind(fd); + K9DBusDispatch::WatcherHash::iterator it = d->watchers.find(fd); if (it != d->watchers.end()) { K9DBusDispatch::WatcherList& list = *it; @@ -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.tqfind(fd); + K9DBusDispatch::WatcherHash::iterator it = d->watchers.find(fd); if (it != d->watchers.end()) { K9DBusDispatch::WatcherList& list = *it; for (K9DBusDispatch::WatcherList::iterator wit = list.begin(); wit != list.end(); @@ -163,7 +163,7 @@ void K9DBusDispatch::purgeRemovedWatches() void K9DBusDispatch::socketRead(int fd) { // FIXME-QT4 TQHashIterator<int, TQDBusConnectionPrivate::Watcher> it(watchers); - WatcherHash::const_iterator it = watchers.tqfind(fd); + WatcherHash::const_iterator it = watchers.find(fd); if (it != watchers.end()) { const WatcherList& list = *it; for (WatcherList::const_iterator wit = list.begin(); wit != list.end(); ++wit) { @@ -179,7 +179,7 @@ void K9DBusDispatch::socketRead(int fd) void K9DBusDispatch::socketWrite(int fd) { // FIXME-QT4 TQHashIterator<int, TQDBusConnectionPrivate::Watcher> it(watchers); - WatcherHash::const_iterator it = watchers.tqfind(fd); + WatcherHash::const_iterator it = watchers.find(fd); if (it != watchers.end()) { const WatcherList& list = *it; for (WatcherList::const_iterator wit = list.begin(); wit != list.end(); ++wit) { |