From 159f7e147ac33c924b3ce9050c8f03cbc54916ee Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:29:42 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- twin-styles/cde/cdeclient.cpp | 2 +- twin-styles/cde/config/config.cpp | 10 +++++----- twin-styles/cde/config/config.h | 8 ++++---- twin-styles/glow/config/glowconfigdialog.cpp | 16 ++++++++-------- twin-styles/glow/config/glowconfigdialog.h | 10 +++++----- twin-styles/glow/glowclient.cpp | 4 ++-- twin-styles/icewm/config/config.cpp | 10 +++++----- twin-styles/icewm/config/config.h | 8 ++++---- twin-styles/icewm/icewm.cpp | 4 ++-- .../smooth-blend/client/config/smoothblendconfig.cc | 10 +++++----- .../smooth-blend/client/config/smoothblendconfig.h | 10 +++++----- twin-styles/smooth-blend/client/smoothblend.cc | 2 +- 12 files changed, 47 insertions(+), 47 deletions(-) (limited to 'twin-styles') 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 #include -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 -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 -- cgit v1.2.1