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

This reverts commit 13281e2856a2ef43bbab78c5528470309c23aa77.
---
 kate/part/katerenderer.cpp | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'kate/part/katerenderer.cpp')

diff --git a/kate/part/katerenderer.cpp b/kate/part/katerenderer.cpp
index 48b73d7e5..143d24f6d 100644
--- a/kate/part/katerenderer.cpp
+++ b/kate/part/katerenderer.cpp
@@ -69,9 +69,9 @@ void KateRenderer::updateAttributes ()
 KateAttribute* KateRenderer::attribute(uint pos)
 {
   if (pos < m_attributes->size())
-    return &m_attributes->at(pos);
+    return &m_attributes->tqat(pos);
 
-  return &m_attributes->at(0);
+  return &m_attributes->tqat(0);
 }
 
 void KateRenderer::setDrawCaret(bool drawCaret)
@@ -537,13 +537,13 @@ void KateRenderer::paintTextLine(TQPainter& paint, const KateLineRange* range, i
             if (isIMSel && !isTab)
             {
               // input method selection
-              fillColor = m_view->colorGroup().color(TQColorGroup::Foreground);
+              fillColor = m_view->tqcolorGroup().color(TQColorGroup::Foreground);
             }
             else if (isIMEdit && !isTab)
             {
               // XIM support
               // input method edit area
-              const TQColorGroup& cg = m_view->colorGroup();
+              const TQColorGroup& cg = m_view->tqcolorGroup();
               int h1, s1, v1, h2, s2, v2;
               TQColor(cg.color( TQColorGroup::Base )).hsv( &h1, &s1, &v1 );
               TQColor(cg.color( TQColorGroup::Background )).hsv( &h2, &s2, &v2 );
@@ -576,7 +576,7 @@ void KateRenderer::paintTextLine(TQPainter& paint, const KateLineRange* range, i
             if (isIMSel && paintBackground && !isTab)
             {
               paint.save();
-              paint.setPen( m_view->colorGroup().color( TQColorGroup::BrightText ) );
+              paint.setPen( m_view->tqcolorGroup().color( TQColorGroup::BrightText ) );
             }
 
             // Draw indentation markers.
@@ -745,7 +745,7 @@ uint KateRenderer::textWidth(const KateTextLine::Ptr &textLine, int cursorCol)
 
   KateFontStruct *fs = config()->fontStruct();
 
-  const TQChar *unicode = textLine->text();
+  const TQChar *tqunicode = textLine->text();
   const TQString &textString = textLine->string();
 
   int x = 0;
@@ -763,7 +763,7 @@ uint KateRenderer::textWidth(const KateTextLine::Ptr &textLine, int cursorCol)
 
     x += width;
 
-    if (z < len && unicode[z] == TQChar('\t'))
+    if (z < len && tqunicode[z] == TQChar('\t'))
       x -= x % width;
   }
 
@@ -787,7 +787,7 @@ uint KateRenderer::textWidth(const KateTextLine::Ptr &textLine, uint startcol, u
   *needWrap = false;
 
   const uint len = textLine->length();
-  const TQChar *unicode = textLine->text();
+  const TQChar *tqunicode = textLine->text();
   const TQString &textString = textLine->string();
 
   uint z = startcol;
@@ -800,10 +800,10 @@ uint KateRenderer::textWidth(const KateTextLine::Ptr &textLine, uint startcol, u
 
     // How should tabs be treated when they word-wrap on a print-out?
     // if startcol != 0, this messes up (then again, word wrapping messes up anyway)
-    if (unicode[z] == TQChar('\t'))
+    if (tqunicode[z] == TQChar('\t'))
       x -= x % width;
 
-    if (unicode[z].isSpace())
+    if (tqunicode[z].isSpace())
     {
       lastWhiteSpace = z+1;
       lastWhiteSpaceX = x;
@@ -887,7 +887,7 @@ uint KateRenderer::textWidth( KateTextCursor &cursor, int xPos, uint startCol)
   if (!textLine) return 0;
 
   const uint len = textLine->length();
-  const TQChar *unicode = textLine->text();
+  const TQChar *tqunicode = textLine->text();
   const TQString &textString = textLine->string();
 
   x = oldX = 0;
@@ -906,7 +906,7 @@ uint KateRenderer::textWidth( KateTextCursor &cursor, int xPos, uint startCol)
 
     x += width;
 
-    if (z < len && unicode[z] == TQChar('\t'))
+    if (z < len && tqunicode[z] == TQChar('\t'))
       x -= x % width;
 
     z++;
-- 
cgit v1.2.1