From 21782c4e6f0fc10e29041f8944a33f4a1b45cf63 Mon Sep 17 00:00:00 2001 From: Sean Rhea Date: Wed, 2 Dec 2009 09:57:46 -0500 Subject: [PATCH] remove duplicate addZoneRange function The cp argument wasn't being used, so just call the one that doesn't take a cp argument. --- src/MainWindow.cpp | 2 +- src/Zones.cpp | 8 +------- src/Zones.h | 1 - 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index 53d100fc7..efc8acca3 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -820,7 +820,7 @@ MainWindow::setCriticalPower(int cp) // add a new range if we failed to find a valid one if (range < 0) { // create an infinite range - zones->addZoneRange(cp); + zones->addZoneRange(); range = 0; } diff --git a/src/Zones.cpp b/src/Zones.cpp index 7f3a2bdd6..9bbb31ed7 100644 --- a/src/Zones.cpp +++ b/src/Zones.cpp @@ -744,12 +744,6 @@ void Zones::addZoneRange(QDate _start, QDate _end, int _cp) ranges.append(ZoneRange(_start, _end, _cp)); } -void Zones::addZoneRange(int _cp) -{ - (void) _cp; // TODO: _cp is unused. Remove it? - ranges.append(ZoneRange(date_zero, date_infinity)); -} - void Zones::addZoneRange() { ranges.append(ZoneRange(date_zero, date_infinity)); @@ -845,7 +839,7 @@ int Zones::insertRangeAtDate(QDate date, int cp) { int rnum; if (ranges.empty()) - addZoneRange(cp); + addZoneRange(); else { rnum = whichRange(date); assert(rnum >= 0); diff --git a/src/Zones.h b/src/Zones.h index 7350557d0..7d4957f8f 100644 --- a/src/Zones.h +++ b/src/Zones.h @@ -60,7 +60,6 @@ class Zones : public QObject Zones() : defaults_from_user(false) {} void addZoneRange(QDate _start, QDate _end, int _cp); - void addZoneRange(int _cp); void addZoneRange(); bool read(QFile &file);