diff options
Diffstat (limited to 'kpackage')
-rw-r--r-- | kpackage/debAptInterface.cpp | 12 | ||||
-rw-r--r-- | kpackage/debDpkgInterface.cpp | 4 | ||||
-rw-r--r-- | kpackage/fbsdInterface.cpp | 2 | ||||
-rw-r--r-- | kpackage/findf.cpp | 10 | ||||
-rw-r--r-- | kpackage/kissInterface.cpp | 4 | ||||
-rw-r--r-- | kpackage/kpPty.cpp | 18 | ||||
-rw-r--r-- | kpackage/kpTerm.cpp | 28 | ||||
-rw-r--r-- | kpackage/kpackage.cpp | 46 | ||||
-rw-r--r-- | kpackage/managementWidget.cpp | 42 | ||||
-rw-r--r-- | kpackage/options.cpp | 22 | ||||
-rw-r--r-- | kpackage/packageDisplay.cpp | 48 | ||||
-rw-r--r-- | kpackage/pkgOptions.cpp | 18 | ||||
-rw-r--r-- | kpackage/procbuf.cpp | 14 | ||||
-rw-r--r-- | kpackage/rpmInterface.cpp | 4 | ||||
-rw-r--r-- | kpackage/search.cpp | 6 | ||||
-rw-r--r-- | kpackage/slackInterface.cpp | 4 | ||||
-rw-r--r-- | kpackage/tdeio.cpp | 12 | ||||
-rw-r--r-- | kpackage/updateLoc.cpp | 12 |
18 files changed, 153 insertions, 153 deletions
diff --git a/kpackage/debAptInterface.cpp b/kpackage/debAptInterface.cpp index d3451b7..5f0f067 100644 --- a/kpackage/debAptInterface.cpp +++ b/kpackage/debAptInterface.cpp @@ -60,8 +60,8 @@ DEBAPT::DEBAPT():DEB() locatedialog->dLocations(1, 8, this, i18n("Folders", "F"), "Deb", "*.deb", i18n("Location of Folders Containing Debian Packages")); - connect(locatedialog,TQT_SIGNAL(returnVal(LcacheObj *)), - this,TQT_SLOT(setAvail(LcacheObj *))); + connect(locatedialog,TQ_SIGNAL(returnVal(LcacheObj *)), + this,TQ_SLOT(setAvail(LcacheObj *))); locatedialog->apply_slot(); paramsInst.append(new param(i18n("Download only"),FALSE,FALSE,"-d")); @@ -102,19 +102,19 @@ void DEBAPT::makeMenu(TDEActionCollection* act) { updateM = new TDEAction( i18n("&Update"), TQString(), 0, this, - TQT_SLOT(updateS()), act, "debapt_update"); + TQ_SLOT(updateS()), act, "debapt_update"); upgradeM = new TDEAction( i18n("U&pgrade"), TQString(), 0, this, - TQT_SLOT(upgradeS()), act, "debapt_upgrade"); + TQ_SLOT(upgradeS()), act, "debapt_upgrade"); fixupM = new TDEAction( i18n("&Fixup"), TQString(), 0, this, - TQT_SLOT(fixupS()), act, "debapt_fixup"); + TQ_SLOT(fixupS()), act, "debapt_fixup"); fileM = new TDEAction( i18n("&Apt-File Update"), TQString(), 0, this, - TQT_SLOT(fileS()), act, "debapt_file"); + TQ_SLOT(fileS()), act, "debapt_file"); } void DEBAPT::setMenu(TDEActionCollection*, bool enable) diff --git a/kpackage/debDpkgInterface.cpp b/kpackage/debDpkgInterface.cpp index cb58908..ddacf75 100644 --- a/kpackage/debDpkgInterface.cpp +++ b/kpackage/debDpkgInterface.cpp @@ -77,8 +77,8 @@ DEBDPKG::DEBDPKG():DEB() locatedialog->dLocations(2, 6, this, i18n("Folders", "F"), "Deb", "*.deb", i18n("Location of Folders Containing Debian Packages")); - connect(locatedialog,TQT_SIGNAL(returnVal(LcacheObj *)), - this,TQT_SLOT(setAvail(LcacheObj *))); + connect(locatedialog,TQ_SIGNAL(returnVal(LcacheObj *)), + this,TQ_SLOT(setAvail(LcacheObj *))); locatedialog->apply_slot(); paramsInst.append(new param(i18n("Allow Downgrade"),TRUE,TRUE,"--refuse-downgrade")); diff --git a/kpackage/fbsdInterface.cpp b/kpackage/fbsdInterface.cpp index b6d3605..98174e2 100644 --- a/kpackage/fbsdInterface.cpp +++ b/kpackage/fbsdInterface.cpp @@ -74,7 +74,7 @@ fbsdInterface::fbsdInterface():pkgInterface() { i18n("Location of Ports Tree (e.g. /usr/ports or /usr/opt)"),FALSE); locatedialog->dLocations(1, 6, this, i18n("Packages"), "Pkg", "*.tbz", i18n("Location of Folders Containing BSD Packages or Package Trees")); - connect(locatedialog, TQT_SIGNAL(returnVal(LcacheObj *)), this, TQT_SLOT(setAvail(LcacheObj *))); + connect(locatedialog, TQ_SIGNAL(returnVal(LcacheObj *)), this, TQ_SLOT(setAvail(LcacheObj *))); locatedialog->apply_slot(); paramsInst.append(new param(i18n("Ignore Scripts"),FALSE,FALSE,"-I")); diff --git a/kpackage/findf.cpp b/kpackage/findf.cpp index 32a759d..2a39057 100644 --- a/kpackage/findf.cpp +++ b/kpackage/findf.cpp @@ -64,15 +64,15 @@ FindF::FindF(TQWidget *parent) gtop->setSpacing( KDialog::spacingHint() ); value = new TQLineEdit( frame1, "value" ); - connect(value,TQT_SIGNAL(textChanged ( const TQString & )),this,TQT_SLOT(textChanged ( const TQString & ))); + connect(value,TQ_SIGNAL(textChanged ( const TQString & )),this,TQ_SLOT(textChanged ( const TQString & ))); value->setFocus(); TQLabel *valueLabel = new TQLabel(value, i18n("Find:"), frame1); valueLabel->setAlignment( AlignRight ); tab = new TDEListView(frame1, "tab"); - connect(tab, TQT_SIGNAL(selectionChanged ( TQListViewItem * )), - this, TQT_SLOT(search( TQListViewItem * ))); + connect(tab, TQ_SIGNAL(selectionChanged ( TQListViewItem * )), + this, TQ_SLOT(search( TQListViewItem * ))); tab->addColumn(i18n("Installed"),18); tab->addColumn(i18n("Type"),110); tab->addColumn("",0); // Hidden column for package type @@ -94,8 +94,8 @@ FindF::FindF(TQWidget *parent) gtop->addWidget(searchAll, 2, 0); - connect(this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(ok_slot())); - connect(this, TQT_SIGNAL(closeClicked()), this, TQT_SLOT(done_slot())); + connect(this, TQ_SIGNAL(user1Clicked()), this, TQ_SLOT(ok_slot())); + connect(this, TQ_SIGNAL(closeClicked()), this, TQ_SLOT(done_slot())); enableButton(User1 , false); show(); diff --git a/kpackage/kissInterface.cpp b/kpackage/kissInterface.cpp index a882d5f..71a2a4e 100644 --- a/kpackage/kissInterface.cpp +++ b/kpackage/kissInterface.cpp @@ -74,8 +74,8 @@ KISS::KISS():pkgInterface() "KISS", "*.installer", i18n("Location of Folders Containing KISS Packages")); - connect(locatedialog,TQT_SIGNAL(returnVal(LcacheObj *)), - this,TQT_SLOT(setAvail(LcacheObj *))); + connect(locatedialog,TQ_SIGNAL(returnVal(LcacheObj *)), + this,TQ_SLOT(setAvail(LcacheObj *))); locatedialog->apply_slot(); queryMsg = i18n("Querying KISS package list: "); diff --git a/kpackage/kpPty.cpp b/kpackage/kpPty.cpp index 7be446f..cb1b416 100644 --- a/kpackage/kpPty.cpp +++ b/kpackage/kpPty.cpp @@ -61,12 +61,12 @@ kpKProcIO::~kpKProcIO() bool kpKProcIO::sstart (RunMode runmode) { - connect (this, TQT_SIGNAL (receivedStdout (TDEProcess *, char *, int)), - this, TQT_SLOT (received (TDEProcess *, char *, int))); + connect (this, TQ_SIGNAL (receivedStdout (TDEProcess *, char *, int)), + this, TQ_SLOT (received (TDEProcess *, char *, int))); - connect (this, TQT_SIGNAL (wroteStdin(TDEProcess *)), - this, TQT_SLOT (sent (TDEProcess *))); + connect (this, TQ_SIGNAL (wroteStdin(TDEProcess *)), + this, TQ_SLOT (sent (TDEProcess *))); return TDEProcess::start (runmode,( TDEProcess::Communication) ( TDEProcess::Stdin | TDEProcess::Stdout)); } @@ -78,13 +78,13 @@ kpPty::kpPty() : TQObject() pty = new kpKProcIO(); pty->setUsePty(TDEProcess::All, false); - connect(pty, TQT_SIGNAL(readReady(KProcIO *)), this, - TQT_SLOT(readLines())); - connect(pty, TQT_SIGNAL(processExited(TDEProcess *)), this, - TQT_SLOT(done())); + connect(pty, TQ_SIGNAL(readReady(KProcIO *)), this, + TQ_SLOT(readLines())); + connect(pty, TQ_SIGNAL(processExited(TDEProcess *)), this, + TQ_SLOT(done())); pty->pty()->setWinSize(0,80); tm = new TQTimer(this); - connect(tm, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeout())); + connect(tm, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimeout())); eventLoop = FALSE; inSession = FALSE; diff --git a/kpackage/kpTerm.cpp b/kpackage/kpTerm.cpp index 4f49dc4..cc94726 100644 --- a/kpackage/kpTerm.cpp +++ b/kpackage/kpTerm.cpp @@ -51,22 +51,22 @@ kpTerm::kpTerm(kpPty *pt, TQWidget * parent, const char * name ) : void kpTerm::doConnect() { - connect(pty, TQT_SIGNAL(textIn(const TQString &, bool)), this, - TQT_SLOT(textIn(const TQString &, bool))); - connect(pty,TQT_SIGNAL(result(TQStringList &, int)), - this,TQT_SLOT(slotResult(TQStringList &, int))); - connect(this, TQT_SIGNAL(keyOut(char)), pty, - TQT_SLOT(keyOut(char))); + connect(pty, TQ_SIGNAL(textIn(const TQString &, bool)), this, + TQ_SLOT(textIn(const TQString &, bool))); + connect(pty,TQ_SIGNAL(result(TQStringList &, int)), + this,TQ_SLOT(slotResult(TQStringList &, int))); + connect(this, TQ_SIGNAL(keyOut(char)), pty, + TQ_SLOT(keyOut(char))); } void kpTerm::doUnconnect() { - disconnect(pty, TQT_SIGNAL(textIn(const TQString &, bool)), this, - TQT_SLOT(textIn(const TQString &, bool))); - disconnect(pty,TQT_SIGNAL(result(TQStringList &, int)), - this,TQT_SLOT(slotResult(TQStringList &, int))); - disconnect(this, TQT_SIGNAL(keyOut(char)), pty, - TQT_SLOT(keyOut(char))); + disconnect(pty, TQ_SIGNAL(textIn(const TQString &, bool)), this, + TQ_SLOT(textIn(const TQString &, bool))); + disconnect(pty,TQ_SIGNAL(result(TQStringList &, int)), + this,TQ_SLOT(slotResult(TQStringList &, int))); + disconnect(this, TQ_SIGNAL(keyOut(char)), pty, + TQ_SLOT(keyOut(char))); } bool kpTerm::run(const TQString &cmd, TQStringList &r) @@ -182,8 +182,8 @@ kpRun::kpRun( TQWidget *parent) term = new kpTerm(kpty,page); resize(600, 300); - 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))); hide(); } diff --git a/kpackage/kpackage.cpp b/kpackage/kpackage.cpp index dc30f45..fb1d50f 100644 --- a/kpackage/kpackage.cpp +++ b/kpackage/kpackage.cpp @@ -93,53 +93,53 @@ KPKG::KPKG(TDEConfig *_config) void KPKG::setupMenu() { - pack_open = KStdAction::open(kpackage, TQT_SLOT(fileOpen()), + pack_open = KStdAction::open(kpackage, TQ_SLOT(fileOpen()), actionCollection()); - recent = KStdAction::openRecent(this, TQT_SLOT(openRecent(const KURL&)), + recent = KStdAction::openRecent(this, TQ_SLOT(openRecent(const KURL&)), actionCollection()); recent->loadEntries( config ); pack_find = new TDEAction( i18n("Find &Package..."), "edit-find", TDEStdAccel::shortcut(TDEStdAccel::Find), kpackage, - TQT_SLOT(find()), actionCollection(), "pack_find"); + TQ_SLOT(find()), actionCollection(), "pack_find"); pack_findf = new TDEAction( i18n("Find &File..."), "filefind", 0, kpackage, - TQT_SLOT(findf()), actionCollection(), "pack_findf"); + TQ_SLOT(findf()), actionCollection(), "pack_findf"); kpack_reload = new TDEAction( i18n("&Reload"), "reload", TDEStdAccel::shortcut(TDEStdAccel::Reload), kpackage, - TQT_SLOT(reload()), actionCollection(), "kpack_reload"); + TQ_SLOT(reload()), actionCollection(), "kpack_reload"); - (void) KStdAction::quit(kpackage, TQT_SLOT(fileQuit()), + (void) KStdAction::quit(kpackage, TQ_SLOT(fileQuit()), actionCollection()); - pack_prev = KStdAction::back(kpackage->management->treeList, TQT_SLOT(previous()), + pack_prev = KStdAction::back(kpackage->management->treeList, TQ_SLOT(previous()), actionCollection(),"pack_prev"); - pack_next = KStdAction::forward(kpackage->management->treeList, TQT_SLOT(next()), + pack_next = KStdAction::forward(kpackage->management->treeList, TQ_SLOT(next()), actionCollection(),"pack_next"); (void) (new TDEAction( i18n("&Expand Tree"), "ftout", 0, kpackage, - TQT_SLOT(expandTree()), actionCollection(), "kpack_expand")); + TQ_SLOT(expandTree()), actionCollection(), "kpack_expand")); (void) (new TDEAction( i18n("&Collapse Tree"), "ftin", 0, kpackage, - TQT_SLOT(collapseTree()), actionCollection(), "kpack_collapse")); + TQ_SLOT(collapseTree()), actionCollection(), "kpack_collapse")); (void) (new TDEAction( i18n("Clear &Marked"), TQString(), 0, kpackage, - TQT_SLOT(clearMarked()), actionCollection(), "kpack_clear")); + TQ_SLOT(clearMarked()), actionCollection(), "kpack_clear")); (void) (new TDEAction( i18n("Mark &All"), TQString(), 0, kpackage, - TQT_SLOT(markAll()), actionCollection(), "kpack_markall")); + TQ_SLOT(markAll()), actionCollection(), "kpack_markall")); pack_install = new TDEAction( i18n("&Install"), TQString(), 0, kpackage->management, - TQT_SLOT(installSingleClicked()), actionCollection(), "install_single"); + TQ_SLOT(installSingleClicked()), actionCollection(), "install_single"); pack_install->setEnabled(false); kpackage->management->setInstallAction(pack_install); @@ -147,7 +147,7 @@ void KPKG::setupMenu() pack_uninstall = new TDEAction( i18n("&Uninstall"), TQString(), 0, kpackage->management, - TQT_SLOT(uninstallSingleClicked()), actionCollection(), "uninstall_single"); + TQ_SLOT(uninstallSingleClicked()), actionCollection(), "uninstall_single"); pack_uninstall->setEnabled(false); kpackage->management->setUninstallAction(pack_uninstall); @@ -155,32 +155,32 @@ void KPKG::setupMenu() (void) (new TDEAction( i18n("&Install Marked"), TQString(), 0, kpackage->management, - TQT_SLOT(installMultClicked()), actionCollection(), "install_marked")); + TQ_SLOT(installMultClicked()), actionCollection(), "install_marked")); (void) (new TDEAction( i18n("&Uninstall Marked"), TQString(), 0, kpackage->management, - TQT_SLOT(uninstallMultClicked()), actionCollection(), "uninstall_marked")); + TQ_SLOT(uninstallMultClicked()), actionCollection(), "uninstall_marked")); setStandardToolBarMenuEnabled(true); - KStdAction::configureToolbars( this, TQT_SLOT(configureToolBars()), + KStdAction::configureToolbars( this, TQ_SLOT(configureToolBars()), actionCollection()); - KStdAction::saveOptions( this, TQT_SLOT(saveSettings()), actionCollection()); + KStdAction::saveOptions( this, TQ_SLOT(saveSettings()), actionCollection()); - KStdAction::keyBindings( guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection()); + KStdAction::keyBindings( guiFactory(), TQ_SLOT(configureShortcuts()), actionCollection()); (void) (new TDEAction( i18n("Configure &KPackage..."), "configure", 0, this, - TQT_SLOT(setOptions()), actionCollection(), "kpack_options")); + TQ_SLOT(setOptions()), actionCollection(), "kpack_options")); (void) (new TDEAction( i18n("Clear Package &Folder Cache"), TQString(), 0, this, - TQT_SLOT(clearDCache()), actionCollection(), "clear_dcache")); + TQ_SLOT(clearDCache()), actionCollection(), "clear_dcache")); (void) (new TDEAction( i18n("Clear &Package Cache"), TQString(), 0, this, - TQT_SLOT(clearPCache()), actionCollection(), "clear_pcache")); + TQ_SLOT(clearPCache()), actionCollection(), "clear_pcache")); int i; for (i = 0; i < kpinterfaceN; i++) { @@ -239,7 +239,7 @@ void KPKG::add_recent_file(const TQString &newfile){ void KPKG::configureToolBars() { KEditToolbar dlg(actionCollection()); - connect(&dlg,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(slotNewToolbarConfig())); + connect(&dlg,TQ_SIGNAL(newToolbarConfig()),this,TQ_SLOT(slotNewToolbarConfig())); dlg.exec(); } diff --git a/kpackage/managementWidget.cpp b/kpackage/managementWidget.cpp index 55293b5..9c515d4 100644 --- a/kpackage/managementWidget.cpp +++ b/kpackage/managementWidget.cpp @@ -91,8 +91,8 @@ managementWidget::managementWidget(TQWidget *parent) setupWidgets(); - connect(treeList,TQT_SIGNAL(updateMarked()), - this, TQT_SLOT( checkMarked())); + connect(treeList,TQ_SIGNAL(updateMarked()), + this, TQ_SLOT( checkMarked())); } managementWidget::~managementWidget() @@ -142,15 +142,15 @@ void managementWidget::setupWidgets() searchLine = new KpListViewSearchLine(searchToolBar, treeList); // searchLine->setKeepParentsVisible(false); - connect( clearSearch, TQT_SIGNAL( pressed() ), searchLine, TQT_SLOT( clear() )); + connect( clearSearch, TQ_SIGNAL( pressed() ), searchLine, TQ_SLOT( clear() )); TQValueList<int> clist; clist.append(0); clist.append(2); searchLine->setSearchColumns(clist); searchToolBar->setStretchableWidget( searchLine ); - connect( treeList, TQT_SIGNAL( cleared() ), searchLine, TQT_SLOT( clear() )); + connect( treeList, TQ_SIGNAL( cleared() ), searchLine, TQ_SLOT( clear() )); - connect(ltab,TQT_SIGNAL(selected (int)),TQT_SLOT(tabChanged(int))); + connect(ltab,TQ_SIGNAL(selected (int)),TQ_SLOT(tabChanged(int))); ltab->setCurrentTab(treeList->treeType); leftbox->addWidget(ltab,10); @@ -163,12 +163,12 @@ void managementWidget::setupWidgets() luinstButton = new TQPushButton(i18n("Uninstall Marked"),leftpanel); luinstButton->setEnabled(FALSE); - connect(luinstButton,TQT_SIGNAL(clicked()), - TQT_SLOT(uninstallMultClicked())); + connect(luinstButton,TQ_SIGNAL(clicked()), + TQ_SLOT(uninstallMultClicked())); linstButton = new TQPushButton(i18n("Install Marked"),leftpanel); linstButton->setEnabled(FALSE); - connect(linstButton,TQT_SIGNAL(clicked()), - TQT_SLOT(installMultClicked())); + connect(linstButton,TQ_SIGNAL(clicked()), + TQ_SLOT(installMultClicked())); leftbox->addLayout(lbuttons,0); // top level layout as child @@ -177,27 +177,27 @@ void managementWidget::setupWidgets() lbuttons->addWidget(luinstButton,1,AlignBottom); lbuttons->addStretch(1); - connect(treeList, TQT_SIGNAL(selectionChanged(TQListViewItem *)), - TQT_SLOT(packageHighlighted(TQListViewItem *))); + connect(treeList, TQ_SIGNAL(selectionChanged(TQListViewItem *)), + TQ_SLOT(packageHighlighted(TQListViewItem *))); // the right panel rightpanel = new TQFrame(vPan); rightbox = new TQBoxLayout(rightpanel,TQBoxLayout::TopToBottom); packageDisplay = new packageDisplayWidget(rightpanel); - // connect(this, TQT_SIGNAL(changePackage(packageInfo *)), - // packageDisplay, TQT_SLOT(changePackage(packageInfo *))); + // connect(this, TQ_SIGNAL(changePackage(packageInfo *)), + // packageDisplay, TQ_SLOT(changePackage(packageInfo *))); rbuttons = new TQBoxLayout(TQBoxLayout::LeftToRight); uinstButton = new TQPushButton(i18n("Uninstall"),rightpanel); uinstButton->setEnabled(FALSE); - connect(uinstButton,TQT_SIGNAL(clicked()), - TQT_SLOT(uninstallSingleClicked())); + connect(uinstButton,TQ_SIGNAL(clicked()), + TQ_SLOT(uninstallSingleClicked())); instButton = new TQPushButton(i18n("Install"),rightpanel); instButton->setEnabled(FALSE); - connect(instButton,TQT_SIGNAL(clicked()), - TQT_SLOT(installSingleClicked())); + connect(instButton,TQ_SIGNAL(clicked()), + TQ_SLOT(installSingleClicked())); // Setup the `right panel' layout @@ -312,12 +312,12 @@ void managementWidget::collectData(bool refresh) TQApplication::setOverrideCursor( waitCursor ); // stop clear() sending selectionChanged signal - disconnect(treeList, TQT_SIGNAL(selectionChanged(TQListViewItem *)), - this, TQT_SLOT(packageHighlighted(TQListViewItem *))); + disconnect(treeList, TQ_SIGNAL(selectionChanged(TQListViewItem *)), + this, TQ_SLOT(packageHighlighted(TQListViewItem *))); treeList->hide(); // hide list tree treeList->clear(); // empty it - connect(treeList, TQT_SIGNAL(selectionChanged(TQListViewItem *)), - TQT_SLOT(packageHighlighted(TQListViewItem *))); + connect(treeList, TQ_SIGNAL(selectionChanged(TQListViewItem *)), + TQ_SLOT(packageHighlighted(TQListViewItem *))); packageDisplay->changePackage(0); diff --git a/kpackage/options.cpp b/kpackage/options.cpp index 3f86743..22ddeb7 100644 --- a/kpackage/options.cpp +++ b/kpackage/options.cpp @@ -76,11 +76,11 @@ Options::Options(TQWidget *parent) hh = new TQGroupBox(1,TQt::Horizontal,i18n("Remote Host"),framet); huse = new TQCheckBox(i18n("Use remote host (Debian APT only):"),hh); - connect(huse, TQT_SIGNAL(clicked()), this, TQT_SLOT(useRemote())); + connect(huse, TQ_SIGNAL(clicked()), this, TQ_SLOT(useRemote())); hosts = new KComboBox( true, hh, "combo" ); TDECompletion *comp = hosts->completionObject(); - connect(hosts,TQT_SIGNAL(returnPressed(const TQString&)),comp,TQT_SLOT(addItem(const TQString&))); - connect(hosts,TQT_SIGNAL(returnPressed()),this,TQT_SLOT(insHosts())); + connect(hosts,TQ_SIGNAL(returnPressed(const TQString&)),comp,TQ_SLOT(addItem(const TQString&))); + connect(hosts,TQ_SIGNAL(returnPressed()),this,TQ_SLOT(insHosts())); hosts->setMaxCount(20); hosts->setDuplicatesEnabled(false); hosts->setInsertionPolicy(TQComboBox::AtTop); @@ -101,9 +101,9 @@ Options::Options(TQWidget *parent) } packageBox[i] = new TQGroupBox(2,TQt::Horizontal,msgStr, framet, "box"); packageHandle[i] = new TQCheckBox(i18n("Enable"), packageBox[i]); - connect(packageHandle[i], TQT_SIGNAL(clicked()), this, TQT_SLOT(scanLocates())); + connect(packageHandle[i], TQ_SIGNAL(clicked()), this, TQ_SLOT(scanLocates())); locate[i] = new TQPushButton(i18n("Location of Packages"),packageBox[i]); - connect(locate[i], TQT_SIGNAL(clicked()), kpinterface[i], TQT_SLOT(setLocation())); + connect(locate[i], TQ_SIGNAL(clicked()), kpinterface[i], TQ_SLOT(setLocation())); } else { packageHandle[i] = 0; } @@ -115,7 +115,7 @@ Options::Options(TQWidget *parent) bc = new TQButtonGroup(page); bc->setTitle(i18n("Cache Remote Package Folders")); - connect( bc, TQT_SIGNAL(clicked(int)), TQT_SLOT(PDCache(int)) ); + connect( bc, TQ_SIGNAL(clicked(int)), TQ_SLOT(PDCache(int)) ); TQVBoxLayout* vc = new TQVBoxLayout( bc, 15, 10, "vc"); vc->addSpacing( bc->fontMetrics().height() ); @@ -131,7 +131,7 @@ Options::Options(TQWidget *parent) bp = new TQButtonGroup(page); bp->setTitle(i18n("Cache Remote Package Files")); - connect( bp, TQT_SIGNAL(clicked(int)), TQT_SLOT(PPCache(int)) ); + connect( bp, TQ_SIGNAL(clicked(int)), TQ_SLOT(PPCache(int)) ); TQVBoxLayout* vp = new TQVBoxLayout( bp, 15, 10, "vp"); vp->addSpacing( bp->fontMetrics().height() ); @@ -160,7 +160,7 @@ Options::Options(TQWidget *parent) bs = new TQButtonGroup(page); bs->setTitle(i18n("Execute Privileged Commands Using")); - connect( bs, TQT_SIGNAL(clicked(int)), TQT_SLOT(PPrivs(int)) ); + connect( bs, TQ_SIGNAL(clicked(int)), TQ_SLOT(PPrivs(int)) ); TQVBoxLayout* vs = new TQVBoxLayout( bs, 15, 10, "bs"); vs->addSpacing( bs->fontMetrics().height() ); @@ -183,9 +183,9 @@ Options::Options(TQWidget *parent) vf->addSpacing(100); } - connect( this, TQT_SIGNAL(okClicked()), TQT_SLOT(apply_slot()) ); - connect( this, TQT_SIGNAL(closeClicked()), TQT_SLOT(cancel_slot()) ); - connect( this, TQT_SIGNAL(cancelClicked()), TQT_SLOT(cancel_slot()) ); + connect( this, TQ_SIGNAL(okClicked()), TQ_SLOT(apply_slot()) ); + connect( this, TQ_SIGNAL(closeClicked()), TQ_SLOT(cancel_slot()) ); + connect( this, TQ_SIGNAL(cancelClicked()), TQ_SLOT(cancel_slot()) ); setValues(); diff --git a/kpackage/packageDisplay.cpp b/kpackage/packageDisplay.cpp index 57d1ed7..e7a4114 100644 --- a/kpackage/packageDisplay.cpp +++ b/kpackage/packageDisplay.cpp @@ -87,10 +87,10 @@ void packageDisplayWidget::setupWidgets() packageProperties = new packagePropertiesWidget(proptab); fileList = new kpFileList(fltab, this); - connect(fileList, TQT_SIGNAL(executed(TQListViewItem *)), - this, TQT_SLOT( openBinding(TQListViewItem *)) ); - connect(fileList, TQT_SIGNAL(returnPressed(TQListViewItem *)), - this, TQT_SLOT( openBinding(TQListViewItem *)) ); + connect(fileList, TQ_SIGNAL(executed(TQListViewItem *)), + this, TQ_SLOT( openBinding(TQListViewItem *)) ); + connect(fileList, TQ_SIGNAL(returnPressed(TQListViewItem *)), + this, TQ_SLOT( openBinding(TQListViewItem *)) ); changeLog = new TQTextEdit(cltab); @@ -105,7 +105,7 @@ void packageDisplayWidget::setupWidgets() if (isTabEnabled(proptab)) setTabEnabled(proptab,false); - connect(this,TQT_SIGNAL(currentChanged(TQWidget *)), this, TQT_SLOT(tabSelected(TQWidget *))); + connect(this,TQ_SIGNAL(currentChanged(TQWidget *)), this, TQ_SLOT(tabSelected(TQWidget *))); } void packageDisplayWidget::tabSelected(TQWidget *tab) @@ -116,7 +116,7 @@ void packageDisplayWidget::tabSelected(TQWidget *tab) void packageDisplayWidget::tabSet(TQWidget *tab) { - disconnect(this,TQT_SIGNAL(currentChanged(TQWidget *)), this, TQT_SLOT(tabSelected(TQWidget *))); + disconnect(this,TQ_SIGNAL(currentChanged(TQWidget *)), this, TQ_SLOT(tabSelected(TQWidget *))); if(tab == proptab) { packageProperties->show(); fileList->hide(); @@ -146,12 +146,12 @@ void packageDisplayWidget::tabSet(TQWidget *tab) } setCurrentPage(2); } - connect(this,TQT_SIGNAL(currentChanged(TQWidget *)), this, TQT_SLOT(tabSelected(TQWidget *))); + connect(this,TQ_SIGNAL(currentChanged(TQWidget *)), this, TQ_SLOT(tabSelected(TQWidget *))); } void packageDisplayWidget::noPackage() { - disconnect(this,TQT_SIGNAL(currentChanged(TQWidget *)), this, TQT_SLOT(tabSelected(TQWidget *))); + disconnect(this,TQ_SIGNAL(currentChanged(TQWidget *)), this, TQ_SLOT(tabSelected(TQWidget *))); if (isTabEnabled(fltab)) { fileList->setColumnText(0,""); @@ -168,7 +168,7 @@ void packageDisplayWidget::noPackage() fileList->clear(); changeLog->setText(""); - connect(this,TQT_SIGNAL(currentChanged(TQWidget *)), this, TQT_SLOT(tabSelected(TQWidget *))); + connect(this,TQ_SIGNAL(currentChanged(TQWidget *)), this, TQ_SLOT(tabSelected(TQWidget *))); } // Change packages @@ -177,12 +177,12 @@ void packageDisplayWidget::changePackage(packageInfo *p) // This is to stop selectionChanged firing off here - disconnect(fileList, TQT_SIGNAL(executed(TQListViewItem *)), - this, TQT_SLOT( openBinding(TQListViewItem *)) ); - disconnect(fileList, TQT_SIGNAL(returnPressed(TQListViewItem *)), - this, TQT_SLOT( openBinding(TQListViewItem *)) ); - disconnect(fileList, TQT_SIGNAL(contextMenu(TDEListView *, TQListViewItem *, const TQPoint &)), - fileList, TQT_SLOT( openContext(TDEListView *, TQListViewItem *, const TQPoint &)) ); + disconnect(fileList, TQ_SIGNAL(executed(TQListViewItem *)), + this, TQ_SLOT( openBinding(TQListViewItem *)) ); + disconnect(fileList, TQ_SIGNAL(returnPressed(TQListViewItem *)), + this, TQ_SLOT( openBinding(TQListViewItem *)) ); + disconnect(fileList, TQ_SIGNAL(contextMenu(TDEListView *, TQListViewItem *, const TQPoint &)), + fileList, TQ_SLOT( openContext(TDEListView *, TQListViewItem *, const TQPoint &)) ); if (package && package != p) { @@ -230,12 +230,12 @@ void packageDisplayWidget::changePackage(packageInfo *p) } - connect(fileList, TQT_SIGNAL(executed(TQListViewItem *)), - this, TQT_SLOT( openBinding(TQListViewItem *)) ); - connect(fileList, TQT_SIGNAL(returnPressed(TQListViewItem *)), - this, TQT_SLOT( openBinding(TQListViewItem *)) ); - connect(fileList, TQT_SIGNAL(contextMenu(TDEListView *, TQListViewItem *, const TQPoint &)), - fileList, TQT_SLOT( openContext(TDEListView *, TQListViewItem *, const TQPoint &)) ); + connect(fileList, TQ_SIGNAL(executed(TQListViewItem *)), + this, TQ_SLOT( openBinding(TQListViewItem *)) ); + connect(fileList, TQ_SIGNAL(returnPressed(TQListViewItem *)), + this, TQ_SLOT( openBinding(TQListViewItem *)) ); + connect(fileList, TQ_SIGNAL(contextMenu(TDEListView *, TQListViewItem *, const TQPoint &)), + fileList, TQ_SLOT( openContext(TDEListView *, TQListViewItem *, const TQPoint &)) ); } @@ -368,11 +368,11 @@ void packageDisplayWidget::updateFileList() hide(); addColumn("name"); setRootIsDecorated(TRUE); - connect(this, TQT_SIGNAL(contextMenu(TDEListView *, TQListViewItem *, const TQPoint &)), - this, TQT_SLOT( openContext(TDEListView *, TQListViewItem *, const TQPoint &)) ); + connect(this, TQ_SIGNAL(contextMenu(TDEListView *, TQListViewItem *, const TQPoint &)), + this, TQ_SLOT( openContext(TDEListView *, TQListViewItem *, const TQPoint &)) ); FileListMenu = new TDEPopupMenu(); - openwith = FileListMenu->insertItem(i18n("&Open With..."),parent2,TQT_SLOT(__openBindingWith())); + openwith = FileListMenu->insertItem(i18n("&Open With..."),parent2,TQ_SLOT(__openBindingWith())); pkDisplay = parent2; } diff --git a/kpackage/pkgOptions.cpp b/kpackage/pkgOptions.cpp index e817736..f90a7a2 100644 --- a/kpackage/pkgOptions.cpp +++ b/kpackage/pkgOptions.cpp @@ -96,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()); @@ -114,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++) { @@ -236,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); @@ -267,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; } diff --git a/kpackage/procbuf.cpp b/kpackage/procbuf.cpp index af94200..73372fa 100644 --- a/kpackage/procbuf.cpp +++ b/kpackage/procbuf.cpp @@ -48,7 +48,7 @@ procbuf::procbuf() { m = NULL; tm = new TQTimer(this); - connect(tm, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeout())); + connect(tm, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimeout())); } procbuf::~procbuf() @@ -59,12 +59,12 @@ void procbuf::setup(TQString cmd) { buf.truncate(0); proc = new TDEProcess(); - connect(proc, TQT_SIGNAL( receivedStdout(TDEProcess *, char *, int)), - this, TQT_SLOT(slotReadInfo(TDEProcess *, char *, int))); - connect(proc, TQT_SIGNAL( receivedStderr(TDEProcess *, char *, int)), - this, TQT_SLOT(slotReadInfo(TDEProcess *, char *, int))); - connect(proc, TQT_SIGNAL( processExited(TDEProcess *)), - this, TQT_SLOT(slotExited(TDEProcess *))); + connect(proc, TQ_SIGNAL( receivedStdout(TDEProcess *, char *, int)), + this, TQ_SLOT(slotReadInfo(TDEProcess *, char *, int))); + connect(proc, TQ_SIGNAL( receivedStderr(TDEProcess *, char *, int)), + this, TQ_SLOT(slotReadInfo(TDEProcess *, char *, int))); + connect(proc, TQ_SIGNAL( processExited(TDEProcess *)), + this, TQ_SLOT(slotExited(TDEProcess *))); proc->clearArguments(); *proc << cmd; command = cmd; diff --git a/kpackage/rpmInterface.cpp b/kpackage/rpmInterface.cpp index 66d4154..8a37844 100644 --- a/kpackage/rpmInterface.cpp +++ b/kpackage/rpmInterface.cpp @@ -59,8 +59,8 @@ RPM::RPM():pkgInterface() locatedialog->dLocations(7,6, this, i18n("Folder","F"), "Rpm","*.rpm", i18n("Location of Folders Containing RPM Packages")); - connect(locatedialog,TQT_SIGNAL(returnVal(LcacheObj *)), - this,TQT_SLOT(setAvail(LcacheObj *))); + connect(locatedialog,TQ_SIGNAL(returnVal(LcacheObj *)), + this,TQ_SLOT(setAvail(LcacheObj *))); locatedialog->apply_slot(); paramsInst.append(new param(i18n("Upgrade"),TRUE,FALSE,"-U","-i")); diff --git a/kpackage/search.cpp b/kpackage/search.cpp index 1ea4c5f..3782257 100644 --- a/kpackage/search.cpp +++ b/kpackage/search.cpp @@ -56,7 +56,7 @@ Search::Search(TQWidget *parent, const char * name) value->setFocus(); value->setFixedHeight(value->sizeHint().height()); value->setMinimumWidth(250); - connect(value, TQT_SIGNAL(textChanged(const TQString &)),this, TQT_SLOT(textChanged(const TQString &))); + connect(value, TQ_SIGNAL(textChanged(const TQString &)),this, TQ_SLOT(textChanged(const TQString &))); TQHBoxLayout* hc = new TQHBoxLayout( ); vf->addLayout(hc,0); @@ -74,8 +74,8 @@ Search::Search(TQWidget *parent, const char * name) enableButton( User1, false ); - connect(this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(ok_slot())); - connect(this, TQT_SIGNAL(closeClicked()), this, TQT_SLOT(done_slot())); + connect(this, TQ_SIGNAL(user1Clicked()), this, TQ_SLOT(ok_slot())); + connect(this, TQ_SIGNAL(closeClicked()), this, TQ_SLOT(done_slot())); show(); } diff --git a/kpackage/slackInterface.cpp b/kpackage/slackInterface.cpp index 84e07a6..bf2be7b 100644 --- a/kpackage/slackInterface.cpp +++ b/kpackage/slackInterface.cpp @@ -92,8 +92,8 @@ SLACK::SLACK():pkgInterface() "Slackware", "*.tgz *.tar.gz", i18n("Location of Folders Containing Slackware Packages")); - connect(locatedialog,TQT_SIGNAL(returnVal(LcacheObj *)), - this,TQT_SLOT(setAvail(LcacheObj *))); + connect(locatedialog,TQ_SIGNAL(returnVal(LcacheObj *)), + this,TQ_SLOT(setAvail(LcacheObj *))); locatedialog->apply_slot(); paramsInst.append(new param(i18n("Test (do not install)"),FALSE,FALSE,"-warn")); diff --git a/kpackage/tdeio.cpp b/kpackage/tdeio.cpp index 6ecfd34..6669137 100644 --- a/kpackage/tdeio.cpp +++ b/kpackage/tdeio.cpp @@ -35,8 +35,8 @@ Kio::Kio() bool Kio::download(const KURL & from, const TQString & to) { TDEIO::Job *iojob = TDEIO::file_copy(from, to); - connect( iojob, TQT_SIGNAL( result(TDEIO::Job*) ), - TQT_SLOT( slotIOJobFinished( TDEIO::Job* ))); + connect( iojob, TQ_SIGNAL( result(TDEIO::Job*) ), + TQ_SLOT( slotIOJobFinished( TDEIO::Job* ))); // missing modal widget hack here. // I'd recommend using TDEIO::NetAccess instead (David). kapp->enter_loop(); @@ -76,10 +76,10 @@ bool Kiod::listDir(const TQString &url, const TQString &fname, bool subdirs) kdDebug() << "started " << job << " " << subdirs << endl; - TQObject::connect( job, TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ), - TQT_SLOT( slotListEntries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) ); - TQObject::connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotFinished( TDEIO::Job* ) ) ); + TQObject::connect( job, TQ_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ), + TQ_SLOT( slotListEntries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) ); + TQObject::connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotFinished( TDEIO::Job* ) ) ); kapp->enter_loop(); diff --git a/kpackage/updateLoc.cpp b/kpackage/updateLoc.cpp index 5f125db..8d89602 100644 --- a/kpackage/updateLoc.cpp +++ b/kpackage/updateLoc.cpp @@ -114,7 +114,7 @@ dpanel::dpanel( TQWidget *parent, const char * name ) pbut = new TQPushButton("...",this); pack->addWidget(pbut,0); - connect(pbut, TQT_SIGNAL(clicked()), this, TQT_SLOT(dirOpen())); + connect(pbut, TQ_SIGNAL(clicked()), this, TQ_SLOT(dirOpen())); } } @@ -148,9 +148,9 @@ dpanel::dpanel(dpanel *basep, const TQString &Pfilter, bool bsubdirs, pack->addWidget(pbut,0); if (base) - connect(pbut, TQT_SIGNAL(clicked()), this, TQT_SLOT(fileOpen())); + connect(pbut, TQ_SIGNAL(clicked()), this, TQ_SLOT(fileOpen())); else - connect(pbut, TQT_SIGNAL(clicked()), this, TQT_SLOT(dirOpen())); + connect(pbut, TQ_SIGNAL(clicked()), this, TQ_SLOT(dirOpen())); } } @@ -554,8 +554,8 @@ cUpdateLoc::cUpdateLoc(TQWidget *p, int panelNumber, pkgInterface *inter, const combo[i] = new KComboBox( true, floc); TDECompletion *comp = combo[i]->completionObject(); - connect(combo[i],TQT_SIGNAL(returnPressed(const TQString&)) - ,comp,TQT_SLOT(addItem(const TQString&))); + connect(combo[i],TQ_SIGNAL(returnPressed(const TQString&)) + ,comp,TQ_SLOT(addItem(const TQString&))); combo[i]->insertStringList(TQStringList::split(' ',*ocIt)); vloc->addWidget(combo[i]); if (kcIt != kc.end()) { @@ -647,7 +647,7 @@ Locations::Locations(const TQString &msg) { numPanels = 0; - connect( this, TQT_SIGNAL(okClicked()), TQT_SLOT(write_slot()) ); + connect( this, TQ_SIGNAL(okClicked()), TQ_SLOT(write_slot()) ); } void Locations::dLocations(int numberDirs, int numberLines, |