TQt4 port kdeadmin

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeadmin@1237416 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 26 insertions, 26 deletions

diff --git a/kpackage/pkgOptions.cpp b/kpackage/pkgOptions.cpp
index bf3975e..c1be713 100644
--- a/kpackage/pkgOptions.cpp
+++ b/kpackage/pkgOptions.cpp
@@ -47,8 +47,8 @@
 ///////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////
 
-pkgOptions::pkgOptions(pkgInterface *pki, TQWidget *parent, const TQString &caption)
-  :  KDialog(parent,0,TRUE)
+pkgOptions::pkgOptions(pkgInterface *pki, TQWidget *tqparent, const TQString &caption)
+  :  KDialog(tqparent,0,TRUE)
 {
   //  setFrameStyle(TQFrame::Raised | TQFrame::Panel);
 
@@ -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 layout
-  vlayout = new TQBoxLayout(this, TQBoxLayout::TopToBottom, marginHint(), spacingHint());
-  vlayout->addWidget(title,0);
+  // Do the tqlayout
+  vtqlayout = new TQBoxLayout(this, TQBoxLayout::TopToBottom, marginHint(), spacingHint());
+  vtqlayout->addWidget(title,0);
 
   {
-    hlayout = new TQBoxLayout(vlayout,TQBoxLayout::LeftToRight, spacingHint());
+    htqlayout = new TQBoxLayout(vtqlayout,TQBoxLayout::LeftToRight, spacingHint());
 
     {
-      layout = new TQBoxLayout(hlayout,TQBoxLayout::TopToBottom, spacingHint());
+      tqlayout = new TQBoxLayout(htqlayout,TQBoxLayout::TopToBottom, spacingHint());
 
       packages = new KListView(this);
-      layout->addWidget(packages,20);
+      tqlayout->addWidget(packages,20);
       packages->addColumn(i18n("PACKAGES"),200);
 
       connect(packages, TQT_SIGNAL(selectionChanged ( TQListViewItem * )),
 	    this, TQT_SLOT(slotSearch( TQListViewItem * )));
 
-      layout->addStretch(1);
+      tqlayout->addStretch(1);
       for (i = 0; i < bnumber; i++) {
-	layout->addWidget(Boxs[i],1);
+	tqlayout->addWidget(Boxs[i],1);
       }
-      layout->addWidget(new KSeparator(KSeparator::HLine, this), 2);
+      tqlayout->addWidget(new KSeparator(KSeparator::HLine, this), 2);
 
-      TQBoxLayout *slayout = new TQBoxLayout(layout, TQBoxLayout::LeftToRight);
-      slayout->addStretch(1);
-      slayout->addWidget(Keep, 1);
-      slayout->addStretch(1);
+      TQBoxLayout *stqlayout = new TQBoxLayout(tqlayout, TQBoxLayout::LeftToRight);
+      stqlayout->addStretch(1);
+      stqlayout->addWidget(Keep, 1);
+      stqlayout->addStretch(1);
 
-      layout->addWidget(new KSeparator(KSeparator::HLine, this), 2);
+      tqlayout->addWidget(new KSeparator(KSeparator::HLine, this), 2);
 
       TQBoxLayout *buttons = new TQBoxLayout(TQBoxLayout::LeftToRight);
-      layout->addLayout(buttons);
+      tqlayout->addLayout(buttons);
 
       buttons->addWidget(installButton,2);
       buttons->addStretch(1);
@@ -141,7 +141,7 @@ void pkgOptions::setupWidgets(TQPtrList<param> &pars)
     }
     {
       term = new kpTerm(kpty,this);
-      hlayout->addWidget(term, 1000);
+      htqlayout->addWidget(term, 1000);
     }
   }
   resize(800, 400);
@@ -188,9 +188,9 @@ bool pkgOptions::setup(TQPtrList<packageInfo> *pl, const TQString &)
 	plist.append(*it);
 	TQString dirIndex = *it + pkgInt->typeID;
 	if (installer) {
-	  pk = kpackage->management->dirUninstPackages->find(dirIndex);
+	  pk = kpackage->management->dirUninstPackages->tqfind(dirIndex);
 	} else {
-	  pk = kpackage->management->dirInstPackages->find(dirIndex);
+	  pk = kpackage->management->dirInstPackages->tqfind(dirIndex);
 	}
 	if (pk) {
 	  //	  kdDebug() << "FF=" << dirIndex << "\n";
@@ -202,7 +202,7 @@ bool pkgOptions::setup(TQPtrList<packageInfo> *pl, const TQString &)
     }
   }
 
- s = i18n("%1: 1 %2 Package","%1: %n %2 Packages",plist.count()).arg(insType,pkgInt->name);
+ s = i18n("%1: 1 %2 Package","%1: %n %2 Packages",plist.count()).tqarg(insType,pkgInt->name);
  title->setText(s);
 
   for (TQStringList::Iterator pit = plist.begin(); pit != plist.end(); ++pit ) {
@@ -302,7 +302,7 @@ void pkgOptions::cancelButtonClicked()
 }
 
 void pkgOptions::closeEvent ( TQCloseEvent * e ) {
-  kdDebug() << "pkgOptions::QCloseEvent\n";
+  kdDebug() << "pkgOptions::TQCloseEvent\n";
   terminate();
    
   TQWidget::closeEvent (e);
@@ -342,8 +342,8 @@ void pkgOptions::getKeep()
 
 ///////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////
-pkgOptionsI::pkgOptionsI(pkgInterface *pkg, TQWidget *parent):
-  pkgOptions(pkg, parent, i18n("Install"))
+pkgOptionsI::pkgOptionsI(pkgInterface *pkg, TQWidget *tqparent):
+  pkgOptions(pkg, tqparent, i18n("Install"))
 {
   insType = i18n("Install");
   installer = TRUE;
@@ -357,8 +357,8 @@ TQString pkgOptionsI::doPackages(int installFlags, TQPtrList<packageInfo> *p, bo
 
 ///////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////
-pkgOptionsU::pkgOptionsU(pkgInterface *pkg, TQWidget *parent):
-  pkgOptions(pkg, parent, i18n("Uninstall"))
+pkgOptionsU::pkgOptionsU(pkgInterface *pkg, TQWidget *tqparent):
+  pkgOptions(pkg, tqparent, i18n("Uninstall"))
 {
   insType = i18n("Uninstall");
   installer = FALSE;