From 8e7816b2f9f62a2df094c5b2a7aa5abb6bc1226a Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 20 Jan 2013 00:21:02 -0600 Subject: Rename KApplication to TDEApplication to avoid conflicts with KDE4 --- tdecore/kprocctrl.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tdecore/kprocctrl.h') diff --git a/tdecore/kprocctrl.h b/tdecore/kprocctrl.h index 9a596334b..fbd096cbf 100644 --- a/tdecore/kprocctrl.h +++ b/tdecore/kprocctrl.h @@ -32,7 +32,7 @@ class TQSocketNotifier; * @author Christian Czezatke * * A class for internal use by KProcess only. -- Exactly one instance - * of this class is created by KApplication. + * of this class is created by TDEApplication. * * This class takes care of the actual (UN*X) signal handling. */ @@ -43,13 +43,13 @@ class TDECORE_EXPORT KProcessController : public TQObject public: /** * Create an instance if none exists yet. - * Called by KApplication::KApplication() + * Called by TDEApplication::TDEApplication() */ static void ref(); /** * Destroy the instance if one exists and it is not referenced any more. - * Called by KApplication::~KApplication() + * Called by TDEApplication::~TDEApplication() */ static void deref(); -- cgit v1.2.1 From 28edc0aa2ab09297288186f5bc15765eb7be58c0 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:47:22 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- tdecore/kprocctrl.h | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'tdecore/kprocctrl.h') diff --git a/tdecore/kprocctrl.h b/tdecore/kprocctrl.h index fbd096cbf..1cb6cc302 100644 --- a/tdecore/kprocctrl.h +++ b/tdecore/kprocctrl.h @@ -27,16 +27,16 @@ class TQSocketNotifier; /** - * @short Used internally by KProcess + * @short Used internally by TDEProcess * @internal * @author Christian Czezatke * - * A class for internal use by KProcess only. -- Exactly one instance + * A class for internal use by TDEProcess only. -- Exactly one instance * of this class is created by TDEApplication. * * This class takes care of the actual (UN*X) signal handling. */ -class TDECORE_EXPORT KProcessController : public TQObject +class TDECORE_EXPORT TDEProcessController : public TQObject { Q_OBJECT @@ -57,7 +57,7 @@ public: * Only a single instance of this class is allowed at a time, * and this static variable is used to track the one instance. */ - static KProcessController *theKProcessController; // kde4: rename: instance + static TDEProcessController *theTDEProcessController; // kde4: rename: instance /** * Automatically called upon SIGCHLD. Never call it directly. @@ -71,7 +71,7 @@ public: /** * Wait for any process to exit and handle their exit without * starting an event loop. - * This function may cause KProcess to emit any of its signals. + * This function may cause TDEProcess to emit any of its signals. * * @param timeout the timeout in seconds. -1 means no timeout. * @return true if a process exited, false @@ -95,7 +95,7 @@ public: void rescheduleCheck(); /* - * Obtain the file descriptor KProcessController uses to get notified + * Obtain the file descriptor TDEProcessController uses to get notified * about process exits. select() or poll() on it if you create a custom * event loop that needs to act upon SIGCHLD. * @return the file descriptor of the reading end of the notification pipe @@ -106,11 +106,11 @@ public: /** * @internal */ - void addKProcess( KProcess* ); + void addTDEProcess( TDEProcess* ); /** * @internal */ - void removeKProcess( KProcess* ); + void removeTDEProcess( TDEProcess* ); /** * @internal */ @@ -125,7 +125,7 @@ private: int fd[2]; bool needcheck; TQSocketNotifier *notifier; - TQValueList kProcessList; + TQValueList kProcessList; TQValueList unixProcessList; static void setupHandlers(); @@ -136,12 +136,12 @@ private: static int refCount; // Disallow instantiation - KProcessController(); - ~KProcessController(); + TDEProcessController(); + ~TDEProcessController(); // Disallow assignment and copy-construction - KProcessController( const KProcessController& ); - KProcessController& operator= ( const KProcessController& ); + TDEProcessController( const TDEProcessController& ); + TDEProcessController& operator= ( const TDEProcessController& ); }; -- cgit v1.2.1