Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 94844816550ad672ccfcdc25659c625546239998.

10 files changed, 18 insertions, 18 deletions

diff --git a/lib/kwmf/kowmfpaint.cc b/lib/kwmf/kowmfpaint.cc
index 43067273..97a6e033 100644
--- a/lib/kwmf/kowmfpaint.cc
+++ b/lib/kwmf/kowmfpaint.cc
@@ -249,7 +249,7 @@ void KoWmfPaint::drawPolyline( const TQPointArray &pa ) {
 
 
 void KoWmfPaint::drawPolygon( const TQPointArray &pa, bool winding ) {
-    mPainter.drawPolygon( pa, winding );
+    mPainter.tqdrawPolygon( pa, winding );
 }
 
 
@@ -276,7 +276,7 @@ void KoWmfPaint::drawPolyPolygon( TQPtrList<TQPointArray>& listPa, bool winding
     if ( mPainter.pen().style() != TQt::NoPen ) {
         mPainter.setBrush( TQt::NoBrush );
         for ( pa = listPa.first() ; pa ; pa = listPa.next() ) {
-            mPainter.drawPolygon( *pa, winding );
+            mPainter.tqdrawPolygon( *pa, winding );
         }
     }
 
diff --git a/lib/kwmf/kowmfread.h b/lib/kwmf/kowmfread.h
index d71af5c6..ff8fa9be 100644
--- a/lib/kwmf/kowmfread.h
+++ b/lib/kwmf/kowmfread.h
@@ -19,7 +19,7 @@
 #define _KOWMFREAD_H_
 
 #include <tqpen.h>
-#include <brush.h>
+#include <tqbrush.h>
 #include <tqfont.h>
 #include <tqcolor.h>
 #include <tqrect.h>
diff --git a/lib/kwmf/kowmfreadprivate.h b/lib/kwmf/kowmfreadprivate.h
index feebe0b3..ea95e563 100644
--- a/lib/kwmf/kowmfreadprivate.h
+++ b/lib/kwmf/kowmfreadprivate.h
@@ -112,7 +112,7 @@ public:
     /****************** Text *******************/
     /// set text color
     void setTextColor( TQ_UINT32 size, TQDataStream& stream );
-    /// set text alignment
+    /// set text tqalignment
     void setTextAlign( TQ_UINT32 size, TQDataStream& stream );
     /// draw text
     void textOut( TQ_UINT32 size, TQDataStream& stream );
diff --git a/lib/kwmf/kowmfstack.h b/lib/kwmf/kowmfstack.h
index af906d55..876318ab 100644
--- a/lib/kwmf/kowmfstack.h
+++ b/lib/kwmf/kowmfstack.h
@@ -22,7 +22,7 @@
 #include <tqpen.h>
 #include <tqcolor.h>
 #include <tqfont.h>
-#include <brush.h>
+#include <tqbrush.h>
 #include <tqpixmap.h>
 
 class KoWmfRead;
diff --git a/lib/kwmf/kowmfstruct.h b/lib/kwmf/kowmfstruct.h
index 84281f4e..d94a9d79 100644
--- a/lib/kwmf/kowmfstruct.h
+++ b/lib/kwmf/kowmfstruct.h
@@ -57,7 +57,7 @@ struct WmfEnhMetaHeader
   TQ_UINT16  numHandles;       // Number of handles in the handle table
   // Handle index zero is reserved.
   TQ_UINT16  reserved;         // always 0
-  TQ_UINT32  sizeOfDescription;   // Number of chars in the unicode description string
+  TQ_UINT32  sizeOfDescription;   // Number of chars in the tqunicode description string
                                  // This is 0 if there is no description string
   TQ_UINT32  offsetOfDescription; // Offset to the metafile description record.
                                  // This is 0 if there is no description string
diff --git a/lib/kwmf/kowmfwrite.h b/lib/kwmf/kowmfwrite.h
index 728566d0..bc3e1411 100644
--- a/lib/kwmf/kowmfwrite.h
+++ b/lib/kwmf/kowmfwrite.h
@@ -19,7 +19,7 @@
 #define _KOWMFWRITE_H_
 
 #include <tqpen.h>
-#include <brush.h>
+#include <tqbrush.h>
 #include <tqcolor.h>
 #include <tqfont.h>
 #include <tqrect.h>
diff --git a/lib/kwmf/kwmf.cc b/lib/kwmf/kwmf.cc
index 38d520db..0a0d2c12 100644
--- a/lib/kwmf/kwmf.cc
+++ b/lib/kwmf/kwmf.cc
@@ -351,7 +351,7 @@ bool KWmf::parse(
     bool isPlaceable;
     bool isEnhanced;
 
-    startedAt = stream.device()->at();
+    startedAt = stream.tqdevice()->at();
     stream.setByteOrder(TQDataStream::LittleEndian); // Great, I love TQt !
 
     for (int i = 0; i < s_maxHandles; i++)
@@ -400,7 +400,7 @@ bool KWmf::parse(
         S16 nHandles;               // Number of handles in the handle table
                                     // Handle index zero is reserved.
         S16 sReserved;              // Reserved.  Must be zero.
-        S32 nDescription;           // Number of chars in the unicode description string
+        S32 nDescription;           // Number of chars in the tqunicode description string
                                     // This is 0 if there is no description string
         S32 offDescription;         // Offset to the metafile description record.
                                     // This is 0 if there is no description string
@@ -477,7 +477,7 @@ bool KWmf::parse(
     }
     else
     {
-        stream.device()->at(startedAt);
+        stream.tqdevice()->at(startedAt);
         m_dpi = (unsigned)((double)576 / m_dpi);
         m_windowOrgX = 0;
         m_windowOrgY = 0;
@@ -487,7 +487,7 @@ bool KWmf::parse(
 
     //----- Read as enhanced metafile header
 
-    fileAt = stream.device()->at();
+    fileAt = stream.tqdevice()->at();
     stream >> eheader.iType;
     stream >> eheader.nSize;
     stream >> eheader.rclBounds.left;
@@ -539,7 +539,7 @@ bool KWmf::parse(
     {
         //    debug("WMF Header");
         //----- Read as standard metafile header
-        stream.device()->at(fileAt);
+        stream.tqdevice()->at(fileAt);
         stream >> header.mtType;
         stream >> header.mtHeaderSize;
         stream >> header.mtVersion;
@@ -558,7 +558,7 @@ bool KWmf::parse(
         */
     }
 
-    walk((size - (stream.device()->at() - startedAt)) / 2, stream);
+    walk((size - (stream.tqdevice()->at() - startedAt)) / 2, stream);
     return true;
 }
 
diff --git a/lib/kwmf/qwmf.cc b/lib/kwmf/qwmf.cc
index aabe4021..a7451b46 100644
--- a/lib/kwmf/qwmf.cc
+++ b/lib/kwmf/qwmf.cc
@@ -348,7 +348,7 @@ bool QWinMetaFile::paint( const TQPaintDevice* aTarget, bool absolute )
     mWinding = false;
     mAbsoluteCoord = absolute;
 
-    mPainter.begin( const_cast<TQPaintDevice*>(aTarget) );
+    mPainter.tqbegin( const_cast<TQPaintDevice*>(aTarget) );
     if ( TQWMF_DEBUG )  {
         kdDebug() << "Bounding box : " << mBBox.left()
         << " " << mBBox.top() << " " << mBBox.right() << " " << mBBox.bottom() << endl;
@@ -482,7 +482,7 @@ void QWinMetaFile::polygon( long, short* parm )
     TQPointArray* pa;
 
     pa = pointArray( parm[ 0 ], &parm[ 1 ] );
-    mPainter.drawPolygon( *pa, mWinding );
+    mPainter.tqdrawPolygon( *pa, mWinding );
 }
 
 
@@ -762,7 +762,7 @@ void QWinMetaFile::extTextOut( long num, short* parm )
         mPainter.translate( -parm[ 1 ], -parm[ 0 ] );
     }
 
-    // alignment
+    // tqalignment
     if ( mTextAlign & 0x06 )
         x -= ( width / 2 );
     if ( mTextAlign & 0x08 )
diff --git a/lib/kwmf/qwmf.h b/lib/kwmf/qwmf.h
index cf05d617..3bc668c9 100644
--- a/lib/kwmf/qwmf.h
+++ b/lib/kwmf/qwmf.h
@@ -139,7 +139,7 @@ public: // should be protected but cannot
     /****************** Text *******************/
     /** set text color */
     void setTextColor( long num, short* parms );
-    /** set text alignment */
+    /** set text tqalignment */
     void setTextAlign( long num, short* parms );
     /** draw text */
     void textOut( long num, short* parms );
diff --git a/lib/kwmf/wmfstruct.h b/lib/kwmf/wmfstruct.h
index 7400e896..33a4a67c 100644
--- a/lib/kwmf/wmfstruct.h
+++ b/lib/kwmf/wmfstruct.h
@@ -53,7 +53,7 @@ struct WmfEnhMetaHeader
     WORD    nHandles;           // Number of handles in the handle table
     // Handle index zero is reserved.
     WORD    sReserved;          // Reserved.  Must be zero.
-    DWORD   nDescription;       // Number of chars in the unicode description string
+    DWORD   nDescription;       // Number of chars in the tqunicode description string
     // This is 0 if there is no description string
     DWORD   offDescription;     // Offset to the metafile description record.
     // This is 0 if there is no description string