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

This reverts commit c2637a0da6d9a1c8626ca39f8451ab3b7cda487a.

4 files changed, 22 insertions, 22 deletions

diff --git a/kfax/faxinput.cpp b/kfax/faxinput.cpp
index 40ae2a41..e37e9dd7 100644
--- a/kfax/faxinput.cpp
+++ b/kfax/faxinput.cpp
@@ -110,7 +110,7 @@ notetiff(const char *name)
 
 
     if ((tf = fopen(name, "r")) == NULL) {
-        TQString mesg = i18n("Unable to open:\n%1\n").arg(TQFile::decodeName(name));
+        TQString mesg = i18n("Unable to open:\n%1\n").tqarg(TQFile::decodeName(name));
 	kfaxerror(i18n("Sorry"), mesg);
 	return 0;
     }
@@ -147,7 +147,7 @@ notetiff(const char *name)
 
 	if (fseek(tf, IFDoff, SEEK_SET) < 0) {
 	realbad:
-	  str = i18n("Invalid tiff file:\n%1\n").arg(TQFile::decodeName(name));
+	  str = i18n("Invalid tiff file:\n%1\n").tqarg(TQFile::decodeName(name));
 	  kfaxerror(i18n("Sorry"),str);
 	bad:
 	    if (strips)
@@ -249,7 +249,7 @@ notetiff(const char *name)
 	    case 279:		/* StripByteCounts */
 		if (count != nstrips) {
 		  str = i18n("In file %1\nStripsPerImage tag 273=%2,tag279=%3\n")
-			      .arg(TQFile::decodeName(name)).arg(nstrips).arg(count);
+			      .tqarg(TQFile::decodeName(name)).tqarg(nstrips).tqarg(count);
 		  kfaxerror(i18n("Message"),str);
 		  goto realbad;
 		}
@@ -419,7 +419,7 @@ getstrip(struct pagenode *pn, int strip)
 	pn->length = pn->strips[strip].size;
     }
     else {
-      str = i18n("Trying to expand too many strips\n%1%n").arg(TQFile::decodeName(pn->pathname));
+      str = i18n("Trying to expand too many strips\n%1%n").tqarg(TQFile::decodeName(pn->pathname));
       kfaxerror(i18n("Warning"),str);
       return NULL;
     }
@@ -448,7 +448,7 @@ getstrip(struct pagenode *pn, int strip)
 	/* handle ghostscript / PC Research fax file */
       if (Data[24] != 1 || Data[25] != 0){
 	str = i18n("Only the first page of the PC Research multipage file\n%1\nwill be shown\n")
-		.arg(TQFile::decodeName(pn->pathname));
+		.tqarg(TQFile::decodeName(pn->pathname));
 	kfaxerror(i18n("Message"),str);
       }
 	pn->length -= 64;
@@ -462,7 +462,7 @@ getstrip(struct pagenode *pn, int strip)
 	pn->height = G3count(pn, pn->expander == g32expand);
     if (pn->height == 0) {
 
-      str = i18n("No fax found in file:\n%1\n").arg(TQFile::decodeName(pn->pathname));
+      str = i18n("No fax found in file:\n%1\n").tqarg(TQFile::decodeName(pn->pathname));
       kfaxerror(i18n("Sorry"),str);
       errno = 0;
       badfile(pn);
diff --git a/kfax/kfax.cpp b/kfax/kfax.cpp
index bbc9121a..1a97400c 100644
--- a/kfax/kfax.cpp
+++ b/kfax/kfax.cpp
@@ -701,7 +701,7 @@ void TopLevel::print(){
   printer.setFullPage( true );
   printer.setUsePrinterResolution( true );
   printer.setCreator( i18n("KFax") + " " KFAXVERSION );
-  printer.setDocName( TQString("%1 - %2").arg(firstpage->name).arg(i18n("KFax")));
+  printer.setDocName( TQString("%1 - %2").tqarg(firstpage->name).tqarg(i18n("KFax")));
   printer.setDocFileName( firstpage->name );
   printer.setPageSelection( KPrinter::ApplicationSide );
   printer.setMinMax( 1, pages ); 
@@ -792,11 +792,11 @@ void TopLevel::printIt( KPrinter &printer, TQPainter &painter )
     TQSize scaledImageSize = size;
     if (size.width() > maxSize.width() || size.height() > maxSize.height() ) {
 	// Image does not fit - scale it and print centered
-	scaledImageSize.scale( maxSize, TQSize::ScaleMin );
+	scaledImageSize.tqscale( maxSize, TQSize::ScaleMin );
 	kdDebug() << "Image does not fit - scaling to " << maxSize << endl;
     } else {
 	// Image does fit - print it in original size, but centered
-	scaledImageSize.scale( size, TQSize::ScaleMin );
+	scaledImageSize.tqscale( size, TQSize::ScaleMin );
 	kdDebug() << "Image does fit - scaling to " << size << endl;
     }
     kdDebug() << "Final image size " << scaledImageSize << endl;
@@ -846,7 +846,7 @@ void TopLevel::openNetFile( const KURL &u)
 
   if ( u.isLocalFile() )
   {
-    TQString string = i18n("Loading '%1'").arg(u.path());
+    TQString string = i18n("Loading '%1'").tqarg(u.path());
     statusbar->message(string);
     openadd( u.path());
     statusbar->clear();
@@ -1441,17 +1441,17 @@ void TopLevel::uiUpdate(){
 	currentpage = pages;
     }
 
-    TQString pagestr = i18n("Page: %1 of %2").arg(currentpage).arg(pages);
+    TQString pagestr = i18n("Page: %1 of %2").tqarg(currentpage).tqarg(pages);
 
     statusbar->changeItem(pagestr, ID_PAGE_NO);
 
     if(Image){
-      TQString wh = i18n("W: %1 H: %2").arg(Image->width).arg(Image->height);
+      TQString wh = i18n("W: %1 H: %2").tqarg(Image->width).tqarg(Image->height);
       statusbar->changeItem(wh, ID_INS_OVR);
     }
 
-    TQString resolution = i18n("Res: %1").arg(thispage->vres?i18n("Fine"):i18n("Normal"));
-    // TODO: resolution += TQString("%1x%2").arg(thispage->dpiX).arg(thispage->dpiY);
+    TQString resolution = i18n("Res: %1").tqarg(thispage->vres?i18n("Fine"):i18n("Normal"));
+    // TODO: resolution += TQString("%1x%2").tqarg(thispage->dpiX).tqarg(thispage->dpiY);
     statusbar->changeItem(resolution, ID_GENERAL);
 
     statusbar->changeItem(thispage->name, ID_FNAME);
diff --git a/kfax/kfax_printsettings.cpp b/kfax/kfax_printsettings.cpp
index 53fc6537..5382c2e5 100644
--- a/kfax/kfax_printsettings.cpp
+++ b/kfax/kfax_printsettings.cpp
@@ -21,7 +21,7 @@
 
 #include <klocale.h>
 #include <tqcheckbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqwhatsthis.h>
 
 KFAXPrintSettings::KFAXPrintSettings(TQWidget *parent, const char *name)
diff --git a/kfax/options.cpp b/kfax/options.cpp
index dab7325b..053bf162 100644
--- a/kfax/options.cpp
+++ b/kfax/options.cpp
@@ -27,7 +27,7 @@
 
 #include <stdio.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <klocale.h>
 #include <knuminput.h>
 #include <tqdir.h>
@@ -60,28 +60,28 @@ OptionsDialog::OptionsDialog( TQWidget *parent, const char *name)
   bg->setColumnLayout( 0, Qt::Horizontal );
   mainLayout->addWidget( bg );
 
-  TQVBoxLayout *vbl = new TQVBoxLayout(bg->layout());
+  TQVBoxLayout *vbl = new TQVBoxLayout(bg->tqlayout());
 
   TQHBoxLayout *hbl1 = new TQHBoxLayout();
 
   vbl->addLayout( hbl1 );
 
   displaylabel = new TQLabel(i18n("Display options:"), bg,"displaylabel");
-  displaylabel->setFixedSize( displaylabel->sizeHint() );
+  displaylabel->setFixedSize( displaylabel->tqsizeHint() );
   hbl1->addWidget( displaylabel );
 
   landscape = new TQCheckBox(i18n("Landscape"), bg,"Landscape");
-  landscape->setFixedSize( landscape->sizeHint() );
+  landscape->setFixedSize( landscape->tqsizeHint() );
   hbl1->addSpacing( 10 );
   hbl1->addWidget( landscape );
 
   flip = new TQCheckBox(i18n("Upside down"), bg,"upsidedown");
-  flip->setFixedSize( flip->sizeHint() );
+  flip->setFixedSize( flip->tqsizeHint() );
   hbl1->addSpacing( 10 );
   hbl1->addWidget( flip );
 
   invert = new TQCheckBox(i18n("Invert"), bg,"invert");
-  invert->setFixedSize( invert->sizeHint() );
+  invert->setFixedSize( invert->tqsizeHint() );
   hbl1->addSpacing( 10 );
   hbl1->addWidget( invert );
 
@@ -139,7 +139,7 @@ OptionsDialog::OptionsDialog( TQWidget *parent, const char *name)
   rawgroup->setFrameStyle(TQFrame::NoFrame);
 
   rawlabel = new TQLabel(i18n("Raw fax format:"),rawgroup,"rawlabel");
-  rawlabel->setFixedSize( rawlabel->sizeHint() );
+  rawlabel->setFixedSize( rawlabel->tqsizeHint() );
   hbl4->addWidget( rawlabel );
 
   g3 = new TQRadioButton("G3",rawgroup,"g3");