summaryrefslogtreecommitdiffstats
path: root/kded/kded.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-26 13:17:21 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-26 13:17:21 -0600
commitdfe289850f068f19ba4a83ab4e7e22a7e09c13c9 (patch)
treec297348a55df66c571de4525646e0b9762427353 /kded/kded.cpp
parentb7658a0d5eca24a9d37c6e04f88298ef02389db0 (diff)
downloadtdelibs-dfe289850f068f19ba4a83ab4e7e22a7e09c13c9.tar.gz
tdelibs-dfe289850f068f19ba4a83ab4e7e22a7e09c13c9.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kded/kded.cpp')
-rw-r--r--kded/kded.cpp14
1 files changed, 7 insertions, 7 deletions
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;