1 files changed, 11 insertions, 13 deletions

diff --git a/kpackage/pkgOptions.cpp b/kpackage/pkgOptions.cpp
index acf9c4f..38479d4 100644
--- a/kpackage/pkgOptions.cpp
+++ b/kpackage/pkgOptions.cpp
@@ -79,8 +79,6 @@ void pkgOptions::setupWidgets(TQPtrList<param> &pars)
   f.setBold(true);
   f.setPointSize(f.pointSize()+6);
   title->setFont(f);
-  //  title->setAutoResize(TRUE);
-  //  title->update();
 
   installButton = new TQPushButton(insType,this);
   cancelButton = new KPushButton(KStdGuiItem::cancel(),this);
@@ -98,9 +96,9 @@ void pkgOptions::setupWidgets(TQPtrList<param> &pars)
   Keep = new TQCheckBox(i18n("Keep this window"), this);
 
   // Connections
-  connect(installButton,TQT_SIGNAL(clicked()),TQT_SLOT(pkginstallButtonClicked()));
-  connect(cancelButton,TQT_SIGNAL(clicked()),TQT_SLOT(cancelButtonClicked()));
-  connect(Keep, TQT_SIGNAL(toggled(bool)), TQT_SLOT(keepToggle(bool)));
+  connect(installButton,TQ_SIGNAL(clicked()),TQ_SLOT(pkginstallButtonClicked()));
+  connect(cancelButton,TQ_SIGNAL(clicked()),TQ_SLOT(cancelButtonClicked()));
+  connect(Keep, TQ_SIGNAL(toggled(bool)), TQ_SLOT(keepToggle(bool)));
 
   // Do the layout
   vlayout = new TQBoxLayout(this, TQBoxLayout::TopToBottom, marginHint(), spacingHint());
@@ -116,8 +114,8 @@ void pkgOptions::setupWidgets(TQPtrList<param> &pars)
       layout->addWidget(packages,20);
       packages->addColumn(i18n("PACKAGES"),200);
 
-      connect(packages, TQT_SIGNAL(selectionChanged ( TQListViewItem * )),
-	    this, TQT_SLOT(slotSearch( TQListViewItem * )));
+      connect(packages, TQ_SIGNAL(selectionChanged ( TQListViewItem * )),
+	    this, TQ_SLOT(slotSearch( TQListViewItem * )));
 
       layout->addStretch(1);
       for (i = 0; i < bnumber; i++) {
@@ -238,8 +236,8 @@ void pkgOptions::pkginstallButtonClicked()
   } else if (s.left(2) == "1=") {
     term->textIn(s.mid(2), true);
   } else {
-    connect(term,TQT_SIGNAL(result(TQStringList &, int)),
-	 this,TQT_SLOT(slotResult(TQStringList &, int)));
+    connect(term,TQ_SIGNAL(result(TQStringList &, int)),
+	 this,TQ_SLOT(slotResult(TQStringList &, int)));
 
     installButton->setEnabled(FALSE);
 
@@ -269,8 +267,8 @@ void pkgOptions::slotSearch(TQListViewItem *item)
 void pkgOptions::reset() {
   installButton->setEnabled(TRUE);
   cancelButton->setGuiItem(KGuiItem(i18n("Done")));  //clear icon
-  disconnect(term,TQT_SIGNAL(result(TQStringList &, int)),
-	 this,TQT_SLOT(slotResult(TQStringList &, int)));
+  disconnect(term,TQ_SIGNAL(result(TQStringList &, int)),
+	 this,TQ_SLOT(slotResult(TQStringList &, int)));
   running = FALSE;
 }
 
@@ -322,7 +320,7 @@ void pkgOptions::keepToggle(bool kp)
 {
   //  kdDebug() << "KEEP " << kp << "\n";
 
-  TDEConfig *config = kapp->config();
+  TDEConfig *config = tdeApp->config();
 
   config->setGroup("Kpackage");
   config->writeEntry("keepIWin", kp);
@@ -332,7 +330,7 @@ void pkgOptions::keepToggle(bool kp)
 
 void pkgOptions::getKeep()
 {
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup("Kpackage");
     keep =  config->readBoolEntry("keepIWin", true);
   kdDebug() << "getKEEP " << keep << "\n";