From 9cc13dcbb01a96c9e60a07ca63c61d24b374f50d Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 16 Dec 2011 09:59:50 -0600
Subject: Revert "Rename a number of old tq methods that are no longer tq
 specific"

This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.
---
 kmail/kmail.kcfg | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'kmail/kmail.kcfg')

diff --git a/kmail/kmail.kcfg b/kmail/kmail.kcfg
index 5441da643..b2cd4d39e 100644
--- a/kmail/kmail.kcfg
+++ b/kmail/kmail.kcfg
@@ -3,7 +3,7 @@
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
       http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
-  <include>textcodec.h</include>
+  <include>tqtextcodec.h</include>
   <include>kapplication.h</include>
   <kcfgfile name="kmailrc"/>
     <group name="Behaviour">
@@ -561,10 +561,10 @@
        <default>true</default>
      </entry>
      <entry name="ForegroundColor" type="Color" key="ForegroundColor">
-       <default code="true">kapp->palette().active().text()</default>
+       <default code="true">kapp->tqpalette().active().text()</default>
      </entry>
      <entry name="BackgroundColor" type="Color" key="BackgroundColor">
-       <default code="true">kapp->palette().active().base()</default>
+       <default code="true">kapp->tqpalette().active().base()</default>
      </entry>
      <entry name="FallbackCharacterEncoding" type="String" key="FallbackCharacterEncoding">
        <default code="true"> TQCString(TQTextCodec::codecForLocale()->name()).lower() == "eucjp"? TQCString("jis7") : TQCString(TQTextCodec::codecForLocale()->name()).lower()</default>
-- 
cgit v1.2.1