Convert remaining references to kde3 (e.g. in paths) to trinity

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kde-style-qtcurve@1248408 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

2 files changed, 15 insertions, 15 deletions

diff --git a/style/CMakeLists.txt b/style/CMakeLists.txt
index 0b5a404..cf37121 100644
--- a/style/CMakeLists.txt
+++ b/style/CMakeLists.txt
@@ -3,11 +3,11 @@ if (NOT QTC_QT_ONLY)
     add_definitions(-DQT_PLUGIN)
     include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} ${KDE3_INCLUDE_DIR} ${QT_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/common)
     link_directories(${KDE3_LIB_DIR})
-    kde3_automoc(${qtcurve_SRCS})
+    trinity_automoc(${qtcurve_SRCS})
     add_library(qtcurve MODULE ${qtcurve_SRCS})
     set_target_properties(qtcurve PROPERTIES PREFIX "")
     target_link_libraries(qtcurve ${QT_LIBRARIES} kdefx)
-    install(TARGETS qtcurve LIBRARY DESTINATION ${KDE3_LIB_DIR}/kde3/plugins/styles)
+    install(TARGETS qtcurve LIBRARY DESTINATION ${KDE3_LIB_DIR}/trinity/plugins/styles)
     install(FILES qtcurve.themerc DESTINATION ${KDE3PREFIX}/share/apps/kstyle/themes)
 else (NOT QTC_QT_ONLY)
     set(qtcurve_MOC_CLASSES qtcurve.h qtc_kstyle.h)
diff --git a/style/qtcurve.cpp b/style/qtcurve.cpp
index 90ffd22..6d743fc 100644
--- a/style/qtcurve.cpp
+++ b/style/qtcurve.cpp
@@ -254,22 +254,22 @@ static TQString readEnvPath(const char *env)
    return path.isEmpty() ? TQString() : TQFile::decodeName(path);
 }
 
-static TQString kdeHome(bool kde3=false)
+static TQString kdeHome(bool trinity=false)
 {
     static TQString kdeHome[2];
 
     // Execute kde-config to ascertain users KDEHOME
-    if(kdeHome[kde3 ? 0 : 1].isEmpty())
+    if(kdeHome[trinity ? 0 : 1].isEmpty())
     {
         FILE *fpipe;
 
-        if (fpipe = (FILE*)popen(kde3 ? "kde-config --localprefix 2> /dev/null" : "kde4-config --localprefix 2> /dev/null", "r"))
+        if (fpipe = (FILE*)popen(trinity ? "kde-config --localprefix 2> /dev/null" : "kde4-config --localprefix 2> /dev/null", "r"))
         {
             char line[1024];
 
             while(fgets(line, sizeof line, fpipe))
             {
-                kdeHome[kde3 ? 0 : 1]=TQString(TQFile::decodeName(line)).replace("\n", "");
+                kdeHome[trinity ? 0 : 1]=TQString(TQFile::decodeName(line)).replace("\n", "");
                 break;
             }
             pclose(fpipe);
@@ -277,19 +277,19 @@ static TQString kdeHome(bool kde3=false)
     }
 
     // Try env vars...
-    if(kdeHome[kde3 ? 0 : 1].isEmpty())
+    if(kdeHome[trinity ? 0 : 1].isEmpty())
     {
-        kdeHome[kde3 ? 0 : 1]=readEnvPath(getuid() ? "KDEHOME" : "KDEROOTHOME");
-        if (kdeHome[kde3 ? 0 : 1].isEmpty())
+        kdeHome[trinity ? 0 : 1]=readEnvPath(getuid() ? "KDEHOME" : "KDEROOTHOME");
+        if (kdeHome[trinity ? 0 : 1].isEmpty())
         {
             TQDir    homeDir(TQDir::homeDirPath());
             TQString kdeConfDir("/.kde");
-            if (!kde3 && homeDir.exists(".kde4"))
+            if (!trinity && homeDir.exists(".kde4"))
                 kdeConfDir = TQString("/.kde4");
-            kdeHome[kde3 ? 0 : 1] = TQDir::homeDirPath() + kdeConfDir;
+            kdeHome[trinity ? 0 : 1] = TQDir::homeDirPath() + kdeConfDir;
         }
     }
-    return kdeHome[kde3 ? 0 : 1];
+    return kdeHome[trinity ? 0 : 1];
 }
 
 #ifdef TQTC_STYLE_SUPPORT
@@ -328,12 +328,12 @@ static TQString themeFile(const TQString &dir, const TQString &n, const char *su
     return TQFile(name).exists() ? name : TQString();
 }
 
-static TQString themeFile(const TQString &dir, const TQString &n, bool kde3=true)
+static TQString themeFile(const TQString &dir, const TQString &n, bool trinity=true)
 {
-    TQString name(themeFile(dir, n, kde3 ? THEME_DIR : THEME_DIR4));
+    TQString name(themeFile(dir, n, trinity ? THEME_DIR : THEME_DIR4));
 
     if(name.isEmpty())
-        name=themeFile(dir, n, kde3 ? THEME_DIR4 : THEME_DIR);
+        name=themeFile(dir, n, trinity ? THEME_DIR4 : THEME_DIR);
     return name;
 }
 #endif