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

---
 systemsettings/kcmultiwidget.cpp | 4 ++--
 systemsettings/mainwindow.cpp    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/systemsettings/kcmultiwidget.cpp b/systemsettings/kcmultiwidget.cpp
index 5197994..cfd5b5e 100644
--- a/systemsettings/kcmultiwidget.cpp
+++ b/systemsettings/kcmultiwidget.cpp
@@ -195,10 +195,10 @@ void KCMultiWidget::slotHelp()
 	KURL url( KURL("help:/"), docPath );
 
 	if (url.protocol() == "help" || url.protocol() == "man" || url.protocol() == "info") {
-		KProcess process;
+		TDEProcess process;
 		process << "khelpcenter"
 				<< url.url();
-		process.start(KProcess::DontCare);
+		process.start(TDEProcess::DontCare);
 		process.detach();
 	} else {
 		new KRun(url);
diff --git a/systemsettings/mainwindow.cpp b/systemsettings/mainwindow.cpp
index 866af19..3cd07d8 100644
--- a/systemsettings/mainwindow.cpp
+++ b/systemsettings/mainwindow.cpp
@@ -141,7 +141,7 @@ void MainWindow::buildActions()
 	// "Search:" label	
 	TQLabel *searchLabel = new TQLabel( this, "SearchLabel");
 	searchLabel->setText( i18n("&Search:") );
-	searchLabel->setFont(KGlobalSettings::toolBarFont());
+	searchLabel->setFont(TDEGlobalSettings::toolBarFont());
 	searchLabel->setMargin(2);
 	searchText = new KWidgetAction( searchLabel, i18n("&Search:"), Key_F6, 0, 0, actionCollection(), "searchText" );
 	searchLabel->setBuddy( search );