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

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

3 files changed, 29 insertions, 29 deletions

diff --git a/cmakemodules/FindKdeLibs.cmake b/cmakemodules/FindKdeLibs.cmake
index 5cdfad5..865f582 100644
--- a/cmakemodules/FindKdeLibs.cmake
+++ b/cmakemodules/FindKdeLibs.cmake
@@ -99,10 +99,10 @@ FIND_PROGRAM(KDECONFIG_EXECUTABLE NAMES kde-config
   HINTS
    $ENV{KDEDIR}/bin
    PATHS
-  /opt/kde3/bin
+  /opt/trinity/bin
   /opt/trinity/bin
   /opt/kde/bin
-  /usr/kde3/bin
+  /usr/trinity/bin
   )
 
 SET(KDE3PREFIX)
@@ -128,7 +128,7 @@ FIND_PATH(KDE3_INCLUDE_DIR kpassdlg.h
   $ENV{KDEDIR}/include
   ${KDE3PREFIX}/include
   PATHS
-  /opt/kde3/include
+  /opt/trinity/include
   /opt/trinity/include
   /opt/kde/include
   /usr/include/kde
@@ -144,10 +144,10 @@ FIND_LIBRARY(KDE3_KDECORE_LIBRARY NAMES kdecore
   $ENV{KDEDIR}/lib
   ${KDE3PREFIX}/lib
   PATHS
-  /opt/kde3/lib
+  /opt/trinity/lib
   /opt/trinity/lib
   /opt/kde/lib
-  /usr/kde3/lib
+  /usr/trinity/lib
 )
 
 SET(QT_AND_KDECORE_LIBS ${QT_LIBRARIES} ${KDE3_KDECORE_LIBRARY})
@@ -156,9 +156,9 @@ GET_FILENAME_COMPONENT(KDE3_LIB_DIR ${KDE3_KDECORE_LIBRARY} PATH )
 
 IF(NOT KDE3_LIBTOOL_DIR)
    IF(KDE3_KDECORE_LIBRARY MATCHES lib64)
-     SET(KDE3_LIBTOOL_DIR /lib64/kde3)
+     SET(KDE3_LIBTOOL_DIR /lib64/trinity)
    ELSE(KDE3_KDECORE_LIBRARY MATCHES lib64)
-     SET(KDE3_LIBTOOL_DIR /lib/kde3)
+     SET(KDE3_LIBTOOL_DIR /lib/trinity)
    ENDIF(KDE3_KDECORE_LIBRARY MATCHES lib64)
 ENDIF(NOT KDE3_LIBTOOL_DIR)
 
@@ -168,10 +168,10 @@ FIND_PROGRAM(KDE3_DCOPIDL_EXECUTABLE NAMES dcopidl
   $ENV{KDEDIR}/bin
   ${KDE3PREFIX}/bin
   PATHS
-  /opt/kde3/bin
+  /opt/trinity/bin
   /opt/trinity/bin
   /opt/kde/bin
-  /usr/kde3/bin
+  /usr/trinity/bin
   )
 
 FIND_PROGRAM(KDE3_DCOPIDL2CPP_EXECUTABLE NAMES dcopidl2cpp
@@ -179,10 +179,10 @@ FIND_PROGRAM(KDE3_DCOPIDL2CPP_EXECUTABLE NAMES dcopidl2cpp
   $ENV{KDEDIR}/bin
   ${KDE3PREFIX}/bin
   PATHS
-  /opt/kde3/bin
+  /opt/trinity/bin
   /opt/trinity/bin
   /opt/kde/bin
-  /usr/kde3/bin
+  /usr/trinity/bin
   )
 
 FIND_PROGRAM(KDE3_KCFGC_EXECUTABLE NAMES kconfig_compiler
@@ -190,10 +190,10 @@ FIND_PROGRAM(KDE3_KCFGC_EXECUTABLE NAMES kconfig_compiler
   $ENV{KDEDIR}/bin
   ${KDE3PREFIX}/bin
   PATHS
-  /opt/kde3/bin
+  /opt/trinity/bin
   /opt/trinity/bin
   /opt/kde/bin
-  /usr/kde3/bin
+  /usr/trinity/bin
   )
 
 
@@ -312,18 +312,18 @@ set(LIB_SUFFIX ${DEF_SUFF} CACHE STRING "Define suffix of directory name (32/64)
 SET(LIB_SEARCH_PATHES   ${KDE3_LIB_DIR}
   $ENV{KDEDIR}/lib
   /opt/kde/lib
-  /opt/kde3/lib
+  /opt/trinity/lib
   /opt/trinity/lib
   /usr/lib
   /usr/local/lib
-  /usr/kde3/lib
+  /usr/trinity/lib
 )
 
 IF (LIB_SUFFIX)
     SET(LIB_SEARCH_PATHES
         $ENV{KDEDIR}/lib${LIB_SUFFIX}
         /opt/kde/lib${LIB_SUFFIX}
-        /opt/kde3/lib${LIB_SUFFIX}
+        /opt/trinity/lib${LIB_SUFFIX}
         /opt/trinity/lib${LIB_SUFFIX}
         /usr/lib${LIB_SUFFIX}
         /usr/local/lib${LIB_SUFFIX}
@@ -363,9 +363,9 @@ FIND_LIBRARY(KDE3_KINIT_KDED_LIBRARY NAMES kdeinit_kded
 FIND_PROGRAM(KDE3_KDECONFIG_EXECUTABLE NAME kde-config PATHS
     $ENV{KDEDIR}/bin
     /opt/kde/bin
-    /opt/kde3/bin
     /opt/trinity/bin
-    /usr/kde3/bin
+    /opt/trinity/bin
+    /usr/trinity/bin
 )
 
 FIND_PROGRAM(MSGFMT
@@ -378,9 +378,9 @@ FIND_PROGRAM(KDE3_MEINPROC_EXECUTABLE NAME meinproc PATHS
      ${KDE3_BIN_INSTALL_DIR}
      $ENV{KDEDIR}/bin
      /opt/kde/bin
-     /opt/kde3/bin
      /opt/trinity/bin
-     /usr/kde3/bin
+     /opt/trinity/bin
+     /usr/trinity/bin
 )
 
 IF(KDE3_MEINPROC_EXECUTABLE)
@@ -412,8 +412,8 @@ set(EXEC_INSTALL_PREFIX  ${CMAKE_INSTALL_PREFIX}       CACHE PATH  "Base directo
 set(BIN_INSTALL_DIR          "${EXEC_INSTALL_PREFIX}/bin"                  CACHE PATH "The kde bin install dir (default prefix/bin)" FORCE)
 set(SBIN_INSTALL_DIR         "${EXEC_INSTALL_PREFIX}/sbin"                 CACHE PATH "The kde sbin install dir (default prefix/sbin)" FORCE)
 set(LIB_INSTALL_DIR          "${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX}"     CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is /lib${LIB_SUFFIX})" FORCE)
-set(LIBEXEC_INSTALL_DIR      "${LIB_INSTALL_DIR}/kde3/libexec"             CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is /lib/kde3/libexec)" FORCE)
-set(PLUGIN_INSTALL_DIR       "${LIB_INSTALL_DIR}/kde3"                     CACHE PATH "The subdirectory relative to the install prefix where plugins will be installed (default is ${LIB_INSTALL_DIR}/kde3)" FORCE)
+set(LIBEXEC_INSTALL_DIR      "${LIB_INSTALL_DIR}/trinity/libexec"             CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is /lib/trinity/libexec)" FORCE)
+set(PLUGIN_INSTALL_DIR       "${LIB_INSTALL_DIR}/trinity"                     CACHE PATH "The subdirectory relative to the install prefix where plugins will be installed (default is ${LIB_INSTALL_DIR}/trinity)" FORCE)
 set(INCLUDE_INSTALL_DIR      "${CMAKE_INSTALL_PREFIX}/include"             CACHE PATH "The subdirectory to the header prefix" FORCE)
 set(CONFIG_INSTALL_DIR       "${SHARE_INSTALL_PREFIX}/config"              CACHE PATH "The config file install dir" FORCE)
 set(DATA_INSTALL_DIR         "${SHARE_INSTALL_PREFIX}/apps"                CACHE PATH "The parent directory where applications can install their data" FORCE)
diff --git a/cmakemodules/KDE3Macros.cmake b/cmakemodules/KDE3Macros.cmake
index 242e12f..54df342 100644
--- a/cmakemodules/KDE3Macros.cmake
+++ b/cmakemodules/KDE3Macros.cmake
@@ -163,19 +163,19 @@ MACRO(KDE3_ADD_UI_FILES _sources )
 
       ADD_CUSTOM_COMMAND(OUTPUT ${_header}
          COMMAND ${QT_UIC_EXECUTABLE}
-         ARGS  -L ${KDE3_LIB_DIR}/kde3/plugins/designer -nounload -o ${_header} ${CMAKE_CURRENT_SOURCE_DIR}/${_current_FILE}
+         ARGS  -L ${KDE3_LIB_DIR}/trinity/plugins/designer -nounload -o ${_header} ${CMAKE_CURRENT_SOURCE_DIR}/${_current_FILE}
          DEPENDS ${_tmp_FILE}
       )
 
       ADD_CUSTOM_COMMAND(OUTPUT ${_src}
          COMMAND ${CMAKE_COMMAND}
          ARGS
-         -DKDE_UIC_PLUGIN_DIR:FILEPATH=${KDE3_LIB_DIR}/kde3/plugins/designer
+         -DKDE_UIC_PLUGIN_DIR:FILEPATH=${KDE3_LIB_DIR}/trinity/plugins/designer
          -DKDE_UIC_EXECUTABLE:FILEPATH=${QT_UIC_EXECUTABLE}
          -DKDE_UIC_FILE:FILEPATH=${_tmp_FILE}
          -DKDE_UIC_CPP_FILE:FILEPATH=${_src}
          -DKDE_UIC_H_FILE:FILEPATH=${_header}
-         -P ${KDE3_MODULE_DIR}/kde3uic.cmake
+         -P ${KDE3_MODULE_DIR}/trinityuic.cmake
          DEPENDS ${_header}
       )
 
@@ -369,7 +369,7 @@ MACRO(KDE3_ADD_KDEINIT_EXECUTABLE _target_NAME )
       ADD_LIBRARY(kdeinit_${_target_NAME} SHARED ${ARGN} )
    ENDIF (KDE3_ENABLE_FINAL)
 
-   CONFIGURE_FILE(${KDE3_MODULE_DIR}/kde3init_dummy.cpp.in ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_dummy.cpp)
+   CONFIGURE_FILE(${KDE3_MODULE_DIR}/trinityinit_dummy.cpp.in ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_dummy.cpp)
 
    ADD_EXECUTABLE( ${_target_NAME} ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_dummy.cpp )
    TARGET_LINK_LIBRARIES( ${_target_NAME} kdeinit_${_target_NAME} )
diff --git a/cmakemodules/kdesvnMacros.cmake b/cmakemodules/kdesvnMacros.cmake
index 29b99db..7384ba0 100644
--- a/cmakemodules/kdesvnMacros.cmake
+++ b/cmakemodules/kdesvnMacros.cmake
@@ -23,7 +23,7 @@ ENDMACRO(KDESVN_CHECK_LINK_FLAG)
 # this macro is required to add libtools to normal build so
 # we may debug our part from within build dir
 # output     name      where
-# _laname    _soname   ${LIBRARY_OUTPUT_PATH}/kde3
+# _laname    _soname   ${LIBRARY_OUTPUT_PATH}/trinity
 MACRO(KDESVN_GENERATE_LIBTOOL_FILE _target)
    GET_TARGET_PROPERTY(_target_location ${_target} LOCATION)
    GET_FILENAME_COMPONENT(_laname ${_target_location} NAME_WE)
@@ -34,9 +34,9 @@ MACRO(KDESVN_GENERATE_LIBTOOL_FILE _target)
     SET(_laname ${CMAKE_CURRENT_BINARY_DIR}/${_laname}.la)
    ENDIF(LIBRARY_OUTPUT_PATH)
    IF(LIBRARY_OUTPUT_PATH)
-    SET(_libdir "'${LIBRARY_OUTPUT_PATH}/kde3'")
+    SET(_libdir "'${LIBRARY_OUTPUT_PATH}/trinity'")
    ELSE(LIBRARY_OUTPUT_PATH)
-    SET(_libdir "'${CMAKE_CURRENT_BUILD_DIR}/kde3'")
+    SET(_libdir "'${CMAKE_CURRENT_BUILD_DIR}/trinity'")
    ENDIF(LIBRARY_OUTPUT_PATH)
     ADD_CUSTOM_COMMAND(TARGET ${_target}
     POST_BUILD