From 47a706a785ee2497fd7ebcf8176364a09f23ae07 Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Fri, 17 May 2013 12:44:40 -0500 Subject: [PATCH] Rename remnant files and references from kinit -> tdeinit. --- CMakeLists.txt | 2 +- Makefile.am.in | 2 +- README | 2 +- tdecore/kcrash.cpp | 4 ++-- tdecore/tdestartupinfo.cpp | 2 +- {kinit => tdeinit}/CMakeLists.txt | 2 +- {kinit => tdeinit}/LICENSE.setproctitle | 0 {kinit => tdeinit}/Mainpage.dox | 0 {kinit => tdeinit}/Makefile.am | 2 +- {kinit => tdeinit}/README | 0 {kinit => tdeinit}/README.DCOP | 0 {kinit => tdeinit}/README.autostart | 0 {kinit => tdeinit}/README.wrapper | 0 {kinit => tdeinit}/autostart.cpp | 0 {kinit => tdeinit}/autostart.h | 0 {kinit => tdeinit}/configure.in.in | 0 {kinit => tdeinit}/kwrapper.c | 0 {kinit => tdeinit}/lnusertemp.c | 0 {kinit => tdeinit}/setproctitle.cpp | 0 {kinit => tdeinit}/setproctitle.h | 0 {kinit => tdeinit}/shell.c | 0 {kinit => tdeinit}/start_tdeinit.c | 0 {kinit => tdeinit}/start_tdeinit_wrapper.c | 0 {kinit => tdeinit}/tdedostartupconfig.cpp | 0 kinit/kinit.cpp => tdeinit/tdeinit.cpp | 2 +- {kinit => tdeinit}/tdeioslave.cpp | 0 {kinit => tdeinit}/tdelauncher.cpp | 0 {kinit => tdeinit}/tdelauncher.h | 0 {kinit => tdeinit}/tdelauncher_cmds.h | 0 {kinit => tdeinit}/tdelauncher_main.cpp | 0 {kinit => tdeinit}/tdestartupconfig.cpp | 0 {kinit => tdeinit}/tests/Makefile.am | 0 {kinit => tdeinit}/tests/tdelaunchertest.cpp | 0 {kinit => tdeinit}/wrapper.c | 0 34 files changed, 9 insertions(+), 9 deletions(-) rename {kinit => tdeinit}/CMakeLists.txt (99%) rename {kinit => tdeinit}/LICENSE.setproctitle (100%) rename {kinit => tdeinit}/Mainpage.dox (100%) rename {kinit => tdeinit}/Makefile.am (98%) rename {kinit => tdeinit}/README (100%) rename {kinit => tdeinit}/README.DCOP (100%) rename {kinit => tdeinit}/README.autostart (100%) rename {kinit => tdeinit}/README.wrapper (100%) rename {kinit => tdeinit}/autostart.cpp (100%) rename {kinit => tdeinit}/autostart.h (100%) rename {kinit => tdeinit}/configure.in.in (100%) rename {kinit => tdeinit}/kwrapper.c (100%) rename {kinit => tdeinit}/lnusertemp.c (100%) rename {kinit => tdeinit}/setproctitle.cpp (100%) rename {kinit => tdeinit}/setproctitle.h (100%) rename {kinit => tdeinit}/shell.c (100%) rename {kinit => tdeinit}/start_tdeinit.c (100%) rename {kinit => tdeinit}/start_tdeinit_wrapper.c (100%) rename {kinit => tdeinit}/tdedostartupconfig.cpp (100%) rename kinit/kinit.cpp => tdeinit/tdeinit.cpp (99%) rename {kinit => tdeinit}/tdeioslave.cpp (100%) rename {kinit => tdeinit}/tdelauncher.cpp (100%) rename {kinit => tdeinit}/tdelauncher.h (100%) rename {kinit => tdeinit}/tdelauncher_cmds.h (100%) rename {kinit => tdeinit}/tdelauncher_main.cpp (100%) rename {kinit => tdeinit}/tdestartupconfig.cpp (100%) rename {kinit => tdeinit}/tests/Makefile.am (100%) rename {kinit => tdeinit}/tests/tdelaunchertest.cpp (100%) rename {kinit => tdeinit}/wrapper.c (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 499b18cc7..b9d179433 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -972,7 +972,7 @@ add_subdirectory( tdeparts ) add_subdirectory( tdeutils ) add_subdirectory( tdespell2 ) add_subdirectory( tdemdi ) -add_subdirectory( kinit ) +add_subdirectory( tdeinit ) add_subdirectory( tdeprint ) add_subdirectory( kab ) add_subdirectory( tderesources ) diff --git a/Makefile.am.in b/Makefile.am.in index 2ebb4f8c6..30da00c6e 100644 --- a/Makefile.am.in +++ b/Makefile.am.in @@ -20,7 +20,7 @@ COMPILE_FIRST = dcop libltdl tdefx tdecore tdeunittest tdeui tdesu kjs tdewallet kio kded kded_post COMPILE_BEFORE_doc = kdoctools -COMPILE_AFTER_tdeparts = tdespell2 tdemdi tdeprint kinit kate interfaces tdecert tdehtml tderandr +COMPILE_AFTER_tdeparts = tdespell2 tdemdi tdeprint tdeinit kate interfaces tdecert tdehtml tderandr COMPILE_AFTER_tdeprint = kate tdehtml COMPILE_BEFORE_tdehtml = tdeutils COMPILE_BEFORE_kabc = kab tderesources diff --git a/README b/README index c96978eb9..c16ab7334 100644 --- a/README +++ b/README @@ -81,7 +81,7 @@ Here is an alphabetical list: An all purpose extension to the qimgio class that supports various image formats. -* kinit +* tdeinit Process launcher, used for fast KDE startup * kio diff --git a/tdecore/kcrash.cpp b/tdecore/kcrash.cpp index 08abe75c7..6fb5e8ff7 100644 --- a/tdecore/kcrash.cpp +++ b/tdecore/kcrash.cpp @@ -51,7 +51,7 @@ #include #include -#include <../kinit/tdelauncher_cmds.h> +#include <../tdeinit/tdelauncher_cmds.h> #if defined Q_WS_X11 #include @@ -337,7 +337,7 @@ void TDECrash::startDirectly( const char* argv[], int ) } } -// From now on this code is copy&pasted from kinit/wrapper.c : +// From now on this code is copy&pasted from tdeinit/wrapper.c : extern char **environ; diff --git a/tdecore/tdestartupinfo.cpp b/tdecore/tdestartupinfo.cpp index 3d798cdc1..731dc8b33 100644 --- a/tdecore/tdestartupinfo.cpp +++ b/tdecore/tdestartupinfo.cpp @@ -65,7 +65,7 @@ DEALINGS IN THE SOFTWARE. static const char* const NET_STARTUP_MSG = "_NET_STARTUP_INFO"; static const char* const NET_STARTUP_WINDOW = "_NET_STARTUP_ID"; -// DESKTOP_STARTUP_ID is used also in kinit/wrapper.c , +// DESKTOP_STARTUP_ID is used also in tdeinit/wrapper.c , // tdesu in both tdelibs and tdebase and who knows where else static const char* const NET_STARTUP_ENV = "DESKTOP_STARTUP_ID"; diff --git a/kinit/CMakeLists.txt b/tdeinit/CMakeLists.txt similarity index 99% rename from kinit/CMakeLists.txt rename to tdeinit/CMakeLists.txt index 88be32621..be78311eb 100644 --- a/kinit/CMakeLists.txt +++ b/tdeinit/CMakeLists.txt @@ -34,7 +34,7 @@ link_directories( set( target tdeinit ) set( ${target}_SRCS - kinit.cpp setproctitle.cpp + tdeinit.cpp setproctitle.cpp ) tde_add_executable( ${target} diff --git a/kinit/LICENSE.setproctitle b/tdeinit/LICENSE.setproctitle similarity index 100% rename from kinit/LICENSE.setproctitle rename to tdeinit/LICENSE.setproctitle diff --git a/kinit/Mainpage.dox b/tdeinit/Mainpage.dox similarity index 100% rename from kinit/Mainpage.dox rename to tdeinit/Mainpage.dox diff --git a/kinit/Makefile.am b/tdeinit/Makefile.am similarity index 98% rename from kinit/Makefile.am rename to tdeinit/Makefile.am index 3090d041e..85381ccd4 100644 --- a/kinit/Makefile.am +++ b/tdeinit/Makefile.am @@ -24,7 +24,7 @@ bin_PROGRAMS = tdeinit tdeinit_wrapper kshell tdeinit_shutdown lnusertemp kwrapp lib_LTLIBRARIES = tdeinit_LTLIBRARIES = tdelauncher.la -tdeinit_SOURCES = kinit.cpp setproctitle.cpp +tdeinit_SOURCES = tdeinit.cpp setproctitle.cpp # NOTE: We link against all common libraries even if we don't need them ourselves. # For the future: examine if condensing the tons of *_LDFLAGS variables diff --git a/kinit/README b/tdeinit/README similarity index 100% rename from kinit/README rename to tdeinit/README diff --git a/kinit/README.DCOP b/tdeinit/README.DCOP similarity index 100% rename from kinit/README.DCOP rename to tdeinit/README.DCOP diff --git a/kinit/README.autostart b/tdeinit/README.autostart similarity index 100% rename from kinit/README.autostart rename to tdeinit/README.autostart diff --git a/kinit/README.wrapper b/tdeinit/README.wrapper similarity index 100% rename from kinit/README.wrapper rename to tdeinit/README.wrapper diff --git a/kinit/autostart.cpp b/tdeinit/autostart.cpp similarity index 100% rename from kinit/autostart.cpp rename to tdeinit/autostart.cpp diff --git a/kinit/autostart.h b/tdeinit/autostart.h similarity index 100% rename from kinit/autostart.h rename to tdeinit/autostart.h diff --git a/kinit/configure.in.in b/tdeinit/configure.in.in similarity index 100% rename from kinit/configure.in.in rename to tdeinit/configure.in.in diff --git a/kinit/kwrapper.c b/tdeinit/kwrapper.c similarity index 100% rename from kinit/kwrapper.c rename to tdeinit/kwrapper.c diff --git a/kinit/lnusertemp.c b/tdeinit/lnusertemp.c similarity index 100% rename from kinit/lnusertemp.c rename to tdeinit/lnusertemp.c diff --git a/kinit/setproctitle.cpp b/tdeinit/setproctitle.cpp similarity index 100% rename from kinit/setproctitle.cpp rename to tdeinit/setproctitle.cpp diff --git a/kinit/setproctitle.h b/tdeinit/setproctitle.h similarity index 100% rename from kinit/setproctitle.h rename to tdeinit/setproctitle.h diff --git a/kinit/shell.c b/tdeinit/shell.c similarity index 100% rename from kinit/shell.c rename to tdeinit/shell.c diff --git a/kinit/start_tdeinit.c b/tdeinit/start_tdeinit.c similarity index 100% rename from kinit/start_tdeinit.c rename to tdeinit/start_tdeinit.c diff --git a/kinit/start_tdeinit_wrapper.c b/tdeinit/start_tdeinit_wrapper.c similarity index 100% rename from kinit/start_tdeinit_wrapper.c rename to tdeinit/start_tdeinit_wrapper.c diff --git a/kinit/tdedostartupconfig.cpp b/tdeinit/tdedostartupconfig.cpp similarity index 100% rename from kinit/tdedostartupconfig.cpp rename to tdeinit/tdedostartupconfig.cpp diff --git a/kinit/kinit.cpp b/tdeinit/tdeinit.cpp similarity index 99% rename from kinit/kinit.cpp rename to tdeinit/tdeinit.cpp index b635b63e6..ca0d1dcaf 100644 --- a/kinit/kinit.cpp +++ b/tdeinit/tdeinit.cpp @@ -168,7 +168,7 @@ int tdeinit_x_errhandler( Display *, XErrorEvent *err ); /* These are to link libtdeparts even if 'smart' linker is used */ #include -extern "C" KParts::Plugin* _kinit_init_tdeparts() { return new KParts::Plugin(); } +extern "C" KParts::Plugin* _tdeinit_init_tdeparts() { return new KParts::Plugin(); } /* These are to link libtdeio even if 'smart' linker is used */ #include extern "C" TDEIO::AuthInfo* _tdeioslave_init_kio() { return new TDEIO::AuthInfo(); } diff --git a/kinit/tdeioslave.cpp b/tdeinit/tdeioslave.cpp similarity index 100% rename from kinit/tdeioslave.cpp rename to tdeinit/tdeioslave.cpp diff --git a/kinit/tdelauncher.cpp b/tdeinit/tdelauncher.cpp similarity index 100% rename from kinit/tdelauncher.cpp rename to tdeinit/tdelauncher.cpp diff --git a/kinit/tdelauncher.h b/tdeinit/tdelauncher.h similarity index 100% rename from kinit/tdelauncher.h rename to tdeinit/tdelauncher.h diff --git a/kinit/tdelauncher_cmds.h b/tdeinit/tdelauncher_cmds.h similarity index 100% rename from kinit/tdelauncher_cmds.h rename to tdeinit/tdelauncher_cmds.h diff --git a/kinit/tdelauncher_main.cpp b/tdeinit/tdelauncher_main.cpp similarity index 100% rename from kinit/tdelauncher_main.cpp rename to tdeinit/tdelauncher_main.cpp diff --git a/kinit/tdestartupconfig.cpp b/tdeinit/tdestartupconfig.cpp similarity index 100% rename from kinit/tdestartupconfig.cpp rename to tdeinit/tdestartupconfig.cpp diff --git a/kinit/tests/Makefile.am b/tdeinit/tests/Makefile.am similarity index 100% rename from kinit/tests/Makefile.am rename to tdeinit/tests/Makefile.am diff --git a/kinit/tests/tdelaunchertest.cpp b/tdeinit/tests/tdelaunchertest.cpp similarity index 100% rename from kinit/tests/tdelaunchertest.cpp rename to tdeinit/tests/tdelaunchertest.cpp diff --git a/kinit/wrapper.c b/tdeinit/wrapper.c similarity index 100% rename from kinit/wrapper.c rename to tdeinit/wrapper.c