Rename additional instances of KDE to TDE

13 years ago · 7b8aca4487
parent 58a743be18
commit 7b8aca4487
6 changed files with 19 additions and 19 deletions
--- a/cmakemodules/FindKdeLibs.cmake
+++ b/cmakemodules/FindKdeLibs.cmake
@ -7,7 +7,7 @@ include(FindQt3)
 #  KDE3_INCLUDE_DIR         - the KDE include directory
 #  KDE3_INCLUDE_DIRS        - the KDE and the Qt include directory, for use with INCLUDE_DIRECTORIES()
 #  KDE3_LIB_DIR             - the directory where the KDE libraries are installed, for use with LINK_DIRECTORIES()
-#  QT_AND_KDECORE_LIBS      - this contains both the Qt and the tdecore library
+#  QT_AND_TDECORE_LIBS      - this contains both the Qt and the tdecore library
 #  KDE3_DCOPIDL_EXECUTABLE  - the dcopidl executable
 #  KDE3_DCOPIDL2CPP_EXECUTABLE - the dcopidl2cpp executable
 #  KDE3_KCFGC_EXECUTABLE    - the kconfig_compiler executable
@ -55,7 +55,7 @@ include(FindQt3)
 #    If WITH_PREFIX is given, the resulting plugin will have the prefix "lib", otherwise it won't.
 #    It creates and installs an appropriate libtool la-file.
 #
-# KDE3_ADD_KDEINIT_EXECUTABLE(name file1 ... fileN )
+# KDE3_ADD_TDEINIT_EXECUTABLE(name file1 ... fileN )
 #    Create a KDE application in the form of a module loadable via tdeinit.
 #    A library named tdeinit_<name> will be created and a small executable which links to it.
 #
@ -139,7 +139,7 @@ FIND_PATH(KDE3_INCLUDE_DIR kpassdlg.h
 # SET(KDE3_INCLUDE_DIR "/usr/include/kde")

 #now the KDE library directory
-FIND_LIBRARY(KDE3_KDECORE_LIBRARY NAMES tdecore
+FIND_LIBRARY(KDE3_TDECORE_LIBRARY NAMES tdecore
  HINTS
  $ENV{KDEDIR}/lib
  ${KDE3PREFIX}/lib
@ -150,16 +150,16 @@ FIND_LIBRARY(KDE3_KDECORE_LIBRARY NAMES tdecore
  /usr/trinity/lib
 )

-SET(QT_AND_KDECORE_LIBS ${QT_LIBRARIES} ${KDE3_KDECORE_LIBRARY})
+SET(QT_AND_TDECORE_LIBS ${QT_LIBRARIES} ${KDE3_TDECORE_LIBRARY})

-GET_FILENAME_COMPONENT(KDE3_LIB_DIR ${KDE3_KDECORE_LIBRARY} PATH )
+GET_FILENAME_COMPONENT(KDE3_LIB_DIR ${KDE3_TDECORE_LIBRARY} PATH )

 IF(NOT KDE3_LIBTOOL_DIR)
-   IF(KDE3_KDECORE_LIBRARY MATCHES lib64)
+   IF(KDE3_TDECORE_LIBRARY MATCHES lib64)
     SET(KDE3_LIBTOOL_DIR /lib64/trinity)
-   ELSE(KDE3_KDECORE_LIBRARY MATCHES lib64)
+   ELSE(KDE3_TDECORE_LIBRARY MATCHES lib64)
     SET(KDE3_LIBTOOL_DIR /lib/trinity)
-   ENDIF(KDE3_KDECORE_LIBRARY MATCHES lib64)
+   ENDIF(KDE3_TDECORE_LIBRARY MATCHES lib64)
 ENDIF(NOT KDE3_LIBTOOL_DIR)

 #now search for the dcop utilities
--- a/cmakemodules/KDE3Macros.cmake
+++ b/cmakemodules/KDE3Macros.cmake
@ -12,7 +12,7 @@
 # KDE3_INSTALL_LIBTOOL_FILE
 # KDE3_CREATE_FINAL_FILE
 # KDE3_ADD_KPART
-# KDE3_ADD_KDEINIT_EXECUTABLE
+# KDE3_ADD_TDEINIT_EXECUTABLE
 # KDE3_ADD_EXECUTABLE


@ -360,7 +360,7 @@ MACRO(KDE3_ADD_KPART _target_NAME _with_PREFIX)
 ENDMACRO(KDE3_ADD_KPART)


-MACRO(KDE3_ADD_KDEINIT_EXECUTABLE _target_NAME )
+MACRO(KDE3_ADD_TDEINIT_EXECUTABLE _target_NAME )

   IF (KDE3_ENABLE_FINAL)
      KDE3_CREATE_FINAL_FILE(${_target_NAME}_final.cpp ${ARGN})
@ -374,7 +374,7 @@ MACRO(KDE3_ADD_KDEINIT_EXECUTABLE _target_NAME )
   ADD_EXECUTABLE( ${_target_NAME} ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_dummy.cpp )
   TARGET_LINK_LIBRARIES( ${_target_NAME} tdeinit_${_target_NAME} )

-ENDMACRO(KDE3_ADD_KDEINIT_EXECUTABLE)
+ENDMACRO(KDE3_ADD_TDEINIT_EXECUTABLE)


 MACRO(KDE3_ADD_EXECUTABLE _target_NAME )
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@ -34,7 +34,7 @@ ADD_EXECUTABLE(kdesvn ${kdesvnsrc})

 KDE3_ADD_KPART(tdesvnpart WITH_PREFIX ${partsrc})
 TARGET_LINK_LIBRARIES(tdesvnpart svnfrontend kdesvnhelpers ksvnwidgets settingsdlgs kdesvncfgreader svnqt
-    ${QT_AND_KDECORE_LIBS} ${KDE3_KIO_LIBRARY} ${KDE3_PART_LIBRARY} ${KDE3_UI_LIBRARY} ${KDE3_WALLET_LIBRARY} )
+    ${QT_AND_TDECORE_LIBS} ${KDE3_KIO_LIBRARY} ${KDE3_PART_LIBRARY} ${KDE3_UI_LIBRARY} ${KDE3_WALLET_LIBRARY} )
 SET_TARGET_PROPERTIES(tdesvnpart
    PROPERTIES
    LINK_FLAGS "${_BASE_LDADD} ${APR_EXTRA_LIBFLAGS} ${APU_EXTRA_LIBFLAGS} ${LINK_NO_UNDEFINED}")
@ -44,8 +44,8 @@ INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/src/svnqt)
 KDESVN_GENERATE_LIBTOOL_FILE(tdesvnpart)


-TARGET_LINK_LIBRARIES(kdesvnaskpass ${QT_AND_KDECORE_LIBS} ${KDE3_UI_LIBRARY})
-TARGET_LINK_LIBRARIES(kdesvn ${QT_AND_KDECORE_LIBS} ${KDE3_UI_LIBRARY} ${KDE3_PART_LIBRARY} ${KDE3_DCOP_LIBRARY} ${KDE3_KIO_LIBRARY})
+TARGET_LINK_LIBRARIES(kdesvnaskpass ${QT_AND_TDECORE_LIBS} ${KDE3_UI_LIBRARY})
+TARGET_LINK_LIBRARIES(kdesvn ${QT_AND_TDECORE_LIBS} ${KDE3_UI_LIBRARY} ${KDE3_PART_LIBRARY} ${KDE3_DCOP_LIBRARY} ${KDE3_KIO_LIBRARY})

 INSTALL(TARGETS kdesvn kdesvnaskpass tdesvnpart
    RUNTIME DESTINATION ${BIN_INSTALL_DIR}
--- a/src/kdesvn_part.h
+++ b/src/kdesvn_part.h
@ -18,8 +18,8 @@
 *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
 ***************************************************************************/

-#ifndef _KDESVNPART_H_
-#define _KDESVNPART_H_
+#ifndef _TDESVNPART_H_
+#define _TDESVNPART_H_

 #include "kdesvn-config.h"

@ -146,4 +146,4 @@ public slots:
    void properties();
 };

-#endif // _KDESVNPART_H_
+#endif // _TDESVNPART_H_
--- a/src/kdesvnd/CMakeLists.txt
+++ b/src/kdesvnd/CMakeLists.txt
@ -17,7 +17,7 @@ TARGET_LINK_LIBRARIES(kded_kdesvnd
    ksvnwidgets
    kdesvnhelpers
    kdesvncfgreader
-    ${QT_AND_KDECORE_LIBS} ${KDE3_KIO_LIBRARY} ${KDE3_DCOP_LIBRARY}
+    ${QT_AND_TDECORE_LIBS} ${KDE3_KIO_LIBRARY} ${KDE3_DCOP_LIBRARY}
    ${KDE3_UI_LIBRARY} ${KDE3_WALLET_LIBRARY} 
    ${KDE3_KINIT_KDED_LIBRARY})

--- a/src/kiosvn/CMakeLists.txt
+++ b/src/kiosvn/CMakeLists.txt
@ -10,7 +10,7 @@ TARGET_LINK_LIBRARIES(kio_ksvn
    svnqt
    kdesvnhelpers
    kdesvncfgreader
-    ${QT_AND_KDECORE_LIBS}
+    ${QT_AND_TDECORE_LIBS}
    ${KDE3_UI_LIBRARY} ${KDE3_DCOP_LIBRARY} ${KDE3_KIO_LIBRARY} ${KDE3_WALLET_LIBRARY})

 SET_TARGET_PROPERTIES(kio_ksvn