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

---
 src/kile/kile.kcfg           | 2 +-
 src/kile/kilemultitabbar.cpp | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/kile/kile.kcfg b/src/kile/kile.kcfg
index 7a8519b..5b5e61a 100644
--- a/src/kile/kile.kcfg
+++ b/src/kile/kile.kcfg
@@ -5,7 +5,7 @@
       http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
 	<include>tqapplication.h</include>
 	<include>tqstring.h</include>
-	<include>tqtextcodec.h</include>
+	<include>textcodec.h</include>
 	<include>tqdir.h</include>
 
 	<kcfgfile name="kilerc"/>
diff --git a/src/kile/kilemultitabbar.cpp b/src/kile/kilemultitabbar.cpp
index a073d4e..40342e7 100644
--- a/src/kile/kilemultitabbar.cpp
+++ b/src/kile/kilemultitabbar.cpp
@@ -672,8 +672,8 @@ void KileMultiTabBarTab::drawButtonStyled(TQPainter *paint) {
 
 	if (isOn()) st|=TQStyle::Style_On;
 
-	tqstyle().drawControl(TQStyle::CE_PushButton,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), colorGroup(),st);
-	tqstyle().drawControl(TQStyle::CE_PushButtonLabel,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), colorGroup(),st);
+	style().drawControl(TQStyle::CE_PushButton,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), colorGroup(),st);
+	style().drawControl(TQStyle::CE_PushButtonLabel,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), colorGroup(),st);
 
 	switch (m_position) {
 		case KileMultiTabBar::Left:
@@ -689,7 +689,7 @@ void KileMultiTabBarTab::drawButtonStyled(TQPainter *paint) {
 			paint->drawPixmap(0,0,pixmap);
 			break;
 	}
-//	tqstyle().drawControl(TQStyle::CE_PushButtonLabel,painter,this, TQRect(0,0,pixmap.width(),pixmap.height()),
+//	style().drawControl(TQStyle::CE_PushButtonLabel,painter,this, TQRect(0,0,pixmap.width(),pixmap.height()),
 //		colorGroup(),TQStyle::Style_Enabled);