summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-21 01:43:11 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-21 01:43:11 +0000
commitacc8d960e351d32a7a00980a3270f65e01b2b2b6 (patch)
tree8322c74ef1caf41c7633daf96557c085c1aa1ac6
parent6c8d760f1f7b0c1582ba4c7a0263a0ea0049ee21 (diff)
downloadkbfx-acc8d960.tar.gz
kbfx-acc8d960.zip
Convert remaining references to kde3 (e.g. in paths) to trinity
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kbfx@1248408 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--CMakeLists.txt6
-rw-r--r--cmakemodules/FindKDE4Internal.cmake8
-rw-r--r--cmakemodules/FindKdeLibs.cmake44
-rw-r--r--cmakemodules/FindStrigi.cmake2
-rw-r--r--cmakemodules/KDE3Macros.cmake8
-rw-r--r--cmakemodules/kdesvnMacros.cmake6
-rw-r--r--kbfx.spec2
-rw-r--r--kbfx.spec.in2
8 files changed, 39 insertions, 39 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d7ac656..97c4284 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,7 +32,7 @@ SET(BIN_SEARCH_PATHES
$ENV{KDEDIR}/bin
${CMAKE_INSTALL_PREFIX}/bin
/opt/kde/bin
- /opt/kde3/bin
+ /opt/trinity/bin
/opt/kde4/bin
/usr/kde/3.5/bin
/usr/bin
@@ -44,7 +44,7 @@ SET(INCLUDE_SEARCH_PATHES
$ENV{HOME}/usr/include
$ENV{KDEDIR}/include
/opt/kde/include
- /opt/kde3/include
+ /opt/trinity/include
/opt/kde4/include
/usr/kde/3.5/include
/usr/include
@@ -57,7 +57,7 @@ SET(LIB_SEARCH_PATHES
$ENV{HOME}/usr/lib
$ENV{KDEDIR}/lib
/opt/kde/lib
- /opt/kde3/lib
+ /opt/trinity/lib
/opt/kde4/lib
/usr/kde/3.5/lib
/usr/lib
diff --git a/cmakemodules/FindKDE4Internal.cmake b/cmakemodules/FindKDE4Internal.cmake
index 3747468..3923172 100644
--- a/cmakemodules/FindKDE4Internal.cmake
+++ b/cmakemodules/FindKDE4Internal.cmake
@@ -27,7 +27,7 @@
# KDE4_KIO_LIBRARY - the kio library
# KDE4_KPARTS_LIBRARY - the kparts library
# KDE4_KUTILS_LIBRARY - the kutils library
-# KDE4_KDE3SUPPORT_LIBRARY - the kde3support library
+# KDE4_KDE3SUPPORT_LIBRARY - the trinitysupport library
# KDE4_KXMLCORE_LIBRARY - the kxmlcore library
# KDE4_KHTML_LIBRARY - the khtml library
# KDE4_KJS_LIBRARY - the kjs library
@@ -56,7 +56,7 @@
# KDE4_KIO_LIBS - the kio library and all depending libraries
# KDE4_KPARTS_LIBS - the kparts library and all depending libraries
# KDE4_KUTILS_LIBS - the kutils library and all depending libraries
-# KDE4_KDE3SUPPORT_LIBS - the kde3support library and all depending libraries
+# KDE4_KDE3SUPPORT_LIBS - the trinitysupport library and all depending libraries
# KDE4_KXMLCORE_LIBS - the kxmlcore library and all depending libraries
# KDE4_KHTML_LIBS - the khtml library and all depending libraries
# KDE4_KJS_LIBS - the kjs library and all depending libraries
@@ -412,8 +412,8 @@ else(EXISTS ${CMAKE_SOURCE_DIR}/kdecore/kernel/kglobal.h)
find_library(KDE4_KUTILS_LIBRARY NAMES kutils PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
set(KDE4_KUTILS_LIBS ${kutils_LIB_DEPENDS} ${KDE4_KUTILS_LIBRARY} )
- find_library(KDE4_KDE3SUPPORT_LIBRARY NAMES kde3support PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
- set(KDE4_KDE3SUPPORT_LIBS ${kde3support_LIB_DEPENDS} ${KDE4_KDE3SUPPORT_LIBRARY} )
+ find_library(KDE4_KDE3SUPPORT_LIBRARY NAMES trinitysupport PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+ set(KDE4_KDE3SUPPORT_LIBS ${trinitysupport_LIB_DEPENDS} ${KDE4_KDE3SUPPORT_LIBRARY} )
find_library(KDE4_KHTML_LIBRARY NAMES khtml PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
set(KDE4_KHTML_LIBS ${khtml_LIB_DEPENDS} ${KDE4_KHTML_LIBRARY} )
diff --git a/cmakemodules/FindKdeLibs.cmake b/cmakemodules/FindKdeLibs.cmake
index b0929df..826d035 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/FindStrigi.cmake b/cmakemodules/FindStrigi.cmake
index 072ad84..bc49a89 100644
--- a/cmakemodules/FindStrigi.cmake
+++ b/cmakemodules/FindStrigi.cmake
@@ -13,7 +13,7 @@ FIND_PATH(STRIGI_INCLUDE_DIR strigihtmlgui.h
$ENV{HOME}/usr/include/strigi
$ENV{KDEDIR}/include/strigi
/opt/kde/include/strigi
- /opt/kde3/include/strigi
+ /opt/trinity/include/strigi
/opt/kde4/include/strigi
/usr/kde/3.5/include/strigi
/usr/include/strigi
diff --git a/cmakemodules/KDE3Macros.cmake b/cmakemodules/KDE3Macros.cmake
index f132854..38c9b8f 100644
--- a/cmakemodules/KDE3Macros.cmake
+++ b/cmakemodules/KDE3Macros.cmake
@@ -164,19 +164,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}
)
@@ -370,7 +370,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
diff --git a/kbfx.spec b/kbfx.spec
index 4916ec5..36a06cf 100644
--- a/kbfx.spec
+++ b/kbfx.spec
@@ -11,7 +11,7 @@
%define is_pclinuxos %(test -e /etc/pclinuxos-release && echo 1 || echo 0)
%if %{is_suse}
-%define prefix /opt/kde3
+%define prefix /opt/trinity
Group: System/GUI/KDE
Release: %{kbfx_release}.suse%(echo "%{suse_version}" | %__sed -e 's/.$//')
Requires: kdelibs3
diff --git a/kbfx.spec.in b/kbfx.spec.in
index 030dab1..70d1277 100644
--- a/kbfx.spec.in
+++ b/kbfx.spec.in
@@ -11,7 +11,7 @@
%define is_pclinuxos %(test -e /etc/pclinuxos-release && echo 1 || echo 0)
%if %{is_suse}
-%define prefix /opt/kde3
+%define prefix /opt/trinity
Group: System/GUI/KDE
Release: %{kbfx_release}.suse%(echo "%{suse_version}" | %__sed -e 's/.$//')
Requires: kdelibs3