diff options
Diffstat (limited to 'kpresenter/KPrCommand.cpp')
| -rw-r--r-- | kpresenter/KPrCommand.cpp | 512 |
1 files changed, 256 insertions, 256 deletions
diff --git a/kpresenter/KPrCommand.cpp b/kpresenter/KPrCommand.cpp index 62119e9f..491976cc 100644 --- a/kpresenter/KPrCommand.cpp +++ b/kpresenter/KPrCommand.cpp @@ -58,12 +58,12 @@ #include <KoOasisStyles.h> #include <KoOasisStore.h> -#include <qxml.h> -#include <qbuffer.h> +#include <tqxml.h> +#include <tqbuffer.h> -KPrShadowCmd::KPrShadowCmd( const QString &_name, QPtrList<ShadowValues> &_oldShadow, ShadowValues _newShadow, - QPtrList<KPrObject> &_objects, KPrDocument *_doc ) +KPrShadowCmd::KPrShadowCmd( const TQString &_name, TQPtrList<ShadowValues> &_oldShadow, ShadowValues _newShadow, + TQPtrList<KPrObject> &_objects, KPrDocument *_doc ) : KNamedCommand( _name ), oldShadow( _oldShadow ), objects( _objects ) { objects.setAutoDelete( false ); @@ -73,14 +73,14 @@ KPrShadowCmd::KPrShadowCmd( const QString &_name, QPtrList<ShadowValues> &_oldSh m_page = doc->findPage( objects ); - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current() ; ++it ) it.current()->incCmdRef(); } KPrShadowCmd::~KPrShadowCmd() { - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current() ; ++it ) it.current()->decCmdRef(); oldShadow.setAutoDelete( true ); @@ -89,12 +89,12 @@ KPrShadowCmd::~KPrShadowCmd() void KPrShadowCmd::execute() { - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current() ; ++it ) it.current()->setShadowParameter(newShadow.shadowDistance, newShadow.shadowDirection, newShadow.shadowColor); - doc->repaint( false ); + doc->tqrepaint( false ); doc->updateSideBarItem( m_page ); } @@ -105,15 +105,15 @@ void KPrShadowCmd::unexecute() objects.at( i )->setShadowParameter(oldShadow.at(i)->shadowDistance, oldShadow.at(i)->shadowDirection, oldShadow.at(i)->shadowColor); - doc->repaint( false ); + doc->tqrepaint( false ); doc->updateSideBarItem( m_page ); } -KPrSetOptionsCmd::KPrSetOptionsCmd( const QString &_name, QValueList<KoPoint> &_diffs, QPtrList<KPrObject> &_objects, +KPrSetOptionsCmd::KPrSetOptionsCmd( const TQString &_name, TQValueList<KoPoint> &_diffs, TQPtrList<KPrObject> &_objects, double _gridX, double _gridY, double _oldGridX, double _oldGridY, - const QColor &_txtBackCol, const QColor &_otxtBackCol, KPrDocument *_doc ) + const TQColor &_txtBackCol, const TQColor &_otxtBackCol, KPrDocument *_doc ) : KNamedCommand( _name ), diffs( _diffs ), objects( _objects ), @@ -125,14 +125,14 @@ KPrSetOptionsCmd::KPrSetOptionsCmd( const QString &_name, QValueList<KoPoint> &_ oldGridX = _oldGridX; oldGridY = _oldGridY; doc = _doc; - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current() ; ++it ) it.current()->incCmdRef(); } KPrSetOptionsCmd::~KPrSetOptionsCmd() { - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current() ; ++it ) it.current()->decCmdRef(); } @@ -145,7 +145,7 @@ void KPrSetOptionsCmd::execute() doc->setGridValue( gridX, gridY, false ); doc->updateRuler(); doc->setTxtBackCol( txtBackCol ); - doc->repaint( false ); + doc->tqrepaint( false ); } void KPrSetOptionsCmd::unexecute() @@ -155,10 +155,10 @@ void KPrSetOptionsCmd::unexecute() doc->setGridValue( oldGridX, oldGridY, false ); doc->updateRuler(); doc->setTxtBackCol( otxtBackCol ); - doc->repaint( false ); + doc->tqrepaint( false ); } -KPrSetBackCmd::KPrSetBackCmd( const QString &name, const KPrBackGround::Settings &settings, +KPrSetBackCmd::KPrSetBackCmd( const TQString &name, const KPrBackGround::Settings &settings, const KPrBackGround::Settings &oldSettings, bool useMasterBackground, bool takeGlobal, KPrDocument *doc, KPrPage *page ) @@ -180,7 +180,7 @@ void KPrSetBackCmd::execute() m_page->setUseMasterBackground( m_useMasterBackground ); m_doc->restoreBackground( m_page ); } else { - QPtrListIterator<KPrPage> it( m_doc->getPageList() ); + TQPtrListIterator<KPrPage> it( m_doc->getPageList() ); for ( ; it.current() ; ++it ) { it.current()->background()->setBackGround( m_settings ); @@ -189,10 +189,10 @@ void KPrSetBackCmd::execute() } } - m_doc->repaint( false ); + m_doc->tqrepaint( false ); if ( m_takeGlobal ) { - QPtrListIterator<KPrPage> it( m_doc->getPageList() ); + TQPtrListIterator<KPrPage> it( m_doc->getPageList() ); for ( int pos = 0; it.current(); ++it, ++pos ) { m_doc->updateSideBarItem( it.current() ); } @@ -209,7 +209,7 @@ void KPrSetBackCmd::unexecute() m_page->setUseMasterBackground( m_oldUseMasterBackground ); m_doc->restoreBackground( m_page ); } else { - QPtrListIterator<KPrPage> it( m_doc->getPageList() ); + TQPtrListIterator<KPrPage> it( m_doc->getPageList() ); for ( ; it.current() ; ++it ) { it.current()->background()->setBackGround( m_oldSettings ); @@ -217,10 +217,10 @@ void KPrSetBackCmd::unexecute() m_doc->restoreBackground(it.current()); } } - m_doc->repaint( false ); + m_doc->tqrepaint( false ); if ( m_takeGlobal ) { - QPtrListIterator<KPrPage> it( m_doc->getPageList() ); + TQPtrListIterator<KPrPage> it( m_doc->getPageList() ); for ( int pos = 0; it.current(); ++it, ++pos ) { m_doc->updateSideBarItem( it.current() ); } @@ -230,14 +230,14 @@ void KPrSetBackCmd::unexecute() } } -KPrRotateCmd::KPrRotateCmd( const QString &_name, float newAngle, QPtrList<KPrObject> &objects, +KPrRotateCmd::KPrRotateCmd( const TQString &_name, float newAngle, TQPtrList<KPrObject> &objects, KPrDocument *doc, bool addAngle ) : KNamedCommand( _name ), m_doc( doc ), m_newAngle( newAngle ), m_addAngle( addAngle ) { m_objects.setAutoDelete( false ); m_oldAngles.setAutoDelete( false ); - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current() ; ++it ) { m_objects.append( it.current() ); @@ -254,7 +254,7 @@ KPrRotateCmd::KPrRotateCmd( const QString &_name, float newAngle, QPtrList<KPrOb KPrRotateCmd::~KPrRotateCmd() { - QPtrListIterator<KPrObject> it( m_objects ); + TQPtrListIterator<KPrObject> it( m_objects ); for ( ; it.current() ; ++it ) it.current()->decCmdRef(); m_oldAngles.setAutoDelete( true ); @@ -263,7 +263,7 @@ KPrRotateCmd::~KPrRotateCmd() void KPrRotateCmd::execute() { - QPtrListIterator<KPrObject> it( m_objects ); + TQPtrListIterator<KPrObject> it( m_objects ); for ( ; it.current() ; ++it ) { if ( m_addAngle ) @@ -272,7 +272,7 @@ void KPrRotateCmd::execute() it.current()->rotate( m_newAngle ); } m_doc->updateRuler(); - m_doc->repaint( false ); + m_doc->tqrepaint( false ); m_doc->updateSideBarItem( m_page ); } @@ -282,13 +282,13 @@ 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->repaint( false ); + m_doc->tqrepaint( false ); m_doc->updateSideBarItem( m_page ); } -KPrChgPixCmd::KPrChgPixCmd( const QString &_name, KPrPixmapObject *_oldObject, KPrPixmapObject *_newObject, +KPrChgPixCmd::KPrChgPixCmd( const TQString &_name, KPrPixmapObject *_oldObject, KPrPixmapObject *_newObject, KPrDocument *_doc, KPrPage *_page) : KNamedCommand( _name ) { @@ -311,7 +311,7 @@ KPrChgPixCmd::~KPrChgPixCmd() void KPrChgPixCmd::execute() { m_page->replaceObject( oldObject, newObject ); - doc->repaint( newObject ); + doc->tqrepaint( newObject ); doc->updateSideBarItem( m_page ); } @@ -319,12 +319,12 @@ void KPrChgPixCmd::execute() void KPrChgPixCmd::unexecute() { m_page->replaceObject( newObject, oldObject ); - doc->repaint( oldObject ); + doc->tqrepaint( oldObject ); doc->updateSideBarItem( m_page ); } -KPrDeleteCmd::KPrDeleteCmd( const QString &_name, QPtrList<KPrObject> &_objects, +KPrDeleteCmd::KPrDeleteCmd( const TQString &_name, TQPtrList<KPrObject> &_objects, KPrDocument *_doc, KPrPage *_page ) : KNamedCommand( _name ) , m_oldObjectList( _page->objectList() ) @@ -332,14 +332,14 @@ KPrDeleteCmd::KPrDeleteCmd( const QString &_name, QPtrList<KPrObject> &_objects, , m_doc( _doc ) , m_page( _page ) { - QPtrListIterator<KPrObject> it( m_oldObjectList ); + TQPtrListIterator<KPrObject> it( m_oldObjectList ); for ( ; it.current() ; ++it ) it.current()->incCmdRef(); } KPrDeleteCmd::~KPrDeleteCmd() { - QPtrListIterator<KPrObject> it( m_oldObjectList ); + TQPtrListIterator<KPrObject> it( m_oldObjectList ); for ( ; it.current() ; ++it ) it.current()->decCmdRef(); } @@ -348,9 +348,9 @@ void KPrDeleteCmd::execute() { bool textObj=false; - QPtrListIterator<KPrObject> it( m_oldObjectList ); - QPtrListIterator<KPrObject> itDelete( m_objectsToDelete ); - QPtrList<KPrObject> newObjectList; + TQPtrListIterator<KPrObject> it( m_oldObjectList ); + TQPtrListIterator<KPrObject> itDelete( m_objectsToDelete ); + TQPtrList<KPrObject> newObjectList; for ( ; it.current(); ++it ) { if ( it.current() == itDelete.current() ) @@ -377,8 +377,8 @@ void KPrDeleteCmd::execute() for ( itDelete.toFirst(); itDelete.current(); ++itDelete ) { - QRect oldRect = m_doc->zoomHandler()->zoomRect( itDelete.current()->getRepaintRect() ); - m_doc->repaint( oldRect ); + TQRect oldRect = m_doc->zoomHandler()->zoomRect( itDelete.current()->getRepaintRect() ); + m_doc->tqrepaint( oldRect ); } if(textObj) m_doc->updateRuler(); @@ -389,37 +389,37 @@ void KPrDeleteCmd::execute() void KPrDeleteCmd::unexecute() { m_page->setObjectList( m_oldObjectList ); - QPtrListIterator<KPrObject> it( m_objectsToDelete ); + TQPtrListIterator<KPrObject> it( m_objectsToDelete ); for ( ; it.current(); ++it ) { it.current()->addToObjList(); - m_doc->repaint( it.current() ); + m_doc->tqrepaint( it.current() ); } m_doc->updateSideBarItem( m_page ); } -KPrEffectCmd::KPrEffectCmd( const QString &_name, const QPtrList<KPrObject> &_objs, - const QValueList<EffectStruct> &_oldEffects, EffectStruct _newEffect ) +KPrEffectCmd::KPrEffectCmd( const TQString &_name, const TQPtrList<KPrObject> &_objs, + const TQValueList<EffectStruct> &_oldEffects, EffectStruct _newEffect ) : KNamedCommand( _name ), oldEffects( _oldEffects ), newEffect( _newEffect ), objs( _objs ) { - QPtrListIterator<KPrObject> it( objs ); + TQPtrListIterator<KPrObject> it( objs ); for ( ; it.current() ; ++it ) it.current()->incCmdRef(); } KPrEffectCmd::~KPrEffectCmd() { - QPtrListIterator<KPrObject> it( objs ); + TQPtrListIterator<KPrObject> it( objs ); for ( ; it.current() ; ++it ) it.current()->decCmdRef(); } void KPrEffectCmd::execute() { - QPtrListIterator<KPrObject> it( objs ); + TQPtrListIterator<KPrObject> it( objs ); for ( ; it.current() ; ++it ) { it.current()->setAppearStep( newEffect.appearStep ); @@ -462,8 +462,8 @@ void KPrEffectCmd::unexecute() } } -KPrGroupObjCmd::KPrGroupObjCmd( const QString &_name, - const QPtrList<KPrObject> &_objects, +KPrGroupObjCmd::KPrGroupObjCmd( const TQString &_name, + const TQPtrList<KPrObject> &_objects, KPrDocument *_doc, KPrPage *_page ) : KNamedCommand( _name ) , m_objectsToGroup( _objects ) @@ -484,7 +484,7 @@ void KPrGroupObjCmd::execute() { KoRect r; int position = 0; - QPtrListIterator<KPrObject> it( m_objectsToGroup ); + TQPtrListIterator<KPrObject> it( m_objectsToGroup ); for ( ; it.current() ; ++it ) { it.current()->setSelected( false ); @@ -501,7 +501,7 @@ void KPrGroupObjCmd::execute() m_groupObject->setSelected( true ); m_doc->refreshGroupButton(); - m_doc->repaint( false ); + m_doc->tqrepaint( false ); m_doc->updateSideBarItem( m_page ); } @@ -513,7 +513,7 @@ void KPrGroupObjCmd::unexecute() m_page->setObjectList( m_oldObjectList ); m_groupObject->removeFromObjList(); - QPtrListIterator<KPrObject> it( m_objectsToGroup ); + TQPtrListIterator<KPrObject> it( m_objectsToGroup ); for ( ; it.current() ; ++it ) { it.current()->addToObjList(); @@ -522,12 +522,12 @@ void KPrGroupObjCmd::unexecute() m_doc->refreshGroupButton(); - m_doc->repaint( false ); + m_doc->tqrepaint( false ); m_doc->updateSideBarItem( m_page ); } -UnGroupObjCmd::UnGroupObjCmd( const QString &_name, +UnGroupObjCmd::UnGroupObjCmd( const TQString &_name, KPrGroupObject *grpObj_, KPrDocument *_doc, KPrPage *_page ) : KNamedCommand( _name ) @@ -551,7 +551,7 @@ void UnGroupObjCmd::execute() int position = m_page->takeObject( m_groupObject ); m_groupObject->removeFromObjList(); - QPtrListIterator<KPrObject> it( m_groupedObjects ); + TQPtrListIterator<KPrObject> it( m_groupedObjects ); for ( it.toLast(); it.current() ; --it ) { m_page->insertObject( it.current(), position ); @@ -561,7 +561,7 @@ void UnGroupObjCmd::execute() m_doc->refreshGroupButton(); - m_doc->repaint( false ); + m_doc->tqrepaint( false ); m_doc->updateSideBarItem( m_page ); } @@ -570,7 +570,7 @@ void UnGroupObjCmd::unexecute() { KoRect r=KoRect(); int position = 0; - QPtrListIterator<KPrObject> it( m_groupedObjects ); + TQPtrListIterator<KPrObject> it( m_groupedObjects ); for ( ; it.current() ; ++it ) { it.current()->setSelected( false ); @@ -587,12 +587,12 @@ void UnGroupObjCmd::unexecute() m_groupObject->setSelected( true ); m_doc->refreshGroupButton(); - m_doc->repaint( false ); + m_doc->tqrepaint( false ); m_doc->updateSideBarItem( m_page ); } -KPrInsertCmd::KPrInsertCmd( const QString &name, const QValueList<KPrObject *> objects, +KPrInsertCmd::KPrInsertCmd( const TQString &name, const TQValueList<KPrObject *> objects, KPrDocument *doc, KPrPage *page ) : KNamedCommand( name ) , m_objects( objects ) @@ -600,14 +600,14 @@ KPrInsertCmd::KPrInsertCmd( const QString &name, const QValueList<KPrObject *> o , m_doc( doc ) , m_page( page ) { - QValueListConstIterator<KPrObject *> it( m_objects.begin() ); + TQValueListConstIterator<KPrObject *> it( m_objects.begin() ); for ( ; it != m_objects.end(); ++it ) { ( *it )->incCmdRef(); } } -KPrInsertCmd::KPrInsertCmd( const QString &name, KPrObject *object, +KPrInsertCmd::KPrInsertCmd( const TQString &name, KPrObject *object, KPrDocument *doc, KPrPage *page ) : KNamedCommand( name ) , m_object( object ) @@ -625,7 +625,7 @@ KPrInsertCmd::~KPrInsertCmd() } else { - QValueListConstIterator<KPrObject *> it( m_objects.begin() ); + TQValueListConstIterator<KPrObject *> it( m_objects.begin() ); for ( ; it != m_objects.end(); ++it ) { ( *it )->decCmdRef(); @@ -641,19 +641,19 @@ void KPrInsertCmd::execute() m_object->addToObjList(); if ( m_object->getType() == OT_TEXT ) m_doc->updateRuler(); - m_doc->repaint( m_object ); + m_doc->tqrepaint( m_object ); } else { m_page->appendObjects( m_objects ); - QValueListConstIterator<KPrObject *> it( m_objects.begin() ); + TQValueListConstIterator<KPrObject *> it( m_objects.begin() ); bool updateRuler = false; for ( ; it != m_objects.end(); ++it ) { ( *it )->addToObjList(); if ( ( *it )->getType() == OT_TEXT ) updateRuler = true; - m_doc->repaint( *it ); + m_doc->tqrepaint( *it ); } if ( updateRuler ) m_doc->updateRuler(); @@ -666,9 +666,9 @@ void KPrInsertCmd::unexecute() { if ( m_object ) { - QRect oldRect = m_doc->zoomHandler()->zoomRect( m_object->getRepaintRect() ); - QPtrList<KPrObject> list(m_page->objectList()); - if ( list.findRef( m_object ) != -1 ) { + TQRect oldRect = m_doc->zoomHandler()->zoomRect( m_object->getRepaintRect() ); + TQPtrList<KPrObject> list(m_page->objectList()); + if ( list.tqfindRef( m_object ) != -1 ) { m_page->takeObject( m_object ); m_object->removeFromObjList(); if ( m_object->getType() == OT_TEXT ) @@ -678,17 +678,17 @@ void KPrInsertCmd::unexecute() m_doc->updateRuler(); } } - m_doc->repaint( oldRect ); + m_doc->tqrepaint( oldRect ); } else { - QPtrList<KPrObject> list(m_page->objectList()); + TQPtrList<KPrObject> list(m_page->objectList()); bool updateRuler = false; - QValueListConstIterator<KPrObject *> it( m_objects.begin() ); + TQValueListConstIterator<KPrObject *> it( m_objects.begin() ); for ( ; it != m_objects.end(); ++it ) { - if ( list.findRef( *it ) != -1 ) + if ( list.tqfindRef( *it ) != -1 ) { m_page->takeObject( *it ); ( *it )->removeFromObjList(); @@ -703,14 +703,14 @@ void KPrInsertCmd::unexecute() if ( updateRuler ) m_doc->updateRuler(); - m_doc->repaint( false ); + m_doc->tqrepaint( false ); } m_doc->updateSideBarItem( m_page ); } -KPrLowerRaiseCmd::KPrLowerRaiseCmd( const QString &_name, const QPtrList<KPrObject>& _oldList, - const QPtrList<KPrObject>& _newList, KPrDocument *_doc, +KPrLowerRaiseCmd::KPrLowerRaiseCmd( const TQString &_name, const TQPtrList<KPrObject>& _oldList, + const TQPtrList<KPrObject>& _newList, KPrDocument *_doc, KPrPage *_page ) : KNamedCommand( _name ) { @@ -721,14 +721,14 @@ KPrLowerRaiseCmd::KPrLowerRaiseCmd( const QString &_name, const QPtrList<KPrObje newList.setAutoDelete( false ); doc = _doc; - QPtrListIterator<KPrObject> it( oldList ); + TQPtrListIterator<KPrObject> it( oldList ); for ( ; it.current() ; ++it ) it.current()->incCmdRef(); } KPrLowerRaiseCmd::~KPrLowerRaiseCmd() { - QPtrListIterator<KPrObject> it( oldList ); + TQPtrListIterator<KPrObject> it( oldList ); for ( ; it.current() ; ++it ) it.current()->decCmdRef(); } @@ -736,7 +736,7 @@ KPrLowerRaiseCmd::~KPrLowerRaiseCmd() void KPrLowerRaiseCmd::execute() { m_page->setObjectList( newList ); - doc->repaint( false ); + doc->tqrepaint( false ); doc->updateSideBarItem( m_page ); } @@ -744,20 +744,20 @@ void KPrLowerRaiseCmd::execute() void KPrLowerRaiseCmd::unexecute() { m_page->setObjectList( oldList ); - doc->repaint( false ); + doc->tqrepaint( false ); doc->updateSideBarItem( m_page ); } -KPrMoveByCmd::KPrMoveByCmd( const QString &_name, const KoPoint &_diff, QPtrList<KPrObject> &_objects, +KPrMoveByCmd::KPrMoveByCmd( const TQString &_name, const KoPoint &_diff, TQPtrList<KPrObject> &_objects, KPrDocument *_doc,KPrPage *_page ) : KNamedCommand( _name ), diff( _diff ), objects( _objects ) { objects.setAutoDelete( false ); doc = _doc; m_page=_page; - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current() ; ++it ) { it.current()->incCmdRef(); @@ -766,14 +766,14 @@ KPrMoveByCmd::KPrMoveByCmd( const QString &_name, const KoPoint &_diff, QPtrList KPrMoveByCmd::~KPrMoveByCmd() { - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current() ; ++it ) it.current()->decCmdRef(); } void KPrMoveByCmd::execute() { - QRect oldRect; + TQRect oldRect; for ( unsigned int i = 0; i < objects.count(); i++ ) { oldRect = doc->zoomHandler()->zoomRect( objects.at( i )->getRepaintRect() ); @@ -783,8 +783,8 @@ void KPrMoveByCmd::execute() if(objects.at(i)->isSelected()) doc->updateRuler(); } - doc->repaint( oldRect ); - doc->repaint( objects.at( i ) ); + doc->tqrepaint( oldRect ); + doc->tqrepaint( objects.at( i ) ); } doc->updateSideBarItem( m_page ); @@ -793,7 +793,7 @@ void KPrMoveByCmd::execute() void KPrMoveByCmd::unexecute() { - QRect oldRect; + TQRect oldRect; for ( unsigned int i = 0; i < objects.count(); i++ ) { oldRect = doc->zoomHandler()->zoomRect( objects.at( i )->getRepaintRect() ); @@ -803,22 +803,22 @@ void KPrMoveByCmd::unexecute() if(objects.at(i)->isSelected()) doc->updateRuler(); } - doc->repaint( oldRect ); - doc->repaint( objects.at( i ) ); + doc->tqrepaint( oldRect ); + doc->tqrepaint( objects.at( i ) ); } doc->updateSideBarItem( m_page ); doc->updateObjectStatusBarItem(); } -KPrAlignCmd::KPrAlignCmd( const QString &_name, QPtrList<KPrObject> &_objects, AlignType _at, KPrDocument *_doc ) +KPrAlignCmd::KPrAlignCmd( const TQString &_name, TQPtrList<KPrObject> &_objects, AlignType _at, KPrDocument *_doc ) : KNamedCommand( _name ), doc(_doc) { objects.setAutoDelete( false ); diffs.setAutoDelete( true ); m_page = doc->findPage( _objects ); - QPtrListIterator<KPrObject> it( _objects ); + TQPtrListIterator<KPrObject> it( _objects ); KoRect boundingRect; for ( ; it.current() ; ++it ) { @@ -868,7 +868,7 @@ KPrAlignCmd::KPrAlignCmd( const QString &_name, QPtrList<KPrObject> &_objects, A KPrAlignCmd::~KPrAlignCmd() { - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current() ; ++it ) it.current()->decCmdRef(); @@ -877,7 +877,7 @@ KPrAlignCmd::~KPrAlignCmd() void KPrAlignCmd::execute() { - QRect oldRect; + TQRect oldRect; for ( unsigned int i = 0; i < objects.count(); i++ ) { oldRect = doc->zoomHandler()->zoomRect( objects.at( i )->getRepaintRect() ); @@ -888,8 +888,8 @@ void KPrAlignCmd::execute() doc->updateRuler(); } - doc->repaint( oldRect ); - doc->repaint( objects.at( i ) ); + doc->tqrepaint( oldRect ); + doc->tqrepaint( objects.at( i ) ); } doc->updateSideBarItem( m_page ); @@ -897,7 +897,7 @@ void KPrAlignCmd::execute() void KPrAlignCmd::unexecute() { - QRect oldRect; + TQRect oldRect; for ( unsigned int i = 0; i < objects.count(); i++ ) { oldRect = doc->zoomHandler()->zoomRect(objects.at( i )->getRepaintRect() ); @@ -907,15 +907,15 @@ void KPrAlignCmd::unexecute() if(objects.at(i)->isSelected()) doc->updateRuler(); } - doc->repaint( oldRect ); - doc->repaint( objects.at( i ) ); + doc->tqrepaint( oldRect ); + doc->tqrepaint( objects.at( i ) ); doc->updateRuler(); } doc->updateSideBarItem( m_page ); } -KoPenCmd::KoPenCmd( const QString &_name, QPtrList<KPrObject> &_objects, Pen _newPen, +KoPenCmd::KoPenCmd( const TQString &_name, TQPtrList<KPrObject> &_objects, Pen _newPen, KPrDocument *_doc, KPrPage *_page, int _flags ) : KNamedCommand(_name), doc(_doc), m_page( _page ), newPen(_newPen), flags(_flags) { @@ -927,7 +927,7 @@ KoPenCmd::KoPenCmd( const QString &_name, QPtrList<KPrObject> &_objects, Pen _ne KoPenCmd::~KoPenCmd() { - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current() ; ++it ) it.current()->decCmdRef(); @@ -976,12 +976,12 @@ void KoPenCmd::applyPen( KPrObject *object, Pen *tmpPen ) //obj->setPen( tmpPen->pen ); obj->setLineBegin( tmpPen->lineBegin ); obj->setLineEnd( tmpPen->lineEnd ); - //doc->repaint( obj ); + //doc->tqrepaint( obj ); } } break; case OT_FREEHAND: case OT_POLYLINE: - case OT_QUADRICBEZIERCURVE: + case OT_TQUADRICBEZIERCURVE: case OT_CUBICBEZIERCURVE: { KPrPointObject *obj = dynamic_cast<KPrPointObject*>( object ); @@ -990,7 +990,7 @@ void KoPenCmd::applyPen( KPrObject *object, Pen *tmpPen ) //obj->setPen( tmpPen->pen ); obj->setLineBegin( tmpPen->lineBegin ); obj->setLineEnd( tmpPen->lineEnd ); - //doc->repaint( obj ); + //doc->tqrepaint( obj ); } } break; case OT_PIE: @@ -1019,7 +1019,7 @@ void KoPenCmd::applyPen( KPrObject *object, Pen *tmpPen ) if ( obj ) { obj->setPen( tmpPen->pen ); - doc->repaint( obj ); + doc->tqrepaint( obj ); } } @@ -1036,9 +1036,9 @@ void KoPenCmd::unexecute() doc->updateSideBarItem( m_page ); } -void KoPenCmd::addObjects( const QPtrList<KPrObject> &_objects ) +void KoPenCmd::addObjects( const TQPtrList<KPrObject> &_objects ) { - QPtrListIterator<KPrObject> it( _objects ); + TQPtrListIterator<KPrObject> it( _objects ); for ( ; it.current(); ++it ) { KPrObject * object( it.current() ); @@ -1067,7 +1067,7 @@ void KoPenCmd::addObjects( const QPtrList<KPrObject> &_objects ) } break; case OT_FREEHAND: case OT_POLYLINE: - case OT_QUADRICBEZIERCURVE: + case OT_TQUADRICBEZIERCURVE: case OT_CUBICBEZIERCURVE: { KPrPointObject *obj = dynamic_cast<KPrPointObject*>( object ); @@ -1114,7 +1114,7 @@ void KoPenCmd::addObjects( const QPtrList<KPrObject> &_objects ) } -KPrBrushCmd::KPrBrushCmd( const QString &_name, QPtrList<KPrObject> &_objects, Brush _newBrush, +KPrBrushCmd::KPrBrushCmd( const TQString &_name, TQPtrList<KPrObject> &_objects, Brush _newBrush, KPrDocument *_doc, KPrPage *_page, int _flags ) : KNamedCommand(_name), doc(_doc), newBrush(_newBrush), m_page(_page), flags(_flags) { @@ -1124,9 +1124,9 @@ KPrBrushCmd::KPrBrushCmd( const QString &_name, QPtrList<KPrObject> &_objects, B addObjects( _objects ); } -void KPrBrushCmd::addObjects( const QPtrList<KPrObject> &_objects ) +void KPrBrushCmd::addObjects( const TQPtrList<KPrObject> &_objects ) { - QPtrListIterator<KPrObject> it( _objects ); + TQPtrListIterator<KPrObject> it( _objects ); for ( ; it.current(); ++it ) { if ( it.current()->getType() == OT_GROUP ) @@ -1163,7 +1163,7 @@ void KPrBrushCmd::addObjects( const QPtrList<KPrObject> &_objects ) KPrBrushCmd::~KPrBrushCmd() { - QPtrListIterator<KPr2DObject> it( objects ); + TQPtrListIterator<KPr2DObject> it( objects ); for ( ; it.current() ; ++it ) it.current()->decCmdRef(); @@ -1220,7 +1220,7 @@ void KPrBrushCmd::applyBrush( KPr2DObject *object, Brush *tmpBrush ) object->setGUnbalanced( tmpBrush->unbalanced ); object->setGXFactor( tmpBrush->xfactor ); object->setGYFactor( tmpBrush->yfactor ); - doc->repaint( object ); + doc->tqrepaint( object ); } void KPrBrushCmd::unexecute() @@ -1233,12 +1233,12 @@ void KPrBrushCmd::unexecute() } -KPrPgConfCmd::KPrPgConfCmd( const QString &_name, bool _manualSwitch, bool _infiniteLoop, - bool _showEndOfPresentationSlide, bool _showPresentationDuration, QPen _pen, - QValueList<bool> _selectedSlides, const QString & _presentationName, +KPrPgConfCmd::KPrPgConfCmd( const TQString &_name, bool _manualSwitch, bool _infiniteLoop, + bool _showEndOfPresentationSlide, bool _showPresentationDuration, TQPen _pen, + TQValueList<bool> _selectedSlides, const TQString & _presentationName, bool _oldManualSwitch, bool _oldInfiniteLoop, - bool _oldShowEndOfPresentationSlide, bool _oldShowPresentationDuration, QPen _oldPen, - QValueList<bool> _oldSelectedSlides, const QString & _oldPresentationName, + bool _oldShowEndOfPresentationSlide, bool _oldShowPresentationDuration, TQPen _oldPen, + TQValueList<bool> _oldSelectedSlides, const TQString & _oldPresentationName, KPrDocument *_doc ) : KNamedCommand( _name ) { @@ -1267,7 +1267,7 @@ void KPrPgConfCmd::execute() doc->setPresentationDuration( showPresentationDuration ); doc->setPresPen( pen ); doc->setPresentationName( presentationName ); - QPtrList<KPrPage> pages = doc->pageList(); + TQPtrList<KPrPage> pages = doc->pageList(); unsigned count = selectedSlides.count(); if( count > pages.count() ) count = pages.count(); for( unsigned i = 0; i < selectedSlides.count(); i++ ) @@ -1283,7 +1283,7 @@ void KPrPgConfCmd::unexecute() doc->setPresPen( oldPen ); doc->setPresentationName( oldPresentationName ); - QPtrList<KPrPage> pages = doc->pageList(); + TQPtrList<KPrPage> pages = doc->pageList(); unsigned count = oldSelectedSlides.count(); if( count > pages.count() ) count = pages.count(); for( unsigned i = 0; i < oldSelectedSlides.count(); i++ ) @@ -1291,7 +1291,7 @@ void KPrPgConfCmd::unexecute() } -KPrTransEffectCmd::KPrTransEffectCmd( QValueVector<PageEffectSettings> oldSettings, +KPrTransEffectCmd::KPrTransEffectCmd( TQValueVector<PageEffectSettings> oldSettings, PageEffectSettings newSettings, KPrPage* page, KPrDocument* doc ) { @@ -1317,7 +1317,7 @@ void KPrTransEffectCmd::execute() if ( m_page ) m_newSettings.applyTo( m_page ); else - for( QPtrListIterator<KPrPage> it( m_doc->getPageList() ); *it; ++it ) + for( TQPtrListIterator<KPrPage> it( m_doc->getPageList() ); *it; ++it ) m_newSettings.applyTo( it.current() ); } @@ -1327,12 +1327,12 @@ void KPrTransEffectCmd::unexecute() m_oldSettings[0].applyTo( m_page ); else { int i = 0; - for( QPtrListIterator<KPrPage> it( m_doc->getPageList() ); *it; ++it, ++i ) + for( TQPtrListIterator<KPrPage> it( m_doc->getPageList() ); *it; ++it, ++i ) m_oldSettings[i].applyTo( it.current() ); } } -QString KPrTransEffectCmd::name() const +TQString KPrTransEffectCmd::name() const { if ( m_page ) return i18n( "Modify Slide Transition" ); @@ -1340,12 +1340,12 @@ QString KPrTransEffectCmd::name() const return i18n( "Modify Slide Transition For All Pages" ); } -KPrPgLayoutCmd::KPrPgLayoutCmd( const QString &_name, KoPageLayout _layout, KoPageLayout _oldLayout, +KPrPgLayoutCmd::KPrPgLayoutCmd( const TQString &_name, KoPageLayout _layout, KoPageLayout _oldLayout, KoUnit::Unit _oldUnit, KoUnit::Unit _unit,KPrDocument *_doc ) : KNamedCommand( _name ) { m_doc=_doc; - layout = _layout; + tqlayout = _layout; oldLayout = _oldLayout; oldUnit = _oldUnit; unit = _unit; @@ -1354,7 +1354,7 @@ KPrPgLayoutCmd::KPrPgLayoutCmd( const QString &_name, KoPageLayout _layout, KoPa void KPrPgLayoutCmd::execute() { m_doc->setUnit( unit ); - m_doc->setPageLayout( layout ); + m_doc->setPageLayout( tqlayout ); m_doc->updateHeaderFooterPosition(); m_doc->updateRuler(); m_doc->updateRulerPageLayout(); @@ -1370,8 +1370,8 @@ void KPrPgLayoutCmd::unexecute() } -KPrPieValueCmd::KPrPieValueCmd( const QString &name, PieValues newValues, - QPtrList<KPrObject> &objects, KPrDocument *doc, +KPrPieValueCmd::KPrPieValueCmd( const TQString &name, PieValues newValues, + TQPtrList<KPrObject> &objects, KPrDocument *doc, KPrPage *page, int flags ) : KNamedCommand( name ) , m_doc( doc ) @@ -1385,8 +1385,8 @@ KPrPieValueCmd::KPrPieValueCmd( const QString &name, PieValues newValues, addObjects( objects ); } -KPrPieValueCmd::KPrPieValueCmd( const QString &_name, QPtrList<PieValues> &_oldValues, PieValues _newValues, - QPtrList<KPrObject> &_objects, KPrDocument *_doc, KPrPage *_page, int _flags ) +KPrPieValueCmd::KPrPieValueCmd( const TQString &_name, TQPtrList<PieValues> &_oldValues, PieValues _newValues, + TQPtrList<KPrObject> &_objects, KPrDocument *_doc, KPrPage *_page, int _flags ) : KNamedCommand( _name ), m_oldValues( _oldValues ), m_objects( _objects ), m_flags(_flags) { m_objects.setAutoDelete( false ); @@ -1395,23 +1395,23 @@ KPrPieValueCmd::KPrPieValueCmd( const QString &_name, QPtrList<PieValues> &_oldV m_page = _page; m_newValues = _newValues; - QPtrListIterator<KPrObject> it( m_objects ); + TQPtrListIterator<KPrObject> it( m_objects ); for ( ; it.current() ; ++it ) it.current()->incCmdRef(); } KPrPieValueCmd::~KPrPieValueCmd() { - QPtrListIterator<KPrObject> it( m_objects ); + TQPtrListIterator<KPrObject> it( m_objects ); for ( ; it.current() ; ++it ) it.current()->decCmdRef(); m_oldValues.setAutoDelete( true ); m_oldValues.clear(); } -void KPrPieValueCmd::addObjects( const QPtrList<KPrObject> &objects ) +void KPrPieValueCmd::addObjects( const TQPtrList<KPrObject> &objects ) { - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current(); ++it ) { if ( it.current()->getType() == OT_GROUP ) @@ -1442,7 +1442,7 @@ void KPrPieValueCmd::addObjects( const QPtrList<KPrObject> &objects ) void KPrPieValueCmd::execute() { - QPtrListIterator<KPrObject> it( m_objects ); + TQPtrListIterator<KPrObject> it( m_objects ); for ( ; it.current() ; ++it ) { KPrPieObject* obj=dynamic_cast<KPrPieObject*>( it.current() ); @@ -1456,7 +1456,7 @@ void KPrPieValueCmd::execute() obj->setPieLength( m_newValues.pieLength ); } } - m_doc->repaint( false ); + m_doc->tqrepaint( false ); m_doc->updateSideBarItem( m_page ); } @@ -1473,14 +1473,14 @@ void KPrPieValueCmd::unexecute() obj->setPieLength( m_oldValues.at( i )->pieLength ); } } - m_doc->repaint( false ); + m_doc->tqrepaint( false ); m_doc->updateSideBarItem( m_page ); } -KPrPolygonSettingCmd::KPrPolygonSettingCmd( const QString &name, PolygonSettings newSettings, - QPtrList<KPrObject> &objects, KPrDocument *doc, +KPrPolygonSettingCmd::KPrPolygonSettingCmd( const TQString &name, PolygonSettings newSettings, + TQPtrList<KPrObject> &objects, KPrDocument *doc, KPrPage *page, int flags ) : KNamedCommand( name ) , m_doc( doc ) @@ -1497,16 +1497,16 @@ KPrPolygonSettingCmd::KPrPolygonSettingCmd( const QString &name, PolygonSettings KPrPolygonSettingCmd::~KPrPolygonSettingCmd() { - QPtrListIterator<KPrObject> it( m_objects ); + TQPtrListIterator<KPrObject> it( m_objects ); for ( ; it.current() ; ++it ) it.current()->decCmdRef(); m_oldSettings.setAutoDelete( true ); m_oldSettings.clear(); } -void KPrPolygonSettingCmd::addObjects( const QPtrList<KPrObject> &objects ) +void KPrPolygonSettingCmd::addObjects( const TQPtrList<KPrObject> &objects ) { - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current(); ++it ) { if ( it.current()->getType() == OT_GROUP ) @@ -1539,7 +1539,7 @@ void KPrPolygonSettingCmd::addObjects( const QPtrList<KPrObject> &objects ) void KPrPolygonSettingCmd::execute() { - QPtrListIterator<KPrObject> it( m_objects ); + TQPtrListIterator<KPrObject> it( m_objects ); for ( ; it.current() ; ++it ) { KPrPolygonObject * obj=dynamic_cast<KPrPolygonObject*>( it.current() ); @@ -1553,7 +1553,7 @@ void KPrPolygonSettingCmd::execute() obj->setSharpnessValue(m_newSettings.sharpnessValue ); } } - m_doc->repaint( false ); + m_doc->tqrepaint( false ); m_doc->updateSideBarItem( m_page ); } @@ -1570,14 +1570,14 @@ void KPrPolygonSettingCmd::unexecute() obj->setSharpnessValue(m_oldSettings.at( i )->sharpnessValue); } } - m_doc->repaint( false ); + m_doc->tqrepaint( false ); m_doc->updateSideBarItem( m_page ); } -KPrPictureSettingCmd::KPrPictureSettingCmd( const QString &name, PictureSettings newSettings, - QPtrList<KPrObject> &objects, KPrDocument *doc, +KPrPictureSettingCmd::KPrPictureSettingCmd( const TQString &name, PictureSettings newSettings, + TQPtrList<KPrObject> &objects, KPrDocument *doc, KPrPage *page, int flags ) : KNamedCommand( name ) , m_doc( doc ) @@ -1591,8 +1591,8 @@ KPrPictureSettingCmd::KPrPictureSettingCmd( const QString &name, PictureSettings addObjects( objects ); } -KPrPictureSettingCmd::KPrPictureSettingCmd( const QString &_name, QPtrList<PictureSettings> &_oldSettings, - PictureSettings _newSettings, QPtrList<KPrObject> &_objects, +KPrPictureSettingCmd::KPrPictureSettingCmd( const TQString &_name, TQPtrList<PictureSettings> &_oldSettings, + PictureSettings _newSettings, TQPtrList<KPrObject> &_objects, KPrDocument *_doc, int flags ) : KNamedCommand( _name ), m_oldValues( _oldSettings ), m_objects( _objects ), m_flags( flags ) { @@ -1603,23 +1603,23 @@ KPrPictureSettingCmd::KPrPictureSettingCmd( const QString &_name, QPtrList<Pictu m_page = m_doc->findPage( m_objects ); - QPtrListIterator<KPrObject> it( m_objects ); + TQPtrListIterator<KPrObject> it( m_objects ); for ( ; it.current() ; ++it ) it.current()->incCmdRef(); } KPrPictureSettingCmd::~KPrPictureSettingCmd() { - QPtrListIterator<KPrObject> it( m_objects ); + TQPtrListIterator<KPrObject> it( m_objects ); for ( ; it.current() ; ++it ) it.current()->decCmdRef(); m_oldValues.setAutoDelete( true ); m_oldValues.clear(); } -void KPrPictureSettingCmd::addObjects( const QPtrList<KPrObject> &objects ) +void KPrPictureSettingCmd::addObjects( const TQPtrList<KPrObject> &objects ) { - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current(); ++it ) { if ( it.current()->getType() == OT_GROUP ) @@ -1654,7 +1654,7 @@ void KPrPictureSettingCmd::addObjects( const QPtrList<KPrObject> &objects ) void KPrPictureSettingCmd::execute() { - QPtrListIterator<KPrObject> it( m_objects ); + TQPtrListIterator<KPrObject> it( m_objects ); for ( ; it.current() ; ++it ) { KPrPixmapObject * obj = dynamic_cast<KPrPixmapObject*>( it.current() ); if ( obj ) { @@ -1670,7 +1670,7 @@ void KPrPictureSettingCmd::execute() obj->setPictureBright( m_newSettings.bright ); } } - m_doc->repaint( false ); + m_doc->tqrepaint( false ); m_doc->updateSideBarItem( m_page ); } @@ -1688,14 +1688,14 @@ void KPrPictureSettingCmd::unexecute() obj->setPictureBright( pictureSettings->bright ); } } - m_doc->repaint( false ); + m_doc->tqrepaint( false ); m_doc->updateSideBarItem( m_page ); } -KPrRectValueCmd::KPrRectValueCmd( const QString &_name, QPtrList<RectValues> &_oldValues, RectValues _newValues, - QPtrList<KPrObject> &_objects, KPrDocument *_doc, KPrPage *_page, int _flags ) +KPrRectValueCmd::KPrRectValueCmd( const TQString &_name, TQPtrList<RectValues> &_oldValues, RectValues _newValues, + TQPtrList<KPrObject> &_objects, KPrDocument *_doc, KPrPage *_page, int _flags ) : KNamedCommand( _name ), m_oldValues( _oldValues ), m_objects( _objects ), m_flags(_flags) { m_objects.setAutoDelete( false ); @@ -1704,13 +1704,13 @@ KPrRectValueCmd::KPrRectValueCmd( const QString &_name, QPtrList<RectValues> &_o m_page = _page; m_newValues = _newValues; - QPtrListIterator<KPrObject> it( m_objects ); + TQPtrListIterator<KPrObject> it( m_objects ); for ( ; it.current() ; ++it ) it.current()->incCmdRef(); } -KPrRectValueCmd::KPrRectValueCmd( const QString &name, QPtrList<KPrObject> &objects, RectValues newValues, +KPrRectValueCmd::KPrRectValueCmd( const TQString &name, TQPtrList<KPrObject> &objects, RectValues newValues, KPrDocument *doc, KPrPage *page, int flags ) : KNamedCommand( name ) , m_doc( doc ) @@ -1727,7 +1727,7 @@ KPrRectValueCmd::KPrRectValueCmd( const QString &name, QPtrList<KPrObject> &obje KPrRectValueCmd::~KPrRectValueCmd() { - QPtrListIterator<KPrObject> it( m_objects ); + TQPtrListIterator<KPrObject> it( m_objects ); for ( ; it.current() ; ++it ) it.current()->decCmdRef(); @@ -1736,9 +1736,9 @@ KPrRectValueCmd::~KPrRectValueCmd() } -void KPrRectValueCmd::addObjects( const QPtrList<KPrObject> &objects ) +void KPrRectValueCmd::addObjects( const TQPtrList<KPrObject> &objects ) { - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current(); ++it ) { if ( it.current()->getType() == OT_GROUP ) @@ -1773,7 +1773,7 @@ void KPrRectValueCmd::addObjects( const QPtrList<KPrObject> &objects ) void KPrRectValueCmd::execute() { - QPtrListIterator<KPrObject> it( m_objects ); + TQPtrListIterator<KPrObject> it( m_objects ); for ( ; it.current() ; ++it ) { KPrRectObject *obj = dynamic_cast<KPrRectObject*>( it.current() ); @@ -1795,7 +1795,7 @@ void KPrRectValueCmd::execute() obj->setRnds( xtmp, ytmp ); } } - m_doc->repaint( false ); + m_doc->tqrepaint( false ); m_doc->updateSideBarItem( m_page ); } @@ -1809,13 +1809,13 @@ void KPrRectValueCmd::unexecute() if( obj ) obj->setRnds( m_oldValues.at( i )->xRnd, m_oldValues.at( i )->yRnd ); } - m_doc->repaint( false ); + m_doc->tqrepaint( false ); m_doc->updateSideBarItem( m_page ); } -KPrResizeCmd::KPrResizeCmd( const QString &_name, const KoPoint &_m_diff, const KoSize &_r_diff, +KPrResizeCmd::KPrResizeCmd( const TQString &_name, const KoPoint &_m_diff, const KoSize &_r_diff, KPrObject *_object, KPrDocument *_doc ) : KNamedCommand( _name ), m_diff( _m_diff ), r_diff( _r_diff ) { @@ -1833,7 +1833,7 @@ KPrResizeCmd::~KPrResizeCmd() void KPrResizeCmd::execute() { - QRect oldRect; + TQRect oldRect; oldRect = doc->zoomHandler()->zoomRect( object->getRepaintRect() ); object->moveBy( m_diff ); @@ -1842,19 +1842,19 @@ void KPrResizeCmd::execute() { if(object->isSelected()) doc->updateRuler(); - doc->layout( object ); + doc->tqlayout( object ); } if ( object->isSelected()) doc->updateObjectStatusBarItem(); - doc->repaint( oldRect ); - doc->repaint( object ); + doc->tqrepaint( oldRect ); + doc->tqrepaint( object ); doc->updateSideBarItem( m_page ); } void KPrResizeCmd::unexecute() { - QRect oldRect; + TQRect oldRect; oldRect = doc->zoomHandler()->zoomRect( object->getRepaintRect() ); object->moveBy( -m_diff.x(), -m_diff.y() ); @@ -1863,20 +1863,20 @@ void KPrResizeCmd::unexecute() { if(object->isSelected()) doc->updateRuler(); - doc->layout( object ); + doc->tqlayout( object ); } if ( object->isSelected()) doc->updateObjectStatusBarItem(); - doc->repaint( oldRect ); - doc->repaint( object ); + doc->tqrepaint( oldRect ); + doc->tqrepaint( object ); doc->updateSideBarItem( m_page ); } KPrOasisPasteTextCommand::KPrOasisPasteTextCommand( KoTextDocument *d, int parag, int idx, - const QByteArray &data ) + const TQByteArray &data ) : KoTextDocCommand( d ), m_parag( parag ), m_idx( idx ), m_data( data ), m_oldParagLayout( 0 ) { } @@ -1895,8 +1895,8 @@ KoTextCursor * KPrOasisPasteTextCommand::execute( KoTextCursor *c ) c->setParag( firstParag ); c->setIndex( m_idx ); - QBuffer buffer( m_data ); - KoStore * store = KoStore::createStore( &buffer, KoStore::Read ); + TQBuffer buffer( m_data ); + KoStore * store = KoStore::createStore( TQT_TQIODEVICE(&buffer), KoStore::Read ); if ( store->bad() || !store->hasFile( "content.xml" ) ) { @@ -1908,8 +1908,8 @@ KoTextCursor * KPrOasisPasteTextCommand::execute( KoTextCursor *c ) store->disallowNameExpansion(); KoOasisStore oasisStore( store ); - QDomDocument contentDoc; - QString errorMessage; + TQDomDocument contentDoc; + TQString errorMessage; bool ok = oasisStore.loadAndParse( "content.xml", contentDoc, errorMessage ); if ( !ok ) { kdError(33001) << "Error parsing content.xml: " << errorMessage << endl; @@ -1917,20 +1917,20 @@ KoTextCursor * KPrOasisPasteTextCommand::execute( KoTextCursor *c ) } KoOasisStyles oasisStyles; - QDomDocument stylesDoc; + TQDomDocument stylesDoc; (void)oasisStore.loadAndParse( "styles.xml", stylesDoc, errorMessage ); // Load styles from style.xml oasisStyles.createStyleMap( stylesDoc, true ); // Also load styles from content.xml oasisStyles.createStyleMap( contentDoc, false ); - QDomElement content = contentDoc.documentElement(); + TQDomElement content = contentDoc.documentElement(); - QDomElement body ( KoDom::namedItemNS( content, KoXmlNS::office, "body" ) ); + TQDomElement body ( KoDom::namedItemNS( content, KoXmlNS::office, "body" ) ); // We then want to use whichever element is the child of <office:body>, // whether that's <office:text> or <office:presentation> or whatever. - QDomElement iter, realBody; + TQDomElement iter, realBody; forEachElement( iter, body ) { realBody = iter; } @@ -1988,7 +1988,7 @@ KoTextCursor * KPrOasisPasteTextCommand::unexecute( KoTextCursor *c ) } -KPrChangeStartingPageCommand::KPrChangeStartingPageCommand( const QString &name, KPrDocument *_doc, +KPrChangeStartingPageCommand::KPrChangeStartingPageCommand( const TQString &name, KPrDocument *_doc, int _oldStartingPage, int _newStartingPage): KNamedCommand(name), m_doc(_doc), @@ -2010,7 +2010,7 @@ void KPrChangeStartingPageCommand::unexecute() } -KPrChangeVariableSettingsCommand::KPrChangeVariableSettingsCommand( const QString &name, KPrDocument *_doc, +KPrChangeVariableSettingsCommand::KPrChangeVariableSettingsCommand( const TQString &name, KPrDocument *_doc, bool _oldValue, bool _newValue, VariableProperties _type): KNamedCommand(name), @@ -2054,7 +2054,7 @@ void KPrChangeVariableSettingsCommand::unexecute() changeValue(m_bOldValue); } -KPrDeletePageCmd::KPrDeletePageCmd( const QString &name, int pageNum, KPrDocument *doc ) +KPrDeletePageCmd::KPrDeletePageCmd( const TQString &name, int pageNum, KPrDocument *doc ) : KNamedCommand( name ) , m_doc( doc ) , m_pageNum( pageNum ) @@ -2069,18 +2069,18 @@ KPrDeletePageCmd::~KPrDeletePageCmd() void KPrDeletePageCmd::execute() { m_doc->deSelectAllObj(); - m_doc->takePage( m_page, QMAX( m_pageNum - 1, 0 ) ); + m_doc->takePage( m_page, TQMAX( m_pageNum - 1, 0 ) ); m_doc->updatePresentationButton(); } void KPrDeletePageCmd::unexecute() { m_doc->deSelectAllObj(); - m_doc->insertPage( m_page, QMAX( m_pageNum - 1, 0 ), m_pageNum ); + m_doc->insertPage( m_page, TQMAX( m_pageNum - 1, 0 ), m_pageNum ); m_doc->updatePresentationButton(); } -KPrInsertPageCmd::KPrInsertPageCmd( const QString &name, int pageNum, InsertPos pos, +KPrInsertPageCmd::KPrInsertPageCmd( const TQString &name, int pageNum, InsertPos pos, KPrPage *page, KPrDocument *doc ) : KNamedCommand(name) , m_doc( doc ) @@ -2118,7 +2118,7 @@ void KPrInsertPageCmd::unexecute() m_doc->updatePresentationButton(); } -KPrMovePageCmd::KPrMovePageCmd( const QString &_name,int from, int to, KPrDocument *_doc ) : +KPrMovePageCmd::KPrMovePageCmd( const TQString &_name,int from, int to, KPrDocument *_doc ) : KNamedCommand( _name ), m_doc( _doc ), m_oldPosition( from ), @@ -2143,9 +2143,9 @@ void KPrMovePageCmd::unexecute() } -KPrChangeTitlePageNameCommand::KPrChangeTitlePageNameCommand( const QString &_name,KPrDocument *_doc, - const QString &_oldPageName, - const QString &_newPageName, KPrPage *_page ) : +KPrChangeTitlePageNameCommand::KPrChangeTitlePageNameCommand( const TQString &_name,KPrDocument *_doc, + const TQString &_oldPageName, + const TQString &_newPageName, KPrPage *_page ) : KNamedCommand(_name), m_doc(_doc), oldPageName(_oldPageName), @@ -2168,8 +2168,8 @@ void KPrChangeTitlePageNameCommand::unexecute() m_doc->recalcVariables( VT_PGNUM ); } -KPrChangeCustomVariableValue::KPrChangeCustomVariableValue( const QString &name, KPrDocument *_doc, - const QString & _oldValue, const QString & _newValue, +KPrChangeCustomVariableValue::KPrChangeCustomVariableValue( const TQString &name, KPrDocument *_doc, + const TQString & _oldValue, const TQString & _newValue, KoCustomVariable *var): KNamedCommand(name), m_doc(_doc), @@ -2193,9 +2193,9 @@ void KPrChangeCustomVariableValue::unexecute() m_doc->recalcVariables( VT_CUSTOM ); } -KPrChangeLinkVariable::KPrChangeLinkVariable( const QString &name, KPrDocument *_doc, - const QString & _oldHref, const QString & _newHref, - const QString & _oldLink,const QString &_newLink, +KPrChangeLinkVariable::KPrChangeLinkVariable( const TQString &name, KPrDocument *_doc, + const TQString & _oldHref, const TQString & _newHref, + const TQString & _oldLink,const TQString &_newLink, KoLinkVariable *var): KNamedCommand(name), m_doc(_doc), @@ -2221,7 +2221,7 @@ void KPrChangeLinkVariable::unexecute() } -KPrNameObjectCommand::KPrNameObjectCommand( const QString &_name, const QString &_objectName, +KPrNameObjectCommand::KPrNameObjectCommand( const TQString &_name, const TQString &_objectName, KPrObject *_obj, KPrDocument *_doc ): KNamedCommand( _name ), newObjectName( _objectName ), @@ -2252,7 +2252,7 @@ void KPrNameObjectCommand::unexecute() doc->updateSideBarItem( m_page ); } -KPrDisplayObjectFromMasterPage::KPrDisplayObjectFromMasterPage(const QString &name, KPrDocument *_doc, KPrPage *_page, bool _newValue) +KPrDisplayObjectFromMasterPage::KPrDisplayObjectFromMasterPage(const TQString &name, KPrDocument *_doc, KPrPage *_page, bool _newValue) :KNamedCommand(name), m_doc( _doc ), m_page(_page), @@ -2273,7 +2273,7 @@ void KPrDisplayObjectFromMasterPage::unexecute() } -KPrDisplayBackgroundPage::KPrDisplayBackgroundPage(const QString &name, KPrDocument *_doc, KPrPage *_page, bool _newValue) +KPrDisplayBackgroundPage::KPrDisplayBackgroundPage(const TQString &name, KPrDocument *_doc, KPrPage *_page, bool _newValue) :KNamedCommand(name), m_doc( _doc ), m_page(_page), @@ -2294,7 +2294,7 @@ void KPrDisplayBackgroundPage::unexecute() } -KPrHideShowHeaderFooter::KPrHideShowHeaderFooter( const QString &name, KPrDocument *_doc, KPrPage *_page, +KPrHideShowHeaderFooter::KPrHideShowHeaderFooter( const TQString &name, KPrDocument *_doc, KPrPage *_page, bool _newValue, KPrTextObject *_textObject): KNamedCommand(name), m_doc( _doc ), @@ -2329,8 +2329,8 @@ void KPrHideShowHeaderFooter::unexecute() m_doc->updateSideBarItem( m_doc->masterPage() ); } -KPrFlipObjectCommand::KPrFlipObjectCommand( const QString &name, KPrDocument *_doc, - bool _horizontal, QPtrList<KPrObject> &_objects ): +KPrFlipObjectCommand::KPrFlipObjectCommand( const TQString &name, KPrDocument *_doc, + bool _horizontal, TQPtrList<KPrObject> &_objects ): KNamedCommand( name ), m_doc( _doc ), objects( _objects ), @@ -2340,14 +2340,14 @@ KPrFlipObjectCommand::KPrFlipObjectCommand( const QString &name, KPrDocument *_d m_page = m_doc->findPage( objects ); - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current() ; ++it ) it.current()->incCmdRef(); } KPrFlipObjectCommand::~KPrFlipObjectCommand() { - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current() ; ++it ) it.current()->decCmdRef(); } @@ -2364,18 +2364,18 @@ void KPrFlipObjectCommand::unexecute() void KPrFlipObjectCommand::flipObjects() { - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current() ; ++it ) { it.current()->flip( horizontal ); - m_doc->repaint( it.current() ); + m_doc->tqrepaint( it.current() ); } m_doc->updateSideBarItem( m_page ); } -KPrGeometryPropertiesCommand::KPrGeometryPropertiesCommand( const QString &name, QPtrList<KPrObject> &objects, +KPrGeometryPropertiesCommand::KPrGeometryPropertiesCommand( const TQString &name, TQPtrList<KPrObject> &objects, bool newValue, KgpType type,KPrDocument *_doc ) : KNamedCommand( name ) , m_objects( objects ) @@ -2383,7 +2383,7 @@ KPrGeometryPropertiesCommand::KPrGeometryPropertiesCommand( const QString &name, , m_type( type ) , m_doc( _doc ) { - QPtrListIterator<KPrObject> it( m_objects ); + TQPtrListIterator<KPrObject> it( m_objects ); for ( ; it.current() ; ++it ) { it.current()->incCmdRef(); @@ -2394,8 +2394,8 @@ KPrGeometryPropertiesCommand::KPrGeometryPropertiesCommand( const QString &name, } } -KPrGeometryPropertiesCommand::KPrGeometryPropertiesCommand( const QString &name, QValueList<bool> &lst, - QPtrList<KPrObject> &objects, bool newValue, +KPrGeometryPropertiesCommand::KPrGeometryPropertiesCommand( const TQString &name, TQValueList<bool> &lst, + TQPtrList<KPrObject> &objects, bool newValue, KgpType type, KPrDocument *_doc) : KNamedCommand( name ) , m_oldValue( lst ) @@ -2404,28 +2404,28 @@ KPrGeometryPropertiesCommand::KPrGeometryPropertiesCommand( const QString &name, , m_type( type ) , m_doc ( _doc ) { - QPtrListIterator<KPrObject> it( m_objects ); + TQPtrListIterator<KPrObject> it( m_objects ); for ( ; it.current() ; ++it ) it.current()->incCmdRef(); } KPrGeometryPropertiesCommand::~KPrGeometryPropertiesCommand() { - QPtrListIterator<KPrObject> it( m_objects ); + TQPtrListIterator<KPrObject> it( m_objects ); for ( ; it.current() ; ++it ) it.current()->decCmdRef(); } void KPrGeometryPropertiesCommand::execute() { - QPtrListIterator<KPrObject> it( m_objects ); + TQPtrListIterator<KPrObject> it( m_objects ); for ( ; it.current() ; ++it ) { if ( m_type == ProtectSize ) { it.current()->setProtect( m_newValue ); if ( it.current()->isSelected() ) - m_doc->repaint( it.current() ); + m_doc->tqrepaint( it.current() ); } else if ( m_type == KeepRatio) it.current()->setKeepRatio( m_newValue ); @@ -2441,14 +2441,14 @@ void KPrGeometryPropertiesCommand::unexecute() { obj->setProtect( *m_oldValue.at(i) ); if ( obj->isSelected() ) - m_doc->repaint( obj ); + m_doc->tqrepaint( obj ); } else if ( m_type == KeepRatio) obj->setKeepRatio( *m_oldValue.at(i) ); } } -KPrProtectContentCommand::KPrProtectContentCommand( const QString &name, QPtrList<KPrObject> &objects, +KPrProtectContentCommand::KPrProtectContentCommand( const TQString &name, TQPtrList<KPrObject> &objects, bool protectContent, KPrDocument *doc ) : KNamedCommand( name ) , m_protectContent( protectContent ) @@ -2459,7 +2459,7 @@ KPrProtectContentCommand::KPrProtectContentCommand( const QString &name, QPtrLis addObjects( objects ); } -KPrProtectContentCommand::KPrProtectContentCommand( const QString &name, bool protectContent, +KPrProtectContentCommand::KPrProtectContentCommand( const TQString &name, bool protectContent, KPrTextObject *obj, KPrDocument *doc ) : KNamedCommand( name ) , m_protectContent( protectContent ) @@ -2472,14 +2472,14 @@ KPrProtectContentCommand::KPrProtectContentCommand( const QString &name, bool pr KPrProtectContentCommand::~KPrProtectContentCommand() { - QPtrListIterator<KPrTextObject> it( m_objects ); + TQPtrListIterator<KPrTextObject> it( m_objects ); for ( ; it.current() ; ++it ) it.current()->decCmdRef(); } -void KPrProtectContentCommand::addObjects( const QPtrList<KPrObject> &objects ) +void KPrProtectContentCommand::addObjects( const TQPtrList<KPrObject> &objects ) { - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current(); ++it ) { if ( it.current()->getType() == OT_GROUP ) @@ -2506,7 +2506,7 @@ void KPrProtectContentCommand::addObjects( const QPtrList<KPrObject> &objects ) void KPrProtectContentCommand::execute() { - QPtrListIterator<KPrTextObject> it( m_objects ); + TQPtrListIterator<KPrTextObject> it( m_objects ); for ( ; it.current() ; ++it ) { it.current()->setProtectContent( m_protectContent ); @@ -2526,12 +2526,12 @@ void KPrProtectContentCommand::unexecute() m_doc->updateRulerInProtectContentMode(); } -KPrCloseObjectCommand::KPrCloseObjectCommand( const QString &name, QPtrList<KPrObject> objects, KPrDocument *doc ) +KPrCloseObjectCommand::KPrCloseObjectCommand( const TQString &name, TQPtrList<KPrObject> objects, KPrDocument *doc ) : KNamedCommand( name ) , m_doc( doc ) , m_page( doc->findPage( objects.at( 0 ) ) ) { - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current(); ++it ) { KPrPointObject * pointObject = dynamic_cast<KPrPointObject *>( *it ); @@ -2548,18 +2548,18 @@ KPrCloseObjectCommand::KPrCloseObjectCommand( const QString &name, QPtrList<KPrO KPrCloseObjectCommand::~KPrCloseObjectCommand() { - QPtrListIterator<KPrObject> it( m_openObjects ); + TQPtrListIterator<KPrObject> it( m_openObjects ); for ( ; it.current() ; ++it ) it.current()->decCmdRef(); - QPtrListIterator<KPrObject> it2( m_closedObjects ); + TQPtrListIterator<KPrObject> it2( m_closedObjects ); for ( ; it2.current() ; ++it2 ) it2.current()->decCmdRef(); } void KPrCloseObjectCommand::execute() { - QPtrListIterator<KPrObject> openIt( m_openObjects ); - QPtrListIterator<KPrObject> closeIt( m_closedObjects ); + TQPtrListIterator<KPrObject> openIt( m_openObjects ); + TQPtrListIterator<KPrObject> closeIt( m_closedObjects ); for ( ; openIt.current() ; ++openIt, ++closeIt ) { m_page->replaceObject( *openIt, *closeIt ); @@ -2568,15 +2568,15 @@ void KPrCloseObjectCommand::execute() ( *closeIt )->addToObjList(); ( *openIt )->setSelected( false ); ( *closeIt )->setSelected( selected ); - m_doc->repaint( *closeIt ); + m_doc->tqrepaint( *closeIt ); } m_doc->updateSideBarItem( m_page ); } void KPrCloseObjectCommand::unexecute() { - QPtrListIterator<KPrObject> openIt( m_openObjects ); - QPtrListIterator<KPrObject> closeIt( m_closedObjects ); + TQPtrListIterator<KPrObject> openIt( m_openObjects ); + TQPtrListIterator<KPrObject> closeIt( m_closedObjects ); for ( ; openIt.current() ; ++openIt, ++closeIt ) { m_page->replaceObject( *closeIt, *openIt ); @@ -2585,7 +2585,7 @@ void KPrCloseObjectCommand::unexecute() ( *openIt )->addToObjList(); ( *closeIt )->setSelected( false ); ( *openIt )->setSelected( selected ); - m_doc->repaint( *openIt ); + m_doc->tqrepaint( *openIt ); } m_doc->updateSideBarItem( m_page ); } @@ -2607,7 +2607,7 @@ MarginsStruct::MarginsStruct( double _left, double _top, double _right, double _ } -KPrChangeMarginCommand::KPrChangeMarginCommand( const QString &name, QPtrList<KPrObject> &objects, +KPrChangeMarginCommand::KPrChangeMarginCommand( const TQString &name, TQPtrList<KPrObject> &objects, MarginsStruct newMargins, KPrDocument *doc, KPrPage *page ) : KNamedCommand( name ) @@ -2624,7 +2624,7 @@ KPrChangeMarginCommand::KPrChangeMarginCommand( const QString &name, QPtrList<KP KPrChangeMarginCommand::~KPrChangeMarginCommand() { - QPtrListIterator<KPrTextObject> it( m_objects ); + TQPtrListIterator<KPrTextObject> it( m_objects ); for ( ; it.current() ; ++it ) it.current()->decCmdRef(); m_oldMargins.setAutoDelete( true ); @@ -2632,9 +2632,9 @@ KPrChangeMarginCommand::~KPrChangeMarginCommand() } -void KPrChangeMarginCommand::addObjects( const QPtrList<KPrObject> &objects ) +void KPrChangeMarginCommand::addObjects( const TQPtrList<KPrObject> &objects ) { - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current(); ++it ) { if ( it.current()->getType() == OT_GROUP ) @@ -2662,15 +2662,15 @@ void KPrChangeMarginCommand::addObjects( const QPtrList<KPrObject> &objects ) void KPrChangeMarginCommand::execute() { - QPtrListIterator<KPrTextObject> it( m_objects ); + TQPtrListIterator<KPrTextObject> it( m_objects ); for ( ; it.current() ; ++it ) { it.current()->setTextMargins( m_newMargins.leftMargin, m_newMargins.topMargin, m_newMargins.rightMargin, m_newMargins.bottomMargin); it.current()->resizeTextDocument(); - it.current()->layout(); + it.current()->tqlayout(); } - m_doc->repaint( false ); + m_doc->tqrepaint( false ); m_doc->updateSideBarItem( m_page ); } @@ -2684,15 +2684,15 @@ void KPrChangeMarginCommand::unexecute() object->setTextMargins( marginsStruct->leftMargin, marginsStruct->topMargin, marginsStruct->rightMargin, marginsStruct->bottomMargin); object->resizeTextDocument(); - object->layout(); + object->tqlayout(); } - m_doc->repaint( false ); + m_doc->tqrepaint( false ); m_doc->updateSideBarItem( m_page ); } -KPrChangeVerticalAlignmentCommand::KPrChangeVerticalAlignmentCommand( const QString &name, KPrTextObject *_obj, +KPrChangeVerticalAlignmentCommand::KPrChangeVerticalAlignmentCommand( const TQString &name, KPrTextObject *_obj, VerticalAlignmentType _oldAlign, VerticalAlignmentType _newAlign, KPrDocument *_doc) : @@ -2708,8 +2708,8 @@ KPrChangeVerticalAlignmentCommand::KPrChangeVerticalAlignmentCommand( const QStr void KPrChangeVerticalAlignmentCommand::execute() { m_obj->setVerticalAligment( m_newAlign ); - m_obj->kPresenterDocument()->layout(m_obj); - m_obj->kPresenterDocument()->repaint(m_obj); + m_obj->kPresenterDocument()->tqlayout(m_obj); + m_obj->kPresenterDocument()->tqrepaint(m_obj); m_doc->updateSideBarItem( m_page ); } @@ -2717,14 +2717,14 @@ void KPrChangeVerticalAlignmentCommand::execute() void KPrChangeVerticalAlignmentCommand::unexecute() { m_obj->setVerticalAligment( m_oldAlign ); - m_obj->kPresenterDocument()->layout(m_obj); - m_obj->kPresenterDocument()->repaint(m_obj); + m_obj->kPresenterDocument()->tqlayout(m_obj); + m_obj->kPresenterDocument()->tqrepaint(m_obj); m_doc->updateSideBarItem( m_page ); } -KPrChangeTabStopValueCommand::KPrChangeTabStopValueCommand( const QString &name, double _oldValue, double _newValue, +KPrChangeTabStopValueCommand::KPrChangeTabStopValueCommand( const TQString &name, double _oldValue, double _newValue, KPrDocument *_doc): KNamedCommand(name), m_doc( _doc ), @@ -2743,8 +2743,8 @@ void KPrChangeTabStopValueCommand::unexecute() m_doc->setTabStopValue ( m_oldValue ); } -KPrImageEffectCmd::KPrImageEffectCmd(const QString &_name, QPtrList<ImageEffectSettings> &_oldSettings, - ImageEffectSettings _newSettings, QPtrList<KPrObject> &_objects, +KPrImageEffectCmd::KPrImageEffectCmd(const TQString &_name, TQPtrList<ImageEffectSettings> &_oldSettings, + ImageEffectSettings _newSettings, TQPtrList<KPrObject> &_objects, KPrDocument *_doc ) :KNamedCommand( _name ), oldSettings( _oldSettings ), objects( _objects ) { @@ -2755,14 +2755,14 @@ KPrImageEffectCmd::KPrImageEffectCmd(const QString &_name, QPtrList<ImageEffectS m_page = doc->findPage( objects ); - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current() ; ++it ) it.current()->incCmdRef(); } KPrImageEffectCmd::~KPrImageEffectCmd() { - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current() ; ++it ) it.current()->decCmdRef(); oldSettings.setAutoDelete( true ); @@ -2771,7 +2771,7 @@ KPrImageEffectCmd::~KPrImageEffectCmd() void KPrImageEffectCmd::execute() { - QPtrListIterator<KPrObject> it( objects ); + TQPtrListIterator<KPrObject> it( objects ); for ( ; it.current() ; ++it ) { KPrPixmapObject * obj = dynamic_cast<KPrPixmapObject*>( it.current() ); if ( obj ) { @@ -2779,7 +2779,7 @@ void KPrImageEffectCmd::execute() obj->setIEParams(newSettings.param1, newSettings.param2, newSettings.param3); } } - doc->repaint( false ); + doc->tqrepaint( false ); doc->updateSideBarItem( m_page ); } @@ -2794,13 +2794,13 @@ void KPrImageEffectCmd::unexecute() oldSettings.at( i )->param3); } } - doc->repaint( false ); + doc->tqrepaint( false ); doc->updateSideBarItem( m_page ); } -KPrChangeVariableNoteText::KPrChangeVariableNoteText( const QString &name, KPrDocument *_doc, - const QString &_oldValue,const QString &_newValue, +KPrChangeVariableNoteText::KPrChangeVariableNoteText( const TQString &name, KPrDocument *_doc, + const TQString &_oldValue,const TQString &_newValue, KoNoteVariable *var): KNamedCommand(name), m_doc(_doc), |