CyclistPage gets const Zones ptr

This commit is contained in:
Sean Rhea
2009-12-02 11:29:42 -05:00
parent 95b44b7752
commit a4a2ca136a
3 changed files with 12 additions and 16 deletions

View File

@@ -31,7 +31,7 @@ ConfigDialog::ConfigDialog(QDir _home, Zones **_zones)
assert(zones);
cyclistPage = new CyclistPage(zones);
cyclistPage = new CyclistPage(*zones);
contentsWidget = new QListWidget;
contentsWidget->setViewMode(QListView::IconMode);

View File

@@ -176,7 +176,7 @@ CyclistPage::~CyclistPage()
delete mainLayout;
}
CyclistPage::CyclistPage(Zones **_zones):
CyclistPage::CyclistPage(const Zones *_zones):
zones(_zones)
{
boost::shared_ptr<QSettings> settings = GetApplicationSettings();
@@ -240,16 +240,16 @@ CyclistPage::CyclistPage(Zones **_zones):
QDate today = QDate::currentDate();
calendar->setSelectedDate(today);
if ((! *zones) || ((*zones)->getRangeSize() == 0))
setCurrentRange();
if (zones->getRangeSize() == 0)
setCurrentRange();
else
{
setCurrentRange((*zones)->whichRange(today));
setCurrentRange(zones->whichRange(today));
btnDelete->setEnabled(true);
checkboxNew->setCheckState(Qt::Unchecked);
}
int cp = (*zones ? (*zones)->getCP(currentRange) : 0);
int cp = zones->getCP(currentRange);
if (cp > 0)
setCP(cp);
@@ -339,11 +339,7 @@ void CyclistPage::setSelectedDate(QDate date)
void CyclistPage::setCurrentRange(int range)
{
int num_ranges =
*zones ?
(*zones)->getRangeSize() :
0;
int num_ranges = zones->getRangeSize();
if ((num_ranges == 0) || (range < 0)) {
btnBack->setEnabled(false);
btnDelete->setEnabled(false);
@@ -372,11 +368,11 @@ void CyclistPage::setCurrentRange(int range)
calendar->setEnabled(true);
// update the CP display
setCP((*zones)->getCP(currentRange));
setCP(zones->getCP(currentRange));
// update date limits
txtStartDate->setText((*zones)->getStartDateString(currentRange));
txtEndDate->setText((*zones)->getEndDateString(currentRange));
txtStartDate->setText(zones->getStartDateString(currentRange));
txtEndDate->setText(zones->getEndDateString(currentRange));
}

View File

@@ -53,7 +53,7 @@ class CyclistPage : public QWidget
{
public:
~CyclistPage();
CyclistPage(Zones **_zones);
CyclistPage(const Zones *_zones);
int thresholdPower;
QString getText();
int getCP();
@@ -91,7 +91,7 @@ class CyclistPage : public QWidget
private:
QGroupBox *cyclistGroup;
Zones **zones;
const Zones *zones;
int currentRange;
QLabel *lblThreshold;
QLineEdit *txtThreshold;