Merge branch 'fixCppStyleToC' of https://github.com/tcanabrava/subsurface into Qt

This commit is contained in:
Dirk Hohndel 2013-04-14 07:02:06 -07:00
commit 983e5f6356

View file

@ -26,28 +26,37 @@ void MainTab::clearEquipment()
void MainTab::clearInfo() void MainTab::clearInfo()
{ {
QList<QLabel*> labels; ui->sac->setText(QString());
labels << ui->sac << ui->otu << ui->oxygenhelium << ui->gasused ui->otu->setText(QString());
<< ui->date << ui->divetime << ui->surfinterval ui->oxygenhelium->setText(QString());
<< ui->maxdepth << ui->avgdepth << ui->visibility ui->gasused->setText(QString());
<< ui->watertemperature << ui->airtemperature << ui->airpress; ui->date->setText(QString());
ui->divetime->setText(QString());
Q_FOREACH(QLabel *l, labels){ ui->surfinterval->setText(QString());
l->setText(QString()); ui->maxdepth->setText(QString());
} ui->avgdepth->setText(QString());
ui->visibility->setText(QString());
ui->watertemperature->setText(QString());
ui->airtemperature->setText(QString());
ui->airpress->setText(QString());
} }
void MainTab::clearStats() void MainTab::clearStats()
{ {
QList<QLabel*> labels; ui->maxdepth_2->setText(QString());
labels << ui->maxdepth_2 << ui->mindepth << ui->avgdepth ui->mindepth->setText(QString());
<< ui->maxsac << ui->minsac << ui->avgsac ui->avgdepth->setText(QString());
<< ui->dives << ui->maxtemp << ui->mintemp << ui->avgtemp ui->maxsac->setText(QString());
<< ui->totaltime << ui->avgtime << ui->longestdive << ui->shortestdive; ui->minsac->setText(QString());
ui->avgsac->setText(QString());
Q_FOREACH(QLabel *l, labels){ ui->dives->setText(QString());
l->setText(QString()); ui->maxtemp->setText(QString());
} ui->mintemp->setText(QString());
ui->avgtemp->setText(QString());
ui->totaltime->setText(QString());
ui->avgtime->setText(QString());
ui->longestdive->setText(QString());
ui->shortestdive->setText(QString());
} }
void MainTab::on_addCylinder_clicked() void MainTab::on_addCylinder_clicked()