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

---
 twin/clients/b2/b2client.cpp      |  2 +-
 twin/clients/b2/config/config.cpp | 10 +++++-----
 twin/clients/b2/config/config.h   |  8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'twin/clients/b2')

diff --git a/twin/clients/b2/b2client.cpp b/twin/clients/b2/b2client.cpp
index 027987b9c..4e174cf44 100644
--- a/twin/clients/b2/b2client.cpp
+++ b/twin/clients/b2/b2client.cpp
@@ -103,7 +103,7 @@ static void read_config(B2ClientFactory *f)
     buttonSize = (TQFontMetrics(options()->font(true)).height() + 1) & 0x3e;
     if (buttonSize < 16) buttonSize = 16;
 
-    KConfig conf("twinb2rc");
+    TDEConfig conf("twinb2rc");
     conf.setGroup("General");
     colored_frame = conf.readBoolEntry("UseTitleBarBorderColors", false);
     do_draw_handle = conf.readBoolEntry("DrawGrabHandle", true);
diff --git a/twin/clients/b2/config/config.cpp b/twin/clients/b2/config/config.cpp
index 6289ec992..ca2e77c4a 100644
--- a/twin/clients/b2/config/config.cpp
+++ b/twin/clients/b2/config/config.cpp
@@ -15,7 +15,7 @@
 
 extern "C"
 {
-	KDE_EXPORT TQObject* allocate_config( KConfig* conf, TQWidget* parent )
+	KDE_EXPORT TQObject* allocate_config( TDEConfig* conf, TQWidget* parent )
 	{
 		return(new B2Config(conf, parent));
 	}
@@ -30,11 +30,11 @@ extern "C"
  *			Configure tab in twindecoration
  */
 
-B2Config::B2Config( KConfig* conf, TQWidget* parent )
+B2Config::B2Config( TDEConfig* conf, TQWidget* parent )
 	: TQObject( parent )
 {
 	TDEGlobal::locale()->insertCatalogue("twin_b2_config");
-	b2Config = new KConfig("twinb2rc");
+	b2Config = new TDEConfig("twinb2rc");
 	gb = new TQVBox(parent);
 
 	cbColorBorder = new TQCheckBox(
@@ -96,7 +96,7 @@ void B2Config::slotSelectionChanged()
 
 // Loads the configurable options from the twinrc config file
 // It is passed the open config from twindecoration to improve efficiency
-void B2Config::load(KConfig * /*conf*/)
+void B2Config::load(TDEConfig * /*conf*/)
 {
 	b2Config->setGroup("General");
 
@@ -141,7 +141,7 @@ static TQString opToString(int op)
 
 
 // Saves the configurable options to the twinrc config file
-void B2Config::save(KConfig * /*conf*/)
+void B2Config::save(TDEConfig * /*conf*/)
 {
 	b2Config->setGroup("General");
 	b2Config->writeEntry("UseTitleBarBorderColors", cbColorBorder->isChecked());
diff --git a/twin/clients/b2/config/config.h b/twin/clients/b2/config/config.h
index 99d664ad1..53bd42767 100644
--- a/twin/clients/b2/config/config.h
+++ b/twin/clients/b2/config/config.h
@@ -21,7 +21,7 @@ class B2Config: public TQObject
 	Q_OBJECT
 
 	public:
-		B2Config( KConfig* conf, TQWidget* parent );
+		B2Config( TDEConfig* conf, TQWidget* parent );
 		~B2Config();
 
 	// These public signals/slots work similar to KCM modules
@@ -29,15 +29,15 @@ class B2Config: 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:
 		void slotSelectionChanged();	// Internal use
 
 	private:
-		KConfig*   b2Config;
+		TDEConfig*   b2Config;
 		TQCheckBox* cbColorBorder;
 		TQCheckBox*  showGrabHandleCb;
 		TQHGroupBox* actionsGB;
-- 
cgit v1.2.1