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

2 files changed, 6 insertions, 6 deletions

diff --git a/kmilo/generic/generic_monitor.cpp b/kmilo/generic/generic_monitor.cpp
index 4e13be1..658533a 100644
--- a/kmilo/generic/generic_monitor.cpp
+++ b/kmilo/generic/generic_monitor.cpp
@@ -98,7 +98,7 @@ bool GenericMonitor::init()
 		{ "Mute", KShortcut("XF86AudioMute"), TQT_SLOT(mute()) }
 	};
 
-	ga = new KGlobalAccel(this, "miloGenericAccel");
+	ga = new TDEGlobalAccel(this, "miloGenericAccel");
 
 	ShortcutInfo si;
 	int len = (int)sizeof(shortcuts)/sizeof(ShortcutInfo);
@@ -338,9 +338,9 @@ Monitor::DisplayType GenericMonitor::poll()
 void GenericMonitor::launch(TQString configKey, TQString defaultApplication)
 {
 	TQString application = config->readEntry(configKey, defaultApplication);
-	KProcess proc;
+	TDEProcess proc;
 	proc << application;
-	proc.start(KProcess::DontCare);
+	proc.start(TDEProcess::DontCare);
 }
 
 void GenericMonitor::launchMail()
@@ -362,9 +362,9 @@ void GenericMonitor::launchSearch()
 void GenericMonitor::launchHomeFolder()
 {
 	TQString home = TQDir::home().path();
-	KProcess proc;
+	TDEProcess proc;
 	proc << "kfmclient" << "exec" << home;
-	proc.start(KProcess::DontCare);
+	proc.start(TDEProcess::DontCare);
 }
 
 void GenericMonitor::launchMusic()
diff --git a/kmilo/generic/generic_monitor.h b/kmilo/generic/generic_monitor.h
index 6f23316..3884627 100644
--- a/kmilo/generic/generic_monitor.h
+++ b/kmilo/generic/generic_monitor.h
@@ -85,7 +85,7 @@ private:
 	void displayVolume();
 	void launch(TQString configKey, TQString defaultApplication);
 
-	KGlobalAccel *ga;
+	TDEGlobalAccel *ga;
 	KConfig* config;
 
 	DCOPRef *kmixClient, *kmixWindow;