diff options
Diffstat (limited to 'tdecore')
| -rw-r--r-- | tdecore/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | tdecore/MAINTAINERS | 2 | ||||
| -rw-r--r-- | tdecore/Makefile.am | 6 | ||||
| -rw-r--r-- | tdecore/kprocess.h | 1 | ||||
| -rw-r--r-- | tdecore/tdeapplication.cpp | 2 | ||||
| -rw-r--r-- | tdecore/tdeprocctrl.cpp (renamed from tdecore/kprocctrl.cpp) | 4 | ||||
| -rw-r--r-- | tdecore/tdeprocctrl.h (renamed from tdecore/kprocctrl.h) | 4 | ||||
| -rw-r--r-- | tdecore/tdeprocess.cpp | 2 |
8 files changed, 12 insertions, 13 deletions
diff --git a/tdecore/CMakeLists.txt b/tdecore/CMakeLists.txt index 18ce4eda9..f56a92aca 100644 --- a/tdecore/CMakeLists.txt +++ b/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 kprocess.h tdeprocess.h kprocctrl.h + kcharsets.h tdeversion.h kpty.h tdeprocess.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 @@ -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 diff --git a/tdecore/MAINTAINERS b/tdecore/MAINTAINERS index d7012b321..1bc8f7a8c 100644 --- a/tdecore/MAINTAINERS +++ b/tdecore/MAINTAINERS @@ -48,7 +48,7 @@ tdemultipledrag.cpp David Faure <[email protected]> knotifyclient.cpp kpalette.cpp Waldo Bastian <[email protected]> kpixmapprovider.cpp Carsten Pfeiffer <[email protected]> -kprocctrl.cpp Waldo Bastian <[email protected]> +tdeprocctrl.cpp Waldo Bastian <[email protected]> tdeprocess.cpp Waldo Bastian <[email protected]> kprocio.cpp Waldo Bastian <[email protected]> krandomsequence.cpp Waldo Bastian <[email protected]> diff --git a/tdecore/Makefile.am b/tdecore/Makefile.am index ada41910c..d30506507 100644 --- a/tdecore/Makefile.am +++ b/tdecore/Makefile.am @@ -40,8 +40,8 @@ include_HEADERS = tdeconfig.h tdeconfigskeleton.h \ tdeconfigdata.h ksimpleconfig.h 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 kprocess.h tdeprocess.h \ - kprocctrl.h tdelocale.h kicontheme.h kiconloader.h kdebug.h \ + tdeuniqueapplication.h kcharsets.h tdeversion.h kpty.h tdeprocess.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 \ diff --git a/tdecore/kprocess.h b/tdecore/kprocess.h deleted file mode 100644 index 216868501..000000000 --- a/tdecore/kprocess.h +++ /dev/null @@ -1 +0,0 @@ -#include <tdeprocess.h> diff --git a/tdecore/tdeapplication.cpp b/tdecore/tdeapplication.cpp index 6b48f805a..cc5410d7a 100644 --- a/tdecore/tdeapplication.cpp +++ b/tdecore/tdeapplication.cpp @@ -128,7 +128,7 @@ #include <netwm.h> #endif -#include "kprocctrl.h" +#include "tdeprocctrl.h" #ifdef HAVE_PATHS_H #include <paths.h> diff --git a/tdecore/kprocctrl.cpp b/tdecore/tdeprocctrl.cpp index 471642ddb..05ff0566a 100644 --- a/tdecore/kprocctrl.cpp +++ b/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" diff --git a/tdecore/kprocctrl.h b/tdecore/tdeprocctrl.h index ddd59179b..fa9a8b3b4 100644 --- a/tdecore/kprocctrl.h +++ b/tdecore/tdeprocctrl.h @@ -17,8 +17,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef __KPROCCTRL_H__ -#define __KPROCCTRL_H__ +#ifndef __TDEPROCCTRL_H__ +#define __TDEPROCCTRL_H__ #include <tqvaluelist.h> diff --git a/tdecore/tdeprocess.cpp b/tdecore/tdeprocess.cpp index 767ddcd2d..d3add5843 100644 --- a/tdecore/tdeprocess.cpp +++ b/tdecore/tdeprocess.cpp @@ -23,7 +23,7 @@ #include "tdeprocess.h" -#include "kprocctrl.h" +#include "tdeprocctrl.h" #include "kpty.h" #include <config.h> |