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

---
 lib/koproperty/editor.cpp               | 2 +-
 lib/koproperty/editors/combobox.cpp     | 2 +-
 lib/koproperty/editors/dateedit.cpp     | 4 ++--
 lib/koproperty/editors/datetimeedit.cpp | 4 ++--
 lib/koproperty/editors/spinbox.cpp      | 2 +-
 lib/koproperty/editors/timeedit.cpp     | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'lib/koproperty')

diff --git a/lib/koproperty/editor.cpp b/lib/koproperty/editor.cpp
index 7040e885..39c965a5 100644
--- a/lib/koproperty/editor.cpp
+++ b/lib/koproperty/editor.cpp
@@ -72,7 +72,7 @@ class EditorPrivate
 			itemToSelectLater = 0;
 			if (!kofficeAppDirAdded) {
 				kofficeAppDirAdded = true;
-				KGlobal::iconLoader()->addAppDir("koffice");
+				TDEGlobal::iconLoader()->addAppDir("koffice");
 			}
 			previouslyCollapsedGroupItem = 0;
 			childFormPreviouslyCollapsedGroupItem = 0;
diff --git a/lib/koproperty/editors/combobox.cpp b/lib/koproperty/editors/combobox.cpp
index b9606e0e..164c5816 100644
--- a/lib/koproperty/editors/combobox.cpp
+++ b/lib/koproperty/editors/combobox.cpp
@@ -146,7 +146,7 @@ ComboBox::fillBox()
 	m_edit->insertStringList(property()->listData()->names);
 	KCompletion *comp = m_edit->completionObject();
 	comp->insertItems(property()->listData()->names);
-	comp->setCompletionMode(KGlobalSettings::CompletionShell);
+	comp->setCompletionMode(TDEGlobalSettings::CompletionShell);
 }
 
 void
diff --git a/lib/koproperty/editors/dateedit.cpp b/lib/koproperty/editors/dateedit.cpp
index 11c36a54..d26dbb30 100644
--- a/lib/koproperty/editors/dateedit.cpp
+++ b/lib/koproperty/editors/dateedit.cpp
@@ -70,8 +70,8 @@ void
 DateEdit::drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r, const TQVariant &value)
 {
 	p->eraseRect(r);
-	Widget::drawViewer(p, cg, r, KGlobal::locale()->formatDate(value.toDate(), true /* use short format*/ ));
-//	p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, KGlobal::locale()->formatDate(value.toDate(), true /* use short format*/ ));
+	Widget::drawViewer(p, cg, r, TDEGlobal::locale()->formatDate(value.toDate(), true /* use short format*/ ));
+//	p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, TDEGlobal::locale()->formatDate(value.toDate(), true /* use short format*/ ));
 }
 
 void
diff --git a/lib/koproperty/editors/datetimeedit.cpp b/lib/koproperty/editors/datetimeedit.cpp
index 6ab541de..1ed2c9c6 100644
--- a/lib/koproperty/editors/datetimeedit.cpp
+++ b/lib/koproperty/editors/datetimeedit.cpp
@@ -69,9 +69,9 @@ void
 DateTimeEdit::drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r, const TQVariant &value)
 {
 	p->eraseRect(r);
-	Widget::drawViewer(p, cg, r, KGlobal::locale()->formatDateTime(value.toDateTime(), true /* use short format*/, false /*no sec */ ));
+	Widget::drawViewer(p, cg, r, TDEGlobal::locale()->formatDateTime(value.toDateTime(), true /* use short format*/, false /*no sec */ ));
 //	p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine,
-//		KGlobal::locale()->formatDateTime(value.toDateTime(), true /* use short format*/, false /*no sec */ ));
+//		TDEGlobal::locale()->formatDateTime(value.toDateTime(), true /* use short format*/, false /*no sec */ ));
 }
 
 void
diff --git a/lib/koproperty/editors/spinbox.cpp b/lib/koproperty/editors/spinbox.cpp
index 8c9dbab9..97a3177d 100644
--- a/lib/koproperty/editors/spinbox.cpp
+++ b/lib/koproperty/editors/spinbox.cpp
@@ -291,7 +291,7 @@ DoubleEdit::drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r, co
 		}
 	}
 	if (valueText.isEmpty())
-		valueText = TQString(value.toString()).replace('.', KGlobal::locale()->decimalSymbol());
+		valueText = TQString(value.toString()).replace('.', TDEGlobal::locale()->decimalSymbol());
 
 	Widget::drawViewer(p, cg, r, valueText);
 //	p->eraseRect(r);
diff --git a/lib/koproperty/editors/timeedit.cpp b/lib/koproperty/editors/timeedit.cpp
index f89530ea..767ba83d 100644
--- a/lib/koproperty/editors/timeedit.cpp
+++ b/lib/koproperty/editors/timeedit.cpp
@@ -68,8 +68,8 @@ TimeEdit::setValue(const TQVariant &value, bool emitChange)
 void
 TimeEdit::drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r, const TQVariant &value)
 {
-	Widget::drawViewer(p, cg, r, KGlobal::locale()->formatTime(value.toTime(), true /* include sec*/));
-//	p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, KGlobal::locale()->formatTime(value.toTime(), true /* include sec*/));
+	Widget::drawViewer(p, cg, r, TDEGlobal::locale()->formatTime(value.toTime(), true /* include sec*/));
+//	p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, TDEGlobal::locale()->formatTime(value.toTime(), true /* include sec*/));
 }
 
 void
-- 
cgit v1.2.1