We use 'setpoint' in UI. Use it also for documentation and comments. No semantic change.

9 files changed, 25 insertions, 25 deletions

diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index aedea9d20..e5337b203 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -3492,7 +3492,7 @@ image::images/PlannerWindow1_f20.jpg["FIGURE: Dive planner startup window",align
  *  The most efficient way to create a dive profile is to enter the appropriate values into the table
     marked _Dive planner points_. The first line of the table represents the duration and the final
     depth of the descent from the surface. Subsequent segments describe the bottom phase of the dive.
-    The _CC set point_ column is only relevant for closed circuit divers.
+    The _CC setpoint_ column is only relevant for closed circuit divers.
     The ascent is usually not specified because this is what the planner is supposed to calculate.
     Add additional segments to the profile by selecting the "+" icon at the top right hand of the
     table. Segments entered into the _Dive planner points_ table automatically appear in the *Dive
@@ -3675,7 +3675,7 @@ the surface. These changes can be deleted by right-clicking the gas change and
 manually creating a gas change by right-clicking on the appropriate
 waypoint.
 
-A non-zero value in the "CC set point" column of the table of dive planner points
+A non-zero value in the "CC setpoint" column of the table of dive planner points
 indicates a valid setpoint for oxygen partial pressure and that the segment
 is dived using a closed circuit rebreather (CCR). If the last manually entered
 segment is a CCR segment, the decompression phase is computed assuming the diver
diff --git a/Documentation/user-manual_es.txt b/Documentation/user-manual_es.txt
index 5e61fc5f6..de8551d45 100644
--- a/Documentation/user-manual_es.txt
+++ b/Documentation/user-manual_es.txt
@@ -3557,7 +3557,7 @@ gestión del oxígeno:
 
 ** CCR Options: Estas opciones determinan la gestión del oxigeno en
 inmersiones con CCRs
-*** _Set point por defecto en el Planificador_: Especifica el setpoint de O~2~
+*** _Setpoint por defecto en el Planificador_: Especifica el setpoint de O~2~
     de una planificación con CCR. Este dertermina la pO~2~ a mantener durante el
     buceo. Se pueden añadir cambios a lo largo de la inmersión desde el menú
     contextual.
@@ -3806,7 +3806,7 @@ image::images/PlannerWindow1_f20.jpg["FIGURA: Ventana de inicio del planificador
    apropiados en la tabla llamada _Puntos del planificador de inmersiones_.
    La primera línea de la tabla representa la duración y profundidad final
    de un descenso desde superficie. Los segmentos siguientes describirán la
-   fase de fondo de la inmersión. La columna _CC set point_ solo es relevante
+   fase de fondo de la inmersión. La columna _CC setpoint_ solo es relevante
    para para buceadores en circuito cerrado.
    El ascenso, normalmente, no se especifica, ya que esto es lo que se supone
    que el planificador debe calcular.
diff --git a/Documentation/user-manual_fr.txt b/Documentation/user-manual_fr.txt
index c4805b6ae..9685f5a66 100644
--- a/Documentation/user-manual_fr.txt
+++ b/Documentation/user-manual_fr.txt
@@ -3684,7 +3684,7 @@ image::images/PlannerWindow1_f20.jpg["FIGURE: Dive planner startup window", alig
     values into the table marked _Dive planner points_. The first line of the
     table represents the duration and the final depth of the descent from the
     surface. Subsequent segments describe the bottom phase of the dive.  The _CC
-    set point_ column is only relevant for closed circuit divers.  The ascent is
+    setpoint_ column is only relevant for closed circuit divers.  The ascent is
     usually not specified because this is what the planner is supposed to
     calculate.  Add additional segments to the profile by selecting the "+" icon
     at the top right hand of the table. Segments entered into the _Dive planner
@@ -3875,7 +3875,7 @@ switches will be suggested during the ascent to the surface. These changes
 can be deleted by right-clicking the gas change and manually creating a gas
 change by right-clicking on the appropriate waypoint.
 
-A non-zero value in the "CC set point" column of the table of dive planner
+A non-zero value in the "CC setpoint" column of the table of dive planner
 points indicates a valid setpoint for oxygen partial pressure and that the
 segment is dived using a closed circuit rebreather (CCR). If the last
 manually entered segment is a CCR segment, the decompression phase is
diff --git a/core/configuredivecomputer.cpp b/core/configuredivecomputer.cpp
index d8aefaecc..1e1f9faaf 100644
--- a/core/configuredivecomputer.cpp
+++ b/core/configuredivecomputer.cpp
@@ -131,8 +131,8 @@ bool ConfigureDiveComputer::saveXMLBackup(QString fileName, DeviceDetails *detai
 	writer.writeTextElement("Dil3", dil3);
 	writer.writeTextElement("Dil4", dil4);
 	writer.writeTextElement("Dil5", dil5);
-	//
-	//Add set point values
+
+	//Add setpoint values
 	QString sp1 = QString("%1,%2")
 			      .arg(QString::number(details->sp1.sp),
 				   QString::number(details->sp1.depth));
diff --git a/core/configuredivecomputerthreads.cpp b/core/configuredivecomputerthreads.cpp
index 33edbdce0..9dd83a6ea 100644
--- a/core/configuredivecomputerthreads.cpp
+++ b/core/configuredivecomputerthreads.cpp
@@ -501,7 +501,7 @@ static dc_status_t read_ostc3_settings(dc_device_t *device, DeviceDetails *m_dev
 	m_deviceDetails->dil4 = dil4;
 	m_deviceDetails->dil5 = dil5;
 
-	//Read set point Values
+	//Read setpoint Values
 	setpoint sp1;
 	setpoint sp2;
 	setpoint sp3;
@@ -700,7 +700,7 @@ static dc_status_t write_ostc3_settings(dc_device_t *device, DeviceDetails *m_de
 		return rc;
 	EMIT_PROGRESS();
 
-	//write set point values
+	//write setpoint values
 	unsigned char sp1Data[2] = {
 		m_deviceDetails->sp1.sp,
 		m_deviceDetails->sp1.depth
diff --git a/core/liquivision.c b/core/liquivision.c
index 9347a724a..c023e0f02 100644
--- a/core/liquivision.c
+++ b/core/liquivision.c
@@ -54,7 +54,7 @@ static int handle_event_ver3(int code, const unsigned char *ps, unsigned int ps_
 		break;
 	case 0x0008:
 		// 4 byte time
-		// 2 byte gas set point 2
+		// 2 byte gas setpoint 2
 		skip = 6;
 		break;
 	case 0x000f:
diff --git a/desktop-widgets/configuredivecomputerdialog.cpp b/desktop-widgets/configuredivecomputerdialog.cpp
index f322ccdde..4ee61bb99 100644
--- a/desktop-widgets/configuredivecomputerdialog.cpp
+++ b/desktop-widgets/configuredivecomputerdialog.cpp
@@ -576,7 +576,7 @@ void ConfigureDiveComputerDialog::populateDeviceDetailsOSTC3()
 	deviceDetails->dil4 = dil4;
 	deviceDetails->dil5 = dil5;
 
-	//set set point details
+	//set setpoint details
 	setpoint sp1;
 	setpoint sp2;
 	setpoint sp3;
@@ -709,7 +709,7 @@ void ConfigureDiveComputerDialog::populateDeviceDetailsOSTC()
 	deviceDetails->dil4 = dil4;
 	deviceDetails->dil5 = dil5;
 
-	//set set point details
+	//set setpoint details
 	setpoint sp1;
 	setpoint sp2;
 	setpoint sp3;
@@ -945,23 +945,23 @@ void ConfigureDiveComputerDialog::reloadValuesOSTC3()
 	ui.ostc3DilTable->setItem(4, 3, new QTableWidgetItem(QString::number(deviceDetails->dil5.type)));
 	ui.ostc3DilTable->setItem(4, 4, new QTableWidgetItem(QString::number(deviceDetails->dil5.depth)));
 
-	//load set point 1 values
+	//load setpoint 1 values
 	ui.ostc3SetPointTable->setItem(0, 1, new QTableWidgetItem(QString::number(deviceDetails->sp1.sp)));
 	ui.ostc3SetPointTable->setItem(0, 2, new QTableWidgetItem(QString::number(deviceDetails->sp1.depth)));
 
-	//load set point 2 values
+	//load setpoint 2 values
 	ui.ostc3SetPointTable->setItem(1, 1, new QTableWidgetItem(QString::number(deviceDetails->sp2.sp)));
 	ui.ostc3SetPointTable->setItem(1, 2, new QTableWidgetItem(QString::number(deviceDetails->sp2.depth)));
 
-	//load set point 3 values
+	//load setpoint 3 values
 	ui.ostc3SetPointTable->setItem(2, 1, new QTableWidgetItem(QString::number(deviceDetails->sp3.sp)));
 	ui.ostc3SetPointTable->setItem(2, 2, new QTableWidgetItem(QString::number(deviceDetails->sp3.depth)));
 
-	//load set point 4 values
+	//load setpoint 4 values
 	ui.ostc3SetPointTable->setItem(3, 1, new QTableWidgetItem(QString::number(deviceDetails->sp4.sp)));
 	ui.ostc3SetPointTable->setItem(3, 2, new QTableWidgetItem(QString::number(deviceDetails->sp4.depth)));
 
-	//load set point 5 values
+	//load setpoint 5 values
 	ui.ostc3SetPointTable->setItem(4, 1, new QTableWidgetItem(QString::number(deviceDetails->sp5.sp)));
 	ui.ostc3SetPointTable->setItem(4, 2, new QTableWidgetItem(QString::number(deviceDetails->sp5.depth)));
 }
@@ -1072,23 +1072,23 @@ setNumberOfDives
 	ui.ostcDilTable->setItem(4, 3, new QTableWidgetItem(QString::number(deviceDetails->dil5.type)));
 	ui.ostcDilTable->setItem(4, 4, new QTableWidgetItem(QString::number(deviceDetails->dil5.depth)));
 
-	//load set point 1 values
+	//load setpoint 1 values
 	ui.ostcSetPointTable->setItem(0, 1, new QTableWidgetItem(QString::number(deviceDetails->sp1.sp)));
 	ui.ostcSetPointTable->setItem(0, 2, new QTableWidgetItem(QString::number(deviceDetails->sp1.depth)));
 
-	//load set point 2 values
+	//load setpoint 2 values
 	ui.ostcSetPointTable->setItem(1, 1, new QTableWidgetItem(QString::number(deviceDetails->sp2.sp)));
 	ui.ostcSetPointTable->setItem(1, 2, new QTableWidgetItem(QString::number(deviceDetails->sp2.depth)));
 
-	//load set point 3 values
+	//load setpoint 3 values
 	ui.ostcSetPointTable->setItem(2, 1, new QTableWidgetItem(QString::number(deviceDetails->sp3.sp)));
 	ui.ostcSetPointTable->setItem(2, 2, new QTableWidgetItem(QString::number(deviceDetails->sp3.depth)));
 
-	//load set point 4 values
+	//load setpoint 4 values
 	ui.ostcSetPointTable->setItem(3, 1, new QTableWidgetItem(QString::number(deviceDetails->sp4.sp)));
 	ui.ostcSetPointTable->setItem(3, 2, new QTableWidgetItem(QString::number(deviceDetails->sp4.depth)));
 
-	//load set point 5 values
+	//load setpoint 5 values
 	ui.ostcSetPointTable->setItem(4, 1, new QTableWidgetItem(QString::number(deviceDetails->sp5.sp)));
 	ui.ostcSetPointTable->setItem(4, 2, new QTableWidgetItem(QString::number(deviceDetails->sp5.depth)));
 }
diff --git a/profile-widget/diveeventitem.cpp b/profile-widget/diveeventitem.cpp
index 5af188c2d..b5a532e7a 100644
--- a/profile-widget/diveeventitem.cpp
+++ b/profile-widget/diveeventitem.cpp
@@ -165,7 +165,7 @@ void DiveEventItem::setupToolTipString()
 		}
 	} else if (type == SAMPLE_EVENT_PO2 && same_string(internalEvent->name, "SP change")) {
 		// this is a bad idea - we are abusing an existing event type that is supposed to
-		// warn of high or low pO₂ and are turning it into a set point change event
+		// warn of high or low pO₂ and are turning it into a setpoint change event
 		name += ":\n" + tr("Manual switch to OC");
 	} else {
 		name += internalEvent->flags & SAMPLE_FLAGS_BEGIN ? tr(" begin", "Starts with space!") :
diff --git a/terms b/terms
index 5643fd721..1c6e21bfc 100644
--- a/terms
+++ b/terms
@@ -80,7 +80,7 @@ CC		 Closed circuit - short for "rebreather diving"
 
 OC		 Open circuit - traditional scuba
 
-CC Set Point	 Rebreathers often are run with a fixed PO₂ - the "set point"
+CC Setpoint	 Rebreathers often are run with a fixed PO₂ - the "setpoint"
 
 Bailing out to OC
 		 in a rebreather dive the dive switches to their emergency