The environment variables KDEDIR and
-KDEDIRS tell &kde; where its files are stored. You will
-usually only need to set KDEDIR to the directory in which
+The environment variables TDEDIR and
+TDEDIRS tell &kde; where its files are stored. You will
+usually only need to set TDEDIR to the directory in which
&kde; is installed, but sometimes you might have other &kde;
programs installed elsewhere: in this case, you can use the
-KDEDIRS environment variable. Set
-KDEDIRS to a list of all the directories containing
+TDEDIRS environment variable. Set
+TDEDIRS to a list of all the directories containing
&kde; programs, separated by commas. For example, if you have &kde;
programs in both /usr/local/kde and
/home/phil/kde, you can use export
-KDEDIR=/usr/local/kde,/home/phil/kde if you use
+TDEDIR=/usr/local/kde,/home/phil/kde if you use
bash or setenv
-KDEDIR=/usr/local/kde,/home/phil/kde if you use sh.
+TDEDIR=/usr/local/kde,/home/phil/kde if you use sh.
diff --git a/drkonqi/README b/drkonqi/README
index 34839e214..dffebe5b8 100644
--- a/drkonqi/README
+++ b/drkonqi/README
@@ -1,6 +1,6 @@
How to activate the developer mode for DrKonqi:
-$KDEHOME/share/config/drkonqirc:
+$TDEHOME/share/config/drkonqirc:
[drkonqi]
ConfigName=developer
diff --git a/kcontrol/fonts/fonts.cpp b/kcontrol/fonts/fonts.cpp
index 9ab122771..484f57410 100644
--- a/kcontrol/fonts/fonts.cpp
+++ b/kcontrol/fonts/fonts.cpp
@@ -648,7 +648,7 @@ KFonts::KFonts(TQWidget *parent, const char *name, const TQStringList &)
"The use of this option is generally discouraged. For selecting proper DPI"
" value a better option is explicitly configuring it for the whole X server if"
" possible (e.g. DisplaySize in xorg.conf or adding -dpi value to"
- " ServerLocalArgs= in $KDEDIR/share/config/kdm/kdmrc). When fonts do not render"
+ " ServerLocalArgs= in $TDEDIR/share/config/kdm/kdmrc). When fonts do not render"
" properly with real DPI value better fonts should be used or configuration"
" of font hinting should be checked.
" );
TQWhatsThis::add(comboForceDpi, whatsthis);
diff --git a/kcontrol/kfontinst/ChangeLog b/kcontrol/kfontinst/ChangeLog
index cdd37c6b6..0c2de0ed1 100644
--- a/kcontrol/kfontinst/ChangeLog
+++ b/kcontrol/kfontinst/ChangeLog
@@ -54,7 +54,7 @@ KDE3.1 -> KDE3.2
================
1. Re-designed (yet again...) to be a kio slave. As a user, starting fonts:/ will display
- Personal Lists contents of $HOME/.fonts and $KDEHOME/share/fonts (where previous installer installed to)
+ Personal Lists contents of $HOME/.fonts and $TDEHOME/share/fonts (where previous installer installed to)
Fonts are installed to $HOME/.fonts
System Lists contents of /usr/local/share/fonts, /usr/share/fonts, and /usr/X11R6/lib/X11/fonts
@@ -250,10 +250,10 @@ KDE3.1 -> KDE3.2
8. Removed some memory leaks
10. Default folders changed for non-root users. KFontinst will now (upon initial start-up) select the following:
- X fonts dir: $KDEHOME/share/fonts
- XConfig file: $KDEHOME/share/fonts/fontpaths
+ X fonts dir: $TDEHOME/share/fonts
+ XConfig file: $TDEHOME/share/fonts/fontpaths
XftConfig file: $HOME/.xftconfig
- Fontmap file: $KDEHOME/share/fonts/Fontmap
+ Fontmap file: $TDEHOME/share/fonts/Fontmap
...This should make it possible for users to install fonts without being root. However, problems may arrise when
configuring StarOffice - as this requires some other files to be modified, which won't be possible if SO has been installed
@@ -262,7 +262,7 @@ KDE3.1 -> KDE3.2
...Also to accomplish this, some changes are needed to 'starttde' - see file README.starttde
11. Because of the above, when started as non-root, KFontinst will create Type1 and TrueType sub-folders in
- $KDEHOME/share/fonts - if they do not already exist.
+ $TDEHOME/share/fonts - if they do not already exist.
12. Moved XftConfig stuff from a sub-page of settings tab into its own tab.
13. Added question dialog if module is unloaded before system has been configured.
14. Added ability to "touch" a X font folder - marking it as being modified, so that a re-configure of the that folder
@@ -403,7 +403,7 @@ KDE3.1 -> KDE3.2
5. Removed kfontinst-cp1252.enc, kfontinst-cp1252.xpp -- these were hacks anyway, and seing as Qt2 is going to
support cp1252 by a hard-coded codec, there's no real point...
6. Rearranged the Configure System dialog - so that Force AFM regeneration is grouped next to the Generate AFMs option.
-7. Encoding files now stored in /share/apps/kfontinst/Encodings
+7. Encoding files now stored in /share/apps/kfontinst/Encodings
0.6.1->0.7
==========
diff --git a/kcontrol/kicker/menutab.ui b/kcontrol/kicker/menutab.ui
index b24573f67..fad4f859a 100644
--- a/kcontrol/kicker/menutab.ui
+++ b/kcontrol/kicker/menutab.ui
@@ -184,7 +184,7 @@
<qt>When this option is selected an image will appear down the left-hand side of the K Menu. The image will be tinted according to your color settings.
- <p><b>Tip</b>: You can customize the image that appears in the K Menu by putting an image file called kside.png and a tileable image file called kside_tile.png in $KDEHOME/share/apps/kicker/pics.</qt>
+ <p><b>Tip</b>: You can customize the image that appears in the K Menu by putting an image file called kside.png and a tileable image file called kside_tile.png in $TDEHOME/share/apps/kicker/pics.</qt>
diff --git a/kcontrol/krdb/ad/README b/kcontrol/krdb/ad/README
index 7dfbcbd8f..a051becc7 100644
--- a/kcontrol/krdb/ad/README
+++ b/kcontrol/krdb/ad/README
@@ -35,7 +35,7 @@ Their meaning should be obvious to anyone familiar with
KDE's desktop wide resources. Install your application
default file either in
-$(KDEDIR)/share/apps/kdisplay/app-defaults
+$(TDEDIR)/share/apps/kdisplay/app-defaults
or
diff --git a/khelpcenter/DESIGN b/khelpcenter/DESIGN
index c670e7346..193207fee 100644
--- a/khelpcenter/DESIGN
+++ b/khelpcenter/DESIGN
@@ -417,7 +417,7 @@ Font Configuration
### Help pages already make heavy use of the cascading feature of CSS, we
### ought to be able to leverage that by writing to perhaps the
-### kde-localized.css file or a copy of it in $KDEHOME. There is already
+### kde-localized.css file or a copy of it in $TDEHOME. There is already
### code in KControl to create a user CSS stylesheet, and we probably only
### need to configure the size and the face for KHC.
diff --git a/khelpcenter/README.metadata b/khelpcenter/README.metadata
index 733bb5ef2..ea2750423 100644
--- a/khelpcenter/README.metadata
+++ b/khelpcenter/README.metadata
@@ -101,9 +101,9 @@ Meta File Location
A list of directories given by the config entry "MetaInfoDirs" in the "General"
group of the help center configuration file "khelpcenterrc" (at
-$KDEDIRS/share/config) is scanned for desktop files. They are merged to a common
+$TDEDIRS/share/config) is scanned for desktop files. They are merged to a common
hierarchy. If the "MetaInfoDirs" entry is empty the directory at
-$KDEDIRS/share/apps/khelpcenter/plugins is used.
+$TDEDIRS/share/apps/khelpcenter/plugins is used.
Document Hierarchy
------------------
diff --git a/khotkeys/README b/khotkeys/README
index 1b181aa43..b087105cb 100644
--- a/khotkeys/README
+++ b/khotkeys/README
@@ -45,17 +45,17 @@
the config file ), so you will be able to go back in case there will be
a serious problem with this version. The files you should remove
and backup before installing the new version are :
- - $KDEDIR/bin/khotkeys
- - $KDEDIR/lib/libkcm_khotkeys.la
- - $KDEDIR/lib/libkcm_khotkeys.so
- - $KDEDIR/lib/trinity/libkcm_khotkeys.la
- - $KDEDIR/lib/trinity/libkcm_khotkeys.so
- - $KDEDIR/lib/khotkeys.la
- - $KDEDIR/lib/khotkeys.so
- - $KDEDIR/lib/libkhotkeys.la
- - $KDEDIR/lib/libkhotkeys.so
- - $KDEDIR/share/autostart/khotkeys.desktop
- - $KDEHOME/share/config/khotkeysrc
+ - $TDEDIR/bin/khotkeys
+ - $TDEDIR/lib/libkcm_khotkeys.la
+ - $TDEDIR/lib/libkcm_khotkeys.so
+ - $TDEDIR/lib/trinity/libkcm_khotkeys.la
+ - $TDEDIR/lib/trinity/libkcm_khotkeys.so
+ - $TDEDIR/lib/khotkeys.la
+ - $TDEDIR/lib/khotkeys.so
+ - $TDEDIR/lib/libkhotkeys.la
+ - $TDEDIR/lib/libkhotkeys.so
+ - $TDEDIR/share/autostart/khotkeys.desktop
+ - $TDEHOME/share/config/khotkeysrc
Not all these files exist, depending on your KDE and OS version. It's simply
all files having 'khotkeys' in their name.
Ok, now the standard install ( ./configure && make && make install ), and
@@ -121,7 +121,7 @@
EXAMPLES :
Ok, as I guess the things written above aren't that good explanation, I've
- included a sample configuration file. Put it in $KDEHOME/share/config/khotkeysrc.
+ included a sample configuration file. Put it in $TDEHOME/share/config/khotkeysrc.
Every action is explained in its comment field. Note that all the actions are
disabled, so you'll have to enable them in order to use them.
diff --git a/khotkeys/configure.in.in b/khotkeys/configure.in.in
index ad9ab0c55..4f170eb1e 100644
--- a/khotkeys/configure.in.in
+++ b/khotkeys/configure.in.in
@@ -48,7 +48,7 @@ dnl check for arts for speech recognition
dnl ---------------------------------------------------------------------------
-artsc_config_test_path=$prefix/bin:$exec_prefix/bin:$KDEDIR/bin:$PATH
+artsc_config_test_path=$prefix/bin:$exec_prefix/bin:$TDEDIR/bin:$PATH
AC_PATH_PROG(ARTSCCONFIG, artsc-config, no, $artsc_config_test_path)
if test "x$build_arts" = "xyes" && test "x$ARTSCCONFIG" != "xno" ; then
diff --git a/kicker/menuext/tom/README b/kicker/menuext/tom/README
index 2616c76c5..9a7dd64a1 100644
--- a/kicker/menuext/tom/README
+++ b/kicker/menuext/tom/README
@@ -35,8 +35,8 @@ Populate and track Recent Applications menu entries
Recent Documents
Writing out of config files to reflect runtime changes (deleted entries, etc)
o This requires keeping track of the config files used in creating the menu
-KDEDIR merging
- o KDEDIRS are already consulted for taskgroups, but groups of the same name
+TDEDIR merging
+ o TDEDIRS are already consulted for taskgroups, but groups of the same name
should be merged
Sane merging of menuext entries
o "Recent" items should go into the recent section
diff --git a/kioslave/DEBUG.howto b/kioslave/DEBUG.howto
index d4873e021..a1d4925a5 100644
--- a/kioslave/DEBUG.howto
+++ b/kioslave/DEBUG.howto
@@ -65,7 +65,7 @@ How to get debug output
It is useful to redirect the debug output of your particular slave to a file
instead of stderr. E.g. I myself use the following lines in
-$KDEDIR/share/config/kdebugrc.
+$TDEDIR/share/config/kdebugrc.
[7113]
InfoOutput=0
diff --git a/konsole/README.keyboard b/konsole/README.keyboard
index 93a0ac20f..cb9e79a4a 100644
--- a/konsole/README.keyboard
+++ b/konsole/README.keyboard
@@ -1,6 +1,6 @@
[README.keyboard]
-The *.keytab files (located in $KDEDIR/share/apps/konsole) allow
+The *.keytab files (located in $TDEDIR/share/apps/konsole) allow
to configure the keyboard due to your specific environment.
Beside that you can use them to make the keyboard emit virtually
diff --git a/konsole/doc/Konsole2.Requirements b/konsole/doc/Konsole2.Requirements
index 19cbd72fc..66f419039 100644
--- a/konsole/doc/Konsole2.Requirements
+++ b/konsole/doc/Konsole2.Requirements
@@ -22,7 +22,7 @@ This file is to collect requirements and ideas for this.
- connection/disconnect session to/from individual windows
-- gui style configuration for $KDEDIR/share/apps/konsole/*
+- gui style configuration for $TDEDIR/share/apps/konsole/*
- improved history algorithm
diff --git a/konsole/other/README.Desktop b/konsole/other/README.Desktop
index b9600ace3..e87c88dc9 100644
--- a/konsole/other/README.Desktop
+++ b/konsole/other/README.Desktop
@@ -2,5 +2,5 @@
The session offered to be created in the File menu are
taken from from configurations files with a *.desktop
-pattern either located in $KDEDIR/share/apps/konsole
+pattern either located in $TDEDIR/share/apps/konsole
or ~/.kde/share/apps/konsole.
diff --git a/konsole/other/README.KeyTab b/konsole/other/README.KeyTab
index 4e94e5e50..8eeb15423 100644
--- a/konsole/other/README.KeyTab
+++ b/konsole/other/README.KeyTab
@@ -2,7 +2,7 @@
The keytabs offered in the Options/Keyboard menu are
taken from from configurations files with a *.keytab
-pattern either located in $KDEDIR/share/apps/konsole
+pattern either located in $TDEDIR/share/apps/konsole
or ~/.kde/share/apps/konsole.
Keytabs allow to configure the behavior of konsole
diff --git a/konsole/other/README.Schema b/konsole/other/README.Schema
index f737c1439..a87f46f4d 100644
--- a/konsole/other/README.Schema
+++ b/konsole/other/README.Schema
@@ -2,7 +2,7 @@
The schemata offered in the Options/Schema menu are
taken from from configurations files with a *.schema
-pattern either located in $KDEDIR/share/apps/konsole
+pattern either located in $TDEDIR/share/apps/konsole
or ~/.kde/share/apps/konsole.
Schemata allow to configure the color set that konsole
diff --git a/ksmserver/README b/ksmserver/README
index dc99a3f1c..ba6ac79f4 100644
--- a/ksmserver/README
+++ b/ksmserver/README
@@ -75,7 +75,7 @@ modules kcminit returns and waits.
When ksmserver is launched, the first thing it does is launching
the window manager, as the WM is necessary before any windows are possibly
shown. When the WM is ready, ksmserver tells klauncher to perform autostart
-phase 0 ($KDEHOME/share/autostart). There are 3 autostart phases, 0, 1 and 2,
+phase 0 ($TDEHOME/share/autostart). There are 3 autostart phases, 0, 1 and 2,
defined by X-KDE-autostart-phase, defaulting to 2. Phase 0 is reserved only
for the actual visible base components of KDE, i.e. KDesktop and Kicker,
in order to make the startup appear visually faster. Both KDesktop and Kicker
diff --git a/ksmserver/ksmserver.upd b/ksmserver/ksmserver.upd
index 22ae5beb2..3416ed856 100644
--- a/ksmserver/ksmserver.upd
+++ b/ksmserver/ksmserver.upd
@@ -1,4 +1,4 @@
-# Move session config files from $KDEHOME/share/config to $KDEHOME/share/config/session
+# Move session config files from $TDEHOME/share/config to $TDEHOME/share/config/session
Id=trinity
File=ksmserverrc
Group=Session
diff --git a/ksplashml/themeengine/objkstheme.h b/ksplashml/themeengine/objkstheme.h
index 504fe2860..090b39220 100644
--- a/ksplashml/themeengine/objkstheme.h
+++ b/ksplashml/themeengine/objkstheme.h
@@ -21,7 +21,7 @@ class KConfig;
/**
* @short Theme reader.
* A Theme is read in from the file
- * /share/apps/ksplash/Themes//Theme.rc
+ * /share/apps/ksplash/Themes//Theme.rc
* This controls the behavior, graphics, and appearance
* of KSplash completely, and offers a friendlier way
* of installing custom splash screens.
diff --git a/libkonq/favicons/favicons.upd b/libkonq/favicons/favicons.upd
index 5c952b22a..853a87d8f 100644
--- a/libkonq/favicons/favicons.upd
+++ b/libkonq/favicons/favicons.upd
@@ -1,3 +1,3 @@
-# Move favicons from $KDEHOME/share/icons and $KDEHOME/share/cache to $KDEHOME/cache-$HOST
+# Move favicons from $TDEHOME/share/icons and $TDEHOME/share/cache to $TDEHOME/cache-$HOST
Id=trinity_2
Script=move_favicons.sh,sh
diff --git a/libkonq/knewmenu.cc b/libkonq/knewmenu.cc
index 6b318c988..35f528318 100644
--- a/libkonq/knewmenu.cc
+++ b/libkonq/knewmenu.cc
@@ -308,7 +308,7 @@ void KNewMenu::slotFillTemplates()
this, TQT_SLOT ( slotFillTemplates() ) );
connect ( s_pDirWatch, TQT_SIGNAL( deleted( const TQString & ) ),
this, TQT_SLOT ( slotFillTemplates() ) );
- // Ok, this doesn't cope with new dirs in KDEDIRS, but that's another story
+ // Ok, this doesn't cope with new dirs in TDEDIRS, but that's another story
}
s_templatesVersion++;
s_filesParsed = false;
diff --git a/nsplugins/HOWTO.DEBUG b/nsplugins/HOWTO.DEBUG
index d00b4a5a6..94b43cfd5 100644
--- a/nsplugins/HOWTO.DEBUG
+++ b/nsplugins/HOWTO.DEBUG
@@ -5,7 +5,7 @@ Want to run nspluginviewer in valgrind? It's not easy. Here's how:
- Record the commandline, then kill -11 the process
- close drkonqi
- in a konsole, export ARTSDSP_MMAP=1
- - run LD_PRELOAD=$KDEDIR/lib/libartsdsp.so.0:$KDEDIR/lib/libartsc.so.0 valgrind -v --num-callers=15 --error-limit=no nspluginviewer
+ - run LD_PRELOAD=$TDEDIR/lib/libartsdsp.so.0:$TDEDIR/lib/libartsc.so.0 valgrind -v --num-callers=15 --error-limit=no nspluginviewer
- WAIT for four lines to be printed to the screen that start with:
5 ............
diff --git a/starttde b/starttde
index b5ed688b4..4949ccca2 100644
--- a/starttde
+++ b/starttde
@@ -63,57 +63,57 @@ fi
# * Then ksmserver is started which takes control of the rest of the startup sequence
# The user's personal KDE directory usually is $HOME/.kde or $HOME/.trinity.
-# This setting may be overridden by setting $KDEHOME.
+# This setting may be overridden by setting $TDEHOME.
# Must be careful here because $HOME/.kde was used commonly in the pre-KDE4
# days for the user's KDE3 profile, but now with KDE4 common on systems,
# $HOME/.kde might point to KDE4 profile settings. Further, the existence
# of KDE4 does not mean all people have KDE4 installed and might want to keep
# $HOME/.kde as their preferred profile location for Trinity KDE.
-if [ -n "$KDEHOME" ]; then
- echo "[starttde] KDEHOME is preset to $KDEHOME." 1>&2
- export KDEHOME=$KDEHOME
+if [ -n "$TDEHOME" ]; then
+ echo "[starttde] TDEHOME is preset to $TDEHOME." 1>&2
+ export TDEHOME=$TDEHOME
else
- # $KDEHOME is NOT already preset in the environment. Try to help.
+ # $TDEHOME is NOT already preset in the environment. Try to help.
# This might be overkill but does provide flexibility.
- echo "[starttde] KDEHOME is not set." 1>&2
+ echo "[starttde] TDEHOME is not set." 1>&2
if [ -d $HOME/.trinity ]; then
# OK, this one is obvious.
- export KDEHOME=$HOME/.trinity
+ export TDEHOME=$HOME/.trinity
elif [ -d $HOME/.trinity ]; then
# Looks like the user had an old version of Trinity installed at last login
echo "[starttde] Migrating old ~/.trinity directory to new ~/.trinity name." 1>&2
mv $HOME/.trinity $HOME/.trinity
- export KDEHOME=$HOME/.trinity
+ export TDEHOME=$HOME/.trinity
elif [ -f /usr/bin/kde4-config ]; then
# Looks like KDE4 is installed.
if [ -d $HOME/.kde ] && [ ! -d $HOME/.trinity ]; then
# Presume $HOME/.kde is being used for KDE4 as it already exists.
- export KDEHOME=$HOME/.trinity
+ export TDEHOME=$HOME/.trinity
else
# Presume $HOME/.kde is being used for KDE4 to be on the safe side.
- export KDEHOME=$HOME/.trinity
+ export TDEHOME=$HOME/.trinity
fi
elif [ -f /opt/trinity/bin/kde-config ]; then
# Looks like KDE3 or Trinity is installed and playing second fiddle to KDE4.
- export KDEHOME=$HOME/.trinity
+ export TDEHOME=$HOME/.trinity
elif [ -f /opt/trinity/bin/kde-config ]; then
# Looks like KDE3 or Trinity is installed and playing second fiddle to KDE4.
- export KDEHOME=$HOME/.trinity
+ export TDEHOME=$HOME/.trinity
elif [ -f /usr/bin/kde-config ] && [ -d $HOME/.kde ]; then
# Looks like KDE3 or Trinity is installed and not playing second fiddle to KDE4.
- export KDEHOME=$HOME/.kde
+ export TDEHOME=$HOME/.kde
else
# Resort to this and hope for the best!
- export KDEHOME=$HOME/.trinity
+ export TDEHOME=$HOME/.trinity
fi
- echo "[starttde] Set KDEHOME to $KDEHOME." 1>&2
+ echo "[starttde] Set TDEHOME to $TDEHOME." 1>&2
fi
# Run a quick test for root.
if [ -z "$KDEROOTHOME" ] && [ "$UID" = "0" ]; then
- echo "[starttde] User ID is $UID. Setting KDEROOTHOME to $KDEHOME."
- export KDEROOTHOME=$KDEHOME
+ echo "[starttde] User ID is $UID. Setting KDEROOTHOME to $TDEHOME."
+ export KDEROOTHOME=$TDEHOME
fi
# Modify the following environment variables only as necessary.
@@ -148,21 +148,21 @@ if [ -d /opt/trinity/share/man ]; then
export MANPATH=/opt/trinity/share/man:$MANPATH
fi
if [ -d /opt/trinity ]; then
- if [ -n "$KDEDIRS" ]; then
- export KDEDIRS=$KDEDIRS:/opt/trinity/:/usr/
+ if [ -n "$TDEDIRS" ]; then
+ export TDEDIRS=$TDEDIRS:/opt/trinity/:/usr/
else
- export KDEDIRS=/opt/trinity/:/usr/
+ export TDEDIRS=/opt/trinity/:/usr/
fi
fi
if [ -d /opt/trinity ]; then
- if [ -n "$KDEDIRS" ]; then
- export KDEDIRS=$KDEDIRS:/opt/trinity/:/usr/
+ if [ -n "$TDEDIRS" ]; then
+ export TDEDIRS=$TDEDIRS:/opt/trinity/:/usr/
else
- export KDEDIRS=/opt/trinity/:/usr/
+ export TDEDIRS=/opt/trinity/:/usr/
fi
fi
-test -n "$KDEHOME" && kdehome=`echo "$KDEHOME" | sed "s,^~/,$HOME/,"`
+test -n "$TDEHOME" && kdehome=`echo "$TDEHOME" | sed "s,^~/,$HOME/,"`
echo "[starttde] kdehome: $kdehome" 1>&2
# Allow interested applications, such as the Plasma control wrapper,
@@ -292,15 +292,15 @@ fi
# Configuration of the gtk_qt_engine if not already set.
-if test -n "$KDEDIRS"; then
- kdedirs_first=`echo "$KDEDIRS" | sed -e 's/:.*//'`
+if test -n "$TDEDIRS"; then
+ kdedirs_first=`echo "$TDEDIRS" | sed -e 's/:.*//'`
KGTK_RC_ENGINE=$kdedirs_first/share/kgtk/gtk-qt-engine.rc.sh
KGTK_RC_KDE1=$kdedirs_first/share/kgtk/.gtkrc-2.0-kde4
KGTK_RC_KDE2=$kdedirs_first/share/kgtk/.gtkrc-2.0-kde-kde4
else
- KGTK_RC_ENGINE=$KDEDIR/share/kgtk/gtk-qt-engine.rc.sh
- KGTK_RC_KDE1=$KDEDIR/share/kgtk/.gtkrc-2.0-kde4
- KGTK_RC_KDE2=$KDEDIR/share/kgtk/.gtkrc-2.0-kde-kde4
+ KGTK_RC_ENGINE=$TDEDIR/share/kgtk/gtk-qt-engine.rc.sh
+ KGTK_RC_KDE1=$TDEDIR/share/kgtk/.gtkrc-2.0-kde4
+ KGTK_RC_KDE2=$TDEDIR/share/kgtk/.gtkrc-2.0-kde-kde4
fi
if [ ! -e $kdehome/env/gtk-qt-engine.rc.sh ] && [ -e $KGTK_RC_ENGINE ]
@@ -321,7 +321,7 @@ then
fi
# Source scripts found in /env/*.sh and /env/*.sh
-# (where is $KDEHOME or ~/.trinity, and is where KDE is installed)
+# (where is $TDEHOME or ~/.trinity, and is where KDE is installed)
#
# This is where you can define environment variables that will be available to
# all KDE programs, so this is where you can run agents using e.g. eval `ssh-agent`
@@ -383,32 +383,32 @@ if test -r "$kde_fontpaths" ; then
IFS=$savifs
fi
-if [ ! -n "$KDEDIR" ]; then
- export KDEDIR=`echo "$KDEDIRS" | sed -e 's/:.*//'`
+if [ ! -n "$TDEDIR" ]; then
+ export TDEDIR=`echo "$TDEDIRS" | sed -e 's/:.*//'`
fi
-echo "[starttde] KDEDIR: $KDEDIR" 1>&2
-echo "[starttde] KDEDIRS: $KDEDIRS" 1>&2
+echo "[starttde] TDEDIR: $TDEDIR" 1>&2
+echo "[starttde] TDEDIRS: $TDEDIRS" 1>&2
-if test -n "$KDEDIRS"; then
- kdedirs_first=`echo "$KDEDIRS" | sed -e 's/:.*//'`
+if test -n "$TDEDIRS"; then
+ kdedirs_first=`echo "$TDEDIRS" | sed -e 's/:.*//'`
sys_odir=$kdedirs_first/share/fonts/override
sys_fdir=$kdedirs_first/share/fonts
else
- sys_odir=$KDEDIR/share/fonts/override
- sys_fdir=$KDEDIR/share/fonts
+ sys_odir=$TDEDIR/share/fonts/override
+ sys_fdir=$TDEDIR/share/fonts
fi
-if test -n "$KDEDIRS"; then
- kdedirs_first=`echo "$KDEDIRS" | sed -e 's/:.*//'`
+if test -n "$TDEDIRS"; then
+ kdedirs_first=`echo "$TDEDIRS" | sed -e 's/:.*//'`
echo "[starttde] kdedirs_first: $kdedirs_first"
if [ -r $kdedirs_first/share/kgtk/preload ]; then
echo "[starttde] Reading from $kdedirs_first/share/kgtk/preload"
read -r KGTK_PRELOAD < $kdedirs_first/share/kgtk/preload
fi
else
- if [ -r $KDEDIR/share/kgtk/preload ]; then
- read -r KGTK_PRELOAD < $KDEDIR/share/kgtk/preload
+ if [ -r $TDEDIR/share/kgtk/preload ]; then
+ read -r KGTK_PRELOAD < $TDEDIR/share/kgtk/preload
fi
fi
@@ -457,9 +457,9 @@ fi
# Link "tmp" "socket" and "cache" resources to directory in /tmp
# Creates:
-# - a directory /tmp/kde-$USER and links $KDEHOME/tmp-$HOSTNAME to it.
-# - a directory /tmp/ksocket-$USER and links $KDEHOME/socket-$HOSTNAME to it.
-# - a directory /var/tmp/kdecache-$USER and links $KDEHOME/cache-$HOSTNAME to it.
+# - a directory /tmp/kde-$USER and links $TDEHOME/tmp-$HOSTNAME to it.
+# - a directory /tmp/ksocket-$USER and links $TDEHOME/socket-$HOSTNAME to it.
+# - a directory /var/tmp/kdecache-$USER and links $TDEHOME/cache-$HOSTNAME to it.
# Note: temporary locations can be overriden through the KDETMP and KDEVARTMP
# environment variables.
for resource in tmp cache socket; do
@@ -476,11 +476,11 @@ dcopserver_shutdown
echo '[starttde] Starting Trinity...' 1>&2
# Detect any running Xorg composition managers
-$KDEDIR/bin/kdetcompmgr
+$TDEDIR/bin/kdetcompmgr
# Run KPersonalizer before the session if this is the first login.
if test "$kpersonalizerrc_general_firstlogin" = "true"; then
- if [ ! -x $KDEDIR/bin/kpersonalizer ]; then
+ if [ ! -x $TDEDIR/bin/kpersonalizer ]; then
echo "[starttde] kpersonalizer not found! Please install it in order to properly configure your user profile." 1>&2
else
# start only dcopserver, don't start whole tdeinit (takes too long)
@@ -601,7 +601,7 @@ fi
echo '[starttde] Running Trinity shutdown scripts...' 1>&2
-# Run scripts found in $KDEDIRS/shutdown
+# Run scripts found in $TDEDIRS/shutdown
for prefix in `echo "$exepath" | sed -n -e 's,/bin[^/]*/,/shutdown/,p'`; do
for file in `ls "$prefix" 2> /dev/null | egrep -v '(~|\.bak)$'`; do
if [ -x "${prefix}${file}" ]; then
diff --git a/tdeprint/slave/kio_print.cpp b/tdeprint/slave/kio_print.cpp
index d8bb4cf6e..71c8779ef 100644
--- a/tdeprint/slave/kio_print.cpp
+++ b/tdeprint/slave/kio_print.cpp
@@ -789,7 +789,7 @@ void KIO_Print::showData(const TQString& pathname)
/**
* Locate a data in this order:
- * - $KDEDIR/share/apps/tdeprint/template/
+ * - $TDEDIR/share/apps/tdeprint/template/
* - as a desktop icon
*/
TQString KIO_Print::locateData(const TQString& item)
diff --git a/tdeprint/tdeprintfax/anytops b/tdeprint/tdeprintfax/anytops
index 9718831dc..f29c996fb 100755
--- a/tdeprint/tdeprintfax/anytops
+++ b/tdeprint/tdeprintfax/anytops
@@ -47,7 +47,7 @@ if [ -z "$INFILE" -o -z "$OUTFILE" -o ! -f "$INFILE" ]; then
fi
if [ -z "$MIMETYPE" ]; then
- MAGIC=$KDEDIR
+ MAGIC=$TDEDIR
if [ -z "$MAGIC" ]; then
MAGIC=/usr
fi
diff --git a/tdesu/tdesu/tdesu.cpp b/tdesu/tdesu/tdesu.cpp
index 682661d54..a91c6936a 100644
--- a/tdesu/tdesu/tdesu.cpp
+++ b/tdesu/tdesu/tdesu.cpp
@@ -284,17 +284,17 @@ static int startApp()
if (pw->pw_uid)
{
- // Only propagate KDEHOME for non-root users,
+ // Only propagate TDEHOME for non-root users,
// root uses KDEROOTHOME
- // Translate the KDEHOME of this user to the new user.
+ // Translate the TDEHOME of this user to the new user.
TQString kdeHome = KGlobal::dirs()->relativeLocation("home", KGlobal::dirs()->localkdedir());
if (kdeHome[0] != '/')
kdeHome.prepend("~/");
else
kdeHome=TQString::null; // Use default
- env << ("KDEHOME="+ TQFile::encodeName(kdeHome));
+ env << ("TDEHOME="+ TQFile::encodeName(kdeHome));
}
KUser u;
diff --git a/tdesu/tdesud/tdesud.cpp b/tdesu/tdesud/tdesud.cpp
index 8f9942400..d2ae3bd36 100644
--- a/tdesu/tdesud/tdesud.cpp
+++ b/tdesu/tdesud/tdesud.cpp
@@ -6,7 +6,7 @@
*
* tdesud.cpp: KDE su daemon. Offers "keep password" functionality to kde su.
*
- * The socket $KDEHOME/socket-$(HOSTNAME)/tdesud_$(display) is used for communication with
+ * The socket $TDEHOME/socket-$(HOSTNAME)/tdesud_$(display) is used for communication with
* client programs.
*
* The protocol: Client initiates the connection. All commands and responses
diff --git a/twin/CONFIGURING b/twin/CONFIGURING
index c2c1e74da..ee5e21668 100644
--- a/twin/CONFIGURING
+++ b/twin/CONFIGURING
@@ -36,14 +36,14 @@ To create such window-specific setting automatically without a need of doing
it manually for every user (for example when doing a large deployment), follow
these steps:
-- Back up your $KDEHOME/share/config/twinrulesrc ($KDEHOME usually being $HOME/.kde)
+- Back up your $TDEHOME/share/config/twinrulesrc ($TDEHOME usually being $HOME/.kde)
and remove it
- Run 'dcop twin default reconfigure'
- Create manually all window-specific settings that should be included (see above)
- When done, check in Window-specific settings configuration module
(Alt+F3/Configure window behavior/Window-specific settings) that all rules are
included
-- Create a copy of $KDEHOME/share/config/twinrulesrc and restore the original one
+- Create a copy of $TDEHOME/share/config/twinrulesrc and restore the original one
- Rename the copy (i.e. the newly created twinrulesrc) to have its unique name
(e.g. foobar_fix_maxsize in this example case)
- Be careful with manual modifications of the file, especially make sure the count=
@@ -62,9 +62,9 @@ Script=twin_update_default_rules
# twin_foobar_fix_maxsize.upd end #
- The kconfig_file (twin_foobar_fix_maxsize.upd) is to be placed
- in $KDEDIR/share/apps/kconf_update/
+ in $TDEDIR/share/apps/kconf_update/
- The file with the window-specific settings (foobar_fix_maxsize) is to be placed
- in $KDEDIR/share/apps/twin/default_rules/
+ in $TDEDIR/share/apps/twin/default_rules/
All KDE user accounts should have these new window-specific settings added