diff options
Diffstat (limited to 'kpresenter')
53 files changed, 433 insertions, 433 deletions
diff --git a/kpresenter/KPrAutoformObject.cpp b/kpresenter/KPrAutoformObject.cpp index 60c5cdcb..90a1eeba 100644 --- a/kpresenter/KPrAutoformObject.cpp +++ b/kpresenter/KPrAutoformObject.cpp @@ -80,8 +80,8 @@ bool KPrAutoformObject::saveOasisObjectAttributes( KPOasisSaveContext &sc ) cons kdDebug(33001) << "bool KPrAutoformObject::saveOasisObjectAttributes()" << endl; TQSize size( int( ext.width() * 100 ), int( ext.height() * 100 ) ); - sc.xmlWriter.addAttribute( "svg:viewBox", TQString( "0 0 %1 %2" ).tqarg( size.width() ) - .tqarg( size.height() ) ); + sc.xmlWriter.addAttribute( "svg:viewBox", TQString( "0 0 %1 %2" ).arg( size.width() ) + .arg( size.height() ) ); TQPointArray points = const_cast<ATFInterpreter &>( atfInterp ).getPointArray( size.width(), size.height() ); @@ -93,14 +93,14 @@ bool KPrAutoformObject::saveOasisObjectAttributes( KPOasisSaveContext &sc ) cons --pointCount; TQString d; - d += TQString( "M%1 %2" ).tqarg( points.at(pos).x() ) - .tqarg( points.at(pos).y() ); + d += TQString( "M%1 %2" ).arg( points.at(pos).x() ) + .arg( points.at(pos).y() ); ++pos; while ( pos < pointCount ) { - d += TQString( "L%1 %2" ).tqarg( points.at( pos ).x() ) - .tqarg( points.at( pos ).y() ); + d += TQString( "L%1 %2" ).arg( points.at( pos ).x() ) + .arg( points.at( pos ).y() ); ++pos; } diff --git a/kpresenter/KPrBackDia.cpp b/kpresenter/KPrBackDia.cpp index b404231d..fb87b9f3 100644 --- a/kpresenter/KPrBackDia.cpp +++ b/kpresenter/KPrBackDia.cpp @@ -313,7 +313,7 @@ void KPrBackDialog::updateConfiguration() { kdDebug(33001) << "set backgound to master" << endl; preview->backGround()->setBackGround( m_page->masterPage()->background()->getBackGround() ); - preview->tqrepaint( true ); + preview->repaint( true ); } else { @@ -331,7 +331,7 @@ void KPrBackDialog::updateConfiguration() preview->backGround()->setBackType( getBackType() ); if ( preview->isVisible() && isVisible() ) { preview->backGround()->reload(); // ### TODO: instead of reloading, load or remove the picture correctly. - preview->tqrepaint( true ); + preview->repaint( true ); } picChanged = false; diff --git a/kpresenter/KPrBezierCurveObject.cpp b/kpresenter/KPrBezierCurveObject.cpp index 0b12115e..a2e71ea0 100644 --- a/kpresenter/KPrBezierCurveObject.cpp +++ b/kpresenter/KPrBezierCurveObject.cpp @@ -60,31 +60,31 @@ KPrBezierCurveObject &KPrBezierCurveObject::operator=( const KPrBezierCurveObjec bool KPrBezierCurveObject::saveOasisObjectAttributes( KPOasisSaveContext &sc ) const { KoRect rect( getRect() ); - sc.xmlWriter.addAttribute("svg:viewBox", TQString( "0 0 %1 %2" ).tqarg( int( rect.width() * 100 ) ) - .tqarg( int( rect.height() * 100 ) ) ); + sc.xmlWriter.addAttribute("svg:viewBox", TQString( "0 0 %1 %2" ).arg( int( rect.width() * 100 ) ) + .arg( int( rect.height() * 100 ) ) ); unsigned int pointCount = points.count(); unsigned int pos = 0; TQString d; - d += TQString( "M%1 %2" ).tqarg( int( points.at(pos).x() * 100 ) ) - .tqarg( int( points.at(pos).y() * 100 ) ); + d += TQString( "M%1 %2" ).arg( int( points.at(pos).x() * 100 ) ) + .arg( int( points.at(pos).y() * 100 ) ); while ( pos + 4 <= pointCount ) { - d += TQString( "C%1 %2 %3 %4 %5 %6" ).tqarg( int( points.at( pos + 2 ).x() * 100 ) ) - .tqarg( int( points.at( pos + 2 ).y() * 100 ) ) - .tqarg( int( points.at( pos + 3 ).x() * 100 ) ) - .tqarg( int( points.at( pos + 3 ).y() * 100 ) ) - .tqarg( int( points.at( pos + 1 ).x() * 100 ) ) - .tqarg( int( points.at( pos + 1 ).y() * 100 ) ); + d += TQString( "C%1 %2 %3 %4 %5 %6" ).arg( int( points.at( pos + 2 ).x() * 100 ) ) + .arg( int( points.at( pos + 2 ).y() * 100 ) ) + .arg( int( points.at( pos + 3 ).x() * 100 ) ) + .arg( int( points.at( pos + 3 ).y() * 100 ) ) + .arg( int( points.at( pos + 1 ).x() * 100 ) ) + .arg( int( points.at( pos + 1 ).y() * 100 ) ); pos += 4; } if ( pos < pointCount ) { - d += TQString( "L%1 %2" ).tqarg( int( points.at( pos + 1 ).x() * 100 ) ) - .tqarg( int( points.at( pos + 1 ).y() * 100 ) ); + d += TQString( "L%1 %2" ).arg( int( points.at( pos + 1 ).x() * 100 ) ) + .arg( int( points.at( pos + 1 ).y() * 100 ) ); } sc.xmlWriter.addAttribute( "svg:d", d ); diff --git a/kpresenter/KPrBrush.cpp b/kpresenter/KPrBrush.cpp index 06954f7c..71ea95fd 100644 --- a/kpresenter/KPrBrush.cpp +++ b/kpresenter/KPrBrush.cpp @@ -73,8 +73,8 @@ TQString KPrBrush::saveOasisGradientStyle( KoGenStyles& mainStyles ) const if ( getGUnbalanced() ) { - unbalancedx = TQString( "%1%" ).tqarg( getGXFactor() / 4 + 50 ); - unbalancedy = TQString( "%1%" ).tqarg( getGYFactor() / 4 + 50 ); + unbalancedx = TQString( "%1%" ).arg( getGXFactor() / 4 + 50 ); + unbalancedy = TQString( "%1%" ).arg( getGYFactor() / 4 + 50 ); } gradientStyle.addAttribute( "draw:cx", unbalancedx ); gradientStyle.addAttribute( "draw:cy", unbalancedy ); diff --git a/kpresenter/KPrBrushProperty.cpp b/kpresenter/KPrBrushProperty.cpp index 6e550fe0..eee5d6c9 100644 --- a/kpresenter/KPrBrushProperty.cpp +++ b/kpresenter/KPrBrushProperty.cpp @@ -57,14 +57,14 @@ KPrBrushProperty::KPrBrushProperty( TQWidget *parent, const char *name, const KP m_brushUI = new BrushPropertyUI( m_stack ); - m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).tqarg( 100 ) ); - m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).tqarg( 94 ) ); - m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).tqarg( 88 ) ); - m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).tqarg( 63 ) ); - m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).tqarg( 50 ) ); - m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).tqarg( 37 ) ); - m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).tqarg( 12 ) ); - m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).tqarg( 6 ) ); + m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).arg( 100 ) ); + m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).arg( 94 ) ); + m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).arg( 88 ) ); + m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).arg( 63 ) ); + m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).arg( 50 ) ); + m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).arg( 37 ) ); + m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).arg( 12 ) ); + m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).arg( 6 ) ); m_brushUI->styleCombo->insertItem( i18n( "Horizontal Lines" ) ); m_brushUI->styleCombo->insertItem( i18n( "Vertical Lines" ) ); m_brushUI->styleCombo->insertItem( i18n( "Crossing Lines" ) ); 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; diff --git a/kpresenter/KPrCanvas.h b/kpresenter/KPrCanvas.h index e2b373e1..f5355be7 100644 --- a/kpresenter/KPrCanvas.h +++ b/kpresenter/KPrCanvas.h @@ -376,8 +376,8 @@ exportPage( 0, s, 800, 600, "/home/khz/page0.png", "PNG", 100 ); void objectPopup( KPrObject *object, const TQPoint &point ); public slots: - // use tqrepaint = false when the KPrCanvas is destroyed to avaid a possible crash - void exitEditMode( bool tqrepaint = true ); + // use repaint = false when the KPrCanvas is destroyed to avaid a possible crash + void exitEditMode( bool repaint = true ); void clipCut(); void clipCopy(); @@ -543,9 +543,9 @@ protected: TQRect getPageRect( bool decBorders = true ) const; unsigned int pageNums() const; - void _tqrepaint( bool erase=true ); - void _tqrepaint( const TQRect &r ); - void _tqrepaint( KPrObject *o ); + void _repaint( bool erase=true ); + void _repaint( const TQRect &r ); + void _repaint( KPrObject *o ); /** * Draw page defined in step to painter. @@ -692,7 +692,7 @@ private: * @param pos the point which should be snapped * @param repaintSnapping true if the guides should be repainted. * @param repaintSnapping false when the guides should not be repainted. - * You have to call tqrepaint by yourself. + * You have to call repaint by yourself. * * @return the position of the snapped point */ diff --git a/kpresenter/KPrClosedLineObject.cpp b/kpresenter/KPrClosedLineObject.cpp index be409183..208335f5 100644 --- a/kpresenter/KPrClosedLineObject.cpp +++ b/kpresenter/KPrClosedLineObject.cpp @@ -297,9 +297,9 @@ void KPrClosedLineObject::loadOasis( const TQDomElement &element, KoOasisContext points = parser.getPoints( d, true ); loadOasisApplyViewBox( element, points ); } - else if ( tag == "custom-tqshape" ) + else if ( tag == "custom-shape" ) { - TQDomElement enhancedGeometry = KoDom::namedItemNS( element, KoXmlNS::draw, "enhanced-tqgeometry" ); + TQDomElement enhancedGeometry = KoDom::namedItemNS( element, KoXmlNS::draw, "enhanced-geometry" ); if ( !enhancedGeometry.isNull() ) { diff --git a/kpresenter/KPrCommand.cpp b/kpresenter/KPrCommand.cpp index 5236aaf6..85e66845 100644 --- a/kpresenter/KPrCommand.cpp +++ b/kpresenter/KPrCommand.cpp @@ -94,7 +94,7 @@ void KPrShadowCmd::execute() it.current()->setShadowParameter(newShadow.shadowDistance, newShadow.shadowDirection, newShadow.shadowColor); - doc->tqrepaint( false ); + doc->repaint( false ); doc->updateSideBarItem( m_page ); } @@ -105,7 +105,7 @@ void KPrShadowCmd::unexecute() objects.at( i )->setShadowParameter(oldShadow.at(i)->shadowDistance, oldShadow.at(i)->shadowDirection, oldShadow.at(i)->shadowColor); - doc->tqrepaint( false ); + doc->repaint( false ); doc->updateSideBarItem( m_page ); } @@ -145,7 +145,7 @@ void KPrSetOptionsCmd::execute() doc->setGridValue( gridX, gridY, false ); doc->updateRuler(); doc->setTxtBackCol( txtBackCol ); - doc->tqrepaint( false ); + doc->repaint( false ); } void KPrSetOptionsCmd::unexecute() @@ -155,7 +155,7 @@ void KPrSetOptionsCmd::unexecute() doc->setGridValue( oldGridX, oldGridY, false ); doc->updateRuler(); doc->setTxtBackCol( otxtBackCol ); - doc->tqrepaint( false ); + doc->repaint( false ); } KPrSetBackCmd::KPrSetBackCmd( const TQString &name, const KPrBackGround::Settings &settings, @@ -189,7 +189,7 @@ void KPrSetBackCmd::execute() } } - m_doc->tqrepaint( false ); + m_doc->repaint( false ); if ( m_takeGlobal ) { TQPtrListIterator<KPrPage> it( m_doc->getPageList() ); @@ -217,7 +217,7 @@ void KPrSetBackCmd::unexecute() m_doc->restoreBackground(it.current()); } } - m_doc->tqrepaint( false ); + m_doc->repaint( false ); if ( m_takeGlobal ) { TQPtrListIterator<KPrPage> it( m_doc->getPageList() ); @@ -272,7 +272,7 @@ void KPrRotateCmd::execute() it.current()->rotate( m_newAngle ); } m_doc->updateRuler(); - m_doc->tqrepaint( false ); + m_doc->repaint( false ); m_doc->updateSideBarItem( m_page ); } @@ -282,7 +282,7 @@ void KPrRotateCmd::unexecute() for ( unsigned int i = 0; i < m_objects.count(); i++ ) m_objects.at(i)->rotate( m_oldAngles.at( i )->angle ); m_doc->updateRuler(); - m_doc->tqrepaint( false ); + m_doc->repaint( false ); m_doc->updateSideBarItem( m_page ); } @@ -311,7 +311,7 @@ KPrChgPixCmd::~KPrChgPixCmd() void KPrChgPixCmd::execute() { m_page->replaceObject( oldObject, newObject ); - doc->tqrepaint( newObject ); + doc->repaint( newObject ); doc->updateSideBarItem( m_page ); } @@ -319,7 +319,7 @@ void KPrChgPixCmd::execute() void KPrChgPixCmd::unexecute() { m_page->replaceObject( newObject, oldObject ); - doc->tqrepaint( oldObject ); + doc->repaint( oldObject ); doc->updateSideBarItem( m_page ); } @@ -378,7 +378,7 @@ void KPrDeleteCmd::execute() for ( itDelete.toFirst(); itDelete.current(); ++itDelete ) { TQRect oldRect = m_doc->zoomHandler()->zoomRect( itDelete.current()->getRepaintRect() ); - m_doc->tqrepaint( oldRect ); + m_doc->repaint( oldRect ); } if(textObj) m_doc->updateRuler(); @@ -393,7 +393,7 @@ void KPrDeleteCmd::unexecute() for ( ; it.current(); ++it ) { it.current()->addToObjList(); - m_doc->tqrepaint( it.current() ); + m_doc->repaint( it.current() ); } m_doc->updateSideBarItem( m_page ); @@ -501,7 +501,7 @@ void KPrGroupObjCmd::execute() m_groupObject->setSelected( true ); m_doc->refreshGroupButton(); - m_doc->tqrepaint( false ); + m_doc->repaint( false ); m_doc->updateSideBarItem( m_page ); } @@ -522,7 +522,7 @@ void KPrGroupObjCmd::unexecute() m_doc->refreshGroupButton(); - m_doc->tqrepaint( false ); + m_doc->repaint( false ); m_doc->updateSideBarItem( m_page ); } @@ -561,7 +561,7 @@ void UnGroupObjCmd::execute() m_doc->refreshGroupButton(); - m_doc->tqrepaint( false ); + m_doc->repaint( false ); m_doc->updateSideBarItem( m_page ); } @@ -587,7 +587,7 @@ void UnGroupObjCmd::unexecute() m_groupObject->setSelected( true ); m_doc->refreshGroupButton(); - m_doc->tqrepaint( false ); + m_doc->repaint( false ); m_doc->updateSideBarItem( m_page ); } @@ -641,7 +641,7 @@ void KPrInsertCmd::execute() m_object->addToObjList(); if ( m_object->getType() == OT_TEXT ) m_doc->updateRuler(); - m_doc->tqrepaint( m_object ); + m_doc->repaint( m_object ); } else { @@ -653,7 +653,7 @@ void KPrInsertCmd::execute() ( *it )->addToObjList(); if ( ( *it )->getType() == OT_TEXT ) updateRuler = true; - m_doc->tqrepaint( *it ); + m_doc->repaint( *it ); } if ( updateRuler ) m_doc->updateRuler(); @@ -678,7 +678,7 @@ void KPrInsertCmd::unexecute() m_doc->updateRuler(); } } - m_doc->tqrepaint( oldRect ); + m_doc->repaint( oldRect ); } else { @@ -703,7 +703,7 @@ void KPrInsertCmd::unexecute() if ( updateRuler ) m_doc->updateRuler(); - m_doc->tqrepaint( false ); + m_doc->repaint( false ); } m_doc->updateSideBarItem( m_page ); @@ -736,7 +736,7 @@ KPrLowerRaiseCmd::~KPrLowerRaiseCmd() void KPrLowerRaiseCmd::execute() { m_page->setObjectList( newList ); - doc->tqrepaint( false ); + doc->repaint( false ); doc->updateSideBarItem( m_page ); } @@ -744,7 +744,7 @@ void KPrLowerRaiseCmd::execute() void KPrLowerRaiseCmd::unexecute() { m_page->setObjectList( oldList ); - doc->tqrepaint( false ); + doc->repaint( false ); doc->updateSideBarItem( m_page ); } @@ -783,8 +783,8 @@ void KPrMoveByCmd::execute() if(objects.at(i)->isSelected()) doc->updateRuler(); } - doc->tqrepaint( oldRect ); - doc->tqrepaint( objects.at( i ) ); + doc->repaint( oldRect ); + doc->repaint( objects.at( i ) ); } doc->updateSideBarItem( m_page ); @@ -803,8 +803,8 @@ void KPrMoveByCmd::unexecute() if(objects.at(i)->isSelected()) doc->updateRuler(); } - doc->tqrepaint( oldRect ); - doc->tqrepaint( objects.at( i ) ); + doc->repaint( oldRect ); + doc->repaint( objects.at( i ) ); } doc->updateSideBarItem( m_page ); @@ -888,8 +888,8 @@ void KPrAlignCmd::execute() doc->updateRuler(); } - doc->tqrepaint( oldRect ); - doc->tqrepaint( objects.at( i ) ); + doc->repaint( oldRect ); + doc->repaint( objects.at( i ) ); } doc->updateSideBarItem( m_page ); @@ -907,8 +907,8 @@ void KPrAlignCmd::unexecute() if(objects.at(i)->isSelected()) doc->updateRuler(); } - doc->tqrepaint( oldRect ); - doc->tqrepaint( objects.at( i ) ); + doc->repaint( oldRect ); + doc->repaint( objects.at( i ) ); doc->updateRuler(); } @@ -976,7 +976,7 @@ void KoPenCmd::applyPen( KPrObject *object, Pen *tmpPen ) //obj->setPen( tmpPen->pen ); obj->setLineBegin( tmpPen->lineBegin ); obj->setLineEnd( tmpPen->lineEnd ); - //doc->tqrepaint( obj ); + //doc->repaint( obj ); } } break; case OT_FREEHAND: @@ -990,7 +990,7 @@ void KoPenCmd::applyPen( KPrObject *object, Pen *tmpPen ) //obj->setPen( tmpPen->pen ); obj->setLineBegin( tmpPen->lineBegin ); obj->setLineEnd( tmpPen->lineEnd ); - //doc->tqrepaint( obj ); + //doc->repaint( obj ); } } break; case OT_PIE: @@ -1019,7 +1019,7 @@ void KoPenCmd::applyPen( KPrObject *object, Pen *tmpPen ) if ( obj ) { obj->setPen( tmpPen->pen ); - doc->tqrepaint( obj ); + doc->repaint( obj ); } } @@ -1220,7 +1220,7 @@ void KPrBrushCmd::applyBrush( KPr2DObject *object, Brush *tmpBrush ) object->setGUnbalanced( tmpBrush->unbalanced ); object->setGXFactor( tmpBrush->xfactor ); object->setGYFactor( tmpBrush->yfactor ); - doc->tqrepaint( object ); + doc->repaint( object ); } void KPrBrushCmd::unexecute() @@ -1456,7 +1456,7 @@ void KPrPieValueCmd::execute() obj->setPieLength( m_newValues.pieLength ); } } - m_doc->tqrepaint( false ); + m_doc->repaint( false ); m_doc->updateSideBarItem( m_page ); } @@ -1473,7 +1473,7 @@ void KPrPieValueCmd::unexecute() obj->setPieLength( m_oldValues.at( i )->pieLength ); } } - m_doc->tqrepaint( false ); + m_doc->repaint( false ); m_doc->updateSideBarItem( m_page ); } @@ -1553,7 +1553,7 @@ void KPrPolygonSettingCmd::execute() obj->setSharpnessValue(m_newSettings.sharpnessValue ); } } - m_doc->tqrepaint( false ); + m_doc->repaint( false ); m_doc->updateSideBarItem( m_page ); } @@ -1570,7 +1570,7 @@ void KPrPolygonSettingCmd::unexecute() obj->setSharpnessValue(m_oldSettings.at( i )->sharpnessValue); } } - m_doc->tqrepaint( false ); + m_doc->repaint( false ); m_doc->updateSideBarItem( m_page ); } @@ -1670,7 +1670,7 @@ void KPrPictureSettingCmd::execute() obj->setPictureBright( m_newSettings.bright ); } } - m_doc->tqrepaint( false ); + m_doc->repaint( false ); m_doc->updateSideBarItem( m_page ); } @@ -1688,7 +1688,7 @@ void KPrPictureSettingCmd::unexecute() obj->setPictureBright( pictureSettings->bright ); } } - m_doc->tqrepaint( false ); + m_doc->repaint( false ); m_doc->updateSideBarItem( m_page ); } @@ -1795,7 +1795,7 @@ void KPrRectValueCmd::execute() obj->setRnds( xtmp, ytmp ); } } - m_doc->tqrepaint( false ); + m_doc->repaint( false ); m_doc->updateSideBarItem( m_page ); } @@ -1809,7 +1809,7 @@ void KPrRectValueCmd::unexecute() if( obj ) obj->setRnds( m_oldValues.at( i )->xRnd, m_oldValues.at( i )->yRnd ); } - m_doc->tqrepaint( false ); + m_doc->repaint( false ); m_doc->updateSideBarItem( m_page ); } @@ -1846,8 +1846,8 @@ void KPrResizeCmd::execute() } if ( object->isSelected()) doc->updateObjectStatusBarItem(); - doc->tqrepaint( oldRect ); - doc->tqrepaint( object ); + doc->repaint( oldRect ); + doc->repaint( object ); doc->updateSideBarItem( m_page ); } @@ -1868,8 +1868,8 @@ void KPrResizeCmd::unexecute() if ( object->isSelected()) doc->updateObjectStatusBarItem(); - doc->tqrepaint( oldRect ); - doc->tqrepaint( object ); + doc->repaint( oldRect ); + doc->repaint( object ); doc->updateSideBarItem( m_page ); } @@ -2368,7 +2368,7 @@ void KPrFlipObjectCommand::flipObjects() for ( ; it.current() ; ++it ) { it.current()->flip( horizontal ); - m_doc->tqrepaint( it.current() ); + m_doc->repaint( it.current() ); } m_doc->updateSideBarItem( m_page ); @@ -2425,7 +2425,7 @@ void KPrGeometryPropertiesCommand::execute() { it.current()->setProtect( m_newValue ); if ( it.current()->isSelected() ) - m_doc->tqrepaint( it.current() ); + m_doc->repaint( it.current() ); } else if ( m_type == KeepRatio) it.current()->setKeepRatio( m_newValue ); @@ -2441,7 +2441,7 @@ void KPrGeometryPropertiesCommand::unexecute() { obj->setProtect( *m_oldValue.at(i) ); if ( obj->isSelected() ) - m_doc->tqrepaint( obj ); + m_doc->repaint( obj ); } else if ( m_type == KeepRatio) obj->setKeepRatio( *m_oldValue.at(i) ); @@ -2568,7 +2568,7 @@ void KPrCloseObjectCommand::execute() ( *closeIt )->addToObjList(); ( *openIt )->setSelected( false ); ( *closeIt )->setSelected( selected ); - m_doc->tqrepaint( *closeIt ); + m_doc->repaint( *closeIt ); } m_doc->updateSideBarItem( m_page ); } @@ -2585,7 +2585,7 @@ void KPrCloseObjectCommand::unexecute() ( *openIt )->addToObjList(); ( *closeIt )->setSelected( false ); ( *openIt )->setSelected( selected ); - m_doc->tqrepaint( *openIt ); + m_doc->repaint( *openIt ); } m_doc->updateSideBarItem( m_page ); } @@ -2670,7 +2670,7 @@ void KPrChangeMarginCommand::execute() it.current()->resizeTextDocument(); it.current()->tqlayout(); } - m_doc->tqrepaint( false ); + m_doc->repaint( false ); m_doc->updateSideBarItem( m_page ); } @@ -2686,7 +2686,7 @@ void KPrChangeMarginCommand::unexecute() object->resizeTextDocument(); object->tqlayout(); } - m_doc->tqrepaint( false ); + m_doc->repaint( false ); m_doc->updateSideBarItem( m_page ); } @@ -2709,7 +2709,7 @@ void KPrChangeVerticalAlignmentCommand::execute() { m_obj->setVerticalAligment( m_newAlign ); m_obj->kPresenterDocument()->tqlayout(m_obj); - m_obj->kPresenterDocument()->tqrepaint(m_obj); + m_obj->kPresenterDocument()->repaint(m_obj); m_doc->updateSideBarItem( m_page ); } @@ -2718,7 +2718,7 @@ void KPrChangeVerticalAlignmentCommand::unexecute() { m_obj->setVerticalAligment( m_oldAlign ); m_obj->kPresenterDocument()->tqlayout(m_obj); - m_obj->kPresenterDocument()->tqrepaint(m_obj); + m_obj->kPresenterDocument()->repaint(m_obj); m_doc->updateSideBarItem( m_page ); } @@ -2779,7 +2779,7 @@ void KPrImageEffectCmd::execute() obj->setIEParams(newSettings.param1, newSettings.param2, newSettings.param3); } } - doc->tqrepaint( false ); + doc->repaint( false ); doc->updateSideBarItem( m_page ); } @@ -2794,7 +2794,7 @@ void KPrImageEffectCmd::unexecute() oldSettings.at( i )->param3); } } - doc->tqrepaint( false ); + doc->repaint( false ); doc->updateSideBarItem( m_page ); } diff --git a/kpresenter/KPrConfig.cpp b/kpresenter/KPrConfig.cpp index 42a701e9..b25e1255 100644 --- a/kpresenter/KPrConfig.cpp +++ b/kpresenter/KPrConfig.cpp @@ -365,13 +365,13 @@ void KPrConfigureColorBackground::apply() if( oldGridColor != _col ) { config->setGroup( "KPresenter Color" ); config->writeEntry( "GridColor", _col ); - doc->tqrepaint( false ); + doc->repaint( false ); doc->setGridColor( _col ); oldGridColor=_col; repaintNeeded = true; } if (repaintNeeded) - doc->tqrepaint( false ); + doc->repaint( false ); } void KPrConfigureColorBackground::slotDefault() @@ -567,7 +567,7 @@ KCommand * KPrConfigureMiscPage::apply() doc->setGridValue( resolutionX->value(), resolutionY->value(), true); - doc->tqrepaint( false ); + doc->repaint( false ); config->sync(); diff --git a/kpresenter/KPrCustomSlideShowDia.cpp b/kpresenter/KPrCustomSlideShowDia.cpp index 7c0fa1c9..61eebe23 100644 --- a/kpresenter/KPrCustomSlideShowDia.cpp +++ b/kpresenter/KPrCustomSlideShowDia.cpp @@ -214,7 +214,7 @@ void KPrCustomSlideShowDia::slotCopy() { if ( !uniqueName( i, str ) ) { - str = str.tqarg( i ); + str = str.arg( i ); m_customSlideShowMap.insert( str, m_customSlideShowMap[item->text()] ); list->insertItem( str ); break; @@ -225,7 +225,7 @@ void KPrCustomSlideShowDia::slotCopy() bool KPrCustomSlideShowDia::uniqueName( int val, const TQString & name ) const { - TQString str = name.tqarg( val ); + TQString str = name.arg( val ); for ( int i= 0; i < ( int )list->count(); ++i ) { if ( list->text ( i ) == str ) diff --git a/kpresenter/KPrDocument.cpp b/kpresenter/KPrDocument.cpp index d7cb13cf..fca675d5 100644 --- a/kpresenter/KPrDocument.cpp +++ b/kpresenter/KPrDocument.cpp @@ -444,9 +444,9 @@ bool KPrDocument::saveChildren( KoStore* _store ) { int i = 0; - TQPtrListIterator<KoDocumentChild> it( tqchildren() ); + TQPtrListIterator<KoDocumentChild> it( children() ); for( ; it.current(); ++it ) { - // Don't save tqchildren that are only in the undo/redo history + // Don't save children that are only in the undo/redo history // but not anymore in the presentation TQPtrListIterator<KPrPage> pageIt( m_pageList ); for ( int pagePos = 0; pageIt.current(); ++pageIt, ++pagePos ) @@ -669,9 +669,9 @@ TQDomDocument KPrDocument::saveXML() } // Write "OBJECT" tag for every child - TQPtrListIterator<KoDocumentChild> chl( tqchildren() ); + TQPtrListIterator<KoDocumentChild> chl( children() ); for( ; chl.current(); ++chl ) { - // Don't save tqchildren that are only in the undo/redo history + // Don't save children that are only in the undo/redo history // but not anymore in the presentation for ( int i = 0; i < static_cast<int>( m_pageList.count() ); i++ ) { if ( saveOnlyPage != -1 && i != saveOnlyPage ) @@ -735,8 +735,8 @@ void KPrDocument::saveEmbeddedObject(KPrPage *page, KoDocumentChild *chl, TQDomD TQDomElement embedded=doc.createElement("EMBEDDED"); KPrChild* curr = (KPrChild*)chl; - // tqgeometry is no zoom value ! - TQRect _rect = curr->tqgeometry(); + // geometry is no zoom value ! + TQRect _rect = curr->geometry(); int tmpX = (int)zoomHandler()->unzoomItX( _rect.x() ); int tmpY = (int)zoomHandler()->unzoomItY( _rect.y() ); int tmpWidth = (int)zoomHandler()->unzoomItX( _rect.width() ); @@ -909,7 +909,7 @@ TQDomElement KPrDocument::saveUsedSoundFileToXML( TQDomDocument &_doc, TQStringL TQString soundFileName = *it; int position = soundFileName.findRev( '.' ); TQString format = soundFileName.right( soundFileName.length() - position - 1 ); - TQString _name = TQString( "sounds/sound%1.%2" ).tqarg( ++i ).tqarg( format.lower() ); + TQString _name = TQString( "sounds/sound%1.%2" ).arg( ++i ).arg( format.lower() ); TQDomElement fileElem = _doc.createElement( "FILE" ); soundFiles.appendChild( fileElem ); @@ -955,7 +955,7 @@ void KPrDocument::saveUsedSoundFileToStore( KoStore *_store, TQStringList _list TQString soundFileName = *it; int position = soundFileName.findRev( '.' ); TQString format = soundFileName.right( soundFileName.length() - position - 1 ); - TQString _storeURL = TQString( "sounds/sound%1.%2" ).tqarg( ++i ).tqarg( format.lower() ); + TQString _storeURL = TQString( "sounds/sound%1.%2" ).arg( ++i ).arg( format.lower() ); if ( _store->open( _storeURL ) ) { KoStoreDevice dev( _store ); @@ -973,7 +973,7 @@ bool KPrDocument::loadChildren( KoStore* _store ) { if ( objStartY == 0 && _clean) // Don't do this when inserting a template or a page... { - TQPtrListIterator<KoDocumentChild> it( tqchildren() ); + TQPtrListIterator<KoDocumentChild> it( children() ); for( ; it.current(); ++it ) { if ( !((KoDocumentChild*)it.current())->loadDocument( _store ) ) return false; @@ -981,7 +981,7 @@ bool KPrDocument::loadChildren( KoStore* _store ) } else // instead load form the correct child on, m_childCountBeforeInsert has the be set { - TQPtrListIterator<KoDocumentChild> it( tqchildren() ); + TQPtrListIterator<KoDocumentChild> it( children() ); for( int i = 0; it.current(); ++it, ++i ) { if ( i < m_childCountBeforeInsert ) continue; @@ -1614,7 +1614,7 @@ bool KPrDocument::loadOasis( const TQDomDocument& doc, KoOasisStyles&oasisStyles if ( localName.isEmpty() ) setErrorMessage( i18n( "Invalid OASIS OpenDocument file. No tag found inside office:body." ) ); else - setErrorMessage( i18n( "This document is not a presentation, but a %1. Please try opening it with the appropriate application." ).tqarg( KoDocument::tagNameToDocumentType( localName ) ) ); + setErrorMessage( i18n( "This document is not a presentation, but a %1. Please try opening it with the appropriate application." ).arg( KoDocument::tagNameToDocumentType( localName ) ) ); return false; } @@ -1857,7 +1857,7 @@ void KPrDocument::loadOasisObject( KPrPage * newpage, TQDomNode & drawPage, KoOa TQRect r; KPrPartObject *kppartobject = new KPrPartObject( ch ); kppartobject->loadOasis( o, context, m_loadingInfo ); - r = ch->tqgeometry(); + r = ch->geometry(); if ( groupObject ) groupObject->addObjects( kppartobject ); else @@ -1993,11 +1993,11 @@ void KPrDocument::loadOasisObject( KPrPage * newpage, TQDomNode & drawPage, KoOa break; } } - else if ( name == "custom-tqshape" && isDrawNS ) + else if ( name == "custom-shape" && isDrawNS ) { fillStyleStack( o, context, "graphic" ); - TQDomElement enhancedGeometry = KoDom::namedItemNS( o, KoXmlNS::draw, "enhanced-tqgeometry" ); + TQDomElement enhancedGeometry = KoDom::namedItemNS( o, KoXmlNS::draw, "enhanced-geometry" ); if ( !enhancedGeometry.isNull() ) { @@ -2054,13 +2054,13 @@ void KPrDocument::loadOasisObject( KPrPage * newpage, TQDomNode & drawPage, KoOa newpage->appendObject( kpClosedObject ); } break; default: - kdDebug(33001) << "draw:custom-tqshape found unsupported object type " << objType << " in draw:enhanced-path " << d << endl; + kdDebug(33001) << "draw:custom-shape found unsupported object type " << objType << " in draw:enhanced-path " << d << endl; break; } } else { - kdDebug(33001) << "draw:custom-tqshape not supported" << endl; + kdDebug(33001) << "draw:custom-shape not supported" << endl; } } } @@ -2136,10 +2136,10 @@ int KPrDocument::createPresentationAnimation(const TQDomElement& element, int or { const bool isPresentationNS = e.namespaceURI() == KoXmlNS::presentation; if ( isPresentationNS && - ( tagName == "show-tqshape" || tagName == "hide-tqshape" ) ) + ( tagName == "show-shape" || tagName == "hide-shape" ) ) { - Q_ASSERT( e.hasAttributeNS( KoXmlNS::draw, "tqshape-id" ) ); - TQString name = e.attributeNS( KoXmlNS::draw, "tqshape-id", TQString() ); + Q_ASSERT( e.hasAttributeNS( KoXmlNS::draw, "shape-id" ) ); + TQString name = e.attributeNS( KoXmlNS::draw, "shape-id", TQString() ); kdDebug()<<" insert animation " << tagName << " name :" << name << endl; if ( e.hasAttributeNS( KoXmlNS::koffice, "order-id" ) ) @@ -2150,7 +2150,7 @@ int KPrDocument::createPresentationAnimation(const TQDomElement& element, int or lstAnimation *tmp = new lstAnimation; tmp->element = new TQDomElement( e ); tmp->order = orderAnimation; - if ( tagName == "show-tqshape" ) + if ( tagName == "show-shape" ) { m_loadingInfo->storePresentationShowAnimation( tmp, name ); } @@ -2246,7 +2246,7 @@ bool KPrDocument::loadXML( TQIODevice * dev, const TQDomDocument& doc ) << " Line: " << errorLine << " Column: " << errorColumn << endl << " Message: " << errorMsg << endl; setErrorMessage( i18n( "parsing error in the main document (converted from an old KPresenter format) at line %1, column %2\nError message: %3" ) - .tqarg( errorLine ).tqarg( errorColumn ).tqarg( i18n ( errorMsg.utf8() ) ) ); + .arg( errorLine ).arg( errorColumn ).arg( i18n ( errorMsg.utf8() ) ) ); return false; } b = loadXML( newdoc ); @@ -2294,7 +2294,7 @@ void KPrDocument::insertEmbedded( KoStore *store, TQDomElement topElem, KMacroCo TQDomElement object=elem.namedItem("OBJECT").toElement(); if(!object.isNull()) { ch->load(object, true); // true == uppercase - r = ch->tqgeometry(); + r = ch->geometry(); ch->loadDocument( store ); insertChild( ch ); kppartobject = new KPrPartObject( ch ); @@ -2376,7 +2376,7 @@ bool KPrDocument::loadXML( const TQDomDocument &doc ) document.attribute("mime")!="application/x-kpresenter" && document.attribute("mime")!="application/vnd.kde.kpresenter" ) ) { kdError(33001) << "Unknown mime type " << document.attribute("mime") << endl; - setErrorMessage( i18n("Invalid document, expected mimetype application/x-kpresenter or application/vnd.kde.kpresenter, got %1").tqarg(document.attribute("mime")) ); + setErrorMessage( i18n("Invalid document, expected mimetype application/x-kpresenter or application/vnd.kde.kpresenter, got %1").arg(document.attribute("mime")) ); return false; } if(document.hasAttribute("url")) @@ -2401,7 +2401,7 @@ bool KPrDocument::loadXML( const TQDomDocument &doc ) TQDomElement object=elem.namedItem("OBJECT").toElement(); if(!object.isNull()) { ch->load(object, true); // true == uppercase - r = ch->tqgeometry(); + r = ch->geometry(); insertChild( ch ); kppartobject = new KPrPartObject( ch ); //emit sig_insertObject( ch, kppartobject ); @@ -3275,7 +3275,7 @@ void KPrDocument::setPageLayout( const KoPageLayout &pgLayout ) //for ( int i = 0; i < static_cast<int>( m_pageList.count() ); i++ ) // m_pageList.at( i )->updateBackgroundSize(); - tqrepaint( false ); + repaint( false ); tqlayout(); // don't setModified(true) here, since this is called on startup } @@ -3287,14 +3287,14 @@ void KPrDocument::updateHeaderFooterPosition( ) TQRect oldBoundingRect = zoomHandler()->zoomRect( _header->getRepaintRect() ); _header->setOrig(pageRect.topLeft ()); _header->setSize(pageRect.width(),_header->getSize().height()); - tqrepaint( oldBoundingRect ); - tqrepaint(_header); + repaint( oldBoundingRect ); + repaint(_header); oldBoundingRect = zoomHandler()->zoomRect( _footer->getRepaintRect() ); _footer->setOrig(pageRect.left(),pageRect.bottom()-_footer->getSize().height()); _footer->setSize(pageRect.width(),_footer->getSize().height()); - tqrepaint(oldBoundingRect); - tqrepaint(_footer); + repaint(oldBoundingRect); + repaint(_footer); } bool KPrDocument::initDoc(InitDocFlags flags, TQWidget* parentWidget) @@ -3401,16 +3401,16 @@ void KPrDocument::setGridValue( double _x, double _y, bool _replace ) replaceObjs(); } -void KPrDocument::tqrepaint( bool erase ) +void KPrDocument::repaint( bool erase ) { TQPtrListIterator<KoView> it( views() ); for( ; it.current(); ++it ) { KPrCanvas* canvas = ((KPrView*)it.current())->getCanvas(); - canvas->tqrepaint( erase ); + canvas->repaint( erase ); } } -void KPrDocument::tqrepaint( const TQRect& rect ) +void KPrDocument::repaint( const TQRect& rect ) { TQRect r; TQPtrListIterator<KoView> it( views() ); @@ -3439,9 +3439,9 @@ void KPrDocument::tqlayout() } } -void KPrDocument::tqrepaint( KPrObject *kpobject ) +void KPrDocument::repaint( KPrObject *kpobject ) { - tqrepaint( m_zoomHandler->zoomRect( kpobject->getRepaintRect() ) ); + repaint( m_zoomHandler->zoomRect( kpobject->getRepaintRect() ) ); } TQValueList<int> KPrDocument::getPageEffectSteps( unsigned int num ) @@ -3556,7 +3556,7 @@ void KPrDocument::takePage( KPrPage *page, int pageNum ) } } - tqrepaint( false ); + repaint( false ); } void KPrDocument::pageOrderChanged() @@ -3646,7 +3646,7 @@ int KPrDocument::insertNewPage( const TQString &cmdName, int _page, InsertPos _i KPrPage *newpage = new KPrPage( this, m_masterPage ); m_pageWhereLoadObject=newpage; - m_childCountBeforeInsert = tqchildren().count(); + m_childCountBeforeInsert = children().count(); bool ok = loadNativeFormat( fileName ); if ( !ok ) @@ -3726,7 +3726,7 @@ KCommand * KPrDocument::loadPastedObjs( const TQString &in, KPrPage* _page ) KCommand *cmd = loadObjects(document,true); m_pageWhereLoadObject=0L; - tqrepaint( false ); + repaint( false ); setModified( true ); return cmd; } @@ -3750,7 +3750,7 @@ void KPrDocument::setDisplayObjectMasterPage( bool b ) TQPtrListIterator<KoView> it( views() ); for (; it.current(); ++it ) ((KPrView*)it.current())->updateDisplayObjectMasterPageButton(); - tqrepaint(b); + repaint(b); } void KPrDocument::setDisplayBackground( bool b ) @@ -3758,7 +3758,7 @@ void KPrDocument::setDisplayBackground( bool b ) TQPtrListIterator<KoView> it( views() ); for (; it.current(); ++it ) ((KPrView*)it.current())->updateDisplayBackgroundButton(); - tqrepaint(b); + repaint(b); } void KPrDocument::setHeader( bool b ) @@ -3772,7 +3772,7 @@ void KPrDocument::setHeader( bool b ) } m_masterPage->setHeader( b, false ); updateHeaderFooterButton(); - tqrepaint(b); + repaint(b); } void KPrDocument::setFooter( bool b ) @@ -3786,7 +3786,7 @@ void KPrDocument::setFooter( bool b ) } m_masterPage->setFooter( b, false ); updateHeaderFooterButton(); - tqrepaint(b); + repaint(b); } void KPrDocument::updateHeaderFooterButton() @@ -3917,7 +3917,7 @@ void KPrDocument::movePage( int from, int to ) void KPrDocument::copyPage( int from ) { _clean = false; - m_childCountBeforeInsert = tqchildren().count(); + m_childCountBeforeInsert = children().count(); _duplicatePage=true; // ### now also set via savePage() parameter below @@ -4145,7 +4145,7 @@ void KPrDocument::slotRepaintChanged( KPrTextObject *kptextobj ) { //todo //use this function for the moment - tqrepaint( kptextobj ); + repaint( kptextobj ); } @@ -4156,7 +4156,7 @@ void KPrDocument::recalcVariables( int type ) if ( modifiedVariables.isEmpty() ) return; - // TODO use the return value from recalcVariables to only tqrepaint what has changed. + // TODO use the return value from recalcVariables to only repaint what has changed. TQPtrListIterator<KPrPage> it( m_pageList ); for ( ; it.current(); ++it ) it.current()->slotRepaintVariable(); @@ -4665,7 +4665,7 @@ void KPrDocument::insertFile(const TQString & file ) { m_insertFilePage = m_pageList.count(); - m_childCountBeforeInsert = tqchildren().count(); + m_childCountBeforeInsert = children().count(); objStartY = 0; bool clean = _clean; _clean = false; diff --git a/kpresenter/KPrDocument.h b/kpresenter/KPrDocument.h index c51060a4..e1ae80e3 100644 --- a/kpresenter/KPrDocument.h +++ b/kpresenter/KPrDocument.h @@ -236,11 +236,11 @@ class KPrDocument : public KoDocument void deletePage( int _page ); void copyPageToClipboard( int pgnum ); - // tqrepaint all views - void tqrepaint( bool ); + // repaint all views + void repaint( bool ); - void tqrepaint( const TQRect& ); - void tqrepaint( KPrObject* ); + void repaint( const TQRect& ); + void repaint( KPrObject* ); // stuff for screen-presentations /** @@ -552,7 +552,7 @@ protected: void testAndCloseAllTextObjectProtectedContent(); // ************ functions ************ /** - * Overloaded function from @ref Document_impl. Saves all tqchildren. + * Overloaded function from @ref Document_impl. Saves all children. */ virtual bool saveChildren( KoStore* _store ); @@ -707,8 +707,8 @@ private: KPrLoadingInfo *m_loadingInfo; TQValueList<int> *m_customListTest; - /// here the amount of existing tqchildren before inserting a page/file - /// is saved, so that we load the correct tqchildren + /// here the amount of existing children before inserting a page/file + /// is saved, so that we load the correct children int m_childCountBeforeInsert; }; diff --git a/kpresenter/KPrDocumentIface.cpp b/kpresenter/KPrDocumentIface.cpp index 04235d73..aa4d154a 100644 --- a/kpresenter/KPrDocumentIface.cpp +++ b/kpresenter/KPrDocumentIface.cpp @@ -432,13 +432,13 @@ void KPrDocumentIface::setShowGuideLines( bool b ) { doc->setShowGuideLines( b ); doc->updateGuideLineButton(); - doc->tqrepaint( false ); + doc->repaint( false ); } void KPrDocumentIface::addGuideLine( bool horizontal, double pos ) { doc->addGuideLine( horizontal ? Qt::Horizontal: Qt::Vertical, pos ); - doc->tqrepaint( false ); + doc->repaint( false ); } unsigned int KPrDocumentIface::nbHorizontalHelpLine() const @@ -460,7 +460,7 @@ void KPrDocumentIface::setShowGrid ( bool _grid ) { doc->setShowGrid( _grid); doc->updateGridButton(); - doc->tqrepaint( false ); + doc->repaint( false ); } double KPrDocumentIface::gridX() const @@ -472,7 +472,7 @@ void KPrDocumentIface::setGridX(double _x) { doc->setGridX( _x ); if( showGrid() ) - doc->tqrepaint( false ); + doc->repaint( false ); } double KPrDocumentIface::gridY() const @@ -484,7 +484,7 @@ void KPrDocumentIface::setGridY(double _y) { doc->setGridY( _y ); if( showGrid() ) - doc->tqrepaint( false ); + doc->repaint( false ); } bool KPrDocumentIface::configAutoSuperScript() const @@ -555,9 +555,9 @@ TQStringList KPrDocumentIface::presentationList() return doc->presentationList(); } -void KPrDocumentIface::tqrepaint() +void KPrDocumentIface::repaint() { - doc->tqrepaint( false ); + doc->repaint( false ); } void KPrDocumentIface::setConfigToolTipCompletion( bool b ) diff --git a/kpresenter/KPrDocumentIface.h b/kpresenter/KPrDocumentIface.h index 3dd061df..83429fb0 100644 --- a/kpresenter/KPrDocumentIface.h +++ b/kpresenter/KPrDocumentIface.h @@ -178,7 +178,7 @@ k_dcop: /// Repaint document. Call this after moving or resizing an object, for instance. /// @since 1.4 - void tqrepaint(); + void repaint(); private: KPrDocument *doc; diff --git a/kpresenter/KPrEffectDia.cpp b/kpresenter/KPrEffectDia.cpp index abddeb68..979df309 100644 --- a/kpresenter/KPrEffectDia.cpp +++ b/kpresenter/KPrEffectDia.cpp @@ -514,7 +514,7 @@ TQString KPrEffectDia::getSoundFileFilter() const if ( comma ) str += '\n'; comma = true; - str += TQString( i18n( "*.%1|%2 Files" ) ).tqarg( *it ).tqarg( (*it).upper() ); + str += TQString( i18n( "*.%1|%2 Files" ) ).arg( *it ).arg( (*it).upper() ); full += TQString( "*.") + (*it) + ' '; } diff --git a/kpresenter/KPrFindReplace.cpp b/kpresenter/KPrFindReplace.cpp index 3836a8ad..709a86d1 100644 --- a/kpresenter/KPrFindReplace.cpp +++ b/kpresenter/KPrFindReplace.cpp @@ -55,10 +55,10 @@ void KPrFindReplace::emitNewCommand(KCommand *cmd) void KPrFindReplace::highlightPortion(KoTextParag * parag, int index, int length, KoTextDocument *_textdoc, KDialogBase* dialog) { - bool tqrepaint = isReplace() ? options() & KReplaceDialog::PromptOnReplace : true; + bool repaint = isReplace() ? options() & KReplaceDialog::PromptOnReplace : true; KPrTextDocument *textdoc = static_cast<KPrTextDocument *>(_textdoc); KPrTextObject* textobj = textdoc->textObject(); - textobj->highlightPortion( parag, index, length, m_canvas, tqrepaint, dialog ); + textobj->highlightPortion( parag, index, length, m_canvas, repaint, dialog ); } #include "KPrFindReplace.moc" diff --git a/kpresenter/KPrFreehandObject.cpp b/kpresenter/KPrFreehandObject.cpp index 077b9eed..273d6041 100644 --- a/kpresenter/KPrFreehandObject.cpp +++ b/kpresenter/KPrFreehandObject.cpp @@ -59,20 +59,20 @@ bool KPrFreehandObject::saveOasisObjectAttributes( KPOasisSaveContext &sc ) cons { // the rect for the view box have to be the rect and not the real rect KoRect rect( getRect() ); - sc.xmlWriter.addAttribute("svg:viewBox", TQString( "0 0 %1 %2" ).tqarg( int( rect.width() * 100 ) ) - .tqarg( int( rect.height() * 100 ) ) ); + sc.xmlWriter.addAttribute("svg:viewBox", TQString( "0 0 %1 %2" ).arg( int( rect.width() * 100 ) ) + .arg( int( rect.height() * 100 ) ) ); unsigned int pointCount = points.count(); unsigned int pos = 0; TQString d; - d += TQString( "M%1 %2" ).tqarg( int( points.at(pos).x() * 100 ) ) - .tqarg( int( points.at(pos).y() * 100 ) ); + d += TQString( "M%1 %2" ).arg( int( points.at(pos).x() * 100 ) ) + .arg( int( points.at(pos).y() * 100 ) ); ++pos; while ( pos < pointCount ) { - d += TQString( "L%1 %2" ).tqarg( int( points.at( pos ).x() * 100 ) ) - .tqarg( int( points.at( pos ).y() * 100 ) ); + d += TQString( "L%1 %2" ).arg( int( points.at( pos ).x() * 100 ) ) + .arg( int( points.at( pos ).y() * 100 ) ); ++pos; } diff --git a/kpresenter/KPrFreehandObjectIface.cpp b/kpresenter/KPrFreehandObjectIface.cpp index 19843a1b..25ff2963 100644 --- a/kpresenter/KPrFreehandObjectIface.cpp +++ b/kpresenter/KPrFreehandObjectIface.cpp @@ -56,12 +56,12 @@ TQString KPrFreehandObjectIface::lineEnd() const void KPrFreehandObjectIface::horizontalFlip() { - //todo tqrepaint it + //todo repaint it obj->flip(true ); } void KPrFreehandObjectIface::verticalFlip() { - //todo tqrepaint it + //todo repaint it obj->flip( false ); } diff --git a/kpresenter/KPrGotoPage.cpp b/kpresenter/KPrGotoPage.cpp index d5d0ed24..c170f159 100644 --- a/kpresenter/KPrGotoPage.cpp +++ b/kpresenter/KPrGotoPage.cpp @@ -60,7 +60,7 @@ KPrGotoPage::KPrGotoPage( const KPrDocument *doc, t.truncate(30); t+="..."; } - spinbox->insertItem( TQString( "%1 - %2" ).tqarg( *it ).tqarg( t ), -1 ); + spinbox->insertItem( TQString( "%1 - %2" ).arg( *it ).arg( t ), -1 ); if ( *it == start ) spinbox->setCurrentItem( spinbox->count()-1 ); } diff --git a/kpresenter/KPrImageEffectDia.cpp b/kpresenter/KPrImageEffectDia.cpp index 6a0162c1..078a3918 100644 --- a/kpresenter/KPrImageEffectDia.cpp +++ b/kpresenter/KPrImageEffectDia.cpp @@ -217,7 +217,7 @@ void KPrImageEffectDia::setPixmap(TQPixmap pix) void KPrImageEffectDia::updatePreview() { base->m_previewLabel->setPixmap(m_pix); - base->m_previewLabel->tqrepaint(false); + base->m_previewLabel->repaint(false); } void KPrImageEffectDia::setEffect(ImageEffect eff, TQVariant p1, TQVariant p2, TQVariant p3) diff --git a/kpresenter/KPrMSPresentationSetup.cpp b/kpresenter/KPrMSPresentationSetup.cpp index 298e8645..4b8545e2 100644 --- a/kpresenter/KPrMSPresentationSetup.cpp +++ b/kpresenter/KPrMSPresentationSetup.cpp @@ -91,7 +91,7 @@ void KPrMSPresentation::initCreation( KProgress *progressBar ) kapp->processEvents(); for (int dirNum = 101; dirNum < 999; dirNum++) { - slidePath = TQString("/DCIM/%1MSPJP").tqarg(dirNum); + slidePath = TQString("/DCIM/%1MSPJP").arg(dirNum); if (! KIO::NetAccess::exists(( path + slidePath), true, ( TQWidget* )0L) ) break; } @@ -198,7 +198,7 @@ void KPrMSPresentation::createIndexFile( KProgress *progressBar ) // DCIM path 1, 68 bytes null padded char buff[68]; - strncpy( buff, TQString("%1").tqarg(slidePath).ascii(), 67 ); + strncpy( buff, TQString("%1").arg(slidePath).ascii(), 67 ); buff[67] = 0x00; sppStream.writeRawBytes( buff, 68 ); sppStream << (TQ_UINT32)0x00000001; // fixed value @@ -444,7 +444,7 @@ void KPrMSPresentationSetup::finish() if ( !KIO::NetAccess::exists(pathname, false, this) ) { TQString msg = i18n( "<qt>The directory <b>%1</b> does not exist.<br>" "Do you want create it?</qt>" ); - if( KMessageBox::questionYesNo( this, msg.tqarg( pathname ), + if( KMessageBox::questionYesNo( this, msg.arg( pathname ), i18n( "Directory Not Found" ) ) == KMessageBox::Yes) { @@ -471,7 +471,7 @@ void KPrMSPresentationSetup::finish() if ( KMessageBox::warningYesNo( 0, i18n( "You are about to overwrite an existing index " "file : %1.\n " - "Do you want to proceed?" ).tqarg( sppFile ), + "Do you want to proceed?" ).arg( sppFile ), i18n( "Overwrite Presentation" ) ) == KMessageBox::No) { path->setFocus(); diff --git a/kpresenter/KPrNoteBar.cpp b/kpresenter/KPrNoteBar.cpp index 576b11cc..80b93552 100644 --- a/kpresenter/KPrNoteBar.cpp +++ b/kpresenter/KPrNoteBar.cpp @@ -174,7 +174,7 @@ TQString KPrNoteBar::getNotesTextForPrinting(TQValueList<int> _list) const if ( !firstText ) allText += TQString("\n\n"); - allText += i18n( "Slide Note %1:\n" ).tqarg( pageCount ); + allText += i18n( "Slide Note %1:\n" ).arg( pageCount ); if(noteIsEmpty && !doc->pageList().at(i)->noteText().isEmpty()) noteIsEmpty = false; allText += doc->pageList().at(i)->noteText(); diff --git a/kpresenter/KPrObject.cpp b/kpresenter/KPrObject.cpp index 5a03896a..8bc6089d 100644 --- a/kpresenter/KPrObject.cpp +++ b/kpresenter/KPrObject.cpp @@ -357,7 +357,7 @@ void KPrObject::saveOasisPosObject( KoXmlWriter &xmlWriter, int indexObj ) const transX.setNum( trans.x(), 'g', DBL_DIG ); TQCString transY; transY.setNum( trans.y(), 'g', DBL_DIG ); - TQString str = TQString( "rotate(%1) translate(%2pt %3pt)" ).tqarg( angInRad ).tqarg( transX.data() ).tqarg( transY.data() ); + TQString str = TQString( "rotate(%1) translate(%2pt %3pt)" ).arg( angInRad ).arg( transX.data() ).arg( transY.data() ); xmlWriter.addAttribute( "draw:transform", str ); } else @@ -422,8 +422,8 @@ bool KPrObject::saveOasisObjectStyleShowAnimation( KoXmlWriter &animation, int o { if ( effect != EF_NONE || appearStep != 0 || !a_fileName.isEmpty() ) { - animation.startElement( "presentation:show-tqshape" ); - animation.addAttribute( "draw:tqshape-id", "object" + TQString::number( objectId ) ); + animation.startElement( "presentation:show-shape" ); + animation.addAttribute( "draw:shape-id", "object" + TQString::number( objectId ) ); animation.addAttribute( "koffice:order-id", appearStep ); switch( effect ) @@ -522,8 +522,8 @@ bool KPrObject::saveOasisObjectStyleHideAnimation( KoXmlWriter &animation, int o //FIXME oo doesn't support hide animation object if ( effect3 != EF3_NONE || disappearStep != 0 || !d_fileName.isEmpty()) { - animation.startElement( "presentation:hide-tqshape" ); - animation.addAttribute( "draw:tqshape-id", "object" + TQString::number( objectId ) ); + animation.startElement( "presentation:hide-shape" ); + animation.addAttribute( "draw:shape-id", "object" + TQString::number( objectId ) ); animation.addAttribute( "koffice:order-id", disappearStep ); switch( effect3 ) { @@ -1743,14 +1743,14 @@ bool KPrShadowObject::saveOasisDrawPoints( const KoPointArray &points, KPOasisSa int tmpY = int( ( *it ).y() * 10000 ); // no space allows before first element if ( !listOfPoint.isEmpty() ) - listOfPoint += TQString( " %1,%2" ).tqarg( tmpX ).tqarg( tmpY ); + listOfPoint += TQString( " %1,%2" ).arg( tmpX ).arg( tmpY ); else - listOfPoint = TQString( "%1,%2" ).tqarg( tmpX ).tqarg( tmpY ); + listOfPoint = TQString( "%1,%2" ).arg( tmpX ).arg( tmpY ); maxX = TQMAX( maxX, tmpX ); maxY = TQMAX( maxY, tmpY ); } sc.xmlWriter.addAttribute("draw:points", listOfPoint ); - sc.xmlWriter.addAttribute("svg:viewBox", TQString( "0 0 %1 %2" ).tqarg( maxX ).tqarg( maxY ) ); + sc.xmlWriter.addAttribute("svg:viewBox", TQString( "0 0 %1 %2" ).arg( maxX ).arg( maxY ) ); return true; } diff --git a/kpresenter/KPrPBPreview.cpp b/kpresenter/KPrPBPreview.cpp index d1afdd8b..a6938d82 100644 --- a/kpresenter/KPrPBPreview.cpp +++ b/kpresenter/KPrPBPreview.cpp @@ -55,7 +55,7 @@ void KPrPBPreview::resizeEvent( TQResizeEvent *e ) { #if 1 gradient->setSize( contentsRect().size() ); - tqrepaint(); + repaint(); #endif } } @@ -118,7 +118,7 @@ void KPrPBPreview::setGradient( const TQColor &_c1, const TQColor &_c2, BCType _ gradient->setUnbalanced( _unbalanced ); gradient->setXFactor( _xfactor ); gradient->setYFactor( _yfactor ); - tqrepaint( false ); + repaint( false ); } diff --git a/kpresenter/KPrPBPreview.h b/kpresenter/KPrPBPreview.h index c3ba061e..a3f1b283 100644 --- a/kpresenter/KPrPBPreview.h +++ b/kpresenter/KPrPBPreview.h @@ -49,21 +49,21 @@ public: KPrPBPreview( TQWidget* parent, const char* name, PaintType _paintType = Pen ); ~KPrPBPreview(); - void setPen( const KoPen &_pen ) { pen = _pen; tqrepaint( true ); } - void setBrush( const TQBrush &_brush ) { brush = _brush; tqrepaint( true ); } - void setLineBegin( LineEnd lb ) { lineBegin = lb; tqrepaint( true ); } - void setLineEnd( LineEnd le ) { lineEnd = le; tqrepaint( true ); } - void setGradient( KPrGradient *g ) { if ( g ) { gradient = g; } tqrepaint( true ); } - void setPaintType( PaintType pt ) { paintType = pt; tqrepaint(true); } + void setPen( const KoPen &_pen ) { pen = _pen; repaint( true ); } + void setBrush( const TQBrush &_brush ) { brush = _brush; repaint( true ); } + void setLineBegin( LineEnd lb ) { lineBegin = lb; repaint( true ); } + void setLineEnd( LineEnd le ) { lineEnd = le; repaint( true ); } + void setGradient( KPrGradient *g ) { if ( g ) { gradient = g; } repaint( true ); } + void setPaintType( PaintType pt ) { paintType = pt; repaint(true); } void setGradient( const TQColor &_c1, const TQColor &_c2, BCType _t, bool _unbalanced, int _xfactor, int _yfactor ); - void setColor1( const TQColor &_color ) { gradient->setColor1( _color ); tqrepaint( false ); } - void setColor2( const TQColor &_color ) { gradient->setColor2( _color ); tqrepaint( false ); } - void setBackColorType( BCType _type ) { gradient->setBackColorType( _type ); tqrepaint( false ); } - void setUnbalanced( bool b ) { gradient->setUnbalanced( b ); tqrepaint( false ); } - void setXFactor( int i ) { gradient->setXFactor( i ); tqrepaint( false ); } - void setYFactor( int i ) { gradient->setYFactor( i ); tqrepaint( false ); } + void setColor1( const TQColor &_color ) { gradient->setColor1( _color ); repaint( false ); } + void setColor2( const TQColor &_color ) { gradient->setColor2( _color ); repaint( false ); } + void setBackColorType( BCType _type ) { gradient->setBackColorType( _type ); repaint( false ); } + void setUnbalanced( bool b ) { gradient->setUnbalanced( b ); repaint( false ); } + void setXFactor( int i ) { gradient->setXFactor( i ); repaint( false ); } + void setYFactor( int i ) { gradient->setYFactor( i ); repaint( false ); } protected: void drawContents( TQPainter *p ); diff --git a/kpresenter/KPrPage.cpp b/kpresenter/KPrPage.cpp index d8e65bac..3eff9180 100644 --- a/kpresenter/KPrPage.cpp +++ b/kpresenter/KPrPage.cpp @@ -524,7 +524,7 @@ TQDomElement KPrPage::save( TQDomDocument &doc ) TQString KPrPage::oasisNamePage( int posPage ) const { - return ( m_manualTitle.isEmpty() ? TQString( "page%1" ).tqarg( posPage ) : m_manualTitle ); + return ( m_manualTitle.isEmpty() ? TQString( "page%1" ).arg( posPage ) : m_manualTitle ); } bool KPrPage::saveOasisPage( KoStore *store, KoXmlWriter &xmlWriter, int posPage, KoSavingContext& context, @@ -881,7 +881,7 @@ void KPrPage::unifyObjectName( KPrObject *object ) { if ( rx.search( objectName ) != -1 ) { objectName.remove( rx ); } - objectName += TQString(" (%1)").tqarg( count ); + objectName += TQString(" (%1)").arg( count ); object->setObjectName( objectName ); } } @@ -930,7 +930,7 @@ void KPrPage::appendObjects( const TQValueList<KPrObject *> &objects ) if ( usedPageNames.contains( objectName ) ) { usedPageNames[objectName]++; - objectName += TQString(" (%1)").tqarg( usedPageNames[objectName] ); + objectName += TQString(" (%1)").arg( usedPageNames[objectName] ); ( *oIt )->setObjectName( objectName ); } m_objectList.append( *oIt ); @@ -1065,7 +1065,7 @@ void KPrPage::pasteObjs( const TQByteArray & data,int nbCopy, double angle, _tempObj->moveBy( moveX*(double)mod,moveY*(double)mod); _tempObj->setSelected( true ); if ( angle == 0.0 || (increaseY == 0.0 && increaseX == 0.0)) - m_doc->tqrepaint(_tempObj); + m_doc->repaint(_tempObj); } if ( angle != 0.0) @@ -1344,14 +1344,14 @@ KPrTextObject* KPrPage::insertTextObject( const KoRect& r, const TQString& text KPrTextObject *kptextobject = new KPrTextObject( m_doc ); insertObject( i18n( "Insert Textbox" ), kptextobject, r ); //TODO create macro command : now insertObject can return KCommand - //TODO fix tqrepaint object + //TODO fix repaint object if ( !text.isEmpty() ) { KPrTextView *view = kptextobject->createKPTextView( _view ? _view->getCanvas() : 0L ); view->insertText( text ); view->terminate(); delete view; - m_doc->tqrepaint( kptextobject ); + m_doc->repaint( kptextobject ); } return kptextobject; } @@ -1461,7 +1461,7 @@ KPrPartObject* KPrPage::insertObject( const KoRect& _rect, KoDocumentEntry& _e ) insertObject( i18n( "Embed Object" ), kppartobject, _rect ); //emit sig_insertObject( ch, kppartobject ); - m_doc->tqrepaint( false ); + m_doc->repaint( false ); return kppartobject; } @@ -1534,7 +1534,7 @@ void KPrPage::slotRepaintVariable() for ( ; it.current() ; ++it ) { if ( it.current()->getType() == OT_TEXT ) - m_doc->tqrepaint( it.current() ); + m_doc->repaint( it.current() ); } } @@ -1545,7 +1545,7 @@ void KPrPage::recalcPageNum() { if ( it.current()->getType() == OT_TEXT ) { ( (KPrTextObject*)it.current() )->recalcPageNum( this ); - m_doc->tqrepaint( it.current() ); // TODO only if something changed + m_doc->repaint( it.current() ); // TODO only if something changed } } } @@ -1605,7 +1605,7 @@ void KPrPage::insertPicture( const TQString &filename, const KoPoint &pos ) //kdDebug(33001) << k_funcinfo << "Size: " << w << ", " << h << endl; kppixmapobject->setOrig(0,0); kppixmapobject->setSize(w, h); - m_doc->tqrepaint( false ); + m_doc->repaint( false ); } } @@ -1883,7 +1883,7 @@ TQString KPrPage::pageTitle( const TQString &_title ) const { // MASTERPAGE if ( m_masterPage ) - title = i18n( "Slide %1" ).tqarg( m_doc->pageList().findRef( this ) + 1 ); + title = i18n( "Slide %1" ).arg( m_doc->pageList().findRef( this ) + 1 ); else title = i18n( "Slide Master" ); } @@ -1990,7 +1990,7 @@ void KPrPage::deSelectAllObj() void KPrPage::deSelectObj( KPrObject *kpobject ) { kpobject->setSelected( false ); - m_doc->tqrepaint( kpobject ); + m_doc->repaint( kpobject ); } TQDomElement KPrPage::saveObjects( TQDomDocument &doc, TQDomElement &objects, double yoffset, @@ -2158,8 +2158,8 @@ KCommand *KPrPage::moveObject(KPrView *_view, double diffx, double diffy) _objects.append( it.current() ); TQRect br = _view->zoomHandler()->zoomRect( it.current()->getRepaintRect() ); br.moveBy( _view->zoomHandler()->zoomItX( diffx ), _view->zoomHandler()->zoomItY( diffy ) ); - m_doc->tqrepaint( br ); // Previous position - m_doc->tqrepaint( it.current() ); // New position + m_doc->repaint( br ); // Previous position + m_doc->repaint( it.current() ); // New position createCommand=true; } } @@ -2189,8 +2189,8 @@ KCommand *KPrPage::moveObject(KPrView *m_view,const KoPoint &_move,bool key) it.current()->moveBy( _move ); _objects.append( it.current() ); - m_doc->tqrepaint( oldBoundingRect ); - m_doc->tqrepaint( it.current() ); + m_doc->repaint( oldBoundingRect ); + m_doc->repaint( it.current() ); } } @@ -2208,7 +2208,7 @@ void KPrPage::repaintObj() for ( ; it.current() ; ++it ) { if(it.current()->isSelected()) - m_doc->tqrepaint(it.current() ); + m_doc->repaint(it.current() ); } } @@ -2388,7 +2388,7 @@ void KPrPage::reactivateBgSpellChecking(bool refreshTextObj) { static_cast<KPrTextObject*>( oIt.current() )->textObject()->setNeedSpellCheck(true); if(refreshTextObj) - m_doc->tqrepaint( oIt.current() ); + m_doc->repaint( oIt.current() ); } } } @@ -2446,7 +2446,7 @@ void KPrPage::changeTabStopValue ( double _tabStop ) { obj->textDocument()->setTabStops( m_doc->zoomHandler()->ptToLayoutUnitPixX( _tabStop )); obj->tqlayout(); - m_doc->tqrepaint( obj ); + m_doc->repaint( obj ); } } } diff --git a/kpresenter/KPrPageEffects.cpp b/kpresenter/KPrPageEffects.cpp index a7c3093b..b358fd55 100644 --- a/kpresenter/KPrPageEffects.cpp +++ b/kpresenter/KPrPageEffects.cpp @@ -440,7 +440,7 @@ bool KPrPageEffects::effectSurround1() const int repaint_w = w; bool finished = false; - bool tqrepaint= false; + bool repaint= false; int rh = 0; int rw = 0; int repaint_rh = 0; @@ -454,7 +454,7 @@ bool KPrPageEffects::effectSurround1() const h = stepSize; if ( step + stepSize >= m_height ) { - tqrepaint = true; + repaint = true; repaint_rh = m_height - repaint_h; repaint_rw = step - m_height + repaint_w; @@ -469,7 +469,7 @@ bool KPrPageEffects::effectSurround1() const w = stepSize; if ( step + stepSize >= m_height + m_width - repaint_w ) { - tqrepaint = true; + repaint = true; repaint_rh = m_height - ( step - m_height + repaint_h - m_width + repaint_w + stepSize ); repaint_rw = m_width - repaint_w; @@ -484,7 +484,7 @@ bool KPrPageEffects::effectSurround1() const h = stepSize; if ( step + stepSize >= 2 * m_height - repaint_h + m_width - repaint_w ) { - tqrepaint = true; + repaint = true; repaint_rh = 0; repaint_rw = m_width - ( step - 2 * m_height + repaint_h - m_width + 2 * repaint_w + stepSize ); @@ -499,7 +499,7 @@ bool KPrPageEffects::effectSurround1() const w = stepSize; if ( step + stepSize >= 2 * m_height - repaint_h + 2 * m_width - 3 * repaint_w ) { - tqrepaint = true; + repaint = true; repaint_rh = step - 2 * m_height + 2 * repaint_h - 2 * m_width + 3 * repaint_w; repaint_rw = repaint_w; @@ -514,7 +514,7 @@ bool KPrPageEffects::effectSurround1() const h = stepSize; if ( step + stepSize >= 3 * m_height - 3 * repaint_h + 2 * m_width - 3 * repaint_w ) { - tqrepaint = true; + repaint = true; repaint_rh = m_height - 2 * repaint_h; repaint_rw = step - 3 * m_height + 3 * repaint_h - 2 * m_width + 5 * repaint_w; @@ -529,7 +529,7 @@ bool KPrPageEffects::effectSurround1() const w = stepSize; if ( step + stepSize >= 3 * m_height - 3 * repaint_h + 3 * m_width - 6 * repaint_w ) { - tqrepaint = true; + repaint = true; repaint_rh = m_height - ( step - 3 * m_height + 5 * repaint_h - 3 * m_width + 6 * repaint_w + stepSize ); repaint_rw = m_width - 2 * repaint_w; @@ -544,7 +544,7 @@ bool KPrPageEffects::effectSurround1() const h = stepSize; if ( step + stepSize >= 4 * m_height - 6 * repaint_h + 3 * m_width - 6 * repaint_w ) { - tqrepaint = true; + repaint = true; repaint_rh = repaint_h; repaint_rw = m_width - ( step - 4 * m_height + 6 * repaint_h - 3 * m_width + 8 * repaint_w + stepSize ); @@ -559,7 +559,7 @@ bool KPrPageEffects::effectSurround1() const w = stepSize; if ( step + stepSize >= 4 * m_height - 6 * repaint_h + 4 * m_width - 10 * repaint_w ) { - tqrepaint = true; + repaint = true; repaint_rh = step - 4 * m_height + 8 * repaint_h - 4 * m_width + 10 * repaint_w; repaint_rw = 2 * repaint_w; @@ -574,7 +574,7 @@ bool KPrPageEffects::effectSurround1() const h = stepSize; if ( step + stepSize >= 5 * m_height - 10 * repaint_h + 4 * m_width - 10 * repaint_w ) { - tqrepaint = true; + repaint = true; repaint_rh = m_height - 3 * repaint_h; repaint_rw = step - 5 * m_height + 10 * repaint_h - 4 * m_width + 13 * repaint_w; @@ -589,7 +589,7 @@ bool KPrPageEffects::effectSurround1() const w = stepSize; if ( step + stepSize >= 5 * m_height - 10 * repaint_h + 5 * m_width - 15 * repaint_w ) { - tqrepaint = true; + repaint = true; repaint_rh = m_height - ( step - 5 * m_height + 13 * repaint_h - 5 * m_width + 15 * repaint_w + stepSize ); repaint_rw = m_width - 3 * repaint_w; @@ -604,7 +604,7 @@ bool KPrPageEffects::effectSurround1() const h = stepSize; if ( step + stepSize >= 6 * m_height - 15 * repaint_h + 5 * m_width - 15 * repaint_w ) { - tqrepaint = true; + repaint = true; repaint_rh = 2 * repaint_h; repaint_rw = m_width - ( step - 6 * m_height + 15 * repaint_h - 5 * m_width + 18 * repaint_w + stepSize ); @@ -619,7 +619,7 @@ bool KPrPageEffects::effectSurround1() const w = stepSize; if ( step + stepSize >= 6 * m_height - 15 * repaint_h + 6 * m_width - 21 * repaint_w ) { - tqrepaint = true; + repaint = true; repaint_rh = step - 6 * m_height + 18 * repaint_h - 6 * m_width + 21 * repaint_w; repaint_rw = 3 * repaint_w; @@ -634,7 +634,7 @@ bool KPrPageEffects::effectSurround1() const h = stepSize; if ( step + stepSize >= 7 * m_height - 21 * repaint_h + 6 * m_width - 21 * repaint_w ) { - tqrepaint = true; + repaint = true; repaint_rh = m_height - 4 * repaint_h; repaint_rw = step - 7 * m_height + 21 * repaint_h - 6 * m_width + 25 * repaint_w; @@ -649,7 +649,7 @@ bool KPrPageEffects::effectSurround1() const w = stepSize; if ( step + stepSize >= 7 * m_height - 21 * repaint_h + 7 * m_width - 28 * repaint_w ) { - tqrepaint = true; + repaint = true; repaint_rh = m_height - ( step - 7 * m_height + 25 * repaint_h - 7 * m_width + 28 * repaint_w + stepSize ); repaint_rw = m_width - 4 * repaint_w; @@ -664,7 +664,7 @@ bool KPrPageEffects::effectSurround1() const h = stepSize; if ( step + stepSize >= 8 * m_height - 28 * repaint_h + 7 * m_width - 28 * repaint_w ) { - tqrepaint = true; + repaint = true; repaint_rh = 3 * repaint_h; repaint_rw = m_width - ( step - 8 * m_height + 28 * repaint_h - 7 * m_width + 32 * repaint_w + stepSize ); @@ -679,7 +679,7 @@ bool KPrPageEffects::effectSurround1() const w = stepSize; if ( step + stepSize >= 8 * m_height - 28 * repaint_h + 8 * m_width - 36 * repaint_w ) { - tqrepaint = true; + repaint = true; repaint_rh = step - 8 * m_height + 32 * repaint_h - 8 * m_width + 36 * repaint_w; repaint_rw = 4 * repaint_w; @@ -694,7 +694,7 @@ bool KPrPageEffects::effectSurround1() const h = stepSize; if ( step + stepSize >= 9 * m_height - 36 * repaint_h + 8 * m_width - 36 * repaint_w ) { - tqrepaint = true; + repaint = true; repaint_rh = m_height - 5 * repaint_h; repaint_rw = step - 9 * m_height + 36 * repaint_h - 8 * m_width + 41 * repaint_w; @@ -709,7 +709,7 @@ bool KPrPageEffects::effectSurround1() const w = stepSize; if ( step + stepSize >= 9 * m_height - 36 * repaint_h + 9 * m_width - 45 * repaint_w ) { - tqrepaint = true; + repaint = true; repaint_rh = m_height - ( step - 9 * m_height + 41 * repaint_h - 9 * m_width + 45 * repaint_w + stepSize ); repaint_rw = m_width - 5 * repaint_w; @@ -737,7 +737,7 @@ bool KPrPageEffects::effectSurround1() const bitBlt( m_dst, rw, rh, &m_pageTo, rw, rh, w, h ); - if ( tqrepaint ) + if ( repaint ) { bitBlt( m_dst, repaint_rw, repaint_rh, &m_pageTo, repaint_rw, repaint_rh, repaint_w, repaint_h ); } diff --git a/kpresenter/KPrPartObject.cpp b/kpresenter/KPrPartObject.cpp index 9f903608..42054ded 100644 --- a/kpresenter/KPrPartObject.cpp +++ b/kpresenter/KPrPartObject.cpp @@ -68,7 +68,7 @@ bool KPrPartObject::saveOasisObjectAttributes( KPOasisSaveContext &sc ) const kdDebug() << "KPrPartObject::saveOasisPart " << sc.partIndexObj << endl; sc.xmlWriter.startElement( "draw:object" ); - const TQString name = TQString( "Object_%1" ).tqarg( sc.partIndexObj + 1 ); + const TQString name = TQString( "Object_%1" ).arg( sc.partIndexObj + 1 ); ++sc.partIndexObj; child->saveOasisAttributes( sc.xmlWriter, name ); @@ -152,7 +152,7 @@ void KPrPartObject::draw( TQPainter *_painter, KoTextZoomHandler *_zoomhandler, void KPrPartObject::slot_changed( KoChild *_koChild ) { KoTextZoomHandler* zh = child->parent()->zoomHandler(); - KoRect g = zh->unzoomRect( _koChild->tqgeometry() ); + KoRect g = zh->unzoomRect( _koChild->geometry() ); KPrObject::setOrig( g.x(), g.y() ); KPrObject::setSize( g.width(), g.height() ); } diff --git a/kpresenter/KPrPicturePreview.cpp b/kpresenter/KPrPicturePreview.cpp index a2eafde8..ba0c8b33 100644 --- a/kpresenter/KPrPicturePreview.cpp +++ b/kpresenter/KPrPicturePreview.cpp @@ -162,7 +162,7 @@ void KPrPicturePreview::slotNormalPicture() if ( mirrorType != PM_NORMAL ) { mirrorType = PM_NORMAL; - tqrepaint( false ); + repaint( false ); } } @@ -172,7 +172,7 @@ void KPrPicturePreview::slotHorizontalMirrorPicture() if ( mirrorType != PM_HORIZONTAL ) { mirrorType = PM_HORIZONTAL; - tqrepaint( false ); + repaint( false ); } } @@ -182,7 +182,7 @@ void KPrPicturePreview::slotVerticalMirrorPicture() if ( mirrorType != PM_VERTICAL ) { mirrorType = PM_VERTICAL; - tqrepaint( false ); + repaint( false ); } } @@ -192,7 +192,7 @@ void KPrPicturePreview::slotHorizontalAndVerticalMirrorPicture() if ( mirrorType != PM_HORIZONTALANDVERTICAL ) { mirrorType = PM_HORIZONTALANDVERTICAL; - tqrepaint( false ); + repaint( false ); } } @@ -202,7 +202,7 @@ void KPrPicturePreview::slotPictureDepth0() if ( depth !=0 ) { depth = 0; - tqrepaint( false ); + repaint( false ); } } @@ -212,7 +212,7 @@ void KPrPicturePreview::slotPictureDepth1() if ( depth != 1 ) { depth = 1; - tqrepaint( false ); + repaint( false ); } } @@ -222,7 +222,7 @@ void KPrPicturePreview::slotPictureDepth8() if ( depth != 8) { depth = 8; - tqrepaint( false ); + repaint( false ); } } @@ -232,7 +232,7 @@ void KPrPicturePreview::slotPictureDepth16() if ( depth != 16 ) { depth = 16; - tqrepaint( false ); + repaint( false ); } } @@ -242,7 +242,7 @@ void KPrPicturePreview::slotPictureDepth32() if ( depth !=32 ) { depth = 32; - tqrepaint( false ); + repaint( false ); } } @@ -252,7 +252,7 @@ void KPrPicturePreview::slotSwapRGBPicture( bool _on ) if ( swapRGB != _on ) { swapRGB = _on; - tqrepaint( false ); + repaint( false ); } } @@ -262,7 +262,7 @@ void KPrPicturePreview::slotGrayscalPicture( bool _on ) if ( grayscal != _on ) { grayscal = _on; - tqrepaint( false ); + repaint( false ); } } @@ -272,7 +272,7 @@ void KPrPicturePreview::slotBrightValue( int _value ) if ( bright != _value ) { bright = _value; - tqrepaint( false ); + repaint( false ); } } @@ -282,7 +282,7 @@ void KPrPicturePreview::setDepth( int _depth) if ( _depth != depth ) { depth = _depth; - tqrepaint( false ); + repaint( false ); } } @@ -292,7 +292,7 @@ void KPrPicturePreview::setMirrorType (PictureMirrorType _t) if ( mirrorType != _t ) { mirrorType = _t; - tqrepaint( false ); + repaint( false ); } } @@ -300,7 +300,7 @@ void KPrPicturePreview::setMirrorType (PictureMirrorType _t) void KPrPicturePreview::setPicturePixmap(const TQPixmap &_pixmap) { origPixmap = _pixmap; - tqrepaint( false ); + repaint( false ); } diff --git a/kpresenter/KPrPiePreview.h b/kpresenter/KPrPiePreview.h index 1f3ca45f..21be8531 100644 --- a/kpresenter/KPrPiePreview.h +++ b/kpresenter/KPrPiePreview.h @@ -39,13 +39,13 @@ public: ~KPrPiePreview() {} void setAngle( int _angle ) - { angle = _angle; tqrepaint( true ); } + { angle = _angle; repaint( true ); } void setLength( int _len ) - { len = _len; tqrepaint( true ); } + { len = _len; repaint( true ); } void setType( PieType _type ) - { type = _type; tqrepaint( true ); } + { type = _type; repaint( true ); } void setPenBrush( const TQPen &_pen, const TQBrush &_brush ) - { pen = _pen; brush = _brush; tqrepaint( true ); } + { pen = _pen; brush = _brush; repaint( true ); } protected: void drawContents( TQPainter* ); diff --git a/kpresenter/KPrPointObject.cpp b/kpresenter/KPrPointObject.cpp index a1fb0564..86fc4641 100644 --- a/kpresenter/KPrPointObject.cpp +++ b/kpresenter/KPrPointObject.cpp @@ -100,7 +100,7 @@ TQDomDocumentFragment KPrPointObject::save( TQDomDocument& doc, double offset ) const char * KPrPointObject::getOasisElementName() const { - return "draw:custom-tqshape"; + return "draw:custom-shape"; } void KPrPointObject::loadOasisMarker( KoOasisContext & context ) diff --git a/kpresenter/KPrPolyLineObjectIface.cpp b/kpresenter/KPrPolyLineObjectIface.cpp index cd419aec..8283a4c5 100644 --- a/kpresenter/KPrPolyLineObjectIface.cpp +++ b/kpresenter/KPrPolyLineObjectIface.cpp @@ -34,12 +34,12 @@ KPrPolyLineObjectIface::KPrPolyLineObjectIface( KPrPolylineObject *_obj ) void KPrPolyLineObjectIface::horizontalFlip() { - //todo tqrepaint it + //todo repaint it obj->flip(true ); } void KPrPolyLineObjectIface::verticalFlip() { - //todo tqrepaint it + //todo repaint it obj->flip( false ); } diff --git a/kpresenter/KPrPolygonObject.cpp b/kpresenter/KPrPolygonObject.cpp index 451b1a48..2f621df9 100644 --- a/kpresenter/KPrPolygonObject.cpp +++ b/kpresenter/KPrPolygonObject.cpp @@ -75,7 +75,7 @@ bool KPrPolygonObject::saveOasisObjectAttributes( KPOasisSaveContext &sc ) const sc.xmlWriter.addAttribute( "draw:concave", checkConcavePolygon ? "true" : "false" ); if ( checkConcavePolygon ) { - sc.xmlWriter.addAttribute( "draw:sharpness", TQString( "%1%").tqarg( sharpnessValue ) ); + sc.xmlWriter.addAttribute( "draw:sharpness", TQString( "%1%").arg( sharpnessValue ) ); } return true; diff --git a/kpresenter/KPrPolygonPreview.cpp b/kpresenter/KPrPolygonPreview.cpp index e41e9c6f..545472a3 100644 --- a/kpresenter/KPrPolygonPreview.cpp +++ b/kpresenter/KPrPolygonPreview.cpp @@ -85,35 +85,35 @@ void KPrPolygonPreview::drawContents( TQPainter *painter ) void KPrPolygonPreview::slotConvexConcave( bool convexConcave ) { isConcave = convexConcave; - tqrepaint(); + repaint(); } void KPrPolygonPreview::slotConvexPolygon() { isConcave = false; - tqrepaint(); + repaint(); } void KPrPolygonPreview::slotConcavePolygon() { isConcave = true; - tqrepaint(); + repaint(); } void KPrPolygonPreview::slotCornersValue( int value ) { nCorners = value; - tqrepaint(); + repaint(); } void KPrPolygonPreview::slotSharpnessValue( int value ) { sharpness = value; - tqrepaint(); + repaint(); } diff --git a/kpresenter/KPrPolygonPreview.h b/kpresenter/KPrPolygonPreview.h index 4d6cc248..4a95a139 100644 --- a/kpresenter/KPrPolygonPreview.h +++ b/kpresenter/KPrPolygonPreview.h @@ -40,7 +40,7 @@ public: ~KPrPolygonPreview() {} void setPenBrush( const TQPen &_pen, const TQBrush &_brush ) - { pen = _pen; brush = _brush; tqrepaint( true ); } + { pen = _pen; brush = _brush; repaint( true ); } public slots: void slotConvexConcave( bool convexConcave ); diff --git a/kpresenter/KPrPresDurationDia.cpp b/kpresenter/KPrPresDurationDia.cpp index 34f578f6..67813eb1 100644 --- a/kpresenter/KPrPresDurationDia.cpp +++ b/kpresenter/KPrPresDurationDia.cpp @@ -71,7 +71,7 @@ void KPrPresDurationDia::setupSlideList( TQWidget *_page ) if ( doc->pageList().at( i )->isSlideSelected() ) { KListViewItem *item = new KListViewItem( slides ); item->setPixmap( 0, KPBarIcon( "slide" ) ); - item->setText( 0, TQString( "%1" ).tqarg( i + 1 ) ); + item->setText( 0, TQString( "%1" ).arg( i + 1 ) ); item->setText( 1, *m_durationListString.at( i ) ); item->setText( 2, doc->pageList().at( i )->pageTitle() ); } diff --git a/kpresenter/KPrRectPreview.h b/kpresenter/KPrRectPreview.h index bf539132..d1dd20bb 100644 --- a/kpresenter/KPrRectPreview.h +++ b/kpresenter/KPrRectPreview.h @@ -37,9 +37,9 @@ public: ~KPrRectPreview() {} void setRnds( int _rx, int _ry ) - { xRnd = _rx; yRnd = _ry; tqrepaint( contentsRect(), true ); } + { xRnd = _rx; yRnd = _ry; repaint( contentsRect(), true ); } void setPenBrush( const TQPen &_pen, const TQBrush &_brush ) - { pen = _pen; brush = _brush; tqrepaint( true ); } + { pen = _pen; brush = _brush; repaint( true ); } protected: void drawContents( TQPainter* ); diff --git a/kpresenter/KPrSideBar.cpp b/kpresenter/KPrSideBar.cpp index 4988a5bb..be2e4079 100644 --- a/kpresenter/KPrSideBar.cpp +++ b/kpresenter/KPrSideBar.cpp @@ -672,7 +672,7 @@ void OutlineSlideItem::updateTitle() { TQString title = m_page->pageTitle(); if ( ! m_page->isSlideSelected() ) - title = i18n( "(%1)" ).tqarg( title ); + title = i18n( "(%1)" ).arg( title ); setText( 0, title ); } @@ -935,7 +935,7 @@ void KPrOutline::itemClicked( TQListViewItem *item ) m_doc->deSelectAllObj(); m_view->getCanvas()->selectObj( object ); m_view->showObjectRect( object ); - m_doc->tqrepaint( false ); + m_doc->repaint( false ); } } diff --git a/kpresenter/KPrSlideTransitionDia.cpp b/kpresenter/KPrSlideTransitionDia.cpp index f0b3a05b..9afecb25 100644 --- a/kpresenter/KPrSlideTransitionDia.cpp +++ b/kpresenter/KPrSlideTransitionDia.cpp @@ -198,7 +198,7 @@ void KPrSlideTransitionDia::preview() delete m_pageEffect; m_pageEffect = 0; - m_dialog->previewPixmap->tqrepaint(); + m_dialog->previewPixmap->repaint(); } m_pageEffect = new KPrPageEffects( TQT_TQPAINTDEVICE(m_dialog->previewPixmap), m_target, effect, effectSpeed ); @@ -271,7 +271,7 @@ TQString KPrSlideTransitionDia::getSoundFileFilter() if ( comma ) str += '\n'; comma = true; - str += TQString( i18n( "*.%1|%2 Files" ) ).tqarg( *it ).tqarg( (*it).upper() ); + str += TQString( i18n( "*.%1|%2 Files" ) ).arg( *it ).arg( (*it).upper() ); full += TQString( "*.") + (*it) + ' '; } diff --git a/kpresenter/KPrTextObject.cpp b/kpresenter/KPrTextObject.cpp index 54934755..6c16133e 100644 --- a/kpresenter/KPrTextObject.cpp +++ b/kpresenter/KPrTextObject.cpp @@ -239,7 +239,7 @@ void KPrTextObject::saveOasisMarginElement( KoGenStyle &styleobjectauto ) const if ( bright != 0.0 ) styleobjectauto.addPropertyPt("fo:padding-right", bright ); - //add vertical tqalignment + //add vertical alignment switch( m_textVertAlign ) { case KP_TOP: @@ -272,15 +272,15 @@ void KPrTextObject::loadOasis(const TQDomElement &element, KoOasisContext& conte if( styleStack.hasAttributeNS( KoXmlNS::fo, "padding-right" ) ) bright = KoUnit::parseValue( styleStack.attributeNS( KoXmlNS::fo, "padding-right" ) ); kdDebug()<<" KPrTextObject::loadOasis : btp :"<<btop<<" bbottom :"<<bbottom<<" bleft :"<<bleft<<" bright :"<<bright<<endl; - // vertical tqalignment + // vertical alignment if ( styleStack.hasAttributeNS( KoXmlNS::draw, "textarea-vertical-align" ) ) { - TQString tqalignment = styleStack.attributeNS( KoXmlNS::draw, "textarea-vertical-align" ); - if ( tqalignment == "top" ) + TQString alignment = styleStack.attributeNS( KoXmlNS::draw, "textarea-vertical-align" ); + if ( alignment == "top" ) m_textVertAlign= KP_TOP; - else if ( tqalignment == "middle" ) + else if ( alignment == "middle" ) m_textVertAlign= KP_CENTER; - else if ( tqalignment == "bottom" ) + else if ( alignment == "bottom" ) m_textVertAlign= KP_BOTTOM; } kdDebug()<<" vertical Alignment :"<< ( ( m_textVertAlign== KP_TOP ) ? "top" : ( m_textVertAlign== KP_CENTER ) ? "center": "bottom" )<<endl; @@ -871,7 +871,7 @@ KoTextFormat KPrTextObject::loadFormat( TQDomElement &n, KoTextFormat * refForma if ( !n.isNull() ) { TQFontDatabase fdb; - TQStringList families = fdb.tqfamilies(); + TQStringList families = fdb.families(); if ( families.findIndex( n.attribute( attrFamily ) ) != -1 ) fn.setFamily( n.attribute( attrFamily ) ); else @@ -1287,7 +1287,7 @@ void KPrTextObject::recalcPageNum( KPrPage *page ) } var->resize(); - var->paragraph()->tqinvalidate( 0 ); // size may have changed -> need reformatting ! + var->paragraph()->invalidate( 0 ); // size may have changed -> need reformatting ! var->paragraph()->setChanged( true ); } } @@ -1295,17 +1295,17 @@ void KPrTextObject::recalcPageNum( KPrPage *page ) void KPrTextObject::tqlayout() { - tqinvalidate(); + invalidate(); // Get the thing going though, repainting doesn't call formatMore m_textobj->formatMore( 2 ); } -void KPrTextObject::tqinvalidate() +void KPrTextObject::invalidate() { - //kdDebug(33001) << "KWTextFrameSet::tqinvalidate " << getName() << endl; + //kdDebug(33001) << "KWTextFrameSet::invalidate " << getName() << endl; m_textobj->setLastFormattedParag( textDocument()->firstParag() ); textDocument()->formatter()->setViewFormattingChars( m_doc->viewFormattingChars() ); - textDocument()->tqinvalidate(); // lazy tqlayout, real update follows upon next tqrepaint + textDocument()->invalidate(); // lazy tqlayout, real update follows upon next repaint } // For the "paragraph after paragraph" effect @@ -1451,13 +1451,13 @@ KPrTextView * KPrTextObject::createKPTextView( KPrCanvas * _canvas, bool temp ) void KPrTextObject::removeHighlight () { - m_textobj->removeHighlight( true /*tqrepaint*/ ); + m_textobj->removeHighlight( true /*repaint*/ ); } -void KPrTextObject::highlightPortion( KoTextParag * parag, int index, int length, KPrCanvas* canvas, bool tqrepaint, KDialogBase* dialog ) +void KPrTextObject::highlightPortion( KoTextParag * parag, int index, int length, KPrCanvas* canvas, bool repaint, KDialogBase* dialog ) { - m_textobj->highlightPortion( parag, index, length, tqrepaint ); - if ( tqrepaint ) + m_textobj->highlightPortion( parag, index, length, repaint ); + if ( repaint ) { KPrDocument* doc = canvas->getView()->kPresenterDoc(); @@ -1616,7 +1616,7 @@ void KPrTextObject::slotAfterFormatting( int bottom, KoTextParag* lastFormatted, // Do recalculate the new available height though slotAvailableHeightNeeded(); m_doc->updateRuler(); - m_doc->tqrepaint( true ); + m_doc->repaint( true ); *abort = false; } } @@ -1864,9 +1864,9 @@ void KPrTextView::updateUI( bool updateFormat, bool force ) KoTextView::updateUI( updateFormat, force ); // Paragraph settings KoTextParag * parag = static_cast<KoTextParag*>( cursor()->parag()); - if ( m_paragLayout.tqalignment != parag->resolveAlignment() || force ) { - m_paragLayout.tqalignment = parag->resolveAlignment(); - m_canvas->getView()->alignChanged( m_paragLayout.tqalignment ); + if ( m_paragLayout.alignment != parag->resolveAlignment() || force ) { + m_paragLayout.alignment = parag->resolveAlignment(); + m_canvas->getView()->alignChanged( m_paragLayout.alignment ); } // Counter @@ -2356,7 +2356,7 @@ void KPrTextView::insertVariable( KoVariable *var, KoTextFormat *format, bool re customItemsMap ); if ( refreshCustomMenu && var->type() == VT_CUSTOM ) kpTextObject()->kPresenterDocument()->refreshMenuCustomVariable(); - kpTextObject()->kPresenterDocument()->tqrepaint( kpTextObject() ); + kpTextObject()->kPresenterDocument()->repaint( kpTextObject() ); } } diff --git a/kpresenter/KPrTextObject.h b/kpresenter/KPrTextObject.h index 3bacdb69..03de6444 100644 --- a/kpresenter/KPrTextObject.h +++ b/kpresenter/KPrTextObject.h @@ -115,7 +115,7 @@ public: void applyStyleChange( KoStyleChangeDefMap changed ); void removeHighlight(); - void highlightPortion( KoTextParag * parag, int index, int length, KPrCanvas *canvas, bool tqrepaint, KDialogBase* dialog = 0 ); + void highlightPortion( KoTextParag * parag, int index, int length, KPrCanvas *canvas, bool repaint, KDialogBase* dialog = 0 ); KCommand * pasteOasis( KoTextCursor * cursor, const TQByteArray & data, bool removeSelected ); @@ -195,7 +195,7 @@ protected: void drawText( TQPainter* _painter, KoTextZoomHandler* zoomHandler, bool onlyChanged, KoTextCursor* cursor, bool resetChanged ); void drawParags( TQPainter *p, KoTextZoomHandler* zoomHandler, const TQColorGroup& cg, int from, int to ); void saveParagLayout( const KoParagLayout& tqlayout, TQDomElement & parentElem ); - void tqinvalidate(); + void invalidate(); void recalcVerticalAlignment(); virtual KoPen defaultPen() const; protected slots: diff --git a/kpresenter/KPrTextPreview.h b/kpresenter/KPrTextPreview.h index f25d6987..bedb4753 100644 --- a/kpresenter/KPrTextPreview.h +++ b/kpresenter/KPrTextPreview.h @@ -13,10 +13,10 @@ public: KPrTextPreview( TQWidget* parent, const char* name = 0 ); ~KPrTextPreview() {} - void setShadowDirection( ShadowDirection sd ) { shadowDirection = sd; tqrepaint( true ); } - void setShadowDistance( int sd ) { shadowDistance = sd; tqrepaint( true ); } - void setShadowColor( const TQColor &sc ) { shadowColor = sc; tqrepaint( true ); } - void setAngle( double a ) { angle = a; tqrepaint( true ); } + void setShadowDirection( ShadowDirection sd ) { shadowDirection = sd; repaint( true ); } + void setShadowDistance( int sd ) { shadowDistance = sd; repaint( true ); } + void setShadowColor( const TQColor &sc ) { shadowColor = sc; repaint( true ); } + void setAngle( double a ) { angle = a; repaint( true ); } protected: void drawContents( TQPainter* ); diff --git a/kpresenter/KPrTransEffectDia.cpp b/kpresenter/KPrTransEffectDia.cpp index 3fad79a2..a060e45f 100644 --- a/kpresenter/KPrTransEffectDia.cpp +++ b/kpresenter/KPrTransEffectDia.cpp @@ -105,7 +105,7 @@ void KPrEffectPreview::run( PageEffect effect, EffectSpeed speed ) delete m_pageEffect; m_pageEffect = 0; - TQLabel::tqrepaint(); + TQLabel::repaint(); } m_pageEffect = new KPrPageEffects( TQT_TQPAINTDEVICE(this), m_target, effect, speed ); @@ -386,7 +386,7 @@ static TQString getSoundFileFilter() if ( comma ) str += '\n'; comma = true; - str += TQString( i18n( "*.%1|%2 Files" ) ).tqarg( *it ).tqarg( (*it).upper() ); + str += TQString( i18n( "*.%1|%2 Files" ) ).arg( *it ).arg( (*it).upper() ); full += TQString( "*.") + (*it) + ' '; } diff --git a/kpresenter/KPrUtils.cpp b/kpresenter/KPrUtils.cpp index fa21141a..2cbf5dc6 100644 --- a/kpresenter/KPrUtils.cpp +++ b/kpresenter/KPrUtils.cpp @@ -383,7 +383,7 @@ TQString saveOasisTimer( int second ) //ISO8601 chapter 5.5.3.2 //TQDate doesn't encode it as this format. - TQString timeIso = TQString( "PT%1H%2M%3S" ).tqarg( hours ).tqarg( ms ).tqarg( sec ); + TQString timeIso = TQString( "PT%1H%2M%3S" ).arg( hours ).arg( ms ).arg( sec ); return timeIso; } diff --git a/kpresenter/KPrView.cpp b/kpresenter/KPrView.cpp index 13e912f1..a2781ca1 100644 --- a/kpresenter/KPrView.cpp +++ b/kpresenter/KPrView.cpp @@ -579,7 +579,7 @@ void KPrView::print( KPrinter &prt ) m_pKPresenterDoc->recalcVariables( VT_ALL ); } - m_canvas->tqrepaint(); + m_canvas->repaint(); kdDebug(33001) << "KPrView::print zoom&res reset" << endl; m_pKPresenterDoc->getVariableCollection()->variableSetting()->setLastPrintingDate(TQDateTime::currentDateTime()); m_pKPresenterDoc->recalcVariables( VT_DATE ); @@ -846,7 +846,7 @@ void KPrView::savePicture( const TQString& oldName, KoPicture& picture) if ( !KIO::NetAccess::upload( tempFile.name(), url, this ) ) { KMessageBox::sorry( this, i18n( - "Unable to save the file to '%1'. %2.").tqarg( url.prettyURL() ).tqarg( KIO::NetAccess::lastErrorString() ), + "Unable to save the file to '%1'. %2.").arg( url.prettyURL() ).arg( KIO::NetAccess::lastErrorString() ), i18n("Save Failed") ); } } @@ -857,7 +857,7 @@ void KPrView::savePicture( const TQString& oldName, KoPicture& picture) } else KMessageBox::sorry( this, i18n( - "Error during saving: could not create temporary file: %1.").tqarg( strerror( tempFile.status() ) ), + "Error during saving: could not create temporary file: %1.").arg( strerror( tempFile.status() ) ), i18n("Save Picture") ); } } @@ -1580,7 +1580,7 @@ void KPrView::startScreenPres( int pgNum /*1-based*/ ) if ( !kPresenterDoc()->spManualSwitch() ) { m_autoPresStop = false; - m_pKPresenterDoc->tqrepaint( false ); + m_pKPresenterDoc->repaint( false ); if ( ! m_autoPresTimerConnected ) { connect( &m_autoPresTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( doAutomaticScreenPres() ) ); @@ -2414,7 +2414,7 @@ void KPrView::setupActions() actionToolsZoom->setExclusiveGroup( "tools" ); actionToolsShapePopup = new KActionMenu( i18n( "&Shape" ), "rectangle", - actionCollection(), "tools_tqshapepopup" ); + actionCollection(), "tools_shapepopup" ); actionToolsShapePopup->setDelayed(true); connect(actionToolsShapePopup, TQT_SIGNAL(activated()), TQT_TQOBJECT(this), TQT_SLOT(toolsShapePopup())); @@ -2597,7 +2597,7 @@ void KPrView::setupActions() // This approach allows to edit toolbars and extract separate actions from this menu KToggleAction* act = new KToggleAction( styleIt.current()->name(), /*TODO icon,*/ 0, TQT_TQOBJECT(this), TQT_SLOT( slotCounterStyleSelected() ), - actionCollection(), TQString("counterstyle_%1").tqarg( styleIt.current()->style() ).latin1() ); + actionCollection(), TQString("counterstyle_%1").arg( styleIt.current()->style() ).latin1() ); act->setExclusiveGroup( "counterstyle" ); // Add to the right menu: both for "none", bullet for bullets, numbers otherwise if ( styleIt.current()->style() == KoParagCounter::STYLE_NONE ) { @@ -3096,19 +3096,19 @@ void KPrView::setupActions() actionAlignVerticalTop = new KToggleAction( i18n( "Align Top" ), 0, TQT_TQOBJECT(this), TQT_SLOT( alignVerticalTop() ), actionCollection(), "align_top" ); - actionAlignVerticalTop->setExclusiveGroup( "vertical_tqalignment" ); + actionAlignVerticalTop->setExclusiveGroup( "vertical_alignment" ); actionAlignVerticalTop->setChecked( true ); actionAlignVerticalBottom = new KToggleAction( i18n( "Align Bottom" ), 0, TQT_TQOBJECT(this), TQT_SLOT( alignVerticalBottom() ), actionCollection(), "align_bottom" ); - actionAlignVerticalBottom->setExclusiveGroup( "vertical_tqalignment" ); + actionAlignVerticalBottom->setExclusiveGroup( "vertical_alignment" ); actionAlignVerticalCenter = new KToggleAction( i18n( "Align Middle" ), 0, TQT_TQOBJECT(this), TQT_SLOT( alignVerticalCenter() ), actionCollection(), "align_center" ); - actionAlignVerticalCenter->setExclusiveGroup( "vertical_tqalignment" ); + actionAlignVerticalCenter->setExclusiveGroup( "vertical_alignment" ); actionSavePicture= new KAction( i18n("Save Picture..."), 0, @@ -3717,7 +3717,7 @@ void KPrView::setupPopupMenus() actionToolsLinePopup->insert(actionToolsCubicBezierCurve); actionToolsLinePopup->insert(actionToolsQuadricBezierCurve); - // create insert-tqshape popup + // create insert-shape popup actionToolsShapePopup->insert(actionToolsRectangle); actionToolsShapePopup->insert(actionToolsCircleOrEllipse); actionToolsShapePopup->insert(actionToolsPie); @@ -3847,7 +3847,7 @@ void KPrView::skipToPage( int num ) //(Laurent) deselect object when we change page. //otherwise you can change object properties on other page deSelectAllObjects(); - m_pKPresenterDoc->tqrepaint( FALSE ); + m_pKPresenterDoc->repaint( FALSE ); m_pKPresenterDoc->displayActivePage( page ); } @@ -4102,7 +4102,7 @@ void KPrView::updatePageInfo() { if (m_sbPageLabel) m_sbPageLabel->setText( TQString(" ") + - i18n("Slide %1/%2").tqarg(getCurrPgNum()).tqarg(m_pKPresenterDoc->getPageNums())+ + i18n("Slide %1/%2").arg(getCurrPgNum()).arg(m_pKPresenterDoc->getPageNums())+ TQString(" ") ); } @@ -4120,13 +4120,13 @@ void KPrView::updateObjectStatusBarItem() KPrObject * obj = m_canvas->getSelectedObj(); KoSize size = obj->getSize(); m_sbObjectLabel->setText( ' ' + i18n( "Statusbar info", "%1: %2, %3 - %4, %5 (width: %6, height: %7)" ) - .tqarg( /*frame->frameSet()->name()*/obj->getObjectName() ) - .tqarg( KoUnit::toUserStringValue( obj->getOrig().x(), unit ) ) - .tqarg( KoUnit::toUserStringValue( obj->getOrig().y() , unit) ) - .tqarg( KoUnit::toUserStringValue( obj->getOrig().x() + size.width(), unit ) ) - .tqarg( KoUnit::toUserStringValue( obj->getOrig().y() + size.height(), unit ) ) - .tqarg( KoUnit::toUserStringValue( size.width(), unit ) ) - .tqarg( KoUnit::toUserStringValue( size.height(), unit ) ) ); + .arg( /*frame->frameSet()->name()*/obj->getObjectName() ) + .arg( KoUnit::toUserStringValue( obj->getOrig().x(), unit ) ) + .arg( KoUnit::toUserStringValue( obj->getOrig().y() , unit) ) + .arg( KoUnit::toUserStringValue( obj->getOrig().x() + size.width(), unit ) ) + .arg( KoUnit::toUserStringValue( obj->getOrig().y() + size.height(), unit ) ) + .arg( KoUnit::toUserStringValue( size.width(), unit ) ) + .arg( KoUnit::toUserStringValue( size.height(), unit ) ) ); } else m_sbObjectLabel->setText( i18n("1 object selected", "%n objects selected", nbSelected) ); @@ -4206,7 +4206,7 @@ void KPrView::setEditMaster( bool editMaster ) if ( sidebar ) sidebar->setViewMasterPage( m_editMaster ); updateNoteBarText(); - m_canvas->tqrepaint( false ); + m_canvas->repaint( false ); } } @@ -4675,7 +4675,7 @@ void KPrView::spellCheckerMisspelling( const TQString &old, int pos ) kdDebug() << "KWView::spellCheckerMisspelling parag=" << parag->paragId() << " pos=" << pos << " length=" << old.length() << endl; - textdoc->textObject()->highlightPortion( parag, pos, old.length(), m_canvas,true/*tqrepaint*/ ); + textdoc->textObject()->highlightPortion( parag, pos, old.length(), m_canvas,true/*repaint*/ ); } void KPrView::spellCheckerCorrected( const TQString &old, int pos, const TQString &corr ) @@ -4694,7 +4694,7 @@ void KPrView::spellCheckerCorrected( const TQString &old, int pos, const TQStrin if ( !textdoc ) return; pos += m_spell.kospell->currentStartIndex(); - textdoc->textObject()->highlightPortion( parag, pos, old.length(), m_canvas,true/*tqrepaint*/ ); + textdoc->textObject()->highlightPortion( parag, pos, old.length(), m_canvas,true/*repaint*/ ); KoTextCursor cursor( textdoc ); cursor.setParag( parag ); @@ -4881,7 +4881,7 @@ void KPrView::refreshCustomMenu() if ( !lst.contains( varName) ) { lst.append( varName ); - TQCString name = TQString("custom-action_%1").tqarg(i).latin1(); + TQCString name = TQString("custom-action_%1").arg(i).latin1(); act = new KAction( varName, shortCuts[varName], TQT_TQOBJECT(this), TQT_SLOT( insertCustomVariable() ), actionCollection(), name ); @@ -4896,7 +4896,7 @@ void KPrView::refreshCustomMenu() actionInsertCustom->popupMenu()->insertSeparator(); act = new KAction( i18n("New..."), 0, TQT_TQOBJECT(this), TQT_SLOT( insertNewCustomVariable() ), actionCollection(), - TQString("custom-action_%1").tqarg(i).latin1() ); + TQString("custom-action_%1").arg(i).latin1() ); act->setGroup( "custom-variable-action" ); actionInsertCustom->insert( act ); @@ -5067,7 +5067,7 @@ void KPrView::slotUpdateRuler() if( getHRuler()->flags()!= flags ) { getHRuler()->changeFlags(flags); - getHRuler()->tqrepaint(); + getHRuler()->repaint(); } } if( getVRuler()) @@ -5075,7 +5075,7 @@ void KPrView::slotUpdateRuler() if( getVRuler()->flags() != 0 ) { getVRuler()->changeFlags(0); - getVRuler()->tqrepaint(); + getVRuler()->repaint(); } } } @@ -5244,22 +5244,22 @@ void KPrView::changeZoomMenu( int zoom ) qHeapSort( list ); for (TQValueList<int>::Iterator it = list.begin() ; it != list.end() ; ++it) - lst.append( i18n("%1%").tqarg(*it) ); + lst.append( i18n("%1%").arg(*it) ); } else { - lst << i18n("%1%").tqarg("33"); - lst << i18n("%1%").tqarg("50"); - lst << i18n("%1%").tqarg("75"); - lst << i18n("%1%").tqarg("100"); - lst << i18n("%1%").tqarg("125"); - lst << i18n("%1%").tqarg("150"); - lst << i18n("%1%").tqarg("200"); - lst << i18n("%1%").tqarg("250"); - lst << i18n("%1%").tqarg("350"); - lst << i18n("%1%").tqarg("400"); - lst << i18n("%1%").tqarg("450"); - lst << i18n("%1%").tqarg("500"); + lst << i18n("%1%").arg("33"); + lst << i18n("%1%").arg("50"); + lst << i18n("%1%").arg("75"); + lst << i18n("%1%").arg("100"); + lst << i18n("%1%").arg("125"); + lst << i18n("%1%").arg("150"); + lst << i18n("%1%").arg("200"); + lst << i18n("%1%").arg("250"); + lst << i18n("%1%").arg("350"); + lst << i18n("%1%").arg("400"); + lst << i18n("%1%").arg("450"); + lst << i18n("%1%").arg("500"); } actionViewZoom->setItems( lst ); } @@ -5267,7 +5267,7 @@ void KPrView::changeZoomMenu( int zoom ) void KPrView::showZoom( int zoom ) { TQStringList list = actionViewZoom->items(); - TQString zoomStr( i18n("%1%").tqarg( zoom ) ); + TQString zoomStr( i18n("%1%").arg( zoom ) ); int pos = list.findIndex(zoomStr); if( pos == -1) { @@ -5315,7 +5315,7 @@ void KPrView::viewZoom( const TQString &s ) } m_canvas->setFocus(); - m_canvas->tqrepaint(); + m_canvas->repaint(); } void KPrView::setZoomRect( const KoRect & rect ) @@ -5331,7 +5331,7 @@ void KPrView::setZoomRect( const KoRect & rect ) m_canvas->setToolEditMode( TEM_MOUSE ); m_canvas->scrollTopLeftPoint( zoomHandler()->zoomPoint( rect.topLeft() ) ); m_canvas->setUpdatesEnabled( true ); - m_canvas->tqrepaint(); + m_canvas->repaint(); } void KPrView::setZoom( int zoom, bool updateViews ) @@ -5361,7 +5361,7 @@ void KPrView::slotViewFormattingChars() { m_pKPresenterDoc->setViewFormattingChars(actionViewFormattingChars->isChecked()); m_pKPresenterDoc->tqlayout(); // Due to the different formatting when this option is activated - m_pKPresenterDoc->tqrepaint(false); + m_pKPresenterDoc->repaint(false); } void KPrView::setPageDuration( int _pgNum ) @@ -5647,7 +5647,7 @@ void KPrView::viewGuideLines() m_pKPresenterDoc->updateGuideLineButton(); deSelectAllObjects(); refreshRuler( state ); - m_pKPresenterDoc->tqrepaint(false); + m_pKPresenterDoc->repaint(false); } @@ -5656,7 +5656,7 @@ void KPrView::viewGrid() m_pKPresenterDoc->setShowGrid( actionViewShowGrid->isChecked() ); m_pKPresenterDoc->setModified( true ); m_pKPresenterDoc->updateGridButton(); - m_pKPresenterDoc->tqrepaint(false); + m_pKPresenterDoc->repaint(false); } @@ -5681,7 +5681,7 @@ void KPrView::refreshRuler( bool state ) if ( !m_pKPresenterDoc->isReadWrite()) { getHRuler()->changeFlags(KoRuler::F_NORESIZE); - getHRuler()->tqrepaint(); + getHRuler()->repaint(); } else { @@ -5690,7 +5690,7 @@ void KPrView::refreshRuler( bool state ) if( getHRuler()->flags() != KoRuler::F_HELPLINES ) { getHRuler()->changeFlags(KoRuler::F_HELPLINES); - getHRuler()->tqrepaint(); + getHRuler()->repaint(); } } else @@ -5698,7 +5698,7 @@ void KPrView::refreshRuler( bool state ) if( getHRuler()->flags() != 0 ) { getHRuler()->changeFlags( 0 ); - getHRuler()->tqrepaint(); + getHRuler()->repaint(); } } } @@ -5709,7 +5709,7 @@ void KPrView::refreshRuler( bool state ) if ( !m_pKPresenterDoc->isReadWrite()) { getVRuler()->changeFlags(KoRuler::F_NORESIZE); - getVRuler()->tqrepaint(); + getVRuler()->repaint(); } else { @@ -5718,7 +5718,7 @@ void KPrView::refreshRuler( bool state ) if( getVRuler()->flags() != KoRuler::F_HELPLINES ) { getVRuler()->changeFlags(KoRuler::F_HELPLINES); - getVRuler()->tqrepaint(); + getVRuler()->repaint(); } } else @@ -5726,7 +5726,7 @@ void KPrView::refreshRuler( bool state ) if( getVRuler()->flags()!= 0) { getVRuler()->changeFlags(0); - getVRuler()->tqrepaint(); + getVRuler()->repaint(); } } } @@ -5889,7 +5889,7 @@ void KPrView::slotObjectEditChanged() KoParagCounter counter; if(paragLayout->counter) counter = *(paragLayout->counter); - int align = paragLayout->tqalignment; + int align = paragLayout->alignment; if ( align == TQt::AlignAuto ) align = TQt::AlignLeft; // ## seems hard to detect RTL here alignChanged( align ); @@ -6224,7 +6224,7 @@ void KPrView::updateRulerInProtectContentMode() getHRuler()->changeFlags(KoRuler::F_INDENTS | KoRuler::F_TABS); else getHRuler()->changeFlags(0); - getHRuler()->tqrepaint(); + getHRuler()->repaint(); } } diff --git a/kpresenter/KPrView.h b/kpresenter/KPrView.h index 1fc3cc7e..f00b7e2d 100644 --- a/kpresenter/KPrView.h +++ b/kpresenter/KPrView.h @@ -1172,7 +1172,7 @@ private: CurrentLineTool m_currentLineTool; - // store the currently selected tqshape-tool + // store the currently selected shape-tool enum CurrentShapeTool { StRectangle = 1, StCircle = 2, diff --git a/kpresenter/KPrViewIface.cpp b/kpresenter/KPrViewIface.cpp index 6f8aa314..49c2d887 100644 --- a/kpresenter/KPrViewIface.cpp +++ b/kpresenter/KPrViewIface.cpp @@ -642,9 +642,9 @@ TQStringList KPrViewIface::exportPage( int _nPage, // see http://www.indeview.org for details. // Note: We use the 1-based page number as fallback page title. res << TQString("Name=%1") - .tqarg( page->pageTitle( TQString("Page%1").tqarg(_nPage) ) ); + .arg( page->pageTitle( TQString("Page%1").arg(_nPage) ) ); res << TQString("Notes=%1") - .tqarg( page->noteText() ); + .arg( page->noteText() ); } } } diff --git a/kpresenter/KPrWebPresentation.cpp b/kpresenter/KPrWebPresentation.cpp index 40ad82be..0d490cf4 100644 --- a/kpresenter/KPrWebPresentation.cpp +++ b/kpresenter/KPrWebPresentation.cpp @@ -129,7 +129,7 @@ static TQString EscapeSgmlText(const TQTextCodec* codec, const TQString& strIn, { if (!codec->canEncode(ch)) { - strReturn+=TQString("&#%1;").tqarg(ch.tqunicode()); + strReturn+=TQString("&#%1;").arg(ch.tqunicode()); break; } } @@ -156,7 +156,7 @@ static TQString EscapeEncodingOnly(const TQTextCodec* codec, const TQString& str { if (!codec->canEncode(ch)) { - strReturn+=TQString("&#%1;").tqarg(ch.tqunicode()); + strReturn+=TQString("&#%1;").arg(ch.tqunicode()); continue; } } @@ -211,7 +211,7 @@ void KPrWebPresentation::loadConfig() if ( num <= slideInfos.count() ) { for ( unsigned int i = 0; i < num; i++ ) { - TQString key = TQString::fromLatin1( "SlideTitle%1" ).tqarg( i ); + TQString key = TQString::fromLatin1( "SlideTitle%1" ).arg( i ); if ( cfg.hasKey( key ) ) { // We'll assume that the selected pages haven't changed... Hmm. @@ -245,7 +245,7 @@ void KPrWebPresentation::saveConfig() cfg.writeEntry( "Slides", slideInfos.count() ); for ( unsigned int i = 0; i < slideInfos.count(); i++ ) - cfg.writeEntry( TQString::fromLatin1( "SlideTitle%1" ).tqarg( i ), slideInfos[ i ].slideTitle ); + cfg.writeEntry( TQString::fromLatin1( "SlideTitle%1" ).arg( i ), slideInfos[ i ].slideTitle ); cfg.writeEntry( "BackColor", backColor ); cfg.writeEntry( "TitleColor", titleColor ); @@ -310,7 +310,7 @@ void KPrWebPresentation::createSlidesPictures( KProgress *progressBar ) for ( unsigned int i = 0; i < slideInfos.count(); i++ ) { int pgNum = slideInfos[i].pageNumber; view->getCanvas()->drawPageInPix( pix, pgNum, zoom, true /*force real variable value*/ ); - filename = TQString( "%1/pics/slide_%2.png" ).tqarg( path ).tqarg( i + 1 ); + filename = TQString( "%1/pics/slide_%2.png" ).arg( path ).arg( i + 1 ); KTempFile tmp; pix.save( tmp.name(), "PNG" ); @@ -395,8 +395,8 @@ void KPrWebPresentation::createSlidesHTML( KProgress *progressBar ) unsigned int pgNum = i + 1; // pgquiles # elpauer . org - I think this is a bug, seems to be an overflow if we have max_unsigned_int slides KTempFile tmp; - TQString dest= TQString( "%1/html/slide_%2.html" ).tqarg( path ).tqarg( pgNum ); - TQString next= TQString( "slide_%2.html" ).tqarg( pgNum<slideInfos.count() ? pgNum+1 : (m_bLoopSlides ? 1 : pgNum ) ); // Ugly, but it works + TQString dest= TQString( "%1/html/slide_%2.html" ).arg( path ).arg( pgNum ); + TQString next= TQString( "slide_%2.html" ).arg( pgNum<slideInfos.count() ? pgNum+1 : (m_bLoopSlides ? 1 : pgNum ) ); // Ugly, but it works TQFile file( tmp.name() ); file.open( IO_WriteOnly ); @@ -480,7 +480,7 @@ void KPrWebPresentation::createSlidesHTML( KProgress *progressBar ) streamOut << "<a href=\"" << next << "\">"; streamOut << "<img src=\"../pics/slide_" << pgNum << ".png\" border=\"0\" alt=\"" - << i18n( "Slide %1" ).tqarg( pgNum ) << "\"" << ( isXML() ?" /":"") << ">"; + << i18n( "Slide %1" ).arg( pgNum ) << "\"" << ( isXML() ?" /":"") << ">"; if ( i < slideInfos.count() - 1 ) streamOut << "</a>"; @@ -509,9 +509,9 @@ void KPrWebPresentation::createSlidesHTML( KProgress *progressBar ) if (email.isEmpty()) htmlAuthor=escapeHtmlText( codec, author ); else - htmlAuthor=TQString("<a href=\"mailto:%1\">%2</a>").tqarg( escapeHtmlText( codec, email )).tqarg( escapeHtmlText( codec, author )); + htmlAuthor=TQString("<a href=\"mailto:%1\">%2</a>").arg( escapeHtmlText( codec, email )).arg( escapeHtmlText( codec, author )); streamOut << EscapeEncodingOnly ( codec, i18n( "Created on %1 by <i>%2</i> with <a href=\"http://www.koffice.org/kpresenter\">KPresenter</a>" ) - .tqarg( KGlobal::locale()->formatDate ( TQDate::currentDate() ) ).tqarg( htmlAuthor ) ); + .arg( KGlobal::locale()->formatDate ( TQDate::currentDate() ) ).arg( htmlAuthor ) ); streamOut << " </center><hr noshade=\"noshade\"" << ( isXML() ?" /":"") << ">\n"; } @@ -532,7 +532,7 @@ void KPrWebPresentation::createMainPage( KProgress *progressBar ) { TQTextCodec *codec = KGlobal::charsets()->codecForName( m_encoding ); KTempFile tmp; - TQString dest = TQString( "%1/index.html" ).tqarg( path ); + TQString dest = TQString( "%1/index.html" ).arg( path ); TQFile file( tmp.name() ); file.open( IO_WriteOnly ); TQTextStream streamOut( &file ); @@ -560,9 +560,9 @@ void KPrWebPresentation::createMainPage( KProgress *progressBar ) // footer: author name, e-mail TQString htmlAuthor = email.isEmpty() ? escapeHtmlText( codec, author ) : - TQString("<a href=\"mailto:%1\">%2</a>").tqarg( escapeHtmlText( codec, email )).tqarg( escapeHtmlText( codec, author )); + TQString("<a href=\"mailto:%1\">%2</a>").arg( escapeHtmlText( codec, email )).arg( escapeHtmlText( codec, author )); streamOut << EscapeEncodingOnly ( codec, i18n( "Created on %1 by <i>%2</i> with <a href=\"http://www.koffice.org/kpresenter\">KPresenter</a>" ) - .tqarg( KGlobal::locale()->formatDate ( TQDate::currentDate() ) ).tqarg( htmlAuthor ) ); + .arg( KGlobal::locale()->formatDate ( TQDate::currentDate() ) ).arg( htmlAuthor ) ); streamOut << "</body>\n</html>\n"; file.close(); @@ -1081,7 +1081,7 @@ void KPrWebPresentationWizard::pageChanged() { TQString msg = i18n( "<qt>The directory <b>%1</b> does not exist.<br>" "Do you want create it?</qt>" ); - if( KMessageBox::questionYesNo( this, msg.tqarg( pathname ), + if( KMessageBox::questionYesNo( this, msg.arg( pathname ), i18n( "Directory Not Found" ) ) == KMessageBox::Yes) { diff --git a/kpresenter/autoformEdit/AFChoose.cpp b/kpresenter/autoformEdit/AFChoose.cpp index 7043a692..5914a621 100644 --- a/kpresenter/autoformEdit/AFChoose.cpp +++ b/kpresenter/autoformEdit/AFChoose.cpp @@ -86,7 +86,7 @@ void AFChoose::setupTabs() for (grpPtr=groupList.first();grpPtr != 0;grpPtr=groupList.next()) { grpPtr->tab = new TQVBox(this); - TQWhatsThis::add(grpPtr->tab, i18n( "Choose a predefined tqshape by clicking on it then clicking the OK button (or just double-click on the tqshape). You can then insert the tqshape onto your slide by drawing the area with the mouse pointer." ) ); + TQWhatsThis::add(grpPtr->tab, i18n( "Choose a predefined shape by clicking on it then clicking the OK button (or just double-click on the shape). You can then insert the shape onto your slide by drawing the area with the mouse pointer." ) ); grpPtr->loadWid = new KIconCanvas(grpPtr->tab); // Changes for the new KIconCanvas (Werner) TQDir d( grpPtr->dir.absFilePath() ); diff --git a/kpresenter/autoformEdit/ATFInterpreter.cpp b/kpresenter/autoformEdit/ATFInterpreter.cpp index 5f010518..0f01368a 100644 --- a/kpresenter/autoformEdit/ATFInterpreter.cpp +++ b/kpresenter/autoformEdit/ATFInterpreter.cpp @@ -199,7 +199,7 @@ TQPointArray ATFInterpreter::getPointArray(int wid,int heig) if (i == 14) py = tmp; } } - pntArray.setPoint(coordList.tqat(),px,py); + pntArray.setPoint(coordList.at(),px,py); } } return pntArray; @@ -239,7 +239,7 @@ void ATFInterpreter::interpret() for (TQStringList::Iterator it=lines.begin(); it!=lines.end(); ++it) { - if (!(*it).isEmpty() && (*it).tqat(0) != COMMENT) + if (!(*it).isEmpty() && (*it).at(0) != COMMENT) { if (level.top() == LEVEL_NULL) { @@ -265,7 +265,7 @@ void ATFInterpreter::interpret() } else if (level.top() == LEVEL_X || level.top() == LEVEL_Y || level.top() == LEVEL_ATTR) { - switch (((*it).tqat(0)).latin1()) + switch (((*it).at(0)).latin1()) { case VAR_1: { @@ -310,7 +310,7 @@ void ATFInterpreter::interpret() } break; case VAR_PW: { - pw = 1; pw = ((*it).tqat(4)).latin1() - 48; + pw = 1; pw = ((*it).at(4)).latin1() - 48; attrib.pwDiv = (*it); } break; case '}': @@ -363,10 +363,10 @@ TQPtrList<ATFInterpreter::Sign> ATFInterpreter::getVar(const TQString &s) for (unsigned int i=1; i<s.length(); ++i) { - if(s.tqat(i)==' ') + if(s.at(i)==' ') continue; signPtr = new Sign; - switch (s.tqat(i).latin1()) + switch (s.at(i).latin1()) { case VAR_W: signPtr->type = ST_WIDTH; break; case VAR_H: signPtr->type = ST_HEIGHT; break; @@ -431,20 +431,20 @@ TQPtrList<ATFInterpreter::Sign> ATFInterpreter::getVar(const TQString &s) signPtr->type = ST_NUMBER; if (s.length() - 1 > i) { - switch (s.tqat(i+1).latin1()) + switch (s.at(i+1).latin1()) { case NUM_0: case NUM_1: case NUM_2: case NUM_3: case NUM_4: case NUM_5: case NUM_6: case NUM_7: case NUM_8: case NUM_9: { - signPtr->num = (s.tqat(i).latin1() - 48) * 10 + s.tqat(i+1).latin1() - 48; + signPtr->num = (s.at(i).latin1() - 48) * 10 + s.at(i+1).latin1() - 48; i++; } break; default: - signPtr->num = s.tqat(i).latin1() - 48; break; + signPtr->num = s.at(i).latin1() - 48; break; } } else - signPtr->num = s.tqat(i).latin1() - 48; + signPtr->num = s.at(i).latin1() - 48; } break; } list.append(signPtr); diff --git a/kpresenter/imageEffectBase.ui b/kpresenter/imageEffectBase.ui index 84d38866..ec1f9959 100644 --- a/kpresenter/imageEffectBase.ui +++ b/kpresenter/imageEffectBase.ui @@ -60,7 +60,7 @@ <property name="scaledContents"> <bool>true</bool> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> @@ -648,7 +648,7 @@ <property name="text"> <string>This effect has no options.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop</set> </property> </widget> @@ -672,7 +672,7 @@ <property name="text"> <string>This effect has no options.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop</set> </property> </widget> @@ -794,7 +794,7 @@ <property name="text"> <string>This effect has no options.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop</set> </property> </widget> @@ -818,7 +818,7 @@ <property name="text"> <string>This effect has no options.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop</set> </property> </widget> diff --git a/kpresenter/kprconverter.pl b/kpresenter/kprconverter.pl index 60aa3fb3..524b3d8d 100644 --- a/kpresenter/kprconverter.pl +++ b/kpresenter/kprconverter.pl @@ -43,9 +43,9 @@ while (<INPUT>) # In the old format we had horzAlign="[0|1|2]" 0=left, 1=center, 2=right # In the new one it's align="..." and uses the Qt::AlignmentFlags enums. # Qt::AlignLeft=1, AlignRight=2, AlignHCenter=4 - $tqalignment=$1 if(/horzAlign=(\"[0-2]+\")/); - $tqalignment =~ tr/01/14/; - s/horzAlign=\"[0-2]+\"/align=$tqalignment/; + $alignment=$1 if(/horzAlign=(\"[0-2]+\")/); + $alignment =~ tr/01/14/; + s/horzAlign=\"[0-2]+\"/align=$alignment/; s/>$/ type=$objType>/; } elsif (/<\/PARAGRAPH>/) |