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

This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.

7 files changed, 23 insertions, 23 deletions

diff --git a/ktnef/gui/attachpropertydialog.cpp b/ktnef/gui/attachpropertydialog.cpp
index 564e3b712..fbf4d6e36 100644
--- a/ktnef/gui/attachpropertydialog.cpp
+++ b/ktnef/gui/attachpropertydialog.cpp
@@ -53,7 +53,7 @@ void AttachPropertyDialog::setAttachment(KTNEFAttach *attach)
 	s.append(" bytes");
 	size_->setText(s);
 	KMimeType::Ptr	mimetype = KMimeType::mimeType(attach->mimeTag());
-	TQPixmap pix = loadRenderingPixmap( attach, colorGroup().background() );
+	TQPixmap pix = loadRenderingPixmap( attach, tqcolorGroup().background() );
 	if ( !pix.isNull() )
 		icon_->setPixmap( pix );
 	else
diff --git a/ktnef/gui/attachpropertydialogbase.ui b/ktnef/gui/attachpropertydialogbase.ui
index 010dd9208..808df4e71 100644
--- a/ktnef/gui/attachpropertydialogbase.ui
+++ b/ktnef/gui/attachpropertydialogbase.ui
@@ -169,7 +169,7 @@
             <property name="name">
                 <cstring>icon_</cstring>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>16</width>
                     <height>16</height>
@@ -211,7 +211,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="8" column="0" rowspan="1" colspan="3">
             <property name="name">
-                <cstring>layout2</cstring>
+                <cstring>tqlayout2</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -227,7 +227,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>150</width>
                             <height>20</height>
diff --git a/ktnef/gui/ktnefmain.cpp b/ktnef/gui/ktnefmain.cpp
index ccb1bb54f..b16b2029c 100644
--- a/ktnef/gui/ktnefmain.cpp
+++ b/ktnef/gui/ktnefmain.cpp
@@ -230,7 +230,7 @@ void KTNEFMain::extractAllFiles()
 		for (;it.current();++it)
 			if (!parser_->extractFileTo(it.current()->name(), dir))
 			{
-				TQString	msg = i18n( "Unable to extract file \"%1\"" ).arg( it.current()->name() );
+				TQString	msg = i18n( "Unable to extract file \"%1\"" ).tqarg( it.current()->name() );
 				TQMessageBox::critical(this,i18n("Error"),msg,TQMessageBox::Ok|TQMessageBox::Default,0);
 				return;
 			}
@@ -301,7 +301,7 @@ void KTNEFMain::extractTo(const TQString& dirname)
 	for (;it.current();++it)
 		if (!parser_->extractFileTo(it.current()->name(), dir))
 		{
-			TQString	msg = i18n("Unable to extract file \"%1\"").arg( it.current()->name() );
+			TQString	msg = i18n("Unable to extract file \"%1\"").tqarg( it.current()->name() );
 			TQMessageBox::critical(this,i18n("Error"),msg,TQMessageBox::Ok|TQMessageBox::Default,0);
 			return;
 		}
@@ -358,7 +358,7 @@ void KTNEFMain::viewDragRequested( const TQValueList<KTNEFAttach*>& list )
 
 void KTNEFMain::slotEditToolbars()
 {
-	saveMainWindowSettings( KGlobal::config(), TQString::fromLatin1("MainWindow") );
+	saveMainWindowSettings( KGlobal::config(), TQString::tqfromLatin1("MainWindow") );
 	KEditToolbar	dlg(actionCollection());
 	connect(&dlg, TQT_SIGNAL( newToolbarConfig() ), this, TQT_SLOT( slotNewToolbarConfig() ));
 	dlg.exec();
@@ -367,7 +367,7 @@ void KTNEFMain::slotEditToolbars()
 void KTNEFMain::slotNewToolbarConfig()
 {
 	createGUI();
-	applyMainWindowSettings( KGlobal::config(), TQString::fromLatin1("MainWindow") );
+	applyMainWindowSettings( KGlobal::config(), TQString::tqfromLatin1("MainWindow") );
 }
 
 void KTNEFMain::slotShowMessageProperties()
diff --git a/ktnef/gui/ktnefview.cpp b/ktnef/gui/ktnefview.cpp
index 05ff229db..676dd4b9f 100644
--- a/ktnef/gui/ktnefview.cpp
+++ b/ktnef/gui/ktnefview.cpp
@@ -49,7 +49,7 @@ Attachment::Attachment(TQListView *parent, KTNEFAttach *attach)
 	if (!attach_->fileName().isEmpty()) setText(0, attach_->fileName());
 	KMimeType::Ptr	mimeType = KMimeType::mimeType( attach_->mimeTag() );
 	setText(1, mimeType->comment());
-	TQPixmap pix = loadRenderingPixmap( attach, parent->colorGroup().base() );
+	TQPixmap pix = loadRenderingPixmap( attach, parent->tqcolorGroup().base() );
 	if ( !pix.isNull() )
 		setPixmap( 0, pix );
 	else
diff --git a/ktnef/gui/qwmf.cpp b/ktnef/gui/qwmf.cpp
index bc31584c1..d60d661d3 100644
--- a/ktnef/gui/qwmf.cpp
+++ b/ktnef/gui/qwmf.cpp
@@ -482,7 +482,7 @@ void TQWinMetaFile::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 TQWinMetaFile::extTextOut( long num, short* parm )
         mPainter.translate( -parm[ 1 ], -parm[ 0 ] );
     }
 
-    // alignment
+    // tqalignment
     if ( mTextAlign & 0x06 )
         x -= ( width / 2 );
     if ( mTextAlign & 0x08 )
@@ -939,10 +939,10 @@ void TQWinMetaFile::createBrushIndirect( long, short* parm )
       Qt::FDiagPattern,   /* hatched */
       Qt::Dense4Pattern,  /* should be custom bitmap pattern */
       Qt::HorPattern,     /* should be BS_INDEXED (?) */
-      Qt::VerPattern,     /* should be device-independent bitmap */
-      Qt::Dense6Pattern,  /* should be device-independent packed-bitmap */
+      Qt::VerPattern,     /* should be tqdevice-independent bitmap */
+      Qt::Dense6Pattern,  /* should be tqdevice-independent packed-bitmap */
       Qt::Dense2Pattern,  /* should be BS_PATTERN8x8 */
-      Qt::Dense3Pattern   /* should be device-independent BS_DIBPATTERN8x8 */
+      Qt::Dense3Pattern   /* should be tqdevice-independent BS_DIBPATTERN8x8 */
     };
     Qt::BrushStyle style;
     short arg;
@@ -994,7 +994,7 @@ void TQWinMetaFile::createPenIndirect( long, short* parm )
     handle->pen.setCapStyle( Qt::RoundCap );
 
     //int width = 0;
-    // TODO : width of pen proportional to device context width
+    // TODO : width of pen proportional to tqdevice context width
     // DOESN'T WORK
 /*
     TQRect devRec;
diff --git a/ktnef/gui/qwmf.h b/ktnef/gui/qwmf.h
index e61eeabaf..2ac861d77 100644
--- a/ktnef/gui/qwmf.h
+++ b/ktnef/gui/qwmf.h
@@ -60,7 +60,7 @@ public:
     virtual bool load( TQBuffer &buffer );
 
     /**
-     * Paint metafile to given paint-device using absolute or relative coordinate.
+     * Paint metafile to given paint-tqdevice using absolute or relative coordinate.
      * abosute coord. reset the world transfomation Matrix
      * relative coord. use the existing world transfomation Matrix
      * Returns true on success.
@@ -124,9 +124,9 @@ public: // should be protected but cannot
     void setPixel( long num, short* parms );
     // Set raster operation mode
     void setRop( long num, short* parms );
-    /* save device context */
+    /* save tqdevice context */
     void saveDC( long num, short* parms );
-    /* restore device context */
+    /* restore tqdevice context */
     void restoreDC( long num, short* parms );
     /*  clipping region is the intersection of this region and the original region */
     void intersectClipRect( long num, short* parms );
@@ -136,7 +136,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/ktnef/gui/wmfstruct.h b/ktnef/gui/wmfstruct.h
index 7400e896e..5e50f022e 100644
--- a/ktnef/gui/wmfstruct.h
+++ b/ktnef/gui/wmfstruct.h
@@ -43,7 +43,7 @@ struct WmfEnhMetaHeader
     DWORD   iType;              // Record type EMR_HEADER
     DWORD   nSize;              // Record size in bytes.  This may be greater
     // than the sizeof( ENHMETAHEADER ).
-    RECTL   rclBounds;          // Inclusive-inclusive bounds in device units
+    RECTL   rclBounds;          // Inclusive-inclusive bounds in tqdevice units
     RECTL   rclFrame;           // Inclusive-inclusive Picture Frame of metafile
     // in .01 mm units
     DWORD   dSignature;         // Signature.  Must be ENHMETA_SIGNATURE.
@@ -53,13 +53,13 @@ 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
     DWORD   nPalEntries;        // Number of entries in the metafile palette.
-    SIZEL   szlDevice;          // Size of the reference device in pels
-    SIZEL   szlMillimeters;     // Size of the reference device in millimeters
+    SIZEL   szlDevice;          // Size of the reference tqdevice in pels
+    SIZEL   szlMillimeters;     // Size of the reference tqdevice in millimeters
 };
 #define ENHMETA_SIGNATURE       0x464D4520