Rename additional KDE strings

14 files changed, 58 insertions, 58 deletions

diff --git a/doc/userguide/kde-for-admins.docbook b/doc/userguide/kde-for-admins.docbook
index 12bdd50c5..bc646625b 100644
--- a/doc/userguide/kde-for-admins.docbook
+++ b/doc/userguide/kde-for-admins.docbook
@@ -64,7 +64,7 @@ class="directory">/etc/opt/trinity</filename>. (This was added by
 
 <para>If you have the KIOSK Admin tool v0.7 or later installed you can
 check which directory trees are used with the following command:
-<userinput><command>kiosktool-kdedirs</command>
+<userinput><command>kiosktool-tdedirs</command>
 <option>--check</option></userinput></para>
 </informalexample>
 
@@ -148,7 +148,7 @@ Position=10,10
 </seglistitem>
 
 <seglistitem>
-<seg><envar>KDEROOTHOME</envar></seg>
+<seg><envar>TDEROOTHOME</envar></seg>
 <seg><filename class="directory">/root/.kde</filename></seg>
 <seg>Different variable to prevent
 root writing to $TDEHOME of the user after running
@@ -184,7 +184,7 @@ colon. If not set, falls back to $<envar>TDEDIR</envar></seg>
 settings:</para>
 <programlisting>
 TDEHOME='~/.trinity'
-KDEROOTHOME='/root/.trinity'
+TDEROOTHOME='/root/.trinity'
 TDEDIRS='/opt/kde_staff:/opt/trinity'
 </programlisting>
 
@@ -1171,7 +1171,7 @@ the directory where personal data is stored.</para>
 </listitem>
 </varlistentry>
 
-<varlistentry><term>$<envar>KDEROOTHOME</envar></term><listitem><para>If
+<varlistentry><term>$<envar>TDEROOTHOME</envar></term><listitem><para>If
 not set, &kde; uses <filename class="directory">~root/.kde</filename>
 as the directory for <systemitem class="username">root</systemitem>'s
 personal data. Was introduced to prevent &kde; from accidently
@@ -1195,7 +1195,7 @@ necessary files are installed.</para>
 </listitem>
 </varlistentry>
 
-<varlistentry><term>$<envar>KDE_MULTIHEAD</envar></term><listitem><para>Set
+<varlistentry><term>$<envar>TDE_MULTIHEAD</envar></term><listitem><para>Set
 this variable to <literal>true</literal> to indicate that &kde; is running
 on a multi-head system.</para>
 </listitem>
diff --git a/kcminit/main.cpp b/kcminit/main.cpp
index d6eea3c86..bdb3bbfdc 100644
--- a/kcminit/main.cpp
+++ b/kcminit/main.cpp
@@ -180,7 +180,7 @@ KCMInit::KCMInit( KCmdLineArgs* args )
   bool multihead = !config.readBoolEntry( "disableMultihead", false) &&
                     (ScreenCount(qt_xdisplay()) > 1);
   // Pass env. var to tdeinit.
-  TQCString name = "KDE_MULTIHEAD";
+  TQCString name = "TDE_MULTIHEAD";
   TQCString value = multihead ? "true" : "false";
   TQByteArray params;
   TQDataStream stream(params, IO_WriteOnly);
diff --git a/kcontrol/background/bgdialog.cpp b/kcontrol/background/bgdialog.cpp
index 4308858d0..02669bdd0 100644
--- a/kcontrol/background/bgdialog.cpp
+++ b/kcontrol/background/bgdialog.cpp
@@ -84,7 +84,7 @@ BGDialog::BGDialog(TQWidget* parent, KConfig* _config, bool _multidesktop)
    m_numViewports = s.width() * s.height();
    m_numScreens = TQApplication::desktop()->numScreens();
    
-   TQCString multiHead = getenv("KDE_MULTIHEAD");
+   TQCString multiHead = getenv("TDE_MULTIHEAD");
    if (multiHead.lower() == "true") 
    {
       m_numScreens = 1;
diff --git a/kcontrol/input/core/themepage.cpp b/kcontrol/input/core/themepage.cpp
index eed2fd319..fb108e7c6 100644
--- a/kcontrol/input/core/themepage.cpp
+++ b/kcontrol/input/core/themepage.cpp
@@ -173,8 +173,8 @@ void ThemePage::fixCursorFile()
 	// override dir.
 	//
 	// Next, if the user wants large cursors, copy the font
-	// cursor_large.pcf.gz to (localkdedir)/share/fonts/override/cursor.pcf.gz.
-	// Else remove the font cursor.pcf.gz from (localkdedir)/share/fonts/override.
+	// cursor_large.pcf.gz to (localtdedir)/share/fonts/override/cursor.pcf.gz.
+	// Else remove the font cursor.pcf.gz from (localtdedir)/share/fonts/override.
 	//
 	// Run mkfontdir to update fonts.dir in that dir.
 
diff --git a/kcontrol/keys/shortcuts.cpp b/kcontrol/keys/shortcuts.cpp
index 3b17a69e1..c133d0de7 100644
--- a/kcontrol/keys/shortcuts.cpp
+++ b/kcontrol/keys/shortcuts.cpp
@@ -104,7 +104,7 @@ TQString ShortcutsModule::quickHelp() const
 
 void ShortcutsModule::initGUI()
 {
-	TQString kde_winkeys_env_dir = KGlobal::dirs()->localkdedir() + "/env/";
+	TQString kde_winkeys_env_dir = KGlobal::dirs()->localtdedir() + "/env/";
 
 	kdDebug(125) << "A-----------" << endl;
 	KAccelActions* keys = &m_actionsGeneral;
@@ -458,7 +458,7 @@ void ShortcutsModule::slotRemoveScheme()
 
 void ShortcutsModule::slotUseRmWinKeysClicked()
 {
-	TQString kde_winkeys_env_dir = KGlobal::dirs()->localkdedir() + "/env/";
+	TQString kde_winkeys_env_dir = KGlobal::dirs()->localtdedir() + "/env/";
 
 	// See if ~/.trinity/env/win-key.sh exists
 	TQFile f( kde_winkeys_env_dir + "win-key.sh" );
diff --git a/kdm/ChangeLog b/kdm/ChangeLog
index dc990e4a6..c03c31e68 100644
--- a/kdm/ChangeLog
+++ b/kdm/ChangeLog
@@ -527,7 +527,7 @@ if they affect the configuration.
 
 1998-03-26  Stephan Kulow <[email protected]>
 
-	* Nuke -kdedir cmdline option and Kdedir resource
+	* Nuke -tdedir cmdline option and Kdedir resource
 
 1997-09-09  Steffen Hansen <[email protected]>
 
diff --git a/khotkeys/app/app.cpp b/khotkeys/app/app.cpp
index 3391ca1aa..c95043c9e 100644
--- a/khotkeys/app/app.cpp
+++ b/khotkeys/app/app.cpp
@@ -96,7 +96,7 @@ int KDE_EXPORT kdemain( int argc, char** argv )
     {
         {
 	// multiheaded hotkeys
-        TQCString multiHead = getenv("KDE_MULTIHEAD");
+        TQCString multiHead = getenv("TDE_MULTIHEAD");
         if (multiHead.lower() == "true") {
 	    Display *dpy = XOpenDisplay(NULL);
 	    if (! dpy) {
diff --git a/khotkeys/kcontrol/init.cpp b/khotkeys/kcontrol/init.cpp
index 4bc587494..2278fa038 100644
--- a/khotkeys/kcontrol/init.cpp
+++ b/khotkeys/kcontrol/init.cpp
@@ -31,7 +31,7 @@ extern "C"
     // Non-xinerama multhead support in KDE is just a hack
     // involving forking apps per-screen. Don't bother with
     // kded modules in such case.
-    TQCString multiHead = getenv("KDE_MULTIHEAD");
+    TQCString multiHead = getenv("TDE_MULTIHEAD");
     if (multiHead.lower() == "true")
         kapp->tdeinitExec( "khotkeys" );
     else
diff --git a/kicker/kicker/core/main.cpp b/kicker/kicker/core/main.cpp
index 76e94a0e3..66740e6fe 100644
--- a/kicker/kicker/core/main.cpp
+++ b/kicker/kicker/core/main.cpp
@@ -57,7 +57,7 @@ static void sighandler(int)
 extern "C" KDE_EXPORT int kdemain( int argc, char ** argv )
 {
     {
-        TQCString multiHead = getenv("KDE_MULTIHEAD");
+        TQCString multiHead = getenv("TDE_MULTIHEAD");
         if (multiHead.lower() == "true") {
 	    Display *dpy = XOpenDisplay(NULL);
 	    if (! dpy) {
diff --git a/konqueror/konq_mainwindow.cc b/konqueror/konq_mainwindow.cc
index 38ed82e02..f08fc10db 100644
--- a/konqueror/konq_mainwindow.cc
+++ b/konqueror/konq_mainwindow.cc
@@ -5857,7 +5857,7 @@ bool KonqMainWindow::stayPreloaded()
     if( getenv( "TDE_FULL_SESSION" ) == NULL || getenv( "TDE_FULL_SESSION" )[ 0 ] == '\0' )
         return false;
     // not the same user like the one running the session (most likely we're run via sudo or something)
-    if( getenv( "KDE_SESSION_UID" ) != NULL && uid_t( atoi( getenv( "KDE_SESSION_UID" ))) != getuid())
+    if( getenv( "TDE_SESSION_UID" ) != NULL && uid_t( atoi( getenv( "TDE_SESSION_UID" ))) != getuid())
         return false;
     if( KonqSettings::maxPreloadCount() == 0 )
         return false;
diff --git a/starttde b/starttde
index 4949ccca2..92c5c0af2 100644
--- a/starttde
+++ b/starttde
@@ -111,9 +111,9 @@ else
 fi
 
 # Run a quick test for root.
-if [ -z "$KDEROOTHOME" ] && [ "$UID" = "0" ]; then
-  echo "[starttde] User ID is $UID. Setting KDEROOTHOME to $TDEHOME."
-  export KDEROOTHOME=$TDEHOME
+if [ -z "$TDEROOTHOME" ] && [ "$UID" = "0" ]; then
+  echo "[starttde] User ID is $UID. Setting TDEROOTHOME to $TDEHOME."
+  export TDEROOTHOME=$TDEHOME
 fi
 
 # Modify the following environment variables only as necessary.
@@ -162,18 +162,18 @@ if [ -d /opt/trinity ]; then
   fi
 fi
 
-test -n "$TDEHOME" && kdehome=`echo "$TDEHOME" | sed "s,^~/,$HOME/,"`
-echo "[starttde] kdehome: $kdehome" 1>&2
+test -n "$TDEHOME" && tdehome=`echo "$TDEHOME" | sed "s,^~/,$HOME/,"`
+echo "[starttde] tdehome: $tdehome" 1>&2
 
 # Allow interested applications, such as the Plasma control wrapper,
 # to know that this is a Trinity desktop and not a KDE one.
 export DESKTOP_SESSION=trinity
 
 # Please see kstartupconfig source for usage.
-mkdir -m 700 -p $kdehome
-mkdir -m 700 -p $kdehome/share
-mkdir -m 700 -p $kdehome/share/config
-cat >$kdehome/share/config/startupconfigkeys <<EOF
+mkdir -m 700 -p $tdehome
+mkdir -m 700 -p $tdehome/share
+mkdir -m 700 -p $tdehome/share/config
+cat >$tdehome/share/config/startupconfigkeys <<EOF
 kcminputrc Mouse cursorTheme ''
 kcminputrc Mouse cursorSize ''
 kpersonalizerrc General FirstLogin true
@@ -189,16 +189,16 @@ kstartupconfig
 if test $? -ne 0; then
   xmessage -geometry 500x100 "Could not start kstartupconfig. Check your installation."
 fi
-# $kdehome/share/config/startupconfig should exist but avoid script failure if not.
-if [ -r $kdehome/share/config/startupconfig ]; then
-  . $kdehome/share/config/startupconfig
+# $tdehome/share/config/startupconfig should exist but avoid script failure if not.
+if [ -r $tdehome/share/config/startupconfig ]; then
+  . $tdehome/share/config/startupconfig
 fi
 
 # Make sure a default wallpaper is set.
-if [ ! -e $kdehome/share/config/kdesktoprc ]; then
+if [ ! -e $tdehome/share/config/kdesktoprc ]; then
  # With Trinity KDE this file should exist, but test first.
   if [ -r /usr/share/wallpapers/isadora.png.desktop ]; then
-cat >$kdehome/share/config/kdesktoprc <<EOF
+cat >$tdehome/share/config/kdesktoprc <<EOF
 [Desktop0]
 Wallpaper=isadora.png
 WallpaperMode=Scaled
@@ -293,21 +293,21 @@ fi
 # Configuration of the gtk_qt_engine if not already set.
 
 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
+  tdedirs_first=`echo "$TDEDIRS" | sed -e 's/:.*//'`
+  KGTK_RC_ENGINE=$tdedirs_first/share/kgtk/gtk-qt-engine.rc.sh
+  KGTK_RC_KDE1=$tdedirs_first/share/kgtk/.gtkrc-2.0-kde4
+  KGTK_RC_KDE2=$tdedirs_first/share/kgtk/.gtkrc-2.0-kde-kde4
 else
   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 ]
+if [ ! -e $tdehome/env/gtk-qt-engine.rc.sh ] && [ -e $KGTK_RC_ENGINE ]
 then
- mkdir -p $kdehome/env
- cp -f $KGTK_RC_ENGINE $kdehome/env
- chmod 755 $kdehome/env/gtk-qt-engine.rc.sh
+ mkdir -p $tdehome/env
+ cp -f $KGTK_RC_ENGINE $tdehome/env
+ chmod 755 $tdehome/env/gtk-qt-engine.rc.sh
 fi
 
 if [ ! -e $HOME/.gtkrc-2.0-kde4 ] && [ -e $KGTK_RC_KDE1 ]
@@ -391,20 +391,20 @@ echo "[starttde] TDEDIR: $TDEDIR" 1>&2
 echo "[starttde] TDEDIRS: $TDEDIRS" 1>&2
 
 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
+  tdedirs_first=`echo "$TDEDIRS" | sed -e 's/:.*//'`
+  sys_odir=$tdedirs_first/share/fonts/override
+  sys_fdir=$tdedirs_first/share/fonts
 else
   sys_odir=$TDEDIR/share/fonts/override
   sys_fdir=$TDEDIR/share/fonts
 fi
 
 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
+  tdedirs_first=`echo "$TDEDIRS" | sed -e 's/:.*//'`
+  echo "[starttde] tdedirs_first: $tdedirs_first"
+  if [ -r $tdedirs_first/share/kgtk/preload ]; then
+    echo "[starttde] Reading from $tdedirs_first/share/kgtk/preload"
+    read -r KGTK_PRELOAD < $tdedirs_first/share/kgtk/preload
   fi
 else
   if [ -r $TDEDIR/share/kgtk/preload ]; then
@@ -498,9 +498,9 @@ if test "$kpersonalizerrc_general_firstlogin" = "true"; then
 fi
 
 # Remove moodin cache if we have a new wallpaper installed, jriddell. Distro-specific.
-if [ -d $kdehome/share/apps/ksplash/cache/Moodin/kubuntu ]; then
-  if [ /usr/share/wallpapers/kubuntu-wallpaper.png -nt $kdehome/share/apps/ksplash/cache/Moodin/kubuntu/ ]; then
-    rm -rf $kdehome/share/apps/ksplash/cache/Moodin/kubuntu/
+if [ -d $tdehome/share/apps/ksplash/cache/Moodin/kubuntu ]; then
+  if [ /usr/share/wallpapers/kubuntu-wallpaper.png -nt $tdehome/share/apps/ksplash/cache/Moodin/kubuntu/ ]; then
+    rm -rf $tdehome/share/apps/ksplash/cache/Moodin/kubuntu/
   fi
 fi
 
@@ -534,7 +534,7 @@ fi
 #     xprop -root | grep "^TDE_FULL_SESSION" >/dev/null 2>/dev/null
 #     if test $? -eq 0; then ... whatever
 #
-# Additionally there is (since KDE 3.5.7) $KDE_SESSION_UID with the uid
+# Additionally there is (since KDE 3.5.7) $TDE_SESSION_UID with the uid
 # of the user running the KDE session. It should be rarely needed (e.g.
 # after sudo to prevent desktop-wide functionality in the new user's kded).
 #
@@ -542,9 +542,9 @@ TDE_FULL_SESSION=true
 export TDE_FULL_SESSION
 xprop -root -f TDE_FULL_SESSION 8t -set TDE_FULL_SESSION true
 echo "[starttde] TDE_FULL_SESSION: $TDE_FULL_SESSION" 1>&2
-KDE_SESSION_UID=$UID
-export KDE_SESSION_UID
-echo "[starttde] KDE_SESSION_UID: $KDE_SESSION_UID" 1>&2
+TDE_SESSION_UID=$UID
+export TDE_SESSION_UID
+echo "[starttde] TDE_SESSION_UID: $TDE_SESSION_UID" 1>&2
 
 # We set LD_BIND_NOW to increase the efficiency of tdeinit.
 # tdeinit unsets this variable before loading applications.
@@ -613,7 +613,7 @@ done
 
 unset TDE_FULL_SESSION
 xprop -root -remove TDE_FULL_SESSION
-unset KDE_SESSION_UID
+unset TDE_SESSION_UID
 
 # Initialize_Status_Header
 echo "[starttde] Trinity shutdown complete." 1>&2
diff --git a/tdesu/tdesu/tdesu.cpp b/tdesu/tdesu/tdesu.cpp
index a91c6936a..65e1efc43 100644
--- a/tdesu/tdesu/tdesu.cpp
+++ b/tdesu/tdesu/tdesu.cpp
@@ -285,10 +285,10 @@ static int startApp()
     if (pw->pw_uid)
     {
        // Only propagate TDEHOME for non-root users,
-       // root uses KDEROOTHOME
+       // root uses TDEROOTHOME
        
        // Translate the TDEHOME of this user to the new user.
-       TQString kdeHome = KGlobal::dirs()->relativeLocation("home", KGlobal::dirs()->localkdedir());
+       TQString kdeHome = KGlobal::dirs()->relativeLocation("home", KGlobal::dirs()->localtdedir());
        if (kdeHome[0] != '/')
           kdeHome.prepend("~/"); 
        else
diff --git a/twin/events.cpp b/twin/events.cpp
index 45f4f6e35..fc6b77988 100644
--- a/twin/events.cpp
+++ b/twin/events.cpp
@@ -431,7 +431,7 @@ bool Workspace::workspaceEvent( XEvent * e )
                 return FALSE;
             break;
         case FocusIn:
-            if( e->xfocus.window == rootWin() && TQCString( getenv("KDE_MULTIHEAD")).lower() != "true"
+            if( e->xfocus.window == rootWin() && TQCString( getenv("TDE_MULTIHEAD")).lower() != "true"
                 && ( e->xfocus.detail == NotifyDetailNone || e->xfocus.detail == NotifyPointerRoot ))
                 {
                 updateXTime(); // focusToNull() uses qt_x_time, which is old now (FocusIn has no timestamp)
diff --git a/twin/main.cpp b/twin/main.cpp
index c30dc3601..5bb1be654 100644
--- a/twin/main.cpp
+++ b/twin/main.cpp
@@ -255,7 +255,7 @@ KDE_EXPORT int kdemain( int argc, char * argv[] )
         // we only do the multihead fork if we are not restored by the session
 	// manager, since the session manager will register multiple twins,
         // one for each screen...
-        TQCString multiHead = getenv("KDE_MULTIHEAD");
+        TQCString multiHead = getenv("TDE_MULTIHEAD");
         if (multiHead.lower() == "true") 
             {