From d5fd8c1234a149ec9d3e10583b1da7ef1cc3f91e Mon Sep 17 00:00:00 2001 From: "Sean C. Rhea" Date: Sat, 8 Mar 2008 16:20:43 +0000 Subject: [PATCH] renamed CombinedFileReader to RideFileFactory --- src/gui/CsvRideFile.cpp | 2 +- src/gui/MainWindow.cpp | 6 +++--- src/gui/RawRideFile.cpp | 2 +- src/gui/RideFile.cpp | 12 ++++++------ src/gui/RideFile.h | 10 +++++----- src/gui/RideItem.cpp | 2 +- src/gui/SrmRideFile.cpp | 2 +- src/gui/cpint.cpp | 4 ++-- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/gui/CsvRideFile.cpp b/src/gui/CsvRideFile.cpp index 8a7f742ab..417a5b7da 100644 --- a/src/gui/CsvRideFile.cpp +++ b/src/gui/CsvRideFile.cpp @@ -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 { diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp index e434fc759..9b4d3be1a 100644 --- a/src/gui/MainWindow.cpp +++ b/src/gui/MainWindow.cpp @@ -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:") diff --git a/src/gui/RawRideFile.cpp b/src/gui/RawRideFile.cpp index 00720e190..8f78bfb11 100644 --- a/src/gui/RawRideFile.cpp +++ b/src/gui/RawRideFile.cpp @@ -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 { diff --git a/src/gui/RideFile.cpp b/src/gui/RideFile.cpp index 380c3da8d..2ea699935 100644 --- a/src/gui/RideFile.cpp +++ b/src/gui/RideFile.cpp @@ -19,16 +19,16 @@ #include "RideFile.h" #include -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 i(readFuncs_); diff --git a/src/gui/RideFile.h b/src/gui/RideFile.h index b6d09abff..3a866a3e1 100644 --- a/src/gui/RideFile.h +++ b/src/gui/RideFile.h @@ -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 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; }; diff --git a/src/gui/RideItem.cpp b/src/gui/RideItem.cpp index 4ad590304..444569f17 100644 --- a/src/gui/RideItem.cpp +++ b/src/gui/RideItem.cpp @@ -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 = "

Couldn't read file \"" + file.fileName() + "\":"; QListIterator i(errors); diff --git a/src/gui/SrmRideFile.cpp b/src/gui/SrmRideFile.cpp index 4cb8a7ff4..75e403072 100644 --- a/src/gui/SrmRideFile.cpp +++ b/src/gui/SrmRideFile.cpp @@ -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 { diff --git a/src/gui/cpint.cpp b/src/gui/cpint.cpp index e2797fdc7..8ec2ba5b4 100644 --- a/src/gui/cpint.cpp +++ b/src/gui/cpint.cpp @@ -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 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);