From cc74f360bb40da3d79f58048f8e8611804980aa6 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:30:47 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- twin/clients/plastik/config/config.cpp | 10 +++++----- twin/clients/plastik/config/config.h | 10 +++++----- twin/clients/plastik/plastik.cpp | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) (limited to 'twin/clients/plastik') diff --git a/twin/clients/plastik/config/config.cpp b/twin/clients/plastik/config/config.cpp index 73a749bdb..d79800d4a 100644 --- a/twin/clients/plastik/config/config.cpp +++ b/twin/clients/plastik/config/config.cpp @@ -34,11 +34,11 @@ #include "config.h" #include "configdialog.h" -PlastikConfig::PlastikConfig(KConfig* config, TQWidget* parent) +PlastikConfig::PlastikConfig(TDEConfig* config, TQWidget* parent) : TQObject(parent), m_config(0), m_dialog(0) { // create the configuration object - m_config = new KConfig("twinplastikrc"); + m_config = new TDEConfig("twinplastikrc"); TDEGlobal::locale()->insertCatalogue("twin_clients"); // create and show the configuration dialog @@ -67,7 +67,7 @@ PlastikConfig::~PlastikConfig() if (m_config) delete m_config; } -void PlastikConfig::load(KConfig*) +void PlastikConfig::load(TDEConfig*) { m_config->setGroup("General"); @@ -85,7 +85,7 @@ void PlastikConfig::load(KConfig*) m_dialog->coloredBorder->setChecked(coloredBorder); } -void PlastikConfig::save(KConfig*) +void PlastikConfig::save(TDEConfig*) { m_config->setGroup("General"); @@ -115,7 +115,7 @@ void PlastikConfig::defaults() extern "C" { - KDE_EXPORT TQObject* allocate_config(KConfig* config, TQWidget* parent) { + KDE_EXPORT TQObject* allocate_config(TDEConfig* config, TQWidget* parent) { return (new PlastikConfig(config, parent)); } } diff --git a/twin/clients/plastik/config/config.h b/twin/clients/plastik/config/config.h index d06bd30b8..73231c50f 100644 --- a/twin/clients/plastik/config/config.h +++ b/twin/clients/plastik/config/config.h @@ -27,26 +27,26 @@ class TQButtonGroup; class TQGroupBox; -class KConfig; +class TDEConfig; class ConfigDialog; class PlastikConfig : public TQObject { Q_OBJECT public: - PlastikConfig(KConfig* config, TQWidget* parent); + PlastikConfig(TDEConfig* config, TQWidget* parent); ~PlastikConfig(); signals: void changed(); public slots: - void load(KConfig *config); - void save(KConfig *config); + void load(TDEConfig *config); + void save(TDEConfig *config); void defaults(); private: - KConfig *m_config; + TDEConfig *m_config; ConfigDialog *m_dialog; }; diff --git a/twin/clients/plastik/plastik.cpp b/twin/clients/plastik/plastik.cpp index 76d643904..2072302d7 100644 --- a/twin/clients/plastik/plastik.cpp +++ b/twin/clients/plastik/plastik.cpp @@ -162,7 +162,7 @@ bool PlastikHandler::supports( Ability ability ) void PlastikHandler::readConfig() { // create a config object - KConfig config("twinplastikrc"); + TDEConfig config("twinplastikrc"); config.setGroup("General"); // grab settings -- cgit v1.2.1