summaryrefslogtreecommitdiffstats
path: root/kded
diff options
context:
space:
mode:
Diffstat (limited to 'kded')
-rw-r--r--kded/DESIGN4
-rw-r--r--kded/Makefile.am6
-rw-r--r--kded/README.kded12
-rw-r--r--kded/kbuildimageiofactory.cpp4
-rw-r--r--kded/kbuildimageiofactory.h2
-rw-r--r--kded/kbuildprotocolinfofactory.cpp4
-rw-r--r--kded/kbuildprotocolinfofactory.h2
-rw-r--r--kded/kbuildservicefactory.cpp4
-rw-r--r--kded/kbuildservicefactory.h2
-rw-r--r--kded/kbuildservicegroupfactory.cpp4
-rw-r--r--kded/kbuildservicegroupfactory.h2
-rw-r--r--kded/kbuildservicetypefactory.cpp4
-rw-r--r--kded/kbuildservicetypefactory.h2
-rw-r--r--kded/kbuildsycoca.cpp56
-rw-r--r--kded/kbuildsycoca.h8
-rw-r--r--kded/kctimefactory.cpp4
-rw-r--r--kded/kctimefactory.h4
-rw-r--r--kded/kded.cpp14
-rw-r--r--kded/kded.h4
19 files changed, 71 insertions, 71 deletions
diff --git a/kded/DESIGN b/kded/DESIGN
index 702fca853..e6653807b 100644
--- a/kded/DESIGN
+++ b/kded/DESIGN
@@ -12,9 +12,9 @@ kbuildsycoca 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..1baf30e4f 100644
--- a/kded/Makefile.am
+++ b/kded/Makefile.am
@@ -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_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_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
kmimelist_LDADD = ../kio/libkio.la
kmimelist_SOURCES = kmimelist.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
diff --git a/kded/README.kded b/kded/README.kded
index f0ff64d41..1cf382279 100644
--- a/kded/README.kded
+++ b/kded/README.kded
@@ -6,10 +6,10 @@ 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 kbuildsycoca
which gets started by kded. When kded is first started it always runs
-kbuildsycoca to ensure that ksycoca is up to date.
+kbuildsycoca 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
@@ -40,9 +40,9 @@ 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 kbuildsycoca program.
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..267af31f6 100644
--- a/kded/kbuildimageiofactory.cpp
+++ b/kded/kbuildimageiofactory.cpp
@@ -16,8 +16,8 @@
* Boston, MA 02110-1301, USA.
**/
-#include "ksycoca.h"
-#include "ksycocadict.h"
+#include "tdesycoca.h"
+#include "tdesycocadict.h"
#include "kresourcelist.h"
#include <kglobal.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..f3fe698d4 100644
--- a/kded/kbuildprotocolinfofactory.cpp
+++ b/kded/kbuildprotocolinfofactory.cpp
@@ -17,8 +17,8 @@
**/
#include "kbuildprotocolinfofactory.h"
-#include "ksycoca.h"
-#include "ksycocadict.h"
+#include "tdesycoca.h"
+#include "tdesycocadict.h"
#include "kresourcelist.h"
#include <kglobal.h>
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..7d9406d36 100644
--- a/kded/kbuildservicefactory.cpp
+++ b/kded/kbuildservicefactory.cpp
@@ -18,8 +18,8 @@
**/
#include "kbuildservicefactory.h"
-#include "ksycoca.h"
-#include "ksycocadict.h"
+#include "tdesycoca.h"
+#include "tdesycocadict.h"
#include "kresourcelist.h"
#include "kmimetype.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..76f27ba57 100644
--- a/kded/kbuildservicegroupfactory.cpp
+++ b/kded/kbuildservicegroupfactory.cpp
@@ -17,8 +17,8 @@
**/
#include "kbuildservicegroupfactory.h"
-#include "ksycoca.h"
-#include "ksycocadict.h"
+#include "tdesycoca.h"
+#include "tdesycocadict.h"
#include "kresourcelist.h"
#include <kglobal.h>
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..351b7847a 100644
--- a/kded/kbuildservicetypefactory.cpp
+++ b/kded/kbuildservicetypefactory.cpp
@@ -17,8 +17,8 @@
**/
#include "kbuildservicetypefactory.h"
-#include "ksycoca.h"
-#include "ksycocadict.h"
+#include "tdesycoca.h"
+#include "tdesycocadict.h"
#include "kresourcelist.h"
#include <kglobal.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/kbuildsycoca.cpp b/kded/kbuildsycoca.cpp
index 59ff8bc18..13a645395 100644
--- a/kded/kbuildsycoca.cpp
+++ b/kded/kbuildsycoca.cpp
@@ -104,15 +104,15 @@ static TQString sycocaPath()
if (bGlobalDatabase)
{
- path = TDEGlobal::dirs()->saveLocation("services")+"ksycoca";
+ path = TDEGlobal::dirs()->saveLocation("services")+"tdesycoca";
}
else
{
- TQCString ksycoca_env = getenv("TDESYCOCA");
- if (ksycoca_env.isEmpty())
- path = TDEGlobal::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 TDEGlobal::dirs()->saveLocation("tmp")+"ksycoca";
+ TQCString tdesycoca_env = getenv("TDESYCOCA");
+ if (tdesycoca_env.isEmpty())
+ return TDEGlobal::dirs()->saveLocation("tmp")+"tdesycoca";
return TQString::null;
}
@@ -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
@@ -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)
@@ -566,7 +566,7 @@ void KBuildSycoca::save()
(*m_str) << TDEGlobal::dirs()->kfsstnd_prefixes();
(*m_str) << newTimestamp;
(*m_str) << TDEGlobal::locale()->language();
- (*m_str) << TDEGlobal::dirs()->calcResourceHash("services", "update_ksycoca", true);
+ (*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();
@@ -805,12 +805,12 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
{
KSycoca::self()->disableAutoRebuild(); // Prevent deadlock
TQString current_language = TDEGlobal::locale()->language();
- TQString ksycoca_language = KSycoca::self()->language();
- TQ_UINT32 current_update_sig = TDEGlobal::dirs()->calcResourceHash("services", "update_ksycoca", true);
- TQ_UINT32 ksycoca_update_sig = KSycoca::self()->updateSignature();
+ 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("[kbuildsycoca] Reusing existing tdesycoca.");
KSycoca *oldSycoca = KSycoca::self();
KSycocaFactoryList *factories = new KSycocaFactoryList;
g_allEntries = new KSycocaEntryListList;
@@ -940,11 +940,11 @@ 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
diff --git a/kded/kbuildsycoca.h b/kded/kbuildsycoca.h
index f98001781..443f5b120 100644
--- a/kded/kbuildsycoca.h
+++ b/kded/kbuildsycoca.h
@@ -25,9 +25,9 @@
#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"
@@ -80,7 +80,7 @@ protected:
bool build();
/**
- * Save the ksycoca file
+ * Save the tdesycoca file
*/
void save();
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 d06c44c38..11c46e064 100644
--- a/kded/kded.cpp
+++ b/kded/kded.cpp
@@ -104,11 +104,11 @@ Kded::Kded(bool checkUpdates, bool new_startup)
{
_self = this;
TQCString cPath;
- TQCString ksycoca_env = getenv("TDESYCOCA");
- if (ksycoca_env.isEmpty())
- cPath = TQFile::encodeName(TDEGlobal::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;
@@ -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;
@@ -961,7 +961,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
// 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..93aac0ab6 100644
--- a/kded/kded.h
+++ b/kded/kded.h
@@ -29,8 +29,8 @@
#include <dcopclient.h>
#include <dcopobject.h>
-#include <ksycoca.h>
-#include <ksycocatype.h>
+#include <tdesycoca.h>
+#include <tdesycocatype.h>
#include <kdedmodule.h>
#include <klibloader.h>
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-29 02:06:23 +0000