From 7dba2f0cd362ac57acdb049156b85d106872ac0e Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 24 Jan 2013 13:17:59 -0600
Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

---
 src/mainwindow.cpp   | 16 ++++++++--------
 src/numerictypes.cpp |  4 ++--
 src/parser.yy        |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 64ca2ff..d9f35ff 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -353,7 +353,7 @@ int MainWindow::getParenthesesLevel(const TQString &str)
 void MainWindow::loadConfig()
 {
     {
-        KConfigGroup config(KGlobal::config(), "Settings");
+        KConfigGroup config(TDEGlobal::config(), "Settings");
 
         TQString mode = config.readEntry("Trigonometric mode", "Degrees");
         if(mode == "Degrees") {
@@ -377,7 +377,7 @@ void MainWindow::loadConfig()
     }
 
     {
-        KConfigGroup config(KGlobal::config(), "Variables");
+        KConfigGroup config(TDEGlobal::config(), "Variables");
 
         TQStringList list = config.readListEntry("Saved Variables");
         for(TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it) {
@@ -392,7 +392,7 @@ void MainWindow::loadConfig()
     }
 
     {
-        KConfigGroup config(KGlobal::config(), "GUI");
+        KConfigGroup config(TDEGlobal::config(), "GUI");
 
         bool showHistory = config.readBoolEntry("ShowHistory", true);
         action<KToggleAction>("toggleHistoryList")->setChecked(showHistory);
@@ -415,7 +415,7 @@ void MainWindow::loadConfig()
     }
 
     {
-        KConfigGroup config(KGlobal::config(), "Functions");
+        KConfigGroup config(TDEGlobal::config(), "Functions");
 
         TQStringList fnList = config.readListEntry("FunctionList");
         for(TQStringList::ConstIterator it = fnList.begin(); it != fnList.end(); ++it)
@@ -428,7 +428,7 @@ void MainWindow::loadConfig()
 void MainWindow::saveConfig()
 {
     {
-        KConfigGroup config(KGlobal::config(), "Settings");
+        KConfigGroup config(TDEGlobal::config(), "Settings");
 
         config.writeEntry("Trigonometric mode",
              trigMode() == Abakus::Degrees
@@ -440,7 +440,7 @@ void MainWindow::saveConfig()
     }
 
     {
-        KConfigGroup config(KGlobal::config(), "Variables");
+        KConfigGroup config(TDEGlobal::config(), "Variables");
 
         TQStringList list;
         TQStringList values = ValueManager::instance()->valueNames();
@@ -462,7 +462,7 @@ void MainWindow::saveConfig()
     }
 
     {
-        KConfigGroup config(KGlobal::config(), "GUI");
+        KConfigGroup config(TDEGlobal::config(), "GUI");
         bool inCompactMode = action<KToggleAction>("toggleCompactMode")->isChecked();
 
         config.writeEntry("InCompactMode", inCompactMode);
@@ -480,7 +480,7 @@ void MainWindow::saveConfig()
     }
 
     {
-        KConfigGroup config(KGlobal::config(), "Functions");
+        KConfigGroup config(TDEGlobal::config(), "Functions");
 
         FunctionManager *manager = FunctionManager::instance();
 
diff --git a/src/numerictypes.cpp b/src/numerictypes.cpp
index 706e554..7a80368 100644
--- a/src/numerictypes.cpp
+++ b/src/numerictypes.cpp
@@ -38,7 +38,7 @@ TQString convertToString(const mpfr_ptr &number)
     TQRegExp zeroKiller ("0*$");
     mp_exp_t exp;
     int desiredPrecision = Abakus::m_prec;
-    TQString decimalSymbol = KGlobal::locale()->decimalSymbol();
+    TQString decimalSymbol = TDEGlobal::locale()->decimalSymbol();
 
     if(desiredPrecision < 0)
         desiredPrecision = 8;
@@ -175,7 +175,7 @@ namespace Abakus
 TQString convertToString(const HNumber &num)
 {
     TQString str = HMath::formatGenString(num, m_prec);
-    TQString decimalSymbol = KGlobal::locale()->decimalSymbol();
+    TQString decimalSymbol = TDEGlobal::locale()->decimalSymbol();
     str.replace('.', decimalSymbol);
 
     TQStringList parts = TQStringList::split("e", str);
diff --git a/src/parser.yy b/src/parser.yy
index 6978cc1..23c6867 100644
--- a/src/parser.yy
+++ b/src/parser.yy
@@ -315,7 +315,7 @@ TERM: VALUE { $$ = $1; }
 VALUE: NUMBER { $$ = $1; }
 
 NUMBER: NUM {
-    KLocale *locale = KGlobal::locale();
+    KLocale *locale = TDEGlobal::locale();
     QChar decimal = locale->decimalSymbol()[0];
 
     // Replace current decimal separator with US Decimal separator to be
-- 
cgit v1.2.1