mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Whitespace and coding style updates

Browse source 
Another futile attempt to cleanup the code and make coding style and
whitespace consistent. I tried to add a file that describes the key points
of our coding style. I have no illusions that this will help the least
bit...

This commit should ONLY change whitespace

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2014-01-16 11:50:56 +07:00
parent 3387ccc6f6
commit a27f67c026
28 changed files with 387 additions and 323 deletions
Download patch file Download diff file Expand all files Collapse all files

26
qt-ui/maintab.cpp
View file

@ -132,7 +132,7 @@ MainTab::MainTab(QWidget *parent) : QTabWidget(parent),
" background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,"
" stop: 0 #E0E0E0, stop: 1 #FFFFFF);"
"}");
Q_FOREACH(QGroupBox *box, findChildren<QGroupBox*>()){
Q_FOREACH(QGroupBox *box, findChildren<QGroupBox*>()) {
box->setStyleSheet(gnomeCss);
}
@ -141,7 +141,7 @@ MainTab::MainTab(QWidget *parent) : QTabWidget(parent),
QSettings s;
s.beginGroup("cylinders_dialog");
for(int i = 0; i < CylindersModel::COLUMNS; i++){
for(int i = 0; i < CylindersModel::COLUMNS; i++) {
if ((i == CylindersModel::REMOVE) || (i == CylindersModel::TYPE))
continue;
bool checked = s.value(QString("column%1_hidden").arg(i)).toBool();
@ -159,7 +159,7 @@ MainTab::~MainTab()
{
QSettings s;
s.beginGroup("cylinders_dialog");
for(int i = 0; i < CylindersModel::COLUMNS; i++){
for(int i = 0; i < CylindersModel::COLUMNS; i++) {
if ((i == CylindersModel::REMOVE) || (i == CylindersModel::TYPE))
continue;
s.setValue(QString("column%1_hidden").arg(i), ui.cylinders->view()->isColumnHidden(i));
@ -172,9 +172,9 @@ void MainTab::toggleTriggeredColumn()
int col = action->data().toInt();
QTableView *view = ui.cylinders->view();
if(action->isChecked()){
if (action->isChecked()) {
view->showColumn(col);
if(view->columnWidth(col) <= 15)
if (view->columnWidth(col) <= 15)
view->setColumnWidth(col, 80);
}
else
@ -548,14 +548,14 @@ void MainTab::updateDiveInfo(int dive)
void MainTab::addCylinder_clicked()
{
if(editMode == NONE)
if (editMode == NONE)
enableEdition();
cylindersModel->add();
}
void MainTab::addWeight_clicked()
{
if(editMode == NONE)
if (editMode == NONE)
enableEdition();
weightModel->add();
}
@ -655,7 +655,7 @@ void MainTab::acceptChanges()
}
int scrolledBy = mainWindow()->dive_list()->verticalScrollBar()->sliderPosition();
resetPallete();
if(editMode == ADD || editMode == MANUALLY_ADDED_DIVE){
if (editMode == ADD || editMode == MANUALLY_ADDED_DIVE) {
mainWindow()->dive_list()->unselectDives();
struct dive *d = get_dive(dive_table.nr -1 );
// mark the dive as remembered (abusing the selected flag)
@ -663,7 +663,7 @@ void MainTab::acceptChanges()
d->selected = true;
sort_table(&dive_table);
int i = 0;
for_each_dive(i,d){
for_each_dive(i,d) {
if (d->selected) {
d->selected = false;
break;
@ -715,7 +715,7 @@ void MainTab::rejectChanges()
tabBar()->setTabIcon(1, QIcon()); // Equipment
mainWindow()->dive_list()->setEnabled(true);
if (mainWindow() && mainWindow()->dive_list()->selectedTrips().count() == 1){
if (mainWindow() && mainWindow()->dive_list()->selectedTrips().count() == 1) {
ui.notes->setText(notesBackup[NULL].notes );
ui.location->setText(notesBackup[NULL].location);
} else {
@ -823,7 +823,7 @@ void MainTab::rejectChanges()
} \
} while(0)
void markChangedWidget(QWidget *w){
void markChangedWidget(QWidget *w) {
QPalette p;
qreal h, s, l, a;
qApp->palette().color(QPalette::Text).getHslF(&h, &s, &l, &a);
@ -890,12 +890,12 @@ void MainTab::on_location_textChanged(const QString& text)
// we are editing a trip
dive_trip_t *currentTrip = *mainWindow()->dive_list()->selectedTrips().begin();
EDIT_TEXT(currentTrip->location, text);
} else if (editMode == DIVE || editMode == ADD){
} else if (editMode == DIVE || editMode == ADD) {
if (!ui.coordinates->isModified() ||
ui.coordinates->text().trimmed().isEmpty()) {
struct dive* dive;
int i = 0;
for_each_dive(i, dive){
for_each_dive(i, dive) {
QString location(dive->location);
if (location == text &&
(dive->latitude.udeg || dive->longitude.udeg)) {