From acc3b1a21507897624b0e045e7859120e150ba16 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 27 Jan 2013 00:55:48 -0600
Subject: Rename a number of libraries and executables to avoid conflicts with
 KDE4

---
 ksquirrel/sq_libraryhandler.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'ksquirrel/sq_libraryhandler.cpp')

diff --git a/ksquirrel/sq_libraryhandler.cpp b/ksquirrel/sq_libraryhandler.cpp
index 4850c84..e2fc206 100644
--- a/ksquirrel/sq_libraryhandler.cpp
+++ b/ksquirrel/sq_libraryhandler.cpp
@@ -27,7 +27,7 @@
 
 #include <kstringhandler.h>
 #include <ktempfile.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kurl.h>
@@ -53,7 +53,7 @@ SQ_LibraryHandler::SQ_LibraryHandler(TQObject *parent)
 
     kdDebug() << "+SQ_LibraryHandler" << endl;
 
-    kconf = new TDEConfig("ksquirrel-codec-settings");
+    tdeconf = new TDEConfig("ksquirrel-codec-settings");
 
     load();
 }
@@ -62,7 +62,7 @@ SQ_LibraryHandler::~SQ_LibraryHandler()
 {
     clear();
 
-    delete kconf;
+    delete tdeconf;
 
     kdDebug() << "-SQ_LibraryHandler" << endl;
 }
@@ -417,7 +417,7 @@ void SQ_LibraryHandler::writeSettings(SQ_LIBRARY *lib)
     if(lib->config.isEmpty())
         return;
 
-    kconf->setGroup(lib->quickinfo);
+    tdeconf->setGroup(lib->quickinfo);
 
     fmt_settings::iterator itEnd = lib->settings.end();
 
@@ -430,22 +430,22 @@ void SQ_LibraryHandler::writeSettings(SQ_LIBRARY *lib)
         if((*it).second.type == settings_value::v_bool) // boolean
         {
            k.prepend("b");
-           kconf->writeEntry(k, (*it).second.bVal);
+           tdeconf->writeEntry(k, (*it).second.bVal);
         }
         else if((*it).second.type == settings_value::v_int) // integer
         {
             k.prepend("i");
-            kconf->writeEntry(k, (*it).second.iVal);
+            tdeconf->writeEntry(k, (*it).second.iVal);
         }
         else if((*it).second.type == settings_value::v_double) // double
          {
              k.prepend("d");
-             kconf->writeEntry(k, (*it).second.dVal);
+             tdeconf->writeEntry(k, (*it).second.dVal);
          }
         else // string
         {
             k.prepend("s");
-            kconf->writeEntry(k, (*it).second.sVal);
+            tdeconf->writeEntry(k, (*it).second.sVal);
         }
     }
 }
@@ -456,7 +456,7 @@ void SQ_LibraryHandler::readSettings(SQ_LIBRARY *lib)
     if(lib->config.isEmpty())
         return;
 
-    TQMap<TQString, TQString> map = kconf->entryMap(lib->quickinfo);
+    TQMap<TQString, TQString> map = tdeconf->entryMap(lib->quickinfo);
 
     if(!map.size())
     {
@@ -573,5 +573,5 @@ void SQ_LibraryHandler::sync()
     for(iterator it = begin();it != itEnd;++it)
         writeSettings(&(*it));
 
-    kconf->sync();
+    tdeconf->sync();
 }
-- 
cgit v1.2.3