From 99cc03399059853dd8699cae5752e8122cb715f1 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 7 Dec 2011 19:10:38 -0600 Subject: Rename KDEHOME and KDEDIR --- kinit/README.DCOP | 8 ++++---- kinit/README.autostart | 2 +- kinit/README.wrapper | 4 ++-- kinit/kdostartupconfig.cpp | 2 +- kinit/kstartupconfig.cpp | 8 ++++---- kinit/lnusertemp.c | 4 ++-- kinit/wrapper.c | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) (limited to 'kinit') diff --git a/kinit/README.DCOP b/kinit/README.DCOP index 43f951226..af5aff809 100644 --- a/kinit/README.DCOP +++ b/kinit/README.DCOP @@ -34,8 +34,8 @@ serviceResult start_service_by_name(QString serviceName, QStringList url) * Start a service by desktop path. * * 'serviceName' refers to a desktop file describing the service. - * This may be an absolute path or a path relative to $KDEDIRS/applnk - * and/or $KDEDIRS/services + * This may be an absolute path or a path relative to $TDEDIRS/applnk + * and/or $TDEDIRS/services * E.g. it should have the form "Applications/korganizer.desktop" or * "/opt/kde/share/applnk/Applications/korganizer.desktop". * @@ -57,8 +57,8 @@ serviceResult start_service_by_desktop_path(QString serviceName, QStringList url * Start a service by desktop name. * * 'serviceName' refers to a desktop file describing the service. - * The service is looked up anywhere in $KDEDIR/applnk and/or - * $KDEDIR/services. + * The service is looked up anywhere in $TDEDIR/applnk and/or + * $TDEDIR/services. * E.g. it should have the form "korganizer". * * 'url', if not empty, will be passed to the service as diff --git a/kinit/README.autostart b/kinit/README.autostart index bbfd036ec..c1f711ef6 100644 --- a/kinit/README.autostart +++ b/kinit/README.autostart @@ -12,7 +12,7 @@ Applications may be scheduled to be automatically run at KDE session startup in either autostart phase 1 or phase 2. Autostart phase 1 is the original autostart phase; phase 2 was introduced in KDE 3. To run in either phase, an application's .desktop file must be located in a KDE autostart directory such -as $KDEDIR/share/autostart or $KDEHOME/share/autostart. The .desktop file can +as $TDEDIR/share/autostart or $TDEHOME/share/autostart. The .desktop file can contain the following optional entries to control its autostart: X-KDE-autostart-condition = rcfile:group:entry:default diff --git a/kinit/README.wrapper b/kinit/README.wrapper index 077d2b870..11483d2bc 100644 --- a/kinit/README.wrapper +++ b/kinit/README.wrapper @@ -3,8 +3,8 @@ README tdeinit_wrapper, kshell and kwrapper are a programs that start programs via tdeinit. -E.g. You can make a symbolic link from $KDEDIR/bin/konsole to -$KDEDIR/bin/tdeinit_wrapper. Typing 'konsole' on the command line +E.g. You can make a symbolic link from $TDEDIR/bin/konsole to +$TDEDIR/bin/tdeinit_wrapper. Typing 'konsole' on the command line will then start 'konsole.la' through tdeinit instead. tdeinit_wrapper is the simplest for, it only passes the program diff --git a/kinit/kdostartupconfig.cpp b/kinit/kdostartupconfig.cpp index 1479cbd7d..fceed88e2 100644 --- a/kinit/kdostartupconfig.cpp +++ b/kinit/kdostartupconfig.cpp @@ -125,7 +125,7 @@ int main() << "=\"" << value.replace( "\"", "\\\"" ) << "\"\n"; } startupconfigfiles << line << endl; - // use even currently non-existing paths in $KDEDIRS + // use even currently non-existing paths in $TDEDIRS TQStringList dirs = TQStringList::split( KPATH_SEPARATOR, KGlobal::dirs()->kfsstnd_prefixes()); for( TQStringList::ConstIterator it = dirs.begin(); it != dirs.end(); diff --git a/kinit/kstartupconfig.cpp b/kinit/kstartupconfig.cpp index 288c52288..3e4d68156 100644 --- a/kinit/kstartupconfig.cpp +++ b/kinit/kstartupconfig.cpp @@ -28,10 +28,10 @@ This utility helps to have some configuration options available in starttde without the need to launch anything linked to KDE libraries (which may need some time to load). -The configuration options are written to $KDEHOME/share/config/startupconfigkeys, +The configuration options are written to $TDEHOME/share/config/startupconfigkeys, one option per line, as . It is possible to use ' for quoting multiword entries. Values of these options will be written -to $KDEHOME/share/config/startupconfig as a shell script that will set +to $TDEHOME/share/config/startupconfig as a shell script that will set the values to shell variables, named __ (all spaces replaced by underscores, everything lowercase). So e.g. line "ksplashrc KSplash Theme Default" may result in "ksplashrc_ksplash_theme=Default". @@ -76,8 +76,8 @@ Otherwise kdostartupconfig is launched to create or update all the necessary fil int main() { char kdehome[ 1024 ]; - if( getenv( "KDEHOME" )) - strlcpy( kdehome, getenv( "KDEHOME" ), 1024 ); + if( getenv( "TDEHOME" )) + strlcpy( kdehome, getenv( "TDEHOME" ), 1024 ); else if( getenv( "HOME" )) { strlcpy( kdehome, getenv( "HOME" ), 1024 ); diff --git a/kinit/lnusertemp.c b/kinit/lnusertemp.c index 31a8afd87..1b613a760 100644 --- a/kinit/lnusertemp.c +++ b/kinit/lnusertemp.c @@ -100,7 +100,7 @@ int build_link(const char *tmp_prefix, const char *kde_prefix, int kdehostname) char tmp_buf[PATH_MAX+1]; int uid = getuid(); const char *home_dir = getenv("HOME"); - const char *kde_home = uid ? getenv("KDEHOME") : getenv("KDEROOTHOME"); + const char *kde_home = uid ? getenv("TDEHOME") : getenv("KDEROOTHOME"); int result; struct stat stat_buf; @@ -181,7 +181,7 @@ int build_link(const char *tmp_prefix, const char *kde_prefix, int kdehostname) result = lstat(kde_tmp_dir, &stat_buf); if ((result == 0) && (S_ISDIR(stat_buf.st_mode))) { - /* $KDEHOME/tmp is a normal directory. Do nothing. */ + /* $TDEHOME/tmp is a normal directory. Do nothing. */ /*printf("Directory \"%s\" already exists.\n", kde_tmp_dir);*/ return 0; } diff --git a/kinit/wrapper.c b/kinit/wrapper.c index 55577793b..9ddc88eb6 100644 --- a/kinit/wrapper.c +++ b/kinit/wrapper.c @@ -132,7 +132,7 @@ static int openSocket() #define MAX_SOCK_FILE 255 char sock_file[MAX_SOCK_FILE + 1]; const char *home_dir = getenv("HOME"); - const char *kde_home = getenv("KDEHOME"); + const char *kde_home = getenv("TDEHOME"); char *display; sock_file[0] = sock_file[MAX_SOCK_FILE] = 0; -- cgit v1.2.1