Rename straggling environment variables KDE->TDE.

33 files changed, 95 insertions, 95 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 47d5b258b..113c618c1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -62,9 +62,9 @@ add_custom_target(install-apidox
 
 OPTION( WITH_ALL_OPTIONS "Enable all optional support" OFF )
 
-OPTION( KDE_MALLOC "Use own malloc implementation" OFF )
-OPTION( KDE_MALLOC_DEBUG "Enable debugging in fast malloc" OFF )
-OPTION( KDE_MALLOC_FULL "Make alloc as fast as possible" OFF )
+OPTION( TDE_MALLOC "Use own malloc implementation" OFF )
+OPTION( TDE_MALLOC_DEBUG "Enable debugging in fast malloc" OFF )
+OPTION( TDE_MALLOC_FULL "Make alloc as fast as possible" OFF )
 
 OPTION( WITH_ARTS "Build with aRts" ON )
 OPTION( WITH_ALSA "Enable ALSA support" ON )
@@ -97,12 +97,12 @@ set( ENV{PKG_CONFIG_PATH} "${PKG_CONFIG_PATH}:${PKGCONFIG_INSTALL_DIR}:${LIB_INS
 
 ### FIXME fast malloc is also available on x86_64 architecture?
 if( ${CMAKE_SYSTEM_PROCESSOR} MATCHES "i?86" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64" )
-  set( KDE_MALLOC_X86 1 )
+  set( TDE_MALLOC_X86 1 )
   message( STATUS "Found x86 architecture" )
 else( ${CMAKE_SYSTEM_PROCESSOR} MATCHES "i?86" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64" )
-  if( KDE_MALLOC )
+  if( TDE_MALLOC )
     message( FATAL_ERROR "\nKDE fast malloc is available only on x86 architecture" )
-  endif( KDE_MALLOC )
+  endif( TDE_MALLOC )
 endif( ${CMAKE_SYSTEM_PROCESSOR} MATCHES "i?86" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64" )
 
 
diff --git a/DEBUG b/DEBUG
index f2a1d3622..47a8fe871 100644
--- a/DEBUG
+++ b/DEBUG
@@ -174,8 +174,8 @@ If you want to have a core dump after your application crashes you need to
 do two things:
 
 1) Disable the TDE crash handler. This can be done either by using the 
---nocrashhandler command line option or by setting the KDE_DEBUG environment
-variable to some value e.g. KDE_DEBUG=true.
+--nocrashhandler command line option or by setting the TDE_DEBUG environment
+variable to some value e.g. TDE_DEBUG=true.
 
 2) Enable core dump generation by changing the so called 'ulimits' with the
 following command: 
diff --git a/config.h.cmake b/config.h.cmake
index 4e4bd18b8..1237494f5 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -720,19 +720,19 @@
 #define KDE_DISTRIBUTION_TEXT "@KDE_DISTRIBUTION_TEXT@"
 
 /* Use own malloc implementation */
-#cmakedefine KDE_MALLOC 1
+#cmakedefine TDE_MALLOC 1
 
 /* Enable debugging in fast malloc */
-#cmakedefine KDE_MALLOC_DEBUG 1
+#cmakedefine TDE_MALLOC_DEBUG 1
 
 /* Make alloc as fast as possible */
-#cmakedefine KDE_MALLOC_FULL 1
+#cmakedefine TDE_MALLOC_FULL 1
 
 /* The libc used is glibc */
-#undef KDE_MALLOC_GLIBC
+#undef TDE_MALLOC_GLIBC
 
 /* The platform is x86 */
-#cmakedefine KDE_MALLOC_X86 1
+#cmakedefine TDE_MALLOC_X86 1
 
 /* Define if we shall use KSSL */
 #cmakedefine KSSL_HAVE_SSL 1
@@ -1093,8 +1093,8 @@ int snprintf(char *str, size_t n, char const *fmt, ...);
 #endif
 
 
-/* KDE bindir */
-#define __KDE_BINDIR "@BIN_INSTALL_DIR@"
+/* TDE bindir */
+#define __TDE_BINDIR "@BIN_INSTALL_DIR@"
 
 /* execprefix or NONE if not set, for libloading */
 #undef __KDE_EXECPREFIX
diff --git a/kate/part/test_regression.cpp b/kate/part/test_regression.cpp
index 9e56bcbe9..de89e0996 100644
--- a/kate/part/test_regression.cpp
+++ b/kate/part/test_regression.cpp
@@ -535,7 +535,7 @@ int main(int argc, char *argv[])
     // we're not interested
     toplevel->statusBar()->hide();
 
-    if (!getenv("KDE_DEBUG")) {
+    if (!getenv("TDE_DEBUG")) {
         // set ulimits
         rlimit vmem_limit = { 256*1024*1024, RLIM_INFINITY };	// 256Mb Memory should suffice
         setrlimit(RLIMIT_AS, &vmem_limit);
diff --git a/kded/kbuildsycoca.cpp b/kded/kbuildsycoca.cpp
index 1b84b196c..e075fdca8 100644
--- a/kded/kbuildsycoca.cpp
+++ b/kded/kbuildsycoca.cpp
@@ -108,7 +108,7 @@ static TQString sycocaPath()
   }
   else
   {
-     TQCString ksycoca_env = getenv("KDESYCOCA");
+     TQCString ksycoca_env = getenv("TDESYCOCA");
      if (ksycoca_env.isEmpty())
         path = KGlobal::dirs()->saveLocation("cache")+"ksycoca";
      else
@@ -120,7 +120,7 @@ static TQString sycocaPath()
 
 static TQString oldSycocaPath()
 {
-  TQCString ksycoca_env = getenv("KDESYCOCA");
+  TQCString ksycoca_env = getenv("TDESYCOCA");
   if (ksycoca_env.isEmpty())
      return KGlobal::dirs()->saveLocation("tmp")+"ksycoca";
 
diff --git a/kded/kded.cpp b/kded/kded.cpp
index 5fa0bd867..b87d2bb87 100644
--- a/kded/kded.cpp
+++ b/kded/kded.cpp
@@ -104,7 +104,7 @@ Kded::Kded(bool checkUpdates, bool new_startup)
 {
   _self = this;
   TQCString cPath;
-  TQCString ksycoca_env = getenv("KDESYCOCA");
+  TQCString ksycoca_env = getenv("TDESYCOCA");
   if (ksycoca_env.isEmpty())
      cPath = TQFile::encodeName(KGlobal::dirs()->saveLocation("tmp")+"ksycoca");
   else
diff --git a/khtml/test_regression.cpp b/khtml/test_regression.cpp
index 5a60bbd19..069ade04f 100644
--- a/khtml/test_regression.cpp
+++ b/khtml/test_regression.cpp
@@ -578,7 +578,7 @@ int main(int argc, char *argv[])
     // we're not interested
     toplevel->statusBar()->hide();
 
-    if (!getenv("KDE_DEBUG")) {
+    if (!getenv("TDE_DEBUG")) {
         // set ulimits
         rlimit vmem_limit = { 256*1024*1024, RLIM_INFINITY };	// 256Mb Memory should suffice
         setrlimit(RLIMIT_AS, &vmem_limit);
diff --git a/kinit/kinit.cpp b/kinit/kinit.cpp
index 3c03f78e8..9962c9867 100644
--- a/kinit/kinit.cpp
+++ b/kinit/kinit.cpp
@@ -590,7 +590,7 @@ static pid_t launch(int argc, const char *_name, const char *args,
         exitWithErrorMsg(errorMsg);
      }
 
-     if ( getenv("KDE_IS_PRELINKED") && !execpath.isEmpty() && !launcher)
+     if ( getenv("TDE_IS_PRELINKED") && !execpath.isEmpty() && !launcher)
          libpath.truncate(0);
 
      if ( !libpath.isEmpty() )
@@ -838,7 +838,7 @@ static void init_tdeinit_socket()
 
   {
      TQCString path = home_dir;
-     TQCString readOnly = getenv("KDE_HOME_READONLY");
+     TQCString readOnly = getenv("TDE_HOME_READONLY");
      if (access(path.data(), R_OK|W_OK))
      {
        if (errno == ENOENT)
@@ -1227,7 +1227,7 @@ static void handle_launcher_request(int sock = -1)
 
       // support for the old a bit broken way of setting DISPLAY for multihead
       TQCString olddisplay = getenv(DISPLAY);
-      TQCString kdedisplay = getenv("KDE_DISPLAY");
+      TQCString kdedisplay = getenv("TDE_DISPLAY");
       bool reset_display = (! olddisplay.isEmpty() &&
                             ! kdedisplay.isEmpty() &&
                             olddisplay != kdedisplay);
@@ -1240,7 +1240,7 @@ static void handle_launcher_request(int sock = -1)
           tty, avoid_loops, startup_id_str );
 
       if (reset_display) {
-          unsetenv("KDE_DISPLAY");
+          unsetenv("TDE_DISPLAY");
           setenv(DISPLAY, olddisplay, true);
       }
 
@@ -1804,7 +1804,7 @@ int main(int argc, char **argv, char **envp)
       }
    }
 #ifndef __CYGWIN__
-   if (!d.suicide && !getenv("KDE_IS_PRELINKED"))
+   if (!d.suicide && !getenv("TDE_IS_PRELINKED"))
    {
       TQString konq = locate("lib", "libkonq.la", s_instance);
       if (!konq.isEmpty())
diff --git a/kinit/klauncher.cpp b/kinit/klauncher.cpp
index ab9bd063f..2d706e36b 100644
--- a/kinit/klauncher.cpp
+++ b/kinit/klauncher.cpp
@@ -207,15 +207,15 @@ KLauncher::KLauncher(int _tdeinitSocket, bool new_startup)
    lastRequest = 0;
    bProcessingQueue = false;
 
-   mSlaveDebug = getenv("KDE_SLAVE_DEBUG_WAIT");
+   mSlaveDebug = getenv("TDE_SLAVE_DEBUG_WAIT");
    if (!mSlaveDebug.isEmpty())
    {
       tqWarning("Klauncher running in slave-debug mode for slaves of protocol '%s'", mSlaveDebug.data());
    }
-   mSlaveValgrind = getenv("KDE_SLAVE_VALGRIND");
+   mSlaveValgrind = getenv("TDE_SLAVE_VALGRIND");
    if (!mSlaveValgrind.isEmpty())
    {
-      mSlaveValgrindSkin = getenv("KDE_SLAVE_VALGRIND_SKIN");
+      mSlaveValgrindSkin = getenv("TDE_SLAVE_VALGRIND_SKIN");
       tqWarning("Klauncher running slaves through valgrind for slaves of protocol '%s'", mSlaveValgrind.data());
    }
    klauncher_header request_header;
diff --git a/kio/kio/slave.cpp b/kio/kio/slave.cpp
index 4826c8da8..3a501d681 100644
--- a/kio/kio/slave.cpp
+++ b/kio/kio/slave.cpp
@@ -390,8 +390,8 @@ Slave* Slave::createSlave( const TQString &protocol, const KURL& url, int& error
     // for the slave to connect to the application.
     // In such case we start the slave via KProcess.
     // It's possible to force this by setting the env. variable
-    // KDE_FORK_SLAVES, Clearcase seems to require this.
-    static bool bForkSlaves = !TQCString(getenv("KDE_FORK_SLAVES")).isEmpty();
+    // TDE_FORK_SLAVES, Clearcase seems to require this.
+    static bool bForkSlaves = !TQCString(getenv("TDE_FORK_SLAVES")).isEmpty();
     
     if (bForkSlaves || !client->isAttached() || client->isAttachedToForeignServer())
     {
diff --git a/kio/kio/slavebase.cpp b/kio/kio/slavebase.cpp
index 6641f6e23..c237bd490 100644
--- a/kio/kio/slavebase.cpp
+++ b/kio/kio/slavebase.cpp
@@ -168,7 +168,7 @@ SlaveBase::SlaveBase( const TQCString &protocol,
 {
     s_protocol = protocol.data();
 #ifdef Q_OS_UNIX
-    if (!getenv("KDE_DEBUG"))
+    if (!getenv("TDE_DEBUG"))
     {
         KCrash::setCrashHandler( sigsegv_handler );
         signal(SIGILL,&sigsegv_handler);
diff --git a/kio/tests/kurifiltertest.cpp b/kio/tests/kurifiltertest.cpp
index c448cca90..a1ebf2e46 100644
--- a/kio/tests/kurifiltertest.cpp
+++ b/kio/tests/kurifiltertest.cpp
@@ -156,7 +156,7 @@ int main(int argc, char **argv)
     // Ensure that user configuration doesn't change the results of those tests
     // TDEHOME needs to be writable though, for a ksycoca database
     setenv( "TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.kde-kurifiltertest" ), true );
-    setenv( "KDE_FORK_SLAVES", "yes", true ); // simpler, for the final cleanup
+    setenv( "TDE_FORK_SLAVES", "yes", true ); // simpler, for the final cleanup
 
     KAboutData aboutData(appName, programName, version, description);
     KCmdLineArgs::init(argc, argv, &aboutData);
diff --git a/tdecore/configure.in.in b/tdecore/configure.in.in
index ce957c92b..d7ef1cd08 100644
--- a/tdecore/configure.in.in
+++ b/tdecore/configure.in.in
@@ -7,7 +7,7 @@ if test "$exec_prefix" = "NONE"; then
 else
     bindir_str="\"$exec_prefix/bin\""
 fi
-AC_DEFINE_UNQUOTED(__KDE_BINDIR, $bindir_str, [KDE bindir])
+AC_DEFINE_UNQUOTED(__TDE_BINDIR, $bindir_str, [TDE bindir])
 
 dnl tests for openpty support
 AC_MSG_CHECKING(whether we can use openpty)
diff --git a/tdecore/kapplication.cpp b/tdecore/kapplication.cpp
index e7995d8b2..af421302f 100644
--- a/tdecore/kapplication.cpp
+++ b/tdecore/kapplication.cpp
@@ -920,7 +920,7 @@ void KApplication::init(bool GUIenabled)
   // * We use kdialog to warn the user, so we better not generate warnings from
   //   kdialog itself.
   // * Don't warn if we run with a read-only $HOME
-  TQCString readOnly = getenv("KDE_HOME_READONLY");
+  TQCString readOnly = getenv("TDE_HOME_READONLY");
   if (readOnly.isEmpty() && (tqstrcmp(name(), "kdialog") != 0))
   {
     KConfigGroupSaver saver(config, "KDE Action Restrictions");
@@ -1642,7 +1642,7 @@ void KApplication::parseCommandLine( )
        }
     }
 
-    bool nocrashhandler = (getenv("KDE_DEBUG") != NULL);
+    bool nocrashhandler = (getenv("TDE_DEBUG") != NULL);
     if (!nocrashhandler && args->isSet("crashhandler"))
     {
         // set default crash handler / set emergency save function to nothing
diff --git a/tdecore/kextsock.cpp b/tdecore/kextsock.cpp
index fc398ef2a..cd74f9ad0 100644
--- a/tdecore/kextsock.cpp
+++ b/tdecore/kextsock.cpp
@@ -147,7 +147,7 @@ static bool process_flags(int flags, int& socktype, int& familyMask, int& outfla
     (flags & KExtendedSocket::canonName ? KResolver::CanonName : 0) |
     (flags & KExtendedSocket::noResolve ? KResolver::NoResolve : 0);
 
-  if (getenv("KDE_NO_IPV6"))
+  if (getenv("TDE_NO_IPV6"))
     familyMask &= ~KResolver::IPv6Family;
 
   return true;
diff --git a/tdecore/kinstance.cpp b/tdecore/kinstance.cpp
index d0f4ffcbb..3e96e0365 100644
--- a/tdecore/kinstance.cpp
+++ b/tdecore/kinstance.cpp
@@ -205,7 +205,7 @@ KConfig	*KInstance::config() const
 	}
 	
 	// Check if we are excempt from kiosk restrictions
-	if (kde_kiosk_admin && !kde_kiosk_exception && !TQCString(getenv("KDE_KIOSK_NO_RESTRICTIONS")).isEmpty())
+	if (kde_kiosk_admin && !kde_kiosk_exception && !TQCString(getenv("TDE_KIOSK_NO_RESTRICTIONS")).isEmpty())
 	{
             kde_kiosk_exception = true;
             d->sharedConfig = 0;
diff --git a/tdecore/klibloader.cpp b/tdecore/klibloader.cpp
index 4577dc7a6..f1e65d0f7 100644
--- a/tdecore/klibloader.cpp
+++ b/tdecore/klibloader.cpp
@@ -306,9 +306,9 @@ KLibLoader::KLibLoader( TQObject* parent, const char* name )
     d = new KLibLoaderPrivate;
     lt_dlinit();
     d->unload_mode = KLibLoaderPrivate::UNKNOWN;
-    if (getenv("KDE_NOUNLOAD") != 0)
+    if (getenv("TDE_NOUNLOAD") != 0)
         d->unload_mode = KLibLoaderPrivate::DONT_UNLOAD;
-    else if (getenv("KDE_DOUNLOAD") != 0)
+    else if (getenv("TDE_DOUNLOAD") != 0)
         d->unload_mode = KLibLoaderPrivate::UNLOAD;
     d->loaded_stack.setAutoDelete( true );
 }
@@ -525,7 +525,7 @@ void KLibLoader::close_pending(KLibWrapPrivate *wrap)
   bool deleted_one = false;
   while ((wrap = d->loaded_stack.first())) {
     /* Let's first see, if we want to try to unload this lib.
-       If the env. var KDE_DOUNLOAD is set, we try to unload every lib.
+       If the env. var TDE_DOUNLOAD is set, we try to unload every lib.
        If not, we look at the lib itself, and unload it only, if it exports
        the symbol __kde_do_unload. */
     if (d->unload_mode != KLibLoaderPrivate::UNLOAD
diff --git a/tdecore/klocale.cpp b/tdecore/klocale.cpp
index 90bf27d66..c4ae52b19 100644
--- a/tdecore/klocale.cpp
+++ b/tdecore/klocale.cpp
@@ -156,7 +156,7 @@ void KLocale::initLanguageList(KConfig * config, bool useEnv)
   TQStringList languageList;
   if ( useEnv )
     languageList += TQStringList::split
-      (':', TQFile::decodeName( ::getenv("KDE_LANG") ));
+      (':', TQFile::decodeName( ::getenv("TDE_LANG") ));
 
   languageList += config->readListEntry("Language", ':');
 
@@ -2074,7 +2074,7 @@ void KLocale::initFileNameEncoding(KConfig *)
 {
   // If the following environment variable is set, assume all filenames
   // are in UTF-8 regardless of the current C locale.
-  d->utf8FileEncoding = getenv("KDE_UTF8_FILENAMES") != 0;
+  d->utf8FileEncoding = getenv("TDE_UTF8_FILENAMES") != 0;
   if (d->utf8FileEncoding)
   {
     TQFile::setEncodingFunction(KLocale::encodeFileNameUTF8);
diff --git a/tdecore/klocale.h b/tdecore/klocale.h
index 4359da4af..ce9dad46b 100644
--- a/tdecore/klocale.h
+++ b/tdecore/klocale.h
@@ -130,7 +130,7 @@ public:
    * The constructor looks for an entry Locale/Language in the
    * configuration file.
    * If no config file is specified, it will also look for languages
-   * using the environment variables (KDE_LANG, LC_MESSAGES, LC_ALL, LANG),
+   * using the environment variables (TDE_LANG, LC_MESSAGES, LC_ALL, LANG),
    * as well as the global configuration file. If KLocale is not able to use
    * any of the specified languages, the default language (en_US) will be
    * used.
diff --git a/tdecore/kstandarddirs.cpp b/tdecore/kstandarddirs.cpp
index 8b936aa8e..229b84f9e 100644
--- a/tdecore/kstandarddirs.cpp
+++ b/tdecore/kstandarddirs.cpp
@@ -1274,7 +1274,7 @@ TQString KStandardDirs::kfsstnd_defaultbindir()
 #ifdef Q_WS_WIN
    s->defaultbindir = kfsstnd_defaultprefix() + TQString::fromLatin1("/bin");
 #else //UNIX
-   s->defaultbindir = __KDE_BINDIR;
+   s->defaultbindir = __TDE_BINDIR;
    if (s->defaultbindir.isEmpty())
       s->defaultbindir = kfsstnd_defaultprefix() + TQString::fromLatin1("/bin");
 #endif
@@ -1568,7 +1568,7 @@ bool KStandardDirs::addCustomized(KConfig *config)
 
         bool readProfiles = true;
 
-        if (kde_kiosk_admin && !TQCString(getenv("KDE_KIOSK_NO_PROFILES")).isEmpty())
+        if (kde_kiosk_admin && !TQCString(getenv("TDE_KIOSK_NO_PROFILES")).isEmpty())
             readProfiles = false;
 
         TQString userMapFile = config->readEntry("userProfileMapFile");
@@ -1630,7 +1630,7 @@ bool KStandardDirs::addCustomized(KConfig *config)
     }
 
     // Process KIOSK restrictions.
-    if (!kde_kiosk_admin || TQCString(getenv("KDE_KIOSK_NO_RESTRICTIONS")).isEmpty())
+    if (!kde_kiosk_admin || TQCString(getenv("TDE_KIOSK_NO_RESTRICTIONS")).isEmpty())
     {
         config->setGroup("KDE Resource Restrictions");
         TQMap<TQString, TQString> entries = config->entryMap("KDE Resource Restrictions");
diff --git a/tdecore/ksycoca.cpp b/tdecore/ksycoca.cpp
index b7763f699..3e30aa7c1 100644
--- a/tdecore/ksycoca.cpp
+++ b/tdecore/ksycoca.cpp
@@ -112,7 +112,7 @@ bool KSycoca::openDatabase( bool openDummyIfNotFound )
    m_str = 0;
    m_barray = 0;
    TQString path;
-   TQCString ksycoca_env = getenv("KDESYCOCA");
+   TQCString ksycoca_env = getenv("TDESYCOCA");
    if (ksycoca_env.isEmpty())
       path = KGlobal::dirs()->saveLocation("cache") + "ksycoca";
    else
diff --git a/tdecore/ktempfile.cpp b/tdecore/ktempfile.cpp
index f439b55ef..2c7b56e79 100644
--- a/tdecore/ktempfile.cpp
+++ b/tdecore/ktempfile.cpp
@@ -233,7 +233,7 @@ KTempFile::sync()
 
    if (mFd >= 0)
    {
-      if( qstrcmp( getenv( "KDE_EXTRA_FSYNC" ), "1" ) == 0 )
+      if( qstrcmp( getenv( "TDE_EXTRA_FSYNC" ), "1" ) == 0 )
       {
          result = FDATASYNC(mFd);
          if (result)
diff --git a/tdecore/malloc/README b/tdecore/malloc/README
index 6a24a39db..eed2c00ba 100644
--- a/tdecore/malloc/README
+++ b/tdecore/malloc/README
@@ -7,7 +7,7 @@ FreeBSD's libc.
  There's a new configure switch, --enable-fast-malloc. By default it's turned off, disabling
 the system libc one and using this one. Using --enable-fast-malloc=full enables this
 malloc unconditionally, aiming for the maximum performance. By using only --enable-fast-malloc,
-it's possible to select both malloc implementations at runtime. When $KDE_MALLOC is set to 0,
+it's possible to select both malloc implementations at runtime. When $TDE_MALLOC is set to 0,
 the system libc malloc is used, otherwise this malloc is used.
 
  For now, the requirements are :
@@ -31,11 +31,11 @@ changes (against malloc-2.7.0):
 #define USE_MEMCPY 0
 #define MMAP_CLEARS 1
 made all functions INLINE
-added #ifdef KDE_MALLOC_DEBUG -> #define DEBUG
+added #ifdef TDE_MALLOC_DEBUG -> #define DEBUG
 reordered all functions in order to avoid 'warning: `XYZ' declared inline after being called'
     especially moved the public_* ones at the end of the file
 commented out #including malloc.h
-added #include <config.h> at the top and enclosed whole file in #ifdef KDE_MALLOC
+added #include <config.h> at the top and enclosed whole file in #ifdef TDE_MALLOC
 taken posix_memalign() from glibc
 removed public icalloc(),icomalloc(),mtrim(),musable()  (they don't exist everywhere anyway)
 enclosed the pthreads part by #if 0 and replaced it with spinlock from glibc CVS (in x86.h)
@@ -45,7 +45,7 @@ static mutex_t spinlock = MUTEX_INITIALIZER;
 #define MALLOC_PREACTION   lock( &spinlock )
 #define MALLOC_POSTACTION  unlock( &spinlock )
 ----------
-public functions call either functions in this malloc or in libc, depending on $KDE_MALLOC
+public functions call either functions in this malloc or in libc, depending on $TDE_MALLOC
 the kde_malloc_is_used hack
 
 
diff --git a/tdecore/malloc/configure.in.in b/tdecore/malloc/configure.in.in
index d669f8daa..e1a0ff528 100644
--- a/tdecore/malloc/configure.in.in
+++ b/tdecore/malloc/configure.in.in
@@ -1,4 +1,4 @@
-dnl --enable-fast-malloc      - depends on $KDE_MALLOC
+dnl --enable-fast-malloc      - depends on $TDE_MALLOC
 dnl --disable-fast-malloc     - disabled
 dnl --enable-fast-malloc=full - enabled always
 dnl
@@ -38,7 +38,7 @@ if test "$kde_fast_malloc" != "no"; then
 dnl platforms for which there's a spinlock implementation
     case $target_cpu in
         i?86)
-            AC_DEFINE(KDE_MALLOC_X86, 1, [The platform is x86])
+            AC_DEFINE(TDE_MALLOC_X86, 1, [The platform is x86])
             ;;
         *)
             if test "$kde_fast_malloc" = "notgiven"; then
@@ -63,7 +63,7 @@ dnl warn on untested platforms
 fi
 
 if test "$kde_fast_malloc" = "yes" -o "$kde_fast_malloc" = "notgiven" -o "$kde_fast_malloc" = "debug"; then
-dnl $KDE_MALLOC needs glibc (__libc_malloc etc.)
+dnl $TDE_MALLOC needs glibc (__libc_malloc etc.)
     AC_CACHE_CHECK([if the libc is glibc],kde_cv_libc_glibc,
         [AC_TRY_COMPILE(
             [#include<stdlib.h>],
@@ -76,7 +76,7 @@ dnl $KDE_MALLOC needs glibc (__libc_malloc etc.)
             [kde_cv_libc_glibc=no])
         ])
     if test "$kde_cv_libc_glibc" = "yes"; then
-        AC_DEFINE(KDE_MALLOC_GLIBC, 1, [The libc used is glibc])
+        AC_DEFINE(TDE_MALLOC_GLIBC, 1, [The libc used is glibc])
     else
         if test "$kde_fast_malloc" = "notgiven"; then
             kde_fast_malloc=notgiven_full
@@ -116,15 +116,15 @@ else
 fi
 
 if test "$kde_fast_malloc" != "no"; then
-    AC_DEFINE(KDE_MALLOC, 1, [Use own malloc implementation])
+    AC_DEFINE(TDE_MALLOC, 1, [Use own malloc implementation])
 fi
 
 if test "$kde_fast_malloc" = "debug" -o "$kde_fast_malloc" = "debug_full"; then
-    AC_DEFINE(KDE_MALLOC_DEBUG, 1, [Enable debugging in fast malloc])
+    AC_DEFINE(TDE_MALLOC_DEBUG, 1, [Enable debugging in fast malloc])
 fi
 
 if test "$kde_fast_malloc" = "full" -o "$kde_fast_malloc" = "debug_full"; then
-    AC_DEFINE(KDE_MALLOC_FULL, 1, [Make alloc as fast as possible])
+    AC_DEFINE(TDE_MALLOC_FULL, 1, [Make alloc as fast as possible])
 fi
 
 dnl -finline-limit=<large num> is needed for gcc3 in order to inline large functions
diff --git a/tdecore/malloc/malloc.c b/tdecore/malloc/malloc.c
index dba0fdef0..8f9fbb79b 100644
--- a/tdecore/malloc/malloc.c
+++ b/tdecore/malloc/malloc.c
@@ -7,9 +7,9 @@
 */
 int kde_malloc_is_used = 0;
 
-#ifdef KDE_MALLOC
+#ifdef TDE_MALLOC
 
-#ifdef KDE_MALLOC_DEBUG
+#ifdef TDE_MALLOC_DEBUG
 #define DEBUG
 #endif
 
@@ -1559,7 +1559,7 @@ static pthread_mutex_t mALLOC_MUTEx = PTHREAD_MUTEX_INITIALIZER;
 
 #else
 
-#ifdef KDE_MALLOC_X86
+#ifdef TDE_MALLOC_X86
 #include "x86.h"
 #else
 #error Unknown spinlock implementation
@@ -5475,9 +5475,9 @@ History:
 
 #ifdef USE_PUBLIC_MALLOC_WRAPPERS
 
-#ifndef KDE_MALLOC_FULL
+#ifndef TDE_MALLOC_FULL
 
-#ifdef KDE_MALLOC_GLIBC
+#ifdef TDE_MALLOC_GLIBC
 #include "glibc.h"
 #else
 /* cannot use dlsym(RTLD_NEXT,...) here, it calls malloc()*/
@@ -5491,7 +5491,7 @@ extern char* getenv(const char*);
 static int malloc_type = 0;
 static void init_malloc_type(void)
     {
-    const char* const env = getenv( "KDE_MALLOC" );
+    const char* const env = getenv( "TDE_MALLOC" );
     if( env == NULL )
         malloc_type = 1;
     else if( env[ 0 ] == '0' || env[ 0 ] == 'n' || env[ 0 ] == 'N' )
@@ -5503,7 +5503,7 @@ static void init_malloc_type(void)
 #endif
 
 Void_t* public_mALLOc(size_t bytes) {
-#ifndef KDE_MALLOC_FULL
+#ifndef TDE_MALLOC_FULL
   if( malloc_type == 1 )
     {
 #endif
@@ -5515,7 +5515,7 @@ Void_t* public_mALLOc(size_t bytes) {
   if (MALLOC_POSTACTION != 0) {
   }
   return m;
-#ifndef KDE_MALLOC_FULL
+#ifndef TDE_MALLOC_FULL
     }
   if( malloc_type == 2 )
       return libc_malloc( bytes );
@@ -5525,7 +5525,7 @@ Void_t* public_mALLOc(size_t bytes) {
 }
 
 void public_fREe(Void_t* m) {
-#ifndef KDE_MALLOC_FULL
+#ifndef TDE_MALLOC_FULL
   if( malloc_type == 1 )
     {
 #endif
@@ -5535,7 +5535,7 @@ void public_fREe(Void_t* m) {
   fREe(m);
   if (MALLOC_POSTACTION != 0) {
   }
-#ifndef KDE_MALLOC_FULL
+#ifndef TDE_MALLOC_FULL
   return;
     }
   if( malloc_type == 2 )
@@ -5549,7 +5549,7 @@ void public_fREe(Void_t* m) {
 }
 
 Void_t* public_rEALLOc(Void_t* m, size_t bytes) {
-#ifndef KDE_MALLOC_FULL
+#ifndef TDE_MALLOC_FULL
   if( malloc_type == 1 )
     {
 #endif
@@ -5560,7 +5560,7 @@ Void_t* public_rEALLOc(Void_t* m, size_t bytes) {
   if (MALLOC_POSTACTION != 0) {
   }
   return m;
-#ifndef KDE_MALLOC_FULL
+#ifndef TDE_MALLOC_FULL
     }
   if( malloc_type == 2 )
       return libc_realloc( m, bytes );
@@ -5570,7 +5570,7 @@ Void_t* public_rEALLOc(Void_t* m, size_t bytes) {
 }
 
 Void_t* public_mEMALIGn(size_t alignment, size_t bytes) {
-#ifndef KDE_MALLOC_FULL
+#ifndef TDE_MALLOC_FULL
   if( malloc_type == 1 )
     {
 #endif
@@ -5582,7 +5582,7 @@ Void_t* public_mEMALIGn(size_t alignment, size_t bytes) {
   if (MALLOC_POSTACTION != 0) {
   }
   return m;
-#ifndef KDE_MALLOC_FULL
+#ifndef TDE_MALLOC_FULL
     }
   if( malloc_type == 2 )
       return libc_memalign( alignment, bytes );
@@ -5592,7 +5592,7 @@ Void_t* public_mEMALIGn(size_t alignment, size_t bytes) {
 }
 
 Void_t* public_vALLOc(size_t bytes) {
-#ifndef KDE_MALLOC_FULL
+#ifndef TDE_MALLOC_FULL
   if( malloc_type == 1 )
     {
 #endif
@@ -5604,7 +5604,7 @@ Void_t* public_vALLOc(size_t bytes) {
   if (MALLOC_POSTACTION != 0) {
   }
   return m;
-#ifndef KDE_MALLOC_FULL
+#ifndef TDE_MALLOC_FULL
     }
   if( malloc_type == 2 )
       return libc_valloc( bytes );
@@ -5614,7 +5614,7 @@ Void_t* public_vALLOc(size_t bytes) {
 }
 
 Void_t* public_pVALLOc(size_t bytes) {
-#ifndef KDE_MALLOC_FULL
+#ifndef TDE_MALLOC_FULL
   if( malloc_type == 1 )
     {
 #endif
@@ -5626,7 +5626,7 @@ Void_t* public_pVALLOc(size_t bytes) {
   if (MALLOC_POSTACTION != 0) {
   }
   return m;
-#ifndef KDE_MALLOC_FULL
+#ifndef TDE_MALLOC_FULL
     }
   if( malloc_type == 2 )
       return libc_pvalloc( bytes );
@@ -5636,7 +5636,7 @@ Void_t* public_pVALLOc(size_t bytes) {
 }
 
 Void_t* public_cALLOc(size_t n, size_t elem_size) {
-#ifndef KDE_MALLOC_FULL
+#ifndef TDE_MALLOC_FULL
   if( malloc_type == 1 )
     {
 #endif
@@ -5648,7 +5648,7 @@ Void_t* public_cALLOc(size_t n, size_t elem_size) {
   if (MALLOC_POSTACTION != 0) {
   }
   return m;
-#ifndef KDE_MALLOC_FULL
+#ifndef TDE_MALLOC_FULL
     }
   if( malloc_type == 2 )
       return libc_calloc( n, elem_size );
@@ -5658,7 +5658,7 @@ Void_t* public_cALLOc(size_t n, size_t elem_size) {
 }
 
 void public_cFREe(Void_t* m) {
-#ifndef KDE_MALLOC_FULL
+#ifndef TDE_MALLOC_FULL
   if( malloc_type == 1 )
     {
 #endif
@@ -5668,7 +5668,7 @@ void public_cFREe(Void_t* m) {
   cFREe(m);
   if (MALLOC_POSTACTION != 0) {
   }
-#ifndef KDE_MALLOC_FULL
+#ifndef TDE_MALLOC_FULL
   return;
     }
   if( malloc_type == 2 )
@@ -5682,7 +5682,7 @@ void public_cFREe(Void_t* m) {
 }
 
 struct mallinfo public_mALLINFo() {
-#ifndef KDE_MALLOC_FULL
+#ifndef TDE_MALLOC_FULL
   if( malloc_type == 1 )
     {
 #endif
@@ -5695,7 +5695,7 @@ struct mallinfo public_mALLINFo() {
   if (MALLOC_POSTACTION != 0) {
   }
   return m;
-#ifndef KDE_MALLOC_FULL
+#ifndef TDE_MALLOC_FULL
     }
   if( malloc_type == 2 )
       return libc_mallinfo();
@@ -5705,7 +5705,7 @@ struct mallinfo public_mALLINFo() {
 }
 
 int public_mALLOPt(int p, int v) {
-#ifndef KDE_MALLOC_FULL
+#ifndef TDE_MALLOC_FULL
   if( malloc_type == 1 )
     {
 #endif
@@ -5717,7 +5717,7 @@ int public_mALLOPt(int p, int v) {
   if (MALLOC_POSTACTION != 0) {
   }
   return result;
-#ifndef KDE_MALLOC_FULL
+#ifndef TDE_MALLOC_FULL
     }
   if( malloc_type == 2 )
       return libc_mallopt( p, v );
diff --git a/tdecore/netsupp.cpp b/tdecore/netsupp.cpp
index 83aec8bc0..c7e968c16 100644
--- a/tdecore/netsupp.cpp
+++ b/tdecore/netsupp.cpp
@@ -188,7 +188,7 @@ static int check_ipv6_stack()
 # ifndef AF_INET6
   return 2;			// how can we check?
 # else
-  if (getenv("KDE_NO_IPV6"))
+  if (getenv("TDE_NO_IPV6"))
      return 2;
   int fd = ::socket(AF_INET6, SOCK_STREAM, 0);
   if (fd == -1)
diff --git a/tdecore/network/kresolver.cpp b/tdecore/network/kresolver.cpp
index cb2e21996..a6ca8e45c 100644
--- a/tdecore/network/kresolver.cpp
+++ b/tdecore/network/kresolver.cpp
@@ -940,7 +940,7 @@ static TQString ToUnicode(const TQString& label);
 
 static TQStringList *KResolver_initIdnDomains()
 {
-  const char *kde_use_idn = getenv("KDE_USE_IDN");
+  const char *kde_use_idn = getenv("TDE_USE_IDN");
   if (!kde_use_idn)
      kde_use_idn = "ac:at:br:cat:ch:cl:cn:de:dk:fi:gr:hu:info:io:is:jp:kr:li:lt:museum:org:no:se:sh:th:tm:tw:vn";
   return new TQStringList(TQStringList::split(':', TQString::fromLatin1(kde_use_idn).lower()));
diff --git a/tdecore/network/kresolverstandardworkers.cpp b/tdecore/network/kresolverstandardworkers.cpp
index 5f0229969..77c085e08 100644
--- a/tdecore/network/kresolverstandardworkers.cpp
+++ b/tdecore/network/kresolverstandardworkers.cpp
@@ -63,7 +63,7 @@ static bool hasIPv6()
 #ifndef AF_INET6
   return false;
 #else
-  if (getenv("KDE_NO_IPV6") != 0L)
+  if (getenv("TDE_NO_IPV6") != 0L)
     return false;
 
   int fd = ::socket(AF_INET6, SOCK_STREAM, 0);
diff --git a/tdecore/network/ksrvresolverworker.cpp b/tdecore/network/ksrvresolverworker.cpp
index f3166b982..419873d4f 100644
--- a/tdecore/network/ksrvresolverworker.cpp
+++ b/tdecore/network/ksrvresolverworker.cpp
@@ -245,7 +245,7 @@ namespace KNetwork
     void initSrvWorker() KDE_NO_EXPORT;
     void initSrvWorker()
     {
-      if (getenv("KDE_NO_SRV") != NULL)
+      if (getenv("TDE_NO_SRV") != NULL)
 	return;
       
       KResolverWorkerFactoryBase::registerNewWorker(new KResolverWorkerFactory<KSrvResolverWorker>);
diff --git a/tdeprint/cups/kmcupsmanager.cpp b/tdeprint/cups/kmcupsmanager.cpp
index 3568ad51b..01c5b8cd6 100644
--- a/tdeprint/cups/kmcupsmanager.cpp
+++ b/tdeprint/cups/kmcupsmanager.cpp
@@ -95,7 +95,7 @@ KMCupsManager::~KMCupsManager()
 
 TQString KMCupsManager::driverDbCreationProgram()
 {
-	return TQString(__KDE_BINDIR).append(TQString::fromLatin1("/make_driver_db_cups"));
+	return TQString(__TDE_BINDIR).append(TQString::fromLatin1("/make_driver_db_cups"));
 }
 
 TQString KMCupsManager::driverDirectory()
diff --git a/tdesu/stub.cpp b/tdesu/stub.cpp
index 5b222f51e..f5b435b40 100644
--- a/tdesu/stub.cpp
+++ b/tdesu/stub.cpp
@@ -125,11 +125,11 @@ int StubProcess::ConverseStub(int check)
 	       if (!path.isEmpty())
 	          path = "/usr/local/sbin:/usr/sbin:/sbin:" + path;
 	       else
-                  if (strcmp(__KDE_BINDIR, "/usr/bin") == 0) {
+                  if (strcmp(__TDE_BINDIR, "/usr/bin") == 0) {
 		          path = "/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin";
 		  }
 		  else {
-			  path = "/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:" __KDE_BINDIR ":/usr/bin:/bin";
+			  path = "/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:" __TDE_BINDIR ":/usr/bin:/bin";
 		  }
 	    writeLine(path);
 	} else if (line == "user") {
diff --git a/tdesu/su.cpp b/tdesu/su.cpp
index 0739c29c3..c4e75772e 100644
--- a/tdesu/su.cpp
+++ b/tdesu/su.cpp
@@ -112,7 +112,7 @@ int SuProcess::exec(const char *password, int check)
     if (superUserCommand == "su") {
         args += "-c";
     }
-    args += TQCString(__KDE_BINDIR) + "/tdesu_stub";
+    args += TQCString(__TDE_BINDIR) + "/tdesu_stub";
 #ifndef Q_OS_DARWIN
     args += "-";
 #endif
diff --git a/win/tdelibs_global_win.h b/win/tdelibs_global_win.h
index c98f67770..d8b4da08a 100644
--- a/win/tdelibs_global_win.h
+++ b/win/tdelibs_global_win.h
@@ -82,8 +82,8 @@ int kde_start
 # ifndef TDEDIR
 #  define TDEDIR TQString(KDEWIN32_DIR)
 # endif
-# ifndef __KDE_BINDIR 
-#  define __KDE_BINDIR TQString(KDEWIN32_DIR "/bin")
+# ifndef __TDE_BINDIR 
+#  define __TDE_BINDIR TQString(KDEWIN32_DIR "/bin")
 # endif
 #endif
 */