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

Correct spelling of "weight" throughout the code.

Browse source 
"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>
This commit is contained in:
Benjamin 2013-10-04 02:04:51 +03:00 • committed by Dirk Hohndel
parent 9961cf13b1
commit fb5ae28865
4 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
qt-ui/maintab.cpp
View file

@ -74,7 +74,7 @@ MainTab::MainTab(QWidget *parent) : QTabWidget(parent),
connect(ui.weights, SIGNAL(addButtonClicked()), this, SLOT(addWeight_clicked())); connect(ui.weights, SIGNAL(addButtonClicked()), this, SLOT(addWeight_clicked()));
connect(ui.cylinders->view(), SIGNAL(clicked(QModelIndex)), this, SLOT(editCylinderWidget(QModelIndex))); 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(accepted()), this, SLOT(acceptChanges()));
connect(ui.notesButtonBox, SIGNAL(rejected()), this, SLOT(rejectChanges())); connect(ui.notesButtonBox, SIGNAL(rejected()), this, SLOT(rejectChanges()));
connect(ui.equipmentButtonBox, SIGNAL(accepted()), this, SLOT(acceptChanges())); connect(ui.equipmentButtonBox, SIGNAL(accepted()), this, SLOT(acceptChanges()));
@ -167,7 +167,7 @@ void MainTab::enableEdition()
notesBackup[mydive].cylinders[i] = mydive->cylinder[i]; notesBackup[mydive].cylinders[i] = mydive->cylinder[i];
} }
for (int i = 0; i < MAX_WEIGHTSYSTEMS; 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; editMode = DIVE;
@ -561,7 +561,7 @@ void MainTab::rejectChanges()
mydive->cylinder[i] = notesBackup[mydive].cylinders[i]; mydive->cylinder[i] = notesBackup[mydive].cylinders[i];
} }
for (int i = 0; i < MAX_WEIGHTSYSTEMS; 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); multiEditEquipmentPlaceholder = *get_dive(selected_dive);
@ -726,7 +726,7 @@ void MainTab::editCylinderWidget(const QModelIndex& index)
ui.cylinders->edit(index); ui.cylinders->edit(index);
} }
void MainTab::editWeigthWidget(const QModelIndex& index) void MainTab::editWeightWidget(const QModelIndex& index)
{ {
if (editMode == NONE) if (editMode == NONE)
enableEdition(); enableEdition();

4
qt-ui/maintab.h
View file

@ -32,7 +32,7 @@ struct NotesBackup{
int visibility; int visibility;
QString divemaster; QString divemaster;
cylinder_t cylinders[MAX_CYLINDERS]; cylinder_t cylinders[MAX_CYLINDERS];
weightsystem_t weigthsystem[MAX_WEIGHTSYSTEMS ]; weightsystem_t weightsystem[MAX_WEIGHTSYSTEMS ];
}; };
struct Completers{ struct Completers{
@ -72,7 +72,7 @@ public slots:
void on_rating_valueChanged(int value); void on_rating_valueChanged(int value);
void on_visibility_valueChanged(int value); void on_visibility_valueChanged(int value);
void editCylinderWidget(const QModelIndex& index); void editCylinderWidget(const QModelIndex& index);
void editWeigthWidget(const QModelIndex& index); void editWeightWidget(const QModelIndex& index);
void addDiveStarted(); void addDiveStarted();
private: private:

2
qt-ui/modeldelegates.cpp
View file

@ -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, /* 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, * 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. * be ADDED to the list, and the user will need to fill the other data.
*/ */
void ComboBoxDelegate::testActivation(const QString& currText) void ComboBoxDelegate::testActivation(const QString& currText)

4
xslt/SuuntoSDM.xslt
View file

@ -62,10 +62,10 @@
</xsl:otherwise> </xsl:otherwise>
</xsl:choose> </xsl:choose>
<xsl:if test="WEIGTH != ''"> <xsl:if test="WEIGHT != ''">
<weightsystem> <weightsystem>
<xsl:attribute name="weight"> <xsl:attribute name="weight">
<xsl:value-of select="concat(translate(WEIGTH, ',', '.'), ' kg')"/> <xsl:value-of select="concat(translate(WEIGHT, ',', '.'), ' kg')"/>
</xsl:attribute> </xsl:attribute>
</weightsystem> </weightsystem>
</xsl:if> </xsl:if>