Remove additional unneeded tq method conversions

1 files changed, 37 insertions, 37 deletions

diff --git a/kpresenter/KPrCanvas.cpp b/kpresenter/KPrCanvas.cpp
index e5e97785..61c00c96 100644
--- a/kpresenter/KPrCanvas.cpp
+++ b/kpresenter/KPrCanvas.cpp
@@ -291,7 +291,7 @@ void KPrCanvas::paintEvent( TQPaintEvent* paintEvent )
         {
             //kdDebug(33001) << "KPrCanvas::paintEvent" << endl;
             TQPainter bufPainter;
-            bufPainter.tqbegin( TQT_TQPAINTDEVICE(&buffer), this ); // double-buffering - (the buffer is as big as the widget)
+            bufPainter.begin( TQT_TQPAINTDEVICE(&buffer), this ); // double-buffering - (the buffer is as big as the widget)
             bufPainter.translate( -diffx(), -diffy() );
             bufPainter.setBrushOrigin( -diffx(), -diffy() );
 
@@ -1202,7 +1202,7 @@ void KPrCanvas::mouseReleaseEvent( TQMouseEvent *e )
                 }
 
                 if ( mouseSelectedObject )
-                    _tqrepaint( false );
+                    _repaint( false );
                 emit objectSelectedChanged();
             }
         } break;
@@ -1379,7 +1379,7 @@ void KPrCanvas::mouseReleaseEvent( TQMouseEvent *e )
     emit objectSelectedChanged();
 
     if ( toolEditMode != TEM_MOUSE && editMode )
-        tqrepaint( false );
+        repaint( false );
 
     m_view->disableAutoScroll();
     mousePressed = false;
@@ -1542,7 +1542,7 @@ void KPrCanvas::mouseMoveEvent( TQMouseEvent *e )
                         angle -= 360;
 
                     m_rotateObject->rotate( angle );
-                    _tqrepaint( m_rotateObject );
+                    _repaint( m_rotateObject );
                 }
             }break;
             case INS_AUTOFORM:
@@ -2072,8 +2072,8 @@ void KPrCanvas::keyPressEvent( TQKeyEvent *e )
                         m_resizeObject->setOrig( m_rectBeforeResize.topLeft() );
                         m_resizeObject->setSize( m_rectBeforeResize.size() );
                         drawContour = false;
-                        m_view->kPresenterDoc()->tqrepaint( oldBoundingRect );
-                        m_view->kPresenterDoc()->tqrepaint( m_resizeObject );
+                        m_view->kPresenterDoc()->repaint( oldBoundingRect );
+                        m_view->kPresenterDoc()->repaint( m_resizeObject );
                         m_ratio = 0.0;
                         m_resizeObject = 0;
                         m_isResizing = false;
@@ -2243,7 +2243,7 @@ KPrObject * KPrCanvas::getObjectAt( const KoPoint &pos, bool withoutProtected )
 void KPrCanvas::selectObj( KPrObject *kpobject )
 {
     kpobject->setSelected( true );
-    _tqrepaint( kpobject );
+    _repaint( kpobject );
     emit objectSelectedChanged();
 
     mouseSelectedObject = true;
@@ -2252,7 +2252,7 @@ void KPrCanvas::selectObj( KPrObject *kpobject )
 void KPrCanvas::deSelectObj( KPrObject *kpobject )
 {
     kpobject->setSelected( false );
-    _tqrepaint( kpobject );
+    _repaint( kpobject );
 
     if ( !m_activePage->isOneObjectSelected() )
     {
@@ -2271,7 +2271,7 @@ void KPrCanvas::selectAllObj()
     }
 
     mouseSelectedObject = true;
-    _tqrepaint( false );
+    _repaint( false );
     emit objectSelectedChanged();
 }
 
@@ -2989,7 +2989,7 @@ void KPrCanvas::stopScreenPresentation()
     m_step.m_pageNumber = 0;
     editMode = true;
     m_drawMode = false;
-    tqrepaint( false );
+    repaint( false );
     setToolEditMode( toolEditMode );
     setWFlags( WResizeNoErase );
 }
@@ -3173,7 +3173,7 @@ bool KPrCanvas::pPrev( bool gotoPreviousPage )
         m_step.m_step = *( --it );
         //hopefully there are never more than 1000 sub steps :-)
         m_step.m_subStep = 1000;
-        tqrepaint( false );
+        repaint( false );
         return false;
     } else {
         // when we go back on the first slide, thats like starting the presentation again
@@ -3201,7 +3201,7 @@ bool KPrCanvas::pPrev( bool gotoPreviousPage )
         else
         {
             m_step.m_step = *( --m_pageEffectSteps.end() );
-            tqrepaint( false );
+            repaint( false );
         }
 
         return true;
@@ -3544,7 +3544,7 @@ void KPrCanvas::print( TQPainter *painter, KPrinter *printer, float /*left_margi
     //deSelectAllObj(); // already done in KPrView::setupPrinter
     int i = 0;
 
-    tqrepaint( false );
+    repaint( false );
     kapp->processEvents();
 
     editMode = false;
@@ -3633,7 +3633,7 @@ void KPrCanvas::print( TQPainter *painter, KPrinter *printer, float /*left_margi
 
     fillBlack = true;
     editMode = true;
-    tqrepaint( false );
+    repaint( false );
 }
 
 
@@ -3872,7 +3872,7 @@ void KPrCanvas::endDrawPolyline()
 
     emit objectSelectedChanged();
     if ( toolEditMode != TEM_MOUSE && editMode )
-        tqrepaint( false );
+        repaint( false );
     m_view->disableAutoScroll();
     mousePressed = false;
     modType = MT_NONE;
@@ -3885,7 +3885,7 @@ void KPrCanvas::endDrawCubicBezierCurve()
     insertCubicBezierCurve( m_pointArray );
     emit objectSelectedChanged();
     if ( toolEditMode != TEM_MOUSE && editMode )
-        tqrepaint( false );
+        repaint( false );
     m_view->disableAutoScroll();
     mousePressed = false;
     modType = MT_NONE;
@@ -3908,7 +3908,7 @@ void KPrCanvas::selectNext()
         }
     }
     m_view->showObjectRect( m_activePage->getSelectedObj() );
-    _tqrepaint( false );
+    _repaint( false );
 }
 
 void KPrCanvas::selectPrev()
@@ -3927,7 +3927,7 @@ void KPrCanvas::selectPrev()
         }
     }
     m_view->showObjectRect( m_activePage->getSelectedObj() );
-    _tqrepaint( false );
+    _repaint( false );
 }
 
 void KPrCanvas::dragEnterEvent( TQDragEnterEvent *e )
@@ -4285,19 +4285,19 @@ unsigned int KPrCanvas::pageNums() const
     return m_view->kPresenterDoc()->getPageNums();
 }
 
-void KPrCanvas::_tqrepaint( bool /*erase*/ )
+void KPrCanvas::_repaint( bool /*erase*/ )
 {
-    m_view->kPresenterDoc()->tqrepaint( false );
+    m_view->kPresenterDoc()->repaint( false );
 }
 
-void KPrCanvas::_tqrepaint( const TQRect &r )
+void KPrCanvas::_repaint( const TQRect &r )
 {
-    m_view->kPresenterDoc()->tqrepaint( r );
+    m_view->kPresenterDoc()->repaint( r );
 }
 
-void KPrCanvas::_tqrepaint( KPrObject *o )
+void KPrCanvas::_repaint( KPrObject *o )
 {
-    m_view->kPresenterDoc()->tqrepaint( o );
+    m_view->kPresenterDoc()->repaint( o );
 }
 
 void KPrCanvas::slotExitPres()
@@ -4327,7 +4327,7 @@ void KPrCanvas::setSwitchingMode( bool continueTimer )
         m_view->continueAutoPresTimer();
 }
 
-void KPrCanvas::exitEditMode( bool tqrepaint )
+void KPrCanvas::exitEditMode( bool repaint )
 {
     if ( m_editObject )
     {
@@ -4337,7 +4337,7 @@ void KPrCanvas::exitEditMode( bool tqrepaint )
             {
                 m_currentTextObjectView->clearSelection();
                 //hide cursor when we desactivate textObjectView
-                if ( tqrepaint )
+                if ( repaint )
                 {
                     m_currentTextObjectView->drawCursor( false );
                     m_currentTextObjectView->terminate();
@@ -4347,8 +4347,8 @@ void KPrCanvas::exitEditMode( bool tqrepaint )
                 delete m_currentTextObjectView;
                 m_currentTextObjectView = 0;
 
-                if ( tqrepaint )
-                    _tqrepaint( static_cast<KPrObject*>( kpTextObj ) );
+                if ( repaint )
+                    _repaint( static_cast<KPrObject*>( kpTextObj ) );
             }
             // Title of slide may have changed
             m_view->kPresenterDoc()->updateSideBarItem( m_activePage );
@@ -4358,7 +4358,7 @@ void KPrCanvas::exitEditMode( bool tqrepaint )
         else if (m_editObject->getType() == OT_PART )
         {
             static_cast<KPrPartObject *>(m_editObject)->deactivate();
-            _tqrepaint( m_editObject );
+            _repaint( m_editObject );
             m_editObject = 0;
             return;
         }
@@ -4632,7 +4632,7 @@ void KPrCanvas::moveObjectsByKey( int x, int y )
         move.setY( pageRect.bottom() - rect.bottom() );
     }
 
-    // we only want a tqrepaint if we have guide lines
+    // we only want a repaint if we have guide lines
     if ( snapToGuideLines )
     {
         // redraw guidelines (intentionally always)
@@ -4934,8 +4934,8 @@ void KPrCanvas::resizeObject( ModifyType _modType, const KoPoint & point, bool k
             m_gl.repaintSnapping( sp, snapStatus );
         }
 
-        _tqrepaint( oldBoundingRect );
-        _tqrepaint( kpobject );
+        _repaint( oldBoundingRect );
+        _repaint( kpobject );
         emit objectSizeChanged();
     }
 }
@@ -4963,7 +4963,7 @@ void KPrCanvas::finishResizeObject( const TQString &name, bool tqlayout )
 
         m_ratio = 0.0;
         m_isResizing = false;
-        _tqrepaint( m_resizeObject );
+        _repaint( m_resizeObject );
         m_resizeObject = NULL;
     }
 }
@@ -5321,14 +5321,14 @@ void KPrCanvas::textContentsToHeight()
             if ( !macro )
                 macro = new KMacroCommand(i18n("Extend Text Contents to Height"));
             macro->addCommand( cmd);
-            _tqrepaint( it.current() );
+            _repaint( it.current() );
         }
     }
     if( macro )
     {
         macro->execute();
         m_view->kPresenterDoc()->addCommand( macro );
-        m_view->kPresenterDoc()->tqrepaint(this);
+        m_view->kPresenterDoc()->repaint(this);
     }
 }
 
@@ -5354,7 +5354,7 @@ void KPrCanvas::textObjectToContents()
     {
         macro->execute();
         m_view->kPresenterDoc()->addCommand( macro );
-        m_view->kPresenterDoc()->tqrepaint(this);
+        m_view->kPresenterDoc()->repaint(this);
     }
 
 }
@@ -5444,7 +5444,7 @@ bool KPrCanvas::checkCurrentTextEdit( KPrTextObject * textObj )
     if ( textObj && m_currentTextObjectView && m_currentTextObjectView->kpTextObject() != textObj )
     {
         m_currentTextObjectView->kpTextObject()->setEditingTextObj( false );
-        _tqrepaint( m_currentTextObjectView->kpTextObject() );
+        _repaint( m_currentTextObjectView->kpTextObject() );
         //don't remove selection otherwise break dnd.
         m_currentTextObjectView->terminate(false);
         delete m_currentTextObjectView;