diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-03-22 21:00:06 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-03-22 21:00:06 +0000 |
commit | 13ad43878ded427963928de0757e55dae18c7493 (patch) | |
tree | 33068177843fbb6615cc6195ed5dae7c2540a22f /kio | |
parent | 496589d096de43c96769d47acade262e91fc201f (diff) | |
download | tdelibs-13ad43878ded427963928de0757e55dae18c7493.tar.gz tdelibs-13ad43878ded427963928de0757e55dae18c7493.zip |
kdelibs should now compile properly with TQt for Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1225671 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kio')
-rw-r--r-- | kio/kio/kdirlister.cpp | 4 | ||||
-rw-r--r-- | kio/kio/scheduler.cpp | 10 | ||||
-rw-r--r-- | kio/misc/kwalletd/kwalletd.cpp | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/kio/kio/kdirlister.cpp b/kio/kio/kdirlister.cpp index 11721f751..749c80b03 100644 --- a/kio/kio/kdirlister.cpp +++ b/kio/kio/kdirlister.cpp @@ -1781,7 +1781,7 @@ void KDirListerCache::printDebug() << " rootItem: " << ( itu.current()->rootItem ? itu.current()->rootItem->url() : KURL() ) << " autoUpdates refcount: " << itu.current()->autoUpdates << " complete: " << itu.current()->complete - << ( itu.current()->lstItems ? TQString(" with %1 items.").arg(itu.current()->lstItems->count()) : TQString(" lstItems=NULL") ) << endl; + << ( itu.current()->lstItems ? TQString(" with %1 items.").tqarg(itu.current()->lstItems->count()) : TQString(" lstItems=NULL") ) << endl; } kdDebug(7004) << "urlsCurrentlyHeld: " << endl; @@ -1814,7 +1814,7 @@ void KDirListerCache::printDebug() for ( ; itc.current() ; ++itc ) kdDebug(7004) << " " << itc.currentKey() << " rootItem: " << ( itc.current()->rootItem ? itc.current()->rootItem->url().prettyURL() : TQString("NULL") ) - << ( itc.current()->lstItems ? TQString(" with %1 items.").arg(itc.current()->lstItems->count()) : TQString(" lstItems=NULL") ) << endl; + << ( itc.current()->lstItems ? TQString(" with %1 items.").tqarg(itc.current()->lstItems->count()) : TQString(" lstItems=NULL") ) << endl; } #endif diff --git a/kio/kio/scheduler.cpp b/kio/kio/scheduler.cpp index 52b342dee..38e7d10d4 100644 --- a/kio/kio/scheduler.cpp +++ b/kio/kio/scheduler.cpp @@ -586,7 +586,7 @@ void Scheduler::_jobFinished(SimpleJob *job, Slave *slave) if (list) { assert(slave->isConnected()); - assert(!coIdleSlaves->contains(slave)); + assert(!coIdleSlaves->tqcontains(slave)); coIdleSlaves->append(slave); if (!list->isEmpty()) coSlaveTimer.start(0, true); @@ -741,7 +741,7 @@ Scheduler::slotScheduleCoSlave() coIdleSlaves->removeRef(slave); // kdDebug(7006) << "scheduler: job started " << job << endl; - assert(!coIdleSlaves->contains(slave)); + assert(!coIdleSlaves->tqcontains(slave)); KURL url =job->url(); TQString host = url.host(); @@ -775,7 +775,7 @@ Scheduler::slotSlaveConnected() disconnect(slave, TQT_SIGNAL(connected()), this, TQT_SLOT(slotSlaveConnected())); emit slaveConnected(slave); - assert(!coIdleSlaves->contains(slave)); + assert(!coIdleSlaves->tqcontains(slave)); coIdleSlaves->append(slave); coSlaveTimer.start(0, true); } @@ -814,7 +814,7 @@ Scheduler::_assignJobToSlave(KIO::Slave *slave, SimpleJob *job) return false; } - assert(list->contains(job) == 0); + assert(list->tqcontains(job) == 0); list->append(job); coSlaveTimer.start(0, true); // Start job on timer event @@ -837,7 +837,7 @@ Scheduler::_disconnectSlave(KIO::Slave *slave) } delete list; coIdleSlaves->removeRef(slave); - assert(!coIdleSlaves->contains(slave)); + assert(!coIdleSlaves->tqcontains(slave)); disconnect(slave, TQT_SIGNAL(connected()), this, TQT_SLOT(slotSlaveConnected())); disconnect(slave, TQT_SIGNAL(error(int, const TQString &)), diff --git a/kio/misc/kwalletd/kwalletd.cpp b/kio/misc/kwalletd/kwalletd.cpp index 2cd8cd406..748f62347 100644 --- a/kio/misc/kwalletd/kwalletd.cpp +++ b/kio/misc/kwalletd/kwalletd.cpp @@ -710,7 +710,7 @@ int KWalletD::close(const TQString& wallet, bool force) { int KWalletD::closeWallet(KWallet::Backend *w, int handle, bool force) { if (w) { const TQString& wallet = w->walletName(); - assert(_passwords.contains(wallet)); + assert(_passwords.tqcontains(wallet)); if (w->refCount() == 0 || force) { tqinvalidateHandle(handle); if (_closeIdle && _timeouts) { |