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

---
 kig/kig/kig.cpp | 6 +++---
 kig/kig/kig.h   | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'kig')

diff --git a/kig/kig/kig.cpp b/kig/kig/kig.cpp
index 82beb27e..13cbd8b7 100644
--- a/kig/kig/kig.cpp
+++ b/kig/kig/kig.cpp
@@ -46,7 +46,7 @@ Kig::Kig()
   : KParts::MainWindow( 0L, "Kig" ), m_part( 0 )
 {
   // setting the configation file
-  config = new KConfig( "kigrc" );
+  config = new TDEConfig( "kigrc" );
   // set the shell's ui resource file
   setXMLFile("kigui.rc");
   // then, setup our actions
@@ -131,7 +131,7 @@ void Kig::setupActions()
   KStdAction::tipOfDay( TQT_TQOBJECT(this), TQT_SLOT( tipOfDay() ), actionCollection(), "help_tipofday" );
 }
 
-void Kig::saveProperties(KConfig* config)
+void Kig::saveProperties(TDEConfig* config)
 {
   // the 'config' object points to the session managed
   // config file.  anything you write here will be available
@@ -139,7 +139,7 @@ void Kig::saveProperties(KConfig* config)
   config->writePathEntry("fileName", m_part->url().path());
 }
 
-void Kig::readProperties(KConfig* config)
+void Kig::readProperties(TDEConfig* config)
 {
   // the 'config' object points to the session managed
   // config file.  this function is automatically called whenever
diff --git a/kig/kig/kig.h b/kig/kig/kig.h
index a042a2ba..ee65962c 100644
--- a/kig/kig/kig.h
+++ b/kig/kig/kig.h
@@ -103,14 +103,14 @@ class Kig : public KParts::MainWindow
    * This method is called when it is time for the app to save its
    * properties for session management purposes.
    */
-  void saveProperties(KConfig *);
+  void saveProperties(TDEConfig *);
 
   /**
-   * This method is called when this app is restored.  The KConfig
+   * This method is called when this app is restored.  The TDEConfig
    * object points to the session management config file that was saved
    * with \ref saveProperties
    */
-  void readProperties(KConfig *);
+  void readProperties(TDEConfig *);
 
  private slots:
   void fileNew();
@@ -141,7 +141,7 @@ class Kig : public KParts::MainWindow
 //#endif
   KRecentFilesAction *m_recentFilesAction;
 
-  KConfig* config;
+  TDEConfig* config;
 
   static bool kimageioRegistered;
 };
-- 
cgit v1.2.3