diff options
author | Timothy Pearson <[email protected]> | 2013-01-25 00:29:42 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-25 00:29:42 -0600 |
commit | 159f7e147ac33c924b3ce9050c8f03cbc54916ee (patch) | |
tree | 38565fca708177609da9ddd523d49b9480b10de5 /twin-styles/cde | |
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 'twin-styles/cde')
-rw-r--r-- | twin-styles/cde/cdeclient.cpp | 2 | ||||
-rw-r--r-- | twin-styles/cde/config/config.cpp | 10 | ||||
-rw-r--r-- | twin-styles/cde/config/config.h | 8 |
3 files changed, 10 insertions, 10 deletions
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; |