Rename kprocctrl.{h,cpp} to tdeprocctrl.{h.cpp}.

Add temporary kprocctrl.h to keep things building.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

tdecore/CMakeLists.txt

@@ -53,7 +53,7 @@ install( FILES
     tdeconfigdialogmanager.h tdeconfigbase.h kdesktopfile.h
     kurl.h ksock.h tdeaboutdata.h tdecmdlineargs.h tdeconfigbackend.h
     tdeapplication.h tdeuniqueapplication.h
-    kcharsets.h tdeversion.h kpty.h tdeprocess.h kprocctrl.h
+    kcharsets.h tdeversion.h kpty.h tdeprocess.h tdeprocctrl.h kprocctrl.h
     tdelocale.h kicontheme.h kiconloader.h kdebug.h twinmodule.h
     twin.h krootprop.h tdeshortcut.h kkeynative.h tdeaccel.h
     kglobalaccel.h tdestdaccel.h tdeshortcutlist.h kcatalogue.h
@@ -108,7 +108,7 @@ set( ${target}_SRCS
   libintl.cpp tdeapplication.cpp kdebug.cpp netwm.cpp
   tdeconfigbase.cpp tdeconfig.cpp ksimpleconfig.cpp tdeconfigbackend.cpp
   kmanagerselection.cpp kdesktopfile.cpp kstandarddirs.cpp
-  ksock.cpp kpty.cpp tdeprocess.cpp kprocctrl.cpp tdelocale.cpp
+  ksock.cpp kpty.cpp tdeprocess.cpp tdeprocctrl.cpp tdelocale.cpp
   krfcdate.cpp kiconeffect.cpp kicontheme.cpp kiconloader.cpp
   twin.cpp twinmodule.cpp krootprop.cpp kcharsets.cpp
   kckey.cpp tdeshortcut.cpp kkeynative_x11.cpp kkeyserver_x11.cpp

tdecore/MAINTAINERS

@@ -48,7 +48,7 @@ tdemultipledrag.cpp	David Faure <faure@kde.org>
 knotifyclient.cpp
 kpalette.cpp		Waldo Bastian <bastian@kde.org>
 kpixmapprovider.cpp	Carsten Pfeiffer <pfeiffer@kde.org>
-kprocctrl.cpp		Waldo Bastian <bastian@kde.org>
+tdeprocctrl.cpp		Waldo Bastian <bastian@kde.org>
 tdeprocess.cpp		Waldo Bastian <bastian@kde.org>
 kprocio.cpp		Waldo Bastian <bastian@kde.org>
 krandomsequence.cpp	Waldo Bastian <bastian@kde.org>

tdecore/Makefile.am

@@ -41,7 +41,7 @@ include_HEADERS = tdeconfig.h tdeconfigskeleton.h \
 	tdeconfigbase.h kdesktopfile.h kurl.h ksock.h tdeaboutdata.h \
 	tdecmdlineargs.h tdeconfigbackend.h tdeapplication.h \
 	tdeuniqueapplication.h kcharsets.h tdeversion.h kpty.h tdeprocess.h \
-	kprocctrl.h tdelocale.h kicontheme.h kiconloader.h kdebug.h \
+	kprocctrl.h tdeprocctrl.h tdelocale.h kicontheme.h kiconloader.h kdebug.h \
 	twinmodule.h twin.h krootprop.h tdeshortcut.h kkeynative.h tdeaccel.h \
 	kglobalaccel.h tdestdaccel.h tdeshortcutlist.h kcatalogue.h \
 	kregexp.h kcompletion.h kstringhandler.h \
@@ -92,7 +92,7 @@ noinst_HEADERS = tdeaccelaction.h tdeaccelbase.h tdeaccelprivate.h kckey.h \
 libtdecore_la_SOURCES = libintl.cpp tdeapplication.cpp \
 	kdebug.cpp netwm.cpp tdeconfigbase.cpp tdeconfig.cpp  ksimpleconfig.cpp \
 	tdeconfigbackend.cpp kmanagerselection.cpp kdesktopfile.cpp \
-	kstandarddirs.cpp ksock.cpp kpty.cpp tdeprocess.cpp kprocctrl.cpp \
+	kstandarddirs.cpp ksock.cpp kpty.cpp tdeprocess.cpp tdeprocctrl.cpp \
 	tdelocale.cpp krfcdate.cpp kiconeffect.cpp kicontheme.cpp \
 	kiconloader.cpp twin.cpp twinmodule.cpp krootprop.cpp kcharsets.cpp \
 	kckey.cpp tdeshortcut.cpp kkeynative_x11.cpp kkeyserver_x11.cpp \

tdecore/kprocctrl.h

@@ -1,150 +1 @@
-/* This file is part of the KDE libraries
+#include "tdeprocctrl.h"
-    Copyright (C) 1997 Christian Czezakte (e9025461@student.tuwien.ac.at)
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
-*/
-
-#ifndef __KPROCCTRL_H__
-#define __KPROCCTRL_H__
-
-#include <tqvaluelist.h>
-
-#include "tdeprocess.h"
-
-class TQSocketNotifier;
-
-/**
- * @short Used internally by TDEProcess
- * @internal
- * @author Christian Czezatke <e9025461@student.tuwien.ac.at>
- *
- *  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 TDEProcessController : public TQObject
-{
-  TQ_OBJECT
-
-public:
-  /**
-   * Create an instance if none exists yet.
-   * Called by TDEApplication::TDEApplication()
-   */
-  static void ref();
-
-  /**
-   * Destroy the instance if one exists and it is not referenced any more.
-   * Called by TDEApplication::~TDEApplication()
-   */
-  static void deref();
-
-  /**
-   * Only a single instance of this class is allowed at a time,
-   * and this static variable is used to track the one instance.
-   */
-  static TDEProcessController *theTDEProcessController; // kde4: rename: instance
-
-  /**
-   * Automatically called upon SIGCHLD. Never call it directly.
-   * If your application (or some library it uses) redirects SIGCHLD,
-   * the new signal handler (and only it) should call the old handler
-   * returned by sigaction().
-   * @internal
-   */
-  static void theSigCHLDHandler(int signal); // KDE4: private
-
-  /**
-   * Wait for any process to exit and handle their exit without
-   * starting an event loop.
-   * 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
-   *         if no process exited within @p timeout seconds.
-   * @since 3.1
-   */
-  bool waitForProcessExit(int timeout);
-
-  /**
-   * Call this function to defer processing of the data that became available
-   * on notifierFd().
-   * @since 3.2
-   */
-  void unscheduleCheck();
-
-  /**
-   * This function @em must be called at some point after calling
-   * unscheduleCheck().
-   * @since 3.2
-   */
-  void rescheduleCheck();
-
-  /*
-   * 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
-   * @since 3.2
-   */
-  int notifierFd() const;
-
-  /**
-   * @internal
-   */
-  void addTDEProcess( TDEProcess* );
-  /**
-   * @internal
-   */
-  void removeTDEProcess( TDEProcess* );
-  /**
-   * @internal
-   */
-  void addProcess( int pid );
-
-private slots:
-  void slotDoHousekeeping();
-
-private:
-  friend class I_just_love_gcc;
-
-  int fd[2];
-  bool needcheck;
-  TQSocketNotifier *notifier;
-  TQValueList<TDEProcess*> kProcessList;
-  TQValueList<int> unixProcessList;
-
-  static void setupHandlers();
-  static void resetHandlers();
-  static struct sigaction oldChildHandlerData;
-  static bool handlerSet;
-
-  static int refCount;
-
-  // Disallow instantiation
-  TDEProcessController();
-  ~TDEProcessController();
-
-  // Disallow assignment and copy-construction
-  TDEProcessController( const TDEProcessController& );
-  TDEProcessController& operator= ( const TDEProcessController& );
-};
-
-
-
-#endif
-

tdecore/tdeapplication.cpp

@@ -128,7 +128,7 @@
 #include <netwm.h>
 #endif
 
-#include "kprocctrl.h"
+#include "tdeprocctrl.h"
 
 #ifdef HAVE_PATHS_H
 #include <paths.h>

tdecore/tdeprocctrl.cpp

@@ -18,7 +18,7 @@
 */
 
 #include "tdeprocess.h"
-#include "kprocctrl.h"
+#include "tdeprocctrl.h"
 
 #include <config.h>
 
@@ -274,4 +274,4 @@ void TDEProcessController::addProcess( int pid )
   ref(); // make sure we stay around when the TDEProcess goes away
 }
 
-#include "kprocctrl.moc"
+#include "tdeprocctrl.moc"

tdecore/tdeprocctrl.h

@@ -0,0 +1,150 @@
+/* This file is part of the KDE libraries
+    Copyright (C) 1997 Christian Czezakte (e9025461@student.tuwien.ac.at)
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301, USA.
+*/
+
+#ifndef __TDEPROCCTRL_H__
+#define __TDEPROCCTRL_H__
+
+#include <tqvaluelist.h>
+
+#include "tdeprocess.h"
+
+class TQSocketNotifier;
+
+/**
+ * @short Used internally by TDEProcess
+ * @internal
+ * @author Christian Czezatke <e9025461@student.tuwien.ac.at>
+ *
+ *  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 TDEProcessController : public TQObject
+{
+  TQ_OBJECT
+
+public:
+  /**
+   * Create an instance if none exists yet.
+   * Called by TDEApplication::TDEApplication()
+   */
+  static void ref();
+
+  /**
+   * Destroy the instance if one exists and it is not referenced any more.
+   * Called by TDEApplication::~TDEApplication()
+   */
+  static void deref();
+
+  /**
+   * Only a single instance of this class is allowed at a time,
+   * and this static variable is used to track the one instance.
+   */
+  static TDEProcessController *theTDEProcessController; // kde4: rename: instance
+
+  /**
+   * Automatically called upon SIGCHLD. Never call it directly.
+   * If your application (or some library it uses) redirects SIGCHLD,
+   * the new signal handler (and only it) should call the old handler
+   * returned by sigaction().
+   * @internal
+   */
+  static void theSigCHLDHandler(int signal); // KDE4: private
+
+  /**
+   * Wait for any process to exit and handle their exit without
+   * starting an event loop.
+   * 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
+   *         if no process exited within @p timeout seconds.
+   * @since 3.1
+   */
+  bool waitForProcessExit(int timeout);
+
+  /**
+   * Call this function to defer processing of the data that became available
+   * on notifierFd().
+   * @since 3.2
+   */
+  void unscheduleCheck();
+
+  /**
+   * This function @em must be called at some point after calling
+   * unscheduleCheck().
+   * @since 3.2
+   */
+  void rescheduleCheck();
+
+  /*
+   * 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
+   * @since 3.2
+   */
+  int notifierFd() const;
+
+  /**
+   * @internal
+   */
+  void addTDEProcess( TDEProcess* );
+  /**
+   * @internal
+   */
+  void removeTDEProcess( TDEProcess* );
+  /**
+   * @internal
+   */
+  void addProcess( int pid );
+
+private slots:
+  void slotDoHousekeeping();
+
+private:
+  friend class I_just_love_gcc;
+
+  int fd[2];
+  bool needcheck;
+  TQSocketNotifier *notifier;
+  TQValueList<TDEProcess*> kProcessList;
+  TQValueList<int> unixProcessList;
+
+  static void setupHandlers();
+  static void resetHandlers();
+  static struct sigaction oldChildHandlerData;
+  static bool handlerSet;
+
+  static int refCount;
+
+  // Disallow instantiation
+  TDEProcessController();
+  ~TDEProcessController();
+
+  // Disallow assignment and copy-construction
+  TDEProcessController( const TDEProcessController& );
+  TDEProcessController& operator= ( const TDEProcessController& );
+};
+
+
+
+#endif
+

tdecore/tdeprocess.cpp

@@ -23,7 +23,7 @@
 
 
 #include "tdeprocess.h"
-#include "kprocctrl.h"
+#include "tdeprocctrl.h"
 #include "kpty.h"
 
 #include <config.h>