From 1c93fca14d9ce37499bcfdf994c660186a0b6f17 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Thu, 14 Apr 2011 20:16:30 +0000
Subject: Enable kdepim compilation under Qt4 This will likely break Qt3
 compilation temporarily, which is an unintended side effect. A third and
 final kdepim commit will repair Qt3 compilation shortly.

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227946 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 knode/knconfig.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'knode/knconfig.cpp')

diff --git a/knode/knconfig.cpp b/knode/knconfig.cpp
index a75343867..608e625a9 100644
--- a/knode/knconfig.cpp
+++ b/knode/knconfig.cpp
@@ -452,7 +452,7 @@ TQColor KNConfig::Appearance::defaultColor(int i) const
   switch(i) {
 
     case background:
-      return kapp->palette().active().base();
+      return kapp->tqpalette().active().base();
 
     case alternateBackground:
       return KGlobalSettings::alternateBackgroundColor();
@@ -466,13 +466,13 @@ TQColor KNConfig::Appearance::defaultColor(int i) const
 
     case normalText:
     case unreadThread:
-      return kapp->palette().active().text();
+      return kapp->tqpalette().active().text();
 
     case url:
       return KGlobalSettings::linkColor();
 
     case readThread:
-      return kapp->palette().disabled().text();
+      return kapp->tqpalette().disabled().text();
 
     case unreadArticle:
       return TQColor( 183, 154, 11 );
@@ -492,7 +492,7 @@ TQColor KNConfig::Appearance::defaultColor(int i) const
       return TQColor( 0xFF, 0x40, 0x40 );
   }
 
-  return kapp->palette().disabled().text();
+  return kapp->tqpalette().disabled().text();
 }
 
 
@@ -801,7 +801,7 @@ void KNConfig::DisplayedHeaders::remove(KNDisplayedHeader *h)
 
 void KNConfig::DisplayedHeaders::up(KNDisplayedHeader *h)
 {
-  int idx = mHeaderList.findIndex( h );
+  int idx = mHeaderList.tqfindIndex( h );
   if ( idx != -1 ) {
     mHeaderList.remove( mHeaderList.at( idx ) );
     mHeaderList.insert( mHeaderList.at( idx - 1 ), h );
@@ -812,7 +812,7 @@ void KNConfig::DisplayedHeaders::up(KNDisplayedHeader *h)
 
 void KNConfig::DisplayedHeaders::down(KNDisplayedHeader *h)
 {
-  int idx = mHeaderList.findIndex( h );
+  int idx = mHeaderList.tqfindIndex( h );
   if ( idx != -1 ) {
     mHeaderList.remove( mHeaderList.at( idx ) );
     mHeaderList.insert( mHeaderList.at( idx + 1 ), h );
@@ -1175,10 +1175,10 @@ bool KNConfig::Cleanup::expireToday()
     return false;
 
   TQDate today = TQDate::tqcurrentDate();
-  if (mLastExpDate == today)
+  if (mLastExpDate == TQDateTime(today))
     return false;
 
-  return (mLastExpDate.daysTo( today ) >= e_xpireInterval);
+  return (mLastExpDate.daysTo( TQDateTime(today) ) >= e_xpireInterval);
 }
 
 
@@ -1194,10 +1194,10 @@ bool KNConfig::Cleanup::compactToday()
     return false;
 
   TQDate today = TQDate::tqcurrentDate();
-  if (mLastCompDate == today)
+  if (mLastCompDate == TQDateTime(today))
     return false;
 
-  return (mLastCompDate.daysTo( today ) >= c_ompactInterval);
+  return (mLastCompDate.daysTo( TQDateTime(today) ) >= c_ompactInterval);
 }
 
 
-- 
cgit v1.2.1