diff options
43 files changed, 176 insertions, 176 deletions
diff --git a/kscreensaver/kdesavers/Euphoria.cpp b/kscreensaver/kdesavers/Euphoria.cpp index c42e7693..7f69e34e 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 = TDEGlobal::config(); + TDEConfig* config = TDEGlobal::config(); config->setGroup("Settings"); _mode = config->readNumEntry( "Mode", EuphoriaWidget::Regular ); @@ -1047,7 +1047,7 @@ void KEuphoriaSetup::slotHelp() */ void KEuphoriaSetup::slotOk() { - KConfig* config = TDEGlobal::config(); + TDEConfig* config = TDEGlobal::config(); config->setGroup("Settings"); TQString val; diff --git a/kscreensaver/kdesavers/Flux.cpp b/kscreensaver/kdesavers/Flux.cpp index 0fb73466..d401b782 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 = TDEGlobal::config(); + TDEConfig* config = TDEGlobal::config(); config->setGroup("Settings"); _mode = config->readNumEntry( "Mode", FluxWidget::Regular ); @@ -928,7 +928,7 @@ void KFluxSetup::slotHelp() */ void KFluxSetup::slotOk() { - KConfig* config = TDEGlobal::config(); + TDEConfig* config = TDEGlobal::config(); config->setGroup("Settings"); TQString val; diff --git a/kscreensaver/kdesavers/SolarWinds.cpp b/kscreensaver/kdesavers/SolarWinds.cpp index 4b534b1d..b464a8de 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 = TDEGlobal::config(); + TDEConfig* config = TDEGlobal::config(); config->setGroup("Settings"); _mode = config->readNumEntry( "Mode", SWindsWidget::Regular ); @@ -740,7 +740,7 @@ void KSWindsSetup::slotHelp() */ void KSWindsSetup::slotOk() { - KConfig* config = TDEGlobal::config(); + TDEConfig* config = TDEGlobal::config(); config->setGroup("Settings"); TQString val; diff --git a/kscreensaver/kdesavers/banner.cpp b/kscreensaver/kdesavers/banner.cpp index 0410f397..a1672b27 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 = TDEGlobal::config(); + TDEConfig *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 = TDEGlobal::config(); + TDEConfig *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 = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup( "Settings" ); setSpeed( config->readNumEntry("Speed",50) ); diff --git a/kscreensaver/kdesavers/blob.cpp b/kscreensaver/kdesavers/blob.cpp index 9bf36b78..4b116744 100644 --- a/kscreensaver/kdesavers/blob.cpp +++ b/kscreensaver/kdesavers/blob.cpp @@ -412,7 +412,7 @@ void KBlobSaver::blank() void KBlobSaver::readSettings() { - KConfig *config = TDEGlobal::config(); + TDEConfig *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 = TDEGlobal::config(); + TDEConfig *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 = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup("Settings"); diff --git a/kscreensaver/kdesavers/firesaver.cpp b/kscreensaver/kdesavers/firesaver.cpp index c03fc1fa..ad6b83ac 100644 --- a/kscreensaver/kdesavers/firesaver.cpp +++ b/kscreensaver/kdesavers/firesaver.cpp @@ -1001,7 +1001,7 @@ void KFireSaver :: freeTexture( unsigned int & textureID ) void KFireSaver :: readConfig () { - KConfig config("kfiresaverrc",true,false); + TDEConfig config("kfiresaverrc",true,false); // show config.setGroup( "Show" ); diff --git a/kscreensaver/kdesavers/firesaversetup.ui.h b/kscreensaver/kdesavers/firesaversetup.ui.h index 5602cc6d..da8ed42a 100644 --- a/kscreensaver/kdesavers/firesaversetup.ui.h +++ b/kscreensaver/kdesavers/firesaversetup.ui.h @@ -58,7 +58,7 @@ void KFireSaverSetup::updatePreview() void KFireSaverSetup::writeConfig() { - KConfig config("kfiresaverrc",false,false); + TDEConfig config("kfiresaverrc",false,false); // show config.setGroup( "Show" ); @@ -129,7 +129,7 @@ void KFireSaverSetup::writeConfig() void KFireSaverSetup::readConfig() { - KConfig config("kfiresaverrc",true,false); + TDEConfig config("kfiresaverrc",true,false); // show config.setGroup( "Show" ); diff --git a/kscreensaver/kdesavers/fountain.cpp b/kscreensaver/kdesavers/fountain.cpp index 47b66998..125be143 100644 --- a/kscreensaver/kdesavers/fountain.cpp +++ b/kscreensaver/kdesavers/fountain.cpp @@ -4,7 +4,7 @@ // // Copyright (c) Ian Reinhart Geiser 2001 // -// KConfig code and KScreenSaver "Setup..." improvements by +// TDEConfig code and KScreenSaver "Setup..." improvements by // Nick Betcher <nbetcher@usinternet.com> 2001 // #include <stdlib.h> @@ -96,7 +96,7 @@ KFountainSetup::KFountainSetup( TQWidget *parent, const char *name ) // read settings from config file void KFountainSetup::readSettings() { - KConfig config("kssfountainrc", false, false); + TDEConfig config("kssfountainrc", false, false); config.setGroup( "Settings" ); TQString boolval = config.readEntry( "Stars", "false" ); @@ -119,7 +119,7 @@ void KFountainSetup::readSettings() // Ok pressed - save settings and exit void KFountainSetup::slotOkPressed() { - KConfig config("kssfountainrc", false, false); + TDEConfig config("kssfountainrc", false, false); config.setGroup( "Settings" ); if (RadioButton1->isOn() == true) @@ -141,7 +141,7 @@ void KFountainSetup::slotOkPressed() void KFountainSetup::aboutPressed() { KMessageBox::about(this, - i18n("<h3>Particle Fountain</h3>\n<p>Particle Fountain Screen Saver for TDE</p>\nCopyright (c) Ian Reinhart Geiser 2001<br>\n\n<p>KConfig code and KScreenSaver \"Setup...\" improvements by Nick Betcher <nbetcher@usinternet.com> 2001</p>")); + i18n("<h3>Particle Fountain</h3>\n<p>Particle Fountain Screen Saver for TDE</p>\nCopyright (c) Ian Reinhart Geiser 2001<br>\n\n<p>TDEConfig code and KScreenSaver \"Setup...\" improvements by Nick Betcher <nbetcher@usinternet.com> 2001</p>")); } //----------------------------------------------------------------------------- @@ -191,7 +191,7 @@ Fountain::Fountain( TQWidget * parent, const char * name) : TQGLWidget (parent,n obj = gluNewQuadric(); // This has to be here because you can't update the fountain until 'fountain' is created! - KConfig config("kssfountainrc", false, false); + TDEConfig config("kssfountainrc", false, false); config.setGroup( "Settings" ); TQString boolval = config.readEntry( "Stars", "false" ); if (boolval == "true") { diff --git a/kscreensaver/kdesavers/gravity.cpp b/kscreensaver/kdesavers/gravity.cpp index 25adf2e2..1f51a5a7 100644 --- a/kscreensaver/kdesavers/gravity.cpp +++ b/kscreensaver/kdesavers/gravity.cpp @@ -4,7 +4,7 @@ // // Copyright (c) Ian Reinhart Geiser 2001 // -// KConfig code and KScreenSaver "Setup..." improvements by +// TDEConfig code and KScreenSaver "Setup..." improvements by // Nick Betcher <nbetcher@usinternet.com> 2001 // #include <stdlib.h> @@ -82,7 +82,7 @@ KGravitySetup::~KGravitySetup() // read settings from config file void KGravitySetup::readSettings() { - KConfig config("kssgravityrc", false, false); + TDEConfig config("kssgravityrc", false, false); config.setGroup( "Settings" ); TQString boolval = config.readEntry( "Stars", "false" ); @@ -105,7 +105,7 @@ void KGravitySetup::readSettings() // Ok pressed - save settings and exit void KGravitySetup::slotOkPressed() { - KConfig config("kssgravityrc", false, false); + TDEConfig config("kssgravityrc", false, false); config.setGroup( "Settings" ); if (RadioButton1->isOn() == true) @@ -127,7 +127,7 @@ void KGravitySetup::slotOkPressed() void KGravitySetup::aboutPressed() { KMessageBox::about(this, - i18n("<h3>Gravity</h3>\n<p>Particle Gravity Screen Saver for TDE</p>\nCopyright (c) Ian Reinhart Geiser 2001<br>\n\n<p>KConfig code and KScreenSaver \"Setup...\" improvements by Nick Betcher <nbetcher@usinternet.com> 2001</p>")); + i18n("<h3>Gravity</h3>\n<p>Particle Gravity Screen Saver for TDE</p>\nCopyright (c) Ian Reinhart Geiser 2001<br>\n\n<p>TDEConfig code and KScreenSaver \"Setup...\" improvements by Nick Betcher <nbetcher@usinternet.com> 2001</p>")); } //----------------------------------------------------------------------------- @@ -179,7 +179,7 @@ Gravity::Gravity( TQWidget * parent, const char * name) : TQGLWidget (parent,nam // obj = gluNewQuadric(); // This has to be here because you can't update the gravity until 'gravity' is created! - KConfig config("kssgravityrc", false, false); + TDEConfig config("kssgravityrc", false, false); config.setGroup( "Settings" ); TQString boolval = config.readEntry( "Stars", "false" ); if (boolval == "true") { diff --git a/kscreensaver/kdesavers/kclock.cpp b/kscreensaver/kdesavers/kclock.cpp index 8ff4d6fa..5201f222 100644 --- a/kscreensaver/kdesavers/kclock.cpp +++ b/kscreensaver/kdesavers/kclock.cpp @@ -174,7 +174,7 @@ KClockSetup::~KClockSetup() void KClockSetup::readSettings() { - KConfig *config = TDEGlobal::config(); + TDEConfig *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 = TDEGlobal::config(); + TDEConfig *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 = TDEGlobal::config(); + TDEConfig *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 4e6bbb77..fbbfdd31 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 = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup( "Settings" ); speed = config->readNumEntry( "Speed", 50 ); @@ -329,7 +329,7 @@ kVmSetup::~kVmSetup() void kVmSetup::readSettings() { - KConfig *config = TDEGlobal::config(); + TDEConfig *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 = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup( "Settings" ); TQString sspeed; diff --git a/kscreensaver/kdesavers/lines.cpp b/kscreensaver/kdesavers/lines.cpp index 235da413..d66f5a43 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 = TDEGlobal::config(); + TDEConfig *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 = TDEGlobal::config(); + TDEConfig *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=TDEGlobal::config(); + TDEConfig *config=TDEGlobal::config(); config->setGroup("Settings"); numLines=config->readNumEntry("Length", 10); diff --git a/kscreensaver/kdesavers/lorenz.cpp b/kscreensaver/kdesavers/lorenz.cpp index e6f911dc..e4e5f63c 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 = TDEGlobal::config(); + TDEConfig *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 = TDEGlobal::config(); + TDEConfig *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 = TDEGlobal::config(); + TDEConfig *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 = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup( "Settings" ); speed = config->readNumEntry( "Speed", DEFSPEED ); diff --git a/kscreensaver/kdesavers/pendulum.cpp b/kscreensaver/kdesavers/pendulum.cpp index e178d997..a355e029 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 = TDEGlobal::config(); + TDEConfig *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 = TDEGlobal::config(); + TDEConfig* 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 1de9aab3..2358f90a 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 = TDEGlobal::config(); + TDEConfig *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 = TDEGlobal::config(); + TDEConfig *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 = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup( "Settings" ); numLines = config->readNumEntry( "Length", 10 ); diff --git a/kscreensaver/kdesavers/rotation.cpp b/kscreensaver/kdesavers/rotation.cpp index 2c0ddd84..9958bd81 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 = TDEGlobal::config(); + TDEConfig *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 = TDEGlobal::config(); + TDEConfig* 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 093084c2..efa860d9 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 = TDEGlobal::config(); + TDEConfig *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 = TDEGlobal::config(); + TDEConfig *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 = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); TQString sSize, sSpeed, sIntensity, sMode; config->setGroup( "Settings" ); diff --git a/kscreensaver/kdesavers/slideshow.cpp b/kscreensaver/kdesavers/slideshow.cpp index 4c8510e5..a3179b5f 100644 --- a/kscreensaver/kdesavers/slideshow.cpp +++ b/kscreensaver/kdesavers/slideshow.cpp @@ -139,7 +139,7 @@ void kSlideShowSaver::initNextScreen() //----------------------------------------------------------------------------- void kSlideShowSaver::readConfig() { - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup("Settings"); mShowRandom = config->readBoolEntry("ShowRandom", true); mZoomImages = config->readBoolEntry("ZoomImages", false); @@ -955,7 +955,7 @@ kSlideShowSetup::~kSlideShowSetup() //----------------------------------------------------------------------------- void kSlideShowSetup::readSettings() { - KConfig *config = TDEGlobal::config(); + TDEConfig *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 = TDEGlobal::config(); + TDEConfig *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 817b5062..f2f03544 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 = TDEGlobal::config(); + TDEConfig *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 = TDEGlobal::config(); + TDEConfig *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 = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup( "Settings" ); // color = config->readColorEntry( "Color", &black ); diff --git a/kscreensaver/kpartsaver/kpartsaver.cpp b/kscreensaver/kpartsaver/kpartsaver.cpp index 3b456ec4..aa4b63e7 100644 --- a/kscreensaver/kpartsaver/kpartsaver.cpp +++ b/kscreensaver/kpartsaver/kpartsaver.cpp @@ -110,7 +110,7 @@ KPartSaver::KPartSaver( WId id ) closeURL(); // load config - KConfig *cfg = kapp->config(); + TDEConfig *cfg = kapp->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("down") ); // load config - KConfig *cfg = kapp->config(); + TDEConfig *cfg = kapp->config(); cfg->setGroup( "Misc" ); bool single = cfg->readBoolEntry( "Single", true ); @@ -317,7 +317,7 @@ void SaverConfig::apply() { kdDebug() << "apply" << endl; - KConfig *cfg = kapp->config(); + TDEConfig *cfg = kapp->config(); cfg->setGroup( "Misc" ); cfg->writeEntry( "Single", m_single->isChecked() ); diff --git a/kscreensaver/kxsconfig/kxsconfig.cpp b/kscreensaver/kxsconfig/kxsconfig.cpp index a085d032..dbe3ea91 100644 --- a/kscreensaver/kxsconfig/kxsconfig.cpp +++ b/kscreensaver/kxsconfig/kxsconfig.cpp @@ -98,7 +98,7 @@ bool KXSConfigDialog::create() layout->addWidget(controlLayout); ((TQBoxLayout*)controlLayout->layout())->addStrut(120); - KConfig config(mConfigFile); + TDEConfig config(mConfigFile); TQString xmlFile = "/doesntexist"; #ifdef XSCREENSAVER_CONFIG_DIR @@ -292,7 +292,7 @@ void KXSConfigDialog::slotChanged() void KXSConfigDialog::slotOk() { KXSConfigItem *item; - KConfig config(mConfigFile); + TDEConfig config(mConfigFile); for (item = mConfigItemList.first(); item != 0; item = mConfigItemList.next()) { diff --git a/kscreensaver/kxsconfig/kxscontrol.cpp b/kscreensaver/kxsconfig/kxscontrol.cpp index aca1993c..08f9b55c 100644 --- a/kscreensaver/kxsconfig/kxscontrol.cpp +++ b/kscreensaver/kxsconfig/kxscontrol.cpp @@ -33,7 +33,7 @@ //=========================================================================== KXSRangeControl::KXSRangeControl(TQWidget *parent, const TQString &name, - KConfig &config) + TDEConfig &config) : TQWidget(parent), KXSRangeItem(name, config), mSlider(0), mSpinBox(0) { TQVBoxLayout *l = new TQVBoxLayout(this); @@ -87,7 +87,7 @@ void KXSRangeControl::slotValueChanged(int value) emit changed(); } -void KXSRangeControl::read(KConfig &config) +void KXSRangeControl::read(TDEConfig &config) { KXSRangeItem::read(config); if ( mSpinBox ) @@ -98,7 +98,7 @@ void KXSRangeControl::read(KConfig &config) //=========================================================================== KXSDoubleRangeControl::KXSDoubleRangeControl(TQWidget *parent, - const TQString &name, KConfig &config) + const TQString &name, TDEConfig &config) : TQWidget(parent), KXSDoubleRangeItem(name, config) { TQVBoxLayout *l = new TQVBoxLayout(this); @@ -144,7 +144,7 @@ void KXSDoubleRangeControl::slotValueChanged(int value) emit changed(); } -void KXSDoubleRangeControl::read(KConfig &config) +void KXSDoubleRangeControl::read(TDEConfig &config) { KXSDoubleRangeItem::read(config); mSlider->setValue((int)((mValue - mMinimum) * 100.0 / @@ -153,7 +153,7 @@ void KXSDoubleRangeControl::read(KConfig &config) //=========================================================================== KXSCheckBoxControl::KXSCheckBoxControl(TQWidget *parent, const TQString &name, - KConfig &config) + TDEConfig &config) : TQCheckBox(parent), KXSBoolItem(name, config) { setText(mLabel); @@ -176,7 +176,7 @@ void KXSCheckBoxControl::slotToggled(bool state) emit changed(); } -void KXSCheckBoxControl::read(KConfig &config) +void KXSCheckBoxControl::read(TDEConfig &config) { KXSBoolItem::read(config); setChecked(mValue); @@ -184,7 +184,7 @@ void KXSCheckBoxControl::read(KConfig &config) //=========================================================================== KXSDropListControl::KXSDropListControl(TQWidget *parent, const TQString &name, - KConfig &config) + TDEConfig &config) : TQWidget(parent), KXSSelectItem(name, config) { TQVBoxLayout *l = new TQVBoxLayout(this); @@ -224,7 +224,7 @@ void KXSDropListControl::slotActivated(int indx) emit changed(); } -void KXSDropListControl::read(KConfig &config) +void KXSDropListControl::read(TDEConfig &config) { KXSSelectItem::read(config); mCombo->setCurrentItem(mValue); @@ -232,7 +232,7 @@ void KXSDropListControl::read(KConfig &config) //=========================================================================== KXSLineEditControl::KXSLineEditControl(TQWidget *parent, const TQString &name, - KConfig &config) + TDEConfig &config) : TQWidget(parent), KXSStringItem(name, config) { TQVBoxLayout *l = new TQVBoxLayout(this); @@ -261,7 +261,7 @@ void KXSLineEditControl::textChanged( const TQString &text ) emit changed(); } -void KXSLineEditControl::read(KConfig &config) +void KXSLineEditControl::read(TDEConfig &config) { KXSStringItem::read(config); mEdit->setText(mValue); @@ -269,7 +269,7 @@ void KXSLineEditControl::read(KConfig &config) //=========================================================================== KXSFileControl::KXSFileControl(TQWidget *parent, const TQString &name, - KConfig &config) + TDEConfig &config) : TQWidget(parent), KXSStringItem(name, config) { TQVBoxLayout *l = new TQVBoxLayout(this); @@ -312,7 +312,7 @@ void KXSFileControl::selectFile() } } -void KXSFileControl::read(KConfig &config) +void KXSFileControl::read(TDEConfig &config) { KXSStringItem::read(config); mEdit->setText(mValue); diff --git a/kscreensaver/kxsconfig/kxscontrol.h b/kscreensaver/kxsconfig/kxscontrol.h index 98594050..acd1a664 100644 --- a/kscreensaver/kxsconfig/kxscontrol.h +++ b/kscreensaver/kxsconfig/kxscontrol.h @@ -39,10 +39,10 @@ class KXSRangeControl : public TQWidget, public KXSRangeItem Q_OBJECT public: - KXSRangeControl(TQWidget *parent, const TQString &name, KConfig &config); + KXSRangeControl(TQWidget *parent, const TQString &name, TDEConfig &config); KXSRangeControl(TQWidget *parent, const TQString &name, const TQXmlAttributes &attr ); - virtual void read(KConfig &config); + virtual void read(TDEConfig &config); signals: void changed(); @@ -61,10 +61,10 @@ class KXSDoubleRangeControl : public TQWidget, public KXSDoubleRangeItem Q_OBJECT public: - KXSDoubleRangeControl(TQWidget *parent, const TQString &name, KConfig &config); + KXSDoubleRangeControl(TQWidget *parent, const TQString &name, TDEConfig &config); KXSDoubleRangeControl(TQWidget *parent, const TQString &name, const TQXmlAttributes &attr ); - virtual void read(KConfig &config); + virtual void read(TDEConfig &config); signals: void changed(); @@ -83,10 +83,10 @@ class KXSCheckBoxControl : public TQCheckBox, public KXSBoolItem Q_OBJECT public: - KXSCheckBoxControl(TQWidget *parent, const TQString &name, KConfig &config); + KXSCheckBoxControl(TQWidget *parent, const TQString &name, TDEConfig &config); KXSCheckBoxControl(TQWidget *parent, const TQString &name, const TQXmlAttributes &attr ); - virtual void read(KConfig &config); + virtual void read(TDEConfig &config); signals: void changed(); @@ -101,10 +101,10 @@ class KXSDropListControl : public TQWidget, public KXSSelectItem Q_OBJECT public: - KXSDropListControl(TQWidget *parent, const TQString &name, KConfig &config); + KXSDropListControl(TQWidget *parent, const TQString &name, TDEConfig &config); KXSDropListControl(TQWidget *parent, const TQString &name, const TQXmlAttributes &attr ); - virtual void read(KConfig &config); + virtual void read(TDEConfig &config); virtual void addOption( const TQXmlAttributes &attr ); @@ -124,10 +124,10 @@ class KXSLineEditControl : public TQWidget, public KXSStringItem Q_OBJECT public: - KXSLineEditControl(TQWidget *parent, const TQString &name, KConfig &config); + KXSLineEditControl(TQWidget *parent, const TQString &name, TDEConfig &config); KXSLineEditControl(TQWidget *parent, const TQString &name, const TQXmlAttributes &attr ); - virtual void read(KConfig &config); + virtual void read(TDEConfig &config); signals: void changed(); @@ -145,10 +145,10 @@ class KXSFileControl : public TQWidget, public KXSStringItem Q_OBJECT public: - KXSFileControl(TQWidget *parent, const TQString &name, KConfig &config); + KXSFileControl(TQWidget *parent, const TQString &name, TDEConfig &config); KXSFileControl(TQWidget *parent, const TQString &name, const TQXmlAttributes &attr ); - virtual void read(KConfig &config); + virtual void read(TDEConfig &config); signals: void changed(); diff --git a/kscreensaver/kxsconfig/kxsitem.cpp b/kscreensaver/kxsconfig/kxsitem.cpp index 7d9ab034..96e20758 100644 --- a/kscreensaver/kxsconfig/kxsitem.cpp +++ b/kscreensaver/kxsconfig/kxsitem.cpp @@ -24,7 +24,7 @@ #include <tqxml.h> //=========================================================================== -KXSConfigItem::KXSConfigItem(const TQString &name, KConfig &config) +KXSConfigItem::KXSConfigItem(const TQString &name, TDEConfig &config) : mName(name) { config.setGroup(name); @@ -38,7 +38,7 @@ KXSConfigItem::KXSConfigItem(const TQString &name, const TQXmlAttributes &attr ) } //=========================================================================== -KXSRangeItem::KXSRangeItem(const TQString &name, KConfig &config) +KXSRangeItem::KXSRangeItem(const TQString &name, TDEConfig &config) : KXSConfigItem(name, config), mInvert(false) { mMinimum = config.readNumEntry("Minimum"); @@ -68,21 +68,21 @@ TQString KXSRangeItem::command() return mSwitch.arg(mInvert?mMaximum-(mValue-mMinimum):mValue); } -void KXSRangeItem::read(KConfig &config) +void KXSRangeItem::read(TDEConfig &config) { config.setGroup(mName); if (config.hasKey("Value")) mValue = config.readNumEntry("Value"); } -void KXSRangeItem::save(KConfig &config) +void KXSRangeItem::save(TDEConfig &config) { config.setGroup(mName); config.writeEntry("Value", mValue); } //=========================================================================== -KXSDoubleRangeItem::KXSDoubleRangeItem(const TQString &name, KConfig &config) +KXSDoubleRangeItem::KXSDoubleRangeItem(const TQString &name, TDEConfig &config) : KXSConfigItem(name, config), mInvert(false) { mMinimum = config.readDoubleNumEntry("Minimum"); @@ -112,14 +112,14 @@ TQString KXSDoubleRangeItem::command() return mSwitch.arg(mInvert?mMaximum-(mValue-mMinimum):mValue); } -void KXSDoubleRangeItem::read(KConfig &config) +void KXSDoubleRangeItem::read(TDEConfig &config) { config.setGroup(mName); if (config.hasKey("Value")) mValue = config.readDoubleNumEntry("Value"); } -void KXSDoubleRangeItem::save(KConfig &config) +void KXSDoubleRangeItem::save(TDEConfig &config) { config.setGroup(mName); config.writeEntry("Value", mValue); @@ -127,7 +127,7 @@ void KXSDoubleRangeItem::save(KConfig &config) //=========================================================================== -KXSBoolItem::KXSBoolItem(const TQString &name, KConfig &config) +KXSBoolItem::KXSBoolItem(const TQString &name, TDEConfig &config) : KXSConfigItem(name, config) { mValue = config.readBoolEntry("Value"); @@ -148,21 +148,21 @@ TQString KXSBoolItem::command() return mValue ? mSwitchOn : mSwitchOff; } -void KXSBoolItem::read(KConfig &config) +void KXSBoolItem::read(TDEConfig &config) { config.setGroup(mName); if (config.hasKey("Value")) mValue = config.readBoolEntry("Value"); } -void KXSBoolItem::save(KConfig &config) +void KXSBoolItem::save(TDEConfig &config) { config.setGroup(mName); config.writeEntry("Value", mValue); } //=========================================================================== -KXSSelectItem::KXSSelectItem(const TQString &name, KConfig &config) +KXSSelectItem::KXSSelectItem(const TQString &name, TDEConfig &config) : KXSConfigItem(name, config) { mOptions = config.readListEntry("Options"); @@ -191,14 +191,14 @@ TQString KXSSelectItem::command() return (*it); } -void KXSSelectItem::read(KConfig &config) +void KXSSelectItem::read(TDEConfig &config) { config.setGroup(mName); if (config.hasKey("Value")) mValue = config.readNumEntry("Value"); } -void KXSSelectItem::save(KConfig &config) +void KXSSelectItem::save(TDEConfig &config) { config.setGroup(mName); config.writeEntry("Value", mValue); @@ -206,7 +206,7 @@ void KXSSelectItem::save(KConfig &config) //=========================================================================== -KXSStringItem::KXSStringItem(const TQString &name, KConfig &config) +KXSStringItem::KXSStringItem(const TQString &name, TDEConfig &config) : KXSConfigItem(name, config) { mValue = config.readEntry("Value"); @@ -236,14 +236,14 @@ TQString KXSStringItem::command() return ""; } -void KXSStringItem::read(KConfig &config) +void KXSStringItem::read(TDEConfig &config) { config.setGroup(mName); if (config.hasKey("Value")) mValue = config.readEntry("Value"); } -void KXSStringItem::save(KConfig &config) +void KXSStringItem::save(TDEConfig &config) { config.setGroup(mName); config.writeEntry("Value", mValue); diff --git a/kscreensaver/kxsconfig/kxsitem.h b/kscreensaver/kxsconfig/kxsitem.h index 74bdff24..9e4bed3e 100644 --- a/kscreensaver/kxsconfig/kxsitem.h +++ b/kscreensaver/kxsconfig/kxsitem.h @@ -29,13 +29,13 @@ class TQXmlAttributes; class KXSConfigItem { public: - KXSConfigItem(const TQString &name, KConfig &config); + KXSConfigItem(const TQString &name, TDEConfig &config); KXSConfigItem(const TQString &name, const TQXmlAttributes &attr); virtual ~KXSConfigItem() {} virtual TQString command() = 0; - virtual void save(KConfig &config) = 0; - virtual void read(KConfig &config) = 0; + virtual void save(TDEConfig &config) = 0; + virtual void read(TDEConfig &config) = 0; protected: TQString mName; @@ -45,12 +45,12 @@ protected: class KXSRangeItem : public KXSConfigItem { public: - KXSRangeItem(const TQString &name, KConfig &config); + KXSRangeItem(const TQString &name, TDEConfig &config); KXSRangeItem(const TQString &name, const TQXmlAttributes &attr); virtual TQString command(); - virtual void save(KConfig &config); - virtual void read(KConfig &config); + virtual void save(TDEConfig &config); + virtual void read(TDEConfig &config); protected: TQString mSwitch; @@ -63,12 +63,12 @@ protected: class KXSDoubleRangeItem : public KXSConfigItem { public: - KXSDoubleRangeItem(const TQString &name, KConfig &config); + KXSDoubleRangeItem(const TQString &name, TDEConfig &config); KXSDoubleRangeItem(const TQString &name, const TQXmlAttributes &attr); virtual TQString command(); - virtual void read(KConfig &config); - virtual void save(KConfig &config); + virtual void read(TDEConfig &config); + virtual void save(TDEConfig &config); protected: TQString mSwitch; @@ -81,12 +81,12 @@ protected: class KXSBoolItem : public KXSConfigItem { public: - KXSBoolItem(const TQString &name, KConfig &config); + KXSBoolItem(const TQString &name, TDEConfig &config); KXSBoolItem(const TQString &name, const TQXmlAttributes &attr); virtual TQString command(); - virtual void read(KConfig &config); - virtual void save(KConfig &config); + virtual void read(TDEConfig &config); + virtual void save(TDEConfig &config); protected: TQString mSwitchOn; @@ -97,15 +97,15 @@ protected: class KXSSelectItem : public KXSConfigItem { public: - KXSSelectItem(const TQString &name, KConfig &config); + KXSSelectItem(const TQString &name, TDEConfig &config); KXSSelectItem(const TQString &name, const TQXmlAttributes &attr); virtual void addOption(const TQXmlAttributes &attr); virtual TQString command(); - virtual void read(KConfig &config); - virtual void save(KConfig &config); + virtual void read(TDEConfig &config); + virtual void save(TDEConfig &config); protected: TQStringList mOptions; @@ -116,12 +116,12 @@ protected: class KXSStringItem : public KXSConfigItem { public: - KXSStringItem(const TQString &name, KConfig &config); + KXSStringItem(const TQString &name, TDEConfig &config); KXSStringItem(const TQString &name, const TQXmlAttributes &attr); virtual TQString command(); - virtual void save(KConfig &config); - virtual void read(KConfig &config); + virtual void save(TDEConfig &config); + virtual void read(TDEConfig &config); protected: TQString mSwitch; diff --git a/kscreensaver/kxsconfig/kxsrun.cpp b/kscreensaver/kxsconfig/kxsrun.cpp index 6f4dbf5e..6ffa1b15 100644 --- a/kscreensaver/kxsconfig/kxsrun.cpp +++ b/kscreensaver/kxsconfig/kxsrun.cpp @@ -83,7 +83,7 @@ int main(int argc, char *argv[]) configFile += "rc"; // read configuration args - KConfig config(configFile); + TDEConfig config(configFile); TQPtrList<KXSConfigItem> configItemList; diff --git a/kscreensaver/xsavers/helpers.cpp b/kscreensaver/xsavers/helpers.cpp index ef700545..e55cf98c 100644 --- a/kscreensaver/xsavers/helpers.cpp +++ b/kscreensaver/xsavers/helpers.cpp @@ -26,13 +26,13 @@ void fixed_size(TQWidget *w) { w->setFixedSize(w->sizeHint()); } -KConfig *klock_config() +TDEConfig *klock_config() { TQString name( kapp->argv()[0] ); int slash = name.findRev( '/' ); if ( slash ) name = name.mid( slash+1 ); - return new KConfig( name + "rc" ); + return new TDEConfig( name + "rc" ); } diff --git a/kscreensaver/xsavers/helpers.h b/kscreensaver/xsavers/helpers.h index d8ba3b8c..e4125709 100644 --- a/kscreensaver/xsavers/helpers.h +++ b/kscreensaver/xsavers/helpers.h @@ -12,12 +12,12 @@ void min_size(TQWidget *); void fixed_size(TQWidget *); /* - * Use this to get a KConfig object that uses a reasonable config filename. + * Use this to get a TDEConfig object that uses a reasonable config filename. * TDEGlobal::config() will use the klockrc config file. * * Caller must delete the object when finished. */ -KConfig *klock_config(); +TDEConfig *klock_config(); #endif diff --git a/kscreensaver/xsavers/space.cpp b/kscreensaver/xsavers/space.cpp index c1cea946..a15dd171 100644 --- a/kscreensaver/xsavers/space.cpp +++ b/kscreensaver/xsavers/space.cpp @@ -540,7 +540,7 @@ void kSpaceSaver::setWarp( int w ) void kSpaceSaver::readSettings() { - KConfig *config = klock_config(); + TDEConfig *config = klock_config(); config->setGroup( "Settings" ); TQString str; @@ -622,7 +622,7 @@ kSpaceSetup::kSpaceSetup( TQWidget *parent, const char *name ) void kSpaceSetup::readSettings() { - KConfig *config = klock_config(); + TDEConfig *config = klock_config(); config->setGroup( "Settings" ); speed = config->readNumEntry( "Speed", speed ); @@ -654,7 +654,7 @@ void kSpaceSetup::slotWarp( int num ) void kSpaceSetup::slotOk() { - KConfig *config = klock_config(); + TDEConfig *config = klock_config(); config->setGroup( "Settings" ); TQString sspeed; diff --git a/kscreensaver/xsavers/swarm.cpp b/kscreensaver/xsavers/swarm.cpp index 57968ec8..0707abc6 100644 --- a/kscreensaver/xsavers/swarm.cpp +++ b/kscreensaver/xsavers/swarm.cpp @@ -297,7 +297,7 @@ void kSwarmSaver::setLevels( int l ) void kSwarmSaver::readSettings() { - KConfig *config = klock_config(); + TDEConfig *config = klock_config(); config->setGroup( "Settings" ); speed = MAXSPEED - config->readNumEntry( "Speed", MAXSPEED - DEFSPEED ); @@ -363,7 +363,7 @@ kSwarmSetup::kSwarmSetup( TQWidget *parent, const char *name ) void kSwarmSetup::readSettings() { - KConfig *config = klock_config(); + TDEConfig *config = klock_config(); config->setGroup( "Settings" ); speed = config->readNumEntry( "Speed", speed ); @@ -395,7 +395,7 @@ void kSwarmSetup::slotLevels( int num ) void kSwarmSetup::slotOk() { - KConfig *config = klock_config(); + TDEConfig *config = klock_config(); config->setGroup( "Settings" ); TQString sspeed; diff --git a/styles/phase/config/phasestyleconfig.h b/styles/phase/config/phasestyleconfig.h index 5b6f8e9c..0c29a52c 100644 --- a/styles/phase/config/phasestyleconfig.h +++ b/styles/phase/config/phasestyleconfig.h @@ -29,7 +29,7 @@ #include "styledialog.h" -class KConfig; +class TDEConfig; class PhaseStyleConfig : public StyleDialog { diff --git a/twin-styles/cde/cdeclient.cpp b/twin-styles/cde/cdeclient.cpp index 64187357..a54df440 100644 --- a/twin-styles/cde/cdeclient.cpp +++ b/twin-styles/cde/cdeclient.cpp @@ -150,7 +150,7 @@ static int scaleCoord(int c) static void readConfig(CdeClientFactory *f) { - KConfig conf( "twincderc" ); + TDEConfig conf( "twincderc" ); conf.setGroup("General"); coloredFrame = conf.readBoolEntry( "UseTitleBarBorderColors", true ); diff --git a/twin-styles/cde/config/config.cpp b/twin-styles/cde/config/config.cpp index 4a6b9f44..13441218 100644 --- a/twin-styles/cde/config/config.cpp +++ b/twin-styles/cde/config/config.cpp @@ -6,7 +6,7 @@ #include <tqvbox.h> #include <klocale.h> -extern "C" KDE_EXPORT TQObject* allocate_config( KConfig* conf, TQWidget* parent ) +extern "C" KDE_EXPORT TQObject* allocate_config( TDEConfig* conf, TQWidget* parent ) { return new CdeConfig(conf, parent); } @@ -20,10 +20,10 @@ extern "C" KDE_EXPORT TQObject* allocate_config( KConfig* conf, TQWidget* parent * Configure tab in twindecoration */ -CdeConfig::CdeConfig( KConfig* conf, TQWidget* parent ) +CdeConfig::CdeConfig( TDEConfig* conf, TQWidget* parent ) : TQObject( parent ) { - cdeConfig = new KConfig("twincderc"); + cdeConfig = new TDEConfig("twincderc"); TDEGlobal::locale()->insertCatalogue("twin_art_clients"); groupBox = new TQVBox( parent ); @@ -82,7 +82,7 @@ void CdeConfig::slotSelectionChanged( int ) // Loads the configurable options from the twinrc config file // It is passed the open config from twindecoration to improve efficiency -void CdeConfig::load( KConfig* /*conf*/ ) +void CdeConfig::load( TDEConfig* /*conf*/ ) { cdeConfig->setGroup("General"); @@ -100,7 +100,7 @@ void CdeConfig::load( KConfig* /*conf*/ ) // Saves the configurable options to the twinrc config file -void CdeConfig::save( KConfig* /*conf*/ ) +void CdeConfig::save( TDEConfig* /*conf*/ ) { cdeConfig->setGroup("General"); diff --git a/twin-styles/cde/config/config.h b/twin-styles/cde/config/config.h index e8779d84..8a9fc6df 100644 --- a/twin-styles/cde/config/config.h +++ b/twin-styles/cde/config/config.h @@ -21,7 +21,7 @@ class CdeConfig: public TQObject public: - CdeConfig( KConfig* conf, TQWidget* parent ); + CdeConfig( TDEConfig* conf, TQWidget* parent ); ~CdeConfig(); // These public signals/slots work similar to KCM modules @@ -29,8 +29,8 @@ class CdeConfig: public TQObject void changed(); public slots: - void load( KConfig* conf ); - void save( KConfig* conf ); + void load( TDEConfig* conf ); + void save( TDEConfig* conf ); void defaults(); protected slots: @@ -38,7 +38,7 @@ class CdeConfig: public TQObject void slotSelectionChanged( int ); private: - KConfig* cdeConfig; + TDEConfig* cdeConfig; TQCheckBox* cbColorBorder; // TQCheckBox* cbTitlebarButton; TQHBox* groupBox; diff --git a/twin-styles/glow/config/glowconfigdialog.cpp b/twin-styles/glow/config/glowconfigdialog.cpp index 312af343..31b34c5e 100644 --- a/twin-styles/glow/config/glowconfigdialog.cpp +++ b/twin-styles/glow/config/glowconfigdialog.cpp @@ -45,16 +45,16 @@ extern "C" { - KDE_EXPORT TQObject* allocate_config( KConfig* conf, TQWidget* parent ) + KDE_EXPORT TQObject* allocate_config( TDEConfig* conf, TQWidget* parent ) { return(new GlowConfigDialog(conf, parent)); } } -GlowConfigDialog::GlowConfigDialog( KConfig * conf, TQWidget * parent ) +GlowConfigDialog::GlowConfigDialog( TDEConfig * conf, TQWidget * parent ) : TQObject(parent) { - _glowConfig = new KConfig("twinglowrc"); + _glowConfig = new TDEConfig("twinglowrc"); TDEGlobal::locale()->insertCatalogue("twin_glow_config"); _main_group_box = new TQWidget(parent); @@ -138,8 +138,8 @@ GlowConfigDialog::GlowConfigDialog( KConfig * conf, TQWidget * parent ) TQHBoxLayout *titlebarGradientTypeLayout = new TQHBoxLayout(); _titlebarGradientTypeComboBox = new TQComboBox(_main_group_box); - KConfig *c = TDEGlobal::config(); - KConfigGroupSaver cgs( c, TQString::fromLatin1("WM") ); + TDEConfig *c = TDEGlobal::config(); + TDEConfigGroupSaver cgs( c, TQString::fromLatin1("WM") ); TQColor activeBackground = c->readColorEntry("activeBackground"); TQColor activeBlend = c->readColorEntry("activeBlend"); @@ -183,7 +183,7 @@ GlowConfigDialog::~GlowConfigDialog() delete[] _buttonConfigMap; } -void GlowConfigDialog::load( KConfig* /* conf */ ) +void GlowConfigDialog::load( TDEConfig* /* conf */ ) { TQColor color; const TQColor defaultCloseButtonColor(DEFAULT_CLOSE_BUTTON_COLOR); @@ -229,7 +229,7 @@ void GlowConfigDialog::load( KConfig* /* conf */ ) slotTitleButtonClicked(0); } -void GlowConfigDialog::save( KConfig* /* conf */ ) +void GlowConfigDialog::save( TDEConfig* /* conf */ ) { _glowConfig->setGroup("General"); @@ -298,7 +298,7 @@ void GlowConfigDialog::slotLoadThemeList () if (! _theme_list_view->findItem (finfo->fileName(), 0)) { - KConfig conf (dir.path() + "/" + finfo->fileName() + "/" + + TDEConfig conf (dir.path() + "/" + finfo->fileName() + "/" + finfo->fileName() + ".theme"); TQSize button_size = conf.readSizeEntry ( "buttonSize", new TQSize (-1, -1)); diff --git a/twin-styles/glow/config/glowconfigdialog.h b/twin-styles/glow/config/glowconfigdialog.h index 81ab91b2..f86dfbc6 100644 --- a/twin-styles/glow/config/glowconfigdialog.h +++ b/twin-styles/glow/config/glowconfigdialog.h @@ -26,7 +26,7 @@ class TQPushButton; class TQSignalMapper; class TQCheckBox; class TQComboBox; -class KConfig; +class TDEConfig; class KColorButton; class GlowConfigDialog : public TQObject @@ -35,15 +35,15 @@ class GlowConfigDialog : public TQObject public: - GlowConfigDialog( KConfig* conf, TQWidget* parent ); + GlowConfigDialog( TDEConfig* conf, TQWidget* parent ); ~GlowConfigDialog(); signals: void changed(); public slots: - void load( KConfig* conf ); - void save( KConfig* conf ); + void load( TDEConfig* conf ); + void save( TDEConfig* conf ); void defaults(); protected slots: @@ -60,7 +60,7 @@ private: enum ButtonType{stickyButton, helpButton, iconifyButton, maximizeButton, closeButton }; - KConfig *_glowConfig; + TDEConfig *_glowConfig; bool _showResizeHandle; KPixmapEffect::GradientType _titlebarGradientType; diff --git a/twin-styles/glow/glowclient.cpp b/twin-styles/glow/glowclient.cpp index 81be88d7..767363de 100644 --- a/twin-styles/glow/glowclient.cpp +++ b/twin-styles/glow/glowclient.cpp @@ -51,7 +51,7 @@ GlowClientConfig::GlowClientConfig() void GlowClientConfig::load(KDecorationFactory *factory) { - KConfig conf("twinglowrc"); + TDEConfig conf("twinglowrc"); conf.setGroup("General"); const TQColor defaultCloseButtonColor(DEFAULT_CLOSE_BUTTON_COLOR); @@ -173,7 +173,7 @@ void GlowClientGlobals::readTheme() return; } - KConfig conf (theme_config_file); + TDEConfig conf (theme_config_file); _theme = new GlowTheme(default_glow_theme); _theme->buttonSize = conf.readSizeEntry ("buttonSize", diff --git a/twin-styles/icewm/config/config.cpp b/twin-styles/icewm/config/config.cpp index 8942467f..dc99a05a 100644 --- a/twin-styles/icewm/config/config.cpp +++ b/twin-styles/icewm/config/config.cpp @@ -39,7 +39,7 @@ extern "C" { - KDE_EXPORT TQObject* allocate_config( KConfig* conf, TQWidget* parent ) + KDE_EXPORT TQObject* allocate_config( TDEConfig* conf, TQWidget* parent ) { return(new IceWMConfig(conf, parent)); } @@ -55,10 +55,10 @@ extern "C" // Configure tab in twindecoration // ========================================================================== -IceWMConfig::IceWMConfig( KConfig* conf, TQWidget* parent ) +IceWMConfig::IceWMConfig( TDEConfig* conf, TQWidget* parent ) : TQObject( parent ) { - icewmConfig = new KConfig("twinicewmrc"); + icewmConfig = new TDEConfig("twinicewmrc"); TDEGlobal::locale()->insertCatalogue("twin_art_clients"); mainWidget = new TQVBox( parent ); @@ -224,7 +224,7 @@ void IceWMConfig::slotSelectionChanged() // Loads the configurable options from the twinicewmrc config file -void IceWMConfig::load( KConfig* ) +void IceWMConfig::load( TDEConfig* ) { icewmConfig->setGroup("General"); @@ -242,7 +242,7 @@ void IceWMConfig::load( KConfig* ) // Saves the configurable options to the twinicewmrc config file -void IceWMConfig::save( KConfig* ) +void IceWMConfig::save( TDEConfig* ) { icewmConfig->setGroup("General"); icewmConfig->writeEntry( "ThemeTitleTextColors", cbThemeTitleTextColors->isChecked() ); diff --git a/twin-styles/icewm/config/config.h b/twin-styles/icewm/config/config.h index d8865971..89f98e0d 100644 --- a/twin-styles/icewm/config/config.h +++ b/twin-styles/icewm/config/config.h @@ -43,7 +43,7 @@ class IceWMConfig: public TQObject public: - IceWMConfig( KConfig* conf, TQWidget* parent ); + IceWMConfig( TDEConfig* conf, TQWidget* parent ); ~IceWMConfig(); // These public signals/slots work similar to KCM modules @@ -51,8 +51,8 @@ class IceWMConfig: public TQObject void changed(); public slots: - void load( KConfig* conf ); - void save( KConfig* conf ); + void load( TDEConfig* conf ); + void save( TDEConfig* conf ); void defaults(); protected slots: @@ -61,7 +61,7 @@ class IceWMConfig: public TQObject void findIceWMThemes(); private: - KConfig* icewmConfig; + TDEConfig* icewmConfig; TQCheckBox* cbThemeTitleTextColors; TQCheckBox* cbTitleBarOnTop; TQCheckBox* cbShowMenuButtonIcon; diff --git a/twin-styles/icewm/icewm.cpp b/twin-styles/icewm/icewm.cpp index 1e79ceb0..003ec3d5 100644 --- a/twin-styles/icewm/icewm.cpp +++ b/twin-styles/icewm/icewm.cpp @@ -237,7 +237,7 @@ TQString ThemeHandler::reverseString( TQString s ) // This function reads the twinicewmrc config file void ThemeHandler::readConfig() { - KConfig conf("twinicewmrc"); + TDEConfig conf("twinicewmrc"); conf.setGroup("General"); themeName = conf.readEntry("CurrentTheme"); themeTitleTextColors = conf.readBoolEntry("ThemeTitleTextColors", true); @@ -271,7 +271,7 @@ void ThemeHandler::initTheme() // We use kconfig to read icewm config files... // this is easy since icewm uses key=value pairs! - KConfig config( locate("data", TQString("twin/icewm-themes/") + + TDEConfig config( locate("data", TQString("twin/icewm-themes/") + themeName + TQString("default.theme")) ); // Load specifics, or use IceWM defaults instead. diff --git a/twin-styles/smooth-blend/client/config/smoothblendconfig.cc b/twin-styles/smooth-blend/client/config/smoothblendconfig.cc index a59e1c46..58574360 100644 --- a/twin-styles/smooth-blend/client/config/smoothblendconfig.cc +++ b/twin-styles/smooth-blend/client/config/smoothblendconfig.cc @@ -26,10 +26,10 @@ // ------------- // Constructor -smoothblendConfig::smoothblendConfig(KConfig* config, TQWidget* parent) +smoothblendConfig::smoothblendConfig(TDEConfig* config, TQWidget* parent) : TQObject(parent), config_(0), dialog_(0) { // create the configuration object - config_ = new KConfig("twinsmoothblendrc"); + config_ = new TDEConfig("twinsmoothblendrc"); TDEGlobal::locale()->insertCatalogue("twin_smoothblend_config"); // create and show the configuration dialog @@ -96,7 +96,7 @@ void smoothblendConfig::selectionChanged(int) { // ------ // Load configuration data -void smoothblendConfig::load(KConfig*) { +void smoothblendConfig::load(TDEConfig*) { config_->setGroup("General"); TQString value = config_->readEntry("TitleAlignment", "AlignHCenter"); @@ -126,7 +126,7 @@ void smoothblendConfig::load(KConfig*) { // ------ // Save configuration data -void smoothblendConfig::save(KConfig*) { +void smoothblendConfig::save(TDEConfig*) { config_->setGroup("General"); TQRadioButton *button = (TQRadioButton*)dialog_->titlealign->selected(); @@ -172,7 +172,7 @@ void smoothblendConfig::defaults() { ////////////////////////////////////////////////////////////////////////////// extern "C" { - TQObject* allocate_config(KConfig* config, TQWidget* parent) { + TQObject* allocate_config(TDEConfig* config, TQWidget* parent) { return (new smoothblendConfig(config, parent)); } } diff --git a/twin-styles/smooth-blend/client/config/smoothblendconfig.h b/twin-styles/smooth-blend/client/config/smoothblendconfig.h index 604645bd..73931d61 100644 --- a/twin-styles/smooth-blend/client/config/smoothblendconfig.h +++ b/twin-styles/smooth-blend/client/config/smoothblendconfig.h @@ -27,29 +27,29 @@ #include <tqobject.h> -class KConfig; +class TDEConfig; class ConfigDialog; class smoothblendConfig : public TQObject { Q_OBJECT public: - smoothblendConfig(KConfig* config, TQWidget* parent); + smoothblendConfig(TDEConfig* config, TQWidget* parent); ~smoothblendConfig(); signals: void changed(); public slots: - void load(KConfig*); - void save(KConfig*); + void load(TDEConfig*); + void save(TDEConfig*); void defaults(); protected slots: void selectionChanged(int); private: - KConfig *config_; + TDEConfig *config_; ConfigDialog *dialog_; }; diff --git a/twin-styles/smooth-blend/client/smoothblend.cc b/twin-styles/smooth-blend/client/smoothblend.cc index 91433102..e616e49f 100644 --- a/twin-styles/smooth-blend/client/smoothblend.cc +++ b/twin-styles/smooth-blend/client/smoothblend.cc @@ -118,7 +118,7 @@ bool smoothblendFactory::reset(unsigned long changed) { bool smoothblendFactory::readConfig() { // create a config object - KConfig config("twinsmoothblendrc"); + TDEConfig config("twinsmoothblendrc"); config.setGroup("General"); // grab settings |