From dd3d53e70948ffd0e3e2745edfd345bbeb838a32 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 8 Dec 2011 17:25:42 -0600
Subject: [PATCH] Rename additional KDE strings

---
 CMakeLists.txt.orig | 4 ++--
 ChangeLog           | 8 ++++----
 README              | 2 +-
 style/qtcurve.cpp   | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt.orig b/CMakeLists.txt.orig
index 2a530cc..51933e5 100644
--- a/CMakeLists.txt.orig
+++ b/CMakeLists.txt.orig
@@ -102,9 +102,9 @@ configure_file (config.h.cmake ${CMAKE_BINARY_DIR}/config.h)
 set(DATA_INSTALL_DIR ${KDE3PREFIX}/share/apps)
 
 if(QTC_DEFAULT_TO_KDE3)
-    message("INFO: Defaulting to reading KDE3 settings if KDE_SESSION_VERSION is not set")
+    message("INFO: Defaulting to reading KDE3 settings if TDE_SESSION_VERSION is not set")
 else(QTC_DEFAULT_TO_KDE3)
-    message("INFO: Defaulting to reading KDE4 settings if KDE_SESSION_VERSION is not set")
+    message("INFO: Defaulting to reading KDE4 settings if TDE_SESSION_VERSION is not set")
 endif(QTC_DEFAULT_TO_KDE3)
 
 add_subdirectory(style)
diff --git a/ChangeLog b/ChangeLog
index cd057db..8cf4fdf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -173,7 +173,7 @@
  6. Modify defaults:
         Scrollbars outside of scrollview (Gtk/oxygen style)
         Thin scrollbar groove.
- 7. Use KDE_SESSION_VERSION to determine which KDE prefix (KDE3, or KDE4) to
+ 7. Use TDE_SESSION_VERSION to determine which KDE prefix (KDE3, or KDE4) to
     seach first for qtc_xxx.themerc files.
  8. Update Klearlooks to be more consistent with Clearlooks (lighten tab background,
     use highlight strip on active tab, dont colour active tab)
@@ -236,7 +236,7 @@
 11. Modified how button, and combo, heights are calculated - no longer set a
     minimum height.
 12. Fix some re-draw errors with thin scrollbar grooves.
-13. Default to reading KDE4 settings if KDE_SESSION_VERSION is not set.
+13. Default to reading KDE4 settings if TDE_SESSION_VERSION is not set.
     Pass -DQTC_DEFAULT_TO_KDE3=true to cmake to force this to default to KDE3.
 14. Call kde-config / kde4-config to ascertain users TDEHOME.
 15. Fix slight redraw error with glow style mouse over tabs.
@@ -271,7 +271,7 @@
     setting.
 15. Fix kaffeine's slider benig completely filled at start of song.
 16. Fix LineEdit in qtconfig.
-17. Under KDE4 (KDE_SESSION_VERSION>=4), default hover/focus colours to the
+17. Under KDE4 (TDE_SESSION_VERSION>=4), default hover/focus colours to the
     KDE4 defaults.
 
 0.63.0
@@ -729,7 +729,7 @@
       Tab appearance
       Listview appearance
       Slider appearance
-2. If KDE_SESSION_VERSION is set to >=4, then read settings from
+2. If TDE_SESSION_VERSION is set to >=4, then read settings from
    $XDG_CONFIG_HOME/TrollTech.conf. This only affects Qt-only
    applications - KDE apps should not be affected.
 3. Lighten focus rectangle.
diff --git a/README b/README
index f1aa129..071bc9e 100644
--- a/README
+++ b/README
@@ -19,7 +19,7 @@ The following options may be supplied to cmake:
         Build KDE3 config module. NOTE: This is no longer maintained.
 
     -DQTC_DEFAULT_TO_KDE3=true
-       If the KDE_SESSION_VERSION is not set, then assume we are running
+       If the TDE_SESSION_VERSION is not set, then assume we are running
        under KDE3. If this cmake option is not set, then KDE4 is assumed.
 
     -DQTC_STYLE_SUPPORT=true
diff --git a/style/qtcurve.cpp b/style/qtcurve.cpp
index 1734d8a..84853da 100644
--- a/style/qtcurve.cpp
+++ b/style/qtcurve.cpp
@@ -190,7 +190,7 @@ static bool useTQt3Settings()
 
     if(0==ver)
     {
-        const char *sessionVersion=getenv("KDE_SESSION_VERSION");
+        const char *sessionVersion=getenv("TDE_SESSION_VERSION");
 
         ver=sessionVersion
                 ? atoi(sessionVersion)<4
@@ -279,7 +279,7 @@ static TQString kdeHome(bool trinity=false)
     // Try env vars...
     if(kdeHome[trinity ? 0 : 1].isEmpty())
     {
-        kdeHome[trinity ? 0 : 1]=readEnvPath(getuid() ? "TDEHOME" : "KDEROOTHOME");
+        kdeHome[trinity ? 0 : 1]=readEnvPath(getuid() ? "TDEHOME" : "TDEROOTHOME");
         if (kdeHome[trinity ? 0 : 1].isEmpty())
         {
             TQDir    homeDir(TQDir::homeDirPath());