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

---
 lib/interfaces/extensions/kdevmakefrontend.h | 2 +-
 lib/util/settings.cpp                        | 6 +++---
 lib/util/settings.h                          | 4 ++--
 lib/widgets/kdevhtmlpart.cpp                 | 6 +++---
 lib/widgets/kdevhtmlpart.h                   | 2 +-
 lib/widgets/klistviewaction.cpp              | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'lib')

diff --git a/lib/interfaces/extensions/kdevmakefrontend.h b/lib/interfaces/extensions/kdevmakefrontend.h
index 702312c8..640db77f 100644
--- a/lib/interfaces/extensions/kdevmakefrontend.h
+++ b/lib/interfaces/extensions/kdevmakefrontend.h
@@ -89,7 +89,7 @@ public:
     /**@return Whether the application is currently running.*/
     virtual bool isRunning() = 0;
     
-    /**Advices to synchronize the settings from KConfig because they were changed externally.*/
+    /**Advices to synchronize the settings from TDEConfig because they were changed externally.*/
     virtual void updateSettingsFromConfig() = 0;
 
 signals:
diff --git a/lib/util/settings.cpp b/lib/util/settings.cpp
index 90af2b1c..f7895145 100644
--- a/lib/util/settings.cpp
+++ b/lib/util/settings.cpp
@@ -15,7 +15,7 @@
 
 #include "settings.h"
 
-TQString Settings::terminalEmulatorName( KConfig & config )
+TQString Settings::terminalEmulatorName( TDEConfig & config )
 {
 	config.setGroup("TerminalEmulator");
 	bool useKDESetting = config.readBoolEntry( "UseKDESetting", true );
@@ -23,7 +23,7 @@ TQString Settings::terminalEmulatorName( KConfig & config )
 
 	if ( useKDESetting )
 	{
-		KConfigGroup confGroup( TDEGlobal::config(), TQString::fromLatin1("General") );
+		TDEConfigGroup confGroup( TDEGlobal::config(), TQString::fromLatin1("General") );
 		terminal = confGroup.readEntry("TerminalApplication", TQString::fromLatin1("konsole"));
 	}
 	else
@@ -35,7 +35,7 @@ TQString Settings::terminalEmulatorName( KConfig & config )
 
 TQString Settings::profileByAttributes(const TQString &language, const TQStringList &keywords)
 {
-    KConfig config(locate("data", "tdevelop/profiles/projectprofiles"));
+    TDEConfig config(locate("data", "tdevelop/profiles/projectprofiles"));
     config.setGroup(language);
 
     TQStringList profileKeywords = TQStringList::split("/", "Empty");
diff --git a/lib/util/settings.h b/lib/util/settings.h
index ad92805d..65888357 100644
--- a/lib/util/settings.h
+++ b/lib/util/settings.h
@@ -12,13 +12,13 @@
 #ifndef SETTINGS_H
 #define SETTINGS_H
 
-class KConfig;
+class TDEConfig;
 
 /// Utility functions for settings
 class Settings
 {
 public:
-	static TQString terminalEmulatorName( KConfig & config );
+	static TQString terminalEmulatorName( TDEConfig & config );
 	static TQString profileByAttributes(const TQString &language, const TQStringList &keywords);
 
 };
diff --git a/lib/widgets/kdevhtmlpart.cpp b/lib/widgets/kdevhtmlpart.cpp
index 323c2cc7..abbeebbc 100644
--- a/lib/widgets/kdevhtmlpart.cpp
+++ b/lib/widgets/kdevhtmlpart.cpp
@@ -27,7 +27,7 @@ KDevHTMLPart::KDevHTMLPart()
   connect(browserExtension(), TQT_SIGNAL(openURLRequestDelayed(const KURL &,const KParts::URLArgs &)),
           this, TQT_SLOT(openURLRequest(const KURL &)) );
 
-  connect(this, TQT_SIGNAL(started(KIO::Job *)), this, TQT_SLOT(slotStarted(KIO::Job* )));
+  connect(this, TQT_SIGNAL(started(TDEIO::Job *)), this, TQT_SLOT(slotStarted(TDEIO::Job* )));
   connect(this, TQT_SIGNAL(completed()), this, TQT_SLOT(slotCompleted()));
   connect(this, TQT_SIGNAL(canceled(const TQString &)), this, TQT_SLOT(slotCancelled(const TQString &)));
 
@@ -78,7 +78,7 @@ KDevHTMLPart::KDevHTMLPart()
 //END documentation history stuff  
   
   //settings:
-  KConfig *appConfig = TDEGlobal::config();
+  TDEConfig *appConfig = TDEGlobal::config();
   appConfig->setGroup("KHTMLPart");
   setStandardFont(appConfig->readEntry("StandardFont",
       settings()->stdFontName()));
@@ -354,7 +354,7 @@ void KDevHTMLPart::slotStop( )
     closeURL();
 }
 
-void KDevHTMLPart::slotStarted( KIO::Job * )
+void KDevHTMLPart::slotStarted( TDEIO::Job * )
 {
     stopAction->setEnabled(true);
 }
diff --git a/lib/widgets/kdevhtmlpart.h b/lib/widgets/kdevhtmlpart.h
index c9520d7f..805134a0 100644
--- a/lib/widgets/kdevhtmlpart.h
+++ b/lib/widgets/kdevhtmlpart.h
@@ -64,7 +64,7 @@ signals:
 
 protected slots:
 
-    void slotStarted(KIO::Job *);
+    void slotStarted(TDEIO::Job *);
     void slotCompleted();
     void slotCancelled(const TQString &errMsg);
     
diff --git a/lib/widgets/klistviewaction.cpp b/lib/widgets/klistviewaction.cpp
index adedc5a4..b4110375 100644
--- a/lib/widgets/klistviewaction.cpp
+++ b/lib/widgets/klistviewaction.cpp
@@ -28,7 +28,7 @@
 
 KListViewAction::~KListViewAction()
 {
-    KConfig *config = TDEGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
     if (config && m_view->name())
     {
         config->setGroup("KListViewAction");
@@ -76,7 +76,7 @@ void KListViewAction::setWhatsThis( const TQString & str )
 
 void KListViewAction::loadComboWidth( )
 {
-    KConfig *config = TDEGlobal::config();
+    TDEConfig *config = TDEGlobal::config();
     if (config && m_view->name())
     {
         config->setGroup("KListViewAction");
-- 
cgit v1.2.1