Rename additional KDE strings

6 files changed, 29 insertions, 29 deletions

diff --git a/tdecore/kapplication.cpp b/tdecore/kapplication.cpp
index 5338cfccd..878b6e12f 100644
--- a/tdecore/kapplication.cpp
+++ b/tdecore/kapplication.cpp
@@ -1332,8 +1332,8 @@ static void checkRestartVersion( TQSessionManager& sm )
         0, 1, False, AnyPropertyType, &type, &format, &nitems, &after, &data ) == Success ) {
         if( data != NULL )
             XFree( data );
-        if( type == XA_STRING && format == 8 ) { // session set, check if KDE_SESSION_VERSION is not set (meaning KDE3)
-            if( XGetWindowProperty( dpy, RootWindow( dpy, 0 ), XInternAtom( dpy, "KDE_SESSION_VERSION", False ),
+        if( type == XA_STRING && format == 8 ) { // session set, check if TDE_SESSION_VERSION is not set (meaning KDE3)
+            if( XGetWindowProperty( dpy, RootWindow( dpy, 0 ), XInternAtom( dpy, "TDE_SESSION_VERSION", False ),
                 0, 1, False, AnyPropertyType, &type, &format, &nitems, &after, &data ) == Success ) {
                 if( data != NULL )
                     XFree( data ); // KDE4 or newer
@@ -1385,7 +1385,7 @@ void KApplication::saveState( TQSessionManager& sm )
     // tell the session manager about our new lifecycle
     TQStringList restartCommand = sm.restartCommand();
 
-    TQCString multiHead = getenv("KDE_MULTIHEAD");
+    TQCString multiHead = getenv("TDE_MULTIHEAD");
     if (multiHead.lower() == "true") {
         // if multihead is enabled, we save our -display argument so that
         // we are restored onto the correct head... one problem with this
diff --git a/tdecore/kde-config.cpp.cmake b/tdecore/kde-config.cpp.cmake
index 0f6d286d5..3a042705d 100644
--- a/tdecore/kde-config.cpp.cmake
+++ b/tdecore/kde-config.cpp.cmake
@@ -150,7 +150,7 @@ int main(int argc, char **argv)
 
     if (args->isSet("localprefix"))
     {
-        printResult(KGlobal::dirs()->localkdedir());
+        printResult(KGlobal::dirs()->localtdedir());
         return 0;
     }
 
diff --git a/tdecore/kde-config.cpp.in b/tdecore/kde-config.cpp.in
index 9699c28b0..4accfbc85 100644
--- a/tdecore/kde-config.cpp.in
+++ b/tdecore/kde-config.cpp.in
@@ -150,7 +150,7 @@ int main(int argc, char **argv)
 
     if (args->isSet("localprefix"))
     {
-        printResult(KGlobal::dirs()->localkdedir());
+        printResult(KGlobal::dirs()->localtdedir());
         return 0;
     }
 
diff --git a/tdecore/kglobalsettings.cpp b/tdecore/kglobalsettings.cpp
index 6ff632f9e..d539f56c9 100644
--- a/tdecore/kglobalsettings.cpp
+++ b/tdecore/kglobalsettings.cpp
@@ -553,7 +553,7 @@ void KGlobalSettings::initStatic() // should be called initPaths(). Don't put an
     }
 
     // Autostart Path
-    *s_autostartPath = KGlobal::dirs()->localkdedir() + "Autostart/";
+    *s_autostartPath = KGlobal::dirs()->localtdedir() + "Autostart/";
     *s_autostartPath = g.readPathEntry( "Autostart" , *s_autostartPath);
     *s_autostartPath = TQDir::cleanDirPath( *s_autostartPath );
     if ( !s_autostartPath->endsWith("/") )
@@ -668,7 +668,7 @@ bool KGlobalSettings::isMultiHead()
 #ifdef Q_WS_WIN
     return GetSystemMetrics(SM_CMONITORS) > 1;
 #else
-    TQCString multiHead = getenv("KDE_MULTIHEAD");
+    TQCString multiHead = getenv("TDE_MULTIHEAD");
     if (!multiHead.isEmpty()) {
         return (multiHead.lower() == "true");
     }
diff --git a/tdecore/kstandarddirs.cpp b/tdecore/kstandarddirs.cpp
index a0b25dcbb..038b5ce06 100644
--- a/tdecore/kstandarddirs.cpp
+++ b/tdecore/kstandarddirs.cpp
@@ -723,7 +723,7 @@ void KStandardDirs::createSpecialResource(const char *type)
        strlcpy(hostname, getenv("XAUTHLOCALHOSTNAME"), 255 );
    else
        gethostname(hostname, 255);
-   TQString dir = TQString("%1%2-%3").arg(localkdedir()).arg(type).arg(hostname);
+   TQString dir = TQString("%1%2-%3").arg(localtdedir()).arg(type).arg(hostname);
    char link[1024];
    link[1023] = 0;
    int result = readlink(TQFile::encodeName(dir).data(), link, 1023);
@@ -1113,7 +1113,7 @@ TQString KStandardDirs::saveLocation(const char *type,
           else if (strncmp(type, "xdgconf-", 8) == 0)
              pPath = new TQString(realPath(localxdgconfdir() + dirs->last()));
           else
-             pPath = new TQString(realPath(localkdedir() + dirs->last()));
+             pPath = new TQString(realPath(localtdedir() + dirs->last()));
        }
        else {
           dirs = absolutes.find(type);
@@ -1285,44 +1285,44 @@ TQString KStandardDirs::kfsstnd_defaultbindir()
 
 void KStandardDirs::addKDEDefaults()
 {
-    TQStringList kdedirList;
+    TQStringList tdedirList;
 
     // begin TDEDIRS
-    TQString kdedirs = readEnvPath("TDEDIRS");
-    if (!kdedirs.isEmpty())
+    TQString tdedirs = readEnvPath("TDEDIRS");
+    if (!tdedirs.isEmpty())
     {
-        tokenize(kdedirList, kdedirs, TQChar(KPATH_SEPARATOR));
+        tokenize(tdedirList, tdedirs, TQChar(KPATH_SEPARATOR));
     }
     else
     {
-        TQString kdedir = readEnvPath("TDEDIR");
-        if (!kdedir.isEmpty())
+        TQString tdedir = readEnvPath("TDEDIR");
+        if (!tdedir.isEmpty())
         {
-           kdedir = KShell::tildeExpand(kdedir);
-           kdedirList.append(kdedir);
+           tdedir = KShell::tildeExpand(tdedir);
+           tdedirList.append(tdedir);
         }
     }
 
 #ifndef Q_OS_WIN //no default TDEDIR on win32 defined
-    kdedirList.append(TDEDIR);
+    tdedirList.append(TDEDIR);
 #endif
 
 #ifdef __KDE_EXECPREFIX
     TQString execPrefix(__KDE_EXECPREFIX);
     if (execPrefix!="NONE")
-       kdedirList.append(execPrefix);
+       tdedirList.append(execPrefix);
 #endif
 #ifdef __linux__
     const TQString linuxExecPrefix = executablePrefix();
     if ( !linuxExecPrefix.isEmpty() )
-       kdedirList.append( linuxExecPrefix );
+       tdedirList.append( linuxExecPrefix );
 #endif
 
     // We treat root differently to prevent a "su" shell messing up the
     // file permissions in the user's home directory.
     TQString localKdeDir;
     if (getuid() == 0) {
-      localKdeDir = readEnvPath("KDEROOTHOME");
+      localKdeDir = readEnvPath("TDEROOTHOME");
       if (localKdeDir.isEmpty() == true)
         localKdeDir = readEnvPath("TDEHOME");
     }
@@ -1345,8 +1345,8 @@ void KStandardDirs::addKDEDefaults()
         addPrefix(localKdeDir);
     }
 
-	TQStringList::ConstIterator end(kdedirList.end());
-    for (TQStringList::ConstIterator it = kdedirList.begin();
+	TQStringList::ConstIterator end(tdedirList.end());
+    for (TQStringList::ConstIterator it = tdedirList.begin();
 	 it != end; ++it)
     {
         TQString dir = KShell::tildeExpand(*it);
@@ -1403,8 +1403,8 @@ void KStandardDirs::addKDEDefaults()
     else
     {
 	xdgdirList.clear();
-        for (TQStringList::ConstIterator it = kdedirList.begin();
-           it != kdedirList.end(); ++it)
+        for (TQStringList::ConstIterator it = tdedirList.begin();
+           it != tdedirList.end(); ++it)
         {
            TQString dir = *it;
            if (dir[dir.length()-1] != QChar('/'))
@@ -1657,7 +1657,7 @@ bool KStandardDirs::addCustomized(KConfig *config)
     return configDirsChanged;
 }
 
-TQString KStandardDirs::localkdedir() const
+TQString KStandardDirs::localtdedir() const
 {
     // Return the prefix to use for saving
     return prefixes.first();
diff --git a/tdecore/kstandarddirs.h b/tdecore/kstandarddirs.h
index 6d695c175..e1e56bcb3 100644
--- a/tdecore/kstandarddirs.h
+++ b/tdecore/kstandarddirs.h
@@ -115,8 +115,8 @@ class KStandardDirsPrivate;
  * @li TDEHOME: The directory where changes are saved to. This directory is
  *          used to search for resources first. If TDEHOME is not
  *          specified it defaults to "$HOME/.kde"
- * @li KDEROOTHOME: Like TDEHOME, but used for the root user.
- *          If KDEROOTHOME is not set it defaults to the .kde directory in the
+ * @li TDEROOTHOME: Like TDEHOME, but used for the root user.
+ *          If TDEROOTHOME is not set it defaults to the .kde directory in the
  *          home directory of root, usually "/root/.kde".
  *          Note that the setting of $HOME is ignored in this case.
  *
@@ -550,7 +550,7 @@ public:
 	 * Don't use this function if you can use locateLocal
 	 * @return the toplevel directory
 	 */
-	TQString localkdedir() const;
+	TQString localtdedir() const;
 
 	/**
 	 * @internal