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

Code Cleanup: Remove #if 0 code

Browse Source 
As a personal habit I tend to use the C pre-processor to
comment out code blocks I don't want to remove. This is in
case the code will be required in the future.

I think it is now safe to say the code commented out is not
required -- most of it is legacy and marks the transition from
earlier designs or legacy code.

I've done this in one big commit since in theory it has no
functional change, and in future can look in this commit for any
code we may want to reinstate.
This commit is contained in:
Mark Liversedge
2013-02-11 15:00:00 +00:00
parent 0cb46687ab
commit cd2fca9346
17 changed files with 15 additions and 395 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
src/DiaryWindow.cpp
View File

@@ -53,9 +53,6 @@ DiaryWindow::DiaryWindow(MainWindow *mainWindow) :
controls->addStretch();
controls->addWidget(title, Qt::AlignCenter | Qt::AlignVCenter);
controls->addStretch();
#if 0
controls->addWidget(viewMode);
#endif
vlayout->addLayout(controls);
@@ -120,97 +117,35 @@ DiaryWindow::rideSelected()
QDate when = ride->dateTime.date();
int month = when.month();
int year = when.year();
#if 0
int weekNumber = when.weekNumber();
#endif
// monthly view updates
calendarModel->setMonth(when.month(), when.year());
when = when.addDays(Qt::Monday - when.dayOfWeek());
#if 0
// ok update title
switch (viewMode->currentIndex()) {
case 0 : // monthly
#endif
title->setText(QString("%1 %2").arg(QDate::longMonthName(month)).arg(year));
next->show();
prev->show();
#if 0
break;
case 1 : // weekly
title->setText(QString("Week %1 %2").arg(weekNumber).arg(year));
next->show();
prev->show();
break;
default:
case 2 : //ride
title->setText("");
next->hide();
prev->hide();
break;
}
#endif
title->setText(QString("%1 %2").arg(QDate::longMonthName(month)).arg(year));
next->show();
prev->show();
}
void
DiaryWindow::prevClicked()
{
#if 0
switch (viewMode->currentIndex()) {
case 0 : // monthly
{
#endif
int month = calendarModel->getMonth();
int year = calendarModel->getYear();
QDate when = QDate(year, month, 1).addDays(-1);
calendarModel->setMonth(when.month(), when.year());
title->setText(QString("%1 %2").arg(QDate::longMonthName(when.month())).arg(when.year()));
#if 0
}
break;
case 1 : // weekly
{
QDateTime when = weeklyView->getStartTime();
when = when.addDays(-7);
weeklyView->setDateRange(when.date(), when.addDays(6).date());
weeklyView->setViewMode(QxtScheduleView::DayView);
title->setText(QString("Week %1 %2").arg(when.date().weekNumber()).arg(when.date().year()));
}
break;
}
#endif
int month = calendarModel->getMonth();
int year = calendarModel->getYear();
QDate when = QDate(year, month, 1).addDays(-1);
calendarModel->setMonth(when.month(), when.year());
title->setText(QString("%1 %2").arg(QDate::longMonthName(when.month())).arg(when.year()));
}
void
DiaryWindow::nextClicked()
{
#if 0
switch (viewMode->currentIndex()) {
case 0 : // monthly
{
#endif
int month = calendarModel->getMonth();
int year = calendarModel->getYear();
QDate when = QDate(year, month, 1).addMonths(1);
calendarModel->setMonth(when.month(), when.year());
title->setText(QString("%1 %2").arg(QDate::longMonthName(when.month())).arg(when.year()));
#if 0
}
break;
case 1 : // weekly
{
QDateTime when = weeklyView->getStartTime();
when = when.addDays(7);
weeklyView->setDateRange(when.date(), when.addDays(6).date());
weeklyView->setViewMode(QxtScheduleView::DayView);
title->setText(QString("Week %1 %2").arg(when.date().weekNumber()).arg(when.date().year()));
}
break;
}
#endif
int month = calendarModel->getMonth();
int year = calendarModel->getYear();
QDate when = QDate(year, month, 1).addMonths(1);
calendarModel->setMonth(when.month(), when.year());
title->setText(QString("%1 %2").arg(QDate::longMonthName(when.month())).arg(when.year()));
}
bool
@@ -220,8 +155,6 @@ DiaryWindow::eventFilter(QObject *object, QEvent *e)
if (e->type() != QEvent::ToolTip && e->type() != QEvent::Paint && e->type() != QEvent::Destroy)
mainWindow->setBubble("");
//if (object != (QObject *)monthlyView) return false;
switch (e->type()) {
case QEvent::MouseButtonPress:
{