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

diff --git a/kpackage/managementWidget.cpp b/kpackage/managementWidget.cpp
index e8dbcb6..2d30f5b 100644
--- a/kpackage/managementWidget.cpp
+++ b/kpackage/managementWidget.cpp
@@ -52,8 +52,8 @@
 
 extern Opts *opts;
 
-KpListViewSearchLine::KpListViewSearchLine(TQWidget *parent, KpTreeList *listView)  
-  :KListViewSearchLine(parent, listView)
+KpListViewSearchLine::KpListViewSearchLine(TQWidget *tqparent, KpTreeList *listView)  
+  :KListViewSearchLine(tqparent, listView)
 {
   list = listView;
 }
@@ -72,8 +72,8 @@ void KpListViewSearchLine::updateSearch(const TQString &s)
 
 
 // constructor -- initialise variables
-managementWidget::managementWidget(TQWidget *parent)
-  : TQFrame(parent)
+managementWidget::managementWidget(TQWidget *tqparent)
+  : TQFrame(tqparent)
 {
   install_action = 0;
   uninstall_action = 0;
@@ -114,7 +114,7 @@ void managementWidget::setupWidgets()
   TQTab t;
 
   top = new TQBoxLayout(this,TQBoxLayout::TopToBottom);
-  vPan  = new TQSplitter(TQSplitter::Horizontal, this);
+  vPan  = new TQSplitter(Qt::Horizontal, this);
   top->addWidget(vPan);
 
   // the left panel
@@ -170,9 +170,9 @@ void managementWidget::setupWidgets()
   connect(linstButton,TQT_SIGNAL(clicked()),
 	  TQT_SLOT(installMultClicked()));
 
-  leftbox->addLayout(lbuttons,0); // top level layout as child
+  leftbox->addLayout(lbuttons,0); // top level tqlayout as child
 
-  // Setup the `buttons' layout
+  // Setup the `buttons' tqlayout
   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' layout
+  // Setup the `right panel' tqlayout
   rightbox->addWidget(packageDisplay,10);
-  rightbox->addLayout(rbuttons,0); // top level layout as child
+  rightbox->addLayout(rbuttons,0); // top level tqlayout as child
 
-  // Setup the `buttons' layout
+  // Setup the `buttons' tqlayout
   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 layout managers
+  // this is done automatically by the tqlayout managers
 }
 
 void managementWidget::tabChanged(int tab)
@@ -352,7 +352,7 @@ void managementWidget::rebuildListTree()
   packageInfo *i;
   int  n = 0;
 
-  kpackage->setStatus(i18n("Building package tree"));
+  kpackage->settqStatus(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->setStatus("");
+  kpackage->settqStatus("");
 
   checkMarked();
 }
@@ -623,7 +623,7 @@ KpTreeListItem *managementWidget::updatePackage(packageInfo *pki, bool install)
     if (install) {
       if (pnew) {
 	if (pnew->packageState !=  packageInfo::BAD_INSTALL) {
-	  ptree = dirInstPackages->find(pkgId); // remove installed entry
+	  ptree = dirInstPackages->tqfind(pkgId); // remove installed entry
 	  dirInstPackages->remove(pkgId);
 	  if (ptree) {
 	    if (ptree->getItem()) {
@@ -632,7 +632,7 @@ KpTreeListItem *managementWidget::updatePackage(packageInfo *pki, bool install)
 	    }
 	  }
 
-	  ptree = dirUninstPackages->find(pkgId); // remove uninstalled entry
+	  ptree = dirUninstPackages->tqfind(pkgId); // remove uninstalled entry
 	  if (ptree) {
 	    ptree->packageState = packageInfo::HIDDEN;
 	    if (ptree->getItem()) {
@@ -665,7 +665,7 @@ KpTreeListItem *managementWidget::updatePackage(packageInfo *pki, bool install)
 	} else {
 	  kdDebug() << "DEL=" << name << endl;
 	}
-	packageInfo *pb = dirUninstPackages->find(pkgId);
+	packageInfo *pb = dirUninstPackages->tqfind(pkgId);
 	if (pb) { // available package matching the one just uninstalled
 	  pb->packageState = packageInfo::NEW;
 	  q = pb->place(treeList,TRUE);