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

---
 kview/config/plugins/kviewpluginsconfig.desktop | 2 +-
 kview/config/plugins/kviewpluginsconfig.h       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'kview/config/plugins')

diff --git a/kview/config/plugins/kviewpluginsconfig.desktop b/kview/config/plugins/kviewpluginsconfig.desktop
index 38977149..c4f1d0e3 100644
--- a/kview/config/plugins/kviewpluginsconfig.desktop
+++ b/kview/config/plugins/kviewpluginsconfig.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=plugin
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kviewpluginsconfig
diff --git a/kview/config/plugins/kviewpluginsconfig.h b/kview/config/plugins/kviewpluginsconfig.h
index 9b53dc05..99ac995b 100644
--- a/kview/config/plugins/kviewpluginsconfig.h
+++ b/kview/config/plugins/kviewpluginsconfig.h
@@ -21,7 +21,7 @@
 
 #include <ksettings/pluginpage.h>
 
-class KConfig;
+class TDEConfig;
 
 class KViewPluginsConfig : public KSettings::PluginPage
 {
@@ -31,7 +31,7 @@ class KViewPluginsConfig : public KSettings::PluginPage
 		KViewPluginsConfig( TQWidget * parent, const char * name = 0, const TQStringList & args = TQStringList() );
 		~KViewPluginsConfig();
 	private:
-		KConfig * m_config;
+		TDEConfig * m_config;
 };
 
 // vim: sw=4 ts=4 noet
-- 
cgit v1.2.1