Skip to content

Commit

Permalink
source typo fixes pt6
Browse files Browse the repository at this point in the history
  • Loading branch information
luzpaz authored and yorikvanhavre committed Mar 7, 2017
1 parent ec5f19a commit 3017173
Show file tree
Hide file tree
Showing 44 changed files with 112 additions and 112 deletions.
6 changes: 3 additions & 3 deletions src/App/Application.cpp
Expand Up @@ -1557,7 +1557,7 @@ void Application::runApplication()
processCmdLineFiles();

if (mConfig["RunMode"] == "Cmd") {
// Run the comandline interface
// Run the commandline interface
Interpreter().runCommandLine("FreeCAD Console mode");
}
else if (mConfig["RunMode"] == "Internal") {
Expand Down Expand Up @@ -1809,7 +1809,7 @@ void Application::ParseOptions(int ac, char ** av)
//x11.add_options()
// ("display", boost::program_options::value< string >(), "set the X-Server")
// ;
//0000723: improper handling of qt specific comand line arguments
//0000723: improper handling of qt specific command line arguments
std::vector<std::string> args;
bool merge=false;
for (int i=1; i<ac; i++) {
Expand Down Expand Up @@ -1873,7 +1873,7 @@ void Application::ParseOptions(int ac, char ** av)
if (vm.count("help")) {
std::stringstream str;
str << mConfig["ExeName"] << endl << endl;
str << "For detailed descripton see http://www.freecadweb.org" << endl<<endl;
str << "For detailed description see http://www.freecadweb.org" << endl<<endl;
str << "Usage: " << mConfig["ExeName"] << " [options] File1 File2 ..." << endl << endl;
str << visible << endl;
throw Base::ProgramInformation(str.str());
Expand Down
2 changes: 1 addition & 1 deletion src/App/Application.h
Expand Up @@ -124,7 +124,7 @@ class AppExport Application


/** @name Signals of the document
* This signals are an agregation of all document. If you only
* This signals are an aggregation of all document. If you only
* the signal of a special document connect to the document itself
*/
//@{
Expand Down
6 changes: 3 additions & 3 deletions src/App/Document.cpp
Expand Up @@ -606,7 +606,7 @@ void Document::exportGraphviz(std::ostream& out) const
auto uvi = in_use.begin();
auto uvi_end = in_use.end();

// Flag that no changes has occured so far. If the loop goes through
// Flag that no changes has occurred so far. If the loop goes through
// without this flag being set to true, we are done.
changed = false;

Expand Down Expand Up @@ -2318,7 +2318,7 @@ void Document::remObject(const char* sName)
}
#endif //USE_OLD_DAG

// Before deleting we must nullify all dependant objects
// Before deleting we must nullify all dependent objects
breakDependency(pos->second, true);

//and remove the tip if needed
Expand Down Expand Up @@ -2409,7 +2409,7 @@ void Document::_remObject(DocumentObject* pcObject)

void Document::breakDependency(DocumentObject* pcObject, bool clear)
{
// Nullify all dependant objects
// Nullify all dependent objects
for (std::map<std::string,DocumentObject*>::iterator it = d->objectMap.begin(); it != d->objectMap.end(); ++it) {
std::map<std::string,App::Property*> Map;
it->second->getPropertyMap(Map);
Expand Down
6 changes: 3 additions & 3 deletions src/App/Document.h
Expand Up @@ -93,11 +93,11 @@ class AppExport Document : public App::PropertyContainer
* for the Creative Commons license suit.
*/
App::PropertyString License;
/// License descripton/contract URL
/// License description/contract URL
App::PropertyString LicenseURL;
/// Meta descriptons
/// Meta descriptions
App::PropertyMap Meta;
/// Material descriptons, used and defined in the Material module.
/// Material descriptions, used and defined in the Material module.
App::PropertyMap Material;
/// read-only name of the temp dir created wen the document is opened
PropertyString TransientDir;
Expand Down
4 changes: 2 additions & 2 deletions src/App/DocumentObject.h
Expand Up @@ -189,11 +189,11 @@ class AppExport DocumentObject: public App::TransactionalObject
/// get the status Message
const char *getStatusString(void) const;

/** Called in case of loosing a link
/** Called in case of losing a link
* Get called by the document when a object got deleted a link property of this
* object ist pointing to. The standard behaviour of the DocumentObject implementation
* is to reset the links to nothing. You may overide this method to implement
*additional or different behavior.
* additional or different behavior.
*/
virtual void onLostLinkToObject(DocumentObject*);
virtual PyObject *getPyObject(void);
Expand Down
2 changes: 1 addition & 1 deletion src/App/Expression.cpp
Expand Up @@ -908,7 +908,7 @@ Expression * FunctionExpression::evalAggregate() const
}

/**
* Evaluate function. Returns a NumberExpression if evaluation is successfuly.
* Evaluate function. Returns a NumberExpression if evaluation is successful.
* Throws an ExpressionError exception if something fails.
*
* @returns A NumberExpression with the result.
Expand Down
2 changes: 1 addition & 1 deletion src/App/Extension.cpp
Expand Up @@ -84,7 +84,7 @@ void Extension::initExtension(ExtensionContainer* obj) {
throw Base::Exception("Extension: Extension type not set");

//all properties are initialised without PropertyContainer father. Now that we know it we can
//finaly finsih the property initialisation
//finally finish the property initialisation
std::vector<Property*> list;
extensionGetPropertyData().getPropertyList(this, list);
for(Property* prop : list)
Expand Down
8 changes: 4 additions & 4 deletions src/App/Extension.h
Expand Up @@ -156,7 +156,7 @@ template<> void _class_::init(void){\
* can be added to an object from python. It does not work to add the c++ version directly there.
*
* Note that every method of the extension becomes part of the extendded object when added from c++.
* This means one should carefully design the API and make only neccessary methods public or protected.
* This means one should carefully design the API and make only necessary methods public or protected.
* Every internal method should be private.
*
* The automatic availibility of methods in the class does not hold for the python interface, only
Expand All @@ -165,15 +165,15 @@ template<> void _class_::init(void){\
* extension, which works exactly like the normal FreeCAD python object workflow. There is nothing
* special at all for extension python objects, the normal xml + imp.cpp approach is used. It must
* only be taken care that the objects father is the correct extension base class. Of course also
* makse sure your extension returns the correct python ojbect in its "getPyObject" call.
* make sure your extension returns the correct python ojbect in its "getPyObject" call.
* Every method you create in the extensions python will be later added to an extended object. This
* happens automatically for both, c++ and python extension, if "getPyObject" returns the correct
* python object. No extra work needs to be done.
*
* A special case that needs to be handled for extensions is the possibility of overriden methods.
* A special case that needs to be handled for extensions is the possibility of overridden methods.
* Often it is desired to customise extension behaviour by allowing the user to override methods
* provided by the extension. On c++ side this is trival, such methods are simply marked as "virtual"
* and can than be overriden in any derived class. This is more involved for the python interface and
* and can than be overridden in any derived class. This is more involved for the python interface and
* here special care needs to be taken.
*
* As already seen above one needs to create a special ExtensionPythonT<> object for extension from
Expand Down
6 changes: 3 additions & 3 deletions src/App/ExtensionContainer.cpp
Expand Up @@ -283,7 +283,7 @@ void ExtensionContainer::Save(Base::Writer& writer) const {

//Note: save extensions must be called first to ensure that the extension element is always the
// very first inside the object element. That is needed as extension eleent works together with
// an object attribute, and if annother element would be read first the object attributes would be
// an object attribute, and if another element would be read first the object attributes would be
// cleared.
saveExtensions(writer);
App::PropertyContainer::Save(writer);
Expand All @@ -294,7 +294,7 @@ void ExtensionContainer::Restore(Base::XMLReader& reader) {
//restore dynamic extensions.
//Note 1: The extension element must be read first, before all other object elements. That is
// needed as the element works together with an object element attribute, which would be
// cleared if annother attribute is read first
// cleared if another attribute is read first
//Note 2: This must happen before the py object of this container is used, as only in the
// pyobject constructor the extension methods are added to the container.
restoreExtensions(reader);
Expand Down Expand Up @@ -349,7 +349,7 @@ void ExtensionContainer::saveExtensions(Base::Writer& writer) const {
void ExtensionContainer::restoreExtensions(Base::XMLReader& reader) {

//Dynamic extensions are optional (also because they are introduced late into the document format)
//and hence it is possible that the element does not exist. As we cannot check for the existance of
//and hence it is possible that the element does not exist. As we cannot check for the existence of
//an element a object attribute is set if extensions are available. Here we check that
//attribute, and only if it exists the extensions element will be available.
if(!reader.hasAttribute("Extensions"))
Expand Down
4 changes: 2 additions & 2 deletions src/App/ExtensionContainer.h
Expand Up @@ -102,10 +102,10 @@ namespace App {
* registerExtension("App::SecondExtensionPython", self)
* @endcode
*
* Extensions can provide methods that should be overriden by the extended object for customisation
* Extensions can provide methods that should be overridden by the extended object for customisation
* of the extension behaviour. In c++ this is as simple as overriding the provided virtual functions.
* In python a class method must be provided which has the same name as the method to override. This
* method must not neccessarily be in the object that is extended, it must be in the object which is
* method must not necessarily be in the object that is extended, it must be in the object which is
* provided to the "registerExtension" call as second argument. This second argument is used as a
* proxy and enqueired if the method to override exists in this proxy before calling it.
*
Expand Down
2 changes: 1 addition & 1 deletion src/App/Material.h
Expand Up @@ -203,7 +203,7 @@ class AppExport Material
* \li Jade
* \li Ruby
* \li Emerald
* Furthermore there two additional modes \a Default which defines a kind of grey metalic and user defined that
* Furthermore there two additional modes \a Default which defines a kind of grey metallic and user defined that
* does nothing.
* The Color and the other properties of the material are defined in the range [0-1].
* If \a MatName is an unknown material name then the type USER_DEFINED is set and the material doesn't get changed.
Expand Down
6 changes: 3 additions & 3 deletions src/App/Origin.h
Expand Up @@ -50,8 +50,8 @@ class AppExport Origin : public App::DocumentObject
}

/** @name Axis and plane access
* This functions returns casted axis and planes objects and asserts they are setted correctly
* otherwice Base::Exception is thrown.
* This functions returns casted axis and planes objects and asserts they are set correctly
* otherwise Base::Exception is thrown.
*/
///@{
// returns X axis
Expand Down Expand Up @@ -90,7 +90,7 @@ class AppExport Origin : public App::DocumentObject
return { getXY(), getXZ(), getYZ() };
}

/// Returns all controled objects (both planes and axis) to iterate on them
/// Returns all controlled objects (both planes and axis) to iterate on them
std::vector<App::OriginFeature *> baseObjects() const {
return { getX(), getY(), getZ(), getXY(), getXZ(), getYZ() };
}
Expand Down
2 changes: 1 addition & 1 deletion src/App/Part.cpp
Expand Up @@ -57,7 +57,7 @@ Part::Part(void)
// license stuff
ADD_PROPERTY_TYPE(License, ("CC BY 3.0"), 0, App::Prop_None, "License string of the Item");
ADD_PROPERTY_TYPE(LicenseURL, ("http://creativecommons.org/licenses/by/3.0/"), 0, App::Prop_None, "URL to the license text/contract");
// color and apperance
// color and appearance
ADD_PROPERTY(Color, (1.0, 1.0, 1.0, 1.0)); // set transparent -> not used

GroupExtension::initExtension(this);
Expand Down
6 changes: 3 additions & 3 deletions src/App/Part.h
Expand Up @@ -52,17 +52,17 @@ class AppExport Part : public App::GeoFeature, public App::OriginGroupExtension
App::PropertyString Id;
/// unique identifier of the Item
App::PropertyUUID Uid;
/// material descriptons
/// material descriptions
App::PropertyMap Material;
/// Meta descriptons
/// Meta descriptions
App::PropertyMap Meta;

/** License string
* Holds the short license string for the Item, e.g. CC-BY
* for the Creative Commons license suit.
*/
App::PropertyString License;
/// License descripton/contract URL
/// License description/contract URL
App::PropertyString LicenseURL;
//@}

Expand Down
4 changes: 2 additions & 2 deletions src/App/PropertyContainer.h
Expand Up @@ -58,9 +58,9 @@ struct AppExport PropertyData
short Offset,Type;
};

//purpose of this struct is to be constructible from all accepptable container types and to
//purpose of this struct is to be constructible from all acceptable container types and to
//be able to return the offset to a property from the accepted containers. This allows to use
//one function implementation for multiple container types without loosing all type safety by
//one function implementation for multiple container types without losing all type safety by
//accepting void*
struct OffsetBase
{
Expand Down
2 changes: 1 addition & 1 deletion src/App/PropertyContainerPy.xml
Expand Up @@ -48,7 +48,7 @@ If the list contains 'Hidden' then the item even doesn't appear in the property
</Methode>
<Methode Name="getGroupOfProperty">
<Documentation>
<UserDocu>Return the name of the group which the property belongs to in this class. The properties sorted in differnt named groups for convenience.</UserDocu>
<UserDocu>Return the name of the group which the property belongs to in this class. The properties sorted in different named groups for convenience.</UserDocu>
</Documentation>
</Methode>
<Methode Name="getDocumentationOfProperty">
Expand Down
2 changes: 1 addition & 1 deletion src/App/PropertyExpressionEngine.cpp
Expand Up @@ -208,7 +208,7 @@ void PropertyExpressionEngine::Restore(Base::XMLReader &reader)
}

/**
* @brief Update graph stucture with given path and expression.
* @brief Update graph structure with given path and expression.
* @param path Path
* @param expression Expression to query for dependencies
* @param nodes Map with nodes of graph
Expand Down
14 changes: 7 additions & 7 deletions src/App/PropertyStandard.h
Expand Up @@ -206,9 +206,9 @@ class AppExport PropertyEnumeration: public Property
};

/** Constraint integer properties
* This property fullfill the need of constraint integer. It holds basicly a
* This property fulfills the need of a constraint integer. It holds basically a
* state (integer) and a struct of boundaries. If the boundaries
* is not set it act basicly like a IntegerProperty and do no checking.
* is not set it act basically like a IntegerProperty and do no checking.
* The constraints struct can be created on the heap or build in.
*/
class AppExport PropertyIntegerConstraint: public PropertyInteger
Expand All @@ -229,9 +229,9 @@ class AppExport PropertyIntegerConstraint: public PropertyInteger
long LowerBound, UpperBound, StepSize;
};
/** setting the boundaries
* This sets the constraint struct. It can be dynamcly
* This sets the constraint struct. It can be dynamically
* allocated or set as an static in the class the property
* blongs to:
* belongs to:
* \code
* const Constraints percent = {0,100,1}
* \endcode
Expand All @@ -249,7 +249,7 @@ class AppExport PropertyIntegerConstraint: public PropertyInteger
};

/** Percent property
* This property is a special interger property and holds only
* This property is a special integer property and holds only
* numbers between 0 and 100.
*/

Expand Down Expand Up @@ -467,9 +467,9 @@ class AppExport PropertyFloat: public Property
};

/** Constraint float properties
* This property fullfill the need of constraint float. It holds basicly a
* This property fulfills the need of a constraint float. It holds basically a
* state (float) and a struct of boundaries. If the boundaries
* is not set it acts basicly like a PropertyFloat and does no checking
* is not set it acts basically like a PropertyFloat and does no checking
* The constraints struct can be created on the heap or built-in.
*/
class AppExport PropertyFloatConstraint: public PropertyFloat
Expand Down
2 changes: 1 addition & 1 deletion src/App/PropertyUnits.h
Expand Up @@ -163,7 +163,7 @@ class AppExport PropertyVolume : public PropertyQuantityConstraint
};

/** Angle property
* This is a property for representing angles. It basicly a float
* This is a property for representing angles. It basically a float
* property. On the Gui it has a quantity like RAD.
*/
class AppExport PropertyAngle: public PropertyQuantityConstraint
Expand Down
4 changes: 2 additions & 2 deletions src/App/core-app.dox
Expand Up @@ -5,9 +5,9 @@

/** \namespace App
\ingroup APP
\brief The FreeCAD Aplication layer
\brief The FreeCAD Application layer

This namespace includes Aplication services of FreeCAD like:
This namespace includes Application services of FreeCAD like:
- The Application class
- The Document class

Expand Down
2 changes: 1 addition & 1 deletion src/Mod/Assembly/App/Item.h
Expand Up @@ -41,7 +41,7 @@ class AssemblyExport Item : public App::GeoFeature
Item();
~Item() {};

/// Meta descriptons
/// Meta descriptions
App::PropertyMap Meta;

/** @name methods override feature */
Expand Down
2 changes: 1 addition & 1 deletion src/Mod/Assembly/App/Product.cpp
Expand Up @@ -54,7 +54,7 @@ Product::Product() {
// license stuff
ADD_PROPERTY_TYPE(License,("CC BY 3.0"),0,App::Prop_None,"License string of the Item");
ADD_PROPERTY_TYPE(LicenseURL,("http://creativecommons.org/licenses/by/3.0/"),0,App::Prop_None,"URL to the license text/contract");
// color and apperance
// color and appearance
ADD_PROPERTY(Color,(1.0,1.0,1.0,1.0)); // set transparent -> not used
ADD_PROPERTY(Visibility,(true));

Expand Down
4 changes: 2 additions & 2 deletions src/Mod/Assembly/App/Product.h
Expand Up @@ -52,15 +52,15 @@ class AssemblyExport Product : public Assembly::Item
App::PropertyString Id;
/// unique identifier of the Item
App::PropertyUUID Uid;
/// material descriptons
/// material descriptions
App::PropertyMap Material;

/** License string
* Holds the short license string for the Item, e.g. CC-BY
* for the Creative Commons license suit.
*/
App::PropertyString License;
/// License descripton/contract URL
/// License description/contract URL
App::PropertyString LicenseURL;
//@}

Expand Down

0 comments on commit 3017173

Please sign in to comment.