summaryrefslogtreecommitdiffstats
path: root/kinit
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:04:16 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:04:16 -0600
commit5159cd2beb2e87806a5b54e9991b7895285c9d3e (patch)
tree9b70e8be47a390f8f4d56ead812ab0c9dad88709 /kinit
parentc17cb900dcf52b8bd6dc300d4f103392900ec2b4 (diff)
downloadtdelibs-5159cd2beb2e87806a5b54e9991b7895285c9d3e.tar.gz
tdelibs-5159cd2beb2e87806a5b54e9991b7895285c9d3e.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kinit')
-rw-r--r--kinit/CMakeLists.txt32
-rw-r--r--kinit/Makefile.am30
-rw-r--r--kinit/autostart.cpp2
-rw-r--r--kinit/kinit.cpp46
-rw-r--r--kinit/tdedostartupconfig.cpp (renamed from kinit/kdostartupconfig.cpp)8
-rw-r--r--kinit/tdeioslave.cpp (renamed from kinit/kioslave.cpp)8
-rw-r--r--kinit/tdelauncher.cpp (renamed from kinit/klauncher.cpp)34
-rw-r--r--kinit/tdelauncher.h (renamed from kinit/klauncher.h)2
-rw-r--r--kinit/tdelauncher_cmds.h (renamed from kinit/klauncher_cmds.h)2
-rw-r--r--kinit/tdelauncher_main.cpp (renamed from kinit/klauncher_main.cpp)16
-rw-r--r--kinit/tdestartupconfig.cpp (renamed from kinit/kstartupconfig.cpp)18
-rw-r--r--kinit/tests/Makefile.am6
-rw-r--r--kinit/tests/tdelaunchertest.cpp (renamed from kinit/tests/klaunchertest.cpp)2
-rw-r--r--kinit/wrapper.c4
14 files changed, 105 insertions, 105 deletions
diff --git a/kinit/CMakeLists.txt b/kinit/CMakeLists.txt
index 834242bf1..88be32621 100644
--- a/kinit/CMakeLists.txt
+++ b/kinit/CMakeLists.txt
@@ -19,8 +19,8 @@ include_directories(
${CMAKE_SOURCE_DIR}/dcop
${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/tdeui
- ${CMAKE_SOURCE_DIR}/kio
- ${CMAKE_SOURCE_DIR}/kio/kio
+ ${CMAKE_SOURCE_DIR}/tdeio
+ ${CMAKE_SOURCE_DIR}/tdeio/tdeio
${FREETYPE_INCLUDE_DIRS}
)
@@ -94,34 +94,34 @@ tde_add_executable( ${target}
)
-#### kioslave ###################################
+#### tdeioslave ###################################
-set( target kioslave )
+set( target tdeioslave )
tde_add_executable( ${target} AUTOMOC
- SOURCES kioslave.cpp
- LINK ltdlc-static kio-shared
+ SOURCES tdeioslave.cpp
+ LINK ltdlc-static tdeio-shared
DESTINATION ${BIN_INSTALL_DIR}
)
-#### kstartupconfig #############################
+#### tdestartupconfig #############################
-set( target kstartupconfig )
+set( target tdestartupconfig )
tde_add_executable( ${target} AUTOMOC
- SOURCES kstartupconfig.cpp
+ SOURCES tdestartupconfig.cpp
LINK tdefakes-shared ${TQT_LIBRARIES}
DESTINATION ${BIN_INSTALL_DIR}
)
-#### kdostartupconfig ###########################
+#### tdedostartupconfig ###########################
-set( target kdostartupconfig )
+set( target tdedostartupconfig )
tde_add_executable( ${target} AUTOMOC
- SOURCES kdostartupconfig.cpp
+ SOURCES tdedostartupconfig.cpp
LINK tdecore-shared
DESTINATION ${BIN_INSTALL_DIR}
)
@@ -153,15 +153,15 @@ tde_add_executable( ${target}
)
-#### klauncher ##################################
+#### tdelauncher ##################################
-set( target klauncher )
+set( target tdelauncher )
set( ${target}_SRCS
- klauncher.cpp klauncher_main.cpp autostart.cpp
+ tdelauncher.cpp tdelauncher_main.cpp autostart.cpp
)
tde_add_tdeinit_executable( ${target} AUTOMOC
SOURCES ${${target}_SRCS}
- LINK kio-shared
+ LINK tdeio-shared
)
diff --git a/kinit/Makefile.am b/kinit/Makefile.am
index ef329980a..3090d041e 100644
--- a/kinit/Makefile.am
+++ b/kinit/Makefile.am
@@ -19,11 +19,11 @@ INCLUDES = -I$(srcdir)/../libltdl/ $(all_includes) $(TDEINIT_XFT_INCLUDES)
SUBDIRS = . tests
-bin_PROGRAMS = tdeinit tdeinit_wrapper kshell tdeinit_shutdown lnusertemp kwrapper kioslave \
- kstartupconfig kdostartupconfig start_tdeinit start_tdeinit_wrapper
+bin_PROGRAMS = tdeinit tdeinit_wrapper kshell tdeinit_shutdown lnusertemp kwrapper tdeioslave \
+ tdestartupconfig tdedostartupconfig start_tdeinit start_tdeinit_wrapper
lib_LTLIBRARIES =
-tdeinit_LTLIBRARIES = klauncher.la
+tdeinit_LTLIBRARIES = tdelauncher.la
tdeinit_SOURCES = kinit.cpp setproctitle.cpp
# NOTE: We link against all common libraries even if we don't need them ourselves.
@@ -35,10 +35,10 @@ tdeinit_LDFLAGS = $(KDE_MT_LDFLAGS) $(QT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) \
$(KDE_RPATH)
tdeinit_LDADD = $(LIB_KPARTS) -lXft $(LIB_QT)
-kioslave_SOURCES = kioslave.cpp
-kioslave_LDFLAGS = $(KDE_MT_LDFLAGS) $(QT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) \
+tdeioslave_SOURCES = tdeioslave.cpp
+tdeioslave_LDFLAGS = $(KDE_MT_LDFLAGS) $(QT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) \
$(KDE_RPATH)
-kioslave_LDADD = $(LIB_KIO)
+tdeioslave_LDADD = $(LIB_KIO)
tdeinit_wrapper_SOURCES = wrapper.c
tdeinit_wrapper_LDADD = $(LIBSOCKET)
@@ -55,16 +55,16 @@ lnusertemp_LDFLAGS = $(KDE_RPATH)
kwrapper_SOURCES = kwrapper.c
kwrapper_LDADD = $(LIBSOCKET)
-klauncher_la_LDFLAGS = $(all_libraries) -module -avoid-version
-klauncher_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11)
-klauncher_la_SOURCES = klauncher.cpp klauncher_main.cpp autostart.cpp
+tdelauncher_la_LDFLAGS = $(all_libraries) -module -avoid-version
+tdelauncher_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11)
+tdelauncher_la_SOURCES = tdelauncher.cpp tdelauncher_main.cpp autostart.cpp
-kstartupconfig_SOURCES = kstartupconfig.cpp
-kstartupconfig_LDADD = $(top_builddir)/tdecore/libtdefakes.la $(LIB_QT)
-kdostartupconfig_SOURCES = kdostartupconfig.cpp
-kdostartupconfig_LDFLAGS = $(KDE_MT_LDFLAGS) $(QT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) \
+tdestartupconfig_SOURCES = tdestartupconfig.cpp
+tdestartupconfig_LDADD = $(top_builddir)/tdecore/libtdefakes.la $(LIB_QT)
+tdedostartupconfig_SOURCES = tdedostartupconfig.cpp
+tdedostartupconfig_LDFLAGS = $(KDE_MT_LDFLAGS) $(QT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) \
$(KDE_RPATH)
-kdostartupconfig_LDADD = $(LIB_TDECORE)
+tdedostartupconfig_LDADD = $(LIB_TDECORE)
start_tdeinit_SOURCES = start_tdeinit.c
tdeinitpath = $(bindir)/tdeinit
@@ -75,7 +75,7 @@ start_tdeinit_wrapper_SOURCES = start_tdeinit_wrapper.c
METASOURCES = AUTO
-noinst_HEADERS = klauncher.h autostart.h klauncher_cmds.h setproctitle.h
+noinst_HEADERS = tdelauncher.h autostart.h tdelauncher_cmds.h setproctitle.h
kwrapper.o: wrapper.c
diff --git a/kinit/autostart.cpp b/kinit/autostart.cpp
index 3fe0825a4..4e4ad1f56 100644
--- a/kinit/autostart.cpp
+++ b/kinit/autostart.cpp
@@ -22,7 +22,7 @@
#include "autostart.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kdesktopfile.h>
#include <kglobal.h>
#include <kstandarddirs.h>
diff --git a/kinit/kinit.cpp b/kinit/kinit.cpp
index 6cf9293d6..63e6ab832 100644
--- a/kinit/kinit.cpp
+++ b/kinit/kinit.cpp
@@ -55,7 +55,7 @@
#include <kinstance.h>
#include <kstandarddirs.h>
#include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <klibloader.h>
#include <kapplication.h>
#include <klocale.h>
@@ -74,7 +74,7 @@
#include <tdeversion.h>
#include "ltdl.h"
-#include "klauncher_cmds.h"
+#include "tdelauncher_cmds.h"
//#if defined Q_WS_X11 && ! defined K_WS_QTONLY
#ifdef Q_WS_X11
@@ -169,9 +169,9 @@ int tdeinit_x_errhandler( Display *, XErrorEvent *err );
/* These are to link libtdeparts even if 'smart' linker is used */
#include <tdeparts/plugin.h>
extern "C" KParts::Plugin* _kinit_init_tdeparts() { return new KParts::Plugin(); }
-/* These are to link libkio even if 'smart' linker is used */
-#include <kio/authinfo.h>
-extern "C" TDEIO::AuthInfo* _kioslave_init_kio() { return new TDEIO::AuthInfo(); }
+/* These are to link libtdeio even if 'smart' linker is used */
+#include <tdeio/authinfo.h>
+extern "C" TDEIO::AuthInfo* _tdeioslave_init_kio() { return new TDEIO::AuthInfo(); }
/*
* Close fd's which are only useful for the parent process.
@@ -429,8 +429,8 @@ static pid_t launch(int argc, const char *_name, const char *args,
TQCString name;
TQCString exec;
- if (strcmp(_name, "klauncher") == 0) {
- /* klauncher is launched in a special way:
+ if (strcmp(_name, "tdelauncher") == 0) {
+ /* tdelauncher is launched in a special way:
* It has a communication socket on LAUNCHER_FD
*/
if (0 > socketpair(AF_UNIX, SOCK_STREAM, 0, d.launcher))
@@ -891,7 +891,7 @@ static void init_tdeinit_socket()
if(connect(s, (struct sockaddr *)&server, socklen) == 0)
{
fprintf(stderr, "[tdeinit] Shutting down running client.\n");
- klauncher_header request_header;
+ tdelauncher_header request_header;
request_header.cmd = LAUNCHER_TERMINATE_TDEINIT;
request_header.arg_length = 0;
write(s, &request_header, sizeof(request_header));
@@ -1090,7 +1090,7 @@ static void launcher_died()
close(d.launcher[0]);
d.launcher[0] = -1;
- pid_t pid = launch( 1, "klauncher", 0 );
+ pid_t pid = launch( 1, "tdelauncher", 0 );
#ifndef NDEBUG
fprintf(stderr, "[tdeinit] Relaunching KLauncher, pid = %ld result = %d\n", (long) pid, d.result);
#endif
@@ -1105,7 +1105,7 @@ static void handle_launcher_request(int sock = -1)
launcher = true;
}
- klauncher_header request_header;
+ tdelauncher_header request_header;
char *request_data = 0L;
int result = read_socket(sock, (char *) &request_header, sizeof(request_header));
if (result != 0)
@@ -1141,7 +1141,7 @@ static void handle_launcher_request(int sock = -1)
(request_header.cmd == LAUNCHER_EXEC_NEW)))
{
pid_t pid;
- klauncher_header response_header;
+ tdelauncher_header response_header;
long response_data;
long l;
memcpy( &l, request_data, sizeof( long ));
@@ -1273,7 +1273,7 @@ static void handle_launcher_request(int sock = -1)
#ifndef NDEBUG
if (launcher)
- fprintf(stderr, "[tdeinit] Got SETENV '%s=%s' from klauncher.\n", env_name, env_value);
+ fprintf(stderr, "[tdeinit] Got SETENV '%s=%s' from tdelauncher.\n", env_name, env_value);
else
fprintf(stderr, "[tdeinit] Got SETENV '%s=%s' from socket.\n", env_name, env_value);
#endif
@@ -1301,7 +1301,7 @@ static void handle_launcher_request(int sock = -1)
else if (request_header.cmd == LAUNCHER_TERMINATE_TDEINIT)
{
#ifndef NDEBUG
- fprintf(stderr,"[tdeinit] Killing tdeinit/klauncher.\n");
+ fprintf(stderr,"[tdeinit] Killing tdeinit/tdelauncher.\n");
#endif
if (d.launcher_pid)
kill(d.launcher_pid, SIGTERM);
@@ -1359,7 +1359,7 @@ static void handle_requests(pid_t waitForPid)
if (d.launcher_pid)
{
// TODO send process died message
- klauncher_header request_header;
+ tdelauncher_header request_header;
long request_data[2];
request_header.cmd = LAUNCHER_DIED;
request_header.arg_length = sizeof(long) * 2;
@@ -1686,7 +1686,7 @@ int main(int argc, char **argv, char **envp)
int i;
pid_t pid;
int launch_dcop = 1;
- int launch_klauncher = 1;
+ int launch_tdelauncher = 1;
int launch_kded = 1;
int keep_running = 1;
int new_startup = 0;
@@ -1699,8 +1699,8 @@ int main(int argc, char **argv, char **envp)
safe_argv[i] = strcpy((char*)malloc(strlen(argv[i])+1), argv[i]);
if (strcmp(safe_argv[i], "--no-dcop") == 0)
launch_dcop = 0;
- if (strcmp(safe_argv[i], "--no-klauncher") == 0)
- launch_klauncher = 0;
+ if (strcmp(safe_argv[i], "--no-tdelauncher") == 0)
+ launch_tdelauncher = 0;
if (strcmp(safe_argv[i], "--no-kded") == 0)
launch_kded = 0;
if (strcmp(safe_argv[i], "--suicide") == 0)
@@ -1717,7 +1717,7 @@ int main(int argc, char **argv, char **envp)
{
printf("Usage: tdeinit [options]\n");
// printf(" --no-dcop Do not start dcopserver\n");
- // printf(" --no-klauncher Do not start klauncher\n");
+ // printf(" --no-tdelauncher Do not start tdelauncher\n");
printf(" --no-kded Do not start kded\n");
printf(" --suicide Terminate when no TDE applications are left running\n");
// printf(" --exit Terminate when kded has run\n");
@@ -1729,7 +1729,7 @@ int main(int argc, char **argv, char **envp)
// Fork here and let parent process exit.
// Parent process may only exit after all required services have been
- // launched. (dcopserver/klauncher and services which start with '+')
+ // launched. (dcopserver/tdelauncher and services which start with '+')
signal( SIGCHLD, secondary_child_handler);
if (fork() > 0) // Go into background
{
@@ -1812,16 +1812,16 @@ int main(int argc, char **argv, char **envp)
(void) lt_dlopen(TQFile::encodeName(konq).data());
}
#endif
- if (launch_klauncher)
+ if (launch_tdelauncher)
{
if( new_startup )
- pid = launch( 2, "klauncher", "--new-startup" );
+ pid = launch( 2, "tdelauncher", "--new-startup" );
else
- pid = launch( 1, "klauncher", 0 );
+ pid = launch( 1, "tdelauncher", 0 );
#ifndef NDEBUG
fprintf(stderr, "[tdeinit] Launched KLauncher, pid = %ld result = %d\n", (long) pid, d.result);
#endif
- handle_requests(pid); // Wait for klauncher to be ready
+ handle_requests(pid); // Wait for tdelauncher to be ready
}
#if defined Q_WS_X11 && ! defined K_WS_QTONLY
diff --git a/kinit/kdostartupconfig.cpp b/kinit/tdedostartupconfig.cpp
index b74417c3f..d964a900b 100644
--- a/kinit/kdostartupconfig.cpp
+++ b/kinit/tdedostartupconfig.cpp
@@ -24,13 +24,13 @@ DEALINGS IN THE SOFTWARE.
#undef QT_NO_CAST_ASCII
-// See description in kstartupconfig.cpp .
+// See description in tdestartupconfig.cpp .
#include <tqfile.h>
#include <tqtextstream.h>
#include <kinstance.h>
#include <kstandarddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kdebug.h>
TQString get_entry( TQString* ll )
@@ -62,8 +62,8 @@ TQString get_entry( TQString* ll )
int main()
{
- TDEInstance inst( "kdostartupconfig" );
- kdDebug() << "Running kdostartupconfig." << endl;
+ TDEInstance inst( "tdedostartupconfig" );
+ kdDebug() << "Running tdedostartupconfig." << endl;
TQString keysname = locateLocal( "config", "startupconfigkeys" );
TQFile keys( keysname );
if( !keys.open( IO_ReadOnly ))
diff --git a/kinit/kioslave.cpp b/kinit/tdeioslave.cpp
index 0cb77db02..1690ca2f7 100644
--- a/kinit/kioslave.cpp
+++ b/kinit/tdeioslave.cpp
@@ -47,15 +47,15 @@
# endif
#endif
-/* These are to link libkio even if 'smart' linker is used */
-#include <kio/authinfo.h>
-extern "C" TDEIO::AuthInfo* _kioslave_init_kio() { return new TDEIO::AuthInfo(); }
+/* These are to link libtdeio even if 'smart' linker is used */
+#include <tdeio/authinfo.h>
+extern "C" TDEIO::AuthInfo* _tdeioslave_init_kio() { return new TDEIO::AuthInfo(); }
int main(int argc, char **argv)
{
if (argc < 5)
{
- fprintf(stderr, "Usage: kioslave <slave-lib> <protocol> <klauncher-socket> <app-socket>\n\nThis program is part of TDE.\n");
+ fprintf(stderr, "Usage: tdeioslave <slave-lib> <protocol> <tdelauncher-socket> <app-socket>\n\nThis program is part of TDE.\n");
exit(1);
}
TQCString libpath = argv[1];
diff --git a/kinit/klauncher.cpp b/kinit/tdelauncher.cpp
index 8c66789e7..306903a55 100644
--- a/kinit/klauncher.cpp
+++ b/kinit/tdelauncher.cpp
@@ -29,7 +29,7 @@
#include <tqfile.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kdebug.h>
#include <klibloader.h>
#include <klocale.h>
@@ -45,12 +45,12 @@
#endif
-#include "kio/global.h"
-#include "kio/connection.h"
-#include "kio/slaveinterface.h"
+#include "tdeio/global.h"
+#include "tdeio/connection.h"
+#include "tdeio/slaveinterface.h"
-#include "klauncher.h"
-#include "klauncher_cmds.h"
+#include "tdelauncher.h"
+#include "tdelauncher_cmds.h"
//#if defined Q_WS_X11 && ! defined K_WS_QTONLY
#ifdef Q_WS_X11
@@ -165,7 +165,7 @@ IdleSlave::age(time_t now)
KLauncher::KLauncher(int _tdeinitSocket, bool new_startup)
// : TDEApplication( false, false ), // No Styles, No GUI
: TDEApplication( false, true ), // TQClipboard tries to construct a QWidget so a GUI is technically needed, even though it is not used
- DCOPObject("klauncher"),
+ DCOPObject("tdelauncher"),
tdeinitSocket(_tdeinitSocket), mAutoStart( new_startup ),
dontBlockReading(false), newStartup( new_startup )
{
@@ -181,7 +181,7 @@ KLauncher::KLauncher(int _tdeinitSocket, bool new_startup)
dcopClient()->connectDCOPSignal( "DCOPServer", "", "terminateKDE()",
objId(), "terminateKDE()", false );
- TQString prefix = locateLocal("socket", "klauncher");
+ TQString prefix = locateLocal("socket", "tdelauncher");
KTempFile domainname(prefix, TQString::fromLatin1(".slave-socket"));
if (domainname.status() != 0)
{
@@ -218,7 +218,7 @@ KLauncher::KLauncher(int _tdeinitSocket, bool new_startup)
mSlaveValgrindSkin = getenv("TDE_SLAVE_VALGRIND_SKIN");
tqWarning("Klauncher running slaves through valgrind for slaves of protocol '%s'", mSlaveValgrind.data());
}
- klauncher_header request_header;
+ tdelauncher_header request_header;
request_header.cmd = LAUNCHER_OK;
request_header.arg_length = 0;
write(tdeinitSocket, &request_header, sizeof(request_header));
@@ -410,7 +410,7 @@ KLauncher::process(const TQCString &fun, const TQByteArray &data,
::signal( SIGHUP, SIG_IGN);
::signal( SIGTERM, SIG_IGN);
kdDebug() << "KLauncher::process ---> terminateKDE" << endl;
- klauncher_header request_header;
+ tdelauncher_header request_header;
request_header.cmd = LAUNCHER_TERMINATE_KDE;
request_header.arg_length = 0;
write(tdeinitSocket, &request_header, sizeof(request_header));
@@ -485,7 +485,7 @@ void KLauncher::setLaunchEnv(const TQCString &name, const TQCString &_value)
TQCString value(_value);
if (value.isNull())
value = "";
- klauncher_header request_header;
+ tdelauncher_header request_header;
TQByteArray requestData(name.length()+value.length()+2);
memcpy(requestData.data(), name.data(), name.length()+1);
memcpy(requestData.data()+name.length()+1, value.data(), value.length()+1);
@@ -524,7 +524,7 @@ read_socket(int sock, char *buffer, int len)
void
KLauncher::slotKDEInitData(int)
{
- klauncher_header request_header;
+ tdelauncher_header request_header;
TQByteArray requestData;
if( dontBlockReading )
{
@@ -792,7 +792,7 @@ KLauncher::requestStart(KLaunchRequest *request)
{
requestList.append( request );
// Send request to tdeinit.
- klauncher_header request_header;
+ tdelauncher_header request_header;
TQByteArray requestData;
int length = 0;
length += sizeof(long); // Nr of. Args
@@ -1162,7 +1162,7 @@ KLauncher::tdeinit_exec(const TQString &app, const TQStringList &args,
request->startup_id = startup_id;
#endif
request->envs = envs;
- if( app != "kbuildsycoca" ) // avoid stupid loop
+ if( app != "tdebuildsycoca" ) // avoid stupid loop
{
// Find service, if any - strip path if needed
KService::Ptr service = KService::serviceByDesktopName( app.mid( app.findRev( '/' ) + 1 ));
@@ -1295,7 +1295,7 @@ KLauncher::requestSlave(const TQString &protocol,
// kdDebug(7016) << "KLauncher: launching new slave " << _name << " with protocol=" << protocol << endl;
if (mSlaveDebug == arg1)
{
- klauncher_header request_header;
+ tdelauncher_header request_header;
request_header.cmd = LAUNCHER_DEBUG_WAIT;
request_header.arg_length = 0;
write(tdeinitSocket, &request_header, sizeof(request_header));
@@ -1303,7 +1303,7 @@ KLauncher::requestSlave(const TQString &protocol,
if (mSlaveValgrind == arg1)
{
arg_list.prepend(TQFile::encodeName(KLibLoader::findLibrary(name)));
- arg_list.prepend(TQFile::encodeName(locate("exe", "kioslave")));
+ arg_list.prepend(TQFile::encodeName(locate("exe", "tdeioslave")));
name = "valgrind";
if (!mSlaveValgrindSkin.isEmpty()) {
arg_list.prepend(TQCString("--tool=") + mSlaveValgrindSkin);
@@ -1418,4 +1418,4 @@ KLauncher::idleTimeout()
}
}
-#include "klauncher.moc"
+#include "tdelauncher.moc"
diff --git a/kinit/klauncher.h b/kinit/tdelauncher.h
index 37b10f059..27c49ef7f 100644
--- a/kinit/klauncher.h
+++ b/kinit/tdelauncher.h
@@ -30,7 +30,7 @@
#include <tqtimer.h>
#include <dcopclient.h>
-#include <kio/connection.h>
+#include <tdeio/connection.h>
#include <ksock.h>
#include <kurl.h>
#include <kuniqueapplication.h>
diff --git a/kinit/klauncher_cmds.h b/kinit/tdelauncher_cmds.h
index 54b13f45a..5763e5a38 100644
--- a/kinit/klauncher_cmds.h
+++ b/kinit/tdelauncher_cmds.h
@@ -24,7 +24,7 @@ typedef struct
{
long cmd;
long arg_length;
-} klauncher_header;
+} tdelauncher_header;
/* Launcher commands: */
diff --git a/kinit/klauncher_main.cpp b/kinit/tdelauncher_main.cpp
index f22da9386..54ab94d54 100644
--- a/kinit/klauncher_main.cpp
+++ b/kinit/tdelauncher_main.cpp
@@ -23,7 +23,7 @@
#include <fcntl.h>
#include "kapplication.h"
-#include "klauncher.h"
+#include "tdelauncher.h"
#include "kcmdlineargs.h"
#include "kcrash.h"
#include "kdebug.h"
@@ -33,14 +33,14 @@
#include <tqcstring.h>
#include <klocale.h>
-#include "klauncher_cmds.h"
+#include "tdelauncher_cmds.h"
static void sig_handler(int sig_num)
{
// No recursion
signal( SIGHUP, SIG_IGN);
signal( SIGTERM, SIG_IGN);
- fprintf(stderr, "[klauncher] Exiting on signal %d\n", sig_num);
+ fprintf(stderr, "[tdelauncher] Exiting on signal %d\n", sig_num);
KLauncher::destruct(255);
}
@@ -55,8 +55,8 @@ extern "C" KDE_EXPORT int kdemain( int argc, char**argv )
// Started via tdeinit.
if (fcntl(LAUNCHER_FD, F_GETFD) == -1)
{
- fprintf(stderr, "%s", i18n("[klauncher] This program is not supposed to be started manually.\n"
- "[klauncher] It is started automatically by tdeinit.\n").local8Bit().data());
+ fprintf(stderr, "%s", i18n("[tdelauncher] This program is not supposed to be started manually.\n"
+ "[tdelauncher] It is started automatically by tdeinit.\n").local8Bit().data());
return 1;
}
@@ -82,7 +82,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char**argv )
TQCString dcopName = TDEApplication::dcopClient()->registerAs(name, false);
if (dcopName.isEmpty())
{
- kdWarning() << "[klauncher] DCOP communication problem!" << endl;
+ kdWarning() << "[tdelauncher] DCOP communication problem!" << endl;
return 1;
}
if (dcopName == cname)
@@ -90,12 +90,12 @@ extern "C" KDE_EXPORT int kdemain( int argc, char**argv )
if (--maxTry == 0)
{
- kdWarning() << "[klauncher] Another instance of klauncher is already running!" << endl;
+ kdWarning() << "[tdelauncher] Another instance of tdelauncher is already running!" << endl;
return 1;
}
// Wait a bit...
- kdWarning() << "[klauncher] Waiting for already running klauncher to exit." << endl;
+ kdWarning() << "[tdelauncher] Waiting for already running tdelauncher to exit." << endl;
sleep(1);
// Try again...
diff --git a/kinit/kstartupconfig.cpp b/kinit/tdestartupconfig.cpp
index 3204d6f7d..373ac6787 100644
--- a/kinit/kstartupconfig.cpp
+++ b/kinit/tdestartupconfig.cpp
@@ -42,10 +42,10 @@ It is not possible to specify default values, but since the configuration option
are processed in the order they are specified this can be solved by first
specifying a group and then all the entries that need default values.
-When a kconf_update script is used to update such option, kstartupconfig is run
-before kconf_update and therefore cannot see the change in time. To avoid this
-problem, together with the kconf_update script also the matching global config
-file should be updated (any change, kstartupconfig will see the timestamp change).
+When a tdeconf_update script is used to update such option, tdestartupconfig is run
+before tdeconf_update and therefore cannot see the change in time. To avoid this
+problem, together with the tdeconf_update script also the matching global config
+file should be updated (any change, tdestartupconfig will see the timestamp change).
Note that the kdeglobals config file is not used as a depedendency for other config
files.
@@ -58,7 +58,7 @@ followed by paths of all files that are relevant to the option. Non-existent fil
have '!' prepended (for the case they'll be later created), the list of files is
terminated by line containing '*'. If the timestamps of all relevant files are older
than the timestamp of the startupconfigfile file, there's no need to update anything.
-Otherwise kdostartupconfig is launched to create or update all the necessary files
+Otherwise tdedostartupconfig is launched to create or update all the necessary files
(which already requires loading KDE libraries, but this case should be rare).
*/
@@ -90,7 +90,7 @@ int main()
strlcat( filename, "/share/config/startupconfig", 1024 );
if( access( filename, R_OK ) != 0 )
{
- int ret = system( "kdostartupconfig" );
+ int ret = system( "tdedostartupconfig" );
return WEXITSTATUS( ret );
}
strlcpy( filename, tdehome, 1024 );
@@ -98,14 +98,14 @@ int main()
struct stat st;
if( stat( filename, &st ) != 0 )
{
- int ret = system( "kdostartupconfig" );
+ int ret = system( "tdedostartupconfig" );
return WEXITSTATUS( ret );
}
time_t config_time = st.st_mtime;
FILE* config = fopen( filename, "r" );
if( config == NULL )
{
- int ret = system( "kdostartupconfig" );
+ int ret = system( "tdedostartupconfig" );
return WEXITSTATUS( ret );
}
strlcpy( filename, tdehome, 1024 );
@@ -169,7 +169,7 @@ int main()
fclose( config );
if( need_update )
{
- int ret = system( "kdostartupconfig" );
+ int ret = system( "tdedostartupconfig" );
return WEXITSTATUS( ret );
}
return 0;
diff --git a/kinit/tests/Makefile.am b/kinit/tests/Makefile.am
index 909e7c14b..e1157bf72 100644
--- a/kinit/tests/Makefile.am
+++ b/kinit/tests/Makefile.am
@@ -3,8 +3,8 @@
INCLUDES= -I$(srcdir)/../.. $(all_includes)
####### Files
-check_PROGRAMS = klaunchertest
+check_PROGRAMS = tdelaunchertest
-klaunchertest_SOURCES = klaunchertest.cpp
-klaunchertest_LDADD = $(LIB_KIO)
+tdelaunchertest_SOURCES = tdelaunchertest.cpp
+tdelaunchertest_LDADD = $(LIB_KIO)
diff --git a/kinit/tests/klaunchertest.cpp b/kinit/tests/tdelaunchertest.cpp
index 3293c07be..a8989870b 100644
--- a/kinit/tests/klaunchertest.cpp
+++ b/kinit/tests/tdelaunchertest.cpp
@@ -30,7 +30,7 @@ int main(int argc, char *argv[])
{
TDEApplication::tdeinitExec("konsole");
- TDEApplication k(argc, argv, "klaunchertest");
+ TDEApplication k(argc, argv, "tdelaunchertest");
kapp->dcopClient()->registerAs( kapp->name()) ;
diff --git a/kinit/wrapper.c b/kinit/wrapper.c
index 36a75d46b..565c9a152 100644
--- a/kinit/wrapper.c
+++ b/kinit/wrapper.c
@@ -21,7 +21,7 @@
#include <config.h>
-#include "klauncher_cmds.h"
+#include "tdelauncher_cmds.h"
#include <sys/types.h>
#include <sys/param.h>
@@ -310,7 +310,7 @@ int main(int argc, char **argv)
int kwrapper = 0;
long arg_count;
long env_count;
- klauncher_header header;
+ tdelauncher_header header;
char *start, *p, *buffer;
char cwd[8192];
const char *tty = NULL;