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

30 files changed, 115 insertions, 115 deletions

diff --git a/kpackage/cache.cpp b/kpackage/cache.cpp
index d60be2f..69ef37b 100644
--- a/kpackage/cache.cpp
+++ b/kpackage/cache.cpp
@@ -60,7 +60,7 @@ TQString cacheObj::PDir()
   TQDir d(tmpd);
   if (!d.exists()) {
     if (!d.mkdir(tmpd)) {
-      KpMsgE(i18n("Cannot create folder %1").tqarg(tmpd),TRUE);
+      KpMsgE(i18n("Cannot create folder %1").arg(tmpd),TRUE);
       tmpd = "";
     } else {
       chown(TQFile::encodeName(tmpd),buf.st_uid,buf.st_gid);
@@ -81,7 +81,7 @@ TQString cacheObj::CDir()
     TQDir d(tmpd);
     if (!d.exists()) {
       if (!d.mkdir(tmpd)) {
-	KpMsgE(i18n("Cannot create folder %1").tqarg(tmpd),TRUE);
+	KpMsgE(i18n("Cannot create folder %1").arg(tmpd),TRUE);
 	tmpd = "";
       } else {
 	chown(TQFile::encodeName(tmpd),buf.st_uid,buf.st_gid);
@@ -95,7 +95,7 @@ int cacheObj::newDCache(const TQString &url, const TQString &fn, TQString  &fnam
 
   KURL u(url);
   if ( !u.isValid() ) {
-    KpMsgE(i18n("Malformed URL: %1").tqarg(url),TRUE);
+    KpMsgE(i18n("Malformed URL: %1").arg(url),TRUE);
     return -1;
   }
 
diff --git a/kpackage/debAptInterface.cpp b/kpackage/debAptInterface.cpp
index ce28d21..f7c6ee0 100644
--- a/kpackage/debAptInterface.cpp
+++ b/kpackage/debAptInterface.cpp
@@ -156,7 +156,7 @@ void DEBAPT::fileS()
       kprun->exec();
    } 
   } else {
-    KpMsg("Error",i18n("The %1 program needs to be installed").tqarg("apt-file"), TRUE);
+    KpMsg("Error",i18n("The %1 program needs to be installed").arg("apt-file"), TRUE);
   }
 }
 
@@ -185,13 +185,13 @@ void DEBAPT::listRPack(TQPtrList<packageInfo> *pki)
   packageInfo *p;
   TQStringList  plist;
 
-  kpackage->settqStatus(i18n("Querying DEB APT remote package list: %1").tqarg(hostName));
+  kpackage->setStatus(i18n("Querying DEB APT remote package list: %1").arg(hostName));
   kpackage->setPercent(0);
 
   TQString cmd = "cat " STATUS;
 
   TQStringList list = kpty->run(cmd);
-  kpackage->settqStatus(i18n("Processing DEB APT remote package list: %1").tqarg(hostName));
+  kpackage->setStatus(i18n("Processing DEB APT remote package list: %1").arg(hostName));
   //  kdDebug() << "P=" << list.count() <<"\n";
   kpackage->setPercent(50);
 
@@ -228,7 +228,7 @@ void DEBAPT::listRPack(TQPtrList<packageInfo> *pki)
   }
 
   list.clear();
-  kpackage->settqStatus(i18n("DEB APT"));
+  kpackage->setStatus(i18n("DEB APT"));
   kpackage->setPercent(100);
 }
 
@@ -241,16 +241,16 @@ void DEBAPT::listAvail(TQPtrList<packageInfo> *pki)
 
   //  kdDebug() << "H=" << hostName << "\n";
   if (hostName.isEmpty())
-    kpackage->settqStatus(i18n("Querying DEB APT available list"));
+    kpackage->setStatus(i18n("Querying DEB APT available list"));
   else
-    kpackage->settqStatus(i18n("Querying DEB APT available list: %1").tqarg(hostName));
+    kpackage->setStatus(i18n("Querying DEB APT available list: %1").arg(hostName));
   kpackage->setPercent(0);
 
   TQStringList list = kpty->run("apt-cache dumpavail");
   if (hostName.isEmpty())
-    kpackage->settqStatus(i18n("Processing DEB APT available list"));
+    kpackage->setStatus(i18n("Processing DEB APT available list"));
   else
-     kpackage->settqStatus(i18n("Processing DEB APT available list: %1").tqarg(hostName));
+     kpackage->setStatus(i18n("Processing DEB APT available list: %1").arg(hostName));
 
   //  kdDebug() << "A=" << list.count() <<"\n";
   kpackage->setPercent(50);
@@ -284,7 +284,7 @@ void DEBAPT::listAvail(TQPtrList<packageInfo> *pki)
   }
 
   list.clear();
-  kpackage->settqStatus(i18n("DEB APT"));
+  kpackage->setStatus(i18n("DEB APT"));
   kpackage->setPercent(100);
 }
 
@@ -365,7 +365,7 @@ TQStringList DEBAPT::FindFile(const TQString &name, bool searchAll)
 
       return filelist;
     } else {
-      KpMsg("Error",i18n("The %1 program needs to be installed").tqarg("apt-file"), TRUE);
+      KpMsg("Error",i18n("The %1 program needs to be installed").arg("apt-file"), TRUE);
       TQStringList nill;
       return nill;
     }
diff --git a/kpackage/debInterface.cpp b/kpackage/debInterface.cpp
index d0bdd69..41146fe 100644
--- a/kpackage/debInterface.cpp
+++ b/kpackage/debInterface.cpp
@@ -155,7 +155,7 @@ void DEB::listPackList(TQPtrList<packageInfo> *pki, const TQString &fname, cache
     local = u.isLocalFile();
   }
 
-  kpackage->settqStatus(sline);
+  kpackage->setStatus(sline);
   kpackage->setPercent(0);
 
   TQFile file(STATUS);
diff --git a/kpackage/debInterface.h b/kpackage/debInterface.h
index 78bfe4c..8b26b14 100644
--- a/kpackage/debInterface.h
+++ b/kpackage/debInterface.h
@@ -34,7 +34,7 @@
 #include <tqdir.h>
 #include <tqfile.h>
 #include <tqfileinfo.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqstringlist.h>
 
 #include <kprocess.h>
diff --git a/kpackage/fbsdInterface.cpp b/kpackage/fbsdInterface.cpp
index 7831a5e..167ec1b 100644
--- a/kpackage/fbsdInterface.cpp
+++ b/kpackage/fbsdInterface.cpp
@@ -128,7 +128,7 @@ static void insertGroups(TQMap<TQString, TQString> *a, TQString cats)
 packageInfo *fbsdInterface::getPackageInfo(char mode, const TQString &pname, const TQString &version) {
   TQString name( pname);
   bool installed = false;
-  kpackage->settqStatus(i18n("Getting package info"));
+  kpackage->setStatus(i18n("Getting package info"));
 
   kdDebug() << "Looking at package " << pname << endl;
 
@@ -205,7 +205,7 @@ packageInfo *fbsdInterface::getPackageInfo(char mode, const TQString &pname, con
     }
     a["description"] = desc;
   } else {
-    kpackage->settqStatus(TQString());
+    kpackage->setStatus(TQString());
     return 0;
   }
 
@@ -213,7 +213,7 @@ packageInfo *fbsdInterface::getPackageInfo(char mode, const TQString &pname, con
   ret->packageState = installed? packageInfo::INSTALLED : packageInfo::AVAILABLE;
   ret->fixup();
   if (!installed) ret->smerge(typeID);
-  kpackage->settqStatus(TQString());
+  kpackage->setStatus(TQString());
   return ret;
 }
 
@@ -234,7 +234,7 @@ TQStringList fbsdInterface::getFileList(packageInfo *p) {
 
   // Run pkg_info on the package name to get the file list.
   // The file list is returned on stdout, one per line.
-  kpackage->settqStatus(i18n("Getting file list"));
+  kpackage->setStatus(i18n("Getting file list"));
 
   TQStringList ret;
 
@@ -249,7 +249,7 @@ TQStringList fbsdInterface::getFileList(packageInfo *p) {
   } else {
     if (!p->hasProperty("name")) {
       ret.append(i18n("Can't find package name!"));
-      kpackage->settqStatus(TQString());
+      kpackage->setStatus(TQString());
       return ret;
     }
 
@@ -270,7 +270,7 @@ TQStringList fbsdInterface::getFileList(packageInfo *p) {
   
   ret = list;
   
-  kpackage->settqStatus(TQString());
+  kpackage->setStatus(TQString());
   return ret;
 }
 
@@ -498,7 +498,7 @@ int fbsdInterface::pathInfo(TQMap<TQString, TQString> &a)
   // Open a pipe to a pkg_info process in order to read the comment, name
   // and description for the packages.
 
-  kpackage->settqStatus(i18n("Querying BSD packages database for installed packages"));
+  kpackage->setStatus(i18n("Querying BSD packages database for installed packages"));
 
   TQString cmd = PKG_INFO_BIN;
   cmd += " -acdl ";
@@ -527,8 +527,8 @@ int fbsdInterface::pathInfo(TQMap<TQString, TQString> &a)
      // Find the last word on this line (which should be the package name) minus a trailing :.
       TQString pkg = name.section(' ',-1);
       if (pkg.isEmpty()) {
-        KpMsgE(i18n("Unexpected output from pkg_info (looking for package name): %1").tqarg(value), TRUE);
-        kpackage->settqStatus(TQString());
+        KpMsgE(i18n("Unexpected output from pkg_info (looking for package name): %1").arg(value), TRUE);
+        kpackage->setStatus(TQString());
         return;
       } else {
         if (pkg[pkg.length()-1] == ':') {
diff --git a/kpackage/findf.cpp b/kpackage/findf.cpp
index 877f2f3..6a333f8 100644
--- a/kpackage/findf.cpp
+++ b/kpackage/findf.cpp
@@ -68,7 +68,7 @@ FindF::FindF(TQWidget *parent)
     value->setFocus();
 
     TQLabel *valueLabel = new TQLabel(value, i18n("Find:"), frame1);
-    valueLabel->tqsetAlignment( AlignRight );
+    valueLabel->setAlignment( AlignRight );
 
     tab = new KListView(frame1, "tab");
     connect(tab, TQT_SIGNAL(selectionChanged ( TQListViewItem * )),
diff --git a/kpackage/findf.h b/kpackage/findf.h
index 8abaea3..a4e3643 100644
--- a/kpackage/findf.h
+++ b/kpackage/findf.h
@@ -41,7 +41,7 @@
 #include <tqfiledialog.h>
 #include <tqgroupbox.h>
 #include <tqcheckbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 // KDE headers
 #include <kapplication.h>
diff --git a/kpackage/gentooInterface.cpp b/kpackage/gentooInterface.cpp
index 964f21c..448b74c 100644
--- a/kpackage/gentooInterface.cpp
+++ b/kpackage/gentooInterface.cpp
@@ -124,7 +124,7 @@ void Gentoo::listInstalledPackages(TQPtrList<packageInfo> *pki)
 
   TQString sline = i18n("Looking for Gentoo packages: ");
 
-  kpackage->settqStatus(sline);
+  kpackage->setStatus(sline);
   kpackage->setPercent(0);
 
   TQFile f(portageDir+"profiles/categories");
diff --git a/kpackage/kio.h b/kpackage/kio.h
index 94bb16b..3379cbc 100644
--- a/kpackage/kio.h
+++ b/kpackage/kio.h
@@ -33,7 +33,7 @@
 
 #include <tqobject.h>
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include "../config.h"
 #include <kio/job.h>
 
diff --git a/kpackage/kissInterface.cpp b/kpackage/kissInterface.cpp
index 4ed7c74..29de45f 100644
--- a/kpackage/kissInterface.cpp
+++ b/kpackage/kissInterface.cpp
@@ -143,7 +143,7 @@ void KISS::listInstalledPackages(TQPtrList<packageInfo> *pki)
   if (!reader.start(0,FALSE))
     return;
 
-  kpackage->settqStatus(sline);
+  kpackage->setStatus(sline);
   kpackage->setPercent(0);
 
   vb = "" ;
diff --git a/kpackage/kpPty.h b/kpackage/kpPty.h
index 327f3ec..a3afdba 100644
--- a/kpackage/kpPty.h
+++ b/kpackage/kpPty.h
@@ -30,7 +30,7 @@
 #include <tqmultilineedit.h>
 #include <tqstringlist.h>
 #include <tqregexp.h>
-#include <tqtextcodec.h> 
+#include <textcodec.h> 
 #include <tqmap.h>
 
 #include <kprocio.h>
diff --git a/kpackage/kpTerm.cpp b/kpackage/kpTerm.cpp
index 34d0a0a..c7e99b6 100644
--- a/kpackage/kpTerm.cpp
+++ b/kpackage/kpTerm.cpp
@@ -44,7 +44,7 @@ kpTerm::kpTerm(kpPty *pt, TQWidget * parent,  const char * name ) :
   pty = pt;
   setFont(KGlobalSettings::fixedFont());
   //  setMinimumWidth(fontMetrics().maxWidth()*80 +
-  //      tqminimumSizeHint().width());
+  //      minimumSizeHint().width());
   setWordWrap(NoWrap);
   setReadOnly(TRUE);
 }
diff --git a/kpackage/kpTerm.h b/kpackage/kpTerm.h
index 466d7c5..e997d39 100644
--- a/kpackage/kpTerm.h
+++ b/kpackage/kpTerm.h
@@ -31,9 +31,9 @@
 
 #include "../config.h"
 
-#include <tqtextedit.h>
+#include <textedit.h>
 #include <tqstringlist.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 
 #include <klocale.h>
diff --git a/kpackage/kpackage.cpp b/kpackage/kpackage.cpp
index 17697ce..2c90b9f 100644
--- a/kpackage/kpackage.cpp
+++ b/kpackage/kpackage.cpp
@@ -485,9 +485,9 @@ pkgInterface *KPACKAGE::pkType(const TQString &fname)
       }
     }
     fclose(file);
-    KpMsgE(i18n("Unknown package type: %1").tqarg(fname),TRUE);
+    KpMsgE(i18n("Unknown package type: %1").arg(fname),TRUE);
   } else {
-    KpMsgE(i18n("File not found: %1").tqarg(fname),TRUE);
+    KpMsgE(i18n("File not found: %1").arg(fname),TRUE);
   }
 
   return 0;
@@ -585,7 +585,7 @@ TQString KPACKAGE::getFileName(const KURL & url, TQString &cacheName )
   TQString fname = "";
 
   if ( !url.isValid() )  {
-    KpMsgE(i18n("Malformed URL: %1").tqarg(url.url()),TRUE);
+    KpMsgE(i18n("Malformed URL: %1").arg(url.url()),TRUE);
   } else {
 
     // Just a usual file ?
@@ -643,12 +643,12 @@ TQString KPACKAGE::fetchNetFile( const KURL & url )
     } else {
       save_url = url;
 
-      settqStatus(i18n("Starting KIO"));
+      setStatus(i18n("Starting KIO"));
 
       Kio kio;
 
       if (kio.download(url, cf)) {
-	settqStatus(i18n("KIO finished"));
+	setStatus(i18n("KIO finished"));
 	TQFileInfo fi(cf);
 	if (!(fi.exists() && fi.size() > 0)) {
           unlink(TQFile::encodeName(cf));
@@ -660,7 +660,7 @@ TQString KPACKAGE::fetchNetFile( const KURL & url )
 	  return cf;
 	}
       } else {
-	settqStatus(i18n("KIO failed"));
+	setStatus(i18n("KIO failed"));
 	return "";
       }
     }
@@ -732,13 +732,13 @@ void KPACKAGE::dropEvent(TQDropEvent *de) // something has been dropped
   openNetFiles(list.toStringList());
 }
 
-void KPACKAGE::settqStatus(const TQString &s)	// set the text in the status bar
+void KPACKAGE::setStatus(const TQString &s)	// set the text in the status bar
 {
   status->setText(s);
   kapp->processEvents();	// refresh the screen
 }
 
-TQString KPACKAGE::gettqStatus()	// get the text in the status bar
+TQString KPACKAGE::getStatus()	// get the text in the status bar
 {
   if(status)
     return status->text();
diff --git a/kpackage/kpackage.h b/kpackage/kpackage.h
index 2b72029..c096a0c 100644
--- a/kpackage/kpackage.h
+++ b/kpackage/kpackage.h
@@ -77,13 +77,13 @@ public:
 	   OPEN_READONLY 	= 2,
 	   OPEN_INSERT 		= 4 };
 
-  void settqStatus(const TQString &s);
+  void setStatus(const TQString &s);
   // this sets the status bar's string to s
 
   void setPercent(int x);
   // this set the status bar's progress to x
 
-  TQString gettqStatus();
+  TQString getStatus();
   // this gets the current status string on the status bar
 
   //  void setMode(int newmode, pkgInterface *type, int refresh);
diff --git a/kpackage/kplview.h b/kpackage/kplview.h
index 7e31529..41b6f4f 100644
--- a/kpackage/kplview.h
+++ b/kpackage/kplview.h
@@ -36,7 +36,7 @@
 #include <tqpushbutton.h>
 #include <tqptrlist.h>
 #include <tqstring.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 // KDE headers
 #include "klistview.h"
diff --git a/kpackage/managementWidget.cpp b/kpackage/managementWidget.cpp
index 3ec4d07..cdd7f45 100644
--- a/kpackage/managementWidget.cpp
+++ b/kpackage/managementWidget.cpp
@@ -170,9 +170,9 @@ void managementWidget::setupWidgets()
   connect(linstButton,TQT_SIGNAL(clicked()),
 	  TQT_SLOT(installMultClicked()));
 
-  leftbox->addLayout(lbuttons,0); // top level tqlayout as child
+  leftbox->addLayout(lbuttons,0); // top level layout as child
 
-  // Setup the `buttons' tqlayout
+  // Setup the `buttons' layout
   lbuttons->addWidget(linstButton,1,AlignBottom);
   lbuttons->addWidget(luinstButton,1,AlignBottom);
   lbuttons->addStretch(1);
@@ -200,11 +200,11 @@ void managementWidget::setupWidgets()
 	  TQT_SLOT(installSingleClicked()));
 
 
-  // Setup the `right panel' tqlayout
+  // Setup the `right panel' layout
   rightbox->addWidget(packageDisplay,10);
-  rightbox->addLayout(rbuttons,0); // top level tqlayout as child
+  rightbox->addLayout(rbuttons,0); // top level layout as child
 
-  // Setup the `buttons' tqlayout
+  // Setup the `buttons' layout
   rbuttons->addWidget(instButton,1);
   rbuttons->addWidget(uinstButton,1);
   rbuttons->addStretch(1);
@@ -289,7 +289,7 @@ void managementWidget::setupInstButton()
 
 void managementWidget::arrangeWidgets()
 {
-  // this is done automatically by the tqlayout managers
+  // this is done automatically by the layout managers
 }
 
 void managementWidget::tabChanged(int tab)
@@ -352,7 +352,7 @@ void managementWidget::rebuildListTree()
   packageInfo *i;
   int  n = 0;
 
-  kpackage->settqStatus(i18n("Building package tree"));
+  kpackage->setStatus(i18n("Building package tree"));
   kpackage->setPercent(0);
 
   treeList->setSorting(-1);
@@ -378,7 +378,7 @@ void managementWidget::rebuildListTree()
   treeList->setSorting(0);
 
   kpackage->setPercent(100);	// set the progress
-  kpackage->settqStatus("");
+  kpackage->setStatus("");
 
   checkMarked();
 }
diff --git a/kpackage/managementWidget.h b/kpackage/managementWidget.h
index f4bd82a..b48e711 100644
--- a/kpackage/managementWidget.h
+++ b/kpackage/managementWidget.h
@@ -47,7 +47,7 @@
 #include <tqpushbutton.h>
 #include <tqptrlist.h>
 #include <tqstring.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtabwidget.h>
 #include <tqlabel.h>
 #include <tqhbox.h>
@@ -181,7 +181,7 @@ private:
   // This widget displays the package info / file-list
 
   TQBoxLayout *top, *leftbox, *rightbox, *lbuttons, *rbuttons;
-  // These are the tqgeometry managers
+  // These are the geometry managers
 
   TQFrame *leftpanel, *rightpanel;
   // frame to put TQBox in
diff --git a/kpackage/options.cpp b/kpackage/options.cpp
index 7594d51..6fa467f 100644
--- a/kpackage/options.cpp
+++ b/kpackage/options.cpp
@@ -40,7 +40,7 @@
 #include <tqframe.h>
 #include <tqlabel.h>
 #include <tqgroupbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlineedit.h>
 #include <tqbuttongroup.h>
 #include <tqradiobutton.h>
@@ -96,8 +96,8 @@ Options::Options(TQWidget *parent)
 	  } else {
 	    msgStr = kpinterface[i]->name;
 	    msgStr = i18n("%1: %2 not found")
-	      .tqarg(kpinterface[i]->name)
-	      .tqarg(kpinterface[i]->errExe);
+	      .arg(kpinterface[i]->name)
+	      .arg(kpinterface[i]->errExe);
 	  }
 	  packageBox[i] = new TQGroupBox(2,Qt::Horizontal,msgStr, framet, "box");
 	  packageHandle[i] =  new TQCheckBox(i18n("Enable"), packageBox[i]);
@@ -146,7 +146,7 @@ Options::Options(TQWidget *parent)
       vp->addWidget(pcache[2]);
 
       TQGroupBox* cd = new TQGroupBox (1, Qt::Horizontal, i18n("Cache Folder"), page) ;
-      cd->tqsetSizePolicy (TQSizePolicy::Expanding, TQSizePolicy::Fixed) ;
+      cd->setSizePolicy (TQSizePolicy::Expanding, TQSizePolicy::Fixed) ;
 
       cachedir = new KURLRequester("", cd, "cachedir");
     }
diff --git a/kpackage/packageDisplay.cpp b/kpackage/packageDisplay.cpp
index 5016439..f81f769 100644
--- a/kpackage/packageDisplay.cpp
+++ b/kpackage/packageDisplay.cpp
@@ -35,7 +35,7 @@
 
 #include <tqapplication.h>
 #include <tqfileinfo.h>
-#include <tqtextedit.h>
+#include <textedit.h>
 
 #include <kdebug.h>
 #include <kiconloader.h>
@@ -280,7 +280,7 @@ void packageDisplayWidget::updateFileList()
   TQStringList errorfiles;
 
   // set the status
-  kpackage->settqStatus(i18n("Updating File List"));
+  kpackage->setStatus(i18n("Updating File List"));
 
   // clear the file list
   fileList->clear();
@@ -306,7 +306,7 @@ void packageDisplayWidget::updateFileList()
     errorfiles = package->interface->verify(package, files);
   }
 
-  kpackage->settqStatus(i18n("Updating File List"));
+  kpackage->setStatus(i18n("Updating File List"));
 
   uint c=0, p=0;
   uint step = (files.count() / 100) + 1;
diff --git a/kpackage/packageProperties.cpp b/kpackage/packageProperties.cpp
index 05fd3ca..2e1aca7 100644
--- a/kpackage/packageProperties.cpp
+++ b/kpackage/packageProperties.cpp
@@ -46,7 +46,7 @@ packagePropertiesWidget::packagePropertiesWidget
 
   //  hide();
   package=NULL;
-  TQColorGroup cg = tqcolorGroup();
+  TQColorGroup cg = colorGroup();
   setBackgroundColor(cg.base());
   initTranslate();
 }
diff --git a/kpackage/pkgInterface.cpp b/kpackage/pkgInterface.cpp
index fba9263..435e830 100644
--- a/kpackage/pkgInterface.cpp
+++ b/kpackage/pkgInterface.cpp
@@ -142,7 +142,7 @@ void pkgInterface::listDir(TQPtrList<packageInfo> *pki, const TQString &fname, c
   packageInfo *p;
 
   TQString sline( queryMsg + fname );
-  kpackage->settqStatus(sline);
+  kpackage->setStatus(sline);
 
   kdDebug() << "listDir fn=" << fname << " dir=" << dir << endl;
 
@@ -163,8 +163,8 @@ void pkgInterface::listDir(TQPtrList<packageInfo> *pki, const TQString &fname, c
       while ( (fi=it.current()) ) {           // for each entry...
 	if ( fi->isDir() ) {
 	  // entry is a subdir
-	  if ( fi->fileName() != TQString::tqfromLatin1(".") &&
-	       fi->fileName() != TQString::tqfromLatin1("..") )
+	  if ( fi->fileName() != TQString::fromLatin1(".") &&
+	       fi->fileName() != TQString::fromLatin1("..") )
 	    {
 	      // not current dir and not parent dir
 	      // -> recursive call:
@@ -197,7 +197,7 @@ void pkgInterface::listDir(TQPtrList<packageInfo> *pki, const TQString &fname, c
       }
     } else {
       // directory is not readable
-      kdDebug() << TQString("WARNING: directory '%1' not readable (will be ignored) !\n").tqarg(d.absPath() ) << endl;
+      kdDebug() << TQString("WARNING: directory '%1' not readable (will be ignored) !\n").arg(d.absPath() ) << endl;
     }
   } else {
       TQFile f(fname);
@@ -257,12 +257,12 @@ TQString pkgInterface::getPackList(cacheObj *cp)
 
     unlink(TQFile::encodeName(tmpf));
     if (kpkg)
-      kpackage->settqStatus(i18n("Starting Kio"));
+      kpackage->setStatus(i18n("Starting Kio"));
 
     Kio kio;
     if (kio.download(url, tmpf)) {
       if (kpkg)
-	kpackage->settqStatus(i18n("Kio finished"));
+	kpackage->setStatus(i18n("Kio finished"));
       TQFileInfo f(tmpf);
       if (!(f.exists() && f.size() > 0)) {
 	unlink(TQFile::encodeName(tmpf));
@@ -272,7 +272,7 @@ TQString pkgInterface::getPackList(cacheObj *cp)
       }
     } else {
       if (kpkg)
-	kpackage->settqStatus(i18n("Kio failed"));
+	kpackage->setStatus(i18n("Kio failed"));
       return "";
     }
   } else {
@@ -297,7 +297,7 @@ TQString pkgInterface::getDir(cacheObj *cp) {
       cl.write();
       return tmpDir;
     } else {
-      KpMsgE(i18n("Cannot read folder %1").tqarg(url),FALSE);
+      KpMsgE(i18n("Cannot read folder %1").arg(url),FALSE);
       unlink(tmpDir.ascii());
       return TQString();
     }
@@ -327,7 +327,7 @@ TQStringList pkgInterface::verify(packageInfo *, const TQStringList &files)
 
     uint step = (files.count() / 100) + 1;
 
-    kpackage->settqStatus(i18n("Verifying"));
+    kpackage->setStatus(i18n("Verifying"));
     kpackage->setPercent(0);
 
     for( TQStringList::ConstIterator it = files.begin();
diff --git a/kpackage/pkgOptions.cpp b/kpackage/pkgOptions.cpp
index 4775fce..9d62f2f 100644
--- a/kpackage/pkgOptions.cpp
+++ b/kpackage/pkgOptions.cpp
@@ -102,38 +102,38 @@ void pkgOptions::setupWidgets(TQPtrList<param> &pars)
   connect(cancelButton,TQT_SIGNAL(clicked()),TQT_SLOT(cancelButtonClicked()));
   connect(Keep, TQT_SIGNAL(toggled(bool)), TQT_SLOT(keepToggle(bool)));
 
-  // Do the tqlayout
-  vtqlayout = new TQBoxLayout(this, TQBoxLayout::TopToBottom, marginHint(), spacingHint());
-  vtqlayout->addWidget(title,0);
+  // Do the layout
+  vlayout = new TQBoxLayout(this, TQBoxLayout::TopToBottom, marginHint(), spacingHint());
+  vlayout->addWidget(title,0);
 
   {
-    htqlayout = new TQBoxLayout(vtqlayout,TQBoxLayout::LeftToRight, spacingHint());
+    hlayout = new TQBoxLayout(vlayout,TQBoxLayout::LeftToRight, spacingHint());
 
     {
-      tqlayout = new TQBoxLayout(htqlayout,TQBoxLayout::TopToBottom, spacingHint());
+      layout = new TQBoxLayout(hlayout,TQBoxLayout::TopToBottom, spacingHint());
 
       packages = new KListView(this);
-      tqlayout->addWidget(packages,20);
+      layout->addWidget(packages,20);
       packages->addColumn(i18n("PACKAGES"),200);
 
       connect(packages, TQT_SIGNAL(selectionChanged ( TQListViewItem * )),
 	    this, TQT_SLOT(slotSearch( TQListViewItem * )));
 
-      tqlayout->addStretch(1);
+      layout->addStretch(1);
       for (i = 0; i < bnumber; i++) {
-	tqlayout->addWidget(Boxs[i],1);
+	layout->addWidget(Boxs[i],1);
       }
-      tqlayout->addWidget(new KSeparator(KSeparator::HLine, this), 2);
+      layout->addWidget(new KSeparator(KSeparator::HLine, this), 2);
 
-      TQBoxLayout *stqlayout = new TQBoxLayout(tqlayout, TQBoxLayout::LeftToRight);
-      stqlayout->addStretch(1);
-      stqlayout->addWidget(Keep, 1);
-      stqlayout->addStretch(1);
+      TQBoxLayout *slayout = new TQBoxLayout(layout, TQBoxLayout::LeftToRight);
+      slayout->addStretch(1);
+      slayout->addWidget(Keep, 1);
+      slayout->addStretch(1);
 
-      tqlayout->addWidget(new KSeparator(KSeparator::HLine, this), 2);
+      layout->addWidget(new KSeparator(KSeparator::HLine, this), 2);
 
       TQBoxLayout *buttons = new TQBoxLayout(TQBoxLayout::LeftToRight);
-      tqlayout->addLayout(buttons);
+      layout->addLayout(buttons);
 
       buttons->addWidget(installButton,2);
       buttons->addStretch(1);
@@ -141,7 +141,7 @@ void pkgOptions::setupWidgets(TQPtrList<param> &pars)
     }
     {
       term = new kpTerm(kpty,this);
-      htqlayout->addWidget(term, 1000);
+      hlayout->addWidget(term, 1000);
     }
   }
   resize(800, 400);
@@ -202,7 +202,7 @@ bool pkgOptions::setup(TQPtrList<packageInfo> *pl, const TQString &)
     }
   }
 
- s = i18n("%1: 1 %2 Package","%1: %n %2 Packages",plist.count()).tqarg(insType,pkgInt->name);
+ s = i18n("%1: 1 %2 Package","%1: %n %2 Packages",plist.count()).arg(insType,pkgInt->name);
  title->setText(s);
 
   for (TQStringList::Iterator pit = plist.begin(); pit != plist.end(); ++pit ) {
diff --git a/kpackage/pkgOptions.h b/kpackage/pkgOptions.h
index becbc54..b933542 100644
--- a/kpackage/pkgOptions.h
+++ b/kpackage/pkgOptions.h
@@ -34,7 +34,7 @@
 #include "../config.h"
 // TQt headers
 #include <tqframe.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpushbutton.h>
 #include <tqlabel.h>
 #include <tqcheckbox.h>
@@ -104,8 +104,8 @@ signals:
   void finished(int refresh);
 
 protected:
-  // The tqlayout managers
-  TQBoxLayout *tqlayout, *htqlayout, *vtqlayout;
+  // The layout managers
+  TQBoxLayout *layout, *hlayout, *vlayout;
 
   // Sub widgets
   TQPushButton *installButton;
diff --git a/kpackage/procbuf.cpp b/kpackage/procbuf.cpp
index 9017c8a..568e651 100644
--- a/kpackage/procbuf.cpp
+++ b/kpackage/procbuf.cpp
@@ -36,7 +36,7 @@ Modal::Modal(TQString msg, TQWidget *parent, const char * name )
   : KDialog( parent, name, TRUE )
 {
   TQLabel *line1 = new TQLabel(msg,this);
-  line1->tqsetAlignment(AlignCenter);
+  line1->setAlignment(AlignCenter);
   line1->setAutoResize(true);
 
  }
@@ -136,13 +136,13 @@ int procbuf::start (TQString  msg, bool errorDlg,
 	    << " exit=" << proc->exitStatus() << endl;
   if (timed) {
     kdDebug() << "timeout..................\n";
-    KpMsg("Error",i18n("Timeout: %1").tqarg(timeMsg), TRUE);
+    KpMsg("Error",i18n("Timeout: %1").arg(timeMsg), TRUE);
     delete proc; proc = 0;
     return 0;
   } else {
     if (!proc->normalExit() || proc->exitStatus()) {
       if (errorDlg) {
-	KpMsg("Error",i18n("Kprocess error:%1").tqarg(buf), TRUE);
+	KpMsg("Error",i18n("Kprocess error:%1").arg(buf), TRUE);
       }
       delete proc; proc = 0;
       return 0;
diff --git a/kpackage/rpmInterface.cpp b/kpackage/rpmInterface.cpp
index 9b0401f..1cc4a85 100644
--- a/kpackage/rpmInterface.cpp
+++ b/kpackage/rpmInterface.cpp
@@ -160,11 +160,11 @@ void RPM::listInstalledPackages(TQPtrList<packageInfo> *pki)
   TQString  cmd = "rpm  -q -a";
   cmd += packageQuery();
 
-  kpackage->settqStatus(i18n("Querying RPM package list"));
+  kpackage->setStatus(i18n("Querying RPM package list"));
   kpackage->setPercent(0);
 
   TQStringList list = kpty->run(cmd);
-  kpackage->settqStatus(i18n("Processing RPM package list"));
+  kpackage->setStatus(i18n("Processing RPM package list"));
   //  kdDebug() << "P=" << list.count() <<"\n";
   kpackage->setPercent(50);
 
@@ -197,7 +197,7 @@ void RPM::listInstalledPackages(TQPtrList<packageInfo> *pki)
   }
 
   list.clear();
-  kpackage->settqStatus(i18n("DEB APT"));
+  kpackage->setStatus(i18n("DEB APT"));
   kpackage->setPercent(100);
 }
 
diff --git a/kpackage/search.cpp b/kpackage/search.cpp
index 2a7bb25..a2cf9ff 100644
--- a/kpackage/search.cpp
+++ b/kpackage/search.cpp
@@ -54,7 +54,7 @@ Search::Search(TQWidget *parent, const char * name)
     value = new TQLineEdit( frame1, "v");
     vf->addWidget(value,0);
     value->setFocus();
-    value->setFixedHeight(value->tqsizeHint().height());
+    value->setFixedHeight(value->sizeHint().height());
     value->setMinimumWidth(250);
     connect(value, TQT_SIGNAL(textChanged(const TQString &)),this, TQT_SLOT(textChanged(const TQString &)));
 
@@ -64,13 +64,13 @@ Search::Search(TQWidget *parent, const char * name)
     substr = new TQCheckBox(i18n("Sub string"), frame1, "substr");
     substr->setChecked(TRUE);
     hc->addWidget(substr,1,AlignLeft);
-    substr->setFixedSize(substr->tqsizeHint());
+    substr->setFixedSize(substr->sizeHint());
     hc->addStretch(1);
 
     wrap = new TQCheckBox(i18n("Wrap search"), frame1, "wrap");
     wrap->setChecked(TRUE);
     hc->addWidget(wrap,1,AlignRight);
-    wrap->setFixedSize(wrap->tqsizeHint());
+    wrap->setFixedSize(wrap->sizeHint());
 
     enableButton( User1, false );
 
@@ -104,7 +104,7 @@ void Search::ok_slot()
   }
   if (pkg == 0)
     KpMsg(i18n("Note"),
-	  i18n("%1 was not found.").tqarg(to_find),TRUE);
+	  i18n("%1 was not found.").arg(to_find),TRUE);
 }
 
 void Search::done_slot()
diff --git a/kpackage/slackInterface.cpp b/kpackage/slackInterface.cpp
index ae51d7b..e4c97a6 100644
--- a/kpackage/slackInterface.cpp
+++ b/kpackage/slackInterface.cpp
@@ -206,7 +206,7 @@ void SLACK::listInstalledPackages(TQPtrList<packageInfo> *pki)
   TQDir d(DIR);
   if (d.exists()) {
     TQString sline = i18n("Querying SLACK package list: ");
-    kpackage->settqStatus(sline);
+    kpackage->setStatus(sline);
 
     const TQFileInfoList *list = d.entryInfoList();
     int count = list->count();
@@ -260,7 +260,7 @@ void SLACK::listPackList(TQPtrList<packageInfo> *pki, const TQString &s,  cacheO
   TQString sline = i18n("Querying SLACK package list: ");
   sline += cp->location;
 
-  kpackage->settqStatus(sline);
+  kpackage->setStatus(sline);
   kpackage->setPercent(0);
 
   np = 0;
@@ -619,7 +619,7 @@ TQStringList SLACK::FindFile(const TQString &name, bool)
   TQDir d(DIR);
   if (d.exists()) {
     TQString sline = i18n("Querying SLACK package list: ");
-    kpackage->settqStatus(sline);
+    kpackage->setStatus(sline);
 
     const TQFileInfoList *list = d.entryInfoList();
     int count = list->count();
diff --git a/kpackage/updateLoc.cpp b/kpackage/updateLoc.cpp
index 1a66446..c662da8 100644
--- a/kpackage/updateLoc.cpp
+++ b/kpackage/updateLoc.cpp
@@ -140,7 +140,7 @@ dpanel::dpanel(dpanel *basep,  const TQString &Pfilter,  bool bsubdirs,
 
     if (bsubdirs) {
       psubdirs = new TQCheckBox(i18n("Subfolders"),this);
-      psubdirs->setFixedSize(psubdirs->tqsizeHint());
+      psubdirs->setFixedSize(psubdirs->sizeHint());
       pack->addWidget(psubdirs,0);
     }
 
@@ -272,9 +272,9 @@ void updateLoc::doBase(const TQString & bmsg)
   if (haveBase) {
     fbase = new TQGroupBox(bmsg, this);
     fbase->setColumnLayout(0, Qt::Vertical );
-    fbase->tqlayout()->setSpacing( KDialog::spacingHint() );
-    fbase->tqlayout()->setMargin( KDialog::marginHint() );
-    vbase = new TQVBoxLayout(fbase->tqlayout());
+    fbase->layout()->setSpacing( KDialog::spacingHint() );
+    fbase->layout()->setMargin( KDialog::marginHint() );
+    vbase = new TQVBoxLayout(fbase->layout());
     vf->addWidget(fbase,1);
     base = new dpanel(fbase);
     vbase->addWidget(base,0);
@@ -410,10 +410,10 @@ pdUpdateLoc::pdUpdateLoc(TQWidget *p, int panelNumber, pkgInterface *inter, cons
 
   TQGroupBox *floc = new TQGroupBox(lmsg, this);
   floc->setColumnLayout(0, Qt::Vertical );
-  floc->tqlayout()->setSpacing( KDialog::spacingHint() );
-  floc->tqlayout()->setMargin( KDialog::marginHint() );
+  floc->layout()->setSpacing( KDialog::spacingHint() );
+  floc->layout()->setMargin( KDialog::marginHint() );
   vf->addWidget(floc,1);
-  TQVBoxLayout *vloc = new TQVBoxLayout(floc->tqlayout());
+  TQVBoxLayout *vloc = new TQVBoxLayout(floc->layout());
 
   for (int i = 0; i < numLines; i++) {
     dp[i] = new dpanel(base, filter,  subdirs, floc);
@@ -547,10 +547,10 @@ cUpdateLoc::cUpdateLoc(TQWidget *p, int panelNumber, pkgInterface *inter, const
   for (int i = 0; i < numLines; i++) {
     TQGroupBox *floc = new TQGroupBox(*kcIt, this);
     floc->setColumnLayout(0, Qt::Vertical );
-    floc->tqlayout()->setSpacing( KDialog::spacingHint() );
-    floc->tqlayout()->setMargin( KDialog::marginHint() );
+    floc->layout()->setSpacing( KDialog::spacingHint() );
+    floc->layout()->setMargin( KDialog::marginHint() );
     vf->addWidget(floc,1);
-    TQVBoxLayout *vloc = new TQVBoxLayout(floc->tqlayout());
+    TQVBoxLayout *vloc = new TQVBoxLayout(floc->layout());
 
     combo[i] = new KComboBox( true, floc);
     KCompletion *comp = combo[i]->completionObject();
diff --git a/kpackage/updateLoc.h b/kpackage/updateLoc.h
index 2305cb2..ebd5d53 100644
--- a/kpackage/updateLoc.h
+++ b/kpackage/updateLoc.h
@@ -42,7 +42,7 @@
 #include <tqfiledialog.h>
 #include <tqgroupbox.h>
 #include <tqcheckbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlineedit.h>
 
 // KDE headers