diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:30:47 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:30:47 -0600 |
| commit | cc74f360bb40da3d79f58048f8e8611804980aa6 (patch) | |
| tree | c4385d2c16b904757b1c8bb998a4aec6993373f7 /twin/clients/default | |
| parent | 79b21d47bce1ee428affc97534cd8b257232a871 (diff) | |
| download | tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.tar.gz tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.zip | |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'twin/clients/default')
| -rw-r--r-- | twin/clients/default/config/config.cpp | 8 | ||||
| -rw-r--r-- | twin/clients/default/config/config.h | 6 | ||||
| -rw-r--r-- | twin/clients/default/kdedefault.cpp | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/twin/clients/default/config/config.cpp b/twin/clients/default/config/config.cpp index 43302b552..8e53dcc75 100644 --- a/twin/clients/default/config/config.cpp +++ b/twin/clients/default/config/config.cpp @@ -17,7 +17,7 @@ extern "C" { - KDE_EXPORT TQObject* allocate_config( KConfig* conf, TQWidget* parent ) + KDE_EXPORT TQObject* allocate_config( TDEConfig* conf, TQWidget* parent ) { return(new KDEDefaultConfig(conf, parent)); } @@ -29,7 +29,7 @@ extern "C" // 'parent' is the parent of the TQObject, which is a VBox inside the // Configure tab in twindecoration -KDEDefaultConfig::KDEDefaultConfig( KConfig* conf, TQWidget* parent ) +KDEDefaultConfig::KDEDefaultConfig( TDEConfig* conf, TQWidget* parent ) : TQObject( parent ) { TDEGlobal::locale()->insertCatalogue("twin_clients"); @@ -88,7 +88,7 @@ void KDEDefaultConfig::slotSelectionChanged() // Loads the configurable options from the twinrc config file // It is passed the open config from twindecoration to improve efficiency -void KDEDefaultConfig::load( KConfig* conf ) +void KDEDefaultConfig::load( TDEConfig* conf ) { conf->setGroup("KDEDefault"); bool override = conf->readBoolEntry( "ShowTitleBarStipple", true ); @@ -105,7 +105,7 @@ void KDEDefaultConfig::load( KConfig* conf ) // Saves the configurable options to the twinrc config file -void KDEDefaultConfig::save( KConfig* conf ) +void KDEDefaultConfig::save( TDEConfig* conf ) { conf->setGroup("KDEDefault"); conf->writeEntry( "ShowTitleBarStipple", cbShowStipple->isChecked() ); diff --git a/twin/clients/default/config/config.h b/twin/clients/default/config/config.h index 733b96141..fcd9fbf23 100644 --- a/twin/clients/default/config/config.h +++ b/twin/clients/default/config/config.h @@ -22,7 +22,7 @@ class KDEDefaultConfig: public TQObject Q_OBJECT public: - KDEDefaultConfig( KConfig* conf, TQWidget* parent ); + KDEDefaultConfig( TDEConfig* conf, TQWidget* parent ); ~KDEDefaultConfig(); // These public signals/slots work similar to KCM modules @@ -30,8 +30,8 @@ class KDEDefaultConfig: 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: diff --git a/twin/clients/default/kdedefault.cpp b/twin/clients/default/kdedefault.cpp index 3c8ce2365..52fff00f3 100644 --- a/twin/clients/default/kdedefault.cpp +++ b/twin/clients/default/kdedefault.cpp @@ -192,7 +192,7 @@ bool KDEDefaultHandler::reset( unsigned long changed ) unsigned long KDEDefaultHandler::readConfig( bool update ) { unsigned long changed = 0; - KConfig* conf = TDEGlobal::config(); + TDEConfig* conf = TDEGlobal::config(); conf->setGroup("KDEDefault"); bool new_showGrabBar = conf->readBoolEntry("ShowGrabBar", true); |