Fix FTBFS

8 files changed, 24 insertions, 14 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 269178378..64a015734 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -90,7 +90,7 @@ option( BUILD_KTNEF "Build ktnef" ${BUILD_ALL} )
 option( BUILD_LIBKCAL "Build libkcal" ${BUILD_ALL} )
 option( BUILD_LIBTDEPIM "Build libtdepim" ${BUILD_ALL} )
 option( BUILD_LIBKPIMIDENTITIES "Build libkpimidentities" ${BUILD_ALL} )
-option( BUILD_LIBKDENETWORK "Build libtdenetwork" ${BUILD_ALL} )
+option( BUILD_LIBTDENETWORK "Build libtdenetwork" ${BUILD_ALL} )
 option( BUILD_CERTMANAGER "Build certmanager" ${BUILD_ALL} )
 option( BUILD_LIBKPGP "Build libkpgp" ${BUILD_ALL} )
 option( BUILD_MIMELIB "Build mimelib" ${BUILD_ALL} )
@@ -161,7 +161,7 @@ tde_conditional_add_subdirectory( BUILD_LIBKCAL libkcal )
 tde_conditional_add_subdirectory( BUILD_LIBTDEPIM pixmaps )
 tde_conditional_add_subdirectory( BUILD_LIBTDEPIM libtdepim )
 tde_conditional_add_subdirectory( BUILD_LIBKPIMIDENTITIES libkpimidentities )
-tde_conditional_add_subdirectory( BUILD_LIBKDENETWORK libtdenetwork )
+tde_conditional_add_subdirectory( BUILD_LIBTDENETWORK libtdenetwork )
 tde_conditional_add_subdirectory( BUILD_CERTMANAGER certmanager )
 tde_conditional_add_subdirectory( BUILD_LIBKPGP libkpgp )
 tde_conditional_add_subdirectory( BUILD_MIMELIB mimelib )
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index fc6c1db72..c75eb54d1 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -57,7 +57,7 @@ if( WITH_GNOKII AND (BUILD_KADDRESSBOOK OR BUILD_KMOBILE) )
 endif( )
 
 
-if( BUILD_LIBKDENETWORK OR BUILD_CERTMANAGER OR BUILD_KMAIL OR BUILD_KADDRESSBOOK OR BUILD_KONTACT )
+if( BUILD_LIBTDENETWORK OR BUILD_CERTMANAGER OR BUILD_KMAIL OR BUILD_KADDRESSBOOK OR BUILD_KONTACT )
 
   if( NOT HAVE_GPGME_0_4_BRANCH )
     message( STATUS "checking for 'gpgme'" )
diff --git a/kmail/kmail.kcfg b/kmail/kmail.kcfg
index 11f0ede47..b2cd4d39e 100644
--- a/kmail/kmail.kcfg
+++ b/kmail/kmail.kcfg
@@ -547,7 +547,7 @@
 
     <group name="Geometry">
       <entry name="ComposerSize" type="Size" key="composer">
-        <default>QSize(480,510)</default>
+        <default>TQSize(480,510)</default>
       </entry>
 
     </group>
diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp
index 3caa18c23..e6c641300 100644
--- a/kmail/kmkernel.cpp
+++ b/kmail/kmkernel.cpp
@@ -1941,12 +1941,12 @@ void KMKernel::kmailMsgHandler(TQtMsgType aType, const char* aMsg)
 
   switch (aType)
   {
-  case QtDebugMsg:
-  case QtWarningMsg:
+  case TQtDebugMsg:
+  case TQtWarningMsg:
     kdDebug(5006) << aMsg << endl;
     break;
 
-  case QtFatalMsg: // Hm, what about using kdFatal() here?
+  case TQtFatalMsg: // Hm, what about using kdFatal() here?
     ungrabPtrKb();
     kdDebug(5006) << kapp->caption() << " fatal error "
 		  << aMsg << endl;
diff --git a/knotes/knoteconfig.kcfg b/knotes/knoteconfig.kcfg
index 18a8c636c..c6449eec6 100644
--- a/knotes/knoteconfig.kcfg
+++ b/knotes/knoteconfig.kcfg
@@ -66,7 +66,7 @@
     </entry>
 
     <entry name="Position" type="Point" key="position">
-      <default code="true">QPoint( -10000, -10000 )</default>
+      <default code="true">TQPoint( -10000, -10000 )</default>
     </entry>
 
     <entry name="ShowInTaskbar" type="Bool">
diff --git a/korganizer/korganizer.kcfg b/korganizer/korganizer.kcfg
index c299aa75c..d5513fe86 100644
--- a/korganizer/korganizer.kcfg
+++ b/korganizer/korganizer.kcfg
@@ -141,12 +141,12 @@
     <entry type="DateTime" name="StartTime">
       <label>Default appointment time</label>
       <whatsthis>Enter the default time for events here. The default is used if you do not supply a start time.</whatsthis>
-      <default>QDateTime(QDate(), QTime(10,0))</default>
+      <default>TQDateTime(TQDate(), TQTime(10,0))</default>
     </entry>
     <entry type="DateTime" name="DefaultDuration">
       <label>Default duration of new appointment (HH:MM)</label>
       <whatsthis>Enter default duration for events here. The default is used if you do not supply an end time.</whatsthis>
-      <default>QDateTime(QDate(), QTime(2,0))</default>
+      <default>TQDateTime(TQDate(), TQTime(2,0))</default>
     </entry>
 
     <entry type="Int" key="Default Reminder Time" name="ReminderTime">
@@ -277,18 +277,18 @@
     <entry type="DateTime" name="DayBegins">
       <label>Day begins at</label>
       <whatsthis>Enter the start time for events here. This time should be the earliest time that you use for events, as it will be displayed at the top.</whatsthis>
-      <default>QDateTime(QDate(), QTime(7,0))</default>
+      <default>TQDateTime(TQDate(), TQTime(7,0))</default>
     </entry>
 
     <entry type="DateTime" name="WorkingHoursStart">
       <label>Daily starting hour</label>
       <whatsthis>Enter the start time for the working hours here. The working hours will be marked with color by KOrganizer.</whatsthis>
-      <default>QDateTime(QDate(), QTime(8,0))</default>
+      <default>TQDateTime(TQDate(), TQTime(8,0))</default>
     </entry>
     <entry type="DateTime" name="WorkingHoursEnd">
       <label>Daily ending hour</label>
       <whatsthis>Enter the ending time for the working hours here. The working hours will be marked with color by KOrganizer.</whatsthis>
-      <default>QDateTime(QDate(), QTime(17,0))</default>
+      <default>TQDateTime(TQDate(), TQTime(17,0))</default>
     </entry>
     <entry type="Int" key="Work Week Mask" name="WorkWeekMask">
       <default>31</default>
diff --git a/libtdepim/CMakeLists.txt b/libtdepim/CMakeLists.txt
index 19ca1d524..0b8537d3f 100644
--- a/libtdepim/CMakeLists.txt
+++ b/libtdepim/CMakeLists.txt
@@ -98,7 +98,7 @@ tde_add_library( tdepim SHARED AUTOMOC
     csshelper.cpp distributionlist.cpp kpimurlrequesterdlg.cpp
     sendsmsdialog.cpp kmailcompletion.cpp
   VERSION 1.0.0
-  LINK kcal-shared kimproxy-shared kparts-shared qui
+  LINK kcal-shared kimproxy-shared kparts-shared ${TQUI_LIBRARIES}
   DESTINATION ${LIB_INSTALL_DIR}
 )
 
diff --git a/libtdepim/ConfigureChecks.cmake b/libtdepim/ConfigureChecks.cmake
index 96e1e621a..d2a8f1ff2 100644
--- a/libtdepim/ConfigureChecks.cmake
+++ b/libtdepim/ConfigureChecks.cmake
@@ -8,3 +8,13 @@
 #  This file is released under GPL >= 2
 #
 #################################################
+
+foreach( f ${TQT_LIBRARIES} )
+  if( ${f} STREQUAL "tqt-mt" )
+    set(TQUI_LIBRARIES "tqui" CACHE TYPE STRING FORCE)
+  endif()
+  if( ${f} STREQUAL "qt-mt" )
+    set(TQUI_LIBRARIES "qui" CACHE TYPE STRING FORCE)
+  endif()
+endforeach()
+