Rename additional KDE strings

kded/kbuildsycoca.cpp

@@ -733,7 +733,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
    if (bGlobalDatabase)
    {
      setenv("TDEHOME", "-", 1);
-     setenv("KDEROOTHOME", "-", 1);
+     setenv("TDEROOTHOME", "-", 1);
    }
 
    KApplication::disableAutoDcopRegistration();

kded/kded.cpp

@@ -158,11 +158,11 @@ void Kded::initModules()
      KConfig *config = kapp->config();
      bool kde_running = !( getenv( "TDE_FULL_SESSION" ) == NULL || getenv( "TDE_FULL_SESSION" )[ 0 ] == '\0' );
     // 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())
         kde_running = false;
      // Preload kded modules.
      KService::List kdedModules = KServiceType::offers("KDEDModule");
-     TQString version = getenv( "KDE_SESSION_VERSION" );
+     TQString version = getenv( "TDE_SESSION_VERSION" );
      TQStringList blacklist;
      if ( version >= "4" )
      {

kded/khostname.cpp

@@ -299,8 +299,8 @@ void KHostName::changeDcop()
 void KHostName::changeStdDirs(const TQCString &type)
 {
    // We make links to the old dirs cause we can't delete the old dirs.
-   TQCString oldDir = TQFile::encodeName(TQString("%1%2-%3").arg(KGlobal::dirs()->localkdedir()).arg(type.data()).arg(oldName.data()));
-   TQCString newDir = TQFile::encodeName(TQString("%1%2-%3").arg(KGlobal::dirs()->localkdedir()).arg(type.data()).arg(newName.data()));
+   TQCString oldDir = TQFile::encodeName(TQString("%1%2-%3").arg(KGlobal::dirs()->localtdedir()).arg(type.data()).arg(oldName.data()));
+   TQCString newDir = TQFile::encodeName(TQString("%1%2-%3").arg(KGlobal::dirs()->localtdedir()).arg(type.data()).arg(newName.data()));
 
    KDE_struct_stat st_buf;
 

kinit/autostart.cpp

@@ -143,7 +143,7 @@ AutoStart::loadAutoStartList()
            localit != files.end();
            ++localit)
        {
-           if (((*localit).startsWith(KGlobal::dirs()->localxdgconfdir()) == true) || ((*localit).startsWith(KGlobal::dirs()->localkdedir()) == true)) {
+           if (((*localit).startsWith(KGlobal::dirs()->localxdgconfdir()) == true) || ((*localit).startsWith(KGlobal::dirs()->localtdedir()) == true)) {
                // Same local file name?
                TQString localOuter;
                TQString localInner;

kinit/kstartupconfig.cpp

@@ -75,25 +75,25 @@ Otherwise kdostartupconfig is launched to create or update all the necessary fil
 
 int main()
     {
-    char kdehome[ 1024 ];
+    char tdehome[ 1024 ];
     if( getenv( "TDEHOME" ))
-        strlcpy( kdehome, getenv( "TDEHOME" ), 1024 );
+        strlcpy( tdehome, getenv( "TDEHOME" ), 1024 );
     else if( getenv( "HOME" ))
         {
-        strlcpy( kdehome, getenv( "HOME" ), 1024 );
-        strlcat( kdehome, "/.trinity", 1024  );
+        strlcpy( tdehome, getenv( "HOME" ), 1024 );
+        strlcat( tdehome, "/.trinity", 1024  );
         }
     else
         return 1;
     char filename[ 1024 ];
-    strlcpy( filename, kdehome, 1024 );
+    strlcpy( filename, tdehome, 1024 );
     strlcat( filename, "/share/config/startupconfig", 1024 );
     if( access( filename, R_OK ) != 0 )
         {
         int ret = system( "kdostartupconfig" );
         return WEXITSTATUS( ret );
         }
-    strlcpy( filename, kdehome, 1024 );
+    strlcpy( filename, tdehome, 1024 );
     strlcat( filename, "/share/config/startupconfigfiles", 1024 );
     struct stat st;
     if( stat( filename, &st ) != 0 )
@@ -108,7 +108,7 @@ int main()
         int ret = system( "kdostartupconfig" );
         return WEXITSTATUS( ret );
         }
-    strlcpy( filename, kdehome, 1024 );
+    strlcpy( filename, tdehome, 1024 );
     strlcat( filename, "/share/config/startupconfigkeys", 1024 );
     FILE* keys = fopen( filename, "r" );
     if( keys == NULL )

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("TDEHOME") : getenv("KDEROOTHOME");
+  const char *kde_home = uid ? getenv("TDEHOME") : getenv("TDEROOTHOME");
   int result;
   struct stat stat_buf;
 

kio/tests/kurifiltertest.cpp

@@ -290,7 +290,7 @@ int main(int argc, char **argv)
 
     TQCString qtdir=getenv("QTDIR");
     TQCString home = getenv("HOME");
-    TQCString kdehome = getenv("TDEHOME");
+    TQCString tdehome = getenv("TDEHOME");
 
     filter( "$SOMEVAR/tdelibs/kio", 0, KURIFilterData::ERROR ); // note: this dir doesn't exist...
     filter( "$ETC/passwd", "/etc/passwd", KURIFilterData::LOCAL_FILE );
@@ -298,32 +298,32 @@ int main(int argc, char **argv)
     filter( "http://www.kde.org/$USER", "http://www.kde.org/$USER", KURIFilterData::NET_PROTOCOL ); // no expansion
 
     // Assume the default (~/.kde) if
-    if (kdehome.isEmpty())
+    if (tdehome.isEmpty())
     {
-      kdehome += "$HOME/.kde";
-      setenv("TDEHOME", kdehome.data(), 0);
+      tdehome += "$HOME/.kde";
+      setenv("TDEHOME", tdehome.data(), 0);
     }
 
-    filter( "$TDEHOME/share", kdehome+"/share", KURIFilterData::LOCAL_DIR );
-    KStandardDirs::makeDir( kdehome+"/a+plus" );
-    filter( "$TDEHOME/a+plus", kdehome+"/a+plus", KURIFilterData::LOCAL_DIR );
+    filter( "$TDEHOME/share", tdehome+"/share", KURIFilterData::LOCAL_DIR );
+    KStandardDirs::makeDir( tdehome+"/a+plus" );
+    filter( "$TDEHOME/a+plus", tdehome+"/a+plus", KURIFilterData::LOCAL_DIR );
 
     // BR 27788
-    KStandardDirs::makeDir( kdehome+"/share/Dir With Space" );
-    filter( "$TDEHOME/share/Dir With Space", kdehome+"/share/Dir With Space", KURIFilterData::LOCAL_DIR );
+    KStandardDirs::makeDir( tdehome+"/share/Dir With Space" );
+    filter( "$TDEHOME/share/Dir With Space", tdehome+"/share/Dir With Space", KURIFilterData::LOCAL_DIR );
 
     // support for name filters (BR 93825)
-    filter( "$TDEHOME/*.txt", kdehome+"/*.txt", KURIFilterData::LOCAL_DIR );
-    filter( "$TDEHOME/[a-b]*.txt", kdehome+"/[a-b]*.txt", KURIFilterData::LOCAL_DIR );
-    filter( "$TDEHOME/a?c.txt", kdehome+"/a?c.txt", KURIFilterData::LOCAL_DIR );
-    filter( "$TDEHOME/?c.txt", kdehome+"/?c.txt", KURIFilterData::LOCAL_DIR );
+    filter( "$TDEHOME/*.txt", tdehome+"/*.txt", KURIFilterData::LOCAL_DIR );
+    filter( "$TDEHOME/[a-b]*.txt", tdehome+"/[a-b]*.txt", KURIFilterData::LOCAL_DIR );
+    filter( "$TDEHOME/a?c.txt", tdehome+"/a?c.txt", KURIFilterData::LOCAL_DIR );
+    filter( "$TDEHOME/?c.txt", tdehome+"/?c.txt", KURIFilterData::LOCAL_DIR );
     // but let's check that a directory with * in the name still works
-    KStandardDirs::makeDir( kdehome+"/share/Dir*With*Stars" );
-    filter( "$TDEHOME/share/Dir*With*Stars", kdehome+"/share/Dir*With*Stars", KURIFilterData::LOCAL_DIR );
-    KStandardDirs::makeDir( kdehome+"/share/Dir?QuestionMark" );
-    filter( "$TDEHOME/share/Dir?QuestionMark", kdehome+"/share/Dir?QuestionMark", KURIFilterData::LOCAL_DIR );
-    KStandardDirs::makeDir( kdehome+"/share/Dir[Bracket" );
-    filter( "$TDEHOME/share/Dir[Bracket", kdehome+"/share/Dir[Bracket", KURIFilterData::LOCAL_DIR );
+    KStandardDirs::makeDir( tdehome+"/share/Dir*With*Stars" );
+    filter( "$TDEHOME/share/Dir*With*Stars", tdehome+"/share/Dir*With*Stars", KURIFilterData::LOCAL_DIR );
+    KStandardDirs::makeDir( tdehome+"/share/Dir?QuestionMark" );
+    filter( "$TDEHOME/share/Dir?QuestionMark", tdehome+"/share/Dir?QuestionMark", KURIFilterData::LOCAL_DIR );
+    KStandardDirs::makeDir( tdehome+"/share/Dir[Bracket" );
+    filter( "$TDEHOME/share/Dir[Bracket", tdehome+"/share/Dir[Bracket", KURIFilterData::LOCAL_DIR );
 
     filter( "$HOME/$TDEDIR/tdebase/kcontrol/ebrowsing", 0, KURIFilterData::ERROR );
     filter( "$1/$2/$3", "http://www.google.com/search?q=$1/$2/$3&ie=UTF-8&oe=UTF-8", KURIFilterData::NET_PROTOCOL );  // can be used as bogus or valid test. Currently triggers default search, i.e. google
@@ -349,12 +349,12 @@ int main(int argc, char **argv)
     filter( sc.sprintf("gg%cпрйвет", delimiter) /* greetings in russian utf-8*/, "http://www.google.com/search?q=%D0%BF%D1%80%D0%B9%D0%B2%D0%B5%D1%82&ie=UTF-8&oe=UTF-8", KURIFilterData::NET_PROTOCOL );
 
     // Absolute Path tests for kshorturifilter
-    filter( "./", kdehome+"/share", KURIFilterData::LOCAL_DIR, "kshorturifilter", kdehome+"/share/" ); // cleanDirPath removes the trailing slash
-    filter( "../", kdehome, KURIFilterData::LOCAL_DIR, "kshorturifilter", kdehome+"/share" );
-    filter( "config", kdehome+"/share/config", KURIFilterData::LOCAL_DIR, "kshorturifilter", kdehome+"/share" );
+    filter( "./", tdehome+"/share", KURIFilterData::LOCAL_DIR, "kshorturifilter", tdehome+"/share/" ); // cleanDirPath removes the trailing slash
+    filter( "../", tdehome, KURIFilterData::LOCAL_DIR, "kshorturifilter", tdehome+"/share" );
+    filter( "config", tdehome+"/share/config", KURIFilterData::LOCAL_DIR, "kshorturifilter", tdehome+"/share" );
 
     // Clean up
-    KIO::NetAccess::del( kdehome, 0 );
+    KIO::NetAccess::del( tdehome, 0 );
 
     kdDebug() << "All tests done. Go home..." << endl;
     return 0;

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

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;
     }
 

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;
     }
 

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");
     }

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();

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

tdeprint/kmspecialmanager.cpp

@@ -47,7 +47,7 @@ bool KMSpecialManager::savePrinters()
 	if (getuid() == 0)
 	{
 		confname = locate("data", "tdeprint/specials.desktop");
-		if (confname.startsWith(KGlobal::dirs()->localkdedir()))
+		if (confname.startsWith(KGlobal::dirs()->localtdedir()))
 		{
 			// seems there's a problem here
 			m_mgr->setErrorMsg(i18n("A file share/tdeprint/specials.desktop was found in your "
@@ -107,7 +107,7 @@ bool KMSpecialManager::loadPrinters()
 	if (m_loaded) return true;
 
 	bool	result(true);
-	TQString	localDir = KGlobal::dirs()->localkdedir();
+	TQString	localDir = KGlobal::dirs()->localtdedir();
 	TQStringList	files = KGlobal::dirs()->findAllResources("data", "tdeprint/specials.desktop");
 	// local files should processed last, so we need to reorder the list
 	// and put local files at the end