From a34aeb25a3006e5a708ec955159226e8b197dc27 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:21:05 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- src/kmplayerprocess.h | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'src/kmplayerprocess.h') diff --git a/src/kmplayerprocess.h b/src/kmplayerprocess.h index 7bc03c5..2a34d87 100644 --- a/src/kmplayerprocess.h +++ b/src/kmplayerprocess.h @@ -35,7 +35,7 @@ #include "kmplayersource.h" class TQWidget; -class KProcess; +class TDEProcess; namespace KIO { class Job; @@ -68,7 +68,7 @@ public: virtual void setAudioLang (int, const TQString &); virtual void setSubtitle (int, const TQString &); bool playing () const; - KDE_NO_EXPORT KProcess * process () const { return m_process; } + KDE_NO_EXPORT TDEProcess * process () const { return m_process; } KDE_NO_EXPORT Source * source () const { return m_source; } virtual WId widget (); Viewer * viewer () const; @@ -106,7 +106,7 @@ protected: NodePtrW m_mrl; State m_state; State m_old_state; - KProcess * m_process; + TDEProcess * m_process; KIO::Job * m_job; TQString m_url; int m_request_seek; @@ -133,9 +133,9 @@ protected: TQStringList commands; bool m_use_slave : 1; protected slots: - virtual void processStopped (KProcess *); + virtual void processStopped (TDEProcess *); private slots: - void dataWritten (KProcess *); + void dataWritten (TDEProcess *); }; class MPlayerPreferencesPage; @@ -170,9 +170,9 @@ public slots: MPlayerPreferencesPage * configPage () const { return m_configpage; } bool ready (Viewer *); protected slots: - void processStopped (KProcess *); + void processStopped (TDEProcess *); private slots: - void processOutput (KProcess *, char *, int); + void processOutput (TDEProcess *, char *, int); private: TQString m_process_output; TQString m_grabfile; @@ -309,8 +309,8 @@ public slots: signals: void configReceived (); protected slots: - void processStopped (KProcess *); - void processOutput (KProcess *, char *, int); + void processStopped (TDEProcess *); + void processOutput (TDEProcess *, char *, int); protected: Callback * m_callback; Backend_stub * m_backend; @@ -414,7 +414,7 @@ public slots: virtual bool stop (); virtual bool quit (); private slots: - void processStopped (KProcess *); + void processStopped (TDEProcess *); }; /* @@ -484,9 +484,9 @@ public slots: public slots: bool ready (Viewer *); private slots: - void processOutput (KProcess *, char *, int); - void processStopped (KProcess *); - void wroteStdin (KProcess *); + void processOutput (TDEProcess *, char *, int); + void processStopped (TDEProcess *); + void wroteStdin (TDEProcess *); void streamStateChanged (); void streamRedirected (TQ_UINT32, const KURL &); protected: -- cgit v1.2.1