branches/trinity/kdelibs

SVN commit 1225671 by tpearson:

kdelibs should now compile properly with TQt for Qt4


 M  +3 -3      kdecore/kdemacros.h.cmake  
 M  +1 -0      kdeui/CMakeLists.txt  
 M  +1 -1      khtml/ecma/kjs_binding.cpp  
 M  +1 -0      khtml/java/CMakeLists.txt  
 M  +1 -0      khtml/java/dummy/CMakeLists.txt  
 M  +1 -1      khtml/misc/loader.cpp  
 M  +1 -1      kinit/CMakeLists.txt  
 M  +2 -2      kio/kio/kdirlister.cpp  
 M  +5 -5      kio/kio/scheduler.cpp  
 M  +1 -1      kio/misc/kwalletd/kwalletd.cpp  


--- branches/trinity/kdelibs/kdecore/kdemacros.h.cmake #1225670:1225671
@@ -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
--- branches/trinity/kdelibs/kdeui/CMakeLists.txt #1225670:1225671
@@ -162,6 +162,7 @@
 
 tde_add_library( ${target} SHARED
   SOURCES ${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp
+  LINK ${TQT_LIBRARIES}
   VERSION 4.2.0
   DESTINATION ${LIB_INSTALL_DIR}
 )
--- branches/trinity/kdelibs/khtml/ecma/kjs_binding.cpp #1225670:1225671
@@ -190,7 +190,7 @@
 #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;
--- branches/trinity/kdelibs/khtml/java/CMakeLists.txt #1225670:1225671
@@ -55,6 +55,7 @@
 
 tde_add_library( ${target} STATIC_PIC
   SOURCES ${${target}_SRCS}
+  LINK ${TQT_LIBRARIES}
 )
 
 
--- branches/trinity/kdelibs/khtml/java/dummy/CMakeLists.txt #1225670:1225671
@@ -19,6 +19,7 @@
 
 tde_add_library( kjava SHARED
   SOURCES dummy.cpp
+  LINK ${TQT_LIBRARIES}
   VERSION 1.0.0
   DESTINATION ${LIB_INSTALL_DIR}
 )
--- branches/trinity/kdelibs/khtml/misc/loader.cpp #1225670:1225671
@@ -1436,7 +1436,7 @@
 
     if ( o && dl->needReload( o, url ) ) {
         o = 0;
-        assert( cache->find( url ) == 0 );
+        assert( cache->tqfind( url ) == 0 );
     }
 
     if(!o)
--- branches/trinity/kdelibs/kinit/CMakeLists.txt #1225670:1225671
@@ -111,7 +111,7 @@
 
 tde_add_executable( ${target} AUTOMOC
   SOURCES kstartupconfig.cpp
-  LINK kdefakes-shared
+  LINK kdefakes-shared ${TQT_LIBRARIES}
   DESTINATION ${BIN_INSTALL_DIR}
 )
 
--- branches/trinity/kdelibs/kio/kio/kdirlister.cpp #1225670:1225671
@@ -1781,7 +1781,7 @@
                     << " 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 @@
   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
 
--- branches/trinity/kdelibs/kio/kio/scheduler.cpp #1225670:1225671
@@ -586,7 +586,7 @@
        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 @@
            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 @@
     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 @@
         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 @@
     }
     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 &)),
--- branches/trinity/kdelibs/kio/misc/kwalletd/kwalletd.cpp #1225670:1225671
@@ -710,7 +710,7 @@
 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) {
_______________________________________________
Khtml-cvs mailing list
Khtml-cvs@...
https://mail.kde.org/mailman/listinfo/khtml-cvs