From 1d7f2552fa95ea4866c9a8e79f69284fabf352ed Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sat, 24 Dec 2011 11:56:10 -0600
Subject: [PATCH] Rename a few stragglers (cherry picked from commit
 5194c8134a168b652142232299d6db4f813aef20)

---
 kmail/headerstyle.cpp | 2 +-
 kmail/kmail.kcfg      | 2 +-
 knode/knwidgets.cpp   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kmail/headerstyle.cpp b/kmail/headerstyle.cpp
index af790014..436e16fe 100644
--- a/kmail/headerstyle.cpp
+++ b/kmail/headerstyle.cpp
@@ -901,7 +901,7 @@ namespace KMail {
 	// colors depend on if its encapsulated or not
         TQColor fontColor(TQt::white);
 	TQString linkColor = "class =\"white\"";
-	const TQColor activeColor = tqApp->tqpalette().active().highlight();
+	const TQColor activeColor = tqApp->palette().active().highlight();
 	TQColor activeColorDark = activeColor.dark(130);
         // reverse colors for encapsulated
         if( !topLevel ){
diff --git a/kmail/kmail.kcfg b/kmail/kmail.kcfg
index b70627c2..022d4af8 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>tqtextcodec.h</include>
+  <include>textcodec.h</include>
   <include>kapplication.h</include>
   <kcfgfile name="kmailrc"/>
     <group name="Behaviour">
diff --git a/knode/knwidgets.cpp b/knode/knwidgets.cpp
index e2afa4cf..b4c9a160 100644
--- a/knode/knwidgets.cpp
+++ b/knode/knwidgets.cpp
@@ -143,7 +143,7 @@ void KNDockWidgetHeaderDrag::paintEvent(TQPaintEvent* ev)
   paint.begin(&drawBuffer);
   paint.fillRect(drawBuffer.rect(), TQBrush(colorGroup().brush(TQColorGroup::Background)));
 
-  paint.setPen(tqpalette().active().highlight());
+  paint.setPen(palette().active().highlight());
   paint.drawLine(1, 2, width(), 2);
   paint.drawLine(1, 3, width(), 3);
   paint.drawLine(1, 5, width(), 5);