aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Benjamin <nystire@gmail.com>2013-10-04 02:04:51 +0300
committerGravatar Dirk Hohndel <dirk@hohndel.org>2013-10-04 09:40:56 -0700
commitfb5ae28865fec02b02f2b1be27192de2d2a9b389 (patch)
tree8e70323da996ee7fbd240757e1c4d5a1b2461779
parent9961cf13b13b03803b2c96ec5d2221cf18d46588 (diff)
downloadsubsurface-fb5ae28865fec02b02f2b1be27192de2d2a9b389.tar.gz
Correct spelling of "weight" throughout the code.
"Weight" was misspelled "weigth" in several places in the code and comments. Signed-off-by: Benjamin Fogel <nystire@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r--qt-ui/maintab.cpp8
-rw-r--r--qt-ui/maintab.h4
-rw-r--r--qt-ui/modeldelegates.cpp2
-rw-r--r--xslt/SuuntoSDM.xslt4
4 files changed, 9 insertions, 9 deletions
diff --git a/qt-ui/maintab.cpp b/qt-ui/maintab.cpp
index ae0de914f..2498a0d97 100644
--- a/qt-ui/maintab.cpp
+++ b/qt-ui/maintab.cpp
@@ -74,7 +74,7 @@ MainTab::MainTab(QWidget *parent) : QTabWidget(parent),
connect(ui.weights, SIGNAL(addButtonClicked()), this, SLOT(addWeight_clicked()));
connect(ui.cylinders->view(), SIGNAL(clicked(QModelIndex)), this, SLOT(editCylinderWidget(QModelIndex)));
- connect(ui.weights->view(), SIGNAL(clicked(QModelIndex)), this, SLOT(editWeigthWidget(QModelIndex)));
+ connect(ui.weights->view(), SIGNAL(clicked(QModelIndex)), this, SLOT(editWeightWidget(QModelIndex)));
connect(ui.notesButtonBox, SIGNAL(accepted()), this, SLOT(acceptChanges()));
connect(ui.notesButtonBox, SIGNAL(rejected()), this, SLOT(rejectChanges()));
connect(ui.equipmentButtonBox, SIGNAL(accepted()), this, SLOT(acceptChanges()));
@@ -167,7 +167,7 @@ void MainTab::enableEdition()
notesBackup[mydive].cylinders[i] = mydive->cylinder[i];
}
for (int i = 0; i < MAX_WEIGHTSYSTEMS; i++) {
- notesBackup[mydive].weigthsystem[i] = mydive->weightsystem[i];
+ notesBackup[mydive].weightsystem[i] = mydive->weightsystem[i];
}
}
editMode = DIVE;
@@ -561,7 +561,7 @@ void MainTab::rejectChanges()
mydive->cylinder[i] = notesBackup[mydive].cylinders[i];
}
for (int i = 0; i < MAX_WEIGHTSYSTEMS; i++) {
- mydive->weightsystem[i] = notesBackup[mydive].weigthsystem[i];
+ mydive->weightsystem[i] = notesBackup[mydive].weightsystem[i];
}
}
multiEditEquipmentPlaceholder = *get_dive(selected_dive);
@@ -726,7 +726,7 @@ void MainTab::editCylinderWidget(const QModelIndex& index)
ui.cylinders->edit(index);
}
-void MainTab::editWeigthWidget(const QModelIndex& index)
+void MainTab::editWeightWidget(const QModelIndex& index)
{
if (editMode == NONE)
enableEdition();
diff --git a/qt-ui/maintab.h b/qt-ui/maintab.h
index 8afa5ff02..2a588bad8 100644
--- a/qt-ui/maintab.h
+++ b/qt-ui/maintab.h
@@ -32,7 +32,7 @@ struct NotesBackup{
int visibility;
QString divemaster;
cylinder_t cylinders[MAX_CYLINDERS];
- weightsystem_t weigthsystem[MAX_WEIGHTSYSTEMS ];
+ weightsystem_t weightsystem[MAX_WEIGHTSYSTEMS ];
};
struct Completers{
@@ -72,7 +72,7 @@ public slots:
void on_rating_valueChanged(int value);
void on_visibility_valueChanged(int value);
void editCylinderWidget(const QModelIndex& index);
- void editWeigthWidget(const QModelIndex& index);
+ void editWeightWidget(const QModelIndex& index);
void addDiveStarted();
private:
diff --git a/qt-ui/modeldelegates.cpp b/qt-ui/modeldelegates.cpp
index e80afab59..5304313b3 100644
--- a/qt-ui/modeldelegates.cpp
+++ b/qt-ui/modeldelegates.cpp
@@ -117,7 +117,7 @@ QWidget* ComboBoxDelegate::createEditor(QWidget* parent, const QStyleOptionViewI
/* This Method is being called when the user *writes* something and press enter or tab,
* and it`s also called when the mouse walks over the list of choices from the ComboBox,
- * One thing is important, if the user writes a *new* cylinder or weigth type, it will
+ * One thing is important, if the user writes a *new* cylinder or weight type, it will
* be ADDED to the list, and the user will need to fill the other data.
*/
void ComboBoxDelegate::testActivation(const QString& currText)
diff --git a/xslt/SuuntoSDM.xslt b/xslt/SuuntoSDM.xslt
index 7256952de..5c3b17373 100644
--- a/xslt/SuuntoSDM.xslt
+++ b/xslt/SuuntoSDM.xslt
@@ -62,10 +62,10 @@
</xsl:otherwise>
</xsl:choose>
- <xsl:if test="WEIGTH != ''">
+ <xsl:if test="WEIGHT != ''">
<weightsystem>
<xsl:attribute name="weight">
- <xsl:value-of select="concat(translate(WEIGTH, ',', '.'), ' kg')"/>
+ <xsl:value-of select="concat(translate(WEIGHT, ',', '.'), ' kg')"/>
</xsl:attribute>
</weightsystem>
</xsl:if>