1 files changed, 7 insertions, 7 deletions
diff --git a/kspread/kspread_object.h b/kspread/kspread_object.h
index b66d67ac..46074109 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 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 );
@@ -183,7 +183,7 @@ class EmbeddedObject
     
     
     void paintSelection( TQPainter *_painter, SelectionMode selectionMode );
-    virtual TQCursor getCursor( const TQPoint &_point, ModifyType &_modType, TQRect &geometry ) const;
+    virtual TQCursor getCursor( const TQPoint &_point, ModifyType &_modType, TQRect &tqgeometry ) const;
 
     virtual void removeFromObjList()
         { inObjList = false; }
@@ -217,7 +217,7 @@ class EmbeddedObject
      */
     void calculateRequiredZoom( TQSize desiredSize , double& xZoom, double& yZoom );
     
-    KoRect m_geometry;
+    KoRect m_tqgeometry;
     Sheet *m_sheet;
     Canvas *m_canvas;
     TQString m_objectName;
@@ -238,7 +238,7 @@ class EmbeddedObject
 class EmbeddedKOfficeObject : public EmbeddedObject
 {
   public:
-    EmbeddedKOfficeObject( Doc *parent, Sheet *_sheet, KoDocument* doc, const KoRect& geometry );
+    EmbeddedKOfficeObject( Doc *parent, Sheet *_sheet, KoDocument* doc, const KoRect& tqgeometry );
     EmbeddedKOfficeObject( Doc *parent, Sheet *_sheet );
     virtual ~EmbeddedKOfficeObject();
     virtual ObjType getType() const { return OBJECT_KOFFICE_PART; }
@@ -314,8 +314,8 @@ 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 & );