Inital V3 Branch

This commit is contained in:
Mark Liversedge
2010-12-30 16:59:48 +00:00
parent 07af116215
commit 805e74de5a
434 changed files with 27702 additions and 3196 deletions

View File

@@ -24,7 +24,6 @@
#include <assert.h>
DataProcessorFactory *DataProcessorFactory::instance_;
DataProcessorFactory &DataProcessorFactory::instance()
{
if (!instance_) instance_ = new DataProcessorFactory();
@@ -42,7 +41,6 @@ DataProcessorFactory::registerProcessor(QString name, DataProcessor *processor)
bool
DataProcessorFactory::autoProcess(RideFile *ride)
{
boost::shared_ptr<QSettings> settings = GetApplicationSettings();
bool changed = false;
// run through the processors and execute them!
@@ -51,7 +49,7 @@ DataProcessorFactory::autoProcess(RideFile *ride)
while (i.hasNext()) {
i.next();
QString configsetting = QString("dp/%1/apply").arg(i.key());
if (settings->value(configsetting, "Manual").toString() == "Auto")
if (appsettings->value(NULL, configsetting, "Manual").toString() == "Auto")
i.value()->postProcess(ride);
}