1 files changed, 12 insertions, 12 deletions

diff --git a/knode/knconfig.cpp b/knode/knconfig.cpp
index 98caed2bb..4e2d7f330 100644
--- a/knode/knconfig.cpp
+++ b/knode/knconfig.cpp
@@ -16,7 +16,7 @@
 
 #include <stdlib.h>
 
-#include <tqtextcodec.h>
+#include <textcodec.h>
 
 #include <ksimpleconfig.h>
 #include <kmessagebox.h>
@@ -452,7 +452,7 @@ TQColor KNConfig::Appearance::defaultColor(int i) const
   switch(i) {
 
     case background:
-      return kapp->tqpalette().active().base();
+      return kapp->palette().active().base();
 
     case alternateBackground:
       return KGlobalSettings::alternateBackgroundColor();
@@ -466,13 +466,13 @@ TQColor KNConfig::Appearance::defaultColor(int i) const
 
     case normalText:
     case unreadThread:
-      return kapp->tqpalette().active().text();
+      return kapp->palette().active().text();
 
     case url:
       return KGlobalSettings::linkColor();
 
     case readThread:
-      return kapp->tqpalette().disabled().text();
+      return kapp->palette().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->tqpalette().disabled().text();
+  return kapp->palette().disabled().text();
 }
 
 
@@ -942,11 +942,11 @@ void KNConfig::PostNewsTechnical::save()
   conf->setGroup("POSTNEWS");
 
   conf->writeEntry("ComposerCharsets", c_omposerCharsets);
-  conf->writeEntry("Charset", TQString::tqfromLatin1(c_harset));
+  conf->writeEntry("Charset", TQString::fromLatin1(c_harset));
   conf->writeEntry("8BitEncoding", a_llow8BitBody);
   conf->writeEntry("UseOwnCharset", u_seOwnCharset);
   conf->writeEntry("generateMId", g_enerateMID);
-  conf->writeEntry("MIdhost", TQString::tqfromLatin1(h_ostname));
+  conf->writeEntry("MIdhost", TQString::fromLatin1(h_ostname));
   conf->writeEntry("dontIncludeUA", d_ontIncludeUA);
   conf->writeEntry("useExternalMailer", u_seExternalMailer);
 
@@ -1100,7 +1100,7 @@ KNConfig::Cleanup::Cleanup( bool global ) :
   // default values for new accounts / groups
   d_oExpire( true ), r_emoveUnavailable( true ), p_reserveThr( true ),
   e_xpireInterval( 5 ), r_eadMaxAge( 10 ), u_nreadMaxAge( 15 ),
-  mGlobal(global), mDefault(!global), mLastExpDate( TQDate::tqcurrentDate() )
+  mGlobal(global), mDefault(!global), mLastExpDate( TQDate::currentDate() )
 {
   if (mGlobal) {
     KConfig *conf = knGlobals.config();
@@ -1174,7 +1174,7 @@ bool KNConfig::Cleanup::expireToday()
   if (!d_oExpire)
     return false;
 
-  TQDate today = TQDate::tqcurrentDate();
+  TQDate today = TQDate::currentDate();
   if (mLastExpDate == TQDateTime(today))
     return false;
 
@@ -1184,7 +1184,7 @@ bool KNConfig::Cleanup::expireToday()
 
 void KNConfig::Cleanup::setLastExpireDate()
 {
-  mLastExpDate = TQDateTime::tqcurrentDateTime();
+  mLastExpDate = TQDateTime::currentDateTime();
 }
 
 
@@ -1193,7 +1193,7 @@ bool KNConfig::Cleanup::compactToday()
   if (!d_oCompact)
     return false;
 
-  TQDate today = TQDate::tqcurrentDate();
+  TQDate today = TQDate::currentDate();
   if (mLastCompDate == TQDateTime(today))
     return false;
 
@@ -1203,7 +1203,7 @@ bool KNConfig::Cleanup::compactToday()
 
 void KNConfig::Cleanup::setLastCompactDate()
 {
-  mLastCompDate = TQDateTime::tqcurrentDateTime();
+  mLastCompDate = TQDateTime::currentDateTime();
 }