diff options
Diffstat (limited to 'kpresenter/KPrPage.cpp')
-rw-r--r-- | kpresenter/KPrPage.cpp | 486 |
1 files changed, 243 insertions, 243 deletions
diff --git a/kpresenter/KPrPage.cpp b/kpresenter/KPrPage.cpp index 8529d2ea..2fbbbaa2 100644 --- a/kpresenter/KPrPage.cpp +++ b/kpresenter/KPrPage.cpp @@ -55,15 +55,15 @@ #include <KoTextObject.h> #include <KoTextParag.h> #include <KoRect.h> -#include <qapplication.h> +#include <tqapplication.h> #include <KoStyleCollection.h> #include <KoVariable.h> #include <KoGenStyles.h> #include <KoXmlWriter.h> #include <ktempfile.h> -#include <qbuffer.h> -#include <qregexp.h> -#include <qfile.h> +#include <tqbuffer.h> +#include <tqregexp.h> +#include <tqfile.h> struct listAnimation { KPrObject *obj; @@ -71,7 +71,7 @@ struct listAnimation { bool appear; }; -typedef QMap<int, QPtrList<listAnimation> > lstMap; +typedef TQMap<int, TQPtrList<listAnimation> > lstMap; KPrPage::KPrPage(KPrDocument *_doc, KPrPage *masterPage ) @@ -87,7 +87,7 @@ KPrPage::KPrPage(KPrDocument *_doc, KPrPage *masterPage ) , m_pageEffect( PEF_NONE ) , m_pageEffectSpeed( ES_MEDIUM ) , m_soundEffect( false ) - , m_soundFileName( QString::null ) + , m_soundFileName( TQString() ) , m_pageTimer( 1 ) { kdDebug(33001)<<"create page : KPrPage::KPrPage(KPrDocument *_doc )"<<this<<endl; @@ -114,7 +114,7 @@ DCOPObject* KPrPage::dcopObject() if ( !m_dcop ) { // 0-based. 1-based would be nicer for the dcop user, but well, docs and views are 0-based, // and the page(int) DCOP call is 0-based. - int pgnum = m_doc->pageList().findRef( this ); + int pgnum = m_doc->pageList().tqfindRef( this ); m_dcop = new KPrPageIface( this, pgnum ); } @@ -130,10 +130,10 @@ void KPrPage::saveOasisObject( KoStore *store, KoXmlWriter &xmlWriter, KoSavingC KTempFile animationTmpFile; animationTmpFile.setAutoDelete( true ); - QFile* tmpFile = animationTmpFile.file(); - KoXmlWriter animationTmpWriter( tmpFile ); + TQFile* tmpFile = animationTmpFile.file(); + KoXmlWriter animationTmpWriter( TQT_TQIODEVICE(tmpFile) ); lstMap listObjectAnimation; - QPtrListIterator<KPrObject> it( m_objectList ); + TQPtrListIterator<KPrObject> it( m_objectList ); for ( ; it.current() ; ++it ) { if ( it.current()== m_doc->header() || it.current()== m_doc->footer()) @@ -152,7 +152,7 @@ void KPrPage::saveOasisObject( KoStore *store, KoXmlWriter &xmlWriter, KoSavingC lstappear->objIndex = indexObj; lstappear->appear = true; //kdDebug()<<" indexObj :"<<indexObj<<endl; - lstMap::Iterator tmp = listObjectAnimation.find( it.current()->getAppearStep() ); + lstMap::Iterator tmp = listObjectAnimation.tqfind( it.current()->getAppearStep() ); if ( tmp!= listObjectAnimation.end() ) { //kdDebug()<<" group already exist \n"; @@ -161,7 +161,7 @@ void KPrPage::saveOasisObject( KoStore *store, KoXmlWriter &xmlWriter, KoSavingC else { //kdDebug()<<" create new list \n"; - QPtrList<listAnimation> tmp2; + TQPtrList<listAnimation> tmp2; tmp2.append( lstappear ); listObjectAnimation.insert( it.current()->getAppearStep(), tmp2 ); } @@ -173,7 +173,7 @@ void KPrPage::saveOasisObject( KoStore *store, KoXmlWriter &xmlWriter, KoSavingC lstappear->objIndex = indexObj; lstappear->appear = false; //kdDebug()<<" indexObj :"<<indexObj<<endl; - lstMap::Iterator tmp = listObjectAnimation.find( it.current()->getDisappearStep() ); + lstMap::Iterator tmp = listObjectAnimation.tqfind( it.current()->getDisappearStep() ); if ( tmp!= listObjectAnimation.end() ) { //kdDebug()<<" group already exist \n"; @@ -182,7 +182,7 @@ void KPrPage::saveOasisObject( KoStore *store, KoXmlWriter &xmlWriter, KoSavingC else { //kdDebug()<<" create new list \n"; - QPtrList<listAnimation> tmp2; + TQPtrList<listAnimation> tmp2; tmp2.append( lstappear ); listObjectAnimation.insert( it.current()->getDisappearStep(), tmp2 ); } @@ -210,7 +210,7 @@ void KPrPage::saveOasisObject( KoStore *store, KoXmlWriter &xmlWriter, KoSavingC } else if ( it.data().count() > 1 ) { - QPtrList<listAnimation> list = it.data(); + TQPtrList<listAnimation> list = it.data(); animationTmpWriter.startElement( "presentation:animation-group" ); for ( uint i = 0; i < list.count(); ++i ) { @@ -229,7 +229,7 @@ void KPrPage::saveOasisObject( KoStore *store, KoXmlWriter &xmlWriter, KoSavingC } animationTmpWriter.endElement();//close "presentation:animations" tmpFile->close(); - xmlWriter.addCompleteElement( tmpFile ); + xmlWriter.addCompleteElement( TQT_TQIODEVICE(tmpFile) ); } else @@ -237,10 +237,10 @@ void KPrPage::saveOasisObject( KoStore *store, KoXmlWriter &xmlWriter, KoSavingC animationTmpFile.close(); } -void KPrPage::load( const QDomElement &element ) +void KPrPage::load( const TQDomElement &element ) { m_kpbackground->load( element ); - QDomElement e=element.namedItem("PGEFFECT").toElement(); + TQDomElement e=element.namedItem("PGEFFECT").toElement(); if(!e.isNull()) { int tmp=0; if(e.hasAttribute("value")) @@ -273,7 +273,7 @@ void KPrPage::load( const QDomElement &element ) m_soundFileName=e.attribute("soundFileName"); } else { - m_soundFileName=QString::null; + m_soundFileName=TQString(); } e=element.namedItem("HEADERFOOTER").toElement(); @@ -309,19 +309,19 @@ void KPrPage::loadOasis(KoOasisContext & context ) //FIXME: fix it in old file format if ( styleStack.hasAttributeNS( KoXmlNS::presentation, "background-objects-visible" ) ) { - const QString str = styleStack.attributeNS( KoXmlNS::presentation, "background-objects-visible" ); + const TQString str = styleStack.attributeNS( KoXmlNS::presentation, "background-objects-visible" ); m_displayObjectFromMasterPage = ( str == "true" ) ? true : false; } if ( styleStack.hasAttributeNS( KoXmlNS::presentation, "background-visible" ) ) { - const QString str = styleStack.attributeNS( KoXmlNS::presentation, "background-visible" ); + const TQString str = styleStack.attributeNS( KoXmlNS::presentation, "background-visible" ); m_displayBackground = ( str == "true" ) ? true : false; } if ( styleStack.hasAttributeNS( KoXmlNS::presentation, "visibility" ) ) { - const QString str = styleStack.attributeNS( KoXmlNS::presentation, "visibility" ); + const TQString str = styleStack.attributeNS( KoXmlNS::presentation, "visibility" ); if ( str=="hidden" ) slideSelected( false ); else @@ -332,7 +332,7 @@ void KPrPage::loadOasis(KoOasisContext & context ) { // this argument is not defined into kpresenter_doc and not into kprpage // TODO add it into each page. - QString speed = styleStack.attributeNS( KoXmlNS::presentation, "transition-speed" ); + TQString speed = styleStack.attributeNS( KoXmlNS::presentation, "transition-speed" ); if ( speed == "slow" ) { m_pageEffectSpeed = ES_SLOW; @@ -360,20 +360,20 @@ void KPrPage::loadOasis(KoOasisContext & context ) } if ( styleStack.hasAttributeNS( KoXmlNS::presentation, "display-header" ) ) { - QString tmp = styleStack.attributeNS( KoXmlNS::presentation, "display-header" ); + TQString tmp = styleStack.attributeNS( KoXmlNS::presentation, "display-header" ); setHeader( tmp =="true" ? true : false ); } if ( styleStack.hasAttributeNS( KoXmlNS::presentation, "display-footer" ) ) { - QString tmp = styleStack.attributeNS( KoXmlNS::presentation, "display-footer" ); + TQString tmp = styleStack.attributeNS( KoXmlNS::presentation, "display-footer" ); setFooter(tmp =="true" ? true : false); } //TODO presentation:display-date-time; presentation:display-page-number if ( styleStack.hasAttributeNS( KoXmlNS::presentation, "transition-style")) { //kdDebug()<<" have a presentation:transition-style------------\n"; - const QString effect = styleStack.attributeNS( KoXmlNS::presentation, "transition-style"); - QString additionalEffect; + const TQString effect = styleStack.attributeNS( KoXmlNS::presentation, "transition-style"); + TQString additionalEffect; if ( styleStack.hasAttributeNS( KoXmlNS::koffice, "additional-transition-style" ) ) { additionalEffect = styleStack.attributeNS( KoXmlNS::koffice, "additional-transition-style" ); @@ -484,17 +484,17 @@ void KPrPage::loadOasis(KoOasisContext & context ) if ( styleStack.hasChildNodeNS( KoXmlNS::presentation, "sound")) { //kdDebug()<<" presentation:sound !!!!!!!!!!!!!!!!!!!!!\n"; - QDomElement sound = styleStack.childNodeNS( KoXmlNS::presentation, "sound"); + TQDomElement sound = styleStack.childNodeNS( KoXmlNS::presentation, "sound"); m_soundEffect = true; - m_soundFileName = sound.attributeNS( KoXmlNS::xlink, "href", QString::null ); + m_soundFileName = sound.attributeNS( KoXmlNS::xlink, "href", TQString() ); } } } -QDomElement KPrPage::save( QDomDocument &doc ) +TQDomElement KPrPage::save( TQDomDocument &doc ) { - QDomElement page = m_kpbackground->save( doc ); - QDomElement element; + TQDomElement page = m_kpbackground->save( doc ); + TQDomElement element; if ( m_pageEffect != PEF_NONE) { element = doc.createElement("PGEFFECT"); @@ -522,25 +522,25 @@ QDomElement KPrPage::save( QDomDocument &doc ) return page; } -QString KPrPage::oasisNamePage( int posPage ) const +TQString KPrPage::oasisNamePage( int posPage ) const { - return ( m_manualTitle.isEmpty() ? QString( "page%1" ).arg( posPage ) : m_manualTitle ); + return ( m_manualTitle.isEmpty() ? TQString( "page%1" ).tqarg( posPage ) : m_manualTitle ); } bool KPrPage::saveOasisPage( KoStore *store, KoXmlWriter &xmlWriter, int posPage, KoSavingContext& context, - int & indexObj, int &partIndexObj, KoXmlWriter* manifestWriter, QMap<QString, int> &pageNames ) const + int & indexObj, int &partIndexObj, KoXmlWriter* manifestWriter, TQMap<TQString, int> &pageNames ) const { if ( isMasterPage() ) { KoGenStyle pageLayout = m_doc->pageLayout().saveOasis(); pageLayout.addAttribute( "style:page-usage", "all" ); // needed? - QString pageLayoutName( context.mainStyles().lookup( pageLayout, "pm" ) ); + TQString pageLayoutName( context.mainStyles().lookup( pageLayout, "pm" ) ); xmlWriter.startElement( "style:master-page" ); xmlWriter.addAttribute( "style:name", "Standard" ); - xmlWriter.addAttribute( "style:page-layout-name", pageLayoutName ); + xmlWriter.addAttribute( "style:page-tqlayout-name", pageLayoutName ); - QString styleName = saveOasisPageStyle( store, context.mainStyles() ); + TQString styleName = saveOasisPageStyle( store, context.mainStyles() ); if ( !styleName.isEmpty() ) xmlWriter.addAttribute( "draw:style-name", styleName ); @@ -561,19 +561,19 @@ bool KPrPage::saveOasisPage( KoStore *store, KoXmlWriter &xmlWriter, int posPage //store use to save picture and co xmlWriter.startElement( "draw:page" ); - QString drawName( m_manualTitle ); - QRegExp rx( "^page[0-9]+$" ); - if ( drawName.isEmpty() || pageNames.contains( drawName ) || rx.search( drawName ) != -1 ) + TQString drawName( m_manualTitle ); + TQRegExp rx( "^page[0-9]+$" ); + if ( drawName.isEmpty() || pageNames.tqcontains( drawName ) || rx.search( drawName ) != -1 ) { - drawName = "page" + QString::number( posPage ); + drawName = "page" + TQString::number( posPage ); } pageNames.insert( drawName, posPage ); xmlWriter.addAttribute( "draw:name", drawName ); //we must store a name xmlWriter.addAttribute( "koffice:name", m_manualTitle ); // so that we can have the same name for different pages - xmlWriter.addAttribute( "draw:id", "page" + QString::number( posPage ) ); + xmlWriter.addAttribute( "draw:id", "page" + TQString::number( posPage ) ); xmlWriter.addAttribute( "draw:master-page-name", "Standard"); //by default name of page is Standard - QString styleName = saveOasisPageStyle( store, context.mainStyles() ); + TQString styleName = saveOasisPageStyle( store, context.mainStyles() ); kdDebug()<<" styleName :"<<styleName<<endl; if ( !styleName.isEmpty() ) xmlWriter.addAttribute( "draw:style-name", styleName ); @@ -586,7 +586,7 @@ bool KPrPage::saveOasisPage( KoStore *store, KoXmlWriter &xmlWriter, int posPage return true; } -QString KPrPage::saveOasisPageStyle( KoStore *, KoGenStyles& mainStyles ) const +TQString KPrPage::saveOasisPageStyle( KoStore *, KoGenStyles& mainStyles ) const { KoGenStyle stylepageauto( isMasterPage() ? KPrDocument::STYLE_BACKGROUNDPAGE : KPrDocument::STYLE_BACKGROUNDPAGEAUTO, "drawing-page" ); @@ -594,11 +594,11 @@ QString KPrPage::saveOasisPageStyle( KoStore *, KoGenStyles& mainStyles ) const { stylepageauto.addProperty( "presentation:background-visible", ( m_displayBackground == true ) ? "true" : "false" ); stylepageauto.addProperty( "presentation:background-objects-visible", ( m_displayObjectFromMasterPage == true ) ? "true" : "false" ); - QString transition = saveOasisPageEffect(); + TQString transition = saveOasisPageEffect(); if ( !transition.isEmpty() ) { stylepageauto.addProperty( "presentation:transition-style", transition ); - QString additionalTransition = saveOasisAdditionalPageEffect(); + TQString additionalTransition = saveOasisAdditionalPageEffect(); if ( !additionalTransition.isEmpty() ) { stylepageauto.addProperty( "koffice:additional-transition-style", additionalTransition ); @@ -625,9 +625,9 @@ QString KPrPage::saveOasisPageStyle( KoStore *, KoGenStyles& mainStyles ) const stylepageauto.addProperty( "presentation:visibility", "hidden" ); if ( !m_soundFileName.isEmpty() && m_soundEffect ) { - QBuffer buffer; + TQBuffer buffer; buffer.open( IO_WriteOnly ); - KoXmlWriter elementWriter( &buffer ); // TODO pass indentation level + KoXmlWriter elementWriter( TQT_TQIODEVICE(&buffer) ); // TODO pass indentation level elementWriter.startElement( "presentation:sound" ); elementWriter.addAttribute( "xlink:href", m_soundFileName ); elementWriter.addAttribute( "xlink:type", "simple" ); @@ -635,7 +635,7 @@ QString KPrPage::saveOasisPageStyle( KoStore *, KoGenStyles& mainStyles ) const elementWriter.addAttribute( "xlink:actuate", "onRequest"); elementWriter.endElement(); - QString elementContents = QString::fromUtf8( buffer.buffer(), buffer.buffer().size() ); + TQString elementContents = TQString::fromUtf8( buffer.buffer(), buffer.buffer().size() ); stylepageauto.addChildElement( "sound effect", elementContents ); } } @@ -655,14 +655,14 @@ 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="layout" 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="tqlayout" 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 xmlWriter.startElement( "draw:text-box" ); - QStringList text = QStringList::split( "\n", m_noteText ); - for ( QStringList::Iterator it = text.begin(); it != text.end(); ++it ) { + TQStringList text = TQStringList::split( "\n", m_noteText ); + for ( TQStringList::Iterator it = text.begin(); it != text.end(); ++it ) { xmlWriter.startElement( "text:p" ); xmlWriter.addTextNode( *it ); xmlWriter.endElement(); @@ -674,9 +674,9 @@ bool KPrPage::saveOasisNote( KoXmlWriter &xmlWriter ) const return true; } -QString KPrPage::saveOasisPageEffect() const +TQString KPrPage::saveOasisPageEffect() const { - QString transition; + TQString transition; switch( m_pageEffect ) { case PEF_NONE: @@ -813,9 +813,9 @@ QString KPrPage::saveOasisPageEffect() const } -QString KPrPage::saveOasisAdditionalPageEffect() const +TQString KPrPage::saveOasisAdditionalPageEffect() const { - QString additionalEffect; + TQString additionalEffect; switch( m_pageEffect ) { case PEF_STRIPS_LEFT_UP: @@ -846,8 +846,8 @@ KPrObject *KPrPage::getObject(int num) /* * Check if object name already exists. */ -bool KPrPage::objectNameExists( KPrObject *object, QPtrList<KPrObject> &list ) { - QPtrListIterator<KPrObject> it( list ); +bool KPrPage::objectNameExists( KPrObject *object, TQPtrList<KPrObject> &list ) { + TQPtrListIterator<KPrObject> it( list ); for ( it.toFirst(); it.current(); ++it ) { // object name can exist in current object. @@ -856,7 +856,7 @@ bool KPrPage::objectNameExists( KPrObject *object, QPtrList<KPrObject> &list ) { return true; } else if ( it.current()->getType() == OT_GROUP ) { - QPtrList<KPrObject> objectList( static_cast<KPrGroupObject*>(it.current())->getObjects() ); + TQPtrList<KPrObject> objectList( static_cast<KPrGroupObject*>(it.current())->getObjects() ); if ( objectNameExists( object, objectList ) ) { return true; } @@ -869,19 +869,19 @@ void KPrPage::unifyObjectName( KPrObject *object ) { if ( object->getObjectName().isEmpty() ) { object->setObjectName( object->getTypeString() ); } - QString objectName( object->getObjectName() ); + TQString objectName( object->getObjectName() ); - QPtrList<KPrObject> list( m_objectList ); + TQPtrList<KPrObject> list( m_objectList ); int count = 1; while ( objectNameExists( object, list ) ) { count++; - QRegExp rx( " \\(\\d{1,}\\)$" ); + TQRegExp rx( " \\(\\d{1,}\\)$" ); if ( rx.search( objectName ) != -1 ) { objectName.remove( rx ); } - objectName += QString(" (%1)").arg( count ); + objectName += TQString(" (%1)").tqarg( count ); object->setObjectName( objectName ); } } @@ -892,16 +892,16 @@ void KPrPage::appendObject(KPrObject *_obj) m_objectList.append(_obj); } -void KPrPage::appendObjects( const QValueList<KPrObject *> &objects ) +void KPrPage::appendObjects( const TQValueList<KPrObject *> &objects ) { - QMap <QString, int> usedPageNames; - QPtrListIterator<KPrObject> it( m_objectList ); + TQMap <TQString, int> usedPageNames; + TQPtrListIterator<KPrObject> it( m_objectList ); // find the biggest number for ( ; it.current() ; ++it ) { - QString objectName( it.current()->getObjectName() ); + TQString objectName( it.current()->getObjectName() ); - QRegExp rx( "(.*) \\((\\d{1,})\\)$" ); + TQRegExp rx( "(.*) \\((\\d{1,})\\)$" ); rx.setMinimal( true ); if ( rx.search( objectName ) != -1 && rx.numCaptures() == 2 ) { @@ -917,20 +917,20 @@ void KPrPage::appendObjects( const QValueList<KPrObject *> &objects ) } } - QValueListConstIterator<KPrObject *> oIt( objects.begin() ); + TQValueListConstIterator<KPrObject *> oIt( objects.begin() ); for ( ; oIt != objects.end(); ++oIt ) { - QString objectName( ( *oIt )->getObjectName() ); - QRegExp rx( " \\(\\d{1,}\\)$" ); + TQString objectName( ( *oIt )->getObjectName() ); + TQRegExp rx( " \\(\\d{1,}\\)$" ); if ( rx.search( objectName ) != -1 ) { objectName.remove( rx ); } - if ( usedPageNames.contains( objectName ) ) + if ( usedPageNames.tqcontains( objectName ) ) { usedPageNames[objectName]++; - objectName += QString(" (%1)").arg( usedPageNames[objectName] ); + objectName += TQString(" (%1)").tqarg( usedPageNames[objectName] ); ( *oIt )->setObjectName( objectName ); } m_objectList.append( *oIt ); @@ -939,7 +939,7 @@ void KPrPage::appendObjects( const QValueList<KPrObject *> &objects ) int KPrPage::takeObject( KPrObject *object ) { - int pos = m_objectList.findRef( object ); + int pos = m_objectList.tqfindRef( object ); m_objectList.take( pos ); return pos; } @@ -947,7 +947,7 @@ int KPrPage::takeObject( KPrObject *object ) void KPrPage::replaceObject( KPrObject *oldObject, KPrObject *newObject ) { //XXX check if object name gets set - unsigned int pos = m_objectList.findRef( oldObject ); + unsigned int pos = m_objectList.tqfindRef( oldObject ); m_objectList.take( pos ); m_objectList.insert( pos, newObject ); } @@ -961,7 +961,7 @@ void KPrPage::insertObject( KPrObject *object, int pos ) KCommand * KPrPage::deleteSelectedObjects() { - QPtrList<KPrObject> objects = getSelectedObjects( true ); + TQPtrList<KPrObject> objects = getSelectedObjects( true ); KPrDeleteCmd *deleteCmd=0L; @@ -975,12 +975,12 @@ KCommand * KPrPage::deleteSelectedObjects() return deleteCmd ; } -void KPrPage::copyObjs(QDomDocument &doc, QDomElement &presenter, QValueList<KoPictureKey> & savePictures) const +void KPrPage::copyObjs(TQDomDocument &doc, TQDomElement &presenter, TQValueList<KoPictureKey> & savePictures) const { if ( !numSelected() ) return; - QPtrListIterator<KPrObject> it( m_objectList ); + TQPtrListIterator<KPrObject> it( m_objectList ); for ( ; it.current() ; ++it ) { if(it.current()->isSelected()) @@ -988,10 +988,10 @@ void KPrPage::copyObjs(QDomDocument &doc, QDomElement &presenter, QValueList<KoP if ( it.current()->getType() == OT_PICTURE ) { KoPictureKey key = static_cast<KPrPixmapObject *>( it.current() )->getKey(); - if ( !savePictures.contains( key ) ) + if ( !savePictures.tqcontains( key ) ) savePictures.append( key ); } - QDomElement object=doc.createElement("OBJECT"); + TQDomElement object=doc.createElement("OBJECT"); object.setAttribute("type", static_cast<int>( it.current()->getType() )); object.appendChild(it.current()->save( doc,0 )); presenter.appendChild(object); @@ -999,25 +999,25 @@ void KPrPage::copyObjs(QDomDocument &doc, QDomElement &presenter, QValueList<KoP } } -void KPrPage::pasteObjs( const QByteArray & data,int nbCopy, double angle, +void KPrPage::pasteObjs( const TQByteArray & data,int nbCopy, double angle, double increaseX, double increaseY, double moveX, double moveY ) { m_doc->deSelectAllObj(); int num = m_objectList.count(); if ( !data.size() ) return; - QBuffer buffer( data ); - KoStore* store = KoStore::createStore( &buffer, KoStore::Read ); + TQBuffer buffer( data ); + KoStore* store = KoStore::createStore( TQT_TQIODEVICE(&buffer), KoStore::Read ); int nbNewObject = -1 ; KMacroCommand *macro = 0L; if ( !store->bad() ) { if ( store->open( "root" ) ) { - QString errorMsg; + TQString errorMsg; int errorLine; int errorColumn; - QDomDocument domDoc; + TQDomDocument domDoc; if ( !domDoc.setContent( store->device(), &errorMsg, &errorLine, &errorColumn ) ) { kdError (30003) << "Parsing Error! Aborting! (in KPrPage::PasteObj)" << endl @@ -1026,7 +1026,7 @@ void KPrPage::pasteObjs( const QByteArray & data,int nbCopy, double angle, delete store; return; } - QDomElement topElem = domDoc.documentElement(); + TQDomElement topElem = domDoc.documentElement(); for ( int i = 0 ; i < nbCopy ; i++ ) { @@ -1065,7 +1065,7 @@ void KPrPage::pasteObjs( const QByteArray & 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->repaint(_tempObj); + m_doc->tqrepaint(_tempObj); } if ( angle != 0.0) @@ -1080,7 +1080,7 @@ void KPrPage::pasteObjs( const QByteArray & data,int nbCopy, double angle, } if ( increaseX != 0.0 || increaseY != 0.0 ) { - QPtrListIterator<KPrObject> it( m_objectList ); + TQPtrListIterator<KPrObject> it( m_objectList ); for ( ; it.current() ; ++it ) { if(it.current()->isSelected()) @@ -1112,7 +1112,7 @@ void KPrPage::pasteObjs( const QByteArray & data,int nbCopy, double angle, KPrTextObject * KPrPage::textFrameSet ( unsigned int _num ) const { unsigned int i = 0; - QPtrListIterator<KPrObject> it( m_objectList ); + TQPtrListIterator<KPrObject> it( m_objectList ); for ( ; it.current() ; ++it ) { if(it.current()->getType()==OT_TEXT) @@ -1129,7 +1129,7 @@ int KPrPage::numSelected() const { int num = 0; - QPtrListIterator<KPrObject> it( m_objectList ); + TQPtrListIterator<KPrObject> it( m_objectList ); for ( ; it.current() ; ++it ) { if(it.current()->isSelected()) @@ -1143,7 +1143,7 @@ int KPrPage::numTextObject() const { int num = 0; - QPtrListIterator<KPrObject> it( m_objectList ); + TQPtrListIterator<KPrObject> it( m_objectList ); for ( ; it.current() ; ++it ) { if(it.current()->getType()==OT_TEXT) @@ -1155,7 +1155,7 @@ int KPrPage::numTextObject() const KPrObject* KPrPage::getSelectedObj() const { - QPtrListIterator<KPrObject> it( m_objectList ); + TQPtrListIterator<KPrObject> it( m_objectList ); for ( ; it.current() ; ++it ) { if(it.current()->isSelected()) @@ -1165,10 +1165,10 @@ KPrObject* KPrPage::getSelectedObj() const } -QPtrList<KPrObject> KPrPage::getSelectedObjects( bool withoutHeaderFooter ) const +TQPtrList<KPrObject> KPrPage::getSelectedObjects( bool withoutHeaderFooter ) const { - QPtrList<KPrObject> objects; - QPtrListIterator<KPrObject> it( m_objectList ); + TQPtrList<KPrObject> objects; + TQPtrListIterator<KPrObject> it( m_objectList ); for ( ; it.current() ; ++it ) { if( it.current()->isSelected() @@ -1184,7 +1184,7 @@ QPtrList<KPrObject> KPrPage::getSelectedObjects( bool withoutHeaderFooter ) cons void KPrPage::groupObjects() { - QPtrList<KPrObject> objects( getSelectedObjects( true ) ); + TQPtrList<KPrObject> objects( getSelectedObjects( true ) ); if ( objects.count() > 1 ) { KPrGroupObjCmd *groupObjCmd = new KPrGroupObjCmd( i18n( "Group Objects" ), objects, m_doc,this ); @@ -1195,8 +1195,8 @@ void KPrPage::groupObjects() void KPrPage::ungroupObjects( KMacroCommand ** macro ) { - QPtrList<KPrObject> objects( getSelectedObjects( true ) ); - QPtrListIterator<KPrObject> it( objects ); + TQPtrList<KPrObject> objects( getSelectedObjects( true ) ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current() ; ++it ) { KPrObject *object = it.current(); @@ -1217,7 +1217,7 @@ void KPrPage::lowerObjs(bool backward) { KPrObject *kpobject = 0; - QPtrList<KPrObject> _new; + TQPtrList<KPrObject> _new; for ( unsigned int j = 0; j < m_objectList.count(); j++ ) _new.append( m_objectList.at( j ) ); @@ -1236,7 +1236,7 @@ void KPrPage::lowerObjs(bool backward) createCmd = true; _new.take( i ); if ( backward ) - _new.insert(QMAX(i-1,0) , kpobject); + _new.insert(TQMAX(i-1,0) , kpobject); else _new.insert( insertPos++, kpobject ); } @@ -1254,7 +1254,7 @@ void KPrPage::raiseObjs(bool forward) { KPrObject *kpobject = 0; - QPtrList<KPrObject> _new; + TQPtrList<KPrObject> _new; for ( unsigned int j = 0; j < m_objectList.count(); j++ ) _new.append( m_objectList.at( j ) ); @@ -1276,7 +1276,7 @@ void KPrPage::raiseObjs(bool forward) createCmd = true; _new.take( i ); if ( forward ) - _new.insert( QMIN( i+1, size - 1), kpobject); + _new.insert( TQMIN( i+1, size - 1), kpobject); else _new.insert( insertPos--, kpobject ); } @@ -1289,7 +1289,7 @@ void KPrPage::raiseObjs(bool forward) } } -KCommand *KPrPage::insertObject( const QString &name, KPrObject * object, const KoRect &r, bool addCommand ) +KCommand *KPrPage::insertObject( const TQString &name, KPrObject * object, const KoRect &r, bool addCommand ) { object->setOrig( r.x(), r.y() ); object->setSize( r.width(), r.height() ); @@ -1311,8 +1311,8 @@ void KPrPage::insertLine( const KoRect &r, const KoPen & pen, LineEnd lb, LineEn insertObject( i18n( "Insert Line" ), kplineobject, r ); } -void KPrPage::insertRectangle( const KoRect &r, const KoPen & pen, const QBrush &brush, FillType ft, - const QColor &g1, const QColor &g2, +void KPrPage::insertRectangle( const KoRect &r, const KoPen & pen, const TQBrush &brush, FillType ft, + const TQColor &g1, const TQColor &g2, BCType gt, int rndX, int rndY, bool unbalanced, int xfactor, int yfactor ) { KPrRectObject *kprectobject = new KPrRectObject( pen, brush, ft, g1, g2, gt, rndX, rndY, @@ -1320,8 +1320,8 @@ void KPrPage::insertRectangle( const KoRect &r, const KoPen & pen, const QBrush insertObject( i18n( "Insert Rectangle" ), kprectobject, r ); } -void KPrPage::insertCircleOrEllipse( const KoRect &r, const KoPen &pen, const QBrush & brush, FillType ft, - const QColor &g1, const QColor &g2, +void KPrPage::insertCircleOrEllipse( const KoRect &r, const KoPen &pen, const TQBrush & brush, FillType ft, + const TQColor &g1, const TQColor &g2, BCType gt, bool unbalanced, int xfactor, int yfactor ) { KPrEllipseObject *kpellipseobject = new KPrEllipseObject( pen, brush, ft, g1, g2, gt, @@ -1329,8 +1329,8 @@ void KPrPage::insertCircleOrEllipse( const KoRect &r, const KoPen &pen, const QB insertObject( i18n( "Insert Ellipse" ), kpellipseobject, r ); } -void KPrPage::insertPie( const KoRect &r, const KoPen &pen, const QBrush &brush, FillType ft, - const QColor &g1, const QColor &g2, +void KPrPage::insertPie( const KoRect &r, const KoPen &pen, const TQBrush &brush, FillType ft, + const TQColor &g1, const TQColor &g2, BCType gt, PieType pt, int _angle, int _len, LineEnd lb, LineEnd le, bool unbalanced, int xfactor, int yfactor ) { @@ -1339,25 +1339,25 @@ void KPrPage::insertPie( const KoRect &r, const KoPen &pen, const QBrush &brush, insertObject( i18n( "Insert Pie/Arc/Chord" ), kppieobject, r ); } -KPrTextObject* KPrPage::insertTextObject( const KoRect& r, const QString& text , KPrView * _view ) +KPrTextObject* KPrPage::insertTextObject( const KoRect& r, const TQString& text , KPrView * _view ) { KPrTextObject *kptextobject = new KPrTextObject( m_doc ); insertObject( i18n( "Insert Textbox" ), kptextobject, r ); //TODO create macro command : now insertObject can return KCommand - //TODO fix repaint object + //TODO fix tqrepaint object if ( !text.isEmpty() ) { KPrTextView *view = kptextobject->createKPTextView( _view ? _view->getCanvas() : 0L ); view->insertText( text ); view->terminate(); delete view; - m_doc->repaint( kptextobject ); + m_doc->tqrepaint( kptextobject ); } return kptextobject; } -void KPrPage::insertAutoform( const KoRect &r, const KoPen &pen, const QBrush &brush, LineEnd lb, LineEnd le, FillType ft, - const QColor &g1, const QColor &g2, BCType gt, const QString &fileName, bool unbalanced, +void KPrPage::insertAutoform( const KoRect &r, const KoPen &pen, const TQBrush &brush, LineEnd lb, LineEnd le, FillType ft, + const TQColor &g1, const TQColor &g2, BCType gt, const TQString &fileName, bool unbalanced, int xfactor, int yfactor ){ KPrAutoformObject *kpautoformobject = new KPrAutoformObject( pen, brush, fileName, lb, le, ft, g1, g2, gt, unbalanced, xfactor, yfactor ); @@ -1401,8 +1401,8 @@ void KPrPage::insertCubicBezierCurve( const KoPointArray &points, const KoPointA insertObject( i18n( "Insert Cubic Bezier Curve" ), kpCubicBezierCurveObject, r ); } -void KPrPage::insertPolygon( const KoPointArray &points, const KoRect &r, const KoPen &pen, const QBrush &brush, FillType ft, - const QColor &g1, const QColor &g2, BCType gt, bool unbalanced, int xfactor, int yfactor, +void KPrPage::insertPolygon( const KoPointArray &points, const KoRect &r, const KoPen &pen, const TQBrush &brush, FillType ft, + const TQColor &g1, const TQColor &g2, BCType gt, bool unbalanced, int xfactor, int yfactor, bool _checkConcavePolygon, int _cornersValue, int _sharpnessValue ) { KoSize size( r.width(), r.height() ); @@ -1413,12 +1413,12 @@ void KPrPage::insertPolygon( const KoPointArray &points, const KoRect &r, const insertObject( i18n( "Insert Polygon" ), kpPolygonObject, r ); } -void KPrPage::insertClosedLine( const KoPointArray &points, const KoRect &r, const KoPen &pen, const QBrush &brush, - FillType ft,const QColor &g1, const QColor &g2, +void KPrPage::insertClosedLine( const KoPointArray &points, const KoRect &r, const KoPen &pen, const TQBrush &brush, + FillType ft,const TQColor &g1, const TQColor &g2, BCType gt, bool unbalanced, int xfactor, int yfactor, ToolEditMode _mode ) { - QString _type; - QString _name; + TQString _type; + TQString _name; if ( _mode == INS_CLOSED_FREEHAND ) { _type = i18n( "Closed Freehand" ); _name = i18n( "Insert Closed Freehand" ); @@ -1427,7 +1427,7 @@ void KPrPage::insertClosedLine( const KoPointArray &points, const KoRect &r, con _type = i18n( "Closed Polyline" ); _name = i18n( "Insert Closed Polyline" ); } - else if ( _mode == INS_CLOSED_QUADRICBEZIERCURVE ) { + else if ( _mode == INS_CLOSED_TQUADRICBEZIERCURVE ) { _type = i18n( "Closed Quadric Bezier Curve" ); _name = i18n( "Insert Closed Quadric Bezier Curve" ); } @@ -1449,10 +1449,10 @@ KPrPartObject* KPrPage::insertObject( const KoRect& _rect, KoDocumentEntry& _e ) if ( !doc ) return NULL; - if ( !doc->showEmbedInitDialog( 0 ) ) //TODO should really have parent + if ( !doc->showEmbedInitDialog( 0 ) ) //TODO should really have tqparent return NULL; - QRect r = QRect( (int)_rect.left(), (int)_rect.top(), + TQRect r = TQRect( (int)_rect.left(), (int)_rect.top(), (int)_rect.width(), (int)_rect.height() ); KPrChild* ch = new KPrChild( m_doc, doc, r ); m_doc->insertObject( ch ); @@ -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->repaint( false ); + m_doc->tqrepaint( false ); return kppartobject; } @@ -1472,10 +1472,10 @@ KCommand* KPrPage::setPen( const KoPen &pen, LineEnd lb, LineEnd le, int flags ) KoPenCmd::Pen _newPen( pen, lb, le); - QPtrList<KPrObject> _objects; + TQPtrList<KPrObject> _objects; _objects.setAutoDelete( false ); - QPtrListIterator<KPrObject> it( m_objectList ); + TQPtrListIterator<KPrObject> it( m_objectList ); for ( ; it.current() ; ++it ) { if( it.current()->isSelected() ) @@ -1492,14 +1492,14 @@ KCommand* KPrPage::setPen( const KoPen &pen, LineEnd lb, LineEnd le, int flags ) return cmd; } -KCommand * KPrPage::setBrush( const QBrush &brush, FillType ft, const QColor &g1, const QColor &g2, +KCommand * KPrPage::setBrush( const TQBrush &brush, FillType ft, const TQColor &g1, const TQColor &g2, BCType gt, bool unbalanced, int xfactor, int yfactor, int flags ) { KPrBrushCmd * cmd = NULL; KPrBrushCmd::Brush _newBrush; - _newBrush.brush = QBrush( brush ); + _newBrush.brush = TQBrush( brush ); _newBrush.fillType = ft; _newBrush.gColor1 = g1; _newBrush.gColor2 = g2; @@ -1508,10 +1508,10 @@ KCommand * KPrPage::setBrush( const QBrush &brush, FillType ft, const QColor &g1 _newBrush.xfactor = xfactor; _newBrush.yfactor = yfactor; - QPtrList<KPrObject> _objects; + TQPtrList<KPrObject> _objects; _objects.setAutoDelete( false ); - QPtrListIterator<KPrObject> it( m_objectList ); + TQPtrListIterator<KPrObject> it( m_objectList ); for ( ; it.current() ; ++it ) { if( it.current()->isSelected() ) @@ -1530,33 +1530,33 @@ KCommand * KPrPage::setBrush( const QBrush &brush, FillType ft, const QColor &g1 void KPrPage::slotRepaintVariable() { - QPtrListIterator<KPrObject> it( m_objectList ); + TQPtrListIterator<KPrObject> it( m_objectList ); for ( ; it.current() ; ++it ) { if ( it.current()->getType() == OT_TEXT ) - m_doc->repaint( it.current() ); + m_doc->tqrepaint( it.current() ); } } void KPrPage::recalcPageNum() { - QPtrListIterator<KPrObject> it( m_objectList ); + TQPtrListIterator<KPrObject> it( m_objectList ); for ( ; it.current() ; ++it ) { if ( it.current()->getType() == OT_TEXT ) { ( (KPrTextObject*)it.current() )->recalcPageNum( this ); - m_doc->repaint( it.current() ); // TODO only if something changed + m_doc->tqrepaint( it.current() ); // TODO only if something changed } } } -void KPrPage::changePicture( const KURL & url, QWidget *parent ) +void KPrPage::changePicture( const KURL & url, TQWidget *tqparent ) { // filename has been chosen in KPrView with a filedialog, // so we know it exists - KoPicture image = m_doc->pictureCollection()->downloadPicture( url, parent ); + KoPicture image = m_doc->pictureCollection()->downloadPicture( url, tqparent ); - QPtrListIterator<KPrObject> it( m_objectList ); + TQPtrListIterator<KPrObject> it( m_objectList ); for ( ; it.current() ; ++it ) { if(it.current()->isSelected() && it.current()->getType()==OT_PICTURE) @@ -1574,7 +1574,7 @@ void KPrPage::changePicture( const KURL & url, QWidget *parent ) } } -void KPrPage::insertPicture( const QString &filename, const KoPoint &pos ) +void KPrPage::insertPicture( const TQString &filename, const KoPoint &pos ) { KoPictureKey key = m_doc->pictureCollection()->loadPicture( filename ).getKey(); KPrPixmapObject *kppixmapobject = new KPrPixmapObject(m_doc->pictureCollection() , key ); @@ -1595,7 +1595,7 @@ void KPrPage::insertPicture( const QString &filename, const KoPoint &pos ) if ( kppixmapobject->getSize().width() > s.width() ) fakt = (float)s.width() / (float)kppixmapobject->getSize().width(); if ( kppixmapobject->getSize().height() > s.height() ) - fakt = QMIN( fakt, (float)s.height() / (float)kppixmapobject->getSize().height() ); + fakt = TQMIN( fakt, (float)s.height() / (float)kppixmapobject->getSize().height() ); //kdDebug(33001) << k_funcinfo << "Fakt: " << fakt << endl; @@ -1605,11 +1605,11 @@ void KPrPage::insertPicture( const QString &filename, const KoPoint &pos ) //kdDebug(33001) << k_funcinfo << "Size: " << w << ", " << h << endl; kppixmapobject->setOrig(0,0); kppixmapobject->setSize(w, h); - m_doc->repaint( false ); + m_doc->tqrepaint( false ); } } -void KPrPage::insertPicture( const QString &_file, const KoRect &_rect ) +void KPrPage::insertPicture( const TQString &_file, const KoRect &_rect ) { KoPictureKey key = m_doc->pictureCollection()->loadPicture( _file ).getKey(); KPrPixmapObject *kppixmapobject = new KPrPixmapObject( m_doc->pictureCollection(), key ); @@ -1620,7 +1620,7 @@ void KPrPage::insertPicture( const QString &_file, const KoRect &_rect ) void KPrPage::enableEmbeddedParts( bool f ) { KPrPartObject *obj=0L; - QPtrListIterator<KPrObject> it( m_objectList ); + TQPtrListIterator<KPrObject> it( m_objectList ); for ( ; it.current() ; ++it ) { if(it.current()->getType()==OT_PART) @@ -1633,7 +1633,7 @@ void KPrPage::enableEmbeddedParts( bool f ) } -void KPrPage::setBackColor(const QColor &backColor1, const QColor &backColor2, BCType bcType, +void KPrPage::setBackColor(const TQColor &backColor1, const TQColor &backColor2, BCType bcType, bool unbalanced, int xfactor, int yfactor ) { m_kpbackground->setBackColor1( backColor1 ); @@ -1684,7 +1684,7 @@ void KPrPage::setPageSoundEffect( bool soundEffect ) m_soundEffect = soundEffect; } -void KPrPage::setPageSoundFileName( const QString &fileName ) +void KPrPage::setPageSoundFileName( const TQString &fileName ) { m_soundFileName = fileName; } @@ -1709,12 +1709,12 @@ KoPicture KPrPage::getBackPicture() const return m_kpbackground->getBackPicture(); } -QColor KPrPage::getBackColor1() const +TQColor KPrPage::getBackColor1() const { return m_kpbackground->getBackColor1(); } -QColor KPrPage::getBackColor2() const +TQColor KPrPage::getBackColor2() const { return m_kpbackground->getBackColor2(); } @@ -1754,7 +1754,7 @@ bool KPrPage::getPageSoundEffect() const return m_soundEffect; } -QString KPrPage::getPageSoundFileName() const +TQString KPrPage::getPageSoundFileName() const { return m_soundFileName; } @@ -1765,21 +1765,21 @@ KoRect KPrPage::getPageRect() const return KoRect( p.ptLeft, p.ptTop, p.ptWidth - p.ptRight - p.ptLeft, p.ptHeight - p.ptTop - p.ptBottom ); } -QRect KPrPage::getZoomPageRect() const +TQRect KPrPage::getZoomPageRect() const { return m_doc->zoomHandler()->zoomRect(getPageRect()); } void KPrPage::completeLoading( bool _clean, int lastObj ) { - QPtrListIterator<KPrObject> it( m_objectList ); + TQPtrListIterator<KPrObject> it( m_objectList ); for ( ; it.current() ; ++it ) { // Pictures and cliparts have been loaded from the store, we can now // get the picture from the collection, and set it in the image/clipart object if ( ( it.current()->getType() == OT_PICTURE ) || ( it.current()->getType() == OT_CLIPART ) ) { - if ( _clean || m_objectList.findRef( it.current() ) > lastObj ) + if ( _clean || m_objectList.tqfindRef( it.current() ) > lastObj ) { KPrPixmapObject* obj=dynamic_cast<KPrPixmapObject*>( it.current()); if(obj) @@ -1803,7 +1803,7 @@ void KPrPage::completeLoadingForGroupObject( KPrObject *_obj ) KPrGroupObject *_groupObj = static_cast<KPrGroupObject*>( _obj ); if ( _groupObj ) { - QPtrListIterator<KPrObject> it( _groupObj->objectList() ); + TQPtrListIterator<KPrObject> it( _groupObj->objectList() ); for ( ; it.current(); ++it ) { if ( ( it.current()->getType() == OT_PICTURE ) || ( it.current()->getType() == OT_CLIPART ) ) { @@ -1822,13 +1822,13 @@ void KPrPage::completeLoadingForGroupObject( KPrObject *_obj ) } } -KCommand * KPrPage::replaceObjs( bool createUndoRedo, double _orastX,double _orastY,const QColor & _txtBackCol, - const QColor & _otxtBackCol ) +KCommand * KPrPage::replaceObjs( bool createUndoRedo, double _orastX,double _orastY,const TQColor & _txtBackCol, + const TQColor & _otxtBackCol ) { KPrObject *kpobject = 0; double ox=0, oy=0; - QPtrList<KPrObject> _objects; - QValueList<KoPoint> _diffs; + TQPtrList<KPrObject> _objects; + TQValueList<KoPoint> _diffs; _objects.setAutoDelete( false ); for ( int i = 0; i < static_cast<int>( m_objectList.count() ); i++ ) { @@ -1851,39 +1851,39 @@ KCommand * KPrPage::replaceObjs( bool createUndoRedo, double _orastX,double _ora return 0L; } -QString KPrPage::manualTitle() const +TQString KPrPage::manualTitle() const { return m_manualTitle; } -void KPrPage::insertManualTitle(const QString & title) +void KPrPage::insertManualTitle(const TQString & title) { m_manualTitle=title; } -QString KPrPage::pageTitle( const QString &_title ) const +TQString KPrPage::pageTitle( const TQString &_title ) const { // If a user sets a title with manual, return it. if ( !m_manualTitle.isEmpty() ) return m_manualTitle; - QPtrList<KPrTextObject> objs; + TQPtrList<KPrTextObject> objs; // Create list of text objects in this page - QPtrListIterator<KPrObject> it( m_objectList ); + TQPtrListIterator<KPrObject> it( m_objectList ); for ( ; it.current() ; ++it ) { if(it.current()->getType()==OT_TEXT) objs.append( static_cast<KPrTextObject*>( it.current() ) ); } - QString title; + TQString title; if ( _title.isNull() ) { // MASTERPAGE if ( m_masterPage ) - title = i18n( "Slide %1" ).arg( m_doc->pageList().findRef( this ) + 1 ); + title = i18n( "Slide %1" ).tqarg( m_doc->pageList().tqfindRef( this ) + 1 ); else title = i18n( "Slide Master" ); } @@ -1904,9 +1904,9 @@ QString KPrPage::pageTitle( const QString &_title ) const // this can't happen, but you never know :- ) if ( !textobject ) - return QString( title ); + return TQString( title ); - QString txt; + TQString txt; if ( textobject->textDocument()->firstParag() ) txt = textobject->textDocument()->firstParag()->toString(); if ( txt.stripWhiteSpace().isEmpty() || txt=="\n" ) @@ -1914,20 +1914,20 @@ QString KPrPage::pageTitle( const QString &_title ) const return txt; } -void KPrPage::setNoteText( const QString &_text ) +void KPrPage::setNoteText( const TQString &_text ) { m_noteText=_text; m_doc->setModified(true); } -QString KPrPage::noteText() const +TQString KPrPage::noteText() const { return m_noteText; } void KPrPage::makeUsedPixmapList() { - QPtrListIterator<KPrObject> it( m_objectList ); + TQPtrListIterator<KPrObject> it( m_objectList ); for ( ; it.current() ; ++it ) { if( it.current()->getType()==OT_PICTURE || it.current()->getType()==OT_CLIPART) @@ -1945,7 +1945,7 @@ void KPrPage::makeUsedPixmapListForGroupObject( KPrObject *_obj ) KPrGroupObject *_groupObj = static_cast<KPrGroupObject*>( _obj ); if ( _groupObj ) { - QPtrListIterator<KPrObject> it( _groupObj->objectList() ); + TQPtrListIterator<KPrObject> it( _groupObj->objectList() ); for ( ; it.current(); ++it ) { if ( ( it.current()->getType() == OT_PICTURE ) || ( it.current()->getType() == OT_CLIPART ) ) @@ -1957,12 +1957,12 @@ void KPrPage::makeUsedPixmapListForGroupObject( KPrObject *_obj ) } -QValueList<int> KPrPage::getEffectSteps() const +TQValueList<int> KPrPage::getEffectSteps() const { - QMap<int,bool> stepmap; + TQMap<int,bool> stepmap; stepmap[0] = true; - QPtrListIterator<KPrObject> it( m_objectList ); + TQPtrListIterator<KPrObject> it( m_objectList ); for ( ; it.current(); ++it ) { stepmap[it.current()->getAppearStep()] = true; @@ -1979,7 +1979,7 @@ QValueList<int> KPrPage::getEffectSteps() const void KPrPage::deSelectAllObj() { - QPtrListIterator<KPrObject> sIt( m_objectList ); + TQPtrListIterator<KPrObject> sIt( m_objectList ); for ( ; sIt.current() ; ++sIt ) { if(sIt.current()->isSelected()) @@ -1990,13 +1990,13 @@ void KPrPage::deSelectAllObj() void KPrPage::deSelectObj( KPrObject *kpobject ) { kpobject->setSelected( false ); - m_doc->repaint( kpobject ); + m_doc->tqrepaint( kpobject ); } -QDomElement KPrPage::saveObjects( QDomDocument &doc, QDomElement &objects, double yoffset, +TQDomElement KPrPage::saveObjects( TQDomDocument &doc, TQDomElement &objects, double yoffset, int saveOnlyPage ) const { - QPtrListIterator<KPrObject> oIt(m_objectList); + TQPtrListIterator<KPrObject> oIt(m_objectList); for (; oIt.current(); ++oIt ) { //don't store header/footer (store in header/footer section) @@ -2004,7 +2004,7 @@ QDomElement KPrPage::saveObjects( QDomDocument &doc, QDomElement &objects, doubl || oIt.current()==m_doc->footer() || oIt.current()->getType() == OT_PART) continue; - QDomElement object=doc.createElement("OBJECT"); + TQDomElement object=doc.createElement("OBJECT"); object.setAttribute("type", static_cast<int>( oIt.current()->getType() )); bool _sticky = ( this->m_masterPage == 0 ); if (_sticky) @@ -2021,9 +2021,9 @@ QDomElement KPrPage::saveObjects( QDomDocument &doc, QDomElement &objects, doubl bool KPrPage::oneObjectTextExist(bool forceAllTextObject) { - QPtrList<KPrObject> lst; + TQPtrList<KPrObject> lst; getAllObjectSelectedList(lst,forceAllTextObject ); - QPtrListIterator<KPrObject> it( lst ); + TQPtrListIterator<KPrObject> it( lst ); for ( ; it.current() ; ++it ) { if ( (it.current() == m_doc->header() && !hasHeader()) @@ -2048,9 +2048,9 @@ bool KPrPage::isOneObjectSelected() bool KPrPage::haveASelectedPartObj() { - QPtrList<KPrObject> lst; + TQPtrList<KPrObject> lst; getAllObjectSelectedList(lst ); - QPtrListIterator<KPrObject> it( lst ); + TQPtrListIterator<KPrObject> it( lst ); for ( ; it.current(); ++it ) { if (it.current()->getType() == OT_PART ) return true; @@ -2060,8 +2060,8 @@ bool KPrPage::haveASelectedPartObj() bool KPrPage::haveASelectedGroupObj() { - QPtrList<KPrObject> objects( getSelectedObjects( true ) ); - QPtrListIterator<KPrObject> it( objects ); + TQPtrList<KPrObject> objects( getSelectedObjects( true ) ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current(); ++it ) { if ( it.current()->getType() == OT_GROUP ) return true; @@ -2071,9 +2071,9 @@ bool KPrPage::haveASelectedGroupObj() bool KPrPage::haveASelectedPixmapObj() { - QPtrList<KPrObject> lst; + TQPtrList<KPrObject> lst; getAllObjectSelectedList(lst ); - QPtrListIterator<KPrObject> it( lst ); + TQPtrListIterator<KPrObject> it( lst ); for ( ; it.current() ; ++it ) { if (( it.current()->getType() == OT_PICTURE ) || ( it.current()->getType() == OT_CLIPART ) ) @@ -2086,7 +2086,7 @@ KoRect KPrPage::getRealRect( bool all ) const { KoRect rect; - QPtrListIterator<KPrObject> it( m_objectList ); + TQPtrListIterator<KPrObject> it( m_objectList ); for ( ; it.current() ; ++it ) { if ( it.current()== m_doc->header() || it.current()== m_doc->footer()) @@ -2102,7 +2102,7 @@ KoRect KPrPage::getRealRect( bool all ) const //return true if we change picture bool KPrPage::chPic( KPrView *_view) { - QPtrListIterator<KPrObject> it( m_objectList ); + TQPtrListIterator<KPrObject> it( m_objectList ); for ( ; it.current() ; ++it ) { if ( it.current()->isSelected() && @@ -2122,7 +2122,7 @@ bool KPrPage::chPic( KPrView *_view) bool KPrPage::savePicture( KPrView *_view ) const { - QPtrListIterator<KPrObject> it( m_objectList ); + TQPtrListIterator<KPrObject> it( m_objectList ); for ( ; it.current() ; ++it ) { if ( it.current()->isSelected() && @@ -2145,9 +2145,9 @@ KCommand *KPrPage::moveObject(KPrView *_view, double diffx, double diffy) { bool createCommand=false; KPrMoveByCmd *moveByCmd=0L; - QPtrList<KPrObject> _objects; + TQPtrList<KPrObject> _objects; _objects.setAutoDelete( false ); - QPtrListIterator<KPrObject> it( m_objectList ); + TQPtrListIterator<KPrObject> it( m_objectList ); for ( ; it.current() ; ++it ) { //don't move a header/footer @@ -2156,10 +2156,10 @@ KCommand *KPrPage::moveObject(KPrView *_view, double diffx, double diffy) if ( it.current()->isSelected() && !it.current()->isProtect()) { _objects.append( it.current() ); - QRect br = _view->zoomHandler()->zoomRect( it.current()->getRepaintRect() ); + TQRect br = _view->zoomHandler()->zoomRect( it.current()->getRepaintRect() ); br.moveBy( _view->zoomHandler()->zoomItX( diffx ), _view->zoomHandler()->zoomItY( diffy ) ); - m_doc->repaint( br ); // Previous position - m_doc->repaint( it.current() ); // New position + m_doc->tqrepaint( br ); // Previous position + m_doc->tqrepaint( it.current() ); // New position createCommand=true; } } @@ -2174,10 +2174,10 @@ KCommand *KPrPage::moveObject(KPrView *_view, double diffx, double diffy) KCommand *KPrPage::moveObject(KPrView *m_view,const KoPoint &_move,bool key) { - QPtrList<KPrObject> _objects; + TQPtrList<KPrObject> _objects; _objects.setAutoDelete( false ); KPrMoveByCmd *moveByCmd=0L; - QPtrListIterator<KPrObject> it( m_objectList ); + TQPtrListIterator<KPrObject> it( m_objectList ); for ( ; it.current() ; ++it ) { //don't move a header/footer @@ -2185,12 +2185,12 @@ KCommand *KPrPage::moveObject(KPrView *m_view,const KoPoint &_move,bool key) continue; if ( it.current()->isSelected() && !it.current()->isProtect()) { - QRect oldBoundingRect = m_view->zoomHandler()->zoomRect( it.current()->getRepaintRect() ); + TQRect oldBoundingRect = m_view->zoomHandler()->zoomRect( it.current()->getRepaintRect() ); it.current()->moveBy( _move ); _objects.append( it.current() ); - m_doc->repaint( oldBoundingRect ); - m_doc->repaint( it.current() ); + m_doc->tqrepaint( oldBoundingRect ); + m_doc->tqrepaint( it.current() ); } } @@ -2202,13 +2202,13 @@ KCommand *KPrPage::moveObject(KPrView *m_view,const KoPoint &_move,bool key) return moveByCmd; } -void KPrPage::repaintObj() +void KPrPage::tqrepaintObj() { - QPtrListIterator<KPrObject> it( m_objectList ); + TQPtrListIterator<KPrObject> it( m_objectList ); for ( ; it.current() ; ++it ) { if(it.current()->isSelected()) - m_doc->repaint(it.current() ); + m_doc->tqrepaint(it.current() ); } } @@ -2216,10 +2216,10 @@ KCommand *KPrPage::rotateSelectedObjects( float _newAngle, bool addAngle ) { KPrRotateCmd * cmd = NULL; - QPtrList<KPrObject> _objects; + TQPtrList<KPrObject> _objects; _objects.setAutoDelete( false ); - QPtrListIterator<KPrObject> it( m_objectList ); + TQPtrListIterator<KPrObject> it( m_objectList ); for ( ; it.current() ; ++it ) { if ( it.current()== m_doc->header() || it.current()== m_doc->footer() ) @@ -2239,12 +2239,12 @@ KCommand *KPrPage::rotateSelectedObjects( float _newAngle, bool addAngle ) } -KCommand *KPrPage::shadowObj(ShadowDirection dir,int dist, const QColor &col) +KCommand *KPrPage::shadowObj(ShadowDirection dir,int dist, const TQColor &col) { KPrShadowCmd *shadowCmd=0L; bool newShadow=false; - QPtrList<KPrObject> _objects; - QPtrList<KPrShadowCmd::ShadowValues> _oldShadow; + TQPtrList<KPrObject> _objects; + TQPtrList<KPrShadowCmd::ShadowValues> _oldShadow; KPrShadowCmd::ShadowValues _newShadow, *tmp; _objects.setAutoDelete( false ); @@ -2254,7 +2254,7 @@ KCommand *KPrPage::shadowObj(ShadowDirection dir,int dist, const QColor &col) _newShadow.shadowDistance = dist; _newShadow.shadowColor = col; - QPtrListIterator<KPrObject> it( m_objectList ); + TQPtrListIterator<KPrObject> it( m_objectList ); for ( ; it.current() ; ++it ) { //don't shadow a header/footer @@ -2290,31 +2290,31 @@ KCommand *KPrPage::shadowObj(ShadowDirection dir,int dist, const QColor &col) return shadowCmd; } -QPtrList<KoTextObject> KPrPage::allTextObjects() const +TQPtrList<KoTextObject> KPrPage::allTextObjects() const { - QPtrList<KoTextObject> lst; + TQPtrList<KoTextObject> lst; addTextObjects( lst ); return lst; } -void KPrPage::addTextObjects(QPtrList<KoTextObject>& lst) const +void KPrPage::addTextObjects(TQPtrList<KoTextObject>& lst) const { - QPtrListIterator<KPrObject> it( m_objectList ); + TQPtrListIterator<KPrObject> it( m_objectList ); for ( ; it.current() ; ++it ) it.current()->addTextObjects( lst ); } -KPrObject * KPrPage::getCursor( const QPoint &pos ) +KPrObject * KPrPage::getCursor( const TQPoint &pos ) { return getCursor( m_doc->zoomHandler()->unzoomPoint( pos ) ); } KPrObject * KPrPage::getCursor(const KoPoint &pos ) { - QPtrListIterator<KPrObject> it( m_objectList ); + TQPtrListIterator<KPrObject> it( m_objectList ); KPrObject *kpobject = it.toLast(); while ( kpobject ) { - if ( kpobject->contains( pos ) && kpobject->isSelected() ) + if ( kpobject->tqcontains( pos ) && kpobject->isSelected() ) return kpobject; kpobject = --it; } @@ -2323,7 +2323,7 @@ KPrObject * KPrPage::getCursor(const KoPoint &pos ) KPrObject* KPrPage::getObjectAt( const KoPoint &pos, bool withoutProtected ) const { - QPtrListIterator<KPrObject> it( m_objectList ); + TQPtrListIterator<KPrObject> it( m_objectList ); KPrObject *o = 0; //tz Check first if there is a selected object at this pos! for ( int i = 0; i < 2; ++i ) @@ -2336,7 +2336,7 @@ KPrObject* KPrPage::getObjectAt( const KoPoint &pos, bool withoutProtected ) con ( m_bHasHeader && o == m_doc->header() ) ) { if ( ( o->isSelected() || i > 0 ) && - o->contains( pos ) && !( o->isProtect() && withoutProtected ) ) + o->tqcontains( pos ) && !( o->isProtect() && withoutProtected ) ) return o; } o = --it; @@ -2348,7 +2348,7 @@ KPrObject* KPrPage::getObjectAt( const KoPoint &pos, bool withoutProtected ) con KPrPixmapObject * KPrPage::picViewOrigHelper() const { KPrPixmapObject *obj=0L; - QPtrListIterator<KPrObject> it( m_objectList ); + TQPtrListIterator<KPrObject> it( m_objectList ); for ( ; it.current() ; ++it ) { if ( it.current()->isSelected() && @@ -2364,9 +2364,9 @@ KPrPixmapObject * KPrPage::picViewOrigHelper() const void KPrPage::applyStyleChange( KoStyleChangeDefMap changed ) { - QPtrList<KPrObject> lst; + TQPtrList<KPrObject> lst; getAllObjectSelectedList(lst,true /*force*/ ); - QPtrListIterator<KPrObject> it( lst ); + TQPtrListIterator<KPrObject> it( lst ); for ( ; it.current() ; ++it ) { @@ -2378,9 +2378,9 @@ void KPrPage::applyStyleChange( KoStyleChangeDefMap changed ) void KPrPage::reactivateBgSpellChecking(bool refreshTextObj) { - QPtrList<KPrObject> lst; + TQPtrList<KPrObject> lst; getAllObjectSelectedList(lst,true /*force*/ ); - QPtrListIterator<KPrObject> oIt( lst ); + TQPtrListIterator<KPrObject> oIt( lst ); for ( ; oIt.current() ; ++oIt ) { @@ -2388,14 +2388,14 @@ void KPrPage::reactivateBgSpellChecking(bool refreshTextObj) { static_cast<KPrTextObject*>( oIt.current() )->textObject()->setNeedSpellCheck(true); if(refreshTextObj) - m_doc->repaint( oIt.current() ); + m_doc->tqrepaint( oIt.current() ); } } } bool KPrPage::canMoveOneObject() const { - QPtrListIterator<KPrObject> it( m_objectList ); + TQPtrListIterator<KPrObject> it( m_objectList ); for ( ; it.current() ; ++it ) { //don't test header/footer all the time sticky @@ -2407,12 +2407,12 @@ bool KPrPage::canMoveOneObject() const return false; } -KCommand *KPrPage::alignVertical( VerticalAlignmentType _type ) +KCommand *KPrPage::alignVertical(VerticalAlignmentType _type ) { KMacroCommand *macro = 0L; - QPtrList<KPrObject> lst; + TQPtrList<KPrObject> lst; getAllObjectSelectedList(lst ); - QPtrListIterator<KPrObject> it( lst ); + TQPtrListIterator<KPrObject> it( lst ); for ( ; it.current() ; ++it ) { if(it.current()->getType()==OT_TEXT) @@ -2420,10 +2420,10 @@ KCommand *KPrPage::alignVertical( VerticalAlignmentType _type ) KPrTextObject *obj = dynamic_cast<KPrTextObject *>(it.current()); if ( obj && !obj->isProtectContent()) { - KPrChangeVerticalAlignmentCommand * cmd = new KPrChangeVerticalAlignmentCommand( i18n("Change Vertical Alignment"), + KPrChangeVerticalAlignmentCommand * cmd = new KPrChangeVerticalAlignmentCommand( i18n("ChangeQt::Vertical Alignment"), obj, obj->verticalAlignment(),_type, m_doc); if ( !macro ) - macro = new KMacroCommand( i18n("Change Vertical Alignment")); + macro = new KMacroCommand( i18n("ChangeQt::Vertical Alignment")); macro->addCommand( cmd ); cmd->execute(); } @@ -2434,9 +2434,9 @@ KCommand *KPrPage::alignVertical( VerticalAlignmentType _type ) void KPrPage::changeTabStopValue ( double _tabStop ) { - QPtrList<KPrObject> lst; + TQPtrList<KPrObject> lst; getAllObjectSelectedList(lst,true /*force*/ ); - QPtrListIterator<KPrObject> it( lst ); + TQPtrListIterator<KPrObject> it( lst ); for ( ; it.current() ; ++it ) { if(it.current()->getType()==OT_TEXT) @@ -2445,8 +2445,8 @@ void KPrPage::changeTabStopValue ( double _tabStop ) if ( obj ) { obj->textDocument()->setTabStops( m_doc->zoomHandler()->ptToLayoutUnitPixX( _tabStop )); - obj->layout(); - m_doc->repaint( obj ); + obj->tqlayout(); + m_doc->tqrepaint( obj ); } } } @@ -2458,7 +2458,7 @@ KPrObject *KPrPage::nextTextObject(KPrTextObject *obj) return 0L; int pos = -1; if ( obj ) - pos = m_objectList.findNextRef(obj); + pos = m_objectList.tqfindNextRef(obj); if (pos != -1 ) { @@ -2485,19 +2485,19 @@ KPrObject *KPrPage::nextTextObject(KPrTextObject *obj) bool KPrPage::findTextObject( KPrObject *obj ) { - return (m_objectList.findRef( obj )>=0 ); + return (m_objectList.tqfindRef( obj )>=0 ); } -void KPrPage::getAllObjectSelectedList(QPtrList<KPrObject> &lst, bool force ) +void KPrPage::getAllObjectSelectedList(TQPtrList<KPrObject> &lst, bool force ) { - QPtrListIterator<KPrObject> it( m_objectList ); + TQPtrListIterator<KPrObject> it( m_objectList ); for ( ; it.current() ; ++it ) it.current()->getAllObjectSelectedList( lst,force ); } -void KPrPage::getAllEmbeddedObjectSelected(QPtrList<KoDocumentChild> &embeddedObjects ) +void KPrPage::getAllEmbeddedObjectSelected(TQPtrList<KoDocumentChild> &embeddedObjects ) { - QPtrListIterator<KPrObject> it( m_objectList ); + TQPtrListIterator<KPrObject> it( m_objectList ); for ( ; it.current() ; ++it ) { if ( it.current()->isSelected() && it.current()->getType() == OT_PART ) @@ -2508,7 +2508,7 @@ void KPrPage::getAllEmbeddedObjectSelected(QPtrList<KoDocumentChild> &embeddedOb KPrPixmapObject* KPrPage::getSelectedImage() const { KPrPixmapObject *obj=0L; - QPtrListIterator<KPrObject> it( m_objectList ); + TQPtrListIterator<KPrObject> it( m_objectList ); for ( ; it.current() ; ++it ) { if ( it.current()->isSelected() && it.current()->getType() == OT_PICTURE ) @@ -2520,12 +2520,12 @@ KPrPixmapObject* KPrPage::getSelectedImage() const return obj; } -KCommand * KPrPage::setImageEffect(ImageEffect eff, QVariant param1, QVariant param2, QVariant param3) +KCommand * KPrPage::setImageEffect(ImageEffect eff, TQVariant param1, TQVariant param2, TQVariant param3) { bool changed = false; KPrImageEffectCmd *imageEffectCmd = 0L; - QPtrList<KPrObject> _objects; - QPtrList<KPrImageEffectCmd::ImageEffectSettings> _oldSettings; + TQPtrList<KPrObject> _objects; + TQPtrList<KPrImageEffectCmd::ImageEffectSettings> _oldSettings; KPrImageEffectCmd::ImageEffectSettings _newSettings, *tmp; _objects.setAutoDelete( false ); @@ -2536,7 +2536,7 @@ KCommand * KPrPage::setImageEffect(ImageEffect eff, QVariant param1, QVariant pa _newSettings.param2 = param2; _newSettings.param3 = param3; - QPtrListIterator<KPrObject> it( m_objectList ); + TQPtrListIterator<KPrObject> it( m_objectList ); for ( ; it.current(); ++it ) { if ( it.current()->getType() == OT_PICTURE && it.current()->isSelected()) { tmp = new KPrImageEffectCmd::ImageEffectSettings; |