Skip to content

Commit

Permalink
Merge pull request FreeCAD#101 from luzpaz/Linkstage3/typos
Browse files Browse the repository at this point in the history
Fix typos
  • Loading branch information
realthunder committed Feb 5, 2021
2 parents ef08bab + a673d8a commit dc2f71f
Show file tree
Hide file tree
Showing 14 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion src/App/ExpressionParser.y
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
/* Represents the many different ways we can access our data */

/* NOTE: this parser requires a patched version of bison 3.0.4. You can find
* the patch file under this directroy named ExpressionParser.bison-3.0.4.patch.
* the patch file under this directory named ExpressionParser.bison-3.0.4.patch.
* The original patch is published at
*
* http://lists.gnu.org/archive/html/bug-bison/2018-03/msg00002.html
Expand Down
2 changes: 1 addition & 1 deletion src/App/Link.h
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ class AppExport LinkBaseExtension : public App::DocumentObjectExtension
#define LINK_PARAM_COPY_ON_CHANGE(...) \
(LinkCopyOnChange, long, App::PropertyEnumeration, ((long)0), \
"Disabled: disable copy on change\n"\
"Enabled: enable copy linked object on change of any of its propert marked as CopyOnChange\n"\
"Enabled: enable copy linked object on change of any of its property marked as CopyOnChange\n"\
"Owned: indicate the linked object has been copied and is own owned by the link. And the\n"\
" the link will try to sync any change of the original linked object back to the copy.",\
##__VA_ARGS__)
Expand Down
2 changes: 1 addition & 1 deletion src/App/ObjectIdentifier.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1649,7 +1649,7 @@ Property *ObjectIdentifier::resolveProperty(const App::DocumentObject *obj,
std::string _subname;
const char *s = subname.c_str();

// If no middle dot found, try interprete it as label
// If no middle dot found, try interpreting it as label
if(ptype!=PseudoShape && subname[0]!='$' && subname.find('.') == std::string::npos) {
_subname = "$";
_subname += subname;
Expand Down
4 changes: 2 additions & 2 deletions src/App/Property.h
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ class AppExport Property : public Base::Persistence
/// get the name of this property in the belonging container
const char* getName(void) const;

/** Return a full quanlified property name that include its own's name
/** Return a fully qualified property name that include its own's name
* @param python: if true, then return an expression for accessing this property in Python
*/
virtual std::string getFullName(bool python=false) const;
Expand Down Expand Up @@ -269,7 +269,7 @@ class AppExport Property : public Base::Persistence
* internal counter. The intention of the ID is to be used as a key for
* mapping, instead of using the raw pointer. Because, it is possible for
* the runtime memory allocator to reuse just deleted memory, which will
* cause hard to debug problem if use pointer as key.
* cause hard to debug problem if use pointer as key.
*/
long getID() const {return _id;}

Expand Down
2 changes: 1 addition & 1 deletion src/App/PropertyContainer.h
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ class AppExport PropertyContainer: public Base::Persistence

virtual unsigned int getMemSize (void) const;

/** Return a full quanlified name for this container
/** Return a fully qualified name for this container
* @param python: if true, then return an expression for accessing this container in Python
*/
virtual std::string getFullName(bool python=false) const {
Expand Down
2 changes: 1 addition & 1 deletion src/Gui/CommandDoc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -553,7 +553,7 @@ StdCmdSaveAsDirectory::StdCmdSaveAsDirectory()
{
sGroup = QT_TR_NOOP("File");
sMenuText = QT_TR_NOOP("Save as &Directory...");
sToolTipText = QT_TR_NOOP("Save the active document in a direcotry without compression");
sToolTipText = QT_TR_NOOP("Save the active document in a directory without compression");
sWhatsThis = "Std_SaveAsDirectory";
sStatusTip = sToolTipText;
eType = 0;
Expand Down
2 changes: 1 addition & 1 deletion src/Gui/DlgExpressionInput.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ void DlgExpressionInput::onTimer()
}
catch (App::ExpressionFunctionDisabledException &) {
ui->msg->setStyleSheet(QString::fromLatin1("*{%1;%2}").arg(background,colorWarning));
ui->msg->setPlainText(tr("Function evaluation and attribute writting are disabled while editing. "
ui->msg->setPlainText(tr("Function evaluation and attribute writing are disabled while editing. "
"You can enable it by checking 'Evaluate function' here. "
"Be aware that invoking function may cause unexpected change "
"to various objects."));
Expand Down
2 changes: 1 addition & 1 deletion src/Gui/ExprParams.h
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ class GuiExport ExprParams: public ParameterGrp::ObserverType {

#define FC_EXPR_PARAMS \
FC_EXPR_PARAM(CompleterCaseSensitive,bool,Bool,false,\
QT_TRANSLATE_NOOP("ExprParams","Expression completer with case sensistive")) \
QT_TRANSLATE_NOOP("ExprParams","Expression completer with case sensitive")) \
FC_EXPR_PARAM(CompleterMatchExact,bool,Bool,false,\
QT_TRANSLATE_NOOP("ExprParams","Expression completer match exact")) \
FC_EXPR_PARAM(NoSystemBackground,bool,Bool,true,\
Expand Down
4 changes: 2 additions & 2 deletions src/Gui/Tree.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ class DocumentObjectItem : public QTreeWidgetItem
// check if a new item is required at root
bool requiredAtRoot(bool excludeSelf=true, bool delay=false) const;

// return the owner, and full quanlified subname
// return the owner, and fully qualified subname
App::DocumentObject *getFullSubName(std::ostringstream &str,
DocumentObjectItem *parent = 0) const;

Expand Down Expand Up @@ -2299,7 +2299,7 @@ void TreeWidget::onToolTipTimer()
info = QString::fromUtf8(Obj->Label2.getValue());
else if (!Obj->isError()) {
if (tag == Gui::treeVisibilityIconTag())
info = QObject::tr("Click to toggle visiblity.\nAlt + click to toggle show on top.");
info = QObject::tr("Click to toggle visibility.\nAlt + click to toggle show on top.");
else {
info = item->object()->getToolTip(tag);
if (info.isEmpty() && !Obj->Label2.getStrValue().empty())
Expand Down
2 changes: 1 addition & 1 deletion src/Gui/ViewParams.h
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ class GuiExport ViewParams: public ParameterGrp::ObserverType {
FC_VIEW_PARAM(ColorRecompute, bool, Bool, true, \
QT_TRANSLATE_NOOP("ViewParams","Recompute affected object(s) after editing color."))\
FC_VIEW_PARAM(SortWBList, bool, Bool, true, \
QT_TRANSLATE_NOOP("ViewParams","Sort workbench entires by their names in the combo box."))\
QT_TRANSLATE_NOOP("ViewParams","Sort workbench entries by their names in the combo box."))\
FC_VIEW_PARAM(MaxCameraAnimatePeriod, int, Int, 3000, \
QT_TRANSLATE_NOOP("ViewParams","Maximum camera move animation duration in milliseconds."))\
FC_VIEW_PARAM(TaskNoWheelFocus, bool, Bool, true, \
Expand Down
6 changes: 3 additions & 3 deletions src/Mod/Part/App/TopoShapeEx.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4173,11 +4173,11 @@ TopoShape TopoShape::splitWires(std::vector<TopoShape> *inner,
}

auto doReorient = [](TopoShape &s, TopAbs_Orientation orient) {
// Speical case of single edge wire. Make sure the edge is in the
// Special case of single edge wire. Make sure the edge is in the
// required orientation. This is necessary because BRepFill_OffsetWire
// has special handling of cicular edge offset, which seem to only
// has special handling of circular edge offset, which seem to only
// respect the edge orientation and disregard the wire orientation. The
// orientation is used to determin whether to shrink or expand.
// orientation is used to determine whether to shrink or expand.
if (s.countSubShapes(TopAbs_EDGE) == 1) {
TopoDS_Shape e = s.getSubShape(TopAbs_EDGE, 1);
if (e.Orientation() == orient) {
Expand Down
2 changes: 1 addition & 1 deletion src/Mod/Part/Gui/SoBrepEdgeSet.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ void SoBrepEdgeSet::glRender(SoGLRenderAction *action, bool inpath)
SoColorPacker packer;
float trans = 0.0;

// SoFCDisplayModeElement::getTransparency() specifices face only
// SoFCDisplayModeElement::getTransparency() specifies face only
// transparency. When there is a face only transparency, we'll make
// edge/point rendering to be opque. Maybe we'll add support for
// edge/point transparency in SoFCDisplayModeElement later.
Expand Down
2 changes: 1 addition & 1 deletion src/Mod/Part/Gui/SoBrepPointSet.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ void SoBrepPointSet::glRender(SoGLRenderAction *action, bool inpath)

state->push();

// SoFCDisplayModeElement::getTransparency() specifices face only
// SoFCDisplayModeElement::getTransparency() specifies face only
// transparency. When there is a face only transparency, we'll make
// edge/point rendering to be opque. Maybe we'll add support for
// edge/point transparency in SoFCDisplayModeElement later.
Expand Down
2 changes: 1 addition & 1 deletion src/Mod/Sketcher/Gui/ViewProviderSketch.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4015,7 +4015,7 @@ void ViewProviderSketch::draw(bool temp /*=false*/, bool rebuildinformationlayer
assert(edit);

// delay drawing until setEditViewer() where edit->viewer is set.
// Because of possible external editing, we can only know the editting
// Because of possible external editing, we can only know the editing
// viewer in setEditViewer().
if (!edit->viewer)
return;
Expand Down

0 comments on commit dc2f71f

Please sign in to comment.