diff options
Diffstat (limited to 'kded')
27 files changed, 269 insertions, 269 deletions
diff --git a/kded/CMakeLists.txt b/kded/CMakeLists.txt index 903126ca8..ee693fb4a 100644 --- a/kded/CMakeLists.txt +++ b/kded/CMakeLists.txt @@ -18,8 +18,8 @@ include_directories( ${CMAKE_SOURCE_DIR}/dcop ${CMAKE_SOURCE_DIR}/tdecore ${CMAKE_SOURCE_DIR}/tdeui - ${CMAKE_SOURCE_DIR}/kio - ${CMAKE_SOURCE_DIR}/kio/kio + ${CMAKE_SOURCE_DIR}/tdeio + ${CMAKE_SOURCE_DIR}/tdeio/tdeio ) link_directories( @@ -51,16 +51,16 @@ set( ${target}_SRCS # modules need this library tde_add_tdeinit_executable( ${target} AUTOMOC EXPORT SOURCES ${${target}_SRCS} - LINK kio-shared + LINK tdeio-shared ) -#### kbuildsycoca ############################### +#### tdebuildsycoca ############################### -set( target kbuildsycoca ) +set( target tdebuildsycoca ) set( ${target}_SRCS - kbuildsycoca.cpp kbuildservicetypefactory.cpp + tdebuildsycoca.cpp kbuildservicetypefactory.cpp kbuildservicefactory.cpp kbuildservicegroupfactory.cpp kbuildimageiofactory.cpp kbuildprotocolinfofactory.cpp kctimefactory.cpp vfolder_menu.cpp @@ -68,7 +68,7 @@ set( ${target}_SRCS tde_add_tdeinit_executable( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK kio-shared + LINK tdeio-shared ) @@ -87,31 +87,31 @@ tde_add_executable( ${target} ) -#### kde-menu ################################### +#### tde-menu ################################### -set( target kde-menu ) +set( target tde-menu ) set( ${target}_SRCS - kde-menu.cpp + tde-menu.cpp ) tde_add_executable( ${target} SOURCES ${${target}_SRCS} - LINK kio-shared + LINK tdeio-shared DESTINATION ${BIN_INSTALL_DIR} ) -#### kmimelist ################################## +#### tdemimelist ################################## -set( target kmimelist ) +set( target tdemimelist ) set( ${target}_SRCS - kmimelist.cpp + tdemimelist.cpp ) tde_add_executable( ${target} SOURCES ${${target}_SRCS} - LINK kio-shared + LINK tdeio-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kded/DESIGN b/kded/DESIGN index 702fca853..0fffb0456 100644 --- a/kded/DESIGN +++ b/kded/DESIGN @@ -6,15 +6,15 @@ cache of servicetypes, mimetypes and services, for a particular user. It uses KDirWatch to monitor the directories contain the .desktop files. When a file is added/removed, it waits 5 seconds (in case of series of -updates), and then launches kbuildsycoca. +updates), and then launches tdebuildsycoca. -kbuildsycoca recreates the sycoca file by: +tdebuildsycoca recreates the sycoca file by: * parsing all .desktop files, replacing global ones by local ones (at any level of the hierarchy) * creating all objects in memory -* saving everything in the sycoca file (see below for ksycoca internals) +* saving everything in the sycoca file (see below for tdesycoca internals) * clearing all memory -* notifying the applications that use ksycoca by a DCOP call to the ksycoca +* notifying the applications that use tdesycoca by a DCOP call to the tdesycoca object (KSycoca::notifyDatabaseChanged()). Format of the sycoca database file diff --git a/kded/Makefile.am b/kded/Makefile.am index ba49c2c8f..093b5db0e 100644 --- a/kded/Makefile.am +++ b/kded/Makefile.am @@ -20,15 +20,15 @@ INCLUDES= -I$(srcdir)/.. -I$(top_srcdir) $(all_includes) lib_LTLIBRARIES = -tdeinit_LTLIBRARIES = kded.la kbuildsycoca.la +tdeinit_LTLIBRARIES = kded.la tdebuildsycoca.la kded_la_LDFLAGS = $(all_libraries) -module -avoid-version kded_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11) kded_la_SOURCES = kded.cpp kdedmodule.cpp -kbuildsycoca_la_LDFLAGS = $(all_libraries) -module -avoid-version -kbuildsycoca_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE) -kbuildsycoca_la_SOURCES = kbuildsycoca.cpp kbuildservicetypefactory.cpp \ +tdebuildsycoca_la_LDFLAGS = $(all_libraries) -module -avoid-version +tdebuildsycoca_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDECORE) +tdebuildsycoca_la_SOURCES = tdebuildsycoca.cpp kbuildservicetypefactory.cpp \ kbuildservicefactory.cpp \ kbuildservicegroupfactory.cpp \ kbuildimageiofactory.cpp \ @@ -36,25 +36,25 @@ kbuildsycoca_la_SOURCES = kbuildsycoca.cpp kbuildservicetypefactory.cpp \ kctimefactory.cpp \ vfolder_menu.cpp -bin_PROGRAMS = kdontchangethehostname kde-menu kmimelist +bin_PROGRAMS = kdontchangethehostname tde-menu tdemimelist -kdontchangethehostname_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kdontchangethehostname_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kdontchangethehostname_LDADD = $(LIB_TDECORE) kdontchangethehostname_SOURCES = khostname.cpp -kmimelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -kmimelist_LDADD = ../kio/libkio.la -kmimelist_SOURCES = kmimelist.cpp +tdemimelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +tdemimelist_LDADD = ../tdeio/libtdeio.la +tdemimelist_SOURCES = tdemimelist.cpp -kde_menu_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kde_menu_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kde_menu_LDADD = $(LIB_KIO) -kde_menu_SOURCES = kde-menu.cpp +kde_menu_SOURCES = tde-menu.cpp METASOURCES = AUTO include_HEADERS = kdedmodule.h -noinst_HEADERS = kbuildsycoca.h kbuildservicetypefactory.h \ +noinst_HEADERS = tdebuildsycoca.h kbuildservicetypefactory.h \ kbuildservicefactory.h kbuildservicegroupfactory.h \ kbuildimageiofactory.h kresourcelist.h \ kbuildprotocolinfofactory.h @@ -65,7 +65,7 @@ servicetypedir = $(kde_servicetypesdir) xdg_menu_DATA = applications.menu applications.menu-no-kde update_DATA = kded.upd -updatedir = $(kde_datadir)/kconf_update +updatedir = $(kde_datadir)/tdeconf_update include $(top_srcdir)/admin/Doxyfile.am diff --git a/kded/README.kded b/kded/README.kded index f0ff64d41..7265a1084 100644 --- a/kded/README.kded +++ b/kded/README.kded @@ -6,20 +6,20 @@ Some of these tasks are built in, others are started on demand. Built in tasks ============== -*) Checking for newly installed software and updating ksycoca when new -software is detected. Updating of ksycoca is done by the program kbuildsycoca +*) Checking for newly installed software and updating tdesycoca when new +software is detected. Updating of tdesycoca is done by the program tdebuildsycoca which gets started by kded. When kded is first started it always runs -kbuildsycoca to ensure that ksycoca is up to date. +tdebuildsycoca to ensure that tdesycoca is up to date. *) Checking for newly installed update files. Applications can install *.upd update files. These *.upd files are used to update configuration files of users, primarily when new versions of applications are installed with (slightly) different configuration file formats. Updating of configuration -files is done by kconf_update. kded starts kconf_update when it detects a -new update file. When kded is first started it always runs kconf_update to -ensure that it has not missed any update files. kconf_update keeps track +files is done by tdeconf_update. kded starts tdeconf_update when it detects a +new update file. When kded is first started it always runs tdeconf_update to +ensure that it has not missed any update files. tdeconf_update keeps track of which update files have been processed already in the config-file -kconf_updaterc. It only performs a certain update once. +tdeconf_updaterc. It only performs a certain update once. *) Checking for hostname changes. It is a really bad idea to change the hostname of a running system and it usually only happens with incorrectly @@ -40,14 +40,14 @@ the hostname is checked for changes. The time is specified in milliseconds and has a default of 5000 (5 seconds). CheckSycoca: This option can be used to disable checking for new software. -ksycoca will still be built when kded starts up and when applications -explicitly request a rebuild of the ksycoca database. The user can -also manually rebuild ksycoca by running the kbuildsycoca program. +tdesycoca will still be built when kded starts up and when applications +explicitly request a rebuild of the tdesycoca database. The user can +also manually rebuild tdesycoca by running the tdebuildsycoca program. The default value of this option is "true". Checking can be disabled by setting this option to "false". CheckUpdates: This option can be used to disable checking for update files. -kconf_update will still be run when kded starts up. +tdeconf_update will still be run when kded starts up. The default value of this option is "true". Checking can be disabled by setting this option to "false". diff --git a/kded/kbuildimageiofactory.cpp b/kded/kbuildimageiofactory.cpp index a0a3ce76e..b5873cad8 100644 --- a/kded/kbuildimageiofactory.cpp +++ b/kded/kbuildimageiofactory.cpp @@ -16,14 +16,14 @@ * Boston, MA 02110-1301, USA. **/ -#include "ksycoca.h" -#include "ksycocadict.h" +#include "tdesycoca.h" +#include "tdesycocadict.h" #include "kresourcelist.h" -#include <kglobal.h> +#include <tdeglobal.h> #include <kstandarddirs.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <assert.h> #include <kimageiofactory.h> diff --git a/kded/kbuildimageiofactory.h b/kded/kbuildimageiofactory.h index 65197e17f..4a1caa81f 100644 --- a/kded/kbuildimageiofactory.h +++ b/kded/kbuildimageiofactory.h @@ -23,7 +23,7 @@ #include <tqstringlist.h> /** - * Service group factory for building ksycoca + * Service group factory for building tdesycoca * @internal */ class KBuildImageIOFactory : public KImageIOFactory diff --git a/kded/kbuildprotocolinfofactory.cpp b/kded/kbuildprotocolinfofactory.cpp index c17b1e772..921e55ab9 100644 --- a/kded/kbuildprotocolinfofactory.cpp +++ b/kded/kbuildprotocolinfofactory.cpp @@ -17,15 +17,15 @@ **/ #include "kbuildprotocolinfofactory.h" -#include "ksycoca.h" -#include "ksycocadict.h" +#include "tdesycoca.h" +#include "tdesycocadict.h" #include "kresourcelist.h" -#include <kglobal.h> +#include <tdeglobal.h> #include <kstandarddirs.h> #include <kmessageboxwrapper.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <assert.h> KBuildProtocolInfoFactory::KBuildProtocolInfoFactory() : diff --git a/kded/kbuildprotocolinfofactory.h b/kded/kbuildprotocolinfofactory.h index e4ddcf6b8..4230670f4 100644 --- a/kded/kbuildprotocolinfofactory.h +++ b/kded/kbuildprotocolinfofactory.h @@ -24,7 +24,7 @@ #include <tqstringlist.h> /** - * Protocol Info factory for building ksycoca + * Protocol Info factory for building tdesycoca * @internal */ class KBuildProtocolInfoFactory : public KProtocolInfoFactory diff --git a/kded/kbuildservicefactory.cpp b/kded/kbuildservicefactory.cpp index 8cc2e9462..6f127caf2 100644 --- a/kded/kbuildservicefactory.cpp +++ b/kded/kbuildservicefactory.cpp @@ -18,15 +18,15 @@ **/ #include "kbuildservicefactory.h" -#include "ksycoca.h" -#include "ksycocadict.h" +#include "tdesycoca.h" +#include "tdesycocadict.h" #include "kresourcelist.h" #include "kmimetype.h" -#include <kglobal.h> +#include <tdeglobal.h> #include <kstandarddirs.h> #include <kmessageboxwrapper.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <assert.h> diff --git a/kded/kbuildservicefactory.h b/kded/kbuildservicefactory.h index eca439c5d..e0497bb9e 100644 --- a/kded/kbuildservicefactory.h +++ b/kded/kbuildservicefactory.h @@ -29,7 +29,7 @@ #include <kbuildservicegroupfactory.h> /** - * Service factory for building ksycoca + * Service factory for building tdesycoca * @internal */ class KBuildServiceFactory : public KServiceFactory diff --git a/kded/kbuildservicegroupfactory.cpp b/kded/kbuildservicegroupfactory.cpp index e231cd5da..3903a6b39 100644 --- a/kded/kbuildservicegroupfactory.cpp +++ b/kded/kbuildservicegroupfactory.cpp @@ -17,15 +17,15 @@ **/ #include "kbuildservicegroupfactory.h" -#include "ksycoca.h" -#include "ksycocadict.h" +#include "tdesycoca.h" +#include "tdesycocadict.h" #include "kresourcelist.h" -#include <kglobal.h> +#include <tdeglobal.h> #include <kstandarddirs.h> #include <kmessageboxwrapper.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <assert.h> KBuildServiceGroupFactory::KBuildServiceGroupFactory() : diff --git a/kded/kbuildservicegroupfactory.h b/kded/kbuildservicegroupfactory.h index 23666fd0f..23b484cdb 100644 --- a/kded/kbuildservicegroupfactory.h +++ b/kded/kbuildservicegroupfactory.h @@ -24,7 +24,7 @@ #include <tqstringlist.h> /** - * Service group factory for building ksycoca + * Service group factory for building tdesycoca * @internal */ class KBuildServiceGroupFactory : public KServiceGroupFactory diff --git a/kded/kbuildservicetypefactory.cpp b/kded/kbuildservicetypefactory.cpp index c017a91e1..da2863347 100644 --- a/kded/kbuildservicetypefactory.cpp +++ b/kded/kbuildservicetypefactory.cpp @@ -17,15 +17,15 @@ **/ #include "kbuildservicetypefactory.h" -#include "ksycoca.h" -#include "ksycocadict.h" +#include "tdesycoca.h" +#include "tdesycocadict.h" #include "kresourcelist.h" -#include <kglobal.h> +#include <tdeglobal.h> #include <kstandarddirs.h> #include <kmessageboxwrapper.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <assert.h> #include <kdesktopfile.h> diff --git a/kded/kbuildservicetypefactory.h b/kded/kbuildservicetypefactory.h index a68b8851b..68fb6c8fb 100644 --- a/kded/kbuildservicetypefactory.h +++ b/kded/kbuildservicetypefactory.h @@ -24,7 +24,7 @@ #include <tqstringlist.h> /** - * Service-type factory for building ksycoca + * Service-type factory for building tdesycoca * @internal */ class KBuildServiceTypeFactory : public KServiceTypeFactory diff --git a/kded/kctimefactory.cpp b/kded/kctimefactory.cpp index 966966a48..f6fd68859 100644 --- a/kded/kctimefactory.cpp +++ b/kded/kctimefactory.cpp @@ -17,8 +17,8 @@ **/ #include "kctimefactory.h" -#include "ksycoca.h" -#include "ksycocatype.h" +#include "tdesycoca.h" +#include "tdesycocatype.h" #include <assert.h> diff --git a/kded/kctimefactory.h b/kded/kctimefactory.h index 64cfe6c19..d415545b1 100644 --- a/kded/kctimefactory.h +++ b/kded/kctimefactory.h @@ -19,11 +19,11 @@ #ifndef __k_ctime_factory_h__ #define __k_ctime_factory_h__ -#include <ksycocafactory.h> +#include <tdesycocafactory.h> #include <tqdict.h> /** - * Service group factory for building ksycoca + * Service group factory for building tdesycoca * @internal */ class KCTimeInfo : public KSycocaFactory diff --git a/kded/kded.cpp b/kded/kded.cpp index 4b891d48a..947d3b816 100644 --- a/kded/kded.cpp +++ b/kded/kded.cpp @@ -36,16 +36,16 @@ #include <dcopclient.h> #include <kuniqueapplication.h> -#include <kcmdlineargs.h> -#include <kaboutdata.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdecmdlineargs.h> +#include <tdeaboutdata.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kprocess.h> #include <kdebug.h> #include <kdirwatch.h> #include <kstandarddirs.h> #include <kdatastream.h> -#include <kio/global.h> +#include <tdeio/global.h> #include <kservicetype.h> #ifdef Q_WS_X11 @@ -72,20 +72,20 @@ static void runBuildSycoca(TQObject *callBackObj=0, const char *callBackSlot=0) { TQByteArray data; TQDataStream dataStream( data, IO_WriteOnly ); - dataStream << TQString("kbuildsycoca") << args; - TQCString _launcher = KApplication::launcher(); + dataStream << TQString("tdebuildsycoca") << args; + TQCString _launcher = TDEApplication::launcher(); kapp->dcopClient()->callAsync(_launcher, _launcher, "tdeinit_exec_wait(TQString,TQStringList)", data, callBackObj, callBackSlot); } else { - KApplication::tdeinitExecWait( "kbuildsycoca", args ); + TDEApplication::tdeinitExecWait( "tdebuildsycoca", args ); } } static void runKonfUpdate() { - KApplication::tdeinitExecWait( "kconf_update", TQStringList(), 0, 0, "0" /*no startup notification*/ ); + TDEApplication::tdeinitExecWait( "tdeconf_update", TQStringList(), 0, 0, "0" /*no startup notification*/ ); } static void runDontChangeHostname(const TQCString &oldName, const TQCString &newName) @@ -93,22 +93,22 @@ static void runDontChangeHostname(const TQCString &oldName, const TQCString &new TQStringList args; args.append(TQFile::decodeName(oldName)); args.append(TQFile::decodeName(newName)); - KApplication::tdeinitExecWait( "kdontchangethehostname", args ); + TDEApplication::tdeinitExecWait( "kdontchangethehostname", args ); } Kded::Kded(bool checkUpdates, bool new_startup) - : DCOPObject("kbuildsycoca"), DCOPObjectProxy(), + : DCOPObject("tdebuildsycoca"), DCOPObjectProxy(), b_checkUpdates(checkUpdates), m_needDelayedCheck(false), m_newStartup( new_startup ) { _self = this; TQCString cPath; - TQCString ksycoca_env = getenv("TDESYCOCA"); - if (ksycoca_env.isEmpty()) - cPath = TQFile::encodeName(KGlobal::dirs()->saveLocation("tmp")+"ksycoca"); + TQCString tdesycoca_env = getenv("TDESYCOCA"); + if (tdesycoca_env.isEmpty()) + cPath = TQFile::encodeName(TDEGlobal::dirs()->saveLocation("tmp")+"tdesycoca"); else - cPath = ksycoca_env; + cPath = tdesycoca_env; m_pTimer = new TQTimer(this); connect(m_pTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(recreate())); @@ -139,7 +139,7 @@ bool Kded::process(const TQCString &obj, const TQCString &fun, const TQByteArray &data, TQCString &replyType, TQByteArray &replyData) { - if (obj == "ksycoca") return false; // Ignore this one. + if (obj == "tdesycoca") return false; // Ignore this one. if (m_dontLoad[obj]) return false; @@ -155,7 +155,7 @@ bool Kded::process(const TQCString &obj, const TQCString &fun, void Kded::initModules() { m_dontLoad.clear(); - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); bool kde_running = !( getenv( "TDE_FULL_SESSION" ) == NULL || getenv( "TDE_FULL_SESSION" )[ 0 ] == '\0' ); // not the same user like the one running the session (most likely we're run via sudo or something) if( getenv( "TDE_SESSION_UID" ) != NULL && uid_t( atoi( getenv( "TDE_SESSION_UID" ))) != getuid()) @@ -225,7 +225,7 @@ void Kded::initModules() void Kded::loadSecondPhase() { kdDebug(7020) << "Loading second phase autoload" << endl; - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); KService::List kdedModules = KServiceType::offers("KDEDModule"); for(KService::List::ConstIterator it = kdedModules.begin(); it != kdedModules.end(); ++it) { @@ -450,7 +450,7 @@ tqWarning("Last DCOP call before KDED crash was from application '%s'\n" void Kded::installCrashHandler() { - KCrash::setEmergencySaveFunction(crashHandler); + TDECrash::setEmergencySaveFunction(crashHandler); } void Kded::recreate() @@ -468,7 +468,7 @@ void Kded::runDelayedCheck() void Kded::recreate(bool initial) { m_recreateBusy = true; - // Using KLauncher here is difficult since we might not have a + // Using TDELauncher here is difficult since we might not have a // database if (!initial) @@ -484,7 +484,7 @@ void Kded::recreate(bool initial) recreateDone(); if(delayedCheck) { - // do a proper ksycoca check after a delay + // do a proper tdesycoca check after a delay TQTimer::singleShot( 60000, this, TQT_SLOT( runDelayedCheck())); m_needDelayedCheck = true; delayedCheck = false; @@ -665,7 +665,7 @@ KUpdateD::KUpdateD() TQObject::connect( m_pDirWatch, TQT_SIGNAL(dirty(const TQString&)), this, TQT_SLOT(slotNewUpdateFile())); - TQStringList dirs = KGlobal::dirs()->findDirs("data", "kconf_update"); + TQStringList dirs = TDEGlobal::dirs()->findDirs("data", "tdeconf_update"); for( TQStringList::ConstIterator it = dirs.begin(); it != dirs.end(); ++it ) @@ -730,11 +730,11 @@ void KHostnameD::checkHostname() } -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "check", I18N_NOOP("Check Sycoca database only once"), 0 }, { "new-startup", "Internal", 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; class KDEDQtDCOPObject : public DCOPObject @@ -872,26 +872,26 @@ public: extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) { - KAboutData aboutData( "kded", I18N_NOOP("TDE Daemon"), + TDEAboutData aboutData( "kded", I18N_NOOP("TDE Daemon"), "$Id$", I18N_NOOP("TDE Daemon - triggers Sycoca database updates when needed")); - KApplication::installSigpipeHandler(); + TDEApplication::installSigpipeHandler(); - KCmdLineArgs::init(argc, argv, &aboutData); + TDECmdLineArgs::init(argc, argv, &aboutData); KUniqueApplication::addCmdLineOptions(); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::addCmdLineOptions( options ); // this program is in tdelibs so it uses tdelibs as catalog - KLocale::setMainCatalogue("tdelibs"); + TDELocale::setMainCatalogue("tdelibs"); // WABA: Make sure not to enable session management. putenv(strdup("SESSION_MANAGER=")); // Parse command line before checking DCOP - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); // Check DCOP communication. { @@ -904,8 +904,8 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) } } - KInstance *instance = new KInstance(&aboutData); - KConfig *config = instance->config(); // Enable translations. + TDEInstance *instance = new TDEInstance(&aboutData); + TDEConfig *config = instance->config(); // Enable translations. if (args->isSet("check")) { @@ -957,11 +957,11 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) // During startup kdesktop waits for KDED to finish. // Send a notifyDatabaseChanged signal even if the database hasn't // changed. - // If the database changed, kbuildsycoca's signal didn't go anywhere + // If the database changed, tdebuildsycoca's signal didn't go anywhere // anyway, because it was too early, so let's send this signal // unconditionnally (David) TQByteArray data; - client->send( "*", "ksycoca", "notifyDatabaseChanged()", data ); + client->send( "*", "tdesycoca", "notifyDatabaseChanged()", data ); client->send( "ksplash", "", "upAndRunning(TQString)", TQString("kded")); #ifdef Q_WS_X11 XEvent e; diff --git a/kded/kded.h b/kded/kded.h index b30549083..a4968624a 100644 --- a/kded/kded.h +++ b/kded/kded.h @@ -29,15 +29,15 @@ #include <dcopclient.h> #include <dcopobject.h> -#include <ksycoca.h> -#include <ksycocatype.h> +#include <tdesycoca.h> +#include <tdesycocatype.h> #include <kdedmodule.h> #include <klibloader.h> class KDirWatch; class KService; -// No need for this in libkio - apps only get readonly access +// No need for this in libtdeio - apps only get readonly access class Kded : public TQObject, public DCOPObject, public DCOPObjectProxy { Q_OBJECT diff --git a/kded/kdedmodule.cpp b/kded/kdedmodule.cpp index ca28a5c62..61da755b3 100644 --- a/kded/kdedmodule.cpp +++ b/kded/kdedmodule.cpp @@ -24,9 +24,9 @@ #include "kded.h" #include "kdedmodule.h" -#include "kconfigdata.h" +#include "tdeconfigdata.h" -typedef TQMap<KEntryKey, KSharedPtr<KShared> > KDEDObjectMap; +typedef TQMap<KEntryKey, TDESharedPtr<TDEShared> > KDEDObjectMap; class KDEDModulePrivate { @@ -62,7 +62,7 @@ void KDEDModule::resetIdle() d->timer.start(d->timeout, true); } -void KDEDModule::insert(const TQCString &app, const TQCString &key, KShared *obj) +void KDEDModule::insert(const TQCString &app, const TQCString &key, TDEShared *obj) { if (!d->objMap) d->objMap = new KDEDObjectMap; @@ -74,13 +74,13 @@ void KDEDModule::insert(const TQCString &app, const TQCString &key, KShared *obj KEntryKey indexKey(app, key); // Prevent deletion in case the same object is inserted again. - KSharedPtr<KShared> _obj = obj; + TDESharedPtr<TDEShared> _obj = obj; d->objMap->replace(indexKey, _obj); resetIdle(); } -KShared * KDEDModule::find(const TQCString &app, const TQCString &key) +TDEShared * KDEDModule::find(const TQCString &app, const TQCString &key) { if (!d->objMap) return 0; diff --git a/kded/kdedmodule.h b/kded/kdedmodule.h index 855a02824..f3954e842 100644 --- a/kded/kdedmodule.h +++ b/kded/kdedmodule.h @@ -91,12 +91,12 @@ public: * Any previous object inserted with the same values for @p app * and @p key will be removed. */ - void insert(const TQCString &app, const TQCString &key, KShared *obj); + void insert(const TQCString &app, const TQCString &key, TDEShared *obj); /** * Lookup object indexed with @p app and @p key */ - KShared *find(const TQCString &app, const TQCString &key); + TDEShared *find(const TQCString &app, const TQCString &key); /** * remove object indexed with @p app and @p key. diff --git a/kded/khostname.cpp b/kded/khostname.cpp index d8c568869..c78152b97 100644 --- a/kded/khostname.cpp +++ b/kded/khostname.cpp @@ -28,19 +28,19 @@ #include <dcopclient.h> -#include <kcmdlineargs.h> -#include <kapplication.h> -#include <klocale.h> -#include <kaboutdata.h> -#include <kglobal.h> +#include <tdecmdlineargs.h> +#include <tdeapplication.h> +#include <tdelocale.h> +#include <tdeaboutdata.h> +#include <tdeglobal.h> #include <kstandarddirs.h> #include <kprocess.h> #include <kde_file.h> -static KCmdLineOptions options[] = { +static TDECmdLineOptions options[] = { { "+old", I18N_NOOP("Old hostname"), 0 }, { "+new", I18N_NOOP("New hostname"), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; static const char appName[] = "kdontchangethehostname"; @@ -65,7 +65,7 @@ protected: KHostName::KHostName() { - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); if (args->count() != 2) args->usage(); oldName = args->arg(0); @@ -166,15 +166,15 @@ void KHostName::changeX() // don't nuke the xauth when XAUTHLOCALHOSTNAME points to it if (!xauthlocalhostname || oldNetId != xauthlocalhostname) { - cmd = "xauth -n remove "+KProcess::quote(netId); + cmd = "xauth -n remove "+TDEProcess::quote(netId); system(TQFile::encodeName(cmd)); } cmd = "xauth -n add "; - cmd += KProcess::quote(newNetId); + cmd += TDEProcess::quote(newNetId); cmd += " "; - cmd += KProcess::quote(authName); + cmd += TDEProcess::quote(authName); cmd += " "; - cmd += KProcess::quote(authKey); + cmd += TDEProcess::quote(authKey); system(TQFile::encodeName(cmd)); } } @@ -236,7 +236,7 @@ void KHostName::changeDcop() ::symlink(fname.data(), compatLink.data()); // Compatibility link // Update .ICEauthority - TQString cmd = "iceauth list "+KProcess::quote("netid="+oldNetId); + TQString cmd = "iceauth list "+TDEProcess::quote("netid="+oldNetId); FILE *iceFile = popen(TQFile::encodeName(cmd), "r"); if (!iceFile) { @@ -272,13 +272,13 @@ void KHostName::changeDcop() continue; cmd = "iceauth add "; - cmd += KProcess::quote(protName); + cmd += TDEProcess::quote(protName); cmd += " '' "; - cmd += KProcess::quote(newNetId); + cmd += TDEProcess::quote(newNetId); cmd += " "; - cmd += KProcess::quote(authName); + cmd += TDEProcess::quote(authName); cmd += " "; - cmd += KProcess::quote(authKey); + cmd += TDEProcess::quote(authKey); system(TQFile::encodeName(cmd)); } } @@ -288,7 +288,7 @@ void KHostName::changeDcop() char* xauthlocalhostname = getenv("XAUTHLOCALHOSTNAME"); if (!xauthlocalhostname || !oldNetId.contains(xauthlocalhostname)) { - TQString cmd = "iceauth remove "+KProcess::quote("netid="+oldNetId); + TQString cmd = "iceauth remove "+TDEProcess::quote("netid="+oldNetId); system(TQFile::encodeName(cmd)); unlink(origFName.data()); origFName = DCOPClient::dcopServerFileOld(oldName); // Compatibility link @@ -299,8 +299,8 @@ void KHostName::changeDcop() void KHostName::changeStdDirs(const TQCString &type) { // We make links to the old dirs cause we can't delete the old dirs. - TQCString oldDir = TQFile::encodeName(TQString("%1%2-%3").arg(KGlobal::dirs()->localtdedir()).arg(type.data()).arg(oldName.data())); - TQCString newDir = TQFile::encodeName(TQString("%1%2-%3").arg(KGlobal::dirs()->localtdedir()).arg(type.data()).arg(newName.data())); + TQCString oldDir = TQFile::encodeName(TQString("%1%2-%3").arg(TDEGlobal::dirs()->localtdedir()).arg(type.data()).arg(oldName.data())); + TQCString newDir = TQFile::encodeName(TQString("%1%2-%3").arg(TDEGlobal::dirs()->localtdedir()).arg(type.data()).arg(newName.data())); KDE_struct_stat st_buf; @@ -358,23 +358,23 @@ void KHostName::changeSessionManager() delete client; return; } - TQCString launcher = KApplication::launcher(); + TQCString launcher = TDEApplication::launcher(); client->send(launcher, launcher, "setLaunchEnv(TQCString,TQCString)", params); delete client; } int main(int argc, char **argv) { - KLocale::setMainCatalogue("tdelibs"); - KAboutData d(appName, I18N_NOOP("KDontChangeTheHostName"), appVersion, + TDELocale::setMainCatalogue("tdelibs"); + TDEAboutData d(appName, I18N_NOOP("KDontChangeTheHostName"), appVersion, I18N_NOOP("Informs TDE about a change in hostname"), - KAboutData::License_GPL, "(c) 2001 Waldo Bastian"); + TDEAboutData::License_GPL, "(c) 2001 Waldo Bastian"); d.addAuthor("Waldo Bastian", I18N_NOOP("Author"), "bastian@kde.org"); - KCmdLineArgs::init(argc, argv, &d); - KCmdLineArgs::addCmdLineOptions(options); + TDECmdLineArgs::init(argc, argv, &d); + TDECmdLineArgs::addCmdLineOptions(options); - KInstance k(&d); + TDEInstance k(&d); KHostName hn; diff --git a/kded/kde-menu.cpp b/kded/tde-menu.cpp index 0362e10e9..4cf7a843e 100644 --- a/kded/kde-menu.cpp +++ b/kded/tde-menu.cpp @@ -23,26 +23,26 @@ #include <dcopclient.h> #include <dcopref.h> -#include "kaboutdata.h" -#include "kapplication.h" -#include "kcmdlineargs.h" -#include "kglobal.h" -#include "klocale.h" +#include "tdeaboutdata.h" +#include "tdeapplication.h" +#include "tdecmdlineargs.h" +#include "tdeglobal.h" +#include "tdelocale.h" #include "kservice.h" #include "kservicegroup.h" #include "kstandarddirs.h" -static KCmdLineOptions options[] = { +static TDECmdLineOptions options[] = { { "utf8", I18N_NOOP("Output data in UTF-8 instead of local encoding"), 0 }, { "print-menu-id", I18N_NOOP("Print menu-id of the menu that contains\nthe application"), 0 }, { "print-menu-name", I18N_NOOP("Print menu name (caption) of the menu that\ncontains the application"), 0 }, { "highlight", I18N_NOOP("Highlight the entry in the menu"), 0 }, { "nocache-update", I18N_NOOP("Do not check if sycoca database is up to date"), 0 }, { "+<application-id>", I18N_NOOP("The id of the menu entry to locate"), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; -static const char appName[] = "kde-menu"; +static const char appName[] = "tde-menu"; static const char appVersion[] = "1.0"; static bool utf8; @@ -60,7 +60,7 @@ static void result(const TQString &txt) static void error(int exitCode, const TQString &txt) { - tqWarning("kde-menu: %s", txt.local8Bit().data()); + tqWarning("tde-menu: %s", txt.local8Bit().data()); exit(exitCode); } @@ -107,30 +107,30 @@ static void findMenuEntry(KServiceGroup::Ptr parent, const TQString &name, const int main(int argc, char **argv) { - KLocale::setMainCatalogue("tdelibs"); + TDELocale::setMainCatalogue("tdelibs"); const char *description = I18N_NOOP("TDE Menu query tool.\n" "This tool can be used to find in which menu a specific application is shown.\n" "The --highlight option can be used to visually indicate to the user where\n" "in the TDE menu a specific application is located."); - KAboutData d(appName, I18N_NOOP("kde-menu"), appVersion, + TDEAboutData d(appName, I18N_NOOP("tde-menu"), appVersion, description, - KAboutData::License_GPL, "(c) 2003 Waldo Bastian"); + TDEAboutData::License_GPL, "(c) 2003 Waldo Bastian"); d.addAuthor("Waldo Bastian", I18N_NOOP("Author"), "bastian@kde.org"); - KCmdLineArgs::init(argc, argv, &d); - KCmdLineArgs::addCmdLineOptions(options); + TDECmdLineArgs::init(argc, argv, &d); + TDECmdLineArgs::addCmdLineOptions(options); -// KApplication k(false, false); - KApplication k(false); +// TDEApplication k(false, false); + TDEApplication k(false); k.disableSessionManagement(); // this program is in tdelibs so it uses tdelibs as catalog - KLocale::setMainCatalogue("tdelibs"); + TDELocale::setMainCatalogue("tdelibs"); - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); if (args->count() != 1) - KCmdLineArgs::usage(i18n("You must specify an application-id such as 'tde-konsole.desktop'")); + TDECmdLineArgs::usage(i18n("You must specify an application-id such as 'tde-konsole.desktop'")); utf8 = args->isSet("utf8"); @@ -139,19 +139,19 @@ int main(int argc, char **argv) bHighlight = args->isSet("highlight"); if (!bPrintMenuId && !bPrintMenuName && !bHighlight) - KCmdLineArgs::usage(i18n("You must specify at least one of --print-menu-id, --print-menu-name or --highlight")); + TDECmdLineArgs::usage(i18n("You must specify at least one of --print-menu-id, --print-menu-name or --highlight")); if (args->isSet("cache-update")) { TQStringList args; args.append("--incremental"); args.append("--checkstamps"); - TQString command = "kbuildsycoca"; - TQCString _launcher = KApplication::launcher(); + TQString command = "tdebuildsycoca"; + TQCString _launcher = TDEApplication::launcher(); if (!DCOPRef(_launcher, _launcher).call("tdeinit_exec_wait", command, args).isValid()) { - tqWarning("Can't talk to klauncher!"); - command = KGlobal::dirs()->findExe(command); + tqWarning("Can't talk to tdelauncher!"); + command = TDEGlobal::dirs()->findExe(command); command += " " + args.join(" "); system(command.local8Bit()); } diff --git a/kded/kbuildsycoca.cpp b/kded/tdebuildsycoca.cpp index f111b3762..4325162f7 100644 --- a/kded/kbuildsycoca.cpp +++ b/kded/tdebuildsycoca.cpp @@ -21,7 +21,7 @@ #include <tqeventloop.h> #include <config.h> -#include "kbuildsycoca.h" +#include "tdebuildsycoca.h" #include "kresourcelist.h" #include "vfolder_menu.h" @@ -40,22 +40,22 @@ #include <tqtimer.h> #include <assert.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <dcopclient.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kdebug.h> #include <kdirwatch.h> #include <kstandarddirs.h> #include <ksavefile.h> -#include <klocale.h> -#include <kaboutdata.h> -#include <kcmdlineargs.h> +#include <tdelocale.h> +#include <tdeaboutdata.h> +#include <tdecmdlineargs.h> #include <kcrash.h> #ifdef KBUILDSYCOCA_GUI // KBUILDSYCOCA_GUI is used on win32 to build - // GUI version of kbuildsycoca, so-called "kbuildsycocaw". + // GUI version of tdebuildsycoca, so-called "tdebuildsycocaw". # include <tqlabel.h> -# include <kmessagebox.h> +# include <tdemessagebox.h> bool silent; bool showprogress; #endif @@ -104,15 +104,15 @@ static TQString sycocaPath() if (bGlobalDatabase) { - path = KGlobal::dirs()->saveLocation("services")+"ksycoca"; + path = TDEGlobal::dirs()->saveLocation("services")+"tdesycoca"; } else { - TQCString ksycoca_env = getenv("TDESYCOCA"); - if (ksycoca_env.isEmpty()) - path = KGlobal::dirs()->saveLocation("cache")+"ksycoca"; + TQCString tdesycoca_env = getenv("TDESYCOCA"); + if (tdesycoca_env.isEmpty()) + path = TDEGlobal::dirs()->saveLocation("cache")+"tdesycoca"; else - path = TQFile::decodeName(ksycoca_env); + path = TQFile::decodeName(tdesycoca_env); } return path; @@ -120,9 +120,9 @@ static TQString sycocaPath() static TQString oldSycocaPath() { - TQCString ksycoca_env = getenv("TDESYCOCA"); - if (ksycoca_env.isEmpty()) - return KGlobal::dirs()->saveLocation("tmp")+"ksycoca"; + TQCString tdesycoca_env = getenv("TDESYCOCA"); + if (tdesycoca_env.isEmpty()) + return TDEGlobal::dirs()->saveLocation("tmp")+"tdesycoca"; return TQString::null; } @@ -189,7 +189,7 @@ KSycocaEntry *KBuildSycoca::createEntry(const TQString &file, bool addToFactory) TQ_UINT32 timeStamp = g_ctimeInfo->ctime(file); if (!timeStamp) { - timeStamp = KGlobal::dirs()->calcResourceHash( g_resource, file, true); + timeStamp = TDEGlobal::dirs()->calcResourceHash( g_resource, file, true); } KSycocaEntry* entry = 0; if (g_allEntries) @@ -317,7 +317,7 @@ bool KBuildSycoca::build() TQStringList relFiles; - (void) KGlobal::dirs()->findAllResources( g_resource, + (void) TDEGlobal::dirs()->findAllResources( g_resource, TQString::null, true, // Recursive! true, // uniq @@ -417,7 +417,7 @@ void KBuildSycoca::createMenu(TQString caption, TQString name, VFolderMenu::SubM TQ_UINT32 timeStamp = g_ctimeInfo->ctime(directoryFile); if (!timeStamp) { - timeStamp = KGlobal::dirs()->calcResourceHash( g_resource, directoryFile, true); + timeStamp = TDEGlobal::dirs()->calcResourceHash( g_resource, directoryFile, true); } KServiceGroup* entry = 0; @@ -463,7 +463,7 @@ bool KBuildSycoca::recreate() { TQString path(sycocaPath()); #ifdef Q_WS_WIN - printf("kbuildsycoca: path='%s'\n", (const char*)path); + printf("tdebuildsycoca: path='%s'\n", (const char*)path); #endif // KSaveFile first writes to a temp file. @@ -476,9 +476,9 @@ bool KBuildSycoca::recreate() } if (database->status() != 0) { - fprintf(stderr, "[kbuildsycoca] ERROR creating database '%s'! %s\n", path.local8Bit().data(),strerror(database->status())); + fprintf(stderr, "[tdebuildsycoca] ERROR creating database '%s'! %s\n", path.local8Bit().data(),strerror(database->status())); #ifdef KBUILDSYCOCA_GUI // KBUILDSYCOCA_GUI is used on win32 to build - // GUI version of kbuildsycoca, so-called "kbuildsycocaw". + // GUI version of tdebuildsycoca, so-called "tdebuildsycocaw". if (!silent) KMessageBox::error(0, i18n("Error creating database '%1'.\nCheck that the permissions are correct on the directory and the disk is not full.\n").arg(path.local8Bit().data()), i18n("KBuildSycoca")); #endif @@ -487,7 +487,7 @@ bool KBuildSycoca::recreate() m_str = database->dataStream(); - kdDebug(7021) << "Recreating ksycoca file (" << path << ", version " << KSycoca::version() << ")" << endl; + kdDebug(7021) << "Recreating tdesycoca file (" << path << ", version " << KSycoca::version() << ")" << endl; // It is very important to build the servicetype one first // Both are registered in KSycoca, no need to keep the pointers @@ -505,11 +505,11 @@ bool KBuildSycoca::recreate() m_str = 0L; if (!database->close()) { - fprintf(stderr, "[kbuildsycoca] ERROR writing database '%s'!\n", database->name().local8Bit().data()); - fprintf(stderr, "[kbuildsycoca] Disk full?\n"); + fprintf(stderr, "[tdebuildsycoca] ERROR writing database '%s'!\n", database->name().local8Bit().data()); + fprintf(stderr, "[tdebuildsycoca] Disk full?\n"); #ifdef KBUILDSYCOCA_GUI if (!silent) - KMessageBox::error(0, i18n("[kbuildsycoca] Error writing database '%1'.\nCheck that the permissions are correct on the directory and the disk is not full.\n").arg(path.local8Bit().data()), i18n("KBuildSycoca")); + KMessageBox::error(0, i18n("[tdebuildsycoca] Error writing database '%1'.\nCheck that the permissions are correct on the directory and the disk is not full.\n").arg(path.local8Bit().data()), i18n("KBuildSycoca")); #endif return false; } @@ -527,9 +527,9 @@ bool KBuildSycoca::recreate() { // update the timestamp file TQString stamppath = path + "stamp"; - TQFile ksycocastamp(stamppath); - ksycocastamp.open( IO_WriteOnly ); - TQDataStream str( &ksycocastamp ); + TQFile tdesycocastamp(stamppath); + tdesycocastamp.open( IO_WriteOnly ); + TQDataStream str( &tdesycocastamp ); str << newTimestamp; str << existingResourceDirs(); if (g_vfolder) @@ -563,10 +563,10 @@ void KBuildSycoca::save() } (*m_str) << (TQ_INT32) 0; // No more factories. // Write TDEDIRS - (*m_str) << KGlobal::dirs()->kfsstnd_prefixes(); + (*m_str) << TDEGlobal::dirs()->kfsstnd_prefixes(); (*m_str) << newTimestamp; - (*m_str) << KGlobal::locale()->language(); - (*m_str) << KGlobal::dirs()->calcResourceHash("services", "update_ksycoca", true); + (*m_str) << TDEGlobal::locale()->language(); + (*m_str) << TDEGlobal::dirs()->calcResourceHash("services", "update_tdesycoca", true); (*m_str) << (*g_allResourceDirs); // Write factory data.... @@ -636,10 +636,10 @@ bool KBuildSycoca::checkDirTimestamps( const TQString& dirname, const TQDateTime return true; } -// check times of last modification of all files on which ksycoca depens, +// check times of last modification of all files on which tdesycoca depens, // and also their directories -// if all of them all older than the timestamp in file ksycocastamp, this -// means that there's no need to rebuild ksycoca +// if all of them all older than the timestamp in file tdesycocastamp, this +// means that there's no need to rebuild tdesycoca bool KBuildSycoca::checkTimestamps( TQ_UINT32 timestamp, const TQStringList &dirs ) { kdDebug( 7021 ) << "checking file timestamps" << endl; @@ -663,7 +663,7 @@ TQStringList KBuildSycoca::existingResourceDirs() return *dirs; dirs = new TQStringList; g_allResourceDirs = new TQStringList; - // these are all resources cached by ksycoca + // these are all resources cached by tdesycoca TQStringList resources; resources += KBuildServiceTypeFactory::resourceTypes(); resources += KBuildServiceGroupFactory::resourceTypes(); @@ -673,7 +673,7 @@ TQStringList KBuildSycoca::existingResourceDirs() while( !resources.empty()) { TQString res = resources.front(); - *dirs += KGlobal::dirs()->resourceDirs( res.latin1()); + *dirs += TDEGlobal::dirs()->resourceDirs( res.latin1()); resources.remove( res ); // remove this 'res' and all its duplicates } @@ -691,7 +691,7 @@ TQStringList KBuildSycoca::existingResourceDirs() return *dirs; } -static KCmdLineOptions options[] = { +static TDECmdLineOptions options[] = { { "nosignal", I18N_NOOP("Do not signal applications to update"), 0 }, { "noincremental", I18N_NOOP("Disable incremental update, re-read everything"), 0 }, { "checkstamps", I18N_NOOP("Check file timestamps"), 0 }, @@ -703,10 +703,10 @@ static KCmdLineOptions options[] = { { "silent", I18N_NOOP("Silent - work without windows and stderr"), 0 }, { "showprogress", I18N_NOOP("Show progress information (even if 'silent' mode is on)"), 0 }, #endif - KCmdLineLastOption + TDECmdLineLastOption }; -static const char appName[] = "kbuildsycoca"; +static const char appName[] = "tdebuildsycoca"; static const char appVersion[] = "1.1"; class WaitForSignal : public QObject @@ -717,16 +717,16 @@ public: extern "C" KDE_EXPORT int kdemain(int argc, char **argv) { - KLocale::setMainCatalogue("tdelibs"); - KAboutData d(appName, I18N_NOOP("KBuildSycoca"), appVersion, + TDELocale::setMainCatalogue("tdelibs"); + TDEAboutData d(appName, I18N_NOOP("KBuildSycoca"), appVersion, I18N_NOOP("Rebuilds the system configuration cache."), - KAboutData::License_GPL, "(c) 1999-2002 KDE Developers"); + TDEAboutData::License_GPL, "(c) 1999-2002 KDE Developers"); d.addAuthor("David Faure", I18N_NOOP("Author"), "faure@kde.org"); d.addAuthor("Waldo Bastian", I18N_NOOP("Author"), "bastian@kde.org"); - KCmdLineArgs::init(argc, argv, &d); - KCmdLineArgs::addCmdLineOptions(options); - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs::init(argc, argv, &d); + TDECmdLineArgs::addCmdLineOptions(options); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); bGlobalDatabase = args->isSet("global"); bMenuTest = args->isSet("menutest"); @@ -736,11 +736,11 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) setenv("TDEROOTHOME", "-", 1); } - KApplication::disableAutoDcopRegistration(); + TDEApplication::disableAutoDcopRegistration(); #ifdef KBUILDSYCOCA_GUI - KApplication k; + TDEApplication k; #else - KApplication k(false, false); + TDEApplication k(false, false); #endif k.disableSessionManagement(); @@ -759,16 +759,16 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) } #endif - KCrash::setCrashHandler(KCrash::defaultCrashHandler); - KCrash::setEmergencySaveFunction(crashHandler); - KCrash::setApplicationName(TQString(appName)); + TDECrash::setCrashHandler(TDECrash::defaultCrashHandler); + TDECrash::setEmergencySaveFunction(crashHandler); + TDECrash::setApplicationName(TQString(appName)); // this program is in tdelibs so it uses tdelibs as catalog - KLocale::setMainCatalogue("tdelibs"); - // force generating of KLocale object. if not, the database will get + TDELocale::setMainCatalogue("tdelibs"); + // force generating of TDELocale object. if not, the database will get // be translated - KGlobal::locale(); - KGlobal::dirs()->addResourceType("app-reg", "share/application-registry" ); + TDEGlobal::locale(); + TDEGlobal::dirs()->addResourceType("app-reg", "share/application-registry" ); DCOPClient *dcopClient = new DCOPClient(); @@ -777,14 +777,14 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) TQCString registeredName = dcopClient->registerAs(appName, false); if (registeredName.isEmpty()) { - fprintf(stderr, "[kbuildsycoca] Warning: %s is unable to register with DCOP.\n", appName); + fprintf(stderr, "[tdebuildsycoca] Warning: %s is unable to register with DCOP.\n", appName); break; } else if (registeredName == appName) { break; // Go } - fprintf(stderr, "[kbuildsycoca] Waiting for already running %s to finish.\n", appName); + fprintf(stderr, "[tdebuildsycoca] Waiting for already running %s to finish.\n", appName); dcopClient->setNotifications( true ); while (dcopClient->isApplicationRegistered(appName)) @@ -796,7 +796,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) } dcopClient->setNotifications( false ); } - fprintf(stderr, "[kbuildsycoca] %s running...\n", appName); + fprintf(stderr, "[tdebuildsycoca] %s running...\n", appName); bool checkfiles = bGlobalDatabase || args->isSet("checkfiles"); @@ -804,13 +804,13 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) if (incremental || !checkfiles) { KSycoca::self()->disableAutoRebuild(); // Prevent deadlock - TQString current_language = KGlobal::locale()->language(); - TQString ksycoca_language = KSycoca::self()->language(); - TQ_UINT32 current_update_sig = KGlobal::dirs()->calcResourceHash("services", "update_ksycoca", true); - TQ_UINT32 ksycoca_update_sig = KSycoca::self()->updateSignature(); + TQString current_language = TDEGlobal::locale()->language(); + TQString tdesycoca_language = KSycoca::self()->language(); + TQ_UINT32 current_update_sig = TDEGlobal::dirs()->calcResourceHash("services", "update_tdesycoca", true); + TQ_UINT32 tdesycoca_update_sig = KSycoca::self()->updateSignature(); - if ((current_update_sig != ksycoca_update_sig) || - (current_language != ksycoca_language) || + if ((current_update_sig != tdesycoca_update_sig) || + (current_language != tdesycoca_language) || (KSycoca::self()->timeStamp() == 0)) { incremental = false; @@ -829,10 +829,10 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) TQString path = sycocaPath()+"stamp"; TQCString qPath = TQFile::encodeName(path); cSycocaPath = qPath.data(); // Delete timestamps on crash - TQFile ksycocastamp(path); - if( ksycocastamp.open( IO_ReadOnly )) + TQFile tdesycocastamp(path); + if( tdesycocastamp.open( IO_ReadOnly )) { - TQDataStream str( &ksycocastamp ); + TQDataStream str( &tdesycocastamp ); if (!str.atEnd()) str >> filestamp; if (!str.atEnd()) @@ -870,7 +870,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) g_ctimeDict = 0; if (incremental) { - tqWarning("[kbuildsycoca] Reusing existing ksycoca."); + tqWarning("[tdebuildsycoca] Reusing existing tdesycoca."); KSycoca *oldSycoca = KSycoca::self(); KSycocaFactoryList *factories = new KSycocaFactoryList; g_allEntries = new KSycocaEntryListList; @@ -914,9 +914,9 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) { // These directories may have been created with 0700 permission // better delete them if they are empty - TQString applnkDir = KGlobal::dirs()->saveLocation("apps", TQString::null, false); + TQString applnkDir = TDEGlobal::dirs()->saveLocation("apps", TQString::null, false); ::rmdir(TQFile::encodeName(applnkDir)); - TQString servicetypesDir = KGlobal::dirs()->saveLocation("servicetypes", TQString::null, false); + TQString servicetypesDir = TDEGlobal::dirs()->saveLocation("servicetypes", TQString::null, false); ::rmdir(TQFile::encodeName(servicetypesDir)); } } @@ -940,20 +940,20 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) if (args->isSet("signal")) { - // Notify ALL applications that have a ksycoca object, using a broadcast + // Notify ALL applications that have a tdesycoca object, using a broadcast TQByteArray data; TQDataStream stream(data, IO_WriteOnly); stream << *g_changeList; - dcopClient->send( "*", "ksycoca", "notifyDatabaseChanged(TQStringList)", data ); + dcopClient->send( "*", "tdesycoca", "notifyDatabaseChanged(TQStringList)", data ); } #ifdef KBUILDSYCOCA_GUI if (!silent) { progress.close(); - KMessageBox::information(0, i18n("[kbuildsycoca] Configuration information reloaded successfully."), capt); + KMessageBox::information(0, i18n("[tdebuildsycoca] Configuration information reloaded successfully."), capt); } #endif return 0; } -#include "kbuildsycoca.moc" +#include "tdebuildsycoca.moc" diff --git a/kded/kbuildsycoca.h b/kded/tdebuildsycoca.h index f98001781..51e7af337 100644 --- a/kded/kbuildsycoca.h +++ b/kded/tdebuildsycoca.h @@ -15,8 +15,8 @@ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301, USA. **/ -#ifndef __kbuildsycoca_h__ -#define __kbuildsycoca_h__ +#ifndef __tdebuildsycoca_h__ +#define __tdebuildsycoca_h__ #include <sys/stat.h> @@ -25,16 +25,16 @@ #include <tqdict.h> #include <kservice.h> -#include <ksycoca.h> -#include <ksycocatype.h> -#include <ksycocaentry.h> +#include <tdesycoca.h> +#include <tdesycocatype.h> +#include <tdesycocaentry.h> #include <kservicegroup.h> #include "vfolder_menu.h" class TQDataStream; -// No need for this in libkio - apps only get readonly access +// No need for this in libtdeio - apps only get readonly access class KBuildSycoca : public KSycoca { Q_OBJECT @@ -80,7 +80,7 @@ protected: bool build(); /** - * Save the ksycoca file + * Save the tdesycoca file */ void save(); diff --git a/kded/kmimelist.cpp b/kded/tdemimelist.cpp index fff626cac..673520e52 100644 --- a/kded/kmimelist.cpp +++ b/kded/tdemimelist.cpp @@ -8,13 +8,13 @@ #include <kuserprofile.h> #include <kprotocolinfo.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <stdio.h> int main(int argc, char *argv[]) { - KApplication k(argc,argv,"blurb",false); + TDEApplication k(argc,argv,"blurb",false); KMimeType::List mtl = KMimeType::allMimeTypes( ); assert( mtl.count() ); diff --git a/kded/test/test.cpp b/kded/test/test.cpp index e99eb1421..8d2aa91b9 100644 --- a/kded/test/test.cpp +++ b/kded/test/test.cpp @@ -1,6 +1,6 @@ #include "test.h" -class TestObject : public KShared +class TestObject : public TDEShared { public: TestObject(const TQCString &_app) : app(_app) diff --git a/kded/vfolder_menu.cpp b/kded/vfolder_menu.cpp index e147dcfaf..408c6af9a 100644 --- a/kded/vfolder_menu.cpp +++ b/kded/vfolder_menu.cpp @@ -23,7 +23,7 @@ #include <stdlib.h> // getenv #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kstandarddirs.h> #include <kservice.h> #include <kde_file.h> @@ -441,10 +441,10 @@ VFolderMenu::absoluteDir(const TQString &_dir, const TQString &baseDir, bool kee if (TQDir::isRelativePath(dir) && !keepRelativeToCfg) { - dir = KGlobal::dirs()->findResource("xdgconf-menu", dir); + dir = TDEGlobal::dirs()->findResource("xdgconf-menu", dir); } - dir = KGlobal::dirs()->realPath(dir); + dir = TDEGlobal::dirs()->realPath(dir); return dir; } @@ -642,7 +642,7 @@ VFolderMenu::mergeMenus(TQDomElement &docElem, TQString &name) else if( e.tagName() == "MergeDir") { TQString dir = absoluteDir(e.text(), e.attribute("__BaseDir"), true); - TQStringList dirs = KGlobal::dirs()->findDirs("xdgconf-menu", dir); + TQStringList dirs = TDEGlobal::dirs()->findDirs("xdgconf-menu", dir); for(TQStringList::ConstIterator it=dirs.begin(); it != dirs.end(); ++it) { @@ -653,12 +653,12 @@ VFolderMenu::mergeMenus(TQDomElement &docElem, TQString &name) if (!TQDir::isRelativePath(dir)) { // Absolute - fileList = KGlobal::dirs()->findAllResources("xdgconf-menu", dir+"*.menu", false, false); + fileList = TDEGlobal::dirs()->findAllResources("xdgconf-menu", dir+"*.menu", false, false); } else { // Relative - (void) KGlobal::dirs()->findAllResources("xdgconf-menu", dir+"*.menu", false, true, fileList); + (void) TDEGlobal::dirs()->findAllResources("xdgconf-menu", dir+"*.menu", false, true, fileList); } for(TQStringList::ConstIterator it=fileList.begin(); @@ -699,7 +699,7 @@ VFolderMenu::pushDocInfo(const TQString &fileName, const TQString &baseDir) if (!baseDir.isEmpty()) { if (!TQDir::isRelativePath(baseDir)) - m_docInfo.baseDir = KGlobal::dirs()->relativeLocation("xdgconf-menu", baseDir); + m_docInfo.baseDir = TDEGlobal::dirs()->relativeLocation("xdgconf-menu", baseDir); else m_docInfo.baseDir = baseDir; } @@ -743,7 +743,7 @@ VFolderMenu::pushDocInfoParent(const TQString &basePath, const TQString &baseDir m_docInfo.baseName = fileName.left( fileName.length() - 5 ); TQString baseName = TQDir::cleanDirPath(m_docInfo.baseDir + fileName); - TQStringList result = KGlobal::dirs()->findAllResources("xdgconf-menu", baseName); + TQStringList result = TDEGlobal::dirs()->findAllResources("xdgconf-menu", baseName); while( !result.isEmpty() && (result[0] != basePath)) result.remove(result.begin()); @@ -767,7 +767,7 @@ VFolderMenu::locateMenuFile(const TQString &fileName) { if (!TQDir::isRelativePath(fileName)) { - if (KStandardDirs::exists(fileName)) + if (TDEStandardDirs::exists(fileName)) return fileName; return TQString::null; } @@ -808,7 +808,7 @@ VFolderMenu::locateDirectoryFile(const TQString &fileName) if (!TQDir::isRelativePath(fileName)) { - if (KStandardDirs::exists(fileName)) + if (TDEStandardDirs::exists(fileName)) return fileName; return TQString::null; } @@ -820,7 +820,7 @@ VFolderMenu::locateDirectoryFile(const TQString &fileName) ++it) { tmp = (*it)+fileName; - if (KStandardDirs::exists(tmp)) + if (TDEStandardDirs::exists(tmp)) return tmp; } @@ -830,13 +830,13 @@ VFolderMenu::locateDirectoryFile(const TQString &fileName) void VFolderMenu::initDirs() { - m_defaultDataDirs = TQStringList::split(':', KGlobal::dirs()->kfsstnd_prefixes()); + m_defaultDataDirs = TQStringList::split(':', TDEGlobal::dirs()->kfsstnd_prefixes()); TQString localDir = m_defaultDataDirs.first(); m_defaultDataDirs.remove(localDir); // Remove local dir - m_defaultAppDirs = KGlobal::dirs()->findDirs("xdgdata-apps", TQString::null); - m_defaultDirectoryDirs = KGlobal::dirs()->findDirs("xdgdata-dirs", TQString::null); - m_defaultLegacyDirs = KGlobal::dirs()->resourceDirs("apps"); + m_defaultAppDirs = TDEGlobal::dirs()->findDirs("xdgdata-apps", TQString::null); + m_defaultDirectoryDirs = TDEGlobal::dirs()->findDirs("xdgdata-dirs", TQString::null); + m_defaultLegacyDirs = TDEGlobal::dirs()->resourceDirs("apps"); } void @@ -1038,7 +1038,7 @@ kdDebug(7021) << "processKDELegacyDirs()" << endl; TQRegExp files("\\.(desktop|kdelnk)$"); TQRegExp dirs("\\.directory$"); - (void) KGlobal::dirs()->findAllResources( "apps", + (void) TDEGlobal::dirs()->findAllResources( "apps", TQString::null, true, // Recursive! true, // uniq @@ -1629,7 +1629,7 @@ VFolderMenu::parseMenu(const TQString &file, bool forceLegacyLoad) m_legacyLoaded = false; m_appsInfo = 0; - TQStringList dirs = KGlobal::dirs()->resourceDirs("xdgconf-menu"); + TQStringList dirs = TDEGlobal::dirs()->resourceDirs("xdgconf-menu"); for(TQStringList::ConstIterator it=dirs.begin(); it != dirs.end(); ++it) { |