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, 17 insertions, 17 deletions

diff --git a/kpackage/updateLoc.cpp b/kpackage/updateLoc.cpp
index 60e43e4..ba33f06 100644
--- a/kpackage/updateLoc.cpp
+++ b/kpackage/updateLoc.cpp
@@ -40,9 +40,9 @@
 
 //////////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////
-apanel::apanel( TQWidget *parent,
+apanel::apanel( TQWidget *tqparent,
               const char * name )
-   : TQWidget( parent, name )
+   : TQWidget( tqparent, name )
 {
   puse = 0;
 
@@ -99,8 +99,8 @@ void apanel::clear()
 
 //////////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////
-dpanel::dpanel( TQWidget *parent, const char * name )
-   : TQWidget( parent, name )
+dpanel::dpanel( TQWidget *tqparent, const char * name )
+   : TQWidget( tqparent, name )
 {
   puse = 0;
   psubdirs = 0;
@@ -120,8 +120,8 @@ dpanel::dpanel( TQWidget *parent, const char * name )
 }
 
 dpanel::dpanel(dpanel *basep,  const TQString &Pfilter,  bool bsubdirs,
-	       TQWidget *parent, const char * name )
-   : TQWidget( parent, name )
+	       TQWidget *tqparent, const char * name )
+   : TQWidget( tqparent, name )
 {
   filter = Pfilter;
   puse = 0;
@@ -140,7 +140,7 @@ dpanel::dpanel(dpanel *basep,  const TQString &Pfilter,  bool bsubdirs,
 
     if (bsubdirs) {
       psubdirs = new TQCheckBox(i18n("Subfolders"),this);
-      psubdirs->setFixedSize(psubdirs->sizeHint());
+      psubdirs->setFixedSize(psubdirs->tqsizeHint());
       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->layout()->setSpacing( KDialog::spacingHint() );
-    fbase->layout()->setMargin( KDialog::marginHint() );
-    vbase = new TQVBoxLayout(fbase->layout());
+    fbase->tqlayout()->setSpacing( KDialog::spacingHint() );
+    fbase->tqlayout()->setMargin( KDialog::marginHint() );
+    vbase = new TQVBoxLayout(fbase->tqlayout());
     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->layout()->setSpacing( KDialog::spacingHint() );
-  floc->layout()->setMargin( KDialog::marginHint() );
+  floc->tqlayout()->setSpacing( KDialog::spacingHint() );
+  floc->tqlayout()->setMargin( KDialog::marginHint() );
   vf->addWidget(floc,1);
-  TQVBoxLayout *vloc = new TQVBoxLayout(floc->layout());
+  TQVBoxLayout *vloc = new TQVBoxLayout(floc->tqlayout());
 
   for (int i = 0; i < numLines; i++) {
     dp[i] = new dpanel(base, filter,  subdirs, floc);
@@ -452,7 +452,7 @@ void pdUpdateLoc::applyS(LcacheObj *slist)
     if (dp[i]->getUse()) {
       t = dp[i]->getText();
       if (!t.isEmpty()) {
-	CObj = new cacheObj(haveBase ? base->getText() : TQString::null,
+	CObj = new cacheObj(haveBase ? base->getText() : TQString(),
 			    t, cn + pn.setNum(i), "", dp[i]->getSubdirs());
 	slist->append(CObj);
 	//	printf("T=%s\n",t.data());
@@ -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->layout()->setSpacing( KDialog::spacingHint() );
-    floc->layout()->setMargin( KDialog::marginHint() );
+    floc->tqlayout()->setSpacing( KDialog::spacingHint() );
+    floc->tqlayout()->setMargin( KDialog::marginHint() );
     vf->addWidget(floc,1);
-    TQVBoxLayout *vloc = new TQVBoxLayout(floc->layout());
+    TQVBoxLayout *vloc = new TQVBoxLayout(floc->tqlayout());
 
     combo[i] = new KComboBox( true, floc);
     KCompletion *comp = combo[i]->completionObject();