From bd28b782b7033c3fe0d4b3a71f10206155414f7e Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Mon, 20 Jan 2025 17:21:29 +0900 Subject: [PATCH] Use tdeApp Signed-off-by: Michele Calgaro --- kcron/ktapp.cpp | 4 +-- kcron/ktvariable.cpp | 2 +- kdat/IndexDlg.cpp | 2 +- kdat/KDatMainWindow.cpp | 8 ++--- kdat/Options.cpp | 2 +- kdat/VerifyDlg.cpp | 4 +-- knetworkconf/knetworkconf/knetworkconf.cpp | 16 ++++----- .../knetworkconf/knetworkconfigparser.cpp | 4 +-- kpackage/kpPty.cpp | 6 ++-- kpackage/kpackage.cpp | 8 ++--- kpackage/kplview.cpp | 8 ++--- kpackage/managementWidget.cpp | 4 +-- kpackage/options.cpp | 6 ++-- kpackage/packageProperties.cpp | 2 +- kpackage/pkgOptions.cpp | 4 +-- kpackage/tdeio.cpp | 8 ++--- kpackage/updateLoc.cpp | 12 +++---- ksysv/OldView.cpp | 26 +++++++------- ksysv/PreferencesDialog.cpp | 2 +- ksysv/TopWidget.cpp | 36 +++++++++---------- ksysv/kbusymanager.cpp | 4 +-- ksysv/kscroller.cpp | 8 ++--- ksysv/ksv_conf.cpp | 2 +- ksysv/ksv_core.cpp | 2 +- ksysv/main.cpp | 2 +- kuser/main.cpp | 4 +-- kuser/misc.cpp | 2 +- kuser/selectconn.cpp | 12 +++---- kuser/tdeglobal.cpp | 2 +- secpolicy/secpolicywin.cpp | 4 +-- 30 files changed, 103 insertions(+), 103 deletions(-) diff --git a/kcron/ktapp.cpp b/kcron/ktapp.cpp index 22d92dc..e5a1d93 100644 --- a/kcron/ktapp.cpp +++ b/kcron/ktapp.cpp @@ -35,7 +35,7 @@ const int KTApp::statusMessage (1001); KTApp::KTApp() : TDEMainWindow(0) { - config=kapp->config(); + config=tdeApp->config(); setIcon(KTIcon::application(true)); @@ -113,7 +113,7 @@ const CTHost& KTApp::getCTHost() const TQString KTApp::caption() { - TQString cap(kapp->caption()); + TQString cap(tdeApp->caption()); return cap; } diff --git a/kcron/ktvariable.cpp b/kcron/ktvariable.cpp index 65628cb..47950fe 100644 --- a/kcron/ktvariable.cpp +++ b/kcron/ktvariable.cpp @@ -13,7 +13,7 @@ #include -#include // kapp +#include // tdeApp #include // i18n() #include #include diff --git a/kdat/IndexDlg.cpp b/kdat/IndexDlg.cpp index b7abf1d..2ff3a93 100644 --- a/kdat/IndexDlg.cpp +++ b/kdat/IndexDlg.cpp @@ -299,7 +299,7 @@ void IndexDlg::timerEvent( TQTimerEvent* ) if ( elapsed > oldElapsed ) { updateStats(); - TDEApplication::kApplication()->processEvents(); + tdeApp->processEvents(); if ( _aborted ) { break; } diff --git a/kdat/KDatMainWindow.cpp b/kdat/KDatMainWindow.cpp index d47144f..48be0dc 100644 --- a/kdat/KDatMainWindow.cpp +++ b/kdat/KDatMainWindow.cpp @@ -961,7 +961,7 @@ void KDatMainWindow::fileDeleteBackupProfile() void KDatMainWindow::fileQuit() { - TDEApplication::kApplication()->quit(); + tdeApp->quit(); } void KDatMainWindow::editPreferences() @@ -972,7 +972,7 @@ void KDatMainWindow::editPreferences() void KDatMainWindow::help() { - TDEApplication::kApplication()->invokeHelp( ); + tdeApp->invokeHelp( ); } void KDatMainWindow::setTapePresent( bool tapePresent, bool eject ) @@ -1023,7 +1023,7 @@ void KDatMainWindow::setTapePresent( bool tapePresent, bool eject ) void KDatMainWindow::status( const TQString & msg ) { _statusBar->changeItem( msg, 0 ); - TDEApplication::kApplication()->processEvents(); + tdeApp->processEvents(); } void KDatMainWindow::show() @@ -1106,7 +1106,7 @@ int KDatMainWindow::calcBackupSize( const TQString& workingDir, bool local, cons .arg(Util::kbytesToString( size / 2 )) .arg(KStringHandler::csqueeze(*path, 60)); status( msg ); - TDEApplication::kApplication()->processEvents(); + tdeApp->processEvents(); dir.setPath( *path ); infoList = dir.entryInfoList( TQDir::Hidden | TQDir::Files | TQDir::Dirs, 0 ); if ( infoList ) { diff --git a/kdat/Options.cpp b/kdat/Options.cpp index 24ec02c..6cba56c 100644 --- a/kdat/Options.cpp +++ b/kdat/Options.cpp @@ -27,7 +27,7 @@ Options* Options::_instance = 0; Options::Options() { - _config = TDEApplication::kApplication()->config(); + _config = tdeApp->config(); _defaultTapeSize = _config->readNumEntry( "defaultTapeSize", 2*1024*1024 ); _tapeBlockSize = _config->readNumEntry( "tapeBlockSize", 20*512 ); // Use tar default. diff --git a/kdat/VerifyDlg.cpp b/kdat/VerifyDlg.cpp index 7d40493..9f162da 100644 --- a/kdat/VerifyDlg.cpp +++ b/kdat/VerifyDlg.cpp @@ -348,7 +348,7 @@ void VerifyDlg::timerEvent( TQTimerEvent* ) } while ( ( !_done ) && ( !_aborted ) && ( !_wroteStdin ) ) - TDEApplication::kApplication()->processEvents(); + tdeApp->processEvents(); if ( _done || _aborted ) { /* 2002-01-30 LEW */ #ifdef DEBUG @@ -367,7 +367,7 @@ void VerifyDlg::timerEvent( TQTimerEvent* ) if ( elapsed > oldElapsed ) { updateStats(); - TDEApplication::kApplication()->processEvents(); + tdeApp->processEvents(); if ( _done || _aborted ) { break; } diff --git a/knetworkconf/knetworkconf/knetworkconf.cpp b/knetworkconf/knetworkconf/knetworkconf.cpp index 8a6d6a1..b9912b5 100644 --- a/knetworkconf/knetworkconf/knetworkconf.cpp +++ b/knetworkconf/knetworkconf/knetworkconf.cpp @@ -43,9 +43,9 @@ KNetworkConf::KNetworkConf(TQWidget *parent, const char *name) : DCOPObject("KNe TQ_SLOT(showInterfaceContextMenuSlot(TDEListView*,TQListViewItem*, const TQPoint&))); // Register with DCOP - No longer needed as now we are a kcontrol module? - if ( !kapp->dcopClient()->isRegistered() ) { - kapp->dcopClient()->registerAs( "knetworkconf" ); - kapp->dcopClient()->setDefaultObject( objId() ); + if ( !tdeApp->dcopClient()->isRegistered() ) { + tdeApp->dcopClient()->registerAs( "knetworkconf" ); + tdeApp->dcopClient()->setDefaultObject( objId() ); } //Temporarly added while gst supports routing option. @@ -65,7 +65,7 @@ void KNetworkConf::getNetworkInfoSlot() KMessageBox::error(this, i18n("Could not load network configuration information."), i18n("Error Reading Configuration File")); - //kapp->quit(); + //tdeApp->quit(); //exit(1); } else @@ -160,10 +160,10 @@ void KNetworkConf::quitSlot(){ if (code == KMessageBox::Yes) saveInfoSlot(); else if (code == KMessageBox::No) - kapp->quit(); + tdeApp->quit(); } else - kapp->quit(); + tdeApp->quit(); } /** Enables the configure and remove buttons. */ void KNetworkConf::enableButtonsSlot(){ @@ -492,12 +492,12 @@ void KNetworkConf::loadNetworkProfiles(){ /** Shows the help browser. Hopefully some day it will be one :-). */ void KNetworkConf::helpSlot(){ - kapp->invokeHelp(); + tdeApp->invokeHelp(); } /** No descriptions */ void KNetworkConf::aboutSlot(){ - TDEAboutApplication *about = new TDEAboutApplication(kapp->aboutData(),0); + TDEAboutApplication *about = new TDEAboutApplication(tdeApp->aboutData(),0); // about->setLogo(locate("icon","knetworkconf.png")); //tqDebug("locate icon= %s",locate("icon","knetworkconf.png").latin1()); diff --git a/knetworkconf/knetworkconf/knetworkconfigparser.cpp b/knetworkconf/knetworkconf/knetworkconfigparser.cpp index 24def66..23b34d2 100644 --- a/knetworkconf/knetworkconf/knetworkconfigparser.cpp +++ b/knetworkconf/knetworkconf/knetworkconfigparser.cpp @@ -41,7 +41,7 @@ void KNetworkConfigParser::runDetectionScript(TQString platform){ i18n("Could not find the backend script for the network configuration detection. Something is wrong with your installation.\n Please check that \n{TDE_PATH}/%1 \nfile is present.").arg(BACKEND_PATH), i18n("Could Not Find Network Configuration Backend Script")); dialog->close(); - //kapp->quit(); + //tdeApp->quit(); } else { @@ -325,7 +325,7 @@ void KNetworkConfigParser::saveNetworkInfo(KNetworkInfo *networkInfo) //wait around until the process has finished, otherwise it becomes a zombie while (processRunning) { - kapp->processEvents(); + tdeApp->processEvents(); } } diff --git a/kpackage/kpPty.cpp b/kpackage/kpPty.cpp index 12f15ec..2919dc4 100644 --- a/kpackage/kpPty.cpp +++ b/kpackage/kpPty.cpp @@ -172,7 +172,7 @@ bool kpPty::startSession(bool needRoot) tm->start(6*1000, TRUE); eventLoop = TRUE; kdDebug() << "Loopst\n"; - kapp->enter_loop(); + tdeApp->enter_loop(); kdDebug() << "Loopfn Result=" << Result << "\n"; tm->stop(); if (Result == TIMEOUT) { // timeout @@ -309,7 +309,7 @@ TQStringList kpPty::run(const TQString &cmd, bool inLoop, bool needRoot) if (inLoop) { eventLoop = TRUE; - kapp->enter_loop(); + tdeApp->enter_loop(); return retList; } else { @@ -367,7 +367,7 @@ void kpPty::finish(int ret) if (eventLoop) { eventLoop = FALSE; - kapp->exit_loop(); + tdeApp->exit_loop(); } } diff --git a/kpackage/kpackage.cpp b/kpackage/kpackage.cpp index fb1d50f..e3246bb 100644 --- a/kpackage/kpackage.cpp +++ b/kpackage/kpackage.cpp @@ -70,7 +70,7 @@ KPKG::KPKG(TDEConfig *_config) kpackage = new KPACKAGE(_config, this); setCentralWidget(kpackage); - config = kapp->config(); + config = tdeApp->config(); config->setGroup("Kpackage"); kpackage->management->readPSeparator(); @@ -251,7 +251,7 @@ void KPKG::writeSettings(){ kpackage->management->writePSeparator(); - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("Kpackage"); @@ -735,7 +735,7 @@ void KPACKAGE::dropEvent(TQDropEvent *de) // something has been dropped void KPACKAGE::setStatus(const TQString &s) // set the text in the status bar { status->setText(s); - kapp->processEvents(); // refresh the screen + tdeApp->processEvents(); // refresh the screen } TQString KPACKAGE::getStatus() // get the text in the status bar @@ -749,7 +749,7 @@ TQString KPACKAGE::getStatus() // get the text in the status bar void KPACKAGE::setPercent(int x) // set the progress in the status bar { processProgress->setValue(x); - kapp->processEvents(); // refresh it + tdeApp->processEvents(); // refresh it } ////////////////////////////////////////////////////////////////////////////// diff --git a/kpackage/kplview.cpp b/kpackage/kplview.cpp index 27bfe72..3bbbb4e 100644 --- a/kpackage/kplview.cpp +++ b/kpackage/kplview.cpp @@ -525,7 +525,7 @@ void KpTreeList::stackRemove(KpTreeListItem *pack) //////////////////////////////////////////////////////////////// void KpTreeList::writeTreeType() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("Kpackage"); @@ -534,7 +534,7 @@ void KpTreeList::writeTreeType() void KpTreeList::readTreeType() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("Kpackage"); @@ -546,12 +546,12 @@ void KpTreeList::readTreeType() void KpTreeList::writeTreeConfig() { - saveLayout( kapp->config(), "Tree"); + saveLayout( tdeApp->config(), "Tree"); } void KpTreeList::readTreeConfig() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); restoreLayout(config, "Tree"); diff --git a/kpackage/managementWidget.cpp b/kpackage/managementWidget.cpp index 9c515d4..8287006 100644 --- a/kpackage/managementWidget.cpp +++ b/kpackage/managementWidget.cpp @@ -218,7 +218,7 @@ void managementWidget::setupWidgets() //////////////////////////////////////////////////////////////// void managementWidget::writePSeparator() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("Kpackage"); @@ -228,7 +228,7 @@ void managementWidget::writePSeparator() void managementWidget::readPSeparator() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("Kpackage"); diff --git a/kpackage/options.cpp b/kpackage/options.cpp index 22ddeb7..360dce8 100644 --- a/kpackage/options.cpp +++ b/kpackage/options.cpp @@ -389,7 +389,7 @@ Opts::~Opts() void Opts::readSettings(const TQString &initHost) { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("Kpackage"); @@ -428,7 +428,7 @@ void Opts::readSettings(const TQString &initHost) void Opts::readLaterSettings() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("Kpackage"); int i; @@ -442,7 +442,7 @@ void Opts::readLaterSettings() void Opts::writeSettings() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("Kpackage"); diff --git a/kpackage/packageProperties.cpp b/kpackage/packageProperties.cpp index fdedc47..2c4557b 100644 --- a/kpackage/packageProperties.cpp +++ b/kpackage/packageProperties.cpp @@ -250,7 +250,7 @@ void packagePropertiesWidget::setSource(const TQString &name) { if (s.startsWith("http:") || s.startsWith("ftp:")) { - TDEApplication::kApplication()->invokeBrowser( s ); + tdeApp->invokeBrowser( s ); return; } diff --git a/kpackage/pkgOptions.cpp b/kpackage/pkgOptions.cpp index f90a7a2..38479d4 100644 --- a/kpackage/pkgOptions.cpp +++ b/kpackage/pkgOptions.cpp @@ -320,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); @@ -330,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"; diff --git a/kpackage/tdeio.cpp b/kpackage/tdeio.cpp index 6669137..1897031 100644 --- a/kpackage/tdeio.cpp +++ b/kpackage/tdeio.cpp @@ -39,14 +39,14 @@ bool Kio::download(const KURL & from, const TQString & to) TQ_SLOT( slotIOJobFinished( TDEIO::Job* ))); // missing modal widget hack here. // I'd recommend using TDEIO::NetAccess instead (David). - kapp->enter_loop(); + tdeApp->enter_loop(); return worked; } void Kio::slotIOJobFinished( TDEIO::Job * job) { worked = (job->error() == 0); - kapp->exit_loop(); + tdeApp->exit_loop(); } Kiod::Kiod() @@ -81,7 +81,7 @@ bool Kiod::listDir(const TQString &url, const TQString &fname, bool subdirs) TQObject::connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), TQ_SLOT( slotFinished( TDEIO::Job* ) ) ); - kapp->enter_loop(); + tdeApp->enter_loop(); file->close(); if (worked) @@ -118,7 +118,7 @@ void Kiod::slotFinished( TDEIO::Job *job ) { //kdDebug() << "finished" << " " << job << " " << dynamic_cast(job)->url() << endl; worked = (job->error() == 0); - kapp->exit_loop(); + tdeApp->exit_loop(); } #include "tdeio.moc" diff --git a/kpackage/updateLoc.cpp b/kpackage/updateLoc.cpp index 8d89602..d89a177 100644 --- a/kpackage/updateLoc.cpp +++ b/kpackage/updateLoc.cpp @@ -432,7 +432,7 @@ void pdUpdateLoc::applyS(LcacheObj *slist) { TQString t,pn,cn,pv,prev,opts; cacheObj *CObj; - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup(interName); cn = interface->head; @@ -466,7 +466,7 @@ void pdUpdateLoc::readSettings() { TQString pv, pn; - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup(interName); @@ -489,7 +489,7 @@ void pdUpdateLoc::writeSettings() { TQString pv, pn; - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup(interName); if (haveBase) { @@ -577,7 +577,7 @@ cUpdateLoc::~cUpdateLoc() { TQString t,pn,cn,pv,prev,opts; cacheObj *CObj; - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup(interName); cn = interface->head; @@ -601,7 +601,7 @@ void cUpdateLoc::readSettings() { TQString pv, pn; - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup(interName); @@ -623,7 +623,7 @@ void cUpdateLoc::writeSettings() { TQString pv, pn; - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup(interName); diff --git a/ksysv/OldView.cpp b/ksysv/OldView.cpp index 65c4002..d657684 100644 --- a/ksysv/OldView.cpp +++ b/ksysv/OldView.cpp @@ -572,7 +572,7 @@ void KSVContent::infoOnData (KSVItem* item) { KSVData oldState = *item->data(); KSVData newState = oldState; - KSVEntryPropertiesDialog* props = new KSVEntryPropertiesDialog (newState, kapp->mainWidget()); + KSVEntryPropertiesDialog* props = new KSVEntryPropertiesDialog (newState, tdeApp->mainWidget()); connect (props, TQ_SIGNAL (editService (const TQString&)), this, TQ_SLOT (editService (const TQString&))); @@ -714,7 +714,7 @@ void KSVContent::slotDoubleClick (TQListViewItem* item) { void KSVContent::slotScriptProperties(TQListViewItem* item) { KSVServicePropertiesDialog* prop = - new KSVServicePropertiesDialog (*static_cast (item)->data(), kapp->mainWidget()); + new KSVServicePropertiesDialog (*static_cast (item)->data(), tdeApp->mainWidget()); connect (prop, TQ_SIGNAL (editService (const TQString&)), this, TQ_SLOT (editService (const TQString&))); @@ -856,7 +856,7 @@ void KSVContent::pasteAppend() { KSVData data; - if (KSVDrag::decodeNative (kapp->clipboard()->data(), data)) + if (KSVDrag::decodeNative (tdeApp->clipboard()->data(), data)) { KSVAction* action = 0L; @@ -933,7 +933,7 @@ void KSVContent::multiplexEnabled (bool val) if ( !file->exists() ) { int choice = KMessageBox::warningYesNo - (kapp->mainWidget(), + (tdeApp->mainWidget(), i18n ("

You have specified that your system's init " \ "scripts are located in the folder " \ "%1, but this folder does not "\ @@ -948,9 +948,9 @@ void KSVContent::multiplexEnabled (bool val) "edit your system's init configuration.

" \ "

Would you like to reconfigure %4?

") .arg (config->scriptPath()) - .arg (kapp->aboutData()->programName()) - .arg (kapp->aboutData()->programName()) - .arg (kapp->aboutData()->programName()), + .arg (tdeApp->aboutData()->programName()) + .arg (tdeApp->aboutData()->programName()) + .arg (tdeApp->aboutData()->programName()), i18n("Folder Does Not Exist"),i18n("Reconfigure"),i18n("Do Not Reconfigure")); if ( choice == KMessageBox::Yes ) @@ -961,7 +961,7 @@ void KSVContent::multiplexEnabled (bool val) } else { - KMessageBox::information (kapp->mainWidget(), + KMessageBox::information (tdeApp->mainWidget(), i18n ("

You do not have the right permissions " \ "to edit your system's init configuration. " \ "However, you are free to browse the runlevels.

" \ @@ -972,8 +972,8 @@ void KSVContent::multiplexEnabled (bool val) "suid or sgid.

" \ "

The latter way is not recommended though, " \ "due to security issues.

") - .arg (kapp->aboutData()->programName()) - .arg (kapp->aboutData()->programName()), + .arg (tdeApp->aboutData()->programName()) + .arg (tdeApp->aboutData()->programName()), i18n("Insufficient Permissions"), ksv::notifications[ksv::RunlevelsReadOnly]); } @@ -1123,7 +1123,7 @@ void KSVContent::merge (TQValueList& list, KSVDragList* widget) emit undoAction (new AddAction (widget, item->data())); } - kapp->processEvents (); + tdeApp->processEvents (); } TQPtrList deleteList; @@ -1140,11 +1140,11 @@ void KSVContent::merge (TQValueList& list, KSVDragList* widget) emit undoAction (new RemoveAction (widget, item->data())); } - kapp->processEvents (); + tdeApp->processEvents (); } widget->sort(); - kapp->processEvents(); + tdeApp->processEvents(); } #include "OldView.moc" diff --git a/ksysv/PreferencesDialog.cpp b/ksysv/PreferencesDialog.cpp index c830a34..9ec0008 100644 --- a/ksysv/PreferencesDialog.cpp +++ b/ksysv/PreferencesDialog.cpp @@ -194,7 +194,7 @@ TQColor KSVPreferences::changedSelected() const KSVPreferences* KSVPreferences::self () { - static KSVPreferences* prefs = new KSVPreferences (kapp->mainWidget()); + static KSVPreferences* prefs = new KSVPreferences (tdeApp->mainWidget()); return prefs; } diff --git a/ksysv/TopWidget.cpp b/ksysv/TopWidget.cpp index 88c5c2b..43f043a 100644 --- a/ksysv/TopWidget.cpp +++ b/ksysv/TopWidget.cpp @@ -158,7 +158,7 @@ KSVTopLevel::KSVTopLevel() connect (mRedoList, TQ_SIGNAL(filled()), this, TQ_SLOT(enableRedo())); // paste - connect (kapp->clipboard(), TQ_SIGNAL (dataChanged()), + connect (tdeApp->clipboard(), TQ_SIGNAL (dataChanged()), this, TQ_SLOT (dispatchEdit())); // init mView according to saved preferences @@ -295,7 +295,7 @@ bool KSVTopLevel::queryExit() uint res = KMessageBox::Continue; if (mChanged) { - res = KMessageBox::warningContinueCancel(kapp->mainWidget(), + res = KMessageBox::warningContinueCancel(tdeApp->mainWidget(), i18n("There are unsaved changes. Are you sure you want to quit?"), i18n("Quit"), KStdGuiItem::quit()); @@ -309,7 +309,7 @@ void KSVTopLevel::slotClearChanges() { if (mChanged && KMessageBox::Yes == - KMessageBox::questionYesNo(kapp->mainWidget(), + KMessageBox::questionYesNo(tdeApp->mainWidget(), i18n("Do you really want to revert all unsaved changes?"), i18n("Revert Configuration"), i18n("&Revert"), @@ -322,7 +322,7 @@ void KSVTopLevel::slotClearChanges() void KSVTopLevel::slotAcceptChanges() { if (KMessageBox::Continue == - KMessageBox::warningContinueCancel(kapp->mainWidget(), + KMessageBox::warningContinueCancel(tdeApp->mainWidget(), i18n("You're about to save the changes made to your init " "configuration. Wrong settings can " "make your system hang on startup.\n" @@ -426,7 +426,7 @@ void KSVTopLevel::initStatusBar() "or ask your sysadmin to install %1 suid or " \ "sgid.

The latter way is not "\ "recommended though, due to security issues.

") - .arg (kapp->aboutData()->programName()).arg(kapp->aboutData()->programName())); + .arg (tdeApp->aboutData()->programName()).arg(tdeApp->aboutData()->programName())); authIconBox->setMinimumSize (authIconBox->minimumSizeHint()); visBox->setMinimumSize (visBox->minimumSizeHint()); @@ -508,7 +508,7 @@ void KSVTopLevel::editCut() { if (list && list->currentItem()) { KSVDrag* mime = new KSVDrag (*list->currentItem()->data(), 0L, 0L); - kapp->clipboard()->setData (mime); + tdeApp->clipboard()->setData (mime); KSVData data = *list->currentItem()->data(); delete list->currentItem(); @@ -525,7 +525,7 @@ void KSVTopLevel::editCopy() if (list) { KSVDrag* mime = new KSVDrag (*static_cast (list->currentItem()), 0L, 0L); - kapp->clipboard()->setData (mime); + tdeApp->clipboard()->setData (mime); } } @@ -537,7 +537,7 @@ void KSVTopLevel::editPaste() { KSVData data; - if (KSVDrag::decodeNative (kapp->clipboard()->data(), data)) + if (KSVDrag::decodeNative (tdeApp->clipboard()->data(), data)) { KSVAction* action = 0L; @@ -629,11 +629,11 @@ void KSVTopLevel::print() // #define checkPage if (metrics.height() - y < fm.lineSpacing()) prt.newPage(); // static KPrinter prt; -// prt.setDocName(kapp->aboutData()->programName() + " Configuration"); -// prt.setCreator(kapp->aboutData()->programName()); +// prt.setDocName(tdeApp->aboutData()->programName() + " Configuration"); +// prt.setCreator(tdeApp->aboutData()->programName()); // static TQPrintDialog* dlg = new TQPrintDialog (&prt, this, "KSysV Print Dialog"); -// dlg->setCaption(kapp->makeStdCaption (i18n("Print"))); +// dlg->setCaption(tdeApp->makeStdCaption (i18n("Print"))); // if (dlg->exec() == TQDialog::Accepted) // { @@ -647,7 +647,7 @@ void KSVTopLevel::print() // TQFontMetrics fm = p.fontMetrics(); // p.drawText (10, y, i18n("%1 Configuration of %2") -// .arg (kapp->aboutData()->programName()) +// .arg (tdeApp->aboutData()->programName()) // .arg (ksv::hostname())); // y += fm.lineSpacing(); @@ -747,8 +747,8 @@ void KSVTopLevel::print() void KSVTopLevel::printLog() { KPrinter *prt = new KPrinter(); - prt->setDocName(kapp->aboutData()->programName() + " Log File"); - prt->setCreator(kapp->aboutData()->programName()); + prt->setDocName(tdeApp->aboutData()->programName() + " Log File"); + prt->setCreator(tdeApp->aboutData()->programName()); if (prt->setup(this, i18n("Print Log File"))) { @@ -807,7 +807,7 @@ void KSVTopLevel::printLog() if (line == lines.end()) goto printing_finished; - kapp->processEvents(); + tdeApp->processEvents(); } prt->newPage(); @@ -826,7 +826,7 @@ void KSVTopLevel::printLog() void KSVTopLevel::catchCannotGenerateNumber() { if (mConfig->showMessage (ksv::CouldNotGenerateSortingNumber)) { - KMessageBox::information (kapp->mainWidget(), + KMessageBox::information (tdeApp->mainWidget(), i18n ("

Unable to generate a valid " \ "sorting number for this position. This means " \ "that there was no number available between "\ @@ -890,7 +890,7 @@ void KSVTopLevel::dispatchEdit () } else { - TQMimeSource* mime = kapp->clipboard()->data(); + TQMimeSource* mime = tdeApp->clipboard()->data(); if (mime && mime->provides ("application/x-ksysv")) setPaste (true); @@ -954,7 +954,7 @@ void KSVTopLevel::enableLogActions () void KSVTopLevel::setCaption (bool changed) { - setPlainCaption (kapp->makeStdCaption(KNetwork::KResolver::localHostName(), true, changed)); + setPlainCaption (tdeApp->makeStdCaption(KNetwork::KResolver::localHostName(), true, changed)); } TDEActionCollection* KSVTopLevel::filteredActions () diff --git a/ksysv/kbusymanager.cpp b/ksysv/kbusymanager.cpp index 2a5c9f9..a46abfa 100644 --- a/ksysv/kbusymanager.cpp +++ b/ksysv/kbusymanager.cpp @@ -66,7 +66,7 @@ void KBusyManager::setBusy (bool val) if (val) TQApplication::setOverrideCursor (KCursor::waitCursor()); - kapp->mainWidget()->setEnabled (!val); + tdeApp->mainWidget()->setEnabled (!val); } void KBusyManager::restore () @@ -79,7 +79,7 @@ void KBusyManager::restore () if (oldBusy) TQApplication::restoreOverrideCursor(); - kapp->mainWidget()->setEnabled (!d->Stack.top()); + tdeApp->mainWidget()->setEnabled (!d->Stack.top()); } KBusyManager::KBusyManager () diff --git a/ksysv/kscroller.cpp b/ksysv/kscroller.cpp index 58cb254..013cb07 100644 --- a/ksysv/kscroller.cpp +++ b/ksysv/kscroller.cpp @@ -88,7 +88,7 @@ TQSize KScroller::minimumSizeHint() const TQSize KScroller::sizeHint() const { TQSize size = mContent->minimumSize(); - int extra = kapp->style().pixelMetric( TQStyle::PM_ScrollBarExtent, 0 ); + int extra = tdeApp->style().pixelMetric( TQStyle::PM_ScrollBarExtent, 0 ); size += TQSize( extra, extra ); return size; } @@ -113,7 +113,7 @@ void KScroller::setupHorizontal (int cw, int, int w, int h) if (cw > w) { - int extra = kapp->style().pixelMetric( TQStyle::PM_ScrollBarExtent, 0 ); + int extra = tdeApp->style().pixelMetric( TQStyle::PM_ScrollBarExtent, 0 ); if (!mVertical->isHidden()) w -= extra; @@ -139,7 +139,7 @@ void KScroller::setupVertical (int, int ch, int w, int h) if (ch > h) { - int extra = kapp->style().pixelMetric( TQStyle::PM_ScrollBarExtent, 0 ); + int extra = tdeApp->style().pixelMetric( TQStyle::PM_ScrollBarExtent, 0 ); mVertical->setRange (0, ch - h); mVertical->setPageStep (h); mVertical->setLineStep (25); @@ -175,7 +175,7 @@ void KScroller::setupCornerWidget (int w, int h) { if (!mVertical->isHidden() && !mHorizontal->isHidden()) { - int extra = kapp->style().pixelMetric( TQStyle::PM_ScrollBarExtent, 0 ); + int extra = tdeApp->style().pixelMetric( TQStyle::PM_ScrollBarExtent, 0 ); mCornerWidget->raise(); mCornerWidget->setGeometry (w - extra, h - extra, extra, extra); diff --git a/ksysv/ksv_conf.cpp b/ksysv/ksv_conf.cpp index dfe13fd..772d9f0 100644 --- a/ksysv/ksv_conf.cpp +++ b/ksysv/ksv_conf.cpp @@ -101,7 +101,7 @@ void KSVConfig::writeSettings() { mConfig->writeEntry("Number Font", mNumberFont); // save screen geometry - TDEMainWindow* mw = static_cast(kapp->mainWidget()); + TDEMainWindow* mw = static_cast(tdeApp->mainWidget()); if (mw) { diff --git a/ksysv/ksv_core.cpp b/ksysv/ksv_core.cpp index caf0dfe..3268bb4 100644 --- a/ksysv/ksv_core.cpp +++ b/ksysv/ksv_core.cpp @@ -152,7 +152,7 @@ TDECompletion* ksv::numberCompletion () const TQString& ksv::logFileFilter () { static TQString filter = "*" + ksv::logFileExtension() + "|" + - TQString(kapp->caption() + i18n(" log files") + " (*" + ksv::logFileExtension() + ")"); + TQString(tdeApp->caption() + i18n(" log files") + " (*" + ksv::logFileExtension() + ")"); return filter; } diff --git a/ksysv/main.cpp b/ksysv/main.cpp index 5e7c2c7..184be73 100644 --- a/ksysv/main.cpp +++ b/ksysv/main.cpp @@ -76,7 +76,7 @@ int main( int argc, char **argv ) { KSVApplication app; // session-management - if (kapp->isRestored()) + if (tdeApp->isRestored()) RESTORE(KSVTopLevel) else { diff --git a/kuser/main.cpp b/kuser/main.cpp index af623ce..06e3ad6 100644 --- a/kuser/main.cpp +++ b/kuser/main.cpp @@ -52,9 +52,9 @@ int main(int argc, char **argv) TDEApplication a; - kapp->sharedConfig()->setGroup( "general" ); + tdeApp->sharedConfig()->setGroup( "general" ); kug = new KUserGlobals(); - kug->initCfg( kapp->sharedConfig()->readEntry( "connection", "default" ) ); + kug->initCfg( tdeApp->sharedConfig()->readEntry( "connection", "default" ) ); mw = new mainWidget("kuser"); a.setMainWidget(mw); diff --git a/kuser/misc.cpp b/kuser/misc.cpp index 84ffa81..febd3b6 100644 --- a/kuser/misc.cpp +++ b/kuser/misc.cpp @@ -139,7 +139,7 @@ TQCString genSalt( int len ) salt[0] = set[getpid() % strlen(set)]; for( int i = 1; i < len; i++ ) { - salt[i] = set[kapp->random() % strlen(set)]; + salt[i] = set[tdeApp->random() % strlen(set)]; } return salt; } diff --git a/kuser/selectconn.cpp b/kuser/selectconn.cpp index 9ab2911..67a38cb 100644 --- a/kuser/selectconn.cpp +++ b/kuser/selectconn.cpp @@ -50,7 +50,7 @@ SelectConn::SelectConn(const TQString &selected, TQWidget* parent, const char * mSelected = selected; kdDebug() << "selected item: " << mSelected << endl; - conns = kapp->sharedConfig()->groupList(); + conns = tdeApp->sharedConfig()->groupList(); TQStringList::iterator it = conns.begin(); int i = 0, sel = 0; while ( it != conns.end() ) { @@ -80,12 +80,12 @@ void SelectConn::slotUser3() newconn = KInputDialog::getText( TQString(), i18n("Please type the name of the new connection:") ); if ( newconn.isEmpty() ) return; - if ( kapp->sharedConfig()->groupList().contains( "connection-" + newconn ) ) { + if ( tdeApp->sharedConfig()->groupList().contains( "connection-" + newconn ) ) { KMessageBox::sorry( 0, i18n("A connection with this name already exists.") ); return; } - KUserPrefsBase kcfg( kapp->sharedConfig(), newconn ); + KUserPrefsBase kcfg( tdeApp->sharedConfig(), newconn ); editDefaults eddlg( &kcfg, this ); connect(&eddlg, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(slotNewApplySettings())); @@ -107,7 +107,7 @@ void SelectConn::slotNewApplySettings() void SelectConn::slotUser2() { kdDebug() << "slotUser2: " << connSelected() << endl; - KUserPrefsBase kcfg( kapp->sharedConfig(), connSelected() ); + KUserPrefsBase kcfg( tdeApp->sharedConfig(), connSelected() ); kcfg.readConfig(); editDefaults eddlg( &kcfg, this ); @@ -122,8 +122,8 @@ void SelectConn::slotUser1() if ( KMessageBox::warningContinueCancel( 0, i18n("Do you really want to delete the connection '%1'?"). arg( conn ),i18n("Delete Connection"),KStdGuiItem::del() ) == KMessageBox::Cancel ) return; - kapp->sharedConfig()->deleteGroup( "connection-" + conn, true ); - kapp->sharedConfig()->sync(); + tdeApp->sharedConfig()->deleteGroup( "connection-" + conn, true ); + tdeApp->sharedConfig()->sync(); mCombo->removeItem( mCombo->currentItem() ); if ( mCombo->count() == 0 ) { mCombo->insertItem( "default" ); diff --git a/kuser/tdeglobal.cpp b/kuser/tdeglobal.cpp index 287f475..479125c 100644 --- a/kuser/tdeglobal.cpp +++ b/kuser/tdeglobal.cpp @@ -42,7 +42,7 @@ void KUserGlobals::initCfg( const TQString &connection ) cfg->writeConfig(); delete cfg; } - cfg = new KUserPrefsBase( kapp->sharedConfig(), connection ); + cfg = new KUserPrefsBase( tdeApp->sharedConfig(), connection ); cfg->readConfig(); } diff --git a/secpolicy/secpolicywin.cpp b/secpolicy/secpolicywin.cpp index 6ae60aa..3ebf6e2 100644 --- a/secpolicy/secpolicywin.cpp +++ b/secpolicy/secpolicywin.cpp @@ -42,10 +42,10 @@ SecPolicyWin::SecPolicyWin(const char *name) KMenuBar *mBar = menuBar(); TQPopupMenu *fileMenu = new TQPopupMenu(this); - fileMenu->insertItem(i18n("&Quit"), kapp, TQ_SLOT(closeAllWindows()), TDEStdAccel::shortcut(TDEStdAccel::Quit)); + fileMenu->insertItem(i18n("&Quit"), tdeApp, TQ_SLOT(closeAllWindows()), TDEStdAccel::shortcut(TDEStdAccel::Quit)); mBar->insertItem(i18n("&File"), fileMenu); - connect(kapp, TQ_SIGNAL(lastWindowClosed()), kapp, TQ_SLOT(quit())); + connect(tdeApp, TQ_SIGNAL(lastWindowClosed()), tdeApp, TQ_SLOT(quit())); adjustSize(); // work around KTMainWindow sizing bug.