diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:29:42 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:29:42 -0600 |
| commit | 159f7e147ac33c924b3ce9050c8f03cbc54916ee (patch) | |
| tree | 38565fca708177609da9ddd523d49b9480b10de5 /kscreensaver/xsavers | |
| parent | b1b005cf854aad925c2e64c3fc3ece582d4bffcf (diff) | |
| download | tdeartwork-159f7e147ac33c924b3ce9050c8f03cbc54916ee.tar.gz tdeartwork-159f7e147ac33c924b3ce9050c8f03cbc54916ee.zip | |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kscreensaver/xsavers')
| -rw-r--r-- | kscreensaver/xsavers/helpers.cpp | 4 | ||||
| -rw-r--r-- | kscreensaver/xsavers/helpers.h | 4 | ||||
| -rw-r--r-- | kscreensaver/xsavers/space.cpp | 6 | ||||
| -rw-r--r-- | kscreensaver/xsavers/swarm.cpp | 6 |
4 files changed, 10 insertions, 10 deletions
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; |