From ec22c2282ace350a2bbdee997eae1d7b616767a9 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Tue, 21 Jan 2025 17:20:59 +0900 Subject: [PATCH] Use tdeApp Signed-off-by: Michele Calgaro --- apps/ktorrent/ktorrent.cpp | 6 +++--- apps/ktorrent/ktorrentapp.cpp | 2 +- apps/ktorrent/ktorrentcore.cpp | 2 +- apps/ktorrent/newui/button.cpp | 4 ++-- apps/ktorrent/newui/ddockwindow.cpp | 8 ++++---- apps/ktorrent/newui/dmainwindow.cpp | 2 +- apps/ktorrent/newui/dtabwidget.cpp | 2 +- apps/ktorrent/trayicon.cpp | 2 +- apps/ktupnptest/upnptestapp.cpp | 2 +- libktorrent/datachecker/multidatachecker.cpp | 2 +- plugins/ipfilter/convertdialog.cpp | 6 +++--- plugins/rssfeed/rss/testlibrss.cpp | 2 +- plugins/search/searchplugin.cpp | 2 +- plugins/webinterface/httpserver.cpp | 2 +- 14 files changed, 22 insertions(+), 22 deletions(-) diff --git a/apps/ktorrent/ktorrent.cpp b/apps/ktorrent/ktorrent.cpp index b187c74..b82b6d5 100644 --- a/apps/ktorrent/ktorrent.cpp +++ b/apps/ktorrent/ktorrent.cpp @@ -499,9 +499,9 @@ void KTorrent::setupActions() { KStdAction::openNew(this,TQ_SLOT(fileNew()),actionCollection()); KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection()); - KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection()); + KStdAction::quit(tdeApp, TQ_SLOT(quit()), actionCollection()); - KStdAction::paste(kapp,TQ_SLOT(paste()),actionCollection()); + KStdAction::paste(tdeApp,TQ_SLOT(paste()),actionCollection()); m_statusbarAction = KStdAction::showStatusbar(this, TQ_SLOT(optionsShowStatusbar()), actionCollection()); m_menubarAction = KStdAction::showMenubar(this, TQ_SLOT(optionsShowMenubar()), actionCollection()); @@ -582,7 +582,7 @@ void KTorrent::setupActions() bool KTorrent::queryClose() { - if (Settings::showSystemTrayIcon() && !TDEApplication::kApplication()->sessionSaving()) + if (Settings::showSystemTrayIcon() && !tdeApp->sessionSaving()) { hide(); return false; diff --git a/apps/ktorrent/ktorrentapp.cpp b/apps/ktorrent/ktorrentapp.cpp index fe7a519..37cccb9 100644 --- a/apps/ktorrent/ktorrentapp.cpp +++ b/apps/ktorrent/ktorrentapp.cpp @@ -59,7 +59,7 @@ int KTorrentApp::newInstance() setMainWidget(widget); } else - TDEStartupInfo::setNewStartupId( mainWidget(), kapp->startupId()); + TDEStartupInfo::setNewStartupId( mainWidget(), tdeApp->startupId()); KTorrent *widget = ::tqt_cast( mainWidget() ); diff --git a/apps/ktorrent/ktorrentcore.cpp b/apps/ktorrent/ktorrentcore.cpp index 541bbcc..0c3e46e 100644 --- a/apps/ktorrent/ktorrentcore.cpp +++ b/apps/ktorrent/ktorrentcore.cpp @@ -741,7 +741,7 @@ void KTorrentCore::makeTorrent(const TQString & file,const TQStringList & tracke prog->setProgress(ns); ns++; if (ns % 10 == 0) - TDEApplication::kApplication()->processEvents(); + tdeApp->processEvents(); } mktor.saveTorrent(output_file); diff --git a/apps/ktorrent/newui/button.cpp b/apps/ktorrent/newui/button.cpp index 4009271..d2d839b 100644 --- a/apps/ktorrent/newui/button.cpp +++ b/apps/ktorrent/newui/button.cpp @@ -60,7 +60,7 @@ Button::Button(ButtonBar *parent, const TQString text, const TQIconSet &icon, m_clearAccelAction = new TDEAction(i18n("Clear Accelerator"), 0, this, TQ_SLOT(clearAccel()), this); - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("UI"); TQString accel = config->readEntry(TQString("button_%1").arg(text), ""); if (!accel.isEmpty()) @@ -70,7 +70,7 @@ Button::Button(ButtonBar *parent, const TQString text, const TQIconSet &icon, Button::~Button() { // m_buttonBar->removeButton(this); - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("UI"); TQRegExp r("^&([0-9])\\s.*"); diff --git a/apps/ktorrent/newui/ddockwindow.cpp b/apps/ktorrent/newui/ddockwindow.cpp index 29f59cf..b52815f 100644 --- a/apps/ktorrent/newui/ddockwindow.cpp +++ b/apps/ktorrent/newui/ddockwindow.cpp @@ -68,7 +68,7 @@ DDockWindow::DDockWindow(DMainWindow *parent, Position position) break; } - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("UI"); int mode = config->readNumEntry("MDIStyle", 3); Ideal::ButtonMode buttonMode = Ideal::Text; @@ -103,7 +103,7 @@ DDockWindow::~DDockWindow() void DDockWindow::setVisible(bool v) { //write dock width to the config file - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); TQString group = TQString("%1").arg(m_name); config->setGroup(group); @@ -147,7 +147,7 @@ void DDockWindow::loadSettings() void DDockWindow::saveSettings() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); TQString group = TQString("%1").arg(m_name); int invisibleWidth = 0; config->setGroup(group); @@ -199,7 +199,7 @@ void DDockWindow::addWidget(const TQString &title, TQWidget *widget, bool skipAc { //if the widget was selected last time the dock is deleted //we need to show it - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); TQString group = TQString("%1").arg(m_name); config->setGroup(group); if (config->readEntry("ViewLastWidget") == title) diff --git a/apps/ktorrent/newui/dmainwindow.cpp b/apps/ktorrent/newui/dmainwindow.cpp index 9134404..d4a2424 100644 --- a/apps/ktorrent/newui/dmainwindow.cpp +++ b/apps/ktorrent/newui/dmainwindow.cpp @@ -42,7 +42,7 @@ DMainWindow::DMainWindow(TQWidget *parent, const char *name) void DMainWindow::loadSettings() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("UI"); m_openTabAfterCurrent = config->readBoolEntry("OpenNewTabAfterCurrent", true); m_showIconsOnTabs = config->readBoolEntry("ShowTabIcons", false); diff --git a/apps/ktorrent/newui/dtabwidget.cpp b/apps/ktorrent/newui/dtabwidget.cpp index f1148a5..c74e1d6 100644 --- a/apps/ktorrent/newui/dtabwidget.cpp +++ b/apps/ktorrent/newui/dtabwidget.cpp @@ -56,7 +56,7 @@ DTabWidget::DTabWidget(TQWidget *parent, const char *name) void DTabWidget::loadSettings() { /* - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("UI"); // m_tabBarShown = config->readBoolEntry("TabBarShown", true); m_tabBarShown = ! config->readNumEntry("TabWidgetVisibility", 0); diff --git a/apps/ktorrent/trayicon.cpp b/apps/ktorrent/trayicon.cpp index 884db94..19667ab 100644 --- a/apps/ktorrent/trayicon.cpp +++ b/apps/ktorrent/trayicon.cpp @@ -49,7 +49,7 @@ TrayIcon::TrayIcon( KTorrentCore* tc, TQWidget *parent, const char *name) m_hover_popup = new TrayHoverPopup(m_kt_pix,this); - connect(this,TQ_SIGNAL(quitSelected()),kapp,TQ_SLOT(quit())); + connect(this,TQ_SIGNAL(quitSelected()),tdeApp,TQ_SLOT(quit())); connect(m_core, TQ_SIGNAL(finished(kt::TorrentInterface* )), this, TQ_SLOT(finished(kt::TorrentInterface* ))); connect(m_core,TQ_SIGNAL(torrentStoppedByError(kt::TorrentInterface*, TQString )), diff --git a/apps/ktupnptest/upnptestapp.cpp b/apps/ktupnptest/upnptestapp.cpp index d85f08a..a6e0852 100644 --- a/apps/ktupnptest/upnptestapp.cpp +++ b/apps/ktupnptest/upnptestapp.cpp @@ -68,7 +68,7 @@ void UPnPTestApp::onTestBtn() void UPnPTestApp::onCloseBtn() { - kapp->quit(); + tdeApp->quit(); } bool UPnPTestApp::queryExit() diff --git a/libktorrent/datachecker/multidatachecker.cpp b/libktorrent/datachecker/multidatachecker.cpp index f63e05c..6fe8e39 100644 --- a/libktorrent/datachecker/multidatachecker.cpp +++ b/libktorrent/datachecker/multidatachecker.cpp @@ -94,7 +94,7 @@ namespace bt if (now - last_update_time > 1000) { Out() << "Checked " << cur_chunk << " chunks" << endl; - // TDEApplication::kApplication()->processEvents(); + // tdeApp->processEvents(); last_update_time = now; } } diff --git a/plugins/ipfilter/convertdialog.cpp b/plugins/ipfilter/convertdialog.cpp index 2334297..48d8e81 100644 --- a/plugins/ipfilter/convertdialog.cpp +++ b/plugins/ipfilter/convertdialog.cpp @@ -122,7 +122,7 @@ namespace kt if(canceled) return; - TDEApplication::kApplication() ->processEvents(); + tdeApp ->processEvents(); TQString line = stream.readLine(); i += line.length() * sizeof( char ); //rough estimation of string size kProgress1->setProgress( i * 100 / source_size ); @@ -184,7 +184,7 @@ namespace kt if ( i % 10000 == 0 ) Out(SYS_IPF|LOG_DEBUG) << "Block " << i << " written." << endl; } - TDEApplication::kApplication()->processEvents(); + tdeApp->processEvents(); if(canceled) return; @@ -206,7 +206,7 @@ namespace kt converting = false; } - TDEApplication::kApplication()->processEvents(); + tdeApp->processEvents(); //reload level1 filter if ( m_plugin ) m_plugin->loadAntiP2P(); diff --git a/plugins/rssfeed/rss/testlibrss.cpp b/plugins/rssfeed/rss/testlibrss.cpp index 4515cf7..a6e970e 100644 --- a/plugins/rssfeed/rss/testlibrss.cpp +++ b/plugins/rssfeed/rss/testlibrss.cpp @@ -53,7 +53,7 @@ void Tester::slotLoadingComplete( Loader *loader, Document doc, Status status ) if ( status != Success ) kdDebug() << "ERROR " << loader->errorCode() << endl; - kapp->quit(); + tdeApp->quit(); } int main( int argc, char **argv ) diff --git a/plugins/search/searchplugin.cpp b/plugins/search/searchplugin.cpp index ebf53e6..0aac421 100644 --- a/plugins/search/searchplugin.cpp +++ b/plugins/search/searchplugin.cpp @@ -106,7 +106,7 @@ namespace kt KURL url = KURL::fromPathOrURL(s_url); if(SearchPluginSettings::useDefaultBrowser()) - kapp->invokeBrowser(url.url()); + tdeApp->invokeBrowser(url.url()); else KRun::runCommand(TQString("%1 \"%2\"").arg(SearchPluginSettings::customBrowser()).arg(url.url()), SearchPluginSettings::customBrowser(), "viewmag" ); diff --git a/plugins/webinterface/httpserver.cpp b/plugins/webinterface/httpserver.cpp index 292ecc8..f0cfefd 100644 --- a/plugins/webinterface/httpserver.cpp +++ b/plugins/webinterface/httpserver.cpp @@ -381,7 +381,7 @@ namespace kt { // first send back login page redirectToLoginPage(hdlr); - TQTimer::singleShot(1000,kapp,TQ_SLOT(quit())); + TQTimer::singleShot(1000,tdeApp,TQ_SLOT(quit())); } else if (redirect) {