diff options
| author | Timothy Pearson <[email protected]> | 2013-01-24 13:21:05 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-24 13:21:05 -0600 |
| commit | a34aeb25a3006e5a708ec955159226e8b197dc27 (patch) | |
| tree | b28fca30332cff7880bce1e4d3f708d4fd212402 /src/kmplayerbroadcast.h | |
| parent | 1366d753b98b2e33452ed46656bff8764e879862 (diff) | |
| download | kmplayer-a34aeb25a3006e5a708ec955159226e8b197dc27.tar.gz kmplayer-a34aeb25a3006e5a708ec955159226e8b197dc27.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'src/kmplayerbroadcast.h')
| -rw-r--r-- | src/kmplayerbroadcast.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/kmplayerbroadcast.h b/src/kmplayerbroadcast.h index eff7bf5..d3c5cd2 100644 --- a/src/kmplayerbroadcast.h +++ b/src/kmplayerbroadcast.h @@ -176,8 +176,8 @@ signals: void broadcastStarted (); void broadcastStopped (); private slots: - void processOutput (KProcess *, char *, int); - void processStopped (KProcess * process); + void processOutput (TDEProcess *, char *, int); + void processStopped (TDEProcess * process); void startServer (); void startFeed (); void stateChange (KMPlayer::Process::State, KMPlayer::Process::State); @@ -187,7 +187,7 @@ private: KMPlayerFFServerConfig * m_ffserverconfig; TQGuardedPtr <KMPlayerPrefBroadcastFormatPage> m_configpage; KMPlayer::FFMpeg * m_ffmpeg_process; - KProcess * m_ffserver_process; + TDEProcess * m_ffserver_process; bool m_endserver; TQString m_ffserver_out; TQString m_ffserver_url; |