Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

1 files changed, 5 insertions, 5 deletions

diff --git a/klaptopdaemon/apm.cpp b/klaptopdaemon/apm.cpp
index 9de0c85..107cff0 100644
--- a/klaptopdaemon/apm.cpp
+++ b/klaptopdaemon/apm.cpp
@@ -54,7 +54,7 @@ extern void wake_laptop_daemon();
 ApmConfig::ApmConfig (TQWidget * parent, const char *name)
   : KCModule(parent, name)
 {
-    KGlobal::locale()->insertCatalogue("klaptopdaemon"); // For translation of klaptopdaemon messages
+    TDEGlobal::locale()->insertCatalogue("klaptopdaemon"); // For translation of klaptopdaemon messages
 
     config =  new KConfig("kcmlaptoprc");
 
@@ -162,12 +162,12 @@ void ApmConfig::setupHelper()
 				"KLaptopDaemon", KStdGuiItem::cont(),
 				"");
 		if (rc == KMessageBox::Continue) {
-			KProcess proc;
+			TDEProcess proc;
 			proc << tdesu;
 			proc << "-u";
 			proc << "root";
 			proc <<  TQString("chown root ")+apm_name+TQString("; chmod +s ")+apm_name;
-			proc.start(KProcess::Block);	// run it sync so has_apm below sees the results
+			proc.start(TDEProcess::Block);	// run it sync so has_apm below sees the results
 		}
 	} else {
 		KMessageBox::sorry(0, i18n("%1 cannot be enabled because tdesu cannot be found.  Please make sure that it is installed correctly.").arg(TQString(apm_name)),
@@ -196,12 +196,12 @@ void ApmConfig::setupHelper2()	// we use the acpi helper to do software suspend
 				i18n("KLaptopDaemon"), KStdGuiItem::cont(),
 				"");
 		if (rc == KMessageBox::Continue) {
-			KProcess proc;
+			TDEProcess proc;
 			proc << tdesu;
 			proc << "-u";
 			proc << "root";
 			proc <<  "chown root "+helper+"; chmod +s "+helper;
-			proc.start(KProcess::Block);	// run it sync so has_acpi below sees the results
+			proc.start(TDEProcess::Block);	// run it sync so has_acpi below sees the results
 		}
 	} else {
 		KMessageBox::sorry(0, i18n("The Software Suspend helper cannot be enabled because tdesu cannot be found.  Please make sure that it is installed correctly."),