summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--kdecore/kdemacros.h.cmake6
-rw-r--r--kdeui/CMakeLists.txt1
-rw-r--r--khtml/ecma/kjs_binding.cpp2
-rw-r--r--khtml/java/CMakeLists.txt1
-rw-r--r--khtml/java/dummy/CMakeLists.txt1
-rw-r--r--khtml/misc/loader.cpp2
-rw-r--r--kinit/CMakeLists.txt2
-rw-r--r--kio/kio/kdirlister.cpp4
-rw-r--r--kio/kio/scheduler.cpp10
-rw-r--r--kio/misc/kwalletd/kwalletd.cpp2
10 files changed, 17 insertions, 14 deletions
diff --git a/kdecore/kdemacros.h.cmake b/kdecore/kdemacros.h.cmake
index d0d8126d0..766ca622a 100644
--- a/kdecore/kdemacros.h.cmake
+++ b/kdecore/kdemacros.h.cmake
@@ -53,9 +53,9 @@
* cope with symbol visibility.
*/
#define KDE_Q_EXPORT_PLUGIN(PLUGIN) \
- Q_EXTERN_C KDE_EXPORT const char* qt_ucm_query_verification_data(); \
- Q_EXTERN_C KDE_EXPORT QUnknownInterface* ucm_instantiate(); \
- Q_EXPORT_PLUGIN(PLUGIN)
+ TQ_EXTERN_C KDE_EXPORT const char* tqt_ucm_query_verification_data(); \
+ TQ_EXTERN_C KDE_EXPORT TQUnknownInterface* ucm_instantiate(); \
+ TQ_EXPORT_PLUGIN(PLUGIN)
/**
* The KDE_PACKED can be used to hint the compiler that a particular
diff --git a/kdeui/CMakeLists.txt b/kdeui/CMakeLists.txt
index 9215c2860..e40154333 100644
--- a/kdeui/CMakeLists.txt
+++ b/kdeui/CMakeLists.txt
@@ -162,6 +162,7 @@ configure_file( ${CMAKE_SOURCE_DIR}/cmake/modules/template_dummy_cpp.cmake dummy
tde_add_library( ${target} SHARED
SOURCES ${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp
+ LINK ${TQT_LIBRARIES}
VERSION 4.2.0
DESTINATION ${LIB_INSTALL_DIR}
)
diff --git a/khtml/ecma/kjs_binding.cpp b/khtml/ecma/kjs_binding.cpp
index 4fa87e2ce..2646b8e26 100644
--- a/khtml/ecma/kjs_binding.cpp
+++ b/khtml/ecma/kjs_binding.cpp
@@ -190,7 +190,7 @@ ScriptInterpreter::~ScriptInterpreter()
#ifdef KJS_VERBOSE
kdDebug(6070) << "ScriptInterpreter::~ScriptInterpreter " << this << " for part=" << m_frame << endl;
#endif
- assert( interpreterList && interpreterList->contains( this ) );
+ assert( interpreterList && interpreterList->tqcontains( this ) );
interpreterList->remove( this );
if ( interpreterList->isEmpty() ) {
delete interpreterList;
diff --git a/khtml/java/CMakeLists.txt b/khtml/java/CMakeLists.txt
index 7c1e7dd43..94a249318 100644
--- a/khtml/java/CMakeLists.txt
+++ b/khtml/java/CMakeLists.txt
@@ -55,6 +55,7 @@ set( ${target}_SRCS
tde_add_library( ${target} STATIC_PIC
SOURCES ${${target}_SRCS}
+ LINK ${TQT_LIBRARIES}
)
diff --git a/khtml/java/dummy/CMakeLists.txt b/khtml/java/dummy/CMakeLists.txt
index e66bf26c6..7e00d3843 100644
--- a/khtml/java/dummy/CMakeLists.txt
+++ b/khtml/java/dummy/CMakeLists.txt
@@ -19,6 +19,7 @@ configure_file( ${CMAKE_SOURCE_DIR}/cmake/modules/template_dummy_cpp.cmake dummy
tde_add_library( kjava SHARED
SOURCES dummy.cpp
+ LINK ${TQT_LIBRARIES}
VERSION 1.0.0
DESTINATION ${LIB_INSTALL_DIR}
)
diff --git a/khtml/misc/loader.cpp b/khtml/misc/loader.cpp
index bc25991ea..460b2ceb2 100644
--- a/khtml/misc/loader.cpp
+++ b/khtml/misc/loader.cpp
@@ -1436,7 +1436,7 @@ CachedObjectType* Cache::requestObject( DocLoader* dl, const KURL& kurl, const c
if ( o && dl->needReload( o, url ) ) {
o = 0;
- assert( cache->find( url ) == 0 );
+ assert( cache->tqfind( url ) == 0 );
}
if(!o)
diff --git a/kinit/CMakeLists.txt b/kinit/CMakeLists.txt
index 8cb794673..c64bcfc33 100644
--- a/kinit/CMakeLists.txt
+++ b/kinit/CMakeLists.txt
@@ -111,7 +111,7 @@ set( target kstartupconfig )
tde_add_executable( ${target} AUTOMOC
SOURCES kstartupconfig.cpp
- LINK kdefakes-shared
+ LINK kdefakes-shared ${TQT_LIBRARIES}
DESTINATION ${BIN_INSTALL_DIR}
)
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) {
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-05 12:52:49 +0000