Rename old tq methods that no longer need a unique name

1 files changed, 18 insertions, 18 deletions

diff --git a/ksirc/kstextview.cpp b/ksirc/kstextview.cpp
index bd43d82c..ff198c02 100644
--- a/ksirc/kstextview.cpp
+++ b/ksirc/kstextview.cpp
@@ -245,7 +245,7 @@ Item *TextChunk::breakLine( int width )
     return 0;
 }
 
-Item::LayoutResettqStatus TextChunk::resetLayout()
+Item::LayoutResetStatus TextChunk::resetLayout()
 {
 
     if ( m_originalTextLength == 0 )
@@ -376,12 +376,12 @@ Item *TextChunk::hardBreak( const StringPtr &rightHandSide )
             selStart->offset -= m_text.len;
             selEnd->offset -= m_text.len;
             selStart->item = selEnd->item = chunk;
-            chunk->setSelectiontqStatus( m_selection );
+            chunk->setSelectionStatus( m_selection );
             m_selection = NoSelection;
         } else if ( selEnd->offset >= m_text.len ) {
             selEnd->offset -= m_text.len;
             selEnd->item = chunk;
-            chunk->setSelectiontqStatus( SelectionEnd );
+            chunk->setSelectionStatus( SelectionEnd );
             m_selection = SelectionStart;
         }
     }
@@ -389,7 +389,7 @@ Item *TextChunk::hardBreak( const StringPtr &rightHandSide )
     if ( selection && selection->offset >= m_text.len ) {
         selection->offset -= m_text.len;
         selection->item = chunk;
-        chunk->setSelectiontqStatus( m_selection );
+        chunk->setSelectionStatus( m_selection );
         m_selection = NoSelection;
     }
 
@@ -433,7 +433,7 @@ int TextChunk::paintSelection( TQPainter &p, int x, const StringPtr &text )
 
     const int width = m_metrics.width( str );
 
-    const TQColorGroup &cg = m_parag->textView()->tqcolorGroup();
+    const TQColorGroup &cg = m_parag->textView()->colorGroup();
 
     if (m_props.bgSelColor.isValid())
         p.fillRect( x, 0, width, height(), m_props.bgSelColor );
@@ -482,11 +482,11 @@ void TextChunk::mergeSelection( TextChunk *child, SelectionPoint *selection )
 
     selection->item = this;
 
-    if ( ( m_selection == SelectionStart && child->selectiontqStatus() == SelectionEnd ) ||
-         ( m_selection == SelectionEnd && child->selectiontqStatus() == SelectionStart ) )
+    if ( ( m_selection == SelectionStart && child->selectionStatus() == SelectionEnd ) ||
+         ( m_selection == SelectionEnd && child->selectionStatus() == SelectionStart ) )
         m_selection = SelectionBoth;
     else
-        m_selection = child->selectiontqStatus();
+        m_selection = child->selectionStatus();
 }
 
 ImageItem::ImageItem( TextParag *parag, const TQPixmap &pixmap )
@@ -512,7 +512,7 @@ void ImageItem::paint( TQPainter &painter )
       if (m_props.bgSelColor.isValid())
 	painter.fillRect( 0, 0, width(), h, m_props.bgSelColor );
       else {
-	const TQColorGroup &cg = m_parag->textView()->tqcolorGroup();
+	const TQColorGroup &cg = m_parag->textView()->colorGroup();
 	painter.fillRect( 0, 0, width(), h, cg.highlight() );
       }
     }
@@ -520,7 +520,7 @@ void ImageItem::paint( TQPainter &painter )
     painter.drawPixmap( 0, y, m_pixmap );
 }
 
-Item::LayoutResettqStatus ImageItem::resetLayout()
+Item::LayoutResetStatus ImageItem::resetLayout()
 {
     // nothin' to do
     return KeepItem;
@@ -1081,7 +1081,7 @@ TQString TextLine::updateSelection( const SelectionPoint &start, const Selection
     {
         if ( i == start.item )
         {
-            i->setSelectiontqStatus( Item::SelectionStart );
+            i->setSelectionStatus( Item::SelectionStart );
 
             StringPtr txt = i->text();
             if ( !txt.isNull() )
@@ -1090,7 +1090,7 @@ TQString TextLine::updateSelection( const SelectionPoint &start, const Selection
         }
         else if ( i == end.item )
         {
-            i->setSelectiontqStatus( Item::SelectionEnd );
+            i->setSelectionStatus( Item::SelectionEnd );
 
             StringPtr txt = i->text();
             if ( !txt.isNull() )
@@ -1098,7 +1098,7 @@ TQString TextLine::updateSelection( const SelectionPoint &start, const Selection
         }
         else
         {
-	    i->setSelectiontqStatus( Item::InSelection );
+	    i->setSelectionStatus( Item::InSelection );
 
             selectedText += i->text().toTQString();
         }
@@ -1111,7 +1111,7 @@ void TextLine::clearSelection()
 {
     Item *i = m_items.first();
     for (; i; i = m_items.next() )
-        i->setSelectiontqStatus( Item::NoSelection );
+        i->setSelectionStatus( Item::NoSelection );
 }
 
 void TextLine::appendItem( Item *i, int layoutUpdatePolicy )
@@ -1840,7 +1840,7 @@ void TextView::contentsMousePressEvent( TQMouseEvent *ev )
     Item *itemUnderMouse = itemAt( ev->pos(), &p, Item::SelectFuzzy );
     if ( p.item && ( ev->button() & Qt::LeftButton ) ) {
         m_selectionMaybeStart = p;
-        p.item->setSelectiontqStatus( Item::NoSelection );
+        p.item->setSelectionStatus( Item::NoSelection );
     }
     if ( TextChunk *text = dynamic_cast<TextChunk *>( itemUnderMouse ) ) {
         StringPtr href = text->props().attributes[ "href" ];
@@ -2103,11 +2103,11 @@ TQString TextView::updateSelection( const SelectionPoint &start, const Selection
         {
             if ( start.pos.x() == end.pos.x() )
             {
-                i->setSelectiontqStatus( Item::NoSelection );
+                i->setSelectionStatus( Item::NoSelection );
                 return TQString();
             }
 
-            i->setSelectiontqStatus( Item::SelectionBoth );
+            i->setSelectionStatus( Item::SelectionBoth );
 
             // ### ugly
             const TextChunk *t = dynamic_cast<TextChunk *>( i );
@@ -2119,7 +2119,7 @@ TQString TextView::updateSelection( const SelectionPoint &start, const Selection
         }
         else
         {
-            i->setSelectiontqStatus( Item::SelectionBoth );
+            i->setSelectionStatus( Item::SelectionBoth );
 
             // ### ugly
             TextChunk *t = dynamic_cast<TextChunk *>( i );