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, 63 insertions, 63 deletions

diff --git a/kspread/kspread_object.h b/kspread/kspread_object.h
index dba2e90c..c111490e 100644
--- a/kspread/kspread_object.h
+++ b/kspread/kspread_object.h
@@ -108,13 +108,13 @@ enum AlignType {
 class EmbeddedObject
 {
   public:
-    EmbeddedObject( Sheet *_sheet, const KoRect& _geometry );
+    EmbeddedObject( Sheet *_sheet, const KoRect& _tqgeometry );
     virtual ~EmbeddedObject();
     virtual ObjType getType() const { return OBJECT_GENERAL; }
-    virtual QString getTypeString() const
-        { return QString(); }
+    virtual TQString getTypeString() const
+        { return TQString(); }
 
-    KoRect geometry();
+    KoRect tqgeometry();
     void setGeometry( const KoRect &rect );
     virtual void moveBy( const KoPoint &_point );
     virtual void moveBy( double _dx, double _dy );
@@ -126,9 +126,9 @@ class EmbeddedObject
     void setSelected(bool s) { m_selected = s; }
     bool isSelected() const { return m_selected; }
 
-    void setObjectName( const QString &_objectName )
+    void setObjectName( const TQString &_objectName )
         { m_objectName = _objectName; }
-    QString getObjectName() const
+    TQString getObjectName() const
         { return m_objectName; }
 
     virtual void setProtect( bool b ) { m_protect = b; }
@@ -156,11 +156,11 @@ class EmbeddedObject
           int &partIndexObj;
     };
 
-    virtual bool load( const QDomElement& element );
-    virtual void loadOasis(const QDomElement &element, KoOasisLoadingContext & context );
-    virtual QDomElement save( QDomDocument& doc );
+    virtual bool load( const TQDomElement& element );
+    virtual void loadOasis(const TQDomElement &element, KoOasisLoadingContext & context );
+    virtual TQDomElement save( TQDomDocument& doc );
     virtual bool saveOasisObject( KSpreadOasisSaveContext &sc ) const;
-    virtual void draw( QPainter *_painter );
+    virtual void draw( TQPainter *_painter );
     
     /**
      * Renders the embedded object to a pixmap and returns the result.  
@@ -169,21 +169,21 @@ class EmbeddedObject
      *
      * @param size Specifies the desired size of the returned pixmap.
      */
-    QPixmap toPixmap( QSize size );
+    TQPixmap toPixmap( TQSize size );
     
     /**
      * Renders the embedded object to a pixmap at 100% scale.  Equivalent to calling toPixmap( 1.0, 1.0 )
      */
-    QPixmap toPixmap();
+    TQPixmap toPixmap();
     
     /**
      * Renders the embedded object to a pixmap at the specified x and y scale and returns the result.  
      */
-    virtual QPixmap toPixmap( double xZoom , double yZoom );
+    virtual TQPixmap toPixmap( double xZoom , double yZoom );
     
     
-    void paintSelection( QPainter *_painter, SelectionMode selectionMode );
-    virtual QCursor getCursor( const QPoint &_point, ModifyType &_modType, QRect &geometry ) const;
+    void paintSelection( TQPainter *_painter, SelectionMode selectionMode );
+    virtual TQCursor getCursor( const TQPoint &_point, ModifyType &_modType, TQRect &tqgeometry ) const;
 
     virtual void removeFromObjList()
         { inObjList = false; }
@@ -195,7 +195,7 @@ class EmbeddedObject
         { cmds--; doDelete(); }
 
     //TEMP:
-    virtual QBrush getBrush() const { return m_brush.getBrush(); }
+    virtual TQBrush getBrush() const { return m_brush.getBrush(); }
 
 
   protected:
@@ -215,12 +215,12 @@ class EmbeddedObject
      * @param xZoom This will be set to the required X zoom factor
      * @param yZoom This will be set to the required Y zoom factor
      */
-    void calculateRequiredZoom( QSize desiredSize , double& xZoom, double& yZoom );
+    void calculateRequiredZoom( TQSize desiredSize , double& xZoom, double& yZoom );
     
-    KoRect m_geometry;
+    KoRect m_tqgeometry;
     Sheet *m_sheet;
     Canvas *m_canvas;
-    QString m_objectName;
+    TQString m_objectName;
     bool m_selected:1;
     bool m_protect:1;
     bool m_keepRatio:1;
@@ -238,25 +238,25 @@ class EmbeddedObject
 class EmbeddedKOfficeObject : public EmbeddedObject
 {
   public:
-    EmbeddedKOfficeObject( Doc *parent, Sheet *_sheet, KoDocument* doc, const KoRect& geometry );
-    EmbeddedKOfficeObject( Doc *parent, Sheet *_sheet );
+    EmbeddedKOfficeObject( Doc *tqparent, Sheet *_sheet, KoDocument* doc, const KoRect& tqgeometry );
+    EmbeddedKOfficeObject( Doc *tqparent, Sheet *_sheet );
     virtual ~EmbeddedKOfficeObject();
     virtual ObjType getType() const { return OBJECT_KOFFICE_PART; }
-    virtual QString getTypeString() const
+    virtual TQString getTypeString() const
         { return i18n("Embedded Object"); }
 
-    Doc* parent();
+    Doc* tqparent();
     KoDocumentChild *embeddedObject();
 
-    bool load( const QDomElement& element );
-    virtual void loadOasis(const QDomElement &element, KoOasisLoadingContext & context );
-    QDomElement save( QDomDocument& doc );
-    virtual void draw( QPainter *_painter );
+    bool load( const TQDomElement& element );
+    virtual void loadOasis(const TQDomElement &element, KoOasisLoadingContext & context );
+    TQDomElement save( TQDomDocument& doc );
+    virtual void draw( TQPainter *_painter );
 
     /**
      * See EmbeddedObject::toPixmap(double,double)
      */
-    virtual QPixmap toPixmap(double xZoom , double yZoom);
+    virtual TQPixmap toPixmap(double xZoom , double yZoom);
     
     void activate( View *_view, Canvas *_canvas );
     void deactivate();
@@ -281,16 +281,16 @@ class EmbeddedChart : public EmbeddedKOfficeObject
     EmbeddedChart( Doc *_spread, Sheet *_sheet );
     virtual ~EmbeddedChart();
     virtual ObjType getType() const { return OBJECT_CHART; }
-    virtual QString getTypeString() const
+    virtual TQString getTypeString() const
         { return i18n("Chart"); }
 
-    void setDataArea( const QRect& _data );
+    void setDataArea( const TQRect& _data );
     void update();
 
-    bool load( const QDomElement& element );
-    virtual void loadOasis(const QDomElement &element, KoOasisLoadingContext & context );
-    QDomElement save( QDomDocument& doc );
-    virtual void draw( QPainter *_painter );
+    bool load( const TQDomElement& element );
+    virtual void loadOasis(const TQDomElement &element, KoOasisLoadingContext & context );
+    TQDomElement save( TQDomDocument& doc );
+    virtual void draw( TQPainter *_painter );
 
 /**
      * @reimp
@@ -314,51 +314,51 @@ class EmbeddedChart : public EmbeddedKOfficeObject
 class EmbeddedPictureObject : public EmbeddedObject
 {
   public:
-    EmbeddedPictureObject(Sheet *_sheet, const KoRect& _geometry, KoPictureCollection *_imageCollection );
-    EmbeddedPictureObject(Sheet *_sheet, const KoRect& _geometry, KoPictureCollection *_imageCollection, const KoPictureKey & key );
+    EmbeddedPictureObject(Sheet *_sheet, const KoRect& _tqgeometry, KoPictureCollection *_imageCollection );
+    EmbeddedPictureObject(Sheet *_sheet, const KoRect& _tqgeometry, KoPictureCollection *_imageCollection, const KoPictureKey & key );
     EmbeddedPictureObject( Sheet *_sheet, KoPictureCollection *_imageCollection );
     virtual ~EmbeddedPictureObject();
     EmbeddedPictureObject &operator=( const EmbeddedPictureObject & );
 
     virtual ObjType getType() const { return OBJECT_PICTURE; }
-    virtual QString getTypeString() const
+    virtual TQString getTypeString() const
         { return i18n("Picture"); }
-    bool load( const QDomElement& element );
-    virtual void loadOasis(const QDomElement &element, KoOasisLoadingContext & context );
-    QDomElement save( QDomDocument& doc );
-    virtual void draw( QPainter *_painter );
+    bool load( const TQDomElement& element );
+    virtual void loadOasis(const TQDomElement &element, KoOasisLoadingContext & context );
+    TQDomElement save( TQDomDocument& doc );
+    virtual void draw( TQPainter *_painter );
     
     /**
      * See EmbeddedObject::toPixmap(double,double)
      */
-    virtual QPixmap toPixmap(double xZoom , double yZoom);
+    virtual TQPixmap toPixmap(double xZoom , double yZoom);
 
         /**
      * Only used as a default value in the filedialog, in changePicture
      * \warning Do not use for anything else
          */
-    QString getFileName() const
+    TQString getFileName() const
     { return image.getKey().filename(); }
 
     KoPictureKey getKey() const
     { return image.getKey(); }
 
-    QSize originalSize() const
+    TQSize originalSize() const
     { return image.getOriginalSize(); }
 
     void setPicture( const KoPictureKey & key );
 
     void reload( void );
 
-    //virtual QDomDocumentFragment save( QDomDocument& doc, double offset );
+    //virtual TQDomDocumentFragment save( TQDomDocument& doc, double offset );
 
-    //virtual double load(const QDomElement &element);
-    //virtual void loadOasis(const QDomElement &element, KoOasisLoadingContext & context, KPRLoadingInfo *info);
+    //virtual double load(const TQDomElement &element);
+    //virtual void loadOasis(const TQDomElement &element, KoOasisLoadingContext & context, KPRLoadingInfo *info);
 
-//     virtual void draw( QPainter *_painter, KoZoomHandler*_zoomHandler,
+//     virtual void draw( TQPainter *_painter, KoZoomHandler*_zoomHandler,
 //                        int /* page */, SelectionMode selectionMode, bool drawContour = FALSE );
 
-    QPixmap getOriginalPixmap();
+    TQPixmap getOriginalPixmap();
     PictureMirrorType getPictureMirrorType() const { return mirrorType; }
     int getPictureDepth() const { return depth; }
     bool getPictureSwapRGB() const { return swapRGB; }
@@ -366,11 +366,11 @@ class EmbeddedPictureObject : public EmbeddedObject
     int getPictureBright() const { return bright; }
 
     ImageEffect getImageEffect() const {return m_effect;}
-    QVariant getIEParam1() const {return m_ie_par1;}
-    QVariant getIEParam2() const {return m_ie_par2;}
-    QVariant getIEParam3() const {return m_ie_par3;}
+    TQVariant getIEParam1() const {return m_ie_par1;}
+    TQVariant getIEParam2() const {return m_ie_par2;}
+    TQVariant getIEParam3() const {return m_ie_par3;}
     void setImageEffect(ImageEffect eff) { m_effect = eff; }
-    void setIEParams(QVariant p1, QVariant p2, QVariant p3) {
+    void setIEParams(TQVariant p1, TQVariant p2, TQVariant p3) {
       m_ie_par1=p1;
       m_ie_par2=p2;
       m_ie_par3=p3;
@@ -384,7 +384,7 @@ class EmbeddedPictureObject : public EmbeddedObject
 
     KoPicture picture() const { return image;}
 
-    void loadPicture( const QString & fileName );
+    void loadPicture( const TQString & fileName );
 
     virtual void flip(bool horizontal );
 
@@ -392,7 +392,7 @@ class EmbeddedPictureObject : public EmbeddedObject
     virtual const char * getOasisElementName() const;
     virtual bool saveOasisObjectAttributes( KSpreadOasisSaveContext &sc ) const;
 
-    QPixmap changePictureSettings( QPixmap _tmpPixmap );
+    TQPixmap changePictureSettings( TQPixmap _tmpPixmap );
     virtual void saveOasisPictureElement( KoGenStyle &styleobjectauto ) const;
     void loadOasisPictureEffect(KoOasisLoadingContext & context );
     virtual void fillStyle( KoGenStyle& styleObjectAuto, KoGenStyles& mainStyles ) const;
@@ -401,10 +401,10 @@ class EmbeddedPictureObject : public EmbeddedObject
      * @internal
      * Draws the shadow
      */
-    void drawShadow( QPainter* _painter,  KoZoomHandler* _zoomHandler);
+    void drawShadow( TQPainter* _painter,  KoZoomHandler* _zoomHandler);
 
-    QPixmap generatePixmap(KoZoomHandler*_zoomHandler);
-    QString convertValueToPercent( int val ) const;
+    TQPixmap generatePixmap(KoZoomHandler*_zoomHandler);
+    TQString convertValueToPercent( int val ) const;
 
     KoPictureCollection *imageCollection;
     KoPicture image;
@@ -417,12 +417,12 @@ class EmbeddedPictureObject : public EmbeddedObject
 
     //image effect and its params
     ImageEffect m_effect, m_cachedEffect;
-    QVariant m_ie_par1, m_cachedPar1;
-    QVariant m_ie_par2, m_cachedPar2;
-    QVariant m_ie_par3, m_cachedPar3;
+    TQVariant m_ie_par1, m_cachedPar1;
+    TQVariant m_ie_par2, m_cachedPar2;
+    TQVariant m_ie_par3, m_cachedPar3;
 
-    QPixmap m_cachedPixmap;
-    QRect m_cachedRect;
+    TQPixmap m_cachedPixmap;
+    TQRect m_cachedRect;
 };
 
  } // namespace KSpread