diff options
Diffstat (limited to 'tdeutils')
| -rw-r--r-- | tdeutils/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tdeutils/Makefile.am | 2 | ||||
| -rw-r--r-- | tdeutils/kplugininfo.cpp | 2 | ||||
| -rw-r--r-- | tdeutils/ksettings/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tdeutils/ksettings/componentsdialog.cpp | 2 | ||||
| -rw-r--r-- | tdeutils/ksettings/dispatcher.cpp | 2 | ||||
| -rw-r--r-- | tdeutils/tdecmoduleloader.cpp | 4 | ||||
| -rw-r--r-- | tdeutils/tdecmoduleproxy.cpp | 10 | ||||
| -rw-r--r-- | tdeutils/tdecmoduleproxyIface.h | 4 | ||||
| -rw-r--r-- | tdeutils/tdecmoduleproxyIfaceImpl.cpp | 2 |
10 files changed, 16 insertions, 16 deletions
diff --git a/tdeutils/CMakeLists.txt b/tdeutils/CMakeLists.txt index 6f647a2b5..1e1982da4 100644 --- a/tdeutils/CMakeLists.txt +++ b/tdeutils/CMakeLists.txt @@ -19,7 +19,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/dcop ${CMAKE_SOURCE_DIR}/tdecore ${CMAKE_SOURCE_DIR}/tdeui - ${CMAKE_SOURCE_DIR}/kio/kio + ${CMAKE_SOURCE_DIR}/tdeio/tdeio ${CMAKE_SOURCE_DIR}/tdeutils ${CMAKE_SOURCE_DIR}/interfaces/kregexpeditor ) diff --git a/tdeutils/Makefile.am b/tdeutils/Makefile.am index 5ba725545..9bc3e2e49 100644 --- a/tdeutils/Makefile.am +++ b/tdeutils/Makefile.am @@ -4,7 +4,7 @@ INCLUDES = -I$(top_srcdir)/interfaces/kregexpeditor $(all_includes) lib_LTLIBRARIES = libtdeutils.la libtdeutils_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:0:2 # Needs KTrader -libtdeutils_la_LIBADD = ../kio/libkio.la ksettings/libksettings.la $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_X11) +libtdeutils_la_LIBADD = ../tdeio/libtdeio.la ksettings/libksettings.la $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_X11) libtdeutils_la_SOURCES = kfind.cpp kfinddialog.cpp kreplace.cpp \ kreplacedialog.cpp tdecmoduleinfo.cpp tdecmoduleloader.cpp \ diff --git a/tdeutils/kplugininfo.cpp b/tdeutils/kplugininfo.cpp index aec0a095c..2b4079bb8 100644 --- a/tdeutils/kplugininfo.cpp +++ b/tdeutils/kplugininfo.cpp @@ -21,7 +21,7 @@ #include <ksimpleconfig.h> #include <ktrader.h> #include <kdebug.h> -#include <kconfigbase.h> +#include <tdeconfigbase.h> #include <kglobal.h> #include <kstandarddirs.h> #include <kdesktopfile.h> diff --git a/tdeutils/ksettings/CMakeLists.txt b/tdeutils/ksettings/CMakeLists.txt index 7a1d5034d..b495c90db 100644 --- a/tdeutils/ksettings/CMakeLists.txt +++ b/tdeutils/ksettings/CMakeLists.txt @@ -16,7 +16,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/tdeutils ${CMAKE_SOURCE_DIR}/tdecore ${CMAKE_SOURCE_DIR}/tdeui - ${CMAKE_SOURCE_DIR}/kio/kio + ${CMAKE_SOURCE_DIR}/tdeio/tdeio ) ##### headers ################################### diff --git a/tdeutils/ksettings/componentsdialog.cpp b/tdeutils/ksettings/componentsdialog.cpp index 097d1f6d7..89a5e2cd7 100644 --- a/tdeutils/ksettings/componentsdialog.cpp +++ b/tdeutils/ksettings/componentsdialog.cpp @@ -26,7 +26,7 @@ #include <kplugininfo.h> #include <kiconloader.h> #include <kdebug.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kseparator.h> namespace KSettings diff --git a/tdeutils/ksettings/dispatcher.cpp b/tdeutils/ksettings/dispatcher.cpp index 590ca7e3c..3a423422f 100644 --- a/tdeutils/ksettings/dispatcher.cpp +++ b/tdeutils/ksettings/dispatcher.cpp @@ -23,7 +23,7 @@ #include <kstaticdeleter.h> #include <kdebug.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <assert.h> namespace KSettings diff --git a/tdeutils/tdecmoduleloader.cpp b/tdeutils/tdecmoduleloader.cpp index 73f6983d3..3627e1777 100644 --- a/tdeutils/tdecmoduleloader.cpp +++ b/tdeutils/tdecmoduleloader.cpp @@ -170,9 +170,9 @@ TDECModule* TDECModuleLoader::loadModule(const TDECModuleInfo &mod, ErrorReporti /* * Ok, we could not load the library. * Try to run it as an executable. - * This must not be done when calling from kcmshell, or you'll + * This must not be done when calling from tdecmshell, or you'll * have infinite recursion - * (startService calls kcmshell which calls modloader which calls startService...) + * (startService calls tdecmshell which calls modloader which calls startService...) * */ if(withfallback) diff --git a/tdeutils/tdecmoduleproxy.cpp b/tdeutils/tdecmoduleproxy.cpp index 673074c16..d124db091 100644 --- a/tdeutils/tdecmoduleproxy.cpp +++ b/tdeutils/tdecmoduleproxy.cpp @@ -151,7 +151,7 @@ TDECModule * TDECModuleProxy::realModule() const if( d->kcm ) return d->kcm; - /* /We/ have no kcm, but kcmshell running with root prevs does.. */ + /* /We/ have no kcm, but tdecmshell running with root prevs does.. */ if( d->rootMode ) return 0; @@ -329,7 +329,7 @@ void TDECModuleProxy::runAsRoot() lblBusy->show(); deleteClient(); - /* The DCOP registration is now gone, and it will occur again when kcmshell soon + /* The DCOP registration is now gone, and it will occur again when tdecmshell soon * registers. Here's a race condition in other words, but how likely is that? * * - It's a user initiated action, which means the user have to do weird stuff, very @@ -340,7 +340,7 @@ void TDECModuleProxy::runAsRoot() * the DCOP object is established. */ - /* Prepare the process to run the kcmshell */ + /* Prepare the process to run the tdecmshell */ TQString cmd = moduleInfo().service()->exec().stripWhiteSpace(); if (cmd.left(5) == "tdesu") { @@ -351,7 +351,7 @@ void TDECModuleProxy::runAsRoot() cmd = TQString(cmd.remove( 0, cmd.find( ' ' ) )).stripWhiteSpace(); } - if (cmd.left(8) == "kcmshell") + if (cmd.left(8) == "tdecmshell") cmd = TQString(cmd.remove(0,8)).stripWhiteSpace(); /* Run the process */ @@ -364,7 +364,7 @@ void TDECModuleProxy::runAsRoot() *d->rootProcess << tdesu; *d->rootProcess << "--nonewdcop" << "-n" << "-d" << TQString( "-i%1" ).arg(moduleInfo().icon()); - *d->rootProcess << TQString("%1 %2 --embed-proxy %3 --lang %4").arg(locate("exe", "kcmshell")) + *d->rootProcess << TQString("%1 %2 --embed-proxy %3 --lang %4").arg(locate("exe", "tdecmshell")) .arg(cmd).arg(d->embedWidget->winId()).arg(TDEGlobal::locale()->language()); connect(d->rootProcess, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(rootExited())); diff --git a/tdeutils/tdecmoduleproxyIface.h b/tdeutils/tdecmoduleproxyIface.h index 22bfa8e52..79d7a68ac 100644 --- a/tdeutils/tdecmoduleproxyIface.h +++ b/tdeutils/tdecmoduleproxyIface.h @@ -93,9 +93,9 @@ k_dcop_signals: * @ingroup tdecmodule * @brief DCOP interface for communicating with the real module running in root mode. * - * When a TDECModuleProxy tells kcmshell to load "itself" and embed into the + * When a TDECModuleProxy tells tdecmshell to load "itself" and embed into the * TDECModuleProxy, this DCOP interface is used to communicate to the real TDECModuleProxy, since - * the TDECModuleProxy which told kcmshell to load itself, is nothing but a shell. + * the TDECModuleProxy which told tdecmshell to load itself, is nothing but a shell. * * Currently is only the changed signal routed, but it's possible to proxy * the rest of the TDECModuleProxy API, if it turns out necessary. diff --git a/tdeutils/tdecmoduleproxyIfaceImpl.cpp b/tdeutils/tdecmoduleproxyIfaceImpl.cpp index 53019f72f..127831b02 100644 --- a/tdeutils/tdecmoduleproxyIfaceImpl.cpp +++ b/tdeutils/tdecmoduleproxyIfaceImpl.cpp @@ -100,7 +100,7 @@ TDECModuleProxyRootCommunicatorImpl::TDECModuleProxyRootCommunicatorImpl p( const_cast<TDECModuleProxy *>( client )) { /* - * Connect kcmshell's TDECModuleProxy's change signal + * Connect tdecmshell's TDECModuleProxy's change signal * to us, such that we act as a proxy for * TDECModuleProxy's API. */ |