nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-02-13 08:08:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

renamed CombinedFileReader to RideFileFactory

Browse Source
This commit is contained in:
Sean C. Rhea
2008-03-08 16:20:43 +00:00
parent 8b782dff27
commit d5fd8c1234
8 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/CsvRideFile.cpp
View File

@@ -27,7 +27,7 @@
#define MILES_TO_KM 1.609344
static int csvFileReaderRegistered =
CombinedFileReader::instance().registerReader("csv", new CsvFileReader());
RideFileFactory::instance().registerReader("csv", new CsvFileReader());
RideFile *CsvFileReader::openRideFile(QFile &file, QStringList &errors) const
{

6
src/gui/MainWindow.cpp
View File

@@ -105,7 +105,7 @@ MainWindow::MainWindow(const QDir &home) :
QRegExp rx(rideFileRegExp);
QTreeWidgetItem *last = NULL;
QStringListIterator i(CombinedFileReader::instance().listRideFiles(home));
QStringListIterator i(RideFileFactory::instance().listRideFiles(home));
while (i.hasNext()) {
QString name = i.next();
if (rx.exactMatch(name)) {
@@ -491,7 +491,7 @@ void MainWindow::importCSV()
QFile file ( dpd->fileName );
QStringList errors;
RideFile *ride =
CombinedFileReader::instance().openRideFile(file, errors);
RideFileFactory::instance().openRideFile(file, errors);
if (!ride || !errors.empty())
{
@@ -546,7 +546,7 @@ MainWindow::importSRM()
QFile file(fileName);
QStringList errors;
RideFile *ride =
CombinedFileReader::instance().openRideFile(file, errors);
RideFileFactory::instance().openRideFile(file, errors);
if (!ride || !errors.empty()) {
QString all = (ride
? tr("Non-fatal problem(s) opening %1:")

2
src/gui/RawRideFile.cpp
View File

@@ -24,7 +24,7 @@
#define MILES_TO_KM 1.609344
static int rawFileReaderRegistered =
CombinedFileReader::instance().registerReader("raw", new RawFileReader());
RideFileFactory::instance().registerReader("raw", new RawFileReader());
struct ReadState
{

12
src/gui/RideFile.cpp
View File

@@ -19,16 +19,16 @@
#include "RideFile.h"
#include <assert.h>
CombinedFileReader *CombinedFileReader::instance_;
RideFileFactory *RideFileFactory::instance_;
CombinedFileReader &CombinedFileReader::instance()
RideFileFactory &RideFileFactory::instance()
{
if (!instance_)
instance_ = new CombinedFileReader();
instance_ = new RideFileFactory();
return *instance_;
}
int CombinedFileReader::registerReader(const QString &suffix,
int RideFileFactory::registerReader(const QString &suffix,
RideFileReader *reader)
{
assert(!readFuncs_.contains(suffix));
@@ -36,7 +36,7 @@ int CombinedFileReader::registerReader(const QString &suffix,
return 1;
}
RideFile *CombinedFileReader::openRideFile(QFile &file,
RideFile *RideFileFactory::openRideFile(QFile &file,
QStringList &errors) const
{
QString suffix = file.fileName();
@@ -48,7 +48,7 @@ RideFile *CombinedFileReader::openRideFile(QFile &file,
return reader->openRideFile(file, errors);
}
QStringList CombinedFileReader::listRideFiles(const QDir &dir) const
QStringList RideFileFactory::listRideFiles(const QDir &dir) const
{
QStringList filters;
QMapIterator<QString,RideFileReader*> i(readFuncs_);

10
src/gui/RideFile.h
View File

@@ -75,21 +75,21 @@ struct RideFileReader {
virtual RideFile *openRideFile(QFile &file, QStringList &errors) const = 0;
};
class CombinedFileReader : public RideFileReader {
class RideFileFactory {
private:
static CombinedFileReader *instance_;
static RideFileFactory *instance_;
QMap<QString,RideFileReader*> readFuncs_;
CombinedFileReader() {}
RideFileFactory() {}
public:
static CombinedFileReader &instance();
static RideFileFactory &instance();
int registerReader(const QString &suffix, RideFileReader *reader);
virtual RideFile *openRideFile(QFile &file, QStringList &errors) const;
RideFile *openRideFile(QFile &file, QStringList &errors) const;
QStringList listRideFiles(const QDir &dir) const;
};

2
src/gui/RideItem.cpp
View File

@@ -174,7 +174,7 @@ RideItem::htmlSummary()
if (summary.isEmpty()) {
QFile file(path + "/" + fileName);
QStringList errors;
ride = CombinedFileReader::instance().openRideFile(file, errors);
ride = RideFileFactory::instance().openRideFile(file, errors);
if (!ride) {
summary = "<p>Couldn't read file \"" + file.fileName() + "\":";
QListIterator<QString> i(errors);

2
src/gui/SrmRideFile.cpp
View File

@@ -22,7 +22,7 @@
#define PI 3.14159265
static int srmFileReaderRegistered =
CombinedFileReader::instance().registerReader("srm", new SrmFileReader());
RideFileFactory::instance().registerReader("srm", new SrmFileReader());
RideFile *SrmFileReader::openRideFile(QFile &file, QStringList &errors) const
{

4
src/gui/cpint.cpp
View File

@@ -56,7 +56,7 @@ cpi_files_to_update(const char *dir)
assert(0);
QStringList filenames =
CombinedFileReader::instance().listRideFiles(QDir(dir));
RideFileFactory::instance().listRideFiles(QDir(dir));
QListIterator<QString> i(filenames);
while (i.hasNext()) {
QString filename = i.next();
@@ -106,7 +106,7 @@ update_cpi_file(cpi_file_info *info,
QFile file(info->inname);
QStringList errors;
RideFile *rideFile =
CombinedFileReader::instance().openRideFile(file, errors);
RideFileFactory::instance().openRideFile(file, errors);
assert(rideFile);
cpint_data data;
data.rec_int_ms = (int) round(rideFile->recIntSecs() * 1000.0);