From b1b005cf854aad925c2e64c3fc3ece582d4bffcf Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:42:09 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- kscreensaver/kdesavers/Euphoria.cpp | 4 ++-- kscreensaver/kdesavers/Flux.cpp | 4 ++-- kscreensaver/kdesavers/SolarWinds.cpp | 4 ++-- kscreensaver/kdesavers/banner.cpp | 8 ++++---- kscreensaver/kdesavers/blob.cpp | 6 +++--- kscreensaver/kdesavers/kclock.cpp | 6 +++--- kscreensaver/kdesavers/kvm.cpp | 6 +++--- kscreensaver/kdesavers/lines.cpp | 6 +++--- kscreensaver/kdesavers/lorenz.cpp | 8 ++++---- kscreensaver/kdesavers/pendulum.cpp | 4 ++-- kscreensaver/kdesavers/polygon.cpp | 6 +++--- kscreensaver/kdesavers/rotation.cpp | 4 ++-- kscreensaver/kdesavers/science.cpp | 6 +++--- kscreensaver/kdesavers/slideshow.cpp | 8 ++++---- kscreensaver/kdesavers/wave.cpp | 6 +++--- kscreensaver/kpartsaver/kpartsaver.cpp | 4 ++-- kscreensaver/kxsconfig/kxsconfig.cpp | 8 ++++---- kscreensaver/kxsconfig/kxsconfig.h | 6 +++--- kscreensaver/xsavers/helpers.h | 2 +- 19 files changed, 53 insertions(+), 53 deletions(-) (limited to 'kscreensaver') diff --git a/kscreensaver/kdesavers/Euphoria.cpp b/kscreensaver/kdesavers/Euphoria.cpp index 0d3eb19b..c42e7693 100644 --- a/kscreensaver/kdesavers/Euphoria.cpp +++ b/kscreensaver/kdesavers/Euphoria.cpp @@ -944,7 +944,7 @@ static int filterRandom( int n ) void KEuphoriaScreenSaver::readSettings() { - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); config->setGroup("Settings"); _mode = config->readNumEntry( "Mode", EuphoriaWidget::Regular ); @@ -1047,7 +1047,7 @@ void KEuphoriaSetup::slotHelp() */ void KEuphoriaSetup::slotOk() { - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); config->setGroup("Settings"); TQString val; diff --git a/kscreensaver/kdesavers/Flux.cpp b/kscreensaver/kdesavers/Flux.cpp index 1dd85a53..0fb73466 100644 --- a/kscreensaver/kdesavers/Flux.cpp +++ b/kscreensaver/kdesavers/Flux.cpp @@ -828,7 +828,7 @@ static int filterRandom( int n ) void KFluxScreenSaver::readSettings() { - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); config->setGroup("Settings"); _mode = config->readNumEntry( "Mode", FluxWidget::Regular ); @@ -928,7 +928,7 @@ void KFluxSetup::slotHelp() */ void KFluxSetup::slotOk() { - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); config->setGroup("Settings"); TQString val; diff --git a/kscreensaver/kdesavers/SolarWinds.cpp b/kscreensaver/kdesavers/SolarWinds.cpp index 0bd5d4e6..4b534b1d 100644 --- a/kscreensaver/kdesavers/SolarWinds.cpp +++ b/kscreensaver/kdesavers/SolarWinds.cpp @@ -642,7 +642,7 @@ static int filterRandom( int n ) void KSWindsScreenSaver::readSettings() { - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); config->setGroup("Settings"); _mode = config->readNumEntry( "Mode", SWindsWidget::Regular ); @@ -740,7 +740,7 @@ void KSWindsSetup::slotHelp() */ void KSWindsSetup::slotOk() { - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); config->setGroup("Settings"); TQString val; diff --git a/kscreensaver/kdesavers/banner.cpp b/kscreensaver/kdesavers/banner.cpp index 143c2aba..0410f397 100644 --- a/kscreensaver/kdesavers/banner.cpp +++ b/kscreensaver/kdesavers/banner.cpp @@ -166,7 +166,7 @@ KBannerSetup::KBannerSetup( TQWidget *parent, const char *name ) // read settings from config file void KBannerSetup::readSettings() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "Settings" ); speed=config->readNumEntry("Speed",50); @@ -308,7 +308,7 @@ void KBannerSetup::slotTimeToggled( bool on ) // Ok pressed - save settings and exit void KBannerSetup::slotOk() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "Settings" ); config->writeEntry( "Speed", speed ); @@ -415,7 +415,7 @@ void KBannerSaver::setTimeDisplay() // read settings from config file void KBannerSaver::readSettings() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "Settings" ); setSpeed( config->readNumEntry("Speed",50) ); @@ -470,7 +470,7 @@ void KBannerSaver::slotTimeout() } if (showTime) { - TQString new_message = KGlobal::locale()->formatTime(TQTime::currentTime(), true); + TQString new_message = TDEGlobal::locale()->formatTime(TQTime::currentTime(), true); if( new_message != message ) needUpdate = TRUE; message = new_message; diff --git a/kscreensaver/kdesavers/blob.cpp b/kscreensaver/kdesavers/blob.cpp index 4877866e..9bf36b78 100644 --- a/kscreensaver/kdesavers/blob.cpp +++ b/kscreensaver/kdesavers/blob.cpp @@ -412,7 +412,7 @@ void KBlobSaver::blank() void KBlobSaver::readSettings() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Settings"); // number of seconds to spend on a frame @@ -491,7 +491,7 @@ KBlobSetup::KBlobSetup void KBlobSetup::readSettings() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Settings"); // number of seconds to spend on a frame @@ -504,7 +504,7 @@ void KBlobSetup::readSettings() // Ok pressed - save settings and exit void KBlobSetup::slotOk() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Settings"); diff --git a/kscreensaver/kdesavers/kclock.cpp b/kscreensaver/kdesavers/kclock.cpp index 319ae822..8ff4d6fa 100644 --- a/kscreensaver/kdesavers/kclock.cpp +++ b/kscreensaver/kdesavers/kclock.cpp @@ -174,7 +174,7 @@ KClockSetup::~KClockSetup() void KClockSetup::readSettings() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Settings"); m_keepCentered = config->readBoolEntry("KeepCentered", DEFAULT_KEEP_CENTERED); @@ -206,7 +206,7 @@ void KClockSetup::readSettings() void KClockSetup::slotOk() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Settings"); config->writeEntry("Size", m_size); config->writeEntry("KeepCentered", m_keepCentered); @@ -488,7 +488,7 @@ void KClockSaver::setKeepCentered(bool b) void KClockSaver::readSettings() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Settings"); m_keepCentered = config->readBoolEntry("KeepCentered", DEFAULT_KEEP_CENTERED); diff --git a/kscreensaver/kdesavers/kvm.cpp b/kscreensaver/kdesavers/kvm.cpp index 9019c165..4e6bbb77 100644 --- a/kscreensaver/kdesavers/kvm.cpp +++ b/kscreensaver/kdesavers/kvm.cpp @@ -226,7 +226,7 @@ void kVmSaver::setRefreshTimeout( const int refreshTimeout ) void kVmSaver::readSettings() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "Settings" ); speed = config->readNumEntry( "Speed", 50 ); @@ -329,7 +329,7 @@ kVmSetup::~kVmSetup() void kVmSetup::readSettings() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "Settings" ); speed = config->readNumEntry( "Speed", 50 ); @@ -359,7 +359,7 @@ void kVmSetup::slotRefreshTimeout( int num ) void kVmSetup::slotOk() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "Settings" ); TQString sspeed; diff --git a/kscreensaver/kdesavers/lines.cpp b/kscreensaver/kdesavers/lines.cpp index 94a42bc2..235da413 100644 --- a/kscreensaver/kdesavers/lines.cpp +++ b/kscreensaver/kdesavers/lines.cpp @@ -186,7 +186,7 @@ kLinesSetup::~kLinesSetup() // read settings from config file void kLinesSetup::readSettings(){ - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "Settings" ); TQString str; @@ -244,7 +244,7 @@ void kLinesSetup::slotHelp(){ // Ok pressed - save settings and exit void kLinesSetup::slotOk(){ - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Settings"); TQString slength; @@ -319,7 +319,7 @@ void kLinesSaver::setColor(const TQColor& cs, const TQColor& cm, const TQColor& // read configuration settings from config file void kLinesSaver::readSettings(){ - KConfig *config=KGlobal::config(); + KConfig *config=TDEGlobal::config(); config->setGroup("Settings"); numLines=config->readNumEntry("Length", 10); diff --git a/kscreensaver/kdesavers/lorenz.cpp b/kscreensaver/kdesavers/lorenz.cpp index 643b2ac7..e6f911dc 100644 --- a/kscreensaver/kdesavers/lorenz.cpp +++ b/kscreensaver/kdesavers/lorenz.cpp @@ -155,7 +155,7 @@ KLorenzSetup::~KLorenzSetup() // read settings from config file void KLorenzSetup::readSettings() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "Settings" ); speed = config->readNumEntry( "Speed", DEFSPEED ); @@ -223,7 +223,7 @@ void KLorenzSetup::slotHelp() // Ok pressed - save settings and exit void KLorenzSetup::slotOk() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "Settings" ); config->writeEntry( "Speed", speed ); @@ -265,7 +265,7 @@ void KLorenzSetup::slotDefault() /* // User can cancel, or save defaults? - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "Settings" ); config->writeEntry( "Speed", speed ); @@ -461,7 +461,7 @@ KLorenzSaver::~KLorenzSaver() // read configuration settings from config file void KLorenzSaver::readSettings() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "Settings" ); speed = config->readNumEntry( "Speed", DEFSPEED ); diff --git a/kscreensaver/kdesavers/pendulum.cpp b/kscreensaver/kdesavers/pendulum.cpp index d91294c2..e178d997 100644 --- a/kscreensaver/kdesavers/pendulum.cpp +++ b/kscreensaver/kdesavers/pendulum.cpp @@ -392,7 +392,7 @@ KPendulumSaver::~KPendulumSaver() void KPendulumSaver::readSettings() { // read configuration settings from config file - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Settings"); // internal saver parameters are set to stored values or left at their @@ -766,7 +766,7 @@ KPendulumSetup::~KPendulumSetup() // Ok pressed - save settings and exit void KPendulumSetup::okButtonClickedSlot() { - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); config->setGroup("Settings"); config->writeEntry("mass ratio", saver->massRatio()); diff --git a/kscreensaver/kdesavers/polygon.cpp b/kscreensaver/kdesavers/polygon.cpp index 5d3de767..1de9aab3 100644 --- a/kscreensaver/kdesavers/polygon.cpp +++ b/kscreensaver/kdesavers/polygon.cpp @@ -113,7 +113,7 @@ kPolygonSetup::~kPolygonSetup() // read settings from config file void kPolygonSetup::readSettings() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "Settings" ); length = config->readNumEntry( "Length", length ); @@ -159,7 +159,7 @@ void kPolygonSetup::slotSpeed( int num ) // Ok pressed - save settings and exit void kPolygonSetup::slotOk() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "Settings" ); TQString slength; @@ -241,7 +241,7 @@ void kPolygonSaver::setSpeed( int spd ) // read configuration settings from config file void kPolygonSaver::readSettings() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "Settings" ); numLines = config->readNumEntry( "Length", 10 ); diff --git a/kscreensaver/kdesavers/rotation.cpp b/kscreensaver/kdesavers/rotation.cpp index d282c98e..2c0ddd84 100644 --- a/kscreensaver/kdesavers/rotation.cpp +++ b/kscreensaver/kdesavers/rotation.cpp @@ -558,7 +558,7 @@ void KRotationSaver::initData() void KRotationSaver::readSettings() { // read configuration settings from config file - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Settings"); // internal saver parameters are set to stored values or left at their @@ -764,7 +764,7 @@ KRotationSetup::~KRotationSetup() // Ok pressed - save settings and exit void KRotationSetup::okButtonClickedSlot(void) { - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); config->setGroup("Settings"); config->writeEntry("x trace", saver->traceFlag(0)); config->writeEntry("y trace", saver->traceFlag(1)); diff --git a/kscreensaver/kdesavers/science.cpp b/kscreensaver/kdesavers/science.cpp index e8de784e..093084c2 100644 --- a/kscreensaver/kdesavers/science.cpp +++ b/kscreensaver/kdesavers/science.cpp @@ -560,7 +560,7 @@ void KScienceSaver::setHideBG( bool b ) void KScienceSaver::readSettings() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); TQString sMode; config->setGroup( "Settings" ); @@ -1008,7 +1008,7 @@ void KScienceSetup::updateSettings() // read settings from config file void KScienceSetup::readSettings() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); TQString sMode; config->setGroup( "Settings" ); @@ -1118,7 +1118,7 @@ void KScienceSetup::slotSliderReleased() // Ok pressed - save settings and exit void KScienceSetup::slotOk() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); TQString sSize, sSpeed, sIntensity, sMode; config->setGroup( "Settings" ); diff --git a/kscreensaver/kdesavers/slideshow.cpp b/kscreensaver/kdesavers/slideshow.cpp index f1d37749..4c8510e5 100644 --- a/kscreensaver/kdesavers/slideshow.cpp +++ b/kscreensaver/kdesavers/slideshow.cpp @@ -139,12 +139,12 @@ void kSlideShowSaver::initNextScreen() //----------------------------------------------------------------------------- void kSlideShowSaver::readConfig() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Settings"); mShowRandom = config->readBoolEntry("ShowRandom", true); mZoomImages = config->readBoolEntry("ZoomImages", false); mPrintName = config->readBoolEntry("PrintName", true); - mDirectory = config->readPathEntry("Directory", KGlobal::dirs()->findDirs("wallpaper", "").last()); + mDirectory = config->readPathEntry("Directory", TDEGlobal::dirs()->findDirs("wallpaper", "").last()); mDelay = config->readNumEntry("Delay", 10) * 1000; mSubdirectory = config->readBoolEntry("SubDirectory", false); mRandomPosition = config->readBoolEntry("RandomPosition", false); @@ -955,7 +955,7 @@ kSlideShowSetup::~kSlideShowSetup() //----------------------------------------------------------------------------- void kSlideShowSetup::readSettings() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Settings"); cfg->mCbxRandom->setChecked(config->readBoolEntry("ShowRandom", true)); @@ -971,7 +971,7 @@ void kSlideShowSetup::readSettings() //----------------------------------------------------------------------------- void kSlideShowSetup::writeSettings() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Settings"); config->writeEntry("ShowRandom", cfg->mCbxRandom->isChecked()); diff --git a/kscreensaver/kdesavers/wave.cpp b/kscreensaver/kdesavers/wave.cpp index 2c817d08..817b5062 100644 --- a/kscreensaver/kdesavers/wave.cpp +++ b/kscreensaver/kdesavers/wave.cpp @@ -83,7 +83,7 @@ KWaveSetup::~KWaveSetup( ) // read settings from config file void KWaveSetup::readSettings() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "Settings" ); // color = config->readColorEntry( "Color", &black ); @@ -92,7 +92,7 @@ void KWaveSetup::readSettings() // Ok pressed - save settings and exit void KWaveSetup::slotOkPressed() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "Settings" ); // config->writeEntry( "Color", color ); @@ -133,7 +133,7 @@ KWaveSaver::~KWaveSaver() // read configuration settings from config file void KWaveSaver::readSettings() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "Settings" ); // color = config->readColorEntry( "Color", &black ); diff --git a/kscreensaver/kpartsaver/kpartsaver.cpp b/kscreensaver/kpartsaver/kpartsaver.cpp index 57caa762..3b456ec4 100644 --- a/kscreensaver/kpartsaver/kpartsaver.cpp +++ b/kscreensaver/kpartsaver/kpartsaver.cpp @@ -64,14 +64,14 @@ extern "C" KDE_EXPORT KScreenSaver *kss_create( WId d ) { - KGlobal::locale()->insertCatalogue("kpartsaver"); + TDEGlobal::locale()->insertCatalogue("kpartsaver"); return new KPartSaver( d ); } KDE_EXPORT TQDialog *kss_setup() { kdDebug() << "kss_setup" << endl; - KGlobal::locale()->insertCatalogue("kpartsaver"); + TDEGlobal::locale()->insertCatalogue("kpartsaver"); return new SaverConfig; } } diff --git a/kscreensaver/kxsconfig/kxsconfig.cpp b/kscreensaver/kxsconfig/kxsconfig.cpp index b3de5e45..a085d032 100644 --- a/kscreensaver/kxsconfig/kxsconfig.cpp +++ b/kscreensaver/kxsconfig/kxsconfig.cpp @@ -165,9 +165,9 @@ bool KXSConfigDialog::create() } } - mPreviewProc = new KProcess; - connect(mPreviewProc, TQT_SIGNAL(processExited(KProcess *)), - TQT_SLOT(slotPreviewExited(KProcess *))); + mPreviewProc = new TDEProcess; + connect(mPreviewProc, TQT_SIGNAL(processExited(TDEProcess *)), + TQT_SLOT(slotPreviewExited(TDEProcess *))); mPreviewTimer = new TQTimer(this); connect(mPreviewTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotNewPreview())); @@ -213,7 +213,7 @@ TQString KXSConfigDialog::command() } //--------------------------------------------------------------------------- -void KXSConfigDialog::slotPreviewExited(KProcess *) +void KXSConfigDialog::slotPreviewExited(TDEProcess *) { if ( mKilled ) { mKilled = false; diff --git a/kscreensaver/kxsconfig/kxsconfig.h b/kscreensaver/kxsconfig/kxsconfig.h index de88df23..daf3c9f8 100644 --- a/kscreensaver/kxsconfig/kxsconfig.h +++ b/kscreensaver/kxsconfig/kxsconfig.h @@ -25,7 +25,7 @@ #include #include "kxsitem.h" -class KProcess; +class TDEProcess; class TQLabel; class KXSConfigDialog : public KDialogBase @@ -40,7 +40,7 @@ public: TQString command(); protected slots: - void slotPreviewExited(KProcess *); + void slotPreviewExited(TDEProcess *); void slotNewPreview(); void slotChanged(); virtual void slotOk(); @@ -50,7 +50,7 @@ protected: TQString mFilename; TQString mExeName; TQString mConfigFile; - KProcess *mPreviewProc; + TDEProcess *mPreviewProc; TQWidget *mPreview; TQTimer *mPreviewTimer; TQPtrList mConfigItemList; diff --git a/kscreensaver/xsavers/helpers.h b/kscreensaver/xsavers/helpers.h index c0f8fb59..d8ba3b8c 100644 --- a/kscreensaver/xsavers/helpers.h +++ b/kscreensaver/xsavers/helpers.h @@ -13,7 +13,7 @@ void fixed_size(TQWidget *); /* * Use this to get a KConfig object that uses a reasonable config filename. - * KGlobal::config() will use the klockrc config file. + * TDEGlobal::config() will use the klockrc config file. * * Caller must delete the object when finished. */ -- cgit v1.2.1