diff options
author | Timothy Pearson <[email protected]> | 2011-12-15 15:32:11 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2011-12-15 15:32:11 -0600 |
commit | 94844816550ad672ccfcdc25659c625546239998 (patch) | |
tree | e35fc60fd736c645d59f6408af032774ad8023d3 /kpresenter/KPrPage.cpp | |
parent | 2a811c38c74c03648ecf857e566c44483cbad706 (diff) | |
download | koffice-94844816550ad672ccfcdc25659c625546239998.tar.gz koffice-94844816550ad672ccfcdc25659c625546239998.zip |
Rename a number of old tq methods that are no longer tq specific
Diffstat (limited to 'kpresenter/KPrPage.cpp')
-rw-r--r-- | kpresenter/KPrPage.cpp | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/kpresenter/KPrPage.cpp b/kpresenter/KPrPage.cpp index d8e65bac..656b48e2 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, @@ -538,7 +538,7 @@ bool KPrPage::saveOasisPage( KoStore *store, KoXmlWriter &xmlWriter, int posPage xmlWriter.startElement( "style:master-page" ); xmlWriter.addAttribute( "style:name", "Standard" ); - xmlWriter.addAttribute( "style:page-tqlayout-name", pageLayoutName ); + xmlWriter.addAttribute( "style:page-layout-name", pageLayoutName ); TQString styleName = saveOasisPageStyle( store, context.mainStyles() ); if ( !styleName.isEmpty() ) @@ -655,7 +655,7 @@ bool KPrPage::saveOasisNote( KoXmlWriter &xmlWriter ) const return true; //todo : add size for draw:text-box otherwise we can't import into oo - //<draw:text-box presentation:style-name="pr1" draw:text-style-name="P1" draw:layer="tqlayout" svg:width="14.5cm" svg:height="11.408cm" svg:x="3.247cm" svg:y="14.126cm" presentation:class="notes"> + //<draw:text-box presentation:style-name="pr1" draw:text-style-name="P1" draw:layer="layout" svg:width="14.5cm" svg:height="11.408cm" svg:x="3.247cm" svg:y="14.126cm" presentation:class="notes"> xmlWriter.startElement( "presentation:notes" ); xmlWriter.startElement( "draw:frame" ); //todo save style @@ -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() ); } } } @@ -2445,8 +2445,8 @@ void KPrPage::changeTabStopValue ( double _tabStop ) if ( obj ) { obj->textDocument()->setTabStops( m_doc->zoomHandler()->ptToLayoutUnitPixX( _tabStop )); - obj->tqlayout(); - m_doc->tqrepaint( obj ); + obj->layout(); + m_doc->repaint( obj ); } } } |