diff --git a/core/dive.cpp b/core/dive.cpp
index 0bf2209ae..541bdfac6 100644
--- a/core/dive.cpp
+++ b/core/dive.cpp
@@ -704,9 +704,9 @@ static void fixup_water_salinity(struct dive &dive)
 		dive.salinity = (sum + nr / 2) / nr;
 }
 
-int get_dive_salinity(const struct dive *dive)
+int dive::get_salinity() const
 {
-	return dive->user_salinity ? dive->user_salinity : dive->salinity;
+	return user_salinity ? user_salinity : salinity;
 }
 
 static void fixup_meandepth(struct dive &dive)
diff --git a/core/dive.h b/core/dive.h
index 4ecc21dde..e16163947 100644
--- a/core/dive.h
+++ b/core/dive.h
@@ -107,6 +107,7 @@ struct dive {
 	cylinder_t *get_cylinder(int idx);
 	const cylinder_t *get_cylinder(int idx) const;
 	weight_t total_weight() const;
+	int get_salinity() const;
 
 	int depth_to_mbar(int depth) const;
 	double depth_to_mbarf(int depth) const;
@@ -191,7 +192,6 @@ extern int legacy_format_o2pressures(const struct dive *dive, const struct divec
 extern bool dive_less_than(const struct dive &a, const struct dive &b);
 extern bool dive_less_than_ptr(const struct dive *a, const struct dive *b);
 extern bool dive_or_trip_less_than(struct dive_or_trip a, struct dive_or_trip b);
-extern int get_dive_salinity(const struct dive *dive);
 extern int dive_getUniqID();
 
 extern void copy_events_until(const struct dive *sd, struct dive *dd, int dcNr, int time);
diff --git a/desktop-widgets/tab-widgets/TabDiveInformation.cpp b/desktop-widgets/tab-widgets/TabDiveInformation.cpp
index 8dec4d510..99ec535ac 100644
--- a/desktop-widgets/tab-widgets/TabDiveInformation.cpp
+++ b/desktop-widgets/tab-widgets/TabDiveInformation.cpp
@@ -221,7 +221,7 @@ void TabDiveInformation::updateData(const std::vector<dive *> &, dive *currentDi
 	ui->airtemp->setText(get_temperature_string(currentDive->airtemp, true));
 	ui->atmPressType->setItemText(1, get_depth_unit());  // Check for changes in depth unit (imperial/metric)
 	setIndexNoSignal(ui->atmPressType, 0);		     // Set the atmospheric pressure combo box to mbar
-	salinity_value = get_dive_salinity(currentDive);
+	salinity_value = currentDive->get_salinity();
 	if (salinity_value) {			// Set water type indicator (EN13319 = 1.020 g/l)
 		setIndexNoSignal(ui->waterTypeCombo, updateSalinityComboIndex(salinity_value));
 		ui->waterTypeText->setText(get_water_type_string(salinity_value));