1 files changed, 20 insertions, 20 deletions

diff --git a/kword/KWFrame.h b/kword/KWFrame.h
index 37a3ff256..531c6f380 100644
--- a/kword/KWFrame.h
+++ b/kword/KWFrame.h
@@ -24,9 +24,9 @@
 
 #include "defs.h"
 #include <KoRect.h>
-#include <qbrush.h>
+#include <tqbrush.h>
 #include "KoBorder.h"
-#include <qptrlist.h>
+#include <tqptrlist.h>
 
 class KWCanvas;
 class KWDocument;
@@ -41,21 +41,21 @@ class KoOasisContext;
 class KoStyleStack;
 class KoXmlWriter;
 
-class QDomElement;
+class TQDomElement;
 
 /**
  * small utility class representing a sortable (by z-order) list of frames
  * you can use sort() and inSort(item)
  *
- * Deprecated, use QValueVector<KWFrame*> from now on, and sort it with
+ * Deprecated, use TQValueVector<KWFrame*> from now on, and sort it with
  * std::sort(frames.begin(),frames.end(),KWFrame::compareFrameZOrder);
  *
- * With Qt4 we'll be able to use qSort for lists.
+ * With TQt4 we'll be able to use qSort for lists.
  */
-class ZOrderedFrameList : public QPtrList<KWFrame>
+class ZOrderedFrameList : public TQPtrList<KWFrame>
 {
 protected:
-    virtual int compareItems(QPtrCollection::Item a, QPtrCollection::Item b);
+    virtual int compareItems(TQPtrCollection::Item a, TQPtrCollection::Item b);
 };
 
 
@@ -82,7 +82,7 @@ public:
 
     /**
      * Constructor
-     * @param fs parent frameset
+     * @param fs tqparent frameset
      * @param left, top, width, height coordinates of the frame
      * The page number will be automatically determined from the position of the frame.
      * @param ra the "runaround" setting, i.e. whether text should flow below the frame,
@@ -183,7 +183,7 @@ public:
     /** Return the _zoomed_ rectangle for this frame, including the border - for drawing
      * @param viewMode needed to know if borders are visible or not
      */
-    QRect outerRect( KWViewMode* viewMode ) const;
+    TQRect outerRect( KWViewMode* viewMode ) const;
 
     /** Return the unzoomed rectangle, including the border, for the frames-on-top list.
      * The default border of size 1-pixel that is drawn on screen is _not_ included here
@@ -208,9 +208,9 @@ public:
     void frameBordersChanged();
     void updateRulerHandles();
 
-    QBrush backgroundColor() const { return m_backgroundColor; }
-    void setBackgroundColor( const QBrush &_color );
-    bool isTransparent() const { return m_backgroundColor.style() != Qt::SolidPattern; }
+    TQBrush backgroundColor() const { return m_backgroundColor; }
+    void setBackgroundColor( const TQBrush &_color );
+    bool isTransparent() const { return m_backgroundColor.style() != TQt::SolidPattern; }
 
     KoRect innerRect() const;
 
@@ -221,7 +221,7 @@ public:
     /** The "internal Y" is the offset (in pt) of the real frame showed in this one
      * ("real" means "the last that isn't a copy")
      * This offset in pt is the sum of the height of the frames before that one.
-     * For text frames, this is equivalent to the layout units (after multiplication). */
+     * For text frames, this is equivalent to the tqlayout units (after multiplication). */
     void setInternalY( double y ) { m_internalY = y; }
     double internalY() const { return m_internalY; }
 
@@ -252,21 +252,21 @@ public:
 
     /** create XML to describe yourself
      */
-    void save( QDomElement &frameElem );
+    void save( TQDomElement &frameElem );
     /** read attributes from XML. @p headerOrFooter if true some defaults are different
      */
-    void load( QDomElement &frameElem, KWFrameSet* frameSet, int syntaxVersion );
+    void load( TQDomElement &frameElem, KWFrameSet* frameSet, int syntaxVersion );
     void loadCommonOasisProperties( KoOasisContext& context, KWFrameSet* frameSet, const char* typeProperties );
     void loadBorderProperties( KoStyleStack& styleStack );
 
-    QString saveOasisFrameStyle( KoGenStyles& mainStyles ) const;
+    TQString saveOasisFrameStyle( KoGenStyles& mainStyles ) const;
     /**
      * Write out a draw:frame element and its style.
      * The caller is responsible for creating the child element and closing the draw:frame element.
      * @p lastFrameName is the name of the previous frame in the same frameset; this is only used for copy-frames
      */
-    void startOasisFrame( KoXmlWriter &xmlWriter, KoGenStyles& mainStyles, const QString& name,
-                          const QString& lastFrameName = QString::null ) const;
+    void startOasisFrame( KoXmlWriter &xmlWriter, KoGenStyles& mainStyles, const TQString& name,
+                          const TQString& lastFrameName = TQString() ) const;
     void saveBorderProperties( KoGenStyle& frameStyle ) const;
     void saveMarginProperties( KoGenStyle& frameStyle ) const;
     void saveMarginAttributes( KoXmlWriter &writer ) const;
@@ -289,7 +289,7 @@ public:
         @param nPoint the point in normal coordinates.
         @param borderOfFrameOnly when true an additional check is done if the point
           is on the border.  */
-    bool frameAtPos( const QPoint& nPoint, bool borderOfFrameOnly=false ) const;
+    bool frameAtPos( const TQPoint& nPoint, bool borderOfFrameOnly=false ) const;
 
     /**
      * Only applicable to frames of the main text frameset.
@@ -315,7 +315,7 @@ private:
     double m_internalY;
     int m_zOrder;
 
-    QBrush m_backgroundColor;
+    TQBrush m_backgroundColor;
     KoBorder m_borderLeft, m_borderRight, m_borderTop, m_borderBottom;
 
     /** List of frames we have below and on top of us.