diff options
Diffstat (limited to 'kded')
| -rw-r--r-- | kded/CMakeLists.txt | 14 | ||||
| -rw-r--r-- | kded/Mainpage.dox | 4 | ||||
| -rw-r--r-- | kded/Makefile.am | 8 | ||||
| -rw-r--r-- | kded/kde-menu.cpp | 2 | ||||
| -rw-r--r-- | kded/kded.cpp | 8 |
5 files changed, 18 insertions, 18 deletions
diff --git a/kded/CMakeLists.txt b/kded/CMakeLists.txt index aa466d999..0b9a3d72a 100644 --- a/kded/CMakeLists.txt +++ b/kded/CMakeLists.txt @@ -14,10 +14,10 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_BINARY_DIR}/kdecore + ${CMAKE_BINARY_DIR}/tdecore ${CMAKE_SOURCE_DIR}/dcop - ${CMAKE_SOURCE_DIR}/kdecore - ${CMAKE_SOURCE_DIR}/kdeui + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdeui ${CMAKE_SOURCE_DIR}/kio ${CMAKE_SOURCE_DIR}/kio/kio ) @@ -47,9 +47,9 @@ set( ${target}_SRCS kded.cpp kdedmodule.cpp ) -# we must to export kdeinit_kded-shared because various +# we must to export tdeinit_kded-shared because various # modules need this library -tde_add_kdeinit_executable( ${target} AUTOMOC EXPORT +tde_add_tdeinit_executable( ${target} AUTOMOC EXPORT SOURCES ${${target}_SRCS} LINK kio-shared ) @@ -66,7 +66,7 @@ set( ${target}_SRCS kctimefactory.cpp vfolder_menu.cpp ) -tde_add_kdeinit_executable( ${target} AUTOMOC +tde_add_tdeinit_executable( ${target} AUTOMOC SOURCES ${${target}_SRCS} LINK kio-shared ) @@ -82,7 +82,7 @@ set( ${target}_SRCS tde_add_executable( ${target} SOURCES ${${target}_SRCS} - LINK kdecore-shared + LINK tdecore-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kded/Mainpage.dox b/kded/Mainpage.dox index 47f010f9d..50c0493d8 100644 --- a/kded/Mainpage.dox +++ b/kded/Mainpage.dox @@ -4,7 +4,7 @@ TrinityD runs in the background and performs a number of small tasks. Some of these tasks are built in, others are started on demand. <p> The chances are you are looking here because you want to write a -TrinityD module. For that, see TrinityDModule in kdecore and the +TrinityD module. For that, see TrinityDModule in tdecore and the <a href="http://websvn.kde.org/trunk/Trinity/kdelibs/kded/README.kded?view=markup">TrinityD README</a>. @@ -21,6 +21,6 @@ Waldo Bastian \<bastian@kde.org\> */ -// DOXYGEN_REFERENCES = kdecore kdeui kio +// DOXYGEN_REFERENCES = tdecore tdeui kio // DOXYGEN_SET_PROJECT_NAME = TrinityD // vim:ts=4:sw=4:expandtab:filetype=doxygen diff --git a/kded/Makefile.am b/kded/Makefile.am index 554a0e536..c91804b4b 100644 --- a/kded/Makefile.am +++ b/kded/Makefile.am @@ -20,7 +20,7 @@ INCLUDES= -I$(srcdir)/.. -I$(top_srcdir) $(all_includes) lib_LTLIBRARIES = -kdeinit_LTLIBRARIES = kded.la kbuildsycoca.la +tdeinit_LTLIBRARIES = kded.la kbuildsycoca.la kded_la_LDFLAGS = $(all_libraries) -module -avoid-version kded_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11) @@ -38,15 +38,15 @@ kbuildsycoca_la_SOURCES = kbuildsycoca.cpp kbuildservicetypefactory.cpp \ bin_PROGRAMS = kdontchangethehostname kde-menu kmimelist -kdontchangethehostname_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kdontchangethehostname_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor kdontchangethehostname_LDADD = $(LIB_KDECORE) kdontchangethehostname_SOURCES = khostname.cpp -kmimelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kmimelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor kmimelist_LDADD = ../kio/libkio.la kmimelist_SOURCES = kmimelist.cpp -kde_menu_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kde_menu_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor kde_menu_LDADD = $(LIB_KIO) kde_menu_SOURCES = kde-menu.cpp diff --git a/kded/kde-menu.cpp b/kded/kde-menu.cpp index 873ce154d..33faf6c7c 100644 --- a/kded/kde-menu.cpp +++ b/kded/kde-menu.cpp @@ -148,7 +148,7 @@ int main(int argc, char **argv) args.append("--checkstamps"); TQString command = "kbuildsycoca"; TQCString _launcher = KApplication::launcher(); - if (!DCOPRef(_launcher, _launcher).call("kdeinit_exec_wait", command, args).isValid()) + if (!DCOPRef(_launcher, _launcher).call("tdeinit_exec_wait", command, args).isValid()) { qWarning("Can't talk to klauncher!"); command = KGlobal::dirs()->findExe(command); diff --git a/kded/kded.cpp b/kded/kded.cpp index 1d234ac06..2a634ff5c 100644 --- a/kded/kded.cpp +++ b/kded/kded.cpp @@ -75,17 +75,17 @@ static void runBuildSycoca(TQObject *callBackObj=0, const char *callBackSlot=0) dataStream << TQString("kbuildsycoca") << args; TQCString _launcher = KApplication::launcher(); - kapp->dcopClient()->callAsync(_launcher, _launcher, "kdeinit_exec_wait(TQString,TQStringList)", data, callBackObj, callBackSlot); + kapp->dcopClient()->callAsync(_launcher, _launcher, "tdeinit_exec_wait(TQString,TQStringList)", data, callBackObj, callBackSlot); } else { - KApplication::kdeinitExecWait( "kbuildsycoca", args ); + KApplication::tdeinitExecWait( "kbuildsycoca", args ); } } static void runKonfUpdate() { - KApplication::kdeinitExecWait( "kconf_update", TQStringList(), 0, 0, "0" /*no startup notification*/ ); + KApplication::tdeinitExecWait( "kconf_update", TQStringList(), 0, 0, "0" /*no startup notification*/ ); } static void runDontChangeHostname(const TQCString &oldName, const TQCString &newName) @@ -93,7 +93,7 @@ static void runDontChangeHostname(const TQCString &oldName, const TQCString &new TQStringList args; args.append(TQFile::decodeName(oldName)); args.append(TQFile::decodeName(newName)); - KApplication::kdeinitExecWait( "kdontchangethehostname", args ); + KApplication::tdeinitExecWait( "kdontchangethehostname", args ); } Kded::Kded(bool checkUpdates, bool new_startup) |