From 97949c227e1638f2b1b85c4528b1102b6730211f Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Mon, 20 Jan 2025 23:54:06 +0900 Subject: Use tdeApp Signed-off-by: Michele Calgaro --- tdescreensaver/kdesavers/kclock.cpp | 2 +- tdescreensaver/kdesavers/lorenz.cpp | 8 ++++---- tdescreensaver/kdesavers/science.cpp | 2 +- tdescreensaver/kdesavers/tdeasciiquarium/aasaver.cpp | 2 +- tdescreensaver/kxsconfig/kxsconfig.cpp | 4 ++-- tdescreensaver/tdepartsaver/tdepartsaver.cpp | 6 +++--- tdescreensaver/xsavers/demowin.h | 2 +- tdescreensaver/xsavers/helpers.cpp | 2 +- twin-styles/icewm/config/config.cpp | 2 +- twin-styles/openlook/OpenLook.cpp | 4 ++-- twin-styles/system/systemclient.cpp | 2 +- 11 files changed, 18 insertions(+), 18 deletions(-) diff --git a/tdescreensaver/kdesavers/kclock.cpp b/tdescreensaver/kdesavers/kclock.cpp index 44614a51..84db6b4f 100644 --- a/tdescreensaver/kdesavers/kclock.cpp +++ b/tdescreensaver/kdesavers/kclock.cpp @@ -150,7 +150,7 @@ KClockSetup::KClockSetup(TQWidget *parent, const char *name) connect(qs, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotSliderMoved(int))); top->addWidget( qs ); - bool rtl = kapp->reverseLayout(); + bool rtl = tdeApp->reverseLayout(); TQHBox *qsscale = new TQHBox(main); label = new TQLabel(i18n("Small"), qsscale); label->setAlignment(rtl ? AlignRight : AlignLeft); diff --git a/tdescreensaver/kdesavers/lorenz.cpp b/tdescreensaver/kdesavers/lorenz.cpp index 0825ecd2..926aad82 100644 --- a/tdescreensaver/kdesavers/lorenz.cpp +++ b/tdescreensaver/kdesavers/lorenz.cpp @@ -520,11 +520,11 @@ void KLorenzSaver::updateMatrix() void KLorenzSaver::newEpoch() { // Start at a random position, somewhere around the mean - x = 0.95-25.0+50.0*kapp->random() / (RAND_MAX+1.0); - y = 0.97-25.0+50.0*kapp->random() / (RAND_MAX+1.0); - z = 23.6-25.0+50.0*kapp->random() / (RAND_MAX+1.0); + x = 0.95-25.0+50.0*tdeApp->random() / (RAND_MAX+1.0); + y = 0.97-25.0+50.0*tdeApp->random() / (RAND_MAX+1.0); + z = 23.6-25.0+50.0*tdeApp->random() / (RAND_MAX+1.0); // start at some random 'time' as well to have different colors - t = 10000.0*kapp->random() / (RAND_MAX+1.0); + t = 10000.0*tdeApp->random() / (RAND_MAX+1.0); erase(); e=0; // reset epoch counter } diff --git a/tdescreensaver/kdesavers/science.cpp b/tdescreensaver/kdesavers/science.cpp index a63733c8..7e79a4fc 100644 --- a/tdescreensaver/kdesavers/science.cpp +++ b/tdescreensaver/kdesavers/science.cpp @@ -980,7 +980,7 @@ KScienceSetup::KScienceSetup( TQWidget *parent, const char *name ) lt->addWidget( preview ); // let the preview window display before creating the saver - kapp->processEvents(); + tdeApp->processEvents(); saver = new KScienceSaver( preview->winId(), true, !p.isNull() ); preview->notifySaver( saver ); diff --git a/tdescreensaver/kdesavers/tdeasciiquarium/aasaver.cpp b/tdescreensaver/kdesavers/tdeasciiquarium/aasaver.cpp index fa3862d5..a3e23c7a 100644 --- a/tdescreensaver/kdesavers/tdeasciiquarium/aasaver.cpp +++ b/tdescreensaver/kdesavers/tdeasciiquarium/aasaver.cpp @@ -413,7 +413,7 @@ void AASaver::addAllFish() // many we'd be dealing with in full screen, and then scale the user's // number down to adjust so that we look about the same in a window as we // do fullscreen. TODO: Xinerama issues? - TQRect fullScreenGeometry = kapp->desktop()->screenGeometry(); + TQRect fullScreenGeometry = tdeApp->desktop()->screenGeometry(); int full_width = fullScreenGeometry.width() / screen->cellWidth(); int full_height = fullScreenGeometry.height() / screen->cellHeight() - 9; diff --git a/tdescreensaver/kxsconfig/kxsconfig.cpp b/tdescreensaver/kxsconfig/kxsconfig.cpp index a5caa70c..945ccd55 100644 --- a/tdescreensaver/kxsconfig/kxsconfig.cpp +++ b/tdescreensaver/kxsconfig/kxsconfig.cpp @@ -323,13 +323,13 @@ void KXSConfigDialog::slotOk() item->save(config); } - kapp->quit(); + tdeApp->quit(); } //--------------------------------------------------------------------------- void KXSConfigDialog::slotCancel() { - kapp->quit(); + tdeApp->quit(); } diff --git a/tdescreensaver/tdepartsaver/tdepartsaver.cpp b/tdescreensaver/tdepartsaver/tdepartsaver.cpp index eddfa739..8a312d8e 100644 --- a/tdescreensaver/tdepartsaver/tdepartsaver.cpp +++ b/tdescreensaver/tdepartsaver/tdepartsaver.cpp @@ -110,7 +110,7 @@ KPartSaver::KPartSaver( WId id ) closeURL(); // load config - TDEConfig *cfg = kapp->config(); + TDEConfig *cfg = tdeApp->config(); cfg->setGroup( "Misc" ); m_single = cfg->readBoolEntry( "Single", true ); @@ -291,7 +291,7 @@ SaverConfig::SaverConfig( TQWidget* parent, const char* name ) m_down->setIconSet( SmallIconSet("go-down") ); // load config - TDEConfig *cfg = kapp->config(); + TDEConfig *cfg = tdeApp->config(); cfg->setGroup( "Misc" ); bool single = cfg->readBoolEntry( "Single", true ); @@ -317,7 +317,7 @@ void SaverConfig::apply() { kdDebug() << "apply" << endl; - TDEConfig *cfg = kapp->config(); + TDEConfig *cfg = tdeApp->config(); cfg->setGroup( "Misc" ); cfg->writeEntry( "Single", m_single->isChecked() ); diff --git a/tdescreensaver/xsavers/demowin.h b/tdescreensaver/xsavers/demowin.h index 9f9e467f..b66909a0 100644 --- a/tdescreensaver/xsavers/demowin.h +++ b/tdescreensaver/xsavers/demowin.h @@ -36,7 +36,7 @@ protected: { if (e->ascii() == 'q') { - kapp->quit(); + tdeApp->quit(); } } }; diff --git a/tdescreensaver/xsavers/helpers.cpp b/tdescreensaver/xsavers/helpers.cpp index 56c28d17..ffc27118 100644 --- a/tdescreensaver/xsavers/helpers.cpp +++ b/tdescreensaver/xsavers/helpers.cpp @@ -28,7 +28,7 @@ void fixed_size(TQWidget *w) { TDEConfig *klock_config() { - TQString name( kapp->argv()[0] ); + TQString name( tdeApp->argv()[0] ); int slash = name.findRev( '/' ); if ( slash ) name = name.mid( slash+1 ); diff --git a/twin-styles/icewm/config/config.cpp b/twin-styles/icewm/config/config.cpp index 9d7090ff..341f342d 100644 --- a/twin-styles/icewm/config/config.cpp +++ b/twin-styles/icewm/config/config.cpp @@ -218,7 +218,7 @@ void IceWMConfig::findIceWMThemes() void IceWMConfig::callURL( const TQString& s ) { - kapp->invokeBrowser( s ); + tdeApp->invokeBrowser( s ); } diff --git a/twin-styles/openlook/OpenLook.cpp b/twin-styles/openlook/OpenLook.cpp index b74f3580..a76ba8bc 100644 --- a/twin-styles/openlook/OpenLook.cpp +++ b/twin-styles/openlook/OpenLook.cpp @@ -404,7 +404,7 @@ OpenLook::animateMinimize(bool /*iconify*/) p.flush(); - kapp->syncX(); + tdeApp->syncX(); usleep(10000); @@ -415,7 +415,7 @@ OpenLook::animateMinimize(bool /*iconify*/) p.flush(); - kapp->syncX(); + tdeApp->syncX(); usleep(10000); diff --git a/twin-styles/system/systemclient.cpp b/twin-styles/system/systemclient.cpp index f4237c95..c6e755b6 100644 --- a/twin-styles/system/systemclient.cpp +++ b/twin-styles/system/systemclient.cpp @@ -79,7 +79,7 @@ static void create_pixmaps() aUpperGradient->resize(32, 18); iUpperGradient = new KPixmap; iUpperGradient->resize(32, 18); - TQColor bgColor = kapp->palette().active().background(); + TQColor bgColor = tdeApp->palette().active().background(); KPixmapEffect::gradient(*aUpperGradient, KDecoration::options()->color(KDecorationOptions::ColorFrame, true).light(130), bgColor, -- cgit v1.2.3