From 159f7e147ac33c924b3ce9050c8f03cbc54916ee Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 25 Jan 2013 00:29:42 -0600
Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid
 conflicts with KDE4

---
 twin-styles/smooth-blend/client/config/smoothblendconfig.cc | 10 +++++-----
 twin-styles/smooth-blend/client/config/smoothblendconfig.h  | 10 +++++-----
 twin-styles/smooth-blend/client/smoothblend.cc              |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'twin-styles/smooth-blend/client')

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 <tqobject.h>
 
-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