diff options
author | Timothy Pearson <[email protected]> | 2013-01-24 13:47:22 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-24 13:47:22 -0600 |
commit | 28edc0aa2ab09297288186f5bc15765eb7be58c0 (patch) | |
tree | 7b7a01768b3781763186c825af21bb14717d2c32 /khtml/java/kjavaprocess.h | |
parent | 07c48c43ff72c237e4028154f4594102b798073f (diff) | |
download | tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.tar.gz tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'khtml/java/kjavaprocess.h')
-rw-r--r-- | khtml/java/kjavaprocess.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/khtml/java/kjavaprocess.h b/khtml/java/kjavaprocess.h index 280701233..4768bc382 100644 --- a/khtml/java/kjavaprocess.h +++ b/khtml/java/kjavaprocess.h @@ -39,7 +39,7 @@ */ class KJavaProcessPrivate; -class KJavaProcess : public KProcess //QObject +class KJavaProcess : public TDEProcess //QObject { Q_OBJECT @@ -64,7 +64,7 @@ public: /** * Returns the status of the java Process- true if it's ok, false if it has died. - * It calls KProcess::isRunning() + * It calls TDEProcess::isRunning() */ bool isRunning(); @@ -139,7 +139,7 @@ protected slots: /** * This slot is called when the Java Process exited. */ - void slotExited( KProcess *process ); + void slotExited( TDEProcess *process ); protected: virtual bool invokeJVM(); @@ -150,7 +150,7 @@ protected: void sendBuffer( TQByteArray* buff ); void storeSize( TQByteArray* buff ); - KProcess* javaProcess; + TDEProcess* javaProcess; signals: void received( const TQByteArray& ); |