From b09bffed6b43262948018dfb0f11890850ddf7c1 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 18 Jun 2011 20:34:22 +0000 Subject: 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 --- kpackage/kpackage.cpp | 92 +++++++++++++++++++++++++-------------------------- 1 file changed, 46 insertions(+), 46 deletions(-) (limited to 'kpackage/kpackage.cpp') diff --git a/kpackage/kpackage.cpp b/kpackage/kpackage.cpp index c5dd2eb..670b4b6 100644 --- a/kpackage/kpackage.cpp +++ b/kpackage/kpackage.cpp @@ -93,93 +93,93 @@ KPKG::KPKG(KConfig *_config) void KPKG::setupMenu() { - pack_open = KStdAction::open(kpackage, TQT_SLOT(fileOpen()), + pack_open = KStdAction::open(TQT_TQOBJECT(kpackage), TQT_SLOT(fileOpen()), actionCollection()); - recent = KStdAction::openRecent(this, TQT_SLOT(openRecent(const KURL&)), + recent = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(openRecent(const KURL&)), actionCollection()); recent->loadEntries( config ); - pack_find = new KAction( i18n("Find &Package..."), "find", - KStdAccel::shortcut(KStdAccel::Find), kpackage, - TQT_SLOT(find()), actionCollection(), "pack_find"); + pack_tqfind = new KAction( i18n("Find &Package..."), "tqfind", + KStdAccel::shortcut(KStdAccel::Find), TQT_TQOBJECT(kpackage), + TQT_SLOT(tqfind()), actionCollection(), "pack_tqfind"); - pack_findf = new KAction( i18n("Find &File..."), "filefind", - 0, kpackage, + pack_findf = new KAction( i18n("Find &File..."), "filetqfind", + 0, TQT_TQOBJECT(kpackage), TQT_SLOT(findf()), actionCollection(), "pack_findf"); kpack_reload = new KAction( i18n("&Reload"), "reload", - KStdAccel::shortcut(KStdAccel::Reload), kpackage, + KStdAccel::shortcut(KStdAccel::Reload), TQT_TQOBJECT(kpackage), TQT_SLOT(reload()), actionCollection(), "kpack_reload"); - (void) KStdAction::quit(kpackage, TQT_SLOT(fileQuit()), + (void) KStdAction::quit(TQT_TQOBJECT(kpackage), TQT_SLOT(fileQuit()), actionCollection()); - pack_prev = KStdAction::back(kpackage->management->treeList, TQT_SLOT(previous()), + pack_prev = KStdAction::back(TQT_TQOBJECT(kpackage->management->treeList), TQT_SLOT(previous()), actionCollection(),"pack_prev"); - pack_next = KStdAction::forward(kpackage->management->treeList, TQT_SLOT(next()), + pack_next = KStdAction::forward(TQT_TQOBJECT(kpackage->management->treeList), TQT_SLOT(next()), actionCollection(),"pack_next"); (void) (new KAction( i18n("&Expand Tree"), "ftout", - 0, kpackage, + 0, TQT_TQOBJECT(kpackage), TQT_SLOT(expandTree()), actionCollection(), "kpack_expand")); (void) (new KAction( i18n("&Collapse Tree"), "ftin", - 0, kpackage, + 0, TQT_TQOBJECT(kpackage), TQT_SLOT(collapseTree()), actionCollection(), "kpack_collapse")); - (void) (new KAction( i18n("Clear &Marked"), TQString::null, - 0, kpackage, + (void) (new KAction( i18n("Clear &Marked"), TQString(), + 0, TQT_TQOBJECT(kpackage), TQT_SLOT(clearMarked()), actionCollection(), "kpack_clear")); - (void) (new KAction( i18n("Mark &All"), TQString::null, - 0, kpackage, + (void) (new KAction( i18n("Mark &All"), TQString(), + 0, TQT_TQOBJECT(kpackage), TQT_SLOT(markAll()), actionCollection(), "kpack_markall")); - pack_install = new KAction( i18n("&Install"), TQString::null, - 0, kpackage->management, + pack_install = new KAction( i18n("&Install"), TQString(), + 0, TQT_TQOBJECT(kpackage->management), TQT_SLOT(installSingleClicked()), actionCollection(), "install_single"); pack_install->setEnabled(false); kpackage->management->setInstallAction(pack_install); - pack_uninstall = new KAction( i18n("&Uninstall"), TQString::null, - 0, kpackage->management, + pack_uninstall = new KAction( i18n("&Uninstall"), TQString(), + 0, TQT_TQOBJECT(kpackage->management), TQT_SLOT(uninstallSingleClicked()), actionCollection(), "uninstall_single"); pack_uninstall->setEnabled(false); kpackage->management->setUninstallAction(pack_uninstall); - (void) (new KAction( i18n("&Install Marked"), TQString::null, - 0, kpackage->management, + (void) (new KAction( i18n("&Install Marked"), TQString(), + 0, TQT_TQOBJECT(kpackage->management), TQT_SLOT(installMultClicked()), actionCollection(), "install_marked")); - (void) (new KAction( i18n("&Uninstall Marked"), TQString::null, - 0, kpackage->management, + (void) (new KAction( i18n("&Uninstall Marked"), TQString(), + 0, TQT_TQOBJECT(kpackage->management), TQT_SLOT(uninstallMultClicked()), actionCollection(), "uninstall_marked")); setStandardToolBarMenuEnabled(true); - KStdAction::configureToolbars( this, TQT_SLOT(configureToolBars()), + KStdAction::configureToolbars( TQT_TQOBJECT(this), TQT_SLOT(configureToolBars()), actionCollection()); - KStdAction::saveOptions( this, TQT_SLOT(saveSettings()), actionCollection()); + KStdAction::saveOptions( TQT_TQOBJECT(this), TQT_SLOT(saveSettings()), actionCollection()); KStdAction::keyBindings( guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection()); (void) (new KAction( i18n("Configure &KPackage..."), "configure", - 0, this, + 0, TQT_TQOBJECT(this), TQT_SLOT(setOptions()), actionCollection(), "kpack_options")); - (void) (new KAction( i18n("Clear Package &Folder Cache"), TQString::null, - 0, this, + (void) (new KAction( i18n("Clear Package &Folder Cache"), TQString(), + 0, TQT_TQOBJECT(this), TQT_SLOT(clearDCache()), actionCollection(), "clear_dcache")); - (void) (new KAction( i18n("Clear &Package Cache"), TQString::null, - 0, this, + (void) (new KAction( i18n("Clear &Package Cache"), TQString(), + 0, TQT_TQOBJECT(this), TQT_SLOT(clearPCache()), actionCollection(), "clear_pcache")); int i; @@ -196,7 +196,7 @@ void KPKG::setupMenu() void KPKG::disableMenu() { pack_open->setEnabled(false); - pack_find->setEnabled(false); + pack_tqfind->setEnabled(false); pack_findf->setEnabled(false); kpack_reload->setEnabled(false); recent->setEnabled(false); @@ -205,7 +205,7 @@ void KPKG::disableMenu() void KPKG::enableMenu() { pack_open->setEnabled(true); - pack_find->setEnabled(true); + pack_tqfind->setEnabled(true); pack_findf->setEnabled(true); kpack_reload->setEnabled(true); recent->setEnabled(true); @@ -302,8 +302,8 @@ bool KPKG::queryClose() { ////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////// -KPACKAGE::KPACKAGE(KConfig *_config, TQWidget *parent) - : TQWidget(parent) +KPACKAGE::KPACKAGE(KConfig *_config, TQWidget *tqparent) + : TQWidget(tqparent) { // Save copy of config @@ -485,9 +485,9 @@ pkgInterface *KPACKAGE::pkType(const TQString &fname) } } fclose(file); - KpMsgE(i18n("Unknown package type: %1").arg(fname),TRUE); + KpMsgE(i18n("Unknown package type: %1").tqarg(fname),TRUE); } else { - KpMsgE(i18n("File not found: %1").arg(fname),TRUE); + KpMsgE(i18n("File not found: %1").tqarg(fname),TRUE); } return 0; @@ -585,7 +585,7 @@ TQString KPACKAGE::getFileName(const KURL & url, TQString &cacheName ) TQString fname = ""; if ( !url.isValid() ) { - KpMsgE(i18n("Malformed URL: %1").arg(url.url()),TRUE); + KpMsgE(i18n("Malformed URL: %1").tqarg(url.url()),TRUE); } else { // Just a usual file ? @@ -643,12 +643,12 @@ TQString KPACKAGE::fetchNetFile( const KURL & url ) } else { save_url = url; - setStatus(i18n("Starting KIO")); + settqStatus(i18n("Starting KIO")); Kio kio; if (kio.download(url, cf)) { - setStatus(i18n("KIO finished")); + settqStatus(i18n("KIO finished")); TQFileInfo fi(cf); if (!(fi.exists() && fi.size() > 0)) { unlink(TQFile::encodeName(cf)); @@ -660,7 +660,7 @@ TQString KPACKAGE::fetchNetFile( const KURL & url ) return cf; } } else { - setStatus(i18n("KIO failed")); + settqStatus(i18n("KIO failed")); return ""; } } @@ -672,7 +672,7 @@ void KPACKAGE::fileOpenUrl(){ bool ok; - TQString url = KInputDialog::getText( TQString::null, + TQString url = KInputDialog::getText( TQString(), i18n( "Open location:" ), save_url.prettyURL(), &ok, this ); if ( ok ) @@ -682,7 +682,7 @@ void KPACKAGE::fileOpenUrl(){ } } -void KPACKAGE::find(){ +void KPACKAGE::tqfind(){ if (srchdialog) srchdialog->show(); else @@ -732,13 +732,13 @@ void KPACKAGE::dropEvent(TQDropEvent *de) // something has been dropped openNetFiles(list.toStringList()); } -void KPACKAGE::setStatus(const TQString &s) // set the text in the status bar +void KPACKAGE::settqStatus(const TQString &s) // set the text in the status bar { status->setText(s); kapp->processEvents(); // refresh the screen } -TQString KPACKAGE::getStatus() // get the text in the status bar +TQString KPACKAGE::gettqStatus() // get the text in the status bar { if(status) return status->text(); -- cgit v1.2.3