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

Fix some random compiler warnings

Browse source 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2013-11-14 21:06:31 +09:00
parent ed41d5a744
commit 9c90d6790a
3 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
qt-ui/diveplanner.cpp
View file

@ -1321,7 +1321,7 @@ void DivePlannerPointsModel::tanksUpdated()
divedatapoint& p = divepoints[j]; divedatapoint& p = divepoints[j];
int o2 = oldGases.at(i).first; int o2 = oldGases.at(i).first;
int he = oldGases.at(i).second; int he = oldGases.at(i).second;
if (p.o2 == o2 && p.he == he || if ((p.o2 == o2 && p.he == he) ||
(is_air(p.o2, p.he) && (is_air(o2, he) || (o2 == 0 && he == 0)))) { (is_air(p.o2, p.he) && (is_air(o2, he) || (o2 == 0 && he == 0)))) {
p.o2 = gases.at(i).first; p.o2 = gases.at(i).first;
p.he = gases.at(i).second; p.he = gases.at(i).second;

2
qt-ui/maintab.h
View file

@ -83,11 +83,11 @@ public slots:
void enableEdition(EditMode newEditMode = NONE); void enableEdition(EditMode newEditMode = NONE);
private: private:
EditMode editMode;
Ui::MainTab ui; Ui::MainTab ui;
WeightModel *weightModel; WeightModel *weightModel;
CylindersModel *cylindersModel; CylindersModel *cylindersModel;
QMap<dive*, NotesBackup> notesBackup; QMap<dive*, NotesBackup> notesBackup;
EditMode editMode;
/* since the multi-edition of the equipment is fairly more /* since the multi-edition of the equipment is fairly more
* complex than a single item, because it involves a Qt * complex than a single item, because it involves a Qt

2
qt-ui/mainwindow.cpp
View file

@ -566,7 +566,6 @@ bool MainWindow::askSaveChanges()
void MainWindow::initialUiSetup() void MainWindow::initialUiSetup()
{ {
QSettings settings; QSettings settings;
int i;
settings.beginGroup("MainWindow"); settings.beginGroup("MainWindow");
QSize sz = settings.value("size", qApp->desktop()->size()).value<QSize>(); QSize sz = settings.value("size", qApp->desktop()->size()).value<QSize>();
resize(sz); resize(sz);
@ -641,7 +640,6 @@ void MainWindow::readSettings()
void MainWindow::writeSettings() void MainWindow::writeSettings()
{ {
int i;
QSettings settings; QSettings settings;
settings.beginGroup("MainWindow"); settings.beginGroup("MainWindow");