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

This reverts commit bf280726d5d22f33d33e4f9e771220c725249407.

11 files changed, 31 insertions, 31 deletions

diff --git a/kdf/disklist.cpp b/kdf/disklist.cpp
index abec1b8..596cbcb 100644
--- a/kdf/disklist.cpp
+++ b/kdf/disklist.cpp
@@ -243,7 +243,7 @@ void DiskList::receivedDFStdErrOut(KProcess *, char *data, int len )
    */
    
 
-  TQString tmp = TQString::fromLatin1(data, len);
+  TQString tmp = TQString::tqfromLatin1(data, len);
   dfStringErrOut.append(tmp);
 }
 
diff --git a/kdf/disks.cpp b/kdf/disks.cpp
index c4af664..155e6e2 100644
--- a/kdf/disks.cpp
+++ b/kdf/disks.cpp
@@ -104,13 +104,13 @@ int DiskEntry::mount()
       {
       // FreeBSD's mount(8) is picky: -o _must_ go before
       // the device and mountpoint.
-      cmdS=TQString::fromLatin1("mount -t%t -o%o %d %m");
+      cmdS=TQString::tqfromLatin1("mount -t%t -o%o %d %m");
       }
 
-  cmdS.replace(TQString::fromLatin1("%d"),deviceName());
-  cmdS.replace(TQString::fromLatin1("%m"),mountPoint());
-  cmdS.replace(TQString::fromLatin1("%t"),fsType());
-  cmdS.replace(TQString::fromLatin1("%o"),mountOptions());
+  cmdS.replace(TQString::tqfromLatin1("%d"),deviceName());
+  cmdS.replace(TQString::tqfromLatin1("%m"),mountPoint());
+  cmdS.replace(TQString::tqfromLatin1("%t"),fsType());
+  cmdS.replace(TQString::tqfromLatin1("%o"),mountOptions());
 
   kdDebug() << "mount-cmd: [" << cmdS << "]" << endl;
   int e=sysCall(cmdS);
@@ -126,8 +126,8 @@ int DiskEntry::umount()
   if (cmdS.isEmpty()) // generate default umount cmd
       cmdS="umount %d";
 
-  cmdS.replace(TQString::fromLatin1("%d"),deviceName());
-  cmdS.replace(TQString::fromLatin1("%m"),mountPoint());
+  cmdS.replace(TQString::tqfromLatin1("%d"),deviceName());
+  cmdS.replace(TQString::tqfromLatin1("%m"),mountPoint());
 
   kdDebug() << "umount-cmd: [" << cmdS << "]" << endl;
   int e=sysCall(cmdS);
@@ -226,11 +226,11 @@ int DiskEntry::sysCall(const TQString & command)
 {
   if (readingSysStdErrOut || sysProc->isRunning() )  return -1;
 
-  sysStringErrOut=i18n("Called: %1\n\n").arg(command); // put the called command on ErrOut
+  sysStringErrOut=i18n("Called: %1\n\n").tqarg(command); // put the called command on ErrOut
   sysProc->clearArguments();
   (*sysProc) << command;
     if (!sysProc->start( KProcess::Block, KProcess::AllOutput ))
-     kdFatal() << i18n("could not execute %1").arg(command.local8Bit().data()) << endl;
+     kdFatal() << i18n("could not execute %1").tqarg(command.local8Bit().data()) << endl;
 
   if (sysProc->exitStatus()!=0) emit sysCallError(this, sysProc->exitStatus());
 
diff --git a/kdf/kcmdf.cpp b/kdf/kcmdf.cpp
index 361ba90..2e26113 100644
--- a/kdf/kcmdf.cpp
+++ b/kdf/kcmdf.cpp
@@ -28,7 +28,7 @@
 
 #include <kdialog.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 
 #include "kcmdf.h"
 
diff --git a/kdf/kdf.cpp b/kdf/kdf.cpp
index 45f0ec7..f963a12 100644
--- a/kdf/kdf.cpp
+++ b/kdf/kdf.cpp
@@ -48,8 +48,8 @@ KDFTopLevel::KDFTopLevel(TQWidget *, const char *name)
   KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), 
 actionCollection());
   setCentralWidget(kdf);
-  //  kdf->setMinimumSize(kdf->sizeHint());
-  kdf->resize(kdf->sizeHint());
+  //  kdf->setMinimumSize(kdf->tqsizeHint());
+  kdf->resize(kdf->tqsizeHint());
   setupGUI(KMainWindow::Keys | StatusBar | Save | Create);
 }
 
diff --git a/kdf/kdfconfig.cpp b/kdf/kdfconfig.cpp
index 784e9c4..6831868 100644
--- a/kdf/kdfconfig.cpp
+++ b/kdf/kdfconfig.cpp
@@ -31,7 +31,7 @@
 #include <tqcheckbox.h>
 #include <tqheader.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlcdnumber.h>
 #include <tqlineedit.h>
 
diff --git a/kdf/kdfwidget.cpp b/kdf/kdfwidget.cpp
index 85c514e..8fbb97c 100644
--- a/kdf/kdfwidget.cpp
+++ b/kdf/kdfwidget.cpp
@@ -32,7 +32,7 @@
 
 #include <tqheader.h>
 #include <tqtimer.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpainter.h>
 
 #include <kapplication.h>
@@ -377,7 +377,7 @@ void KDFWidget::criticallyFull( DiskEntry *disk )
   if( mStd.popupIfFull() == true )
   {
     TQString msg = i18n("Device [%1] on [%2] is getting critically full!").
-      arg(disk->deviceName()).arg(disk->mountPoint());
+      tqarg(disk->deviceName()).tqarg(disk->mountPoint());
     KMessageBox::sorry( this, msg, i18n("Warning"));
   }
 }
diff --git a/kdf/kwikdisk.cpp b/kdf/kwikdisk.cpp
index b8963e3..8960e2f 100644
--- a/kdf/kwikdisk.cpp
+++ b/kdf/kwikdisk.cpp
@@ -176,13 +176,13 @@ void KwikDisk::updateDFDone()
    {
       // FIXME: tool tips are unused atm
       TQString toolTipText = i18n("%1 (%2) %3 on %4")
-         .arg( disk->mounted() ? i18n("Unmount") : i18n("Mount"))
-         .arg(disk->fsType()).arg(disk->deviceName()).arg(disk->mountPoint());
+         .tqarg( disk->mounted() ? i18n("Unmount") : i18n("Mount"))
+         .tqarg(disk->fsType()).tqarg(disk->deviceName()).tqarg(disk->mountPoint());
 
       TQString entryName = disk->mountPoint();
       if( disk->mounted() )
       {
-         entryName += TQString("\t\t\t[%1]").arg(disk->prettyKBAvail());
+         entryName += TQString("\t\t\t[%1]").tqarg(disk->prettyKBAvail());
       }
       int id = contextMenu()->insertItem("", this, TQT_SLOT(toggleMount(int)) );
       contextMenu()->setItemParameter(id, itemNo);
@@ -286,7 +286,7 @@ void KwikDisk::criticallyFull(DiskEntry *disk)
    if( m_options.popupIfFull() == true )
    {
       TQString msg = i18n("Device [%1] on [%2] is getting critically full!")
-                    .arg(disk->deviceName()).arg(disk->mountPoint());
+                    .tqarg(disk->deviceName()).tqarg(disk->mountPoint());
       KMessageBox::sorry( this, msg, i18n("Warning"));
    }
 }
diff --git a/kdf/listview.cpp b/kdf/listview.cpp
index b9274c3..49021ee 100644
--- a/kdf/listview.cpp
+++ b/kdf/listview.cpp
@@ -20,7 +20,7 @@
 //
 // 1999-11-28 Espen Sand
 // The purpose of this class is:
-// 1) Easily set minimum number of visible items and to adjust the sizeHint()
+// 1) Easily set minimum number of visible items and to adjust the tqsizeHint()
 // 2) Provide a pixmap collection
 //
 
@@ -46,20 +46,20 @@ void CListView::setVisibleItem( int visibleItem, bool updateSize )
   mVisibleItem = TQMAX( 1, visibleItem );
   if( updateSize == true )
   {
-    TQSize s = sizeHint();
-    setMinimumSize( s.width() + verticalScrollBar()->sizeHint().width() +
+    TQSize s = tqsizeHint();
+    setMinimumSize( s.width() + verticalScrollBar()->tqsizeHint().width() +
 		    lineWidth() * 2, s.height() );
   }
 }
 
-TQSize CListView::sizeHint( void ) const
+TQSize CListView::tqsizeHint( void ) const
 {
-  TQSize s = TQListView::sizeHint();
+  TQSize s = TQListView::tqsizeHint();
 
   int h = fontMetrics().height() + 2*itemMargin();
   if( h % 2 > 0 ) { h++; }
 
-  s.setHeight( h*mVisibleItem + lineWidth()*2 + header()->sizeHint().height());
+  s.setHeight( h*mVisibleItem + lineWidth()*2 + header()->tqsizeHint().height());
   return( s );
 }
 
diff --git a/kdf/listview.h b/kdf/listview.h
index 873a327..96ae398 100644
--- a/kdf/listview.h
+++ b/kdf/listview.h
@@ -34,7 +34,7 @@ class CListView : public KListView
     CListView( TQWidget *parent=0, const char *name=0, int visibleItem=10 );
     
     void setVisibleItem( int visibleItem, bool updateSize=true );
-    virtual TQSize sizeHint( void ) const; 
+    virtual TQSize tqsizeHint( void ) const; 
     const TQPixmap &icon( const TQString &iconName, bool drawBorder );
 
   private:
diff --git a/kdf/mntconfig.cpp b/kdf/mntconfig.cpp
index 1997bd0..1819760 100644
--- a/kdf/mntconfig.cpp
+++ b/kdf/mntconfig.cpp
@@ -29,7 +29,7 @@
 
 #include <tqgroupbox.h>
 #include <tqheader.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlineedit.h>
 
 #undef Unsorted
@@ -102,7 +102,7 @@ MntConfigWidget::MntConfigWidget(TQWidget *parent, const char *name, bool init)
     mIconButton = new KIconButton(mGroupBox);
     mIconButton->setIconType(KIcon::Small, KIcon::Device);
     Q_CHECK_PTR(mIconButton);
-    mIconButton->setFixedWidth( mIconButton->sizeHint().height() );
+    mIconButton->setFixedWidth( mIconButton->tqsizeHint().height() );
     connect(mIconButton,TQT_SIGNAL(iconChanged(TQString)),this,TQT_SLOT(iconChangedButton(TQString)));
     gl->addWidget( mIconButton, 2, 1 );
 
@@ -258,7 +258,7 @@ void MntConfigWidget::iconChanged(const TQString &iconName)
       TQString msg = i18n(""
 			 "This filename is not valid: %1\n"
 			 "It must end with "
-			 "\"_mount\" or \"_unmount\".").arg(iconName);
+			 "\"_mount\" or \"_unmount\".").tqarg(iconName);
       KMessageBox::sorry( this, msg );
       return;
     }
diff --git a/kdf/optiondialog.cpp b/kdf/optiondialog.cpp
index 0b7a7e4..6734294 100644
--- a/kdf/optiondialog.cpp
+++ b/kdf/optiondialog.cpp
@@ -17,7 +17,7 @@
  *
  */
 
-#include <layout.h>
+#include <tqlayout.h>
 
 #include "kdfconfig.h"
 #include "mntconfig.h"