diff options
Diffstat (limited to 'arts')
| -rw-r--r-- | arts/Makefile.am | 2 | ||||
| -rw-r--r-- | arts/kde/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | arts/kde/kartsserver.cpp | 4 | ||||
| -rw-r--r-- | arts/kde/mcop-dcop/Makefile.am | 2 | ||||
| -rw-r--r-- | arts/knotify/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | arts/knotify/Makefile.am | 2 | ||||
| -rw-r--r-- | arts/message/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | arts/message/Makefile.am | 2 |
8 files changed, 17 insertions, 17 deletions
diff --git a/arts/Makefile.am b/arts/Makefile.am index 31bd7bbbd..f15b8b7be 100644 --- a/arts/Makefile.am +++ b/arts/Makefile.am @@ -4,6 +4,6 @@ else SUBDIRS = knotify endif -DOXYGEN_REFERENCES = kio kdecore kdeui +DOXYGEN_REFERENCES = kio tdecore tdeui include ../admin/Doxyfile.am diff --git a/arts/kde/CMakeLists.txt b/arts/kde/CMakeLists.txt index 9c8028bb7..3877ddb9d 100644 --- a/arts/kde/CMakeLists.txt +++ b/arts/kde/CMakeLists.txt @@ -15,9 +15,9 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_BINARY_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_BINARY_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio/kio ) diff --git a/arts/kde/kartsserver.cpp b/arts/kde/kartsserver.cpp index a1b75e2f5..50e8b3a2a 100644 --- a/arts/kde/kartsserver.cpp +++ b/arts/kde/kartsserver.cpp @@ -77,7 +77,7 @@ Arts::SoundServerV2 KArtsServer::server(void) X11CommConfig.sync(); - proc << TQFile::encodeName(KStandardDirs::findExe(TQString::tqfromLatin1("kdeinit_wrapper"))).data(); + proc << TQFile::encodeName(KStandardDirs::findExe(TQString::tqfromLatin1("tdeinit_wrapper"))).data(); if(rt) proc << TQFile::encodeName(KStandardDirs::findExe(TQString::tqfromLatin1("artswrapper"))).data(); @@ -91,7 +91,7 @@ Arts::SoundServerV2 KArtsServer::server(void) // We could have a race-condition here. // The correct way to do it is to make artsd fork-and-exit // after starting to listen to connections (and running artsd - // directly instead of using kdeinit), but this is better + // directly instead of using tdeinit), but this is better // than nothing. int time = 0; do diff --git a/arts/kde/mcop-dcop/Makefile.am b/arts/kde/mcop-dcop/Makefile.am index 6e2b90eac..07d5e7a0f 100644 --- a/arts/kde/mcop-dcop/Makefile.am +++ b/arts/kde/mcop-dcop/Makefile.am @@ -3,7 +3,7 @@ INCLUDES= -I$(includedir)/arts -I$(top_srcdir)/arts/kde $(all_includes) bin_PROGRAMS= lib_LTLIBRARIES = -kdeinit_LTLIBRARIES = kmcop.la +tdeinit_LTLIBRARIES = kmcop.la kmcop_la_SOURCES = mcopdcopobject.cpp kmcop.cpp kmcop.skel kmcop_la_LIBADD = ../libartskde.la diff --git a/arts/knotify/CMakeLists.txt b/arts/knotify/CMakeLists.txt index 7871b1813..c290e9188 100644 --- a/arts/knotify/CMakeLists.txt +++ b/arts/knotify/CMakeLists.txt @@ -14,11 +14,11 @@ include_directories( ${ARTS_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR}/arts/kde ${CMAKE_SOURCE_DIR}/dcop - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ) link_directories( @@ -43,7 +43,7 @@ set( ${target}_SRCS if( ARTS_FOUND ) set( LIBS artskde-shared ) else( ARTS_FOUND ) - set( LIBS kdeui-shared ) + set( LIBS tdeui-shared ) endif( ARTS_FOUND ) tde_add_kpart( ${target} AUTOMOC diff --git a/arts/knotify/Makefile.am b/arts/knotify/Makefile.am index 9472b5dec..fea1a9e9c 100644 --- a/arts/knotify/Makefile.am +++ b/arts/knotify/Makefile.am @@ -15,7 +15,7 @@ knotify_la_METASOURCES = AUTO check_PROGRAMS = knotifytest knotifytest_SOURCES = knotifytest.cpp knotifytest_LDADD = $(LIB_KDECORE) -knotifytest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +knotifytest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor noinst_HEADERS = knotify.h diff --git a/arts/message/CMakeLists.txt b/arts/message/CMakeLists.txt index 1a07d3d94..12e91f65e 100644 --- a/arts/message/CMakeLists.txt +++ b/arts/message/CMakeLists.txt @@ -11,9 +11,9 @@ include_directories( ${TQT_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_BINARY_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ) link_directories( @@ -31,6 +31,6 @@ set( ${target}_SRCS tde_add_executable( ${target} SOURCES ${${target}_SRCS} - LINK kdeui-shared + LINK tdeui-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/arts/message/Makefile.am b/arts/message/Makefile.am index 19dbe8f2f..24b7a6d18 100644 --- a/arts/message/Makefile.am +++ b/arts/message/Makefile.am @@ -4,5 +4,5 @@ bin_PROGRAMS = artsmessage artsmessage_SOURCES = artsmessage.cc -artsmessage_LDADD = ../../kdeui/libtdeui.la +artsmessage_LDADD = ../../tdeui/libtdeui.la artsmessage_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(KDE_MT_LDFLAGS) |