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

1 files changed, 17 insertions, 17 deletions

diff --git a/src/kmplayerbroadcast.cpp b/src/kmplayerbroadcast.cpp
index 4723c26..197d7e5 100644
--- a/src/kmplayerbroadcast.cpp
+++ b/src/kmplayerbroadcast.cpp
@@ -374,24 +374,24 @@ KDE_NO_EXPORT void KMPlayerPrefBroadcastFormatPage::slotDelete () {
 
 //-----------------------------------------------------------------------------
 
-static bool stopProcess (KProcess * process, const char * cmd = 0L) {
+static bool stopProcess (TDEProcess * process, const char * cmd = 0L) {
     if (!process || !process->isRunning ()) return true;
     do {
         if (cmd)
             process->writeStdin (cmd, strlen (cmd));
-        KProcessController::theKProcessController->waitForProcessExit (1);
+        TDEProcessController::theTDEProcessController->waitForProcessExit (1);
         if (!process->isRunning ())
             break;
         process->kill (SIGINT);
-        KProcessController::theKProcessController->waitForProcessExit (3);
+        TDEProcessController::theTDEProcessController->waitForProcessExit (3);
         if (!process->isRunning ())
             break;
         process->kill (SIGTERM);
-        KProcessController::theKProcessController->waitForProcessExit (1);
+        TDEProcessController::theTDEProcessController->waitForProcessExit (1);
         if (!process->isRunning ())
             break;
         process->kill (SIGKILL);
-        KProcessController::theKProcessController->waitForProcessExit (1);
+        TDEProcessController::theTDEProcessController->waitForProcessExit (1);
         if (process->isRunning ()) {
             return false; // give up
         }
@@ -486,10 +486,10 @@ KDE_NO_EXPORT void KMPlayerBroadcastConfig::startServer () {
         return;
     }
     m_configpage->setCursor (TQCursor (TQt::WaitCursor));
-    m_ffserver_process = new KProcess;
+    m_ffserver_process = new TDEProcess;
     m_ffserver_process->setUseShell (true);
-    connect (m_ffserver_process, TQT_SIGNAL (processExited (KProcess *)),
-             this, TQT_SLOT (processStopped (KProcess *)));
+    connect (m_ffserver_process, TQT_SIGNAL (processExited (TDEProcess *)),
+             this, TQT_SLOT (processStopped (TDEProcess *)));
     TQString conffile = locateLocal ("data", "kmplayer/ffserver.conf");
     const char * noaudio = m_player->source ()->audioDevice ().isEmpty () ? "NoAudio" : "";
     FFServerSetting ffs;
@@ -512,9 +512,9 @@ KDE_NO_EXPORT void KMPlayerBroadcastConfig::startServer () {
     *m_ffserver_process << "ffserver -f " << conffile;
     m_ffserver_out.truncate (0);
     connect (m_ffserver_process,
-             TQT_SIGNAL (receivedStderr (KProcess *, char *, int)),
-             this, TQT_SLOT (processOutput (KProcess *, char *, int)));
-    m_ffserver_process->start (KProcess::NotifyOnExit, KProcess::Stderr);
+             TQT_SIGNAL (receivedStderr (TDEProcess *, char *, int)),
+             this, TQT_SLOT (processOutput (TDEProcess *, char *, int)));
+    m_ffserver_process->start (TDEProcess::NotifyOnExit, TDEProcess::Stderr);
     if (m_ffserver_process->isRunning ()) {
         m_configpage->startbutton->setText (i18n ("Stop"));
         m_configpage->serverled->setState (KLed::On);
@@ -531,7 +531,7 @@ KDE_NO_EXPORT void KMPlayerBroadcastConfig::stopServer () {
         KMessageBox::error (m_configpage, i18n ("Failed to end ffserver process."), i18n ("Error"));
 }
 
-KDE_NO_EXPORT void KMPlayerBroadcastConfig::processOutput (KProcess * p, char * s, int) {
+KDE_NO_EXPORT void KMPlayerBroadcastConfig::processOutput (TDEProcess * p, char * s, int) {
     if (p == m_ffserver_process)
         m_ffserver_out += TQString (s);
 }
@@ -548,8 +548,8 @@ KDE_NO_EXPORT void KMPlayerBroadcastConfig::startFeed () {
         KMessageBox::error (m_configpage, i18n ("Failed to start ffserver.\n") + m_ffserver_out, i18n ("Error"));
         goto bail_out;
     }
-    disconnect (m_ffserver_process, TQT_SIGNAL (receivedStderr (KProcess *, char *, int)),
-                this, TQT_SLOT (processOutput (KProcess *, char *, int)));
+    disconnect (m_ffserver_process, TQT_SIGNAL (receivedStderr (TDEProcess *, char *, int)),
+                this, TQT_SLOT (processOutput (TDEProcess *, char *, int)));
     if (m_ffmpeg_process)
         m_ffmpeg_process->stop ();
     delete m_ffmpeg_process;
@@ -582,15 +582,15 @@ KDE_NO_EXPORT void KMPlayerBroadcastConfig::stateChange (KMPlayer::Process::Stat
         kdDebug () << "ffmpeg process stopped " << m_endserver << endl;
         if (m_endserver && !stopProcess (m_ffserver_process)) {
             disconnect (m_ffserver_process,
-                    TQT_SIGNAL (receivedStderr (KProcess *, char *, int)),
-                    this, TQT_SLOT (processOutput (KProcess *, char *, int)));
+                    TQT_SIGNAL (receivedStderr (TDEProcess *, char *, int)),
+                    this, TQT_SLOT (processOutput (TDEProcess *, char *, int)));
             KMessageBox::error (m_configpage, i18n ("Failed to end ffserver process."), i18n ("Error"));
             processStopped (0L);
         }
     }
 }
 
-KDE_NO_EXPORT void KMPlayerBroadcastConfig::processStopped (KProcess *) {
+KDE_NO_EXPORT void KMPlayerBroadcastConfig::processStopped (TDEProcess *) {
     kdDebug () << "ffserver process stopped" << endl;
     if (m_configpage) {
         m_configpage->serverled->setState (KLed::Off);