--- branches/KDE/4.2/kdelibs/kded/kded.cpp 2009/01/12 21:32:29 910250 +++ branches/KDE/4.2/kdelibs/kded/kded.cpp 2009/01/30 20:28:25 918838 @@ -115,9 +115,8 @@ KToolInvocation::kdeinitExecWait( "kdontchangethehostname", args ); } -Kded::Kded(bool checkUpdates) - : b_checkUpdates(checkUpdates), - m_needDelayedCheck(false) +Kded::Kded() + : m_needDelayedCheck(false) { _self = this; @@ -280,7 +279,7 @@ KSharedConfig::Ptr config = KGlobal::config(); // Ensure the service exists. KService::Ptr service = KService::serviceByDesktopPath("kded/"+obj+".desktop"); - if (!service) + if (!service) return; KConfigGroup cg(config, QString("Module-%1").arg(service->desktopEntryName())); cg.writeEntry("autoload", autoload); @@ -290,7 +289,7 @@ bool Kded::isModuleAutoloaded(const QString &obj) const { KService::Ptr s = KService::serviceByDesktopPath("kded/"+obj+".desktop"); - if (!s) + if (!s) return false; return isModuleAutoloaded(s); } @@ -307,7 +306,7 @@ bool Kded::isModuleLoadedOnDemand(const QString &obj) const { KService::Ptr s = KService::serviceByDesktopPath("kded/"+obj+".desktop"); - if (!s) + if (!s) return false; return isModuleLoadedOnDemand(s); } @@ -446,7 +445,7 @@ void Kded::updateDirWatch() { - if (!b_checkUpdates) return; + if (!bCheckUpdates) return; delete m_pDirWatch; m_pDirWatch = new KDirWatch; @@ -471,7 +470,7 @@ { delete KSycoca::self(); - if (!b_checkUpdates) return; + if (!bCheckUpdates) return; if (delayedCheck) return; @@ -921,7 +920,7 @@ checkStamps = cg.readEntry("CheckFileStamps", true); delayedCheck = cg.readEntry("DelayedCheck", false); - Kded *kded = new Kded(false); // Build data base + Kded *kded = new Kded(); // Build data base KDE_signal(SIGTERM, sighandler); KDE_signal(SIGHUP, sighandler); --- branches/KDE/4.2/kdelibs/kded/kded.h 2009/01/06 17:13:38 906699 +++ branches/KDE/4.2/kdelibs/kded/kded.h 2009/01/30 20:28:25 918838 @@ -41,7 +41,7 @@ { Q_OBJECT public: - Kded(bool checkUpdates); + Kded(); virtual ~Kded(); static Kded *self() { return _self;} @@ -186,8 +186,6 @@ */ KDirWatch* m_pDirWatch; - bool b_checkUpdates; - /** * When a desktop file is updated, a timer is started (5 sec) * before rebuilding the binary - so that multiple updates result