Replaced various '#define' with actual strings - part 3

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit dcc4dc7a89e5f5f7fb4217815b892f4b0106d5a0)

5 files changed, 14 insertions, 14 deletions

diff --git a/lib/kofficeui/KoTooluButton.cpp b/lib/kofficeui/KoTooluButton.cpp
index f2c64a32c..1c5f5f1ff 100644
--- a/lib/kofficeui/KoTooluButton.cpp
+++ b/lib/kofficeui/KoTooluButton.cpp
@@ -368,7 +368,7 @@ void KoColorPanel::paintEvent( TQPaintEvent* e )
     // The "active" element (if there is one)
     if ( hasFocus() && m_focusPosition.x != -1 && m_focusPosition.y != -1 &&
          mapFromPosition( m_focusPosition ).intersects( e->rect() ) )
-        style().tqdrawPrimitive( TQStyle::PE_Panel, &p, TQRect( m_focusPosition.x << 4, m_focusPosition.y << 4, TILESIZE, TILESIZE ),
+        style().drawPrimitive( TQStyle::PE_Panel, &p, TQRect( m_focusPosition.x << 4, m_focusPosition.y << 4, TILESIZE, TILESIZE ),
                                colorGroup(), TQStyle::Style_Sunken | TQStyle::Style_Enabled );
 
     --lns;  // Attention: We just avoid some lns - 1 statements
@@ -579,7 +579,7 @@ void KoColorPanel::updateFocusPosition( const Position& newPosition )
     TQMap<Position, TQColor>::ConstIterator it = m_colorMap.find( m_focusPosition );
     if ( it != m_colorMap.end() ) {
         // draw at the new focus position
-        style().tqdrawPrimitive( TQStyle::PE_Panel, &p, TQRect( m_focusPosition.x << 4, m_focusPosition.y << 4, TILESIZE, TILESIZE ),
+        style().drawPrimitive( TQStyle::PE_Panel, &p, TQRect( m_focusPosition.x << 4, m_focusPosition.y << 4, TILESIZE, TILESIZE ),
                                colorGroup(), TQStyle::Style_Sunken | TQStyle::Style_Enabled );
         p.fillRect( ( m_focusPosition.x << 4 ) + 2, ( m_focusPosition.y << 4 ) + 2, 12, 12, it.data() );
     }
@@ -720,7 +720,7 @@ void KoToolButton::drawButton(TQPainter *_painter)
     _painter->setClipping( false );
 
     // ...and the arrow indicating the popup
-    style().tqdrawPrimitive( TQStyle::PE_ArrowDown, _painter, TQRect( width() - ARROW_WIDTH - 1, 0, ARROW_WIDTH, height() ),
+    style().drawPrimitive( TQStyle::PE_ArrowDown, _painter, TQRect( width() - ARROW_WIDTH - 1, 0, ARROW_WIDTH, height() ),
                            cg, flags, opt );
 
     if ( TDEToolBarButton::isRaised() || m_arrowPressed )
diff --git a/lib/kofficeui/tkcombobox.cpp b/lib/kofficeui/tkcombobox.cpp
index 592e3856a..588ffeb5a 100644
--- a/lib/kofficeui/tkcombobox.cpp
+++ b/lib/kofficeui/tkcombobox.cpp
@@ -91,7 +91,7 @@ void TKComboBox::paintEvent(TQPaintEvent*)
   style().drawItem( &p, TQRect( bx, by, bw, bh), AlignCenter, colorGroup(), isEnabled(), &pixmap, TQString() );
 
   if ( hasFocus()) {
-    style().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, fr, g );
+    style().drawPrimitive( TQStyle::PE_FocusRect, &p, fr, g );
   }
 
   if (!editable()) {
diff --git a/lib/koproperty/editoritem.cpp b/lib/koproperty/editoritem.cpp
index 7c0d7c24f..2d2b99de5 100644
--- a/lib/koproperty/editoritem.cpp
+++ b/lib/koproperty/editoritem.cpp
@@ -133,7 +133,7 @@ class GroupWidgetBase : public TQWidget
 			TQRect r(rect());
 			TQPainter p(this);
 			TQStyle::StyleFlags flags = m_mouseDown ? TQStyle::Style_Down : TQStyle::Style_Default;
-			kapp->style().tqdrawPrimitive(TQStyle::PE_HeaderSection, &p, r, palette().active(), flags);
+			kapp->style().drawPrimitive(TQStyle::PE_HeaderSection, &p, r, palette().active(), flags);
 
 			paintListViewExpander(&p, this, r.height()+2, palette().active(), isOpen());
 			if (!m_miniicon.isNull()) {
diff --git a/lib/kotext/KoTextFormatter.cpp b/lib/kotext/KoTextFormatter.cpp
index 60e6528f5..5fb9cdc28 100644
--- a/lib/kotext/KoTextFormatter.cpp
+++ b/lib/kotext/KoTextFormatter.cpp
@@ -118,7 +118,7 @@ TQPair<int, int> KoTextFormatterCore::determineCharWidth()
     }
     Q_ASSERT( ww >= 0 );
     c->width = ww;
-    return tqMakePair(ww, pixelww);
+    return qMakePair(ww, pixelww);
 }
 
 
@@ -257,7 +257,7 @@ bool KoTextFormatterCore::format()
 
     int col = 0;
 
-    maxAvailableWidth = tqMakePair( 0, 0 );
+    maxAvailableWidth = qMakePair( 0, 0 );
 
     KoTextZoomHandler *zh = doc->formattingZoomHandler();
     int pixelx = zh->layoutUnitToPixelX( x );
diff --git a/lib/kotext/KoTextIterator.cpp b/lib/kotext/KoTextIterator.cpp
index 73468f7e1..8ac76173d 100644
--- a/lib/kotext/KoTextIterator.cpp
+++ b/lib/kotext/KoTextIterator.cpp
@@ -306,19 +306,19 @@ TQPair<int, TQString> KoTextIterator::currentTextAndIndex() const
     if ( m_currentParag == m_firstParag )
     {
         if ( m_firstParag == m_lastParag ) // special case, needs truncating at both ends
-            return forw ? tqMakePair( m_firstIndex, str.mid( m_firstIndex, m_lastIndex - m_firstIndex ) )
-                : tqMakePair( m_lastIndex, str.mid( m_lastIndex, m_firstIndex - m_lastIndex ) );
+            return forw ? qMakePair( m_firstIndex, str.mid( m_firstIndex, m_lastIndex - m_firstIndex ) )
+                : qMakePair( m_lastIndex, str.mid( m_lastIndex, m_firstIndex - m_lastIndex ) );
         else
-            return forw ? tqMakePair( m_firstIndex, str.mid( m_firstIndex ) )
-                        : tqMakePair( 0, str.left( m_firstIndex ) );
+            return forw ? qMakePair( m_firstIndex, str.mid( m_firstIndex ) )
+                        : qMakePair( 0, str.left( m_firstIndex ) );
     }
     if ( m_currentParag == m_lastParag )
     {
-        return forw ? tqMakePair( 0, str.left( m_lastIndex ) )
-                    : tqMakePair( m_lastIndex, str.mid( m_lastIndex ) );
+        return forw ? qMakePair( 0, str.left( m_lastIndex ) )
+                    : qMakePair( m_lastIndex, str.mid( m_lastIndex ) );
     }
     // Not the first parag, nor the last, so we return it all
-    return tqMakePair( 0, str );
+    return qMakePair( 0, str );
 }
 
 bool KoTextIterator::hasText() const