[PATCH 2/3] Rename the model column from NITROX to GAS

Anton Lundin glance at acc.umu.se
Sun Jul 20 06:07:56 PDT 2014


The column isn't just about NITROX, there might be air and trimix in
there too.

Signed-off-by: Anton Lundin <glance at acc.umu.se>
---
 qt-ui/divelistview.cpp | 2 +-
 qt-ui/models.cpp       | 6 +++---
 qt-ui/models.h         | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/qt-ui/divelistview.cpp b/qt-ui/divelistview.cpp
index 5fde4c4..d8fe37a 100644
--- a/qt-ui/divelistview.cpp
+++ b/qt-ui/divelistview.cpp
@@ -381,7 +381,7 @@ void DiveListView::reloadHeaderActions()
 			QString settingName = QString("showColumn%1").arg(i);
 			QAction *a = new QAction(title, header());
 			bool showHeaderFirstRun = !(
-							i == DiveTripModel::MAXCNS || i == DiveTripModel::NITROX || i == DiveTripModel::OTU || i == DiveTripModel::TEMPERATURE || i == DiveTripModel::TOTALWEIGHT || i == DiveTripModel::SUIT || i == DiveTripModel::CYLINDER || i == DiveTripModel::SAC);
+							i == DiveTripModel::MAXCNS || i == DiveTripModel::GAS || i == DiveTripModel::OTU || i == DiveTripModel::TEMPERATURE || i == DiveTripModel::TOTALWEIGHT || i == DiveTripModel::SUIT || i == DiveTripModel::CYLINDER || i == DiveTripModel::SAC);
 			bool shown = s.value(settingName, showHeaderFirstRun).toBool();
 			a->setCheckable(true);
 			a->setChecked(shown);
diff --git a/qt-ui/models.cpp b/qt-ui/models.cpp
index 59f97e8..588591f 100644
--- a/qt-ui/models.cpp
+++ b/qt-ui/models.cpp
@@ -1086,7 +1086,7 @@ QVariant DiveItem::data(int column, int role) const
 		case CYLINDER:
 			retVal = QString(dive->cylinder[0].type.description);
 			break;
-		case NITROX:
+		case GAS:
 			retVal = nitrox_sort_value(dive);
 			break;
 		case SAC:
@@ -1130,7 +1130,7 @@ QVariant DiveItem::data(int column, int role) const
 		case CYLINDER:
 			retVal = QString(dive->cylinder[0].type.description);
 			break;
-		case NITROX:
+		case GAS:
 			retVal = QString(get_nitrox_string(dive));
 			break;
 		case SAC:
@@ -1319,7 +1319,7 @@ QVariant DiveTripModel::headerData(int section, Qt::Orientation orientation, int
 		case CYLINDER:
 			ret = tr("Cyl");
 			break;
-		case NITROX:
+		case GAS:
 			ret = tr("Gas");
 			break;
 		case SAC:
diff --git a/qt-ui/models.h b/qt-ui/models.h
index aa314f1..c4a3a07 100644
--- a/qt-ui/models.h
+++ b/qt-ui/models.h
@@ -191,7 +191,7 @@ struct DiveItem : public TreeItem {
 		TOTALWEIGHT,
 		SUIT,
 		CYLINDER,
-		NITROX,
+		GAS,
 		SAC,
 		OTU,
 		MAXCNS,
@@ -245,7 +245,7 @@ public:
 		TOTALWEIGHT,
 		SUIT,
 		CYLINDER,
-		NITROX,
+		GAS,
 		SAC,
 		OTU,
 		MAXCNS,
-- 
1.9.1



More information about the subsurface mailing list