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

---
 kmilo/kmilod/defaultskin.cpp | 4 ++--
 kmilo/kmilod/defaultskin.h   | 2 +-
 kmilo/kmilod/kmilod.cpp      | 2 +-
 kmilo/kmilod/monitor.cpp     | 2 +-
 kmilo/kmilod/monitor.h       | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'kmilo/kmilod')

diff --git a/kmilo/kmilod/defaultskin.cpp b/kmilo/kmilod/defaultskin.cpp
index 2793ee2..b9595e2 100644
--- a/kmilo/kmilod/defaultskin.cpp
+++ b/kmilo/kmilod/defaultskin.cpp
@@ -51,7 +51,7 @@ DefaultSkin::DefaultSkin() {
 
 	_widget->hide();
 
-	KConfig config("kmilodrc");
+	TDEConfig config("kmilodrc");
 	reconfigure( &config );
 }
 
@@ -61,7 +61,7 @@ DefaultSkin::~DefaultSkin() {
 	_widget = 0;
 }
 
-void DefaultSkin::reconfigure( KConfig *config ) {
+void DefaultSkin::reconfigure( TDEConfig *config ) {
 	
 	config->setGroup("DefaultSkin");
 	
diff --git a/kmilo/kmilod/defaultskin.h b/kmilo/kmilod/defaultskin.h
index 69e2e3f..2399d83 100644
--- a/kmilo/kmilod/defaultskin.h
+++ b/kmilo/kmilod/defaultskin.h
@@ -38,7 +38,7 @@ class DefaultSkin : public TQObject, public KMilo::DisplaySkin {
 		virtual ~DefaultSkin();
 
 		virtual void clear();
-		virtual void reconfigure( KConfig *config );
+		virtual void reconfigure( TDEConfig *config );
 
 		virtual void displayText(const TQString& text, const TQPixmap& customPixmap=TQPixmap());
 		virtual void displayProgress(const TQString& text,
diff --git a/kmilo/kmilod/kmilod.cpp b/kmilo/kmilod/kmilod.cpp
index aa40b6d..1b777e2 100644
--- a/kmilo/kmilod/kmilod.cpp
+++ b/kmilo/kmilod/kmilod.cpp
@@ -213,7 +213,7 @@ void KMiloD::displayProgress(const TQString& text, int progress, const TQPixmap&
 void KMiloD::reconfigure()
 {
 	// load the kmilo configuration file:
-	KConfig config("kmilodrc");
+	TDEConfig config("kmilodrc");
 
 	KMilo::Monitor *monitor;
 
diff --git a/kmilo/kmilod/monitor.cpp b/kmilo/kmilod/monitor.cpp
index 7f37aaa..57caf59 100644
--- a/kmilo/kmilod/monitor.cpp
+++ b/kmilo/kmilod/monitor.cpp
@@ -30,7 +30,7 @@ KMilo::Monitor::Monitor(TQObject *parent, const char *name, const TQStringList&)
 KMilo::Monitor::~Monitor() {
 }
 
-void KMilo::Monitor::reconfigure(KConfig*)
+void KMilo::Monitor::reconfigure(TDEConfig*)
 {
 }
 
diff --git a/kmilo/kmilod/monitor.h b/kmilo/kmilod/monitor.h
index d50045b..e646a7e 100644
--- a/kmilo/kmilod/monitor.h
+++ b/kmilo/kmilod/monitor.h
@@ -30,7 +30,7 @@
 
 #include <kdemacros.h>
 
-class KConfig;
+class TDEConfig;
 
 namespace KMilo {
 class KMiloInterface;
@@ -83,7 +83,7 @@ class KDE_EXPORT Monitor : public TQObject {
 
 		bool shouldPoll() const { return _poll; }
 
-		virtual void reconfigure(KConfig*);
+		virtual void reconfigure(TDEConfig*);
 
 	protected:
 		bool _poll;  // set to false to disable polling.
-- 
cgit v1.2.1