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

Code Cleanup: Notes deprecated

Browse Source 
.. some vestiges from the old notes file.
.. fixes a significant memory leak in MainWindow too.
This commit is contained in:
Mark Liversedge
2013-02-11 09:35:03 +00:00
parent ad158d967d
commit 1af4e83509
4 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/MainWindow.cpp
View File

@@ -664,11 +664,10 @@ MainWindow::MainWindow(const QDir &home) :
QTreeWidgetItem *last = NULL;
QStringListIterator i(RideFileFactory::instance().listRideFiles(home));
while (i.hasNext()) {
QString name = i.next(), notesFileName;
QString name = i.next();
QDateTime dt;
if (parseRideFileName(name, &notesFileName, &dt)) {
last = new RideItem(RIDE_TYPE, home.path(),
name, dt, zones(), hrZones(), notesFileName, this);
if (parseRideFileName(name, &dt)) {
last = new RideItem(RIDE_TYPE, home.path(), name, dt, zones(), hrZones(), this);
allRides->addChild(last);
}
}
@@ -1813,13 +1812,12 @@ MainWindow::dropEvent(QDropEvent *event)
void
MainWindow::addRide(QString name, bool /* bSelect =true*/)
{
QString notesFileName;
QDateTime dt;
if (!parseRideFileName(name, &notesFileName, &dt)) {
if (!parseRideFileName(name, &dt)) {
fprintf(stderr, "bad name: %s\n", name.toAscii().constData());
assert(false);
}
RideItem *last = new RideItem(RIDE_TYPE, home.path(), name, dt, zones(), hrZones(), notesFileName, this);
RideItem *last = new RideItem(RIDE_TYPE, home.path(), name, dt, zones(), hrZones(), this);
int index = 0;
while (index < allRides->childCount()) {
@@ -2485,7 +2483,7 @@ MainWindow::setCriticalPower(int cp)
}
bool
MainWindow::parseRideFileName(const QString &name, QString *notesFileName, QDateTime *dt)
MainWindow::parseRideFileName(const QString &name, QDateTime *dt)
{
static char rideFileRegExp[] = "^((\\d\\d\\d\\d)_(\\d\\d)_(\\d\\d)"
"_(\\d\\d)_(\\d\\d)_(\\d\\d))\\.(.+)$";
@@ -2503,7 +2501,6 @@ MainWindow::parseRideFileName(const QString &name, QString *notesFileName, QDate
return false;
}
*dt = QDateTime(date, time);
*notesFileName = rx.cap(1) + ".notes";
return true;
}

4
src/MainWindow.h
View File

@@ -375,8 +375,6 @@ class MainWindow : public QMainWindow
protected:
static QString notesFileName(QString rideFileName);
private:
QSharedPointer<QSettings> settings;
IntervalItem *activeInterval; // currently active for context menu popup
@@ -439,7 +437,7 @@ class MainWindow : public QMainWindow
QSignalMapper *toolMapper;
WithingsDownload *withingsDownload;
ZeoDownload *zeoDownload;
bool parseRideFileName(const QString &name, QString *notesFileName, QDateTime *dt);
bool parseRideFileName(const QString &name, QDateTime *dt);
#ifdef Q_OS_MAC
// Mac Native Support

4
src/RideItem.cpp
View File

@@ -28,9 +28,9 @@
RideItem::RideItem(int type,
QString path, QString fileName, const QDateTime &dateTime,
const Zones *zones, const HrZones *hrZones, QString notesFileName, MainWindow *main) :
const Zones *zones, const HrZones *hrZones, MainWindow *main) :
QTreeWidgetItem(type), ride_(NULL), main(main), isdirty(false), isedit(false), path(path), fileName(fileName),
dateTime(dateTime), zones(zones), hrZones(hrZones), notesFileName(notesFileName)
dateTime(dateTime), zones(zones), hrZones(hrZones)
{
setText(0, dateTime.toString("ddd"));
setText(1, dateTime.toString("MMM d, yyyy"));

3
src/RideItem.h
View File

@@ -74,11 +74,10 @@ class RideItem : public QObject, public QTreeWidgetItem //<< for signals/slots
const QStringList errors() { return errors_; }
const Zones *zones;
const HrZones *hrZones;
QString notesFileName;
RideItem(int type, QString path,
QString fileName, const QDateTime &dateTime,
const Zones *zones, const HrZones *hrZones, QString notesFileName, MainWindow *main);
const Zones *zones, const HrZones *hrZones, MainWindow *main);
void setDirty(bool);
bool isDirty() { return isdirty; }