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

---
 tdeui/knumvalidator.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'tdeui/knumvalidator.cpp')

diff --git a/tdeui/knumvalidator.cpp b/tdeui/knumvalidator.cpp
index fdc51022c..89f0ca88c 100644
--- a/tdeui/knumvalidator.cpp
+++ b/tdeui/knumvalidator.cpp
@@ -214,13 +214,13 @@ TQValidator::State KFloatValidator::validate ( TQString &str, int & ) const
       ok = false;
     else
       return TQValidator::Acceptable;
-  else if (newStr == TQString::fromLatin1(".") || (d->acceptLocalizedNumbers && newStr==KGlobal::locale()->decimalSymbol())) // another special case
+  else if (newStr == TQString::fromLatin1(".") || (d->acceptLocalizedNumbers && newStr==TDEGlobal::locale()->decimalSymbol())) // another special case
     return TQValidator::Acceptable;
   else if (newStr.length())
   {
     val = newStr.toDouble(&ok);
     if(!ok && d->acceptLocalizedNumbers)
-       val= KGlobal::locale()->readNumber(newStr,&ok);
+       val= TDEGlobal::locale()->readNumber(newStr,&ok);
   }
   else {
     val = 0;
@@ -326,7 +326,7 @@ void KDoubleValidator::setAcceptLocalizedNumbers( bool accept ) {
 TQValidator::State KDoubleValidator::validate( TQString & input, int & p ) const {
   TQString s = input;
   if ( acceptLocalizedNumbers() ) {
-    KLocale * l = KGlobal::locale();
+    KLocale * l = TDEGlobal::locale();
     // ok, we have to re-format the number to have:
     // 1. decimalSymbol == '.'
     // 2. negativeSign  == '-'
-- 
cgit v1.2.1


From 59d153016be1e09cb31cdb18bef0a649acfc6292 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 1 Feb 2013 08:17:52 -0600
Subject: Rename KLocale to enhance compatibility with KDE4

---
 tdeui/knumvalidator.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tdeui/knumvalidator.cpp')

diff --git a/tdeui/knumvalidator.cpp b/tdeui/knumvalidator.cpp
index 89f0ca88c..ce5c66842 100644
--- a/tdeui/knumvalidator.cpp
+++ b/tdeui/knumvalidator.cpp
@@ -326,7 +326,7 @@ void KDoubleValidator::setAcceptLocalizedNumbers( bool accept ) {
 TQValidator::State KDoubleValidator::validate( TQString & input, int & p ) const {
   TQString s = input;
   if ( acceptLocalizedNumbers() ) {
-    KLocale * l = TDEGlobal::locale();
+    TDELocale * l = TDEGlobal::locale();
     // ok, we have to re-format the number to have:
     // 1. decimalSymbol == '.'
     // 2. negativeSign  == '-'
-- 
cgit v1.2.1


From ed99a30644c19b0a3cf0d2147243532df4daa16b Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 21:57:54 -0600
Subject: Rename additional header files to avoid conflicts with KDE4

---
 tdeui/knumvalidator.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tdeui/knumvalidator.cpp')

diff --git a/tdeui/knumvalidator.cpp b/tdeui/knumvalidator.cpp
index ce5c66842..6cf486ad1 100644
--- a/tdeui/knumvalidator.cpp
+++ b/tdeui/knumvalidator.cpp
@@ -26,8 +26,8 @@
 #include <tqstring.h>
 
 #include "knumvalidator.h"
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 
 ///////////////////////////////////////////////////////////////
-- 
cgit v1.2.1