TQt4 port koffice

This should enable compilation under both Qt3 and Qt4; fixes for any missed components will be forthcoming


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1238284 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 55 insertions, 55 deletions

diff --git a/kpresenter/KPrGroupObject.cpp b/kpresenter/KPrGroupObject.cpp
index 5a21aaed..867155fe 100644
--- a/kpresenter/KPrGroupObject.cpp
+++ b/kpresenter/KPrGroupObject.cpp
@@ -37,16 +37,16 @@
 #include <kdebug.h>
 #include <KoOasisContext.h>
 
-#include <qpainter.h>
+#include <tqpainter.h>
 using namespace std;
 
 KPrGroupObject::KPrGroupObject()
-    : KPrObject(), objects( QPtrList<KPrObject>() ), updateObjs( false )
+    : KPrObject(), objects( TQPtrList<KPrObject>() ), updateObjs( false )
 {
     objects.setAutoDelete( false );
 }
 
-KPrGroupObject::KPrGroupObject( const QPtrList<KPrObject> &objs )
+KPrGroupObject::KPrGroupObject( const TQPtrList<KPrObject> &objs )
     : KPrObject(), objects( objs ), updateObjs( false )
 {
     objects.setAutoDelete( false );
@@ -59,14 +59,14 @@ KPrGroupObject &KPrGroupObject::operator=( const KPrGroupObject & )
 
 void KPrGroupObject::selectAllObj()
 {
-    QPtrListIterator<KPrObject> it( objects );
+    TQPtrListIterator<KPrObject> it( objects );
     for ( ; it.current() ; ++it )
         it.current()->setSelected(true);
 }
 
 void KPrGroupObject::deSelectAllObj()
 {
-    QPtrListIterator<KPrObject> it( objects );
+    TQPtrListIterator<KPrObject> it( objects );
     for ( ; it.current() ; ++it )
         it.current()->setSelected(false);
 }
@@ -113,17 +113,17 @@ void KPrGroupObject::moveBy( double _dx, double _dy )
     updateCoords( _dx, _dy );
 }
 
-QDomDocumentFragment KPrGroupObject::save( QDomDocument& doc, double offset )
+TQDomDocumentFragment KPrGroupObject::save( TQDomDocument& doc, double offset )
 {
-    QDomDocumentFragment fragment=KPrObject::save(doc, offset);
-    QDomElement objs=doc.createElement("OBJECTS");
+    TQDomDocumentFragment fragment=KPrObject::save(doc, offset);
+    TQDomElement objs=doc.createElement("OBJECTS");
     fragment.appendChild(objs);
-    QPtrListIterator<KPrObject> it( objects );
+    TQPtrListIterator<KPrObject> it( objects );
     for ( ; it.current() ; ++it )
     {
         if ( it.current()->getType() == OT_PART )
             continue;
-        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,offset ));
         objs.appendChild(object);
@@ -134,7 +134,7 @@ QDomDocumentFragment KPrGroupObject::save( QDomDocument& doc, double offset )
 
 bool KPrGroupObject::saveOasisObjectAttributes( KPOasisSaveContext &sc ) const
 {
-    QPtrListIterator<KPrObject> it( objects );
+    TQPtrListIterator<KPrObject> it( objects );
     for ( ; it.current() ; ++it )
     {
         //TODO what to do with parts?
@@ -145,7 +145,7 @@ bool KPrGroupObject::saveOasisObjectAttributes( KPOasisSaveContext &sc ) const
 
 void KPrGroupObject::saveOasisPosObject( KoXmlWriter &xmlWriter, int indexObj ) const
 {
-    xmlWriter.addAttribute( "draw:id", "object" + QString::number( indexObj ) );
+    xmlWriter.addAttribute( "draw:id", "object" + TQString::number( indexObj ) );
 }
 
 
@@ -155,12 +155,12 @@ const char * KPrGroupObject::getOasisElementName() const
 }
 
 
-void KPrGroupObject::loadOasisGroupObject( KPrDocument *_doc, KPrPage * newpage, QDomNode &element, KoOasisContext & context, KPrLoadingInfo */*info*/ )
+void KPrGroupObject::loadOasisGroupObject( KPrDocument *_doc, KPrPage * newpage, TQDomNode &element, KoOasisContext & context, KPrLoadingInfo */*info*/ )
 {
     //KPrObject::loadOasis( element, context, info );
     updateObjs = false;
     _doc->loadOasisObject( newpage,element, context, this);
-    QPtrListIterator<KPrObject> it( objects );
+    TQPtrListIterator<KPrObject> it( objects );
     KoRect r=KoRect();
     for ( ; it.current() ; ++it )
     {
@@ -177,14 +177,14 @@ void KPrGroupObject::addObjects( KPrObject * obj )
     objects.append( obj );
 }
 
-double KPrGroupObject::load( const QDomElement &element, KPrDocument *doc)
+double KPrGroupObject::load( const TQDomElement &element, KPrDocument *doc)
 {
     //FIXME
     double offset=KPrObject::load(element);
     updateObjs = false;
-    QDomElement group=element.namedItem("OBJECTS").toElement();
+    TQDomElement group=element.namedItem("OBJECTS").toElement();
     if(!group.isNull()) {
-        QDomElement current=group.firstChild().toElement();
+        TQDomElement current=group.firstChild().toElement();
         while(!current.isNull()) {
             ObjType t = OT_LINE;
             if(current.tagName()=="OBJECT") {
@@ -248,7 +248,7 @@ double KPrGroupObject::load( const QDomElement &element, KPrDocument *doc)
                     kppolylineobject->setOrig(kppolylineobject->getOrig().x(),objOffset - offset);
                     objects.append( kppolylineobject );
                 } break;
-                case OT_QUADRICBEZIERCURVE: {
+                case OT_TQUADRICBEZIERCURVE: {
                     KPrQuadricBezierCurveObject *kpQuadricBezierCurveObject = new KPrQuadricBezierCurveObject();
                     objOffset = kpQuadricBezierCurveObject->load( current );
                     kpQuadricBezierCurveObject->setOrig(kpQuadricBezierCurveObject->getOrig().x(),objOffset - offset);
@@ -288,10 +288,10 @@ double KPrGroupObject::load( const QDomElement &element, KPrDocument *doc)
     return offset;
 }
 
-void KPrGroupObject::draw( QPainter *_painter,KoTextZoomHandler *_zoomhandler,
+void KPrGroupObject::draw( TQPainter *_painter,KoTextZoomHandler *_zoomhandler,
                           int pageNum, SelectionMode selectionMode, bool drawContour )
 {
-    QPtrListIterator<KPrObject> it( objects );
+    TQPtrListIterator<KPrObject> it( objects );
     for ( ; it.current() ; ++it )
         it.current()->draw( _painter, _zoomhandler, pageNum, selectionMode, drawContour );
 
@@ -303,7 +303,7 @@ void KPrGroupObject::updateSizes( double fx, double fy )
     if ( !updateObjs )
         return;
     KoRect r = KoRect();
-    QPtrListIterator<KPrObject> it( objects );
+    TQPtrListIterator<KPrObject> it( objects );
     for ( ; it.current() ; ++it )
     {
         double _x = ( it.current()->getOrig().x() - orig.x() ) * fx + orig.x();
@@ -320,7 +320,7 @@ void KPrGroupObject::updateCoords( double dx, double dy )
 {
     if ( !updateObjs )
         return;
-    QPtrListIterator<KPrObject> it( objects );
+    TQPtrListIterator<KPrObject> it( objects );
     for ( ; it.current() ; ++it )
         it.current()->moveBy( dx, dy );
 }
@@ -339,7 +339,7 @@ void KPrGroupObject::rotate( float _angle )
 
     if ( !updateObjs )
         return;
-    QPtrListIterator<KPrObject> it( objects );
+    TQPtrListIterator<KPrObject> it( objects );
     for ( ; it.current() ; ++it ) {
         // find distance of object center to group center
         double px = it.current()->getOrig().x() + it.current()->getSize().width() / 2.0 - centerx;
@@ -358,13 +358,13 @@ void KPrGroupObject::rotate( float _angle )
     }
 }
 
-void KPrGroupObject::setShadowParameter( int _distance, ShadowDirection _direction, const QColor &_color )
+void KPrGroupObject::setShadowParameter( int _distance, ShadowDirection _direction, const TQColor &_color )
 {
     KPrObject::setShadowParameter( _distance, _direction, _color );
 
     if ( !updateObjs )
         return;
-    QPtrListIterator<KPrObject> it( objects );
+    TQPtrListIterator<KPrObject> it( objects );
     for ( ; it.current() ; ++it )
         it.current()->setShadowParameter( _distance, _direction, _color );
 }
@@ -375,7 +375,7 @@ void KPrGroupObject::setShadowDistance( int _distance )
 
     if ( !updateObjs )
         return;
-    QPtrListIterator<KPrObject> it( objects );
+    TQPtrListIterator<KPrObject> it( objects );
     for ( ; it.current() ; ++it )
         it.current()->setShadowDistance( _distance );
 }
@@ -386,18 +386,18 @@ void KPrGroupObject::setShadowDirection( ShadowDirection _direction )
 
     if ( !updateObjs )
         return;
-    QPtrListIterator<KPrObject> it( objects );
+    TQPtrListIterator<KPrObject> it( objects );
     for ( ; it.current() ; ++it )
         it.current()->setShadowDirection( _direction );
 }
 
-void KPrGroupObject::setShadowColor( const QColor &_color )
+void KPrGroupObject::setShadowColor( const TQColor &_color )
 {
     KPrObject::setShadowColor( _color );
     kdDebug(33001) << "KPrGroupObject::setShadowColor"<<updateObjs << endl;
     if ( !updateObjs )
         return;
-    QPtrListIterator<KPrObject> it( objects );
+    TQPtrListIterator<KPrObject> it( objects );
     for ( ; it.current() ; ++it )
         it.current()->setShadowColor( _color );
 }
@@ -408,7 +408,7 @@ void KPrGroupObject::setEffect( Effect _effect )
 
     if ( !updateObjs )
         return;
-    QPtrListIterator<KPrObject> it( objects );
+    TQPtrListIterator<KPrObject> it( objects );
     for ( ; it.current() ; ++it )
         it.current()->setEffect( _effect );
 }
@@ -419,7 +419,7 @@ void KPrGroupObject::setEffect2( Effect2 _effect2 )
 
     if ( !updateObjs )
         return;
-    QPtrListIterator<KPrObject> it( objects );
+    TQPtrListIterator<KPrObject> it( objects );
     for ( ; it.current() ; ++it )
         it.current()->setEffect2( _effect2 );
 }
@@ -430,7 +430,7 @@ void KPrGroupObject::setAppearStep( int _appearStep )
 
     if ( !updateObjs )
         return;
-    QPtrListIterator<KPrObject> it( objects );
+    TQPtrListIterator<KPrObject> it( objects );
     for ( ; it.current() ; ++it )
         it.current()->setAppearStep( _appearStep );
 }
@@ -441,7 +441,7 @@ void KPrGroupObject::setDisappear( bool b )
 
     if ( !updateObjs )
         return;
-    QPtrListIterator<KPrObject> it( objects );
+    TQPtrListIterator<KPrObject> it( objects );
     for ( ; it.current() ; ++it )
         it.current()->setDisappear( b );
 }
@@ -452,7 +452,7 @@ void KPrGroupObject::setDisappearStep( int _disappearStep )
 
     if ( !updateObjs )
         return;
-    QPtrListIterator<KPrObject> it( objects );
+    TQPtrListIterator<KPrObject> it( objects );
     for ( ; it.current() ; ++it )
         it.current()->setDisappearStep( _disappearStep );
 }
@@ -463,7 +463,7 @@ void KPrGroupObject::setEffect3( Effect3 _effect3)
 
     if ( !updateObjs )
         return;
-    QPtrListIterator<KPrObject> it( objects );
+    TQPtrListIterator<KPrObject> it( objects );
     for ( ; it.current() ; ++it )
         it.current()->setEffect3( _effect3 );
 }
@@ -474,7 +474,7 @@ void KPrGroupObject::setAppearTimer( int _appearTimer )
 
     if ( !updateObjs )
         return;
-    QPtrListIterator<KPrObject> it( objects );
+    TQPtrListIterator<KPrObject> it( objects );
     for ( ; it.current() ; ++it )
         it.current()->setAppearTimer( _appearTimer );
 }
@@ -485,7 +485,7 @@ void KPrGroupObject::setDisappearTimer( int _disappearTimer )
 
     if ( !updateObjs )
         return;
-    QPtrListIterator<KPrObject> it( objects );
+    TQPtrListIterator<KPrObject> it( objects );
     for ( ; it.current() ; ++it )
         it.current()->setDisappearTimer( _disappearTimer );
 }
@@ -496,7 +496,7 @@ void KPrGroupObject::setOwnClipping( bool _ownClipping )
 
     if ( !updateObjs )
         return;
-    QPtrListIterator<KPrObject> it( objects );
+    TQPtrListIterator<KPrObject> it( objects );
     for ( ; it.current() ; ++it )
         it.current()->setOwnClipping( _ownClipping );
 }
@@ -507,7 +507,7 @@ void KPrGroupObject::setSubPresStep( int _subPresStep )
 
     if ( !updateObjs )
         return;
-    QPtrListIterator<KPrObject> it( objects );
+    TQPtrListIterator<KPrObject> it( objects );
     for ( ; it.current() ; ++it )
         it.current()->setSubPresStep( _subPresStep );
 }
@@ -518,7 +518,7 @@ void KPrGroupObject::doSpecificEffects( bool _specEffects, bool _onlyCurrStep )
 
     if ( !updateObjs )
         return;
-    QPtrListIterator<KPrObject> it( objects );
+    TQPtrListIterator<KPrObject> it( objects );
     for ( ; it.current() ; ++it )
         it.current()->doSpecificEffects( _specEffects, _onlyCurrStep );
 }
@@ -529,7 +529,7 @@ void KPrGroupObject::setAppearSoundEffect( bool b )
 
     if ( !updateObjs )
         return;
-    QPtrListIterator<KPrObject> it( objects );
+    TQPtrListIterator<KPrObject> it( objects );
     for ( ; it.current() ; ++it )
         it.current()->setAppearSoundEffect( b );
 }
@@ -540,52 +540,52 @@ void KPrGroupObject::setDisappearSoundEffect( bool b )
 
     if ( !updateObjs )
         return;
-    QPtrListIterator<KPrObject> it( objects);
+    TQPtrListIterator<KPrObject> it( objects);
     for ( ; it.current() ; ++it )
         it.current()->setDisappearSoundEffect( b );
 }
 
-void KPrGroupObject::setAppearSoundEffectFileName( const QString &_a_fileName )
+void KPrGroupObject::setAppearSoundEffectFileName( const TQString &_a_fileName )
 {
     KPrObject::setAppearSoundEffectFileName( _a_fileName );
 
     if ( !updateObjs )
         return;
-    QPtrListIterator<KPrObject> it( objects);
+    TQPtrListIterator<KPrObject> it( objects);
     for ( ; it.current() ; ++it )
         it.current()->setAppearSoundEffectFileName( _a_fileName );
 }
 
-void KPrGroupObject::setDisappearSoundEffectFileName( const QString &_d_fileName )
+void KPrGroupObject::setDisappearSoundEffectFileName( const TQString &_d_fileName )
 {
     KPrObject::setDisappearSoundEffectFileName( _d_fileName );
 
     if ( !updateObjs )
         return;
-    QPtrListIterator<KPrObject> it( objects);
+    TQPtrListIterator<KPrObject> it( objects);
     for ( ; it.current() ; ++it )
         it.current()->setDisappearSoundEffectFileName( _d_fileName );
 }
 
-void KPrGroupObject::getAllObjectSelectedList(QPtrList<KPrObject> &lst,bool force )
+void KPrGroupObject::getAllObjectSelectedList(TQPtrList<KPrObject> &lst,bool force )
 {
     if ( selected || force)
     {
-        QPtrListIterator<KPrObject> it( objects);
+        TQPtrListIterator<KPrObject> it( objects);
         for ( ; it.current() ; ++it )
             it.current()->getAllObjectSelectedList( lst, true );
     }
 }
 
-void KPrGroupObject::addTextObjects( QPtrList<KoTextObject> &lst ) const
+void KPrGroupObject::addTextObjects( TQPtrList<KoTextObject> &lst ) const
 {
-    QPtrListIterator<KPrObject> it( objects);
+    TQPtrListIterator<KPrObject> it( objects);
     for ( ; it.current() ; ++it )
         it.current()->addTextObjects( lst );
 }
 
 void KPrGroupObject::flip( bool horizontal ) {
-    QPtrListIterator<KPrObject> it( objects );
+    TQPtrListIterator<KPrObject> it( objects );
     for ( ; it.current() ; ++it ) {
         it.current()->flip( horizontal );
         double mx = 0;
@@ -609,7 +609,7 @@ void KPrGroupObject::flip( bool horizontal ) {
 void KPrGroupObject::removeFromObjList()
 {
     inObjList = false; 
-    QPtrListIterator<KPrObject> it( objects );
+    TQPtrListIterator<KPrObject> it( objects );
     for ( ; it.current() ; ++it ) 
         it.current()->removeFromObjList();
 }
@@ -617,14 +617,14 @@ void KPrGroupObject::removeFromObjList()
 void KPrGroupObject::addToObjList()
 { 
     inObjList = true; 
-    QPtrListIterator<KPrObject> it( objects );
+    TQPtrListIterator<KPrObject> it( objects );
     for ( ; it.current() ; ++it ) 
         it.current()->addToObjList();
 }
 
 void KPrGroupObject::incCmdRef()
 { 
-    QPtrListIterator<KPrObject> it( objects );
+    TQPtrListIterator<KPrObject> it( objects );
     for ( ; it.current() ; ++it ) 
         it.current()->incCmdRef();
 
@@ -633,7 +633,7 @@ void KPrGroupObject::incCmdRef()
 
 void KPrGroupObject::decCmdRef()
 { 
-    QPtrListIterator<KPrObject> it( objects );
+    TQPtrListIterator<KPrObject> it( objects );
     for ( ; it.current() ; ++it ) 
         it.current()->decCmdRef();