Skip to content

Commit

Permalink
Merge pull request #7 from dietmarw/fixSpelling
Browse files Browse the repository at this point in the history
Fix common spelling mistakes.
  • Loading branch information
adeas31 committed Jan 28, 2016
2 parents 9a49346 + 7c38b4c commit 80346cc
Show file tree
Hide file tree
Showing 13 changed files with 21 additions and 21 deletions.
6 changes: 3 additions & 3 deletions OMEdit/OMEditGUI/Annotations/ShapeAnnotation.cpp
Expand Up @@ -1058,7 +1058,7 @@ void ShapeAnnotation::referenceShapeDeleted()
}

/*!
Slot activated when Delete option is choosen from context menu of the shape.\n
Slot activated when Delete option is chosen from context menu of the shape.\n
Deletes the connection.
*/
void ShapeAnnotation::deleteConnection()
Expand All @@ -1072,7 +1072,7 @@ void ShapeAnnotation::deleteConnection()
/*!
* \brief ShapeAnnotation::deleteMe
* Deletes the shape. Slot activated when Del key is pressed while the shape is selected.\n
* Slot activated when Delete option is choosen from context menu of the shape.\n
* Slot activated when Delete option is chosen from context menu of the shape.\n
*/
void ShapeAnnotation::deleteMe()
{
Expand Down Expand Up @@ -1460,7 +1460,7 @@ bool ShapeAnnotation::isLineStraight(QPointF point1, QPointF point2)

/*!
* \brief ShapeAnnotation::showShapeProperties
* Slot activated when Properties option is choosen from context menu of the shape.
* Slot activated when Properties option is chosen from context menu of the shape.
*/
void ShapeAnnotation::showShapeProperties()
{
Expand Down
4 changes: 2 additions & 2 deletions OMEdit/OMEditGUI/Annotations/ShapePropertiesDialog.cpp
Expand Up @@ -60,7 +60,7 @@ ShapePropertiesDialog::ShapePropertiesDialog(ShapeAnnotation *pShapeAnnotation,
mpShapePropertiesHeading = new Label(QString(title).append(" ").append(Helper::properties));
mpShapePropertiesHeading->setFont(QFont(Helper::systemFontInfo.family(), Helper::headingFontSize));
mpShapePropertiesHeading->setAlignment(Qt::AlignTop);
// set seperator line
// set separator line
mHorizontalLine = new QFrame();
mHorizontalLine->setFrameShape(QFrame::HLine);
mHorizontalLine->setFrameShadow(QFrame::Sunken);
Expand Down Expand Up @@ -815,7 +815,7 @@ bool ShapePropertiesDialog::applyShapeProperties()
LibraryTreeItem *pLibraryTreeItem = mpShapeAnnotation->getGraphicsView()->getModelWidget()->getLibraryTreeItem();
QString nameStructure = StringHandler::getFirstWordBeforeDot(pLibraryTreeItem->getNameStructure());
pLibraryTreeItem = pMainWindow->getLibraryWidget()->getLibraryTreeModel()->findLibraryTreeItem(nameStructure);
/* get the class directory path and use it to get the relative path of the choosen bitmap file */
/* get the class directory path and use it to get the relative path of the chosen bitmap file */
QFileInfo classFileInfo(pLibraryTreeItem->getFileName());
QDir classDirectory = classFileInfo.absoluteDir();
QString relativeImagePath = classDirectory.relativeFilePath(mpFileTextBox->text());
Expand Down
6 changes: 3 additions & 3 deletions OMEdit/OMEditGUI/Component/ComponentProperties.cpp
Expand Up @@ -459,7 +459,7 @@ void ComponentParameters::setUpDialog()
mpParametersHeading = new Label(Helper::parameters);
mpParametersHeading->setFont(QFont(Helper::systemFontInfo.family(), Helper::headingFontSize));
mpParametersHeading->setAlignment(Qt::AlignTop);
// set seperator line
// set separator line
mHorizontalLine = new QFrame();
mHorizontalLine->setFrameShape(QFrame::HLine);
mHorizontalLine->setFrameShadow(QFrame::Sunken);
Expand Down Expand Up @@ -726,7 +726,7 @@ void ComponentParameters::createTabsGroupBoxesAndParametersHelper(LibraryTreeIte

/*!
* \brief ComponentParameters::fetchComponentModifiers
* Fetches the Component's modifiers and apply modifier values on the approriate Parameters.
* Fetches the Component's modifiers and apply modifier values on the appropriate Parameters.
*/
void ComponentParameters::fetchComponentModifiers()
{
Expand Down Expand Up @@ -959,7 +959,7 @@ void ComponentAttributes::setUpDialog()
mpAttributesHeading = new Label(Helper::attributes);
mpAttributesHeading->setFont(QFont("", Helper::headingFontSize));
mpAttributesHeading->setAlignment(Qt::AlignTop);
// set seperator line
// set separator line
mHorizontalLine = new QFrame();
mHorizontalLine->setFrameShape(QFrame::HLine);
mHorizontalLine->setFrameShadow(QFrame::Sunken);
Expand Down
2 changes: 1 addition & 1 deletion OMEdit/OMEditGUI/Component/CornerItem.cpp
Expand Up @@ -134,7 +134,7 @@ void CornerItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
/*!
Reimplementation of mouseReleaseEvent.\n
Emits the CornerItem::CornerItemRelease SIGNAL.\n
Checks the CornerItem old postion with the current postion.
Checks the CornerItem old position with the current position.
If the position is changed then emits the CornerItem::CornerItemPositionChanged SIGNAL.
\param event - pointer to QGraphicsSceneMouseEvent
*/
Expand Down
2 changes: 1 addition & 1 deletion OMEdit/OMEditGUI/CrashReport/CrashReportDialog.cpp
Expand Up @@ -53,7 +53,7 @@ CrashReportDialog::CrashReportDialog()
// set heading
mpCrashReportHeading = new Label(Helper::crashReport);
mpCrashReportHeading->setFont(QFont(Helper::systemFontInfo.family(), Helper::headingFontSize));
// set seperator line
// set separator line
mpHorizontalLine = new QFrame();
mpHorizontalLine->setFrameShape(QFrame::HLine);
mpHorizontalLine->setFrameShadow(QFrame::Sunken);
Expand Down
2 changes: 1 addition & 1 deletion OMEdit/OMEditGUI/Debugger/GDB/CommandFactory.cpp
Expand Up @@ -130,7 +130,7 @@ QByteArray CommandFactory::attach(QString processID)

/*!
Changes the stdout & stderr stream buffer.\n
Sets them to NULL so that executable can flush the output as they recieve it.
Sets them to NULL so that executable can flush the output as they receive it.
\return the command.
*/
QByteArray CommandFactory::changeStdStreamBuffer()
Expand Down
2 changes: 1 addition & 1 deletion OMEdit/OMEditGUI/FMI/ImportFMUDialog.cpp
Expand Up @@ -58,7 +58,7 @@ ImportFMUDialog::ImportFMUDialog(MainWindow *pParent)
// set import heading
mpImportFMUHeading = new Label(Helper::importFMU);
mpImportFMUHeading->setFont(QFont(Helper::systemFontInfo.family(), Helper::headingFontSize));
// set seperator line
// set separator line
mpHorizontalLine = new QFrame();
mpHorizontalLine->setFrameShape(QFrame::HLine);
mpHorizontalLine->setFrameShadow(QFrame::Sunken);
Expand Down
6 changes: 3 additions & 3 deletions OMEdit/OMEditGUI/Modeling/LibraryTreeWidget.cpp
Expand Up @@ -1585,7 +1585,7 @@ bool LibraryTreeModel::unloadClass(LibraryTreeItem *pLibraryTreeItem, bool askQu
}
}
/* Delete the class in OMC.
* If deleteClass is successfull remove the class from Library Browser and delete the corresponding ModelWidget.
* If deleteClass is successful remove the class from Library Browser and delete the corresponding ModelWidget.
*/
if (mpLibraryWidget->getMainWindow()->getOMCProxy()->deleteClass(pLibraryTreeItem->getNameStructure())) {
/* QSortFilterProxy::filterAcceptRows changes the expand/collapse behavior of indexes or I am using it in some stupid way.
Expand Down Expand Up @@ -1686,7 +1686,7 @@ bool LibraryTreeModel::unloadTLMOrTextFile(LibraryTreeItem *pLibraryTreeItem, bo
bool LibraryTreeModel::unloadLibraryTreeItem(LibraryTreeItem *pLibraryTreeItem)
{
/* Delete the class in OMC.
* If deleteClass is successfull remove the class from Library Browser.
* If deleteClass is successful remove the class from Library Browser.
*/
if (mpLibraryWidget->getMainWindow()->getOMCProxy()->deleteClass(pLibraryTreeItem->getNameStructure())) {
/* QSortFilterProxy::filterAcceptRows changes the expand/collapse behavior of indexes or I am using it in some stupid way.
Expand Down Expand Up @@ -3125,7 +3125,7 @@ bool LibraryWidget::saveModelicaLibraryTreeItemHelper(LibraryTreeItem *pLibraryT
} else {
result = saveModelicaLibraryTreeItemFolder(pLibraryTreeItem);
for (int i = 0; i < pLibraryTreeItem->getChildren().size(); i++) {
// if any child is saved in package.mo then only mark it saved and update its information becasue it should be already saved.
// if any child is saved in package.mo then only mark it saved and update its information because it should be already saved.
LibraryTreeItem *pChildLibraryTreeItem = pLibraryTreeItem->child(i);
if (pLibraryTreeItem->getFileName().compare(pChildLibraryTreeItem->getFileName()) == 0) {
saveChildLibraryTreeItemsOneFileHelper(pChildLibraryTreeItem);
Expand Down
2 changes: 1 addition & 1 deletion OMEdit/OMEditGUI/Modeling/ModelWidgetContainer.cpp
Expand Up @@ -1484,7 +1484,7 @@ void GraphicsView::mousePressEvent(QMouseEvent *event)
} else if (dynamic_cast<ResizerItem*>(itemAt(event->pos()))) {
// do nothing if resizer item is clicked. It will be handled in its class mousePressEvent();
} else {
// this flag is just used to have seperate identity for if statement in mouse release event of graphicsview
// this flag is just used to have separate identity for if statement in mouse release event of graphicsview
setIsMovingComponentsAndShapes(true);
// save the position of all components
foreach (Component *pComponent, mComponentsList) {
Expand Down
4 changes: 2 additions & 2 deletions OMEdit/OMEditGUI/TransformationalDebugger/diff_match_patch.h
Expand Up @@ -608,7 +608,7 @@ class diff_match_patch {

/**
* A safer version of QString.mid(pos). This one returns "" instead of
* null when the postion equals the string length.
* null when the position equals the string length.
* @param str String to take a substring from.
* @param pos Position to start the substring from.
* @return Substring.
Expand All @@ -620,7 +620,7 @@ class diff_match_patch {

/**
* A safer version of QString.mid(pos, len). This one returns "" instead of
* null when the postion equals the string length.
* null when the position equals the string length.
* @param str String to take a substring from.
* @param pos Position to start the substring from.
* @param len Length of substring.
Expand Down
2 changes: 1 addition & 1 deletion OMEdit/OMEditGUI/Util/StringHandler.cpp
Expand Up @@ -1309,7 +1309,7 @@ QString StringHandler::getPlacementAnnotation(QString componentAnnotation)
/*!
* \brief StringHandler::getNormalizedAngle
* Reduces Angle to useful values. Finds the angle between 0° and 360°.\n
* This functin is useful for performing shapes and components flipping.\n\n
* This function is useful for performing shapes and components flipping.\n\n
* <B>Find the angle between 0° and 360° that corresponds to 1275°</B>\n\n
* 1275 ÷ 360 = 3.541 the only part we care about is the "3", which tells us that 360° fits into 1275° three times,\n
* 1275° – 3×360° = 1275° – 1080° = 195°\n\n
Expand Down
2 changes: 1 addition & 1 deletion OMEdit/OMEditGUI/Util/Utilities.cpp
Expand Up @@ -120,7 +120,7 @@ void TreeSearchFilters::showHideFilters(bool On)

/*!
* \class FileDataNotifier
* \brief Looks for new data on file. When data is availabe emits bytesAvailable SIGNAL.
* \brief Looks for new data on file. When data is available emits bytesAvailable SIGNAL.
* \brief FileDataNotifier::FileDataNotifier
* \param fileName
*/
Expand Down
2 changes: 1 addition & 1 deletion qjson/doc/qjson.dox
Expand Up @@ -44,7 +44,7 @@ bool ok;

QVariantMap result = parser.parse (json, &ok).toMap();
if (!ok) {
qFatal("An error occured during parsing");
qFatal("An error occurred during parsing");
exit (1);
}

Expand Down

0 comments on commit 80346cc

Please sign in to comment.