From d1e0cc99a202cef3306b90b8839a6726e89f201e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 23:21:04 -0600 Subject: Rename many classes and header files to avoid conflicts with KDE4 --- kded/tdebuildsycoca.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'kded/tdebuildsycoca.cpp') diff --git a/kded/tdebuildsycoca.cpp b/kded/tdebuildsycoca.cpp index f9b0238c7..81bff9613 100644 --- a/kded/tdebuildsycoca.cpp +++ b/kded/tdebuildsycoca.cpp @@ -695,7 +695,7 @@ static KCmdLineOptions 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 }, - { "nochectdefiles", I18N_NOOP("Disable checking files (dangerous)"), 0 }, + { "nocheckfiles", I18N_NOOP("Disable checking files (dangerous)"), 0 }, { "global", I18N_NOOP("Create global database"), 0 }, { "menutest", I18N_NOOP("Perform menu generation test run only"), 0 }, { "track ", I18N_NOOP("Track menu id for debug purposes"), 0 }, @@ -798,10 +798,10 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) } fprintf(stderr, "[tdebuildsycoca] %s running...\n", appName); - bool chectdefiles = bGlobalDatabase || args->isSet("chectdefiles"); + bool checkfiles = bGlobalDatabase || args->isSet("checkfiles"); - bool incremental = !bGlobalDatabase && args->isSet("incremental") && chectdefiles; - if (incremental || !chectdefiles) + bool incremental = !bGlobalDatabase && args->isSet("incremental") && checkfiles; + if (incremental || !checkfiles) { KSycoca::self()->disableAutoRebuild(); // Prevent deadlock TQString current_language = TDEGlobal::locale()->language(); @@ -814,14 +814,14 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) (KSycoca::self()->timeStamp() == 0)) { incremental = false; - chectdefiles = true; + checkfiles = true; delete KSycoca::self(); } } g_changeList = new TQStringList; - bool checkstamps = incremental && args->isSet("checkstamps") && chectdefiles; + bool checkstamps = incremental && args->isSet("checkstamps") && checkfiles; TQ_UINT32 filestamp = 0; TQStringList oldresourcedirs; if( checkstamps && incremental ) @@ -861,7 +861,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) newTimestamp = (TQ_UINT32) time(0); - if( chectdefiles && ( !checkstamps || !KBuildSycoca::checkTimestamps( filestamp, oldresourcedirs ))) + if( checkfiles && ( !checkstamps || !KBuildSycoca::checkTimestamps( filestamp, oldresourcedirs ))) { TQCString qSycocaPath = TQFile::encodeName(sycocaPath()); cSycocaPath = qSycocaPath.data(); -- cgit v1.2.1