diff --git a/src/3rdParty/salomesmesh/CMakeLists.txt b/src/3rdParty/salomesmesh/CMakeLists.txt index 4ea0753431ec..d58d078e4f4c 100644 --- a/src/3rdParty/salomesmesh/CMakeLists.txt +++ b/src/3rdParty/salomesmesh/CMakeLists.txt @@ -7,9 +7,9 @@ SET(SMESH_VERSION_PATCH 1) SET(SMESH_VERSION_TWEAK 0) if(CMAKE_COMPILER_IS_GNUCXX) - set(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -Wno-sign-compare -Wno-reorder -Wno-switch -Wno-unused-variable -Wno-unused-but-set-variable -Wno-comment -Wno-unused-parameter -Wno-empty-body") + set(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -Wno-sign-compare -Wno-reorder -Wno-switch -Wno-unused-variable -Wno-unused-but-set-variable -Wno-comment -Wno-unused-parameter -Wno-empty-body -Wno-pedantic") elseif(CMAKE_COMPILER_IS_CLANGXX) - set(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -Wno-sign-compare -Wno-reorder -Wno-switch -Wno-unused-variable -Wno-unused-private-field -Wno-unused-function -Wno-sometimes-uninitialized -Wno-overloaded-virtual -Wno-dynamic-class-memaccess -Wno-comment -Wno-unused-parameter") + set(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -Wno-sign-compare -Wno-reorder -Wno-switch -Wno-unused-variable -Wno-unused-private-field -Wno-unused-function -Wno-sometimes-uninitialized -Wno-overloaded-virtual -Wno-dynamic-class-memaccess -Wno-comment -Wno-unused-parameter -Wno-extra-semi") endif() if(CMAKE_COMPILER_IS_CLANGXX) diff --git a/src/App/Application.cpp b/src/App/Application.cpp index c6f388b511b3..5288961a480d 100644 --- a/src/App/Application.cpp +++ b/src/App/Application.cpp @@ -149,7 +149,7 @@ using namespace boost::program_options; # include #endif -FC_LOG_LEVEL_INIT("App",true,true); +FC_LOG_LEVEL_INIT("App",true,true) //using Base::GetConsole; using namespace Base; diff --git a/src/App/AutoTransaction.cpp b/src/App/AutoTransaction.cpp index d6fe5e7c519b..82ccc8cec9d1 100644 --- a/src/App/AutoTransaction.cpp +++ b/src/App/AutoTransaction.cpp @@ -27,7 +27,7 @@ #include "Document.h" #include "AutoTransaction.h" -FC_LOG_LEVEL_INIT("App",true,true); +FC_LOG_LEVEL_INIT("App",true,true) using namespace App; diff --git a/src/App/ComplexGeoData.cpp b/src/App/ComplexGeoData.cpp index 477d3eb0119b..b267d14ca837 100644 --- a/src/App/ComplexGeoData.cpp +++ b/src/App/ComplexGeoData.cpp @@ -35,10 +35,10 @@ using namespace Data; -TYPESYSTEM_SOURCE_ABSTRACT(Data::Segment , Base::BaseClass); +TYPESYSTEM_SOURCE_ABSTRACT(Data::Segment , Base::BaseClass) -TYPESYSTEM_SOURCE_ABSTRACT(Data::ComplexGeoData , Base::Persistence); +TYPESYSTEM_SOURCE_ABSTRACT(Data::ComplexGeoData , Base::Persistence) ComplexGeoData::ComplexGeoData(void) diff --git a/src/App/Document.cpp b/src/App/Document.cpp index 3ca4a38a7293..4738174956d9 100644 --- a/src/App/Document.cpp +++ b/src/App/Document.cpp @@ -126,7 +126,7 @@ recompute path. Also, it enables more complicated dependencies beyond trees. #include "Link.h" #include "GeoFeature.h" -FC_LOG_LEVEL_INIT("App", true, true, true); +FC_LOG_LEVEL_INIT("App", true, true, true) using Base::Console; using Base::streq; diff --git a/src/App/DocumentObserverPython.h b/src/App/DocumentObserverPython.h index 754f9c79fd03..eecc761fc5d9 100644 --- a/src/App/DocumentObserverPython.h +++ b/src/App/DocumentObserverPython.h @@ -111,7 +111,7 @@ class AppExport DocumentObserverPython static std::vector _instances; typedef boost::signals2::connection Connection; - +//FIXME: ISO C++11 requires at least one argument for the "..." in a variadic macro #define FC_PY_DOC_OBSERVER \ FC_PY_ELEMENT(CreatedDocument,_1) \ FC_PY_ELEMENT(DeletedDocument,_1) \ diff --git a/src/App/Expression.cpp b/src/App/Expression.cpp index bf6dc83154ab..33f6400cb8db 100644 --- a/src/App/Expression.cpp +++ b/src/App/Expression.cpp @@ -663,7 +663,7 @@ bool isAnyEqual(const App::any &v1, const App::any &v2) { // Expression base-class // -TYPESYSTEM_SOURCE_ABSTRACT(App::Expression, Base::BaseClass); +TYPESYSTEM_SOURCE_ABSTRACT(App::Expression, Base::BaseClass) Expression::Expression(const DocumentObject *_owner) : owner(const_cast(_owner)) @@ -917,7 +917,7 @@ Expression *Expression::copy() const { // UnitExpression class // -TYPESYSTEM_SOURCE(App::UnitExpression, App::Expression); +TYPESYSTEM_SOURCE(App::UnitExpression, App::Expression) UnitExpression::UnitExpression(const DocumentObject *_owner, const Base::Quantity & _quantity, const std::string &_unitStr) : Expression(_owner) @@ -991,7 +991,7 @@ int UnitExpression::priority() const // NumberExpression class // -TYPESYSTEM_SOURCE(App::NumberExpression, App::Expression); +TYPESYSTEM_SOURCE(App::NumberExpression, App::Expression) NumberExpression::NumberExpression(const DocumentObject *_owner, const Quantity &_quantity) : UnitExpression(_owner, _quantity) @@ -1063,7 +1063,7 @@ bool NumberExpression::isInteger(long *l) const { // OperatorExpression class // -TYPESYSTEM_SOURCE(App::OperatorExpression, App::Expression); +TYPESYSTEM_SOURCE(App::OperatorExpression, App::Expression) OperatorExpression::OperatorExpression(const App::DocumentObject *_owner, Expression * _left, Operator _op, Expression * _right) : UnitExpression(_owner) @@ -1388,7 +1388,7 @@ bool OperatorExpression::isRightAssociative() const // FunctionExpression class. This class handles functions with one or two parameters. // -TYPESYSTEM_SOURCE(App::FunctionExpression, App::UnitExpression); +TYPESYSTEM_SOURCE(App::FunctionExpression, App::UnitExpression) FunctionExpression::FunctionExpression(const DocumentObject *_owner, Function _f, std::vector _args) : UnitExpression(_owner) @@ -2030,7 +2030,7 @@ void FunctionExpression::_visit(ExpressionVisitor &v) // VariableExpression class // -TYPESYSTEM_SOURCE(App::VariableExpression, App::UnitExpression); +TYPESYSTEM_SOURCE(App::VariableExpression, App::UnitExpression) VariableExpression::VariableExpression(const DocumentObject *_owner, ObjectIdentifier _var) : UnitExpression(_owner) @@ -2305,7 +2305,7 @@ void VariableExpression::setPath(const ObjectIdentifier &path) // PyObjectExpression class // -TYPESYSTEM_SOURCE(App::PyObjectExpression, App::Expression); +TYPESYSTEM_SOURCE(App::PyObjectExpression, App::Expression) PyObjectExpression::~PyObjectExpression() { if(pyObj) { @@ -2361,7 +2361,7 @@ boost::any PyObjectExpression::getValueAsAny() const { // StringExpression class // -TYPESYSTEM_SOURCE(App::StringExpression, App::Expression); +TYPESYSTEM_SOURCE(App::StringExpression, App::Expression) StringExpression::StringExpression(const DocumentObject *_owner, const std::string &_text) : Expression(_owner) @@ -2406,7 +2406,7 @@ Expression *StringExpression::_copy() const return new StringExpression(owner, text); } -TYPESYSTEM_SOURCE(App::ConditionalExpression, App::Expression); +TYPESYSTEM_SOURCE(App::ConditionalExpression, App::Expression) ConditionalExpression::ConditionalExpression(const DocumentObject *_owner, Expression *_condition, Expression *_trueExpr, Expression *_falseExpr) : Expression(_owner) @@ -2489,7 +2489,7 @@ void ConditionalExpression::_visit(ExpressionVisitor &v) falseExpr->visit(v); } -TYPESYSTEM_SOURCE(App::ConstantExpression, App::NumberExpression); +TYPESYSTEM_SOURCE(App::ConstantExpression, App::NumberExpression) ConstantExpression::ConstantExpression(const DocumentObject *_owner, std::string _name, const Quantity & _quantity) : NumberExpression(_owner, _quantity) @@ -2512,7 +2512,7 @@ int ConstantExpression::priority() const return 20; } -TYPESYSTEM_SOURCE_ABSTRACT(App::BooleanExpression, App::NumberExpression); +TYPESYSTEM_SOURCE_ABSTRACT(App::BooleanExpression, App::NumberExpression) BooleanExpression::BooleanExpression(const DocumentObject *_owner, bool _value) : NumberExpression(_owner, Quantity(_value ? 1.0 : 0.0)) @@ -2524,7 +2524,7 @@ Expression *BooleanExpression::_copy() const return new BooleanExpression(owner, getValue() > 0.5 ? true : false); } -TYPESYSTEM_SOURCE(App::RangeExpression, App::Expression); +TYPESYSTEM_SOURCE(App::RangeExpression, App::Expression) RangeExpression::RangeExpression(const DocumentObject *_owner, const std::string &begin, const std::string &end) : Expression(_owner), begin(begin), end(end) diff --git a/src/App/Extension.cpp b/src/App/Extension.cpp index 58796fd6319c..c26ba5393b4f 100644 --- a/src/App/Extension.cpp +++ b/src/App/Extension.cpp @@ -38,7 +38,7 @@ /* We do not use a standard property macro for type initiation. The reason is that we have the first * PropertyData in the extension chain, there is no parent property data. */ -EXTENSION_TYPESYSTEM_SOURCE_P(App::Extension); +EXTENSION_TYPESYSTEM_SOURCE_P(App::Extension) const App::PropertyData * App::Extension::extensionGetPropertyDataPtr(void){return &propertyData;} const App::PropertyData & App::Extension::extensionGetPropertyData(void) const{return propertyData;} App::PropertyData App::Extension::propertyData; diff --git a/src/App/Extension.h b/src/App/Extension.h index 8889049e4b7f..7219516c929d 100644 --- a/src/App/Extension.h +++ b/src/App/Extension.h @@ -72,7 +72,7 @@ void * _class_::create(void){return 0;} /// define to implement a subclass of Base::BaseClass #define EXTENSION_TYPESYSTEM_SOURCE(_class_, _parentclass_) \ -EXTENSION_TYPESYSTEM_SOURCE_P(_class_);\ +EXTENSION_TYPESYSTEM_SOURCE_P(_class_)\ void _class_::init(void){\ initExtensionSubclass(_class_::classTypeId, #_class_ , #_parentclass_, &(_class_::create) ); \ } @@ -104,7 +104,7 @@ private: \ static App::PropertyData propertyData #define EXTENSION_PROPERTY_SOURCE(_class_, _parentclass_) \ -EXTENSION_TYPESYSTEM_SOURCE_P(_class_);\ +EXTENSION_TYPESYSTEM_SOURCE_P(_class_)\ const App::PropertyData * _class_::extensionGetPropertyDataPtr(void){return &propertyData;} \ const App::PropertyData & _class_::extensionGetPropertyData(void) const{return propertyData;} \ App::PropertyData _class_::propertyData; \ @@ -114,7 +114,7 @@ void _class_::init(void){\ } #define EXTENSION_PROPERTY_SOURCE_TEMPLATE(_class_, _parentclass_) \ -EXTENSION_TYPESYSTEM_SOURCE_TEMPLATE(_class_);\ +EXTENSION_TYPESYSTEM_SOURCE_TEMPLATE(_class_)\ template<> App::PropertyData _class_::propertyData = App::PropertyData(); \ template<> const App::PropertyData * _class_::extensionGetPropertyDataPtr(void){return &propertyData;} \ template<> const App::PropertyData & _class_::extensionGetPropertyData(void) const{return propertyData;} \ diff --git a/src/App/ExtensionContainer.h b/src/App/ExtensionContainer.h index 9c5c2ae53fb7..4b0226d6e285 100644 --- a/src/App/ExtensionContainer.h +++ b/src/App/ExtensionContainer.h @@ -134,7 +134,7 @@ class AppExport ExtensionContainer : public App::PropertyContainer template ExtensionT* getExtensionByType(bool no_except=false, bool derived=true) const { return static_cast(getExtension(ExtensionT::getExtensionClassTypeId(),derived,no_except)); - }; + } //get all extensions which have the given base class std::vector getExtensionsDerivedFrom(Base::Type type) const; @@ -146,7 +146,7 @@ class AppExport ExtensionContainer : public App::PropertyContainer typevec.push_back(static_cast(entry.second)); } return typevec; - }; + } ExtensionIterator extensionBegin() {return _extensions.begin();}; ExtensionIterator extensionEnd() {return _extensions.end();}; diff --git a/src/App/GroupExtensionPyImp.cpp b/src/App/GroupExtensionPyImp.cpp index 09d73c4d6317..5e2f2df9c592 100644 --- a/src/App/GroupExtensionPyImp.cpp +++ b/src/App/GroupExtensionPyImp.cpp @@ -129,8 +129,7 @@ PyObject* GroupExtensionPy::addObjects(PyObject *args) { std::string error = std::string("type must be list of 'DocumentObject', not "); error += object->ob_type->tp_name; throw Base::TypeError(error); -}; - +} PyObject* GroupExtensionPy::setObjects(PyObject *args) { diff --git a/src/App/Link.h b/src/App/Link.h index 9961b6d0fd7c..ed8ac7a88ce0 100644 --- a/src/App/Link.h +++ b/src/App/Link.h @@ -39,6 +39,8 @@ #include "FeaturePython.h" #include "GroupExtension.h" +//FIXME: ISO C++11 requires at least one argument for the "..." in a variadic macro + #define LINK_THROW(_type,_msg) do{\ if(FC_LOG_INSTANCE.isEnabled(FC_LOGLEVEL_LOG))\ FC_ERR(_msg);\ diff --git a/src/App/Property.cpp b/src/App/Property.cpp index d92df5dcc237..af153fa4a6b5 100644 --- a/src/App/Property.cpp +++ b/src/App/Property.cpp @@ -43,7 +43,7 @@ using namespace App; // Property //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -TYPESYSTEM_SOURCE_ABSTRACT(App::Property , Base::Persistence); +TYPESYSTEM_SOURCE_ABSTRACT(App::Property , Base::Persistence) //************************************************************************** // Construction/Destruction @@ -271,4 +271,4 @@ void PropertyListsBase::_setPyObject(PyObject *value) { // PropertyLists //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -TYPESYSTEM_SOURCE_ABSTRACT(App::PropertyLists , App::Property); +TYPESYSTEM_SOURCE_ABSTRACT(App::PropertyLists , App::Property) diff --git a/src/App/PropertyContainer.cpp b/src/App/PropertyContainer.cpp index 27098f5af658..edd9a51e1ec0 100644 --- a/src/App/PropertyContainer.cpp +++ b/src/App/PropertyContainer.cpp @@ -46,7 +46,7 @@ using namespace App; using namespace Base; using namespace std; -TYPESYSTEM_SOURCE(App::PropertyContainer,Base::Persistence); +TYPESYSTEM_SOURCE(App::PropertyContainer,Base::Persistence) //************************************************************************** diff --git a/src/App/PropertyContainer.h b/src/App/PropertyContainer.h index 652f3ba588aa..a5911436e932 100644 --- a/src/App/PropertyContainer.h +++ b/src/App/PropertyContainer.h @@ -293,7 +293,7 @@ private: \ static App::PropertyData propertyData /// #define PROPERTY_SOURCE(_class_, _parentclass_) \ -TYPESYSTEM_SOURCE_P(_class_);\ +TYPESYSTEM_SOURCE_P(_class_)\ const App::PropertyData * _class_::getPropertyDataPtr(void){return &propertyData;} \ const App::PropertyData & _class_::getPropertyData(void) const{return propertyData;} \ App::PropertyData _class_::propertyData; \ @@ -303,7 +303,7 @@ void _class_::init(void){\ } #define PROPERTY_SOURCE_ABSTRACT(_class_, _parentclass_) \ -TYPESYSTEM_SOURCE_ABSTRACT_P(_class_);\ +TYPESYSTEM_SOURCE_ABSTRACT_P(_class_)\ const App::PropertyData * _class_::getPropertyDataPtr(void){return &propertyData;} \ const App::PropertyData & _class_::getPropertyData(void) const{return propertyData;} \ App::PropertyData _class_::propertyData; \ @@ -321,7 +321,7 @@ template<> void * _class_::create(void){\ } #define PROPERTY_SOURCE_TEMPLATE(_class_, _parentclass_) \ -TYPESYSTEM_SOURCE_TEMPLATE(_class_);\ +TYPESYSTEM_SOURCE_TEMPLATE(_class_)\ template<> App::PropertyData _class_::propertyData = App::PropertyData(); \ template<> const App::PropertyData * _class_::getPropertyDataPtr(void){return &propertyData;} \ template<> const App::PropertyData & _class_::getPropertyData(void) const{return propertyData;} \ diff --git a/src/App/PropertyContainerPyImp.cpp b/src/App/PropertyContainerPyImp.cpp index 9a62ca54d324..b0e57bbf6558 100644 --- a/src/App/PropertyContainerPyImp.cpp +++ b/src/App/PropertyContainerPyImp.cpp @@ -41,7 +41,7 @@ #include "PropertyContainerPy.h" #include "PropertyContainerPy.cpp" -FC_LOG_LEVEL_INIT("Property", true, 2); +FC_LOG_LEVEL_INIT("Property", true, 2) using namespace App; diff --git a/src/App/PropertyExpressionEngine.cpp b/src/App/PropertyExpressionEngine.cpp index 05953d336286..1d36ef7cef8b 100644 --- a/src/App/PropertyExpressionEngine.cpp +++ b/src/App/PropertyExpressionEngine.cpp @@ -43,7 +43,7 @@ using namespace App; using namespace Base; using namespace boost; -TYPESYSTEM_SOURCE_ABSTRACT(App::PropertyExpressionContainer , App::PropertyXLinkContainer); +TYPESYSTEM_SOURCE_ABSTRACT(App::PropertyExpressionContainer , App::PropertyXLinkContainer) static std::set _ExprContainers; @@ -73,7 +73,7 @@ void PropertyExpressionContainer::slotRelabelDocument(const App::Document &doc) /////////////////////////////////////////////////////////////////////////////////////// -TYPESYSTEM_SOURCE(App::PropertyExpressionEngine , App::PropertyExpressionContainer); +TYPESYSTEM_SOURCE(App::PropertyExpressionEngine , App::PropertyExpressionContainer) /** * @brief Construct a new PropertyExpressionEngine object. diff --git a/src/App/PropertyFile.cpp b/src/App/PropertyFile.cpp index 4e27331f5131..5d66676c7c47 100644 --- a/src/App/PropertyFile.cpp +++ b/src/App/PropertyFile.cpp @@ -53,7 +53,7 @@ using namespace std; // PropertyFileIncluded //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -TYPESYSTEM_SOURCE(App::PropertyFileIncluded , App::Property); +TYPESYSTEM_SOURCE(App::PropertyFileIncluded , App::Property) PropertyFileIncluded::PropertyFileIncluded() @@ -626,7 +626,7 @@ unsigned int PropertyFileIncluded::getMemSize (void) const // PropertyFile //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -TYPESYSTEM_SOURCE(App::PropertyFile , App::PropertyString); +TYPESYSTEM_SOURCE(App::PropertyFile , App::PropertyString) PropertyFile::PropertyFile() { diff --git a/src/App/PropertyGeo.cpp b/src/App/PropertyGeo.cpp index ed9f7911cee8..bb21abfbc200 100644 --- a/src/App/PropertyGeo.cpp +++ b/src/App/PropertyGeo.cpp @@ -59,7 +59,7 @@ using namespace std; // PropertyVector //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -TYPESYSTEM_SOURCE(App::PropertyVector , App::Property); +TYPESYSTEM_SOURCE(App::PropertyVector , App::Property) //************************************************************************** // Construction/Destruction @@ -240,7 +240,7 @@ bool PropertyVector::getPyPathValue(const ObjectIdentifier &path, Py::Object &re // PropertyVectorDistance //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -TYPESYSTEM_SOURCE(App::PropertyVectorDistance , App::PropertyVector); +TYPESYSTEM_SOURCE(App::PropertyVectorDistance , App::PropertyVector) //************************************************************************** // Construction/Destruction @@ -260,7 +260,7 @@ PropertyVectorDistance::~PropertyVectorDistance() // PropertyPosition //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -TYPESYSTEM_SOURCE(App::PropertyPosition , App::PropertyVector); +TYPESYSTEM_SOURCE(App::PropertyPosition , App::PropertyVector) //************************************************************************** // Construction/Destruction @@ -280,7 +280,7 @@ PropertyPosition::~PropertyPosition() // PropertyPosition //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -TYPESYSTEM_SOURCE(App::PropertyDirection , App::PropertyVector); +TYPESYSTEM_SOURCE(App::PropertyDirection , App::PropertyVector) //************************************************************************** // Construction/Destruction @@ -300,7 +300,7 @@ PropertyDirection::~PropertyDirection() // PropertyVectorList //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -TYPESYSTEM_SOURCE(App::PropertyVectorList , App::PropertyLists); +TYPESYSTEM_SOURCE(App::PropertyVectorList , App::PropertyLists) //************************************************************************** // Construction/Destruction @@ -420,7 +420,7 @@ unsigned int PropertyVectorList::getMemSize (void) const // PropertyMatrix //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -TYPESYSTEM_SOURCE(App::PropertyMatrix , App::Property); +TYPESYSTEM_SOURCE(App::PropertyMatrix , App::Property) //************************************************************************** // Construction/Destruction @@ -553,7 +553,7 @@ void PropertyMatrix::Paste(const Property &from) // PropertyPlacement //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -TYPESYSTEM_SOURCE(App::PropertyPlacement , App::Property); +TYPESYSTEM_SOURCE(App::PropertyPlacement , App::Property) //************************************************************************** // Construction/Destruction @@ -780,7 +780,7 @@ void PropertyPlacement::Paste(const Property &from) // PropertyPlacementList //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -TYPESYSTEM_SOURCE(App::PropertyPlacementList , App::PropertyLists); +TYPESYSTEM_SOURCE(App::PropertyPlacementList , App::PropertyLists) //************************************************************************** // Construction/Destruction @@ -911,7 +911,7 @@ unsigned int PropertyPlacementList::getMemSize (void) const // PropertyPlacement //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -TYPESYSTEM_SOURCE(App::PropertyPlacementLink , App::PropertyLink); +TYPESYSTEM_SOURCE(App::PropertyPlacementLink , App::PropertyLink) //************************************************************************** // Construction/Destruction @@ -956,7 +956,7 @@ void PropertyPlacementLink::Paste(const Property &from) // ------------------------------------------------------------ -TYPESYSTEM_SOURCE_ABSTRACT(App::PropertyGeometry , App::Property); +TYPESYSTEM_SOURCE_ABSTRACT(App::PropertyGeometry , App::Property) PropertyGeometry::PropertyGeometry() { @@ -970,7 +970,7 @@ PropertyGeometry::~PropertyGeometry() // ------------------------------------------------------------ -TYPESYSTEM_SOURCE_ABSTRACT(App::PropertyComplexGeoData , App::PropertyGeometry); +TYPESYSTEM_SOURCE_ABSTRACT(App::PropertyComplexGeoData , App::PropertyGeometry) PropertyComplexGeoData::PropertyComplexGeoData() { diff --git a/src/App/PropertyLinks.cpp b/src/App/PropertyLinks.cpp index 7c9bf4c7e3b4..8ab4778815bf 100644 --- a/src/App/PropertyLinks.cpp +++ b/src/App/PropertyLinks.cpp @@ -50,7 +50,7 @@ #include "PropertyLinks.h" -FC_LOG_LEVEL_INIT("PropertyLinks",true,true); +FC_LOG_LEVEL_INIT("PropertyLinks",true,true) using namespace App; using namespace Base; diff --git a/src/App/PropertyPythonObject.cpp b/src/App/PropertyPythonObject.cpp index 7a1ebd0c25ab..bf65c45ee0e2 100644 --- a/src/App/PropertyPythonObject.cpp +++ b/src/App/PropertyPythonObject.cpp @@ -40,7 +40,7 @@ using namespace App; -TYPESYSTEM_SOURCE(App::PropertyPythonObject , App::Property); +TYPESYSTEM_SOURCE(App::PropertyPythonObject , App::Property) PropertyPythonObject::PropertyPythonObject() { diff --git a/src/App/PropertyStandard.cpp b/src/App/PropertyStandard.cpp index f7adbfd005f7..b97243ae3863 100644 --- a/src/App/PropertyStandard.cpp +++ b/src/App/PropertyStandard.cpp @@ -61,7 +61,7 @@ using namespace std; // PropertyInteger //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -TYPESYSTEM_SOURCE(App::PropertyInteger , App::Property); +TYPESYSTEM_SOURCE(App::PropertyInteger , App::Property) //************************************************************************** // Construction/Destruction @@ -168,7 +168,7 @@ void PropertyInteger::setPathValue(const ObjectIdentifier &path, const boost::an // PropertyPath //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -TYPESYSTEM_SOURCE(App::PropertyPath , App::Property); +TYPESYSTEM_SOURCE(App::PropertyPath , App::Property) //************************************************************************** // Construction/Destruction @@ -294,7 +294,7 @@ unsigned int PropertyPath::getMemSize (void) const // PropertyEnumeration //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -TYPESYSTEM_SOURCE(App::PropertyEnumeration, App::PropertyInteger); +TYPESYSTEM_SOURCE(App::PropertyEnumeration, App::PropertyInteger) //************************************************************************** // Construction/Destruction @@ -669,7 +669,7 @@ void PropertyIntegerConstraint::setPyObject(PyObject *value) // PropertyPercent //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -TYPESYSTEM_SOURCE(App::PropertyPercent , App::PropertyIntegerConstraint); +TYPESYSTEM_SOURCE(App::PropertyPercent , App::PropertyIntegerConstraint) const PropertyIntegerConstraint::Constraints percent = {0,100,1}; @@ -691,7 +691,7 @@ PropertyPercent::~PropertyPercent() // PropertyIntegerList //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -TYPESYSTEM_SOURCE(App::PropertyIntegerList , App::PropertyLists); +TYPESYSTEM_SOURCE(App::PropertyIntegerList , App::PropertyLists) //************************************************************************** // Construction/Destruction @@ -789,7 +789,7 @@ unsigned int PropertyIntegerList::getMemSize (void) const // PropertyIntegerSet //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -TYPESYSTEM_SOURCE(App::PropertyIntegerSet , App::Property); +TYPESYSTEM_SOURCE(App::PropertyIntegerSet , App::Property) //************************************************************************** // Construction/Destruction @@ -934,7 +934,7 @@ unsigned int PropertyIntegerSet::getMemSize (void) const // PropertyFloat //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -TYPESYSTEM_SOURCE(App::PropertyFloat , App::Property); +TYPESYSTEM_SOURCE(App::PropertyFloat , App::Property) //************************************************************************** // Construction/Destruction @@ -1159,7 +1159,7 @@ void PropertyFloatConstraint::setPyObject(PyObject *value) // PropertyPrecision //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -TYPESYSTEM_SOURCE(App::PropertyPrecision, App::PropertyFloatConstraint); +TYPESYSTEM_SOURCE(App::PropertyPrecision, App::PropertyFloatConstraint) //************************************************************************** // Construction/Destruction @@ -1181,7 +1181,7 @@ PropertyPrecision::~PropertyPrecision() // PropertyFloatList //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -TYPESYSTEM_SOURCE(App::PropertyFloatList , App::PropertyLists); +TYPESYSTEM_SOURCE(App::PropertyFloatList , App::PropertyLists) //************************************************************************** // Construction/Destruction @@ -1313,7 +1313,7 @@ unsigned int PropertyFloatList::getMemSize (void) const // PropertyString //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -TYPESYSTEM_SOURCE(App::PropertyString , App::Property); +TYPESYSTEM_SOURCE(App::PropertyString , App::Property) PropertyString::PropertyString() { @@ -1573,7 +1573,7 @@ const boost::any PropertyString::getPathValue(const ObjectIdentifier &path) cons // PropertyUUID //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -TYPESYSTEM_SOURCE(App::PropertyUUID , App::Property); +TYPESYSTEM_SOURCE(App::PropertyUUID , App::Property) PropertyUUID::PropertyUUID() { @@ -1696,7 +1696,7 @@ unsigned int PropertyUUID::getMemSize (void) const // PropertyFont //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -TYPESYSTEM_SOURCE(App::PropertyFont , App::PropertyString); +TYPESYSTEM_SOURCE(App::PropertyFont , App::PropertyString) PropertyFont::PropertyFont() { @@ -1712,7 +1712,7 @@ PropertyFont::~PropertyFont() // PropertyStringList //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -TYPESYSTEM_SOURCE(App::PropertyStringList , App::PropertyLists); +TYPESYSTEM_SOURCE(App::PropertyStringList , App::PropertyLists) PropertyStringList::PropertyStringList() { @@ -1752,7 +1752,8 @@ PyObject *PropertyStringList::getPyObject(void) return list; } -std::string PropertyStringList::getPyValue(PyObject *item) const { +std::string PropertyStringList::getPyValue(PyObject *item) const +{ std::string ret; if (PyUnicode_Check(item)) { #if PY_MAJOR_VERSION >= 3 @@ -1832,7 +1833,7 @@ void PropertyStringList::Paste(const Property &from) // PropertyMap //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -TYPESYSTEM_SOURCE(App::PropertyMap , App::Property); +TYPESYSTEM_SOURCE(App::PropertyMap , App::Property) PropertyMap::PropertyMap() { @@ -2023,7 +2024,7 @@ void PropertyMap::Paste(const Property &from) // PropertyBool //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -TYPESYSTEM_SOURCE(App::PropertyBool , App::Property); +TYPESYSTEM_SOURCE(App::PropertyBool , App::Property) //************************************************************************** // Construction/Destruction @@ -2138,7 +2139,7 @@ const boost::any PropertyBool::getPathValue(const ObjectIdentifier &path) const // PropertyBoolList //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -TYPESYSTEM_SOURCE(App::PropertyBoolList , App::PropertyLists); +TYPESYSTEM_SOURCE(App::PropertyBoolList , App::PropertyLists) //************************************************************************** // Construction/Destruction @@ -2252,7 +2253,7 @@ unsigned int PropertyBoolList::getMemSize (void) const // PropertyColor //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -TYPESYSTEM_SOURCE(App::PropertyColor , App::Property); +TYPESYSTEM_SOURCE(App::PropertyColor , App::Property) //************************************************************************** // Construction/Destruction @@ -2401,7 +2402,7 @@ void PropertyColor::Paste(const Property &from) // PropertyColorList //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -TYPESYSTEM_SOURCE(App::PropertyColorList , App::PropertyLists); +TYPESYSTEM_SOURCE(App::PropertyColorList , App::PropertyLists) //************************************************************************** // Construction/Destruction @@ -2514,7 +2515,7 @@ unsigned int PropertyColorList::getMemSize (void) const // PropertyMaterial //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -TYPESYSTEM_SOURCE(App::PropertyMaterial , App::Property); +TYPESYSTEM_SOURCE(App::PropertyMaterial , App::Property) PropertyMaterial::PropertyMaterial() { @@ -2648,7 +2649,7 @@ void PropertyMaterial::Paste(const Property &from) // PropertyMaterialList //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -TYPESYSTEM_SOURCE(App::PropertyMaterialList, App::PropertyLists); +TYPESYSTEM_SOURCE(App::PropertyMaterialList, App::PropertyLists) //************************************************************************** // Construction/Destruction @@ -2776,7 +2777,7 @@ unsigned int PropertyMaterialList::getMemSize(void) const // PropertyPersistentObject //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -TYPESYSTEM_SOURCE(App::PropertyPersistentObject , App::PropertyString); +TYPESYSTEM_SOURCE(App::PropertyPersistentObject , App::PropertyString) PyObject *PropertyPersistentObject::getPyObject(void){ if(_pObject) diff --git a/src/App/PropertyUnits.cpp b/src/App/PropertyUnits.cpp index eeb38a43e607..8d8b450b5aca 100644 --- a/src/App/PropertyUnits.cpp +++ b/src/App/PropertyUnits.cpp @@ -56,7 +56,7 @@ const PropertyQuantityConstraint::Constraints AngleStandard = {-360,360,1.0}; // PropertyQuantity //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -TYPESYSTEM_SOURCE(App::PropertyQuantity, App::PropertyFloat); +TYPESYSTEM_SOURCE(App::PropertyQuantity, App::PropertyFloat) Base::Quantity PropertyQuantity::getQuantityValue(void) const { @@ -161,7 +161,7 @@ const boost::any PropertyQuantity::getPathValue(const ObjectIdentifier & /*path* // PropertyQuantityConstraint //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -TYPESYSTEM_SOURCE(App::PropertyQuantityConstraint, App::PropertyQuantity); +TYPESYSTEM_SOURCE(App::PropertyQuantityConstraint, App::PropertyQuantity) @@ -211,7 +211,7 @@ void PropertyQuantityConstraint::setPyObject(PyObject *value) // PropertyDistance //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -TYPESYSTEM_SOURCE(App::PropertyDistance, App::PropertyQuantity); +TYPESYSTEM_SOURCE(App::PropertyDistance, App::PropertyQuantity) PropertyDistance::PropertyDistance() { @@ -223,7 +223,7 @@ PropertyDistance::PropertyDistance() // PropertySpeed //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -TYPESYSTEM_SOURCE(App::PropertySpeed, App::PropertyQuantity); +TYPESYSTEM_SOURCE(App::PropertySpeed, App::PropertyQuantity) PropertySpeed::PropertySpeed() { @@ -235,7 +235,7 @@ PropertySpeed::PropertySpeed() // PropertyAcceleration //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -TYPESYSTEM_SOURCE(App::PropertyAcceleration, App::PropertyQuantity); +TYPESYSTEM_SOURCE(App::PropertyAcceleration, App::PropertyQuantity) PropertyAcceleration::PropertyAcceleration() { @@ -247,7 +247,7 @@ PropertyAcceleration::PropertyAcceleration() // PropertyLength //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -TYPESYSTEM_SOURCE(App::PropertyLength, App::PropertyQuantityConstraint); +TYPESYSTEM_SOURCE(App::PropertyLength, App::PropertyQuantityConstraint) PropertyLength::PropertyLength() { @@ -260,7 +260,7 @@ PropertyLength::PropertyLength() // PropertyArea //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -TYPESYSTEM_SOURCE(App::PropertyArea, App::PropertyQuantityConstraint); +TYPESYSTEM_SOURCE(App::PropertyArea, App::PropertyQuantityConstraint) PropertyArea::PropertyArea() { @@ -273,7 +273,7 @@ PropertyArea::PropertyArea() // PropertyVolume //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -TYPESYSTEM_SOURCE(App::PropertyVolume, App::PropertyQuantityConstraint); +TYPESYSTEM_SOURCE(App::PropertyVolume, App::PropertyQuantityConstraint) PropertyVolume::PropertyVolume() { @@ -286,7 +286,7 @@ PropertyVolume::PropertyVolume() // PropertyAngle //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -TYPESYSTEM_SOURCE(App::PropertyAngle, App::PropertyQuantityConstraint); +TYPESYSTEM_SOURCE(App::PropertyAngle, App::PropertyQuantityConstraint) PropertyAngle::PropertyAngle() { @@ -299,7 +299,7 @@ PropertyAngle::PropertyAngle() // PropertyPressure //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -TYPESYSTEM_SOURCE(App::PropertyPressure, App::PropertyQuantity); +TYPESYSTEM_SOURCE(App::PropertyPressure, App::PropertyQuantity) PropertyPressure::PropertyPressure() { @@ -311,7 +311,7 @@ PropertyPressure::PropertyPressure() // PropertyForce //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -TYPESYSTEM_SOURCE(App::PropertyForce, App::PropertyQuantity); +TYPESYSTEM_SOURCE(App::PropertyForce, App::PropertyQuantity) PropertyForce::PropertyForce() { diff --git a/src/App/Transactions.cpp b/src/App/Transactions.cpp index 32270607f862..2467e2a4bd9a 100644 --- a/src/App/Transactions.cpp +++ b/src/App/Transactions.cpp @@ -40,7 +40,7 @@ using Base::XMLReader; #include "Document.h" #include "DocumentObject.h" -FC_LOG_LEVEL_INIT("App",true,true); +FC_LOG_LEVEL_INIT("App",true,true) using namespace App; using namespace std; @@ -260,7 +260,7 @@ void Transaction::addObjectChange(const TransactionalObject *Obj, const Property // TransactionObject //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -TYPESYSTEM_SOURCE_ABSTRACT(App::TransactionObject, Base::Persistence); +TYPESYSTEM_SOURCE_ABSTRACT(App::TransactionObject, Base::Persistence) //************************************************************************** // Construction/Destruction @@ -411,7 +411,7 @@ void TransactionObject::Restore(Base::XMLReader &/*reader*/) // TransactionDocumentObject //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -TYPESYSTEM_SOURCE_ABSTRACT(App::TransactionDocumentObject, App::TransactionObject); +TYPESYSTEM_SOURCE_ABSTRACT(App::TransactionDocumentObject, App::TransactionObject) //************************************************************************** // Construction/Destruction diff --git a/src/Base/BaseClass.h b/src/Base/BaseClass.h index 2dd7ecfa2ca2..876e3faa9bac 100644 --- a/src/Base/BaseClass.h +++ b/src/Base/BaseClass.h @@ -80,7 +80,7 @@ void * _class_::create(void){return 0;} /// define to implement a subclass of Base::BaseClass #define TYPESYSTEM_SOURCE(_class_, _parentclass_) \ -TYPESYSTEM_SOURCE_P(_class_);\ +TYPESYSTEM_SOURCE_P(_class_)\ void _class_::init(void){\ initSubclass(_class_::classTypeId, #_class_ , #_parentclass_, &(_class_::create) ); \ } @@ -94,7 +94,7 @@ template<> void _class_::init(void){\ /// define to implement a subclass of Base::BaseClass #define TYPESYSTEM_SOURCE_ABSTRACT(_class_, _parentclass_) \ -TYPESYSTEM_SOURCE_ABSTRACT_P(_class_);\ +TYPESYSTEM_SOURCE_ABSTRACT_P(_class_)\ void _class_::init(void){\ initSubclass(_class_::classTypeId, #_class_ , #_parentclass_, &(_class_::create) ); \ } @@ -114,11 +114,11 @@ class BaseExport BaseClass virtual PyObject *getPyObject(void); virtual void setPyObject(PyObject *); - static void *create(void){return 0;} + static void *create(void){return nullptr;} private: static Type classTypeId; protected: - static void initSubclass(Base::Type &toInit,const char* ClassName, const char *ParentName, Type::instantiationMethod method=0); + static void initSubclass(Base::Type &toInit,const char* ClassName, const char *ParentName, Type::instantiationMethod method=nullptr); public: /// Construction diff --git a/src/Base/Exception.cpp b/src/Base/Exception.cpp index b1e58ff7ce31..61177d2d118b 100644 --- a/src/Base/Exception.cpp +++ b/src/Base/Exception.cpp @@ -31,12 +31,12 @@ #include "Console.h" #include -FC_LOG_LEVEL_INIT("Exception", true, true); +FC_LOG_LEVEL_INIT("Exception", true, true) using namespace Base; -TYPESYSTEM_SOURCE(Base::Exception,Base::BaseClass); +TYPESYSTEM_SOURCE(Base::Exception,Base::BaseClass) Exception::Exception(void) @@ -151,7 +151,7 @@ void Exception::setPyObject( PyObject * pydict) // --------------------------------------------------------- -TYPESYSTEM_SOURCE(Base::AbortException,Base::Exception); +TYPESYSTEM_SOURCE(Base::AbortException,Base::Exception) AbortException::AbortException(const char * sMessage) : Exception( sMessage ) diff --git a/src/Base/Persistence.cpp b/src/Base/Persistence.cpp index bb9bf7c98d7b..f5bb8f031a3a 100644 --- a/src/Base/Persistence.cpp +++ b/src/Base/Persistence.cpp @@ -34,7 +34,7 @@ using namespace Base; -TYPESYSTEM_SOURCE_ABSTRACT(Base::Persistence,Base::BaseClass); +TYPESYSTEM_SOURCE_ABSTRACT(Base::Persistence,Base::BaseClass) //************************************************************************** diff --git a/src/Base/Quantity.cpp b/src/Base/Quantity.cpp index ed6062e97b13..5ab27eed0103 100644 --- a/src/Base/Quantity.cpp +++ b/src/Base/Quantity.cpp @@ -349,7 +349,7 @@ double num_change(char* yytext,char dez_delim,char grp_delim) ret_val = atof( temp ); return ret_val; -}; +} // error func void Quantity_yyerror(char *errorinfo) diff --git a/src/Base/Sequencer.cpp b/src/Base/Sequencer.cpp index 39888b88321c..751a6273de4a 100644 --- a/src/Base/Sequencer.cpp +++ b/src/Base/Sequencer.cpp @@ -68,7 +68,7 @@ namespace Base { std::vector SequencerP::_instances; SequencerLauncher* SequencerP::_topLauncher = 0; QMutex SequencerP::mutex(QMutex::Recursive); -}; +} SequencerBase& SequencerBase::Instance () { diff --git a/src/CXX/Python3/IndirectPythonInterface.hxx b/src/CXX/Python3/IndirectPythonInterface.hxx index 97e34e3d3f4f..912fa56963f5 100644 --- a/src/CXX/Python3/IndirectPythonInterface.hxx +++ b/src/CXX/Python3/IndirectPythonInterface.hxx @@ -179,6 +179,6 @@ PYCXX_EXPORT void _XINCREF( PyObject *op ); PYCXX_EXPORT void _XDECREF( PyObject *op ); PYCXX_EXPORT const char *__Py_PackageContext(); -}; +} #endif // __CXX_INDIRECT_PYTHON_INTERFACE__HXX__ diff --git a/src/Gui/ActiveObjectList.cpp b/src/Gui/ActiveObjectList.cpp index d2f85a2e62bd..aaf6407fe0cf 100644 --- a/src/Gui/ActiveObjectList.cpp +++ b/src/Gui/ActiveObjectList.cpp @@ -36,7 +36,7 @@ #include #include "Tree.h" -FC_LOG_LEVEL_INIT("MDIView",true,true); +FC_LOG_LEVEL_INIT("MDIView",true,true) using namespace Gui; diff --git a/src/Gui/AxisOrigin.cpp b/src/Gui/AxisOrigin.cpp index 06c1c698b61d..dbb4aa98a474 100644 --- a/src/Gui/AxisOrigin.cpp +++ b/src/Gui/AxisOrigin.cpp @@ -43,7 +43,7 @@ using namespace Gui; -TYPESYSTEM_SOURCE(Gui::AxisOrigin,Base::BaseClass); +TYPESYSTEM_SOURCE(Gui::AxisOrigin,Base::BaseClass) AxisOrigin::AxisOrigin() :size(6),pSize(4),dist(2),scale(1),lineSize(2),pointSize(4) diff --git a/src/Gui/BlenderNavigationStyle.cpp b/src/Gui/BlenderNavigationStyle.cpp index 608c6c5e177b..2c2b6f96734c 100644 --- a/src/Gui/BlenderNavigationStyle.cpp +++ b/src/Gui/BlenderNavigationStyle.cpp @@ -51,7 +51,7 @@ using namespace Gui; /* TRANSLATOR Gui::BlenderNavigationStyle */ -TYPESYSTEM_SOURCE(Gui::BlenderNavigationStyle, Gui::UserNavigationStyle); +TYPESYSTEM_SOURCE(Gui::BlenderNavigationStyle, Gui::UserNavigationStyle) BlenderNavigationStyle::BlenderNavigationStyle() : lockButton1(false) { diff --git a/src/Gui/CADNavigationStyle.cpp b/src/Gui/CADNavigationStyle.cpp index eb6e47974a30..ef82b266318a 100644 --- a/src/Gui/CADNavigationStyle.cpp +++ b/src/Gui/CADNavigationStyle.cpp @@ -51,7 +51,7 @@ using namespace Gui; /* TRANSLATOR Gui::CADNavigationStyle */ -TYPESYSTEM_SOURCE(Gui::CADNavigationStyle, Gui::UserNavigationStyle); +TYPESYSTEM_SOURCE(Gui::CADNavigationStyle, Gui::UserNavigationStyle) CADNavigationStyle::CADNavigationStyle() : lockButton1(false) { diff --git a/src/Gui/CallTips.cpp b/src/Gui/CallTips.cpp index 984e7de707ce..0c3490c8c552 100644 --- a/src/Gui/CallTips.cpp +++ b/src/Gui/CallTips.cpp @@ -47,7 +47,7 @@ #include #include "CallTips.h" -Q_DECLARE_METATYPE( Gui::CallTip ); //< allows use of QVariant +Q_DECLARE_METATYPE( Gui::CallTip ) //< allows use of QVariant namespace Gui { diff --git a/src/Gui/Command.cpp b/src/Gui/Command.cpp index f377d28bc8fd..895af2886fb2 100644 --- a/src/Gui/Command.cpp +++ b/src/Gui/Command.cpp @@ -67,7 +67,7 @@ #include #include -FC_LOG_LEVEL_INIT("Command", true, true); +FC_LOG_LEVEL_INIT("Command", true, true) using Base::Interpreter; using namespace Gui; diff --git a/src/Gui/Command.h b/src/Gui/Command.h index 02476164a238..8abd9635d1fe 100644 --- a/src/Gui/Command.h +++ b/src/Gui/Command.h @@ -444,6 +444,7 @@ class GuiExport Command : public CommandBase /// Print to Python console the current calling source file and line number static void printCaller(const char *file, int line); + //FIXME: ISO C++11 requires at least one argument for the "..." in a variadic macro /** Convenience macro to run a command with printf like formatter * * @sa Command::_doCommand() diff --git a/src/Gui/CommandDoc.cpp b/src/Gui/CommandDoc.cpp index 8fd1e37247f4..bd918299a1d7 100644 --- a/src/Gui/CommandDoc.cpp +++ b/src/Gui/CommandDoc.cpp @@ -76,7 +76,7 @@ #include "GraphvizView.h" #include "DlgObjectSelection.h" -FC_LOG_LEVEL_INIT("Command", false); +FC_LOG_LEVEL_INIT("Command", false) using namespace Gui; @@ -85,7 +85,7 @@ using namespace Gui; // Std_Open //=========================================================================== -DEF_STD_CMD(StdCmdOpen); +DEF_STD_CMD(StdCmdOpen) StdCmdOpen::StdCmdOpen() : Command("Std_Open") @@ -168,7 +168,7 @@ void StdCmdOpen::activated(int iMsg) // Std_Import //=========================================================================== -DEF_STD_CMD_A(StdCmdImport); +DEF_STD_CMD_A(StdCmdImport) StdCmdImport::StdCmdImport() : Command("Std_Import") @@ -254,7 +254,7 @@ bool StdCmdImport::isActive(void) // Std_Export //=========================================================================== -DEF_STD_CMD_A(StdCmdExport); +DEF_STD_CMD_A(StdCmdExport) StdCmdExport::StdCmdExport() : Command("Std_Export") @@ -320,7 +320,7 @@ bool StdCmdExport::isActive(void) // Std_MergeProjects //=========================================================================== -DEF_STD_CMD_A(StdCmdMergeProjects); +DEF_STD_CMD_A(StdCmdMergeProjects) StdCmdMergeProjects::StdCmdMergeProjects() : Command("Std_MergeProjects") @@ -372,7 +372,7 @@ bool StdCmdMergeProjects::isActive(void) // Std_ExportGraphviz //=========================================================================== -DEF_STD_CMD_A(StdCmdExportGraphviz); +DEF_STD_CMD_A(StdCmdExportGraphviz) StdCmdExportGraphviz::StdCmdExportGraphviz() : Command("Std_ExportGraphviz") @@ -404,7 +404,7 @@ bool StdCmdExportGraphviz::isActive(void) // Std_New //=========================================================================== -DEF_STD_CMD(StdCmdNew); +DEF_STD_CMD(StdCmdNew) StdCmdNew::StdCmdNew() :Command("Std_New") @@ -435,7 +435,7 @@ void StdCmdNew::activated(int iMsg) //=========================================================================== // Std_Save //=========================================================================== -DEF_STD_CMD_A(StdCmdSave); +DEF_STD_CMD_A(StdCmdSave) StdCmdSave::StdCmdSave() :Command("Std_Save") @@ -475,7 +475,7 @@ bool StdCmdSave::isActive(void) //=========================================================================== // Std_SaveAs //=========================================================================== -DEF_STD_CMD_A(StdCmdSaveAs); +DEF_STD_CMD_A(StdCmdSaveAs) StdCmdSaveAs::StdCmdSaveAs() :Command("Std_SaveAs") @@ -517,7 +517,7 @@ bool StdCmdSaveAs::isActive(void) //=========================================================================== // Std_SaveCopy //=========================================================================== -DEF_STD_CMD_A(StdCmdSaveCopy); +DEF_STD_CMD_A(StdCmdSaveCopy) StdCmdSaveCopy::StdCmdSaveCopy() :Command("Std_SaveCopy") @@ -550,7 +550,7 @@ bool StdCmdSaveCopy::isActive(void) //=========================================================================== // Std_SaveAll //=========================================================================== -DEF_STD_CMD_A(StdCmdSaveAll); +DEF_STD_CMD_A(StdCmdSaveAll) StdCmdSaveAll::StdCmdSaveAll() :Command("Std_SaveAll") @@ -577,7 +577,7 @@ bool StdCmdSaveAll::isActive(void) //=========================================================================== // Std_Revert //=========================================================================== -DEF_STD_CMD_A(StdCmdRevert); +DEF_STD_CMD_A(StdCmdRevert) StdCmdRevert::StdCmdRevert() :Command("Std_Revert") @@ -615,7 +615,7 @@ bool StdCmdRevert::isActive(void) // Std_ProjectInfo //=========================================================================== -DEF_STD_CMD_A(StdCmdProjectInfo); +DEF_STD_CMD_A(StdCmdProjectInfo) StdCmdProjectInfo::StdCmdProjectInfo() :Command("Std_ProjectInfo") @@ -647,7 +647,7 @@ bool StdCmdProjectInfo::isActive(void) // Std_ProjectUtil //=========================================================================== -DEF_STD_CMD_A(StdCmdProjectUtil); +DEF_STD_CMD_A(StdCmdProjectUtil) StdCmdProjectUtil::StdCmdProjectUtil() :Command("Std_ProjectUtil") @@ -675,7 +675,7 @@ bool StdCmdProjectUtil::isActive(void) //=========================================================================== // Std_Print //=========================================================================== -DEF_STD_CMD_A(StdCmdPrint ); +DEF_STD_CMD_A(StdCmdPrint) StdCmdPrint::StdCmdPrint() :Command("Std_Print") @@ -706,7 +706,7 @@ bool StdCmdPrint::isActive(void) //=========================================================================== // Std_PrintPreview //=========================================================================== -DEF_STD_CMD_A(StdCmdPrintPreview); +DEF_STD_CMD_A(StdCmdPrintPreview) StdCmdPrintPreview::StdCmdPrintPreview() :Command("Std_PrintPreview") @@ -735,7 +735,7 @@ bool StdCmdPrintPreview::isActive(void) //=========================================================================== // Std_PrintPdf //=========================================================================== -DEF_STD_CMD_A(StdCmdPrintPdf); +DEF_STD_CMD_A(StdCmdPrintPdf) StdCmdPrintPdf::StdCmdPrintPdf() :Command("Std_PrintPdf") @@ -765,7 +765,7 @@ bool StdCmdPrintPdf::isActive(void) // Std_Quit //=========================================================================== -DEF_STD_CMD(StdCmdQuit ); +DEF_STD_CMD(StdCmdQuit) StdCmdQuit::StdCmdQuit() :Command("Std_Quit") @@ -793,7 +793,7 @@ void StdCmdQuit::activated(int iMsg) // Std_Undo //=========================================================================== -DEF_STD_CMD_AC(StdCmdUndo); +DEF_STD_CMD_AC(StdCmdUndo) StdCmdUndo::StdCmdUndo() :Command("Std_Undo") @@ -837,7 +837,7 @@ Action * StdCmdUndo::createAction(void) // Std_Redo //=========================================================================== -DEF_STD_CMD_AC(StdCmdRedo ); +DEF_STD_CMD_AC(StdCmdRedo) StdCmdRedo::StdCmdRedo() :Command("Std_Redo") @@ -880,7 +880,7 @@ Action * StdCmdRedo::createAction(void) //=========================================================================== // Std_Cut //=========================================================================== -DEF_STD_CMD_A(StdCmdCut); +DEF_STD_CMD_A(StdCmdCut) StdCmdCut::StdCmdCut() : Command("Std_Cut") @@ -908,7 +908,7 @@ bool StdCmdCut::isActive(void) //=========================================================================== // Std_Copy //=========================================================================== -DEF_STD_CMD_A(StdCmdCopy); +DEF_STD_CMD_A(StdCmdCopy) StdCmdCopy::StdCmdCopy() : Command("Std_Copy") @@ -943,7 +943,7 @@ bool StdCmdCopy::isActive(void) //=========================================================================== // Std_Paste //=========================================================================== -DEF_STD_CMD_A(StdCmdPaste); +DEF_STD_CMD_A(StdCmdPaste) StdCmdPaste::StdCmdPaste() : Command("Std_Paste") @@ -981,7 +981,7 @@ bool StdCmdPaste::isActive(void) return getMainWindow()->canInsertFromMimeData(mime); } -DEF_STD_CMD_A(StdCmdDuplicateSelection); +DEF_STD_CMD_A(StdCmdDuplicateSelection) StdCmdDuplicateSelection::StdCmdDuplicateSelection() :Command("Std_DuplicateSelection") @@ -1069,7 +1069,7 @@ bool StdCmdDuplicateSelection::isActive(void) // Std_SelectAll //=========================================================================== -DEF_STD_CMD_A(StdCmdSelectAll); +DEF_STD_CMD_A(StdCmdSelectAll) StdCmdSelectAll::StdCmdSelectAll() : Command("Std_SelectAll") @@ -1102,7 +1102,7 @@ bool StdCmdSelectAll::isActive(void) //=========================================================================== // Std_Delete //=========================================================================== -DEF_STD_CMD_A(StdCmdDelete); +DEF_STD_CMD_A(StdCmdDelete) StdCmdDelete::StdCmdDelete() :Command("Std_Delete") @@ -1274,7 +1274,7 @@ bool StdCmdDelete::isActive(void) //=========================================================================== // Std_Refresh //=========================================================================== -DEF_STD_CMD_A(StdCmdRefresh); +DEF_STD_CMD_A(StdCmdRefresh) StdCmdRefresh::StdCmdRefresh() : Command("Std_Refresh") @@ -1319,7 +1319,7 @@ bool StdCmdRefresh::isActive(void) //=========================================================================== // Std_Transform //=========================================================================== -DEF_STD_CMD_A(StdCmdTransform); +DEF_STD_CMD_A(StdCmdTransform) StdCmdTransform::StdCmdTransform() : Command("Std_Transform") @@ -1345,7 +1345,7 @@ bool StdCmdTransform::isActive(void) //=========================================================================== // Std_Placement //=========================================================================== -DEF_STD_CMD_A(StdCmdPlacement); +DEF_STD_CMD_A(StdCmdPlacement) StdCmdPlacement::StdCmdPlacement() : Command("Std_Placement") @@ -1378,7 +1378,7 @@ bool StdCmdPlacement::isActive(void) //=========================================================================== // Std_TransformManip //=========================================================================== -DEF_STD_CMD_A(StdCmdTransformManip); +DEF_STD_CMD_A(StdCmdTransformManip) StdCmdTransformManip::StdCmdTransformManip() : Command("Std_TransformManip") @@ -1411,7 +1411,7 @@ bool StdCmdTransformManip::isActive(void) //=========================================================================== // Std_Alignment //=========================================================================== -DEF_STD_CMD_A(StdCmdAlignment); +DEF_STD_CMD_A(StdCmdAlignment) StdCmdAlignment::StdCmdAlignment() : Command("Std_Alignment") @@ -1480,7 +1480,7 @@ bool StdCmdAlignment::isActive(void) //=========================================================================== // Std_Edit //=========================================================================== -DEF_STD_CMD_A(StdCmdEdit); +DEF_STD_CMD_A(StdCmdEdit) StdCmdEdit::StdCmdEdit() : Command("Std_Edit") diff --git a/src/Gui/CommandFeat.cpp b/src/Gui/CommandFeat.cpp index 50eba0a78b24..7fa0790cf812 100644 --- a/src/Gui/CommandFeat.cpp +++ b/src/Gui/CommandFeat.cpp @@ -41,7 +41,7 @@ using namespace Gui; // Std_Recompute //=========================================================================== -DEF_STD_CMD(StdCmdFeatRecompute); +DEF_STD_CMD(StdCmdFeatRecompute) StdCmdFeatRecompute::StdCmdFeatRecompute() :Command("Std_Recompute") @@ -65,7 +65,7 @@ void StdCmdFeatRecompute::activated(int iMsg) // Std_RandomColor //=========================================================================== -DEF_STD_CMD_A(StdCmdRandomColor); +DEF_STD_CMD_A(StdCmdRandomColor) StdCmdRandomColor::StdCmdRandomColor() :Command("Std_RandomColor") diff --git a/src/Gui/CommandLink.cpp b/src/Gui/CommandLink.cpp index bb2448190625..eef1db69ff66 100644 --- a/src/Gui/CommandLink.cpp +++ b/src/Gui/CommandLink.cpp @@ -47,7 +47,7 @@ #include #include -FC_LOG_LEVEL_INIT("CommandLink",true,true); +FC_LOG_LEVEL_INIT("CommandLink",true,true) using namespace Gui; diff --git a/src/Gui/CommandMacro.cpp b/src/Gui/CommandMacro.cpp index 95de385957da..dedf279898ba 100644 --- a/src/Gui/CommandMacro.cpp +++ b/src/Gui/CommandMacro.cpp @@ -39,7 +39,7 @@ using namespace Gui; //=========================================================================== // Std_DlgMacroRecord //=========================================================================== -DEF_STD_CMD_A(StdCmdDlgMacroRecord); +DEF_STD_CMD_A(StdCmdDlgMacroRecord) StdCmdDlgMacroRecord::StdCmdDlgMacroRecord() : Command("Std_DlgMacroRecord") @@ -68,7 +68,7 @@ bool StdCmdDlgMacroRecord::isActive(void) //=========================================================================== // Std_MacroStopRecord //=========================================================================== -DEF_STD_CMD_A(StdCmdMacroStopRecord); +DEF_STD_CMD_A(StdCmdMacroStopRecord) StdCmdMacroStopRecord::StdCmdMacroStopRecord() : Command("Std_MacroStopRecord") @@ -96,7 +96,7 @@ bool StdCmdMacroStopRecord::isActive(void) //=========================================================================== // Std_DlgMacroExecute //=========================================================================== -DEF_STD_CMD_A(StdCmdDlgMacroExecute); +DEF_STD_CMD_A(StdCmdDlgMacroExecute) StdCmdDlgMacroExecute::StdCmdDlgMacroExecute() : Command("Std_DlgMacroExecute") @@ -125,7 +125,7 @@ bool StdCmdDlgMacroExecute::isActive(void) //=========================================================================== // Std_DlgMacroExecuteDirect //=========================================================================== -DEF_STD_CMD_A(StdCmdDlgMacroExecuteDirect); +DEF_STD_CMD_A(StdCmdDlgMacroExecuteDirect) StdCmdDlgMacroExecuteDirect::StdCmdDlgMacroExecuteDirect() : Command("Std_DlgMacroExecuteDirect") @@ -151,7 +151,7 @@ bool StdCmdDlgMacroExecuteDirect::isActive(void) return getGuiApplication()->sendHasMsgToActiveView("Run"); } -DEF_STD_CMD_A(StdCmdMacroStartDebug); +DEF_STD_CMD_A(StdCmdMacroStartDebug) StdCmdMacroStartDebug::StdCmdMacroStartDebug() : Command("Std_MacroStartDebug") @@ -181,7 +181,7 @@ bool StdCmdMacroStartDebug::isActive(void) return getGuiApplication()->sendHasMsgToActiveView("StartDebug"); } -DEF_STD_CMD_A(StdCmdMacroStopDebug); +DEF_STD_CMD_A(StdCmdMacroStopDebug) StdCmdMacroStopDebug::StdCmdMacroStopDebug() : Command("Std_MacroStopDebug") @@ -208,7 +208,7 @@ bool StdCmdMacroStopDebug::isActive(void) return dbg->isRunning(); } -DEF_STD_CMD_A(StdCmdMacroStepOver); +DEF_STD_CMD_A(StdCmdMacroStepOver) StdCmdMacroStepOver::StdCmdMacroStepOver() : Command("Std_MacroStepOver") @@ -235,7 +235,7 @@ bool StdCmdMacroStepOver::isActive(void) return dbg->isRunning(); } -DEF_STD_CMD_A(StdCmdMacroStepInto); +DEF_STD_CMD_A(StdCmdMacroStepInto) StdCmdMacroStepInto::StdCmdMacroStepInto() : Command("Std_MacroStepInto") @@ -262,7 +262,7 @@ bool StdCmdMacroStepInto::isActive(void) return dbg->isRunning(); } -DEF_STD_CMD_A(StdCmdToggleBreakpoint); +DEF_STD_CMD_A(StdCmdToggleBreakpoint) StdCmdToggleBreakpoint::StdCmdToggleBreakpoint() : Command("Std_ToggleBreakpoint") diff --git a/src/Gui/CommandStd.cpp b/src/Gui/CommandStd.cpp index 1d8ee358c60d..d78767e4c09b 100644 --- a/src/Gui/CommandStd.cpp +++ b/src/Gui/CommandStd.cpp @@ -71,7 +71,7 @@ using namespace Gui; // Std_Workbench //=========================================================================== -DEF_STD_CMD_AC(StdCmdWorkbench); +DEF_STD_CMD_AC(StdCmdWorkbench) StdCmdWorkbench::StdCmdWorkbench() : Command("Std_Workbench") @@ -203,10 +203,10 @@ Action * StdCmdAbout::createAction(void) this->className(), sStatusTip).arg(exe)); pcAction->setWhatsThis(QLatin1String(sWhatsThis)); pcAction->setIcon(QApplication::windowIcon()); - pcAction->setShortcut(QString::fromLatin1(sAccel)); -#if QT_VERSION > 0x050000 - // Needs to have AboutRole set to avoid duplicates if adding the about action more than once on macOS - pcAction->setMenuRole(QAction::AboutRole); + pcAction->setShortcut(QString::fromLatin1(sAccel)); +#if QT_VERSION > 0x050000 + // Needs to have AboutRole set to avoid duplicates if adding the about action more than once on macOS + pcAction->setMenuRole(QAction::AboutRole); #else // With Qt 4.8, having AboutRole set causes it to disappear when readding it: issue #0001485 pcAction->setMenuRole(QAction::ApplicationSpecificRole); @@ -247,7 +247,7 @@ void StdCmdAbout::languageChange() //=========================================================================== // Std_AboutQt //=========================================================================== -DEF_STD_CMD(StdCmdAboutQt); +DEF_STD_CMD(StdCmdAboutQt) StdCmdAboutQt::StdCmdAboutQt() :Command("Std_AboutQt") @@ -269,7 +269,7 @@ void StdCmdAboutQt::activated(int iMsg) //=========================================================================== // Std_WhatsThis //=========================================================================== -DEF_STD_CMD(StdCmdWhatsThis); +DEF_STD_CMD(StdCmdWhatsThis) StdCmdWhatsThis::StdCmdWhatsThis() :Command("Std_WhatsThis") @@ -293,7 +293,7 @@ void StdCmdWhatsThis::activated(int iMsg) //=========================================================================== // Std_DlgParameter //=========================================================================== -DEF_STD_CMD(StdCmdDlgParameter); +DEF_STD_CMD(StdCmdDlgParameter) StdCmdDlgParameter::StdCmdDlgParameter() :Command("Std_DlgParameter") @@ -318,7 +318,7 @@ void StdCmdDlgParameter::activated(int iMsg) //=========================================================================== // Std_DlgPreferences //=========================================================================== -DEF_STD_CMD_C(StdCmdDlgPreferences); +DEF_STD_CMD_C(StdCmdDlgPreferences) StdCmdDlgPreferences::StdCmdDlgPreferences() :Command("Std_DlgPreferences") @@ -349,7 +349,7 @@ void StdCmdDlgPreferences::activated(int iMsg) //=========================================================================== // Std_DlgCustomize //=========================================================================== -DEF_STD_CMD(StdCmdDlgCustomize); +DEF_STD_CMD(StdCmdDlgCustomize) StdCmdDlgCustomize::StdCmdDlgCustomize() :Command("Std_DlgCustomize") @@ -376,7 +376,7 @@ void StdCmdDlgCustomize::activated(int iMsg) //=========================================================================== // Std_CommandLine //=========================================================================== -DEF_STD_CMD(StdCmdCommandLine); +DEF_STD_CMD(StdCmdCommandLine) StdCmdCommandLine::StdCmdCommandLine() :Command("Std_CommandLine") @@ -424,7 +424,7 @@ void StdCmdCommandLine::activated(int iMsg) // Std_OnlineHelp //=========================================================================== -DEF_STD_CMD(StdCmdOnlineHelp); +DEF_STD_CMD(StdCmdOnlineHelp) StdCmdOnlineHelp::StdCmdOnlineHelp() :Command("Std_OnlineHelp") @@ -449,7 +449,7 @@ void StdCmdOnlineHelp::activated(int iMsg) // Std_OnlineHelpWebsite //=========================================================================== -DEF_STD_CMD(StdCmdOnlineHelpWebsite); +DEF_STD_CMD(StdCmdOnlineHelpWebsite) StdCmdOnlineHelpWebsite::StdCmdOnlineHelpWebsite() :Command("Std_OnlineHelpWebsite") @@ -476,7 +476,7 @@ void StdCmdOnlineHelpWebsite::activated(int iMsg) // Std_FreeCADWebsite //=========================================================================== -DEF_STD_CMD(StdCmdFreeCADWebsite); +DEF_STD_CMD(StdCmdFreeCADWebsite) StdCmdFreeCADWebsite::StdCmdFreeCADWebsite() :Command("Std_FreeCADWebsite") @@ -504,7 +504,7 @@ void StdCmdFreeCADWebsite::activated(int iMsg) // Std_FreeCADUserHub //=========================================================================== -DEF_STD_CMD(StdCmdFreeCADUserHub); +DEF_STD_CMD(StdCmdFreeCADUserHub) StdCmdFreeCADUserHub::StdCmdFreeCADUserHub() :Command("Std_FreeCADUserHub") @@ -532,7 +532,7 @@ void StdCmdFreeCADUserHub::activated(int iMsg) // Std_FreeCADPowerUserHub //=========================================================================== -DEF_STD_CMD(StdCmdFreeCADPowerUserHub); +DEF_STD_CMD(StdCmdFreeCADPowerUserHub) StdCmdFreeCADPowerUserHub::StdCmdFreeCADPowerUserHub() :Command("Std_FreeCADPowerUserHub") @@ -560,7 +560,7 @@ void StdCmdFreeCADPowerUserHub::activated(int iMsg) // Std_FreeCADForum //=========================================================================== -DEF_STD_CMD(StdCmdFreeCADForum); +DEF_STD_CMD(StdCmdFreeCADForum) StdCmdFreeCADForum::StdCmdFreeCADForum() :Command("Std_FreeCADForum") @@ -588,7 +588,7 @@ void StdCmdFreeCADForum::activated(int iMsg) // Std_FreeCADFAQ //=========================================================================== -DEF_STD_CMD(StdCmdFreeCADFAQ); +DEF_STD_CMD(StdCmdFreeCADFAQ) StdCmdFreeCADFAQ::StdCmdFreeCADFAQ() :Command("Std_FreeCADFAQ") @@ -616,7 +616,7 @@ void StdCmdFreeCADFAQ::activated(int iMsg) // Std_PythonWebsite //=========================================================================== -DEF_STD_CMD(StdCmdPythonWebsite); +DEF_STD_CMD(StdCmdPythonWebsite) StdCmdPythonWebsite::StdCmdPythonWebsite() :Command("Std_PythonWebsite") @@ -640,7 +640,7 @@ void StdCmdPythonWebsite::activated(int iMsg) // Std_MeasurementSimple //=========================================================================== -DEF_STD_CMD(StdCmdMeasurementSimple); +DEF_STD_CMD(StdCmdMeasurementSimple) StdCmdMeasurementSimple::StdCmdMeasurementSimple() :Command("Std_MeasurementSimple") @@ -695,7 +695,7 @@ void StdCmdMeasurementSimple::activated(int iMsg) //=========================================================================== // Std_UnitsCalculator //=========================================================================== -DEF_STD_CMD(StdCmdUnitsCalculator); +DEF_STD_CMD(StdCmdUnitsCalculator) StdCmdUnitsCalculator::StdCmdUnitsCalculator() : Command("Std_UnitsCalculator") diff --git a/src/Gui/CommandStructure.cpp b/src/Gui/CommandStructure.cpp index 4e9344760a67..f7b5577cfa9e 100644 --- a/src/Gui/CommandStructure.cpp +++ b/src/Gui/CommandStructure.cpp @@ -43,7 +43,7 @@ using namespace Gui; //=========================================================================== // Std_Part //=========================================================================== -DEF_STD_CMD_A(StdCmdPart); +DEF_STD_CMD_A(StdCmdPart) StdCmdPart::StdCmdPart() : Command("Std_Part") @@ -84,7 +84,7 @@ bool StdCmdPart::isActive(void) //=========================================================================== // Std_Group //=========================================================================== -DEF_STD_CMD_A(StdCmdGroup); +DEF_STD_CMD_A(StdCmdGroup) StdCmdGroup::StdCmdGroup() : Command("Std_Group") diff --git a/src/Gui/CommandTest.cpp b/src/Gui/CommandTest.cpp index ee2afc96a059..4efe06226cf6 100644 --- a/src/Gui/CommandTest.cpp +++ b/src/Gui/CommandTest.cpp @@ -55,7 +55,7 @@ using namespace Gui; //=========================================================================== // Std_TestQM //=========================================================================== -DEF_STD_CMD(Std_TestQM); +DEF_STD_CMD(Std_TestQM) Std_TestQM::Std_TestQM() : Command("Std_TestQM") @@ -93,7 +93,7 @@ void Std_TestQM::activated(int iMsg) //=========================================================================== // Std_TestReloadQM //=========================================================================== -DEF_STD_CMD(Std_TestReloadQM); +DEF_STD_CMD(Std_TestReloadQM) Std_TestReloadQM::Std_TestReloadQM() : Command("Std_TestReloadQM") @@ -114,7 +114,7 @@ void Std_TestReloadQM::activated(int iMsg) //=========================================================================== // Std_Test1 //=========================================================================== -DEF_STD_CMD_A(FCCmdTest1); +DEF_STD_CMD_A(FCCmdTest1) FCCmdTest1::FCCmdTest1() : Command("Std_Test1") @@ -142,7 +142,7 @@ bool FCCmdTest1::isActive(void) //=========================================================================== // Std_Test2 //=========================================================================== -DEF_STD_CMD_A(FCCmdTest2); +DEF_STD_CMD_A(FCCmdTest2) FCCmdTest2::FCCmdTest2() : Command("Std_Test2") @@ -169,7 +169,7 @@ bool FCCmdTest2::isActive(void) //=========================================================================== // Std_Test3 //=========================================================================== -DEF_STD_CMD_A(FCCmdTest3); +DEF_STD_CMD_A(FCCmdTest3) FCCmdTest3::FCCmdTest3() : Command("Std_Test3") @@ -199,7 +199,7 @@ bool FCCmdTest3::isActive(void) // Std_Test4 //=========================================================================== -DEF_STD_CMD_A(FCCmdTest4); +DEF_STD_CMD_A(FCCmdTest4) FCCmdTest4::FCCmdTest4() : Command("Std_Test4") @@ -228,7 +228,7 @@ bool FCCmdTest4::isActive(void) //=========================================================================== // Std_Test5 //=========================================================================== -DEF_STD_CMD_A(FCCmdTest5); +DEF_STD_CMD_A(FCCmdTest5) FCCmdTest5::FCCmdTest5() : Command("Std_Test5") @@ -257,7 +257,7 @@ bool FCCmdTest5::isActive(void) //=========================================================================== // Std_Test6 //=========================================================================== -DEF_STD_CMD_A(FCCmdTest6); +DEF_STD_CMD_A(FCCmdTest6) FCCmdTest6::FCCmdTest6() : Command("Std_Test6") @@ -285,7 +285,7 @@ bool FCCmdTest6::isActive(void) //=========================================================================== // Std_TestProgress1 //=========================================================================== -DEF_STD_CMD_A(CmdTestProgress1); +DEF_STD_CMD_A(CmdTestProgress1) CmdTestProgress1::CmdTestProgress1() : Command("Std_TestProgress1") @@ -327,7 +327,7 @@ bool CmdTestProgress1::isActive(void) //=========================================================================== // Std_TestProgress2 //=========================================================================== -DEF_STD_CMD_A(CmdTestProgress2); +DEF_STD_CMD_A(CmdTestProgress2) CmdTestProgress2::CmdTestProgress2() : Command("Std_TestProgress2") @@ -370,7 +370,7 @@ bool CmdTestProgress2::isActive(void) //=========================================================================== // Std_TestProgress3 //=========================================================================== -DEF_STD_CMD_A(CmdTestProgress3); +DEF_STD_CMD_A(CmdTestProgress3) CmdTestProgress3::CmdTestProgress3() : Command("Std_TestProgress3") @@ -440,7 +440,7 @@ bool CmdTestProgress3::isActive(void) //=========================================================================== // Std_TestProgress4 //=========================================================================== -DEF_STD_CMD_A(CmdTestProgress4); +DEF_STD_CMD_A(CmdTestProgress4) CmdTestProgress4::CmdTestProgress4() : Command("Std_TestProgress4") @@ -495,7 +495,7 @@ bool CmdTestProgress4::isActive(void) //=========================================================================== // Std_TestProgress5 //=========================================================================== -DEF_STD_CMD_A(CmdTestProgress5); +DEF_STD_CMD_A(CmdTestProgress5) CmdTestProgress5::CmdTestProgress5() : Command("Std_TestProgress5") @@ -575,7 +575,7 @@ bool CmdTestProgress5::isActive(void) //=========================================================================== // Std_MDITest //=========================================================================== -DEF_STD_CMD_A(CmdTestMDI1); +DEF_STD_CMD_A(CmdTestMDI1) CmdTestMDI1::CmdTestMDI1() : Command("Std_MDITest1") @@ -599,7 +599,7 @@ bool CmdTestMDI1::isActive(void) return getMainWindow()->activeWindow(); } -DEF_STD_CMD_A(CmdTestMDI2); +DEF_STD_CMD_A(CmdTestMDI2) CmdTestMDI2::CmdTestMDI2() : Command("Std_MDITest2") @@ -627,7 +627,7 @@ bool CmdTestMDI2::isActive(void) return getMainWindow()->activeWindow(); } -DEF_STD_CMD_A(CmdTestMDI3); +DEF_STD_CMD_A(CmdTestMDI3) CmdTestMDI3::CmdTestMDI3() : Command("Std_MDITest3") @@ -655,7 +655,7 @@ bool CmdTestMDI3::isActive(void) return getMainWindow()->activeWindow(); } -DEF_STD_CMD(CmdTestConsoleOutput); +DEF_STD_CMD(CmdTestConsoleOutput) CmdTestConsoleOutput::CmdTestConsoleOutput() : Command("Std_TestConsoleOutput") diff --git a/src/Gui/CommandView.cpp b/src/Gui/CommandView.cpp index 57179a3b5d91..0441a8ef26c8 100644 --- a/src/Gui/CommandView.cpp +++ b/src/Gui/CommandView.cpp @@ -3078,7 +3078,7 @@ void CmdViewMeasureToggleAll::activated(int iMsg) // Std_SelBack //=========================================================================== -DEF_STD_CMD_A(StdCmdSelBack); +DEF_STD_CMD_A(StdCmdSelBack) StdCmdSelBack::StdCmdSelBack() :Command("Std_SelBack") @@ -3108,7 +3108,7 @@ bool StdCmdSelBack::isActive(void) // Std_SelForward //=========================================================================== -DEF_STD_CMD_A(StdCmdSelForward); +DEF_STD_CMD_A(StdCmdSelForward) StdCmdSelForward::StdCmdSelForward() :Command("Std_SelForward") diff --git a/src/Gui/CommandWindow.cpp b/src/Gui/CommandWindow.cpp index 232cc92e2623..c52e8e8b3f38 100644 --- a/src/Gui/CommandWindow.cpp +++ b/src/Gui/CommandWindow.cpp @@ -45,7 +45,7 @@ using namespace Gui; //=========================================================================== // Std_ArrangeIcons //=========================================================================== -DEF_STD_CMD_A(StdCmdArrangeIcons); +DEF_STD_CMD_A(StdCmdArrangeIcons) StdCmdArrangeIcons::StdCmdArrangeIcons() : Command("Std_ArrangeIcons") @@ -72,7 +72,7 @@ bool StdCmdArrangeIcons::isActive(void) //=========================================================================== // Std_TileWindows //=========================================================================== -DEF_STD_CMD_A(StdCmdTileWindows); +DEF_STD_CMD_A(StdCmdTileWindows) StdCmdTileWindows::StdCmdTileWindows() : Command("Std_TileWindows") @@ -100,7 +100,7 @@ bool StdCmdTileWindows::isActive(void) //=========================================================================== // Std_CascadeWindows //=========================================================================== -DEF_STD_CMD_A(StdCmdCascadeWindows); +DEF_STD_CMD_A(StdCmdCascadeWindows) StdCmdCascadeWindows::StdCmdCascadeWindows() : Command("Std_CascadeWindows") @@ -128,7 +128,7 @@ bool StdCmdCascadeWindows::isActive(void) //=========================================================================== // Std_CloseActiveWindow //=========================================================================== -DEF_STD_CMD_A(StdCmdCloseActiveWindow); +DEF_STD_CMD_A(StdCmdCloseActiveWindow) StdCmdCloseActiveWindow::StdCmdCloseActiveWindow() : Command("Std_CloseActiveWindow") @@ -159,7 +159,7 @@ bool StdCmdCloseActiveWindow::isActive(void) //=========================================================================== // Std_CloseAllWindows //=========================================================================== -DEF_STD_CMD_A(StdCmdCloseAllWindows); +DEF_STD_CMD_A(StdCmdCloseAllWindows) StdCmdCloseAllWindows::StdCmdCloseAllWindows() : Command("Std_CloseAllWindows") @@ -186,7 +186,7 @@ bool StdCmdCloseAllWindows::isActive(void) //=========================================================================== // Std_ActivateNextWindow //=========================================================================== -DEF_STD_CMD_A(StdCmdActivateNextWindow); +DEF_STD_CMD_A(StdCmdActivateNextWindow) StdCmdActivateNextWindow::StdCmdActivateNextWindow() : Command("Std_ActivateNextWindow") @@ -215,7 +215,7 @@ bool StdCmdActivateNextWindow::isActive(void) //=========================================================================== // Std_ActivatePrevWindow //=========================================================================== -DEF_STD_CMD_A(StdCmdActivatePrevWindow); +DEF_STD_CMD_A(StdCmdActivatePrevWindow) StdCmdActivatePrevWindow::StdCmdActivatePrevWindow() : Command("Std_ActivatePrevWindow") @@ -244,7 +244,7 @@ bool StdCmdActivatePrevWindow::isActive(void) //=========================================================================== // Std_Windows //=========================================================================== -DEF_STD_CMD(StdCmdWindows); +DEF_STD_CMD(StdCmdWindows) StdCmdWindows::StdCmdWindows() : Command("Std_Windows") @@ -268,7 +268,7 @@ void StdCmdWindows::activated(int iMsg) //=========================================================================== // Std_UserInterface //=========================================================================== -DEF_STD_CMD(StdCmdUserInterface); +DEF_STD_CMD(StdCmdUserInterface) StdCmdUserInterface::StdCmdUserInterface() : Command("Std_UserInterface") @@ -290,7 +290,7 @@ void StdCmdUserInterface::activated(int) // Std_DockWindowMenu //=========================================================================== -DEF_STD_CMD_AC(StdCmdDockViewMenu); +DEF_STD_CMD_AC(StdCmdDockViewMenu) StdCmdDockViewMenu::StdCmdDockViewMenu() : Command("Std_DockViewMenu") @@ -326,7 +326,7 @@ Action * StdCmdDockViewMenu::createAction(void) // Std_ToolBarMenu //=========================================================================== -DEF_STD_CMD_AC(StdCmdToolBarMenu); +DEF_STD_CMD_AC(StdCmdToolBarMenu) StdCmdToolBarMenu::StdCmdToolBarMenu() : Command("Std_ToolBarMenu") @@ -362,7 +362,7 @@ Action * StdCmdToolBarMenu::createAction(void) // Std_ViewStatusBar //=========================================================================== -DEF_STD_CMD_AC(StdCmdStatusBar); +DEF_STD_CMD_AC(StdCmdStatusBar) StdCmdStatusBar::StdCmdStatusBar() : Command("Std_ViewStatusBar") @@ -406,7 +406,7 @@ bool StdCmdStatusBar::isActive() // Std_WindowsMenu //=========================================================================== -DEF_STD_CMD_AC(StdCmdWindowsMenu ); +DEF_STD_CMD_AC(StdCmdWindowsMenu) StdCmdWindowsMenu::StdCmdWindowsMenu() : Command("Std_WindowsMenu") diff --git a/src/Gui/DlgKeyboardImp.h b/src/Gui/DlgKeyboardImp.h index 94faa00e2e47..4c7b41a6bd0b 100644 --- a/src/Gui/DlgKeyboardImp.h +++ b/src/Gui/DlgKeyboardImp.h @@ -39,7 +39,7 @@ namespace Dialog { */ class DlgCustomKeyboardImp : public CustomizeActionPage, public Ui_DlgCustomKeyboard { - Q_OBJECT; + Q_OBJECT public: DlgCustomKeyboardImp( QWidget* parent = 0 ); diff --git a/src/Gui/DlgObjectSelection.cpp b/src/Gui/DlgObjectSelection.cpp index 0e53c64809d2..e8ada443da0d 100644 --- a/src/Gui/DlgObjectSelection.cpp +++ b/src/Gui/DlgObjectSelection.cpp @@ -33,7 +33,7 @@ #include "ViewProviderDocumentObject.h" #include "ui_DlgObjectSelection.h" -FC_LOG_LEVEL_INIT("Gui",true,true); +FC_LOG_LEVEL_INIT("Gui",true,true) using namespace Gui; diff --git a/src/Gui/DocumentModel.cpp b/src/Gui/DocumentModel.cpp index 4ec20c140334..15bd9f412098 100644 --- a/src/Gui/DocumentModel.cpp +++ b/src/Gui/DocumentModel.cpp @@ -337,10 +337,10 @@ namespace Gui { // ------------------------------------------------------------------------ - TYPESYSTEM_SOURCE_ABSTRACT(Gui::DocumentModelIndex, Base::BaseClass); - TYPESYSTEM_SOURCE_ABSTRACT(Gui::ApplicationIndex,Gui::DocumentModelIndex); - TYPESYSTEM_SOURCE_ABSTRACT(Gui::DocumentIndex, Gui::DocumentModelIndex); - TYPESYSTEM_SOURCE_ABSTRACT(Gui::ViewProviderIndex, Gui::DocumentModelIndex); + TYPESYSTEM_SOURCE_ABSTRACT(Gui::DocumentModelIndex, Base::BaseClass) + TYPESYSTEM_SOURCE_ABSTRACT(Gui::ApplicationIndex,Gui::DocumentModelIndex) + TYPESYSTEM_SOURCE_ABSTRACT(Gui::DocumentIndex, Gui::DocumentModelIndex) + TYPESYSTEM_SOURCE_ABSTRACT(Gui::ViewProviderIndex, Gui::DocumentModelIndex) struct DocumentModelP { diff --git a/src/Gui/DocumentRecovery.cpp b/src/Gui/DocumentRecovery.cpp index a3ae1431f4c7..ecfa12f245b3 100644 --- a/src/Gui/DocumentRecovery.cpp +++ b/src/Gui/DocumentRecovery.cpp @@ -64,7 +64,7 @@ #include #include -FC_LOG_LEVEL_INIT("Gui",true,true); +FC_LOG_LEVEL_INIT("Gui",true,true) using namespace Gui; using namespace Gui::Dialog; diff --git a/src/Gui/ExpressionCompleter.cpp b/src/Gui/ExpressionCompleter.cpp index a0fbd9ea1fde..ba0267bce921 100644 --- a/src/Gui/ExpressionCompleter.cpp +++ b/src/Gui/ExpressionCompleter.cpp @@ -21,9 +21,9 @@ #include #include -FC_LOG_LEVEL_INIT("Completer",true,true); +FC_LOG_LEVEL_INIT("Completer",true,true) -Q_DECLARE_METATYPE(App::ObjectIdentifier); +Q_DECLARE_METATYPE(App::ObjectIdentifier) using namespace App; using namespace Gui; diff --git a/src/Gui/Flag.cpp b/src/Gui/Flag.cpp index 52a9a761416f..51e5c10cd18b 100644 --- a/src/Gui/Flag.cpp +++ b/src/Gui/Flag.cpp @@ -347,7 +347,7 @@ QSize FlagLayout::calculateSize(SizeType sizeType) const } -TYPESYSTEM_SOURCE_ABSTRACT(Gui::GLFlagWindow, Gui::GLGraphicsItem); +TYPESYSTEM_SOURCE_ABSTRACT(Gui::GLFlagWindow, Gui::GLGraphicsItem) GLFlagWindow::GLFlagWindow(View3DInventorViewer* view) : _viewer(view), _flagLayout(0) { diff --git a/src/Gui/GLPainter.cpp b/src/Gui/GLPainter.cpp index d3974da7d0f5..20fda13bcdaa 100644 --- a/src/Gui/GLPainter.cpp +++ b/src/Gui/GLPainter.cpp @@ -32,7 +32,7 @@ using namespace Gui; -TYPESYSTEM_SOURCE_ABSTRACT(Gui::GLGraphicsItem, Base::BaseClass); +TYPESYSTEM_SOURCE_ABSTRACT(Gui::GLGraphicsItem, Base::BaseClass) GLPainter::GLPainter() : viewer(0) diff --git a/src/Gui/GestureNavigationStyle.cpp b/src/Gui/GestureNavigationStyle.cpp index 16b3663eaa96..21aa7faec29e 100644 --- a/src/Gui/GestureNavigationStyle.cpp +++ b/src/Gui/GestureNavigationStyle.cpp @@ -838,7 +838,7 @@ class NS::InteractState : public sc::state /* TRANSLATOR Gui::GestureNavigationStyle */ -TYPESYSTEM_SOURCE(Gui::GestureNavigationStyle, Gui::UserNavigationStyle); +TYPESYSTEM_SOURCE(Gui::GestureNavigationStyle, Gui::UserNavigationStyle) GestureNavigationStyle::GestureNavigationStyle() diff --git a/src/Gui/Inventor/SmSwitchboard.cpp b/src/Gui/Inventor/SmSwitchboard.cpp index b70666c38ec2..de687bf0f59d 100644 --- a/src/Gui/Inventor/SmSwitchboard.cpp +++ b/src/Gui/Inventor/SmSwitchboard.cpp @@ -84,7 +84,7 @@ SmSwitchboard::initClass(void) SO_NODE_INIT_CLASS(SmSwitchboard, SoGroup, SoGroup); } -SO_NODE_SOURCE(SmSwitchboard); +SO_NODE_SOURCE(SmSwitchboard) /*! Default constructor. diff --git a/src/Gui/Inventor/SoAutoZoomTranslation.cpp b/src/Gui/Inventor/SoAutoZoomTranslation.cpp index 22b8ce8502c2..f48538979d88 100644 --- a/src/Gui/Inventor/SoAutoZoomTranslation.cpp +++ b/src/Gui/Inventor/SoAutoZoomTranslation.cpp @@ -47,7 +47,7 @@ using namespace Gui; // ------------------------------------------------------ -SO_NODE_SOURCE(SoAutoZoomTranslation); +SO_NODE_SOURCE(SoAutoZoomTranslation) void SoAutoZoomTranslation::initClass() { diff --git a/src/Gui/Inventor/SoDrawingGrid.cpp b/src/Gui/Inventor/SoDrawingGrid.cpp index a687f4b5459e..1504c28f8964 100644 --- a/src/Gui/Inventor/SoDrawingGrid.cpp +++ b/src/Gui/Inventor/SoDrawingGrid.cpp @@ -46,7 +46,7 @@ grid=coin.SoType.fromName("SoDrawingGrid").createInstance() Gui.ActiveDocument.ActiveView.getSceneGraph().addChild(grid) */ -SO_NODE_SOURCE(SoDrawingGrid); +SO_NODE_SOURCE(SoDrawingGrid) void SoDrawingGrid::initClass() diff --git a/src/Gui/InventorNavigationStyle.cpp b/src/Gui/InventorNavigationStyle.cpp index fbe46ea0f154..b0ad78ab6022 100644 --- a/src/Gui/InventorNavigationStyle.cpp +++ b/src/Gui/InventorNavigationStyle.cpp @@ -51,7 +51,7 @@ using namespace Gui; /* TRANSLATOR Gui::InventorNavigationStyle */ -TYPESYSTEM_SOURCE(Gui::InventorNavigationStyle, Gui::UserNavigationStyle); +TYPESYSTEM_SOURCE(Gui::InventorNavigationStyle, Gui::UserNavigationStyle) InventorNavigationStyle::InventorNavigationStyle() { diff --git a/src/Gui/MainWindow.cpp b/src/Gui/MainWindow.cpp index d4f67e5bee0e..c6bdd4a8e4ec 100644 --- a/src/Gui/MainWindow.cpp +++ b/src/Gui/MainWindow.cpp @@ -117,7 +117,7 @@ #include "View3DInventorViewer.h" #include "DlgObjectSelection.h" -FC_LOG_LEVEL_INIT("MainWindow",false,true,true); +FC_LOG_LEVEL_INIT("MainWindow",false,true,true) #if defined(Q_OS_WIN32) #define slots diff --git a/src/Gui/MayaGestureNavigationStyle.cpp b/src/Gui/MayaGestureNavigationStyle.cpp index 8e6fc2c2d669..9ec8a73e013e 100644 --- a/src/Gui/MayaGestureNavigationStyle.cpp +++ b/src/Gui/MayaGestureNavigationStyle.cpp @@ -87,7 +87,7 @@ using namespace Gui; /* TRANSLATOR Gui::MayaGestureNavigationStyle */ -TYPESYSTEM_SOURCE(Gui::MayaGestureNavigationStyle, Gui::UserNavigationStyle); +TYPESYSTEM_SOURCE(Gui::MayaGestureNavigationStyle, Gui::UserNavigationStyle) MayaGestureNavigationStyle::MayaGestureNavigationStyle() { diff --git a/src/Gui/NavigationStyle.cpp b/src/Gui/NavigationStyle.cpp index e6128de03b08..259147be8626 100644 --- a/src/Gui/NavigationStyle.cpp +++ b/src/Gui/NavigationStyle.cpp @@ -173,7 +173,7 @@ const Base::Type& NavigationStyleEvent::style() const #define PRIVATE(ptr) (ptr->pimpl) #define PUBLIC(ptr) (ptr->pub) -TYPESYSTEM_SOURCE_ABSTRACT(Gui::NavigationStyle,Base::BaseClass); +TYPESYSTEM_SOURCE_ABSTRACT(Gui::NavigationStyle,Base::BaseClass) NavigationStyle::NavigationStyle() : viewer(0), mouseSelection(0) { @@ -1625,7 +1625,7 @@ void NavigationStyle::openPopupMenu(const SbVec2s& position) // ---------------------------------------------------------------------------------- -TYPESYSTEM_SOURCE_ABSTRACT(Gui::UserNavigationStyle,Gui::NavigationStyle); +TYPESYSTEM_SOURCE_ABSTRACT(Gui::UserNavigationStyle,Gui::NavigationStyle) std::string UserNavigationStyle::userFriendlyName() const { diff --git a/src/Gui/OpenCascadeNavigationStyle.cpp b/src/Gui/OpenCascadeNavigationStyle.cpp index e18aa724e4f0..1c33be20c36f 100644 --- a/src/Gui/OpenCascadeNavigationStyle.cpp +++ b/src/Gui/OpenCascadeNavigationStyle.cpp @@ -51,7 +51,7 @@ using namespace Gui; /* TRANSLATOR Gui::OpenCascadeNavigationStyle */ -TYPESYSTEM_SOURCE(Gui::OpenCascadeNavigationStyle, Gui::UserNavigationStyle); +TYPESYSTEM_SOURCE(Gui::OpenCascadeNavigationStyle, Gui::UserNavigationStyle) OpenCascadeNavigationStyle::OpenCascadeNavigationStyle() { diff --git a/src/Gui/Quarter/Quarter.h b/src/Gui/Quarter/Quarter.h index 53a1548a15f3..1853b5118eef 100644 --- a/src/Gui/Quarter/Quarter.h +++ b/src/Gui/Quarter/Quarter.h @@ -41,7 +41,7 @@ namespace Quarter { void QUARTER_DLL_API init(bool initCoin = true); void QUARTER_DLL_API clean(void); void QUARTER_DLL_API setTimerEpsilon(double sec); -}; +} }}} // namespace diff --git a/src/Gui/Quarter/QuarterP.h b/src/Gui/Quarter/QuarterP.h index 493dd45e6cc5..c655017ffdf7 100644 --- a/src/Gui/Quarter/QuarterP.h +++ b/src/Gui/Quarter/QuarterP.h @@ -24,7 +24,7 @@ class QuarterP { bool initCoin; }; -}}}; +}}} #define QUARTER_MAJOR_VERSION 1 #define QUARTER_MINOR_VERSION 0 diff --git a/src/Gui/RevitNavigationStyle.cpp b/src/Gui/RevitNavigationStyle.cpp index 31778e4c89a7..127a4b63758e 100644 --- a/src/Gui/RevitNavigationStyle.cpp +++ b/src/Gui/RevitNavigationStyle.cpp @@ -51,7 +51,7 @@ using namespace Gui; /* TRANSLATOR Gui::RevitNavigationStyle */ -TYPESYSTEM_SOURCE(Gui::RevitNavigationStyle, Gui::UserNavigationStyle); +TYPESYSTEM_SOURCE(Gui::RevitNavigationStyle, Gui::UserNavigationStyle) RevitNavigationStyle::RevitNavigationStyle() : lockButton1(false) { diff --git a/src/Gui/SoAxisCrossKit.cpp b/src/Gui/SoAxisCrossKit.cpp index 0506214d8784..37eec7da333f 100644 --- a/src/Gui/SoAxisCrossKit.cpp +++ b/src/Gui/SoAxisCrossKit.cpp @@ -24,19 +24,19 @@ #include "PreCompiled.h" #ifndef _PreComp_ -# ifdef FC_OS_WIN32 -# include -# endif -# ifdef FC_OS_MACOSX -# include -# else -# include -# endif +# ifdef FC_OS_WIN32 +# include +# endif +# ifdef FC_OS_MACOSX +# include +# else +# include +# endif # include # include -# include -# include -# include +# include +# include +# include # include # include # include @@ -60,7 +60,7 @@ using namespace Gui; -SO_KIT_SOURCE(SoShapeScale); +SO_KIT_SOURCE(SoShapeScale) // Constructor. SoShapeScale::SoShapeScale(void) @@ -116,7 +116,7 @@ SoShapeScale::GLRender(SoGLRenderAction * action) // -------------------------------------------------------------- -SO_KIT_SOURCE(SoAxisCrossKit); +SO_KIT_SOURCE(SoAxisCrossKit) void SoAxisCrossKit::initClass() @@ -213,15 +213,15 @@ SoAxisCrossKit::createAxes() set("zHead.transform", "rotation 1 0 0 1.5707999"); // Set colors & styles - set("xAxis.appearance.lightModel", "model BASE_COLOR"); - set("xHead.appearance.lightModel", "model BASE_COLOR"); - set("yAxis.appearance.lightModel", "model BASE_COLOR"); - set("yHead.appearance.lightModel", "model BASE_COLOR"); - set("zAxis.appearance.lightModel", "model BASE_COLOR"); - set("zHead.appearance.lightModel", "model BASE_COLOR"); - set("xAxis.appearance.drawStyle", "lineWidth 1"); - set("yAxis.appearance.drawStyle", "lineWidth 1"); - set("zAxis.appearance.drawStyle", "lineWidth 1"); + set("xAxis.appearance.lightModel", "model BASE_COLOR"); + set("xHead.appearance.lightModel", "model BASE_COLOR"); + set("yAxis.appearance.lightModel", "model BASE_COLOR"); + set("yHead.appearance.lightModel", "model BASE_COLOR"); + set("zAxis.appearance.lightModel", "model BASE_COLOR"); + set("zHead.appearance.lightModel", "model BASE_COLOR"); + set("xAxis.appearance.drawStyle", "lineWidth 1"); + set("yAxis.appearance.drawStyle", "lineWidth 1"); + set("zAxis.appearance.drawStyle", "lineWidth 1"); set("xAxis.appearance.material", "diffuseColor 0.5 0.125 0.125"); set("xHead.appearance.material", "diffuseColor 0.5 0.125 0.125"); set("yAxis.appearance.material", "diffuseColor 0.125 0.5 0.125"); @@ -239,127 +239,127 @@ SoAxisCrossKit::createAxes() } // -------------------------------------------------------------- - -SO_NODE_SOURCE(SoRegPoint); - -void SoRegPoint::initClass() -{ - SO_NODE_INIT_CLASS(SoRegPoint, SoShape, "Shape"); -} - -SoRegPoint::SoRegPoint() -{ - SO_NODE_CONSTRUCTOR(SoRegPoint); - - SO_NODE_ADD_FIELD(base, (SbVec3f(0,0,0))); - SO_NODE_ADD_FIELD(normal, (SbVec3f(1,1,1))); - SO_NODE_ADD_FIELD(length, (3.0)); - SO_NODE_ADD_FIELD(color, (1.0f, 0.447059f, 0.337255f)); - SO_NODE_ADD_FIELD(text, ("")); - - root = new SoSeparator(); - root->ref(); - - // translation - SoTranslation* move = new SoTranslation(); - move->translation.setValue(base.getValue() + normal.getValue() * length.getValue()); - root->addChild(move); - - // sub-group - SoBaseColor* col = new SoBaseColor(); - col->rgb.setValue(this->color.getValue()); - - SoFontStyle* font = new SoFontStyle; - font->size = 14; - - SoSeparator* sub = new SoSeparator(); - sub->addChild(col); - sub->addChild(font); - sub->addChild(new SoText2()); - root->addChild(sub); -} - -SoRegPoint::~SoRegPoint() -{ - root->unref(); -} - -/** - * Renders the probe with text label and a bullet at the base point. - */ -void SoRegPoint::GLRender(SoGLRenderAction *action) -{ - if (shouldGLRender(action)) - { - SoState* state = action->getState(); - state->push(); - SoMaterialBundle mb(action); + +SO_NODE_SOURCE(SoRegPoint) + +void SoRegPoint::initClass() +{ + SO_NODE_INIT_CLASS(SoRegPoint, SoShape, "Shape"); +} + +SoRegPoint::SoRegPoint() +{ + SO_NODE_CONSTRUCTOR(SoRegPoint); + + SO_NODE_ADD_FIELD(base, (SbVec3f(0,0,0))); + SO_NODE_ADD_FIELD(normal, (SbVec3f(1,1,1))); + SO_NODE_ADD_FIELD(length, (3.0)); + SO_NODE_ADD_FIELD(color, (1.0f, 0.447059f, 0.337255f)); + SO_NODE_ADD_FIELD(text, ("")); + + root = new SoSeparator(); + root->ref(); + + // translation + SoTranslation* move = new SoTranslation(); + move->translation.setValue(base.getValue() + normal.getValue() * length.getValue()); + root->addChild(move); + + // sub-group + SoBaseColor* col = new SoBaseColor(); + col->rgb.setValue(this->color.getValue()); + + SoFontStyle* font = new SoFontStyle; + font->size = 14; + + SoSeparator* sub = new SoSeparator(); + sub->addChild(col); + sub->addChild(font); + sub->addChild(new SoText2()); + root->addChild(sub); +} + +SoRegPoint::~SoRegPoint() +{ + root->unref(); +} + +/** + * Renders the probe with text label and a bullet at the base point. + */ +void SoRegPoint::GLRender(SoGLRenderAction *action) +{ + if (shouldGLRender(action)) + { + SoState* state = action->getState(); + state->push(); + SoMaterialBundle mb(action); SoTextureCoordinateBundle tb(action, true, false); - SoLazyElement::setLightModel(state, SoLazyElement::BASE_COLOR); - mb.sendFirst(); // make sure we have the correct material - - SbVec3f p1 = base.getValue(); - SbVec3f p2 = p1 + normal.getValue() * length.getValue(); - - glLineWidth(1.0f); - glColor3fv(color.getValue().getValue()); - glBegin(GL_LINE_STRIP); - glVertex3d(p1[0], p1[1], p1[2]); - glVertex3d(p2[0], p2[1], p2[2]); - glEnd(); - glPointSize(5.0f); - glBegin(GL_POINTS); - glVertex3fv(p1.getValue()); - glEnd(); - glPointSize(2.0f); - glBegin(GL_POINTS); - glVertex3fv(p2.getValue()); - glEnd(); - - root->GLRender(action); - state->pop(); - } -} - -void SoRegPoint::generatePrimitives(SoAction* /*action*/) -{ -} - -/** - * Sets the bounding box of the probe to \a box and its center to \a center. - */ -void SoRegPoint::computeBBox(SoAction *action, SbBox3f &box, SbVec3f ¢er) -{ - root->doAction(action); - if (action->getTypeId().isDerivedFrom(SoGetBoundingBoxAction::getClassTypeId())) - static_cast(action)->resetCenter(); - - SbVec3f p1 = base.getValue(); - SbVec3f p2 = p1 + normal.getValue() * length.getValue(); - - box.extendBy(p1); - box.extendBy(p2); - - center = box.getCenter(); -} - -void SoRegPoint::notify(SoNotList * node) -{ - SoField * f = node->getLastField(); - if (f == &this->base || f == &this->normal || f == &this->length) { - SoTranslation* move = static_cast(root->getChild(0)); - move->translation.setValue(base.getValue() + normal.getValue() * length.getValue()); - } - else if (f == &this->color) { - SoSeparator* sub = static_cast(root->getChild(1)); - SoBaseColor* col = static_cast(sub->getChild(0)); - col->rgb = this->color.getValue(); - } - else if (f == &this->text) { - SoSeparator* sub = static_cast(root->getChild(1)); - SoText2* label = static_cast(sub->getChild(2)); - label->string = this->text.getValue(); - } - - SoShape::notify(node); -} + SoLazyElement::setLightModel(state, SoLazyElement::BASE_COLOR); + mb.sendFirst(); // make sure we have the correct material + + SbVec3f p1 = base.getValue(); + SbVec3f p2 = p1 + normal.getValue() * length.getValue(); + + glLineWidth(1.0f); + glColor3fv(color.getValue().getValue()); + glBegin(GL_LINE_STRIP); + glVertex3d(p1[0], p1[1], p1[2]); + glVertex3d(p2[0], p2[1], p2[2]); + glEnd(); + glPointSize(5.0f); + glBegin(GL_POINTS); + glVertex3fv(p1.getValue()); + glEnd(); + glPointSize(2.0f); + glBegin(GL_POINTS); + glVertex3fv(p2.getValue()); + glEnd(); + + root->GLRender(action); + state->pop(); + } +} + +void SoRegPoint::generatePrimitives(SoAction* /*action*/) +{ +} + +/** + * Sets the bounding box of the probe to \a box and its center to \a center. + */ +void SoRegPoint::computeBBox(SoAction *action, SbBox3f &box, SbVec3f ¢er) +{ + root->doAction(action); + if (action->getTypeId().isDerivedFrom(SoGetBoundingBoxAction::getClassTypeId())) + static_cast(action)->resetCenter(); + + SbVec3f p1 = base.getValue(); + SbVec3f p2 = p1 + normal.getValue() * length.getValue(); + + box.extendBy(p1); + box.extendBy(p2); + + center = box.getCenter(); +} + +void SoRegPoint::notify(SoNotList * node) +{ + SoField * f = node->getLastField(); + if (f == &this->base || f == &this->normal || f == &this->length) { + SoTranslation* move = static_cast(root->getChild(0)); + move->translation.setValue(base.getValue() + normal.getValue() * length.getValue()); + } + else if (f == &this->color) { + SoSeparator* sub = static_cast(root->getChild(1)); + SoBaseColor* col = static_cast(sub->getChild(0)); + col->rgb = this->color.getValue(); + } + else if (f == &this->text) { + SoSeparator* sub = static_cast(root->getChild(1)); + SoText2* label = static_cast(sub->getChild(2)); + label->string = this->text.getValue(); + } + + SoShape::notify(node); +} diff --git a/src/Gui/SoFCBackgroundGradient.cpp b/src/Gui/SoFCBackgroundGradient.cpp index d4e7beec2159..03d944a07c6b 100644 --- a/src/Gui/SoFCBackgroundGradient.cpp +++ b/src/Gui/SoFCBackgroundGradient.cpp @@ -27,7 +27,7 @@ using namespace Gui; -SO_NODE_SOURCE(SoFCBackgroundGradient); +SO_NODE_SOURCE(SoFCBackgroundGradient) void SoFCBackgroundGradient::finish() { @@ -60,44 +60,44 @@ void SoFCBackgroundGradient::initClass(void) void SoFCBackgroundGradient::GLRender (SoGLRenderAction * /*action*/) { - glMatrixMode(GL_PROJECTION); - glPushMatrix(); - glLoadIdentity(); - glOrtho(-1,1,-1,1,-1,1); - glMatrixMode(GL_MODELVIEW); - glPushMatrix(); - glLoadIdentity(); - glPushAttrib(GL_ENABLE_BIT); - glDisable(GL_DEPTH_TEST); - glDisable(GL_LIGHTING); - glDisable(GL_TEXTURE_2D); - - glBegin(GL_TRIANGLE_STRIP); - if (mCol[0] < 0) { - glColor3f(fCol[0],fCol[1],fCol[2]); glVertex2f(-1, 1); - glColor3f(tCol[0],tCol[1],tCol[2]); glVertex2f(-1,-1); - glColor3f(fCol[0],fCol[1],fCol[2]); glVertex2f( 1, 1); - glColor3f(tCol[0],tCol[1],tCol[2]); glVertex2f( 1,-1); - } - else { - glColor3f(fCol[0],fCol[1],fCol[2]); glVertex2f(-1, 1); - glColor3f(mCol[0],mCol[1],mCol[2]); glVertex2f(-1, 0); - glColor3f(fCol[0],fCol[1],fCol[2]); glVertex2f( 1, 1); - glColor3f(mCol[0],mCol[1],mCol[2]); glVertex2f( 1, 0); - glEnd(); - glBegin(GL_TRIANGLE_STRIP); - glColor3f(mCol[0],mCol[1],mCol[2]); glVertex2f(-1, 0); - glColor3f(tCol[0],tCol[1],tCol[2]); glVertex2f(-1,-1); - glColor3f(mCol[0],mCol[1],mCol[2]); glVertex2f( 1, 0); - glColor3f(tCol[0],tCol[1],tCol[2]); glVertex2f( 1,-1); - } - glEnd(); - - glPopAttrib(); - glPopMatrix(); // restore modelview - glMatrixMode(GL_PROJECTION); - glPopMatrix(); - glMatrixMode(GL_MODELVIEW); + glMatrixMode(GL_PROJECTION); + glPushMatrix(); + glLoadIdentity(); + glOrtho(-1,1,-1,1,-1,1); + glMatrixMode(GL_MODELVIEW); + glPushMatrix(); + glLoadIdentity(); + glPushAttrib(GL_ENABLE_BIT); + glDisable(GL_DEPTH_TEST); + glDisable(GL_LIGHTING); + glDisable(GL_TEXTURE_2D); + + glBegin(GL_TRIANGLE_STRIP); + if (mCol[0] < 0) { + glColor3f(fCol[0],fCol[1],fCol[2]); glVertex2f(-1, 1); + glColor3f(tCol[0],tCol[1],tCol[2]); glVertex2f(-1,-1); + glColor3f(fCol[0],fCol[1],fCol[2]); glVertex2f( 1, 1); + glColor3f(tCol[0],tCol[1],tCol[2]); glVertex2f( 1,-1); + } + else { + glColor3f(fCol[0],fCol[1],fCol[2]); glVertex2f(-1, 1); + glColor3f(mCol[0],mCol[1],mCol[2]); glVertex2f(-1, 0); + glColor3f(fCol[0],fCol[1],fCol[2]); glVertex2f( 1, 1); + glColor3f(mCol[0],mCol[1],mCol[2]); glVertex2f( 1, 0); + glEnd(); + glBegin(GL_TRIANGLE_STRIP); + glColor3f(mCol[0],mCol[1],mCol[2]); glVertex2f(-1, 0); + glColor3f(tCol[0],tCol[1],tCol[2]); glVertex2f(-1,-1); + glColor3f(mCol[0],mCol[1],mCol[2]); glVertex2f( 1, 0); + glColor3f(tCol[0],tCol[1],tCol[2]); glVertex2f( 1,-1); + } + glEnd(); + + glPopAttrib(); + glPopMatrix(); // restore modelview + glMatrixMode(GL_PROJECTION); + glPopMatrix(); + glMatrixMode(GL_MODELVIEW); } void SoFCBackgroundGradient::setColorGradient(const SbColor& fromColor, diff --git a/src/Gui/SoFCBoundingBox.cpp b/src/Gui/SoFCBoundingBox.cpp index f640ab3c5b9a..95a67c9c0e5d 100644 --- a/src/Gui/SoFCBoundingBox.cpp +++ b/src/Gui/SoFCBoundingBox.cpp @@ -43,7 +43,7 @@ using namespace Gui; -SO_NODE_SOURCE(SoFCBoundingBox); +SO_NODE_SOURCE(SoFCBoundingBox) // vertices used to create a box static const int32_t bBoxVerts[8][3] = @@ -235,7 +235,7 @@ void SoFCBoundingBox::finish() // --------------------------------------------------------------- -SO_NODE_SOURCE(SoSkipBoundingGroup); +SO_NODE_SOURCE(SoSkipBoundingGroup) /*! Constructor. diff --git a/src/Gui/SoFCColorBar.cpp b/src/Gui/SoFCColorBar.cpp index 82c4f55e371d..7145d1d9444a 100644 --- a/src/Gui/SoFCColorBar.cpp +++ b/src/Gui/SoFCColorBar.cpp @@ -37,7 +37,7 @@ using namespace Gui; -SO_NODE_ABSTRACT_SOURCE(SoFCColorBarBase); +SO_NODE_ABSTRACT_SOURCE(SoFCColorBarBase) /*! Constructor. @@ -99,7 +99,7 @@ class SoFCColorBarProxyObject : public QObject }; } -SO_NODE_SOURCE(SoFCColorBar); +SO_NODE_SOURCE(SoFCColorBar) /*! Constructor. diff --git a/src/Gui/SoFCColorGradient.cpp b/src/Gui/SoFCColorGradient.cpp index fc993ce0b4ce..05bbdd3c14cd 100644 --- a/src/Gui/SoFCColorGradient.cpp +++ b/src/Gui/SoFCColorGradient.cpp @@ -43,7 +43,7 @@ using namespace Gui; -SO_NODE_SOURCE(SoFCColorGradient); +SO_NODE_SOURCE(SoFCColorGradient) /*! Constructor. diff --git a/src/Gui/SoFCColorLegend.cpp b/src/Gui/SoFCColorLegend.cpp index 16a9118219d8..75ee3bb8f1a1 100644 --- a/src/Gui/SoFCColorLegend.cpp +++ b/src/Gui/SoFCColorLegend.cpp @@ -40,7 +40,7 @@ using namespace Gui; -SO_NODE_SOURCE(SoFCColorLegend); +SO_NODE_SOURCE(SoFCColorLegend) /*! Constructor. diff --git a/src/Gui/SoFCInteractiveElement.cpp b/src/Gui/SoFCInteractiveElement.cpp index 4b60fe1715a9..8b36147e8927 100644 --- a/src/Gui/SoFCInteractiveElement.cpp +++ b/src/Gui/SoFCInteractiveElement.cpp @@ -28,7 +28,7 @@ using namespace Gui; -SO_ELEMENT_SOURCE(SoFCInteractiveElement); +SO_ELEMENT_SOURCE(SoFCInteractiveElement) void SoFCInteractiveElement::initClass(void) { @@ -69,7 +69,7 @@ const SoFCInteractiveElement * SoFCInteractiveElement::getInstance(SoState * sta // --------------------------------- -SO_ELEMENT_SOURCE(SoGLWidgetElement); +SO_ELEMENT_SOURCE(SoGLWidgetElement) void SoGLWidgetElement::initClass(void) { @@ -124,7 +124,7 @@ SoElement * SoGLWidgetElement::copyMatchInfo(void) const // --------------------------------- -SO_ELEMENT_SOURCE(SoGLRenderActionElement); +SO_ELEMENT_SOURCE(SoGLRenderActionElement) void SoGLRenderActionElement::initClass(void) { @@ -179,7 +179,7 @@ SoElement * SoGLRenderActionElement::copyMatchInfo(void) const // --------------------------------- -SO_NODE_SOURCE(SoGLWidgetNode); +SO_NODE_SOURCE(SoGLWidgetNode) /*! Constructor. @@ -218,7 +218,7 @@ void SoGLWidgetNode::GLRender(SoGLRenderAction * action) // --------------------------------- -SO_ELEMENT_SOURCE(SoGLVBOActivatedElement); +SO_ELEMENT_SOURCE(SoGLVBOActivatedElement) void SoGLVBOActivatedElement::initClass(void) { diff --git a/src/Gui/SoFCSelection.cpp b/src/Gui/SoFCSelection.cpp index 58c15aa72881..7dc4c9f9fc77 100644 --- a/src/Gui/SoFCSelection.cpp +++ b/src/Gui/SoFCSelection.cpp @@ -76,7 +76,7 @@ SoFullPath * Gui::SoFCSelection::currenthighlight = NULL; // ************************************************************************* -SO_NODE_SOURCE(SoFCSelection); +SO_NODE_SOURCE(SoFCSelection) /*! Constructor. diff --git a/src/Gui/SoFCSelectionAction.cpp b/src/Gui/SoFCSelectionAction.cpp index 382195f9792c..6b702110a82d 100644 --- a/src/Gui/SoFCSelectionAction.cpp +++ b/src/Gui/SoFCSelectionAction.cpp @@ -95,7 +95,7 @@ using namespace Gui; -SO_ACTION_SOURCE(SoFCHighlightAction); +SO_ACTION_SOURCE(SoFCHighlightAction) /** * The order of the defined SO_ACTION_ADD_METHOD statements is very important. First the base @@ -181,7 +181,7 @@ void SoFCHighlightAction::callDoAction(SoAction *action,SoNode *node) // --------------------------------------------------------------- -SO_ACTION_SOURCE(SoFCSelectionAction); +SO_ACTION_SOURCE(SoFCSelectionAction) /** * The order of the defined SO_ACTION_ADD_METHOD statements is very important. First the base @@ -267,7 +267,7 @@ void SoFCSelectionAction::callDoAction(SoAction *action,SoNode *node) // --------------------------------------------------------------- -SO_ACTION_SOURCE(SoFCEnableSelectionAction); +SO_ACTION_SOURCE(SoFCEnableSelectionAction) /** * The order of the defined SO_ACTION_ADD_METHOD statements is very important. First the base @@ -349,7 +349,7 @@ void SoFCEnableSelectionAction::callDoAction(SoAction *action,SoNode *node) // --------------------------------------------------------------- -SO_ACTION_SOURCE(SoFCEnableHighlightAction); +SO_ACTION_SOURCE(SoFCEnableHighlightAction) /** * The order of the defined SO_ACTION_ADD_METHOD statements is very important. First the base @@ -431,7 +431,7 @@ void SoFCEnableHighlightAction::callDoAction(SoAction *action,SoNode *node) // --------------------------------------------------------------- -SO_ACTION_SOURCE(SoFCSelectionColorAction); +SO_ACTION_SOURCE(SoFCSelectionColorAction) /** * The order of the defined SO_ACTION_ADD_METHOD statements is very important. First the base @@ -513,7 +513,7 @@ void SoFCSelectionColorAction::callDoAction(SoAction *action,SoNode *node) // --------------------------------------------------------------- -SO_ACTION_SOURCE(SoFCHighlightColorAction); +SO_ACTION_SOURCE(SoFCHighlightColorAction) /** * The order of the defined SO_ACTION_ADD_METHOD statements is very important. First the base @@ -595,7 +595,7 @@ void SoFCHighlightColorAction::callDoAction(SoAction *action,SoNode *node) // --------------------------------------------------------------- -SO_ACTION_SOURCE(SoFCDocumentAction); +SO_ACTION_SOURCE(SoFCDocumentAction) /** * The order of the defined SO_ACTION_ADD_METHOD statements is very important. First the base @@ -678,7 +678,7 @@ void SoFCDocumentAction::callDoAction(SoAction *action,SoNode *node) // --------------------------------------------------------------- -SO_ACTION_SOURCE(SoFCDocumentObjectAction); +SO_ACTION_SOURCE(SoFCDocumentObjectAction) /** * The order of the defined SO_ACTION_ADD_METHOD statements is very important. First the base @@ -763,7 +763,7 @@ SbBool SoFCDocumentObjectAction::isHandled() const // --------------------------------------------------------------- -SO_ACTION_SOURCE(SoGLSelectAction); +SO_ACTION_SOURCE(SoGLSelectAction) /** * The order of the defined SO_ACTION_ADD_METHOD statements is very important. First the base @@ -839,7 +839,7 @@ SbBool SoGLSelectAction::isHandled() const // --------------------------------------------------------------- -SO_ACTION_SOURCE(SoVisibleFaceAction); +SO_ACTION_SOURCE(SoVisibleFaceAction) /** * The order of the defined SO_ACTION_ADD_METHOD statements is very important. First the base @@ -909,7 +909,7 @@ SbBool SoVisibleFaceAction::isHandled() const // --------------------------------------------------------------- -SO_ACTION_SOURCE(SoUpdateVBOAction); +SO_ACTION_SOURCE(SoUpdateVBOAction) /** * The order of the defined SO_ACTION_ADD_METHOD statements is very important. First the base @@ -1108,7 +1108,7 @@ SoBoxSelectionRenderActionP::updateBbox(const SoPath * path) this->localRoot->removeChild(0); } -SO_ACTION_SOURCE(SoBoxSelectionRenderAction); +SO_ACTION_SOURCE(SoBoxSelectionRenderAction) // Overridden from parent class. void diff --git a/src/Gui/SoFCUnifiedSelection.cpp b/src/Gui/SoFCUnifiedSelection.cpp index 2f81c4021ec3..575b84d2d592 100644 --- a/src/Gui/SoFCUnifiedSelection.cpp +++ b/src/Gui/SoFCUnifiedSelection.cpp @@ -95,7 +95,7 @@ #include "ViewProviderGeometryObject.h" #include "ViewParams.h" -FC_LOG_LEVEL_INIT("SoFCUnifiedSelection",false,true,true); +FC_LOG_LEVEL_INIT("SoFCUnifiedSelection",false,true,true) using namespace Gui; @@ -103,7 +103,7 @@ SoFullPath * Gui::SoFCUnifiedSelection::currenthighlight = NULL; // ************************************************************************* -SO_NODE_SOURCE(SoFCUnifiedSelection); +SO_NODE_SOURCE(SoFCUnifiedSelection) /*! Constructor. @@ -905,7 +905,7 @@ void SoFCUnifiedSelection::GLRenderBelowPath(SoGLRenderAction * action) // --------------------------------------------------------------- -SO_ACTION_SOURCE(SoHighlightElementAction); +SO_ACTION_SOURCE(SoHighlightElementAction) void SoHighlightElementAction::initClass() { @@ -974,7 +974,7 @@ const SoDetail* SoHighlightElementAction::getElement() const // --------------------------------------------------------------- -SO_ACTION_SOURCE(SoSelectionElementAction); +SO_ACTION_SOURCE(SoSelectionElementAction) void SoSelectionElementAction::initClass() { @@ -1041,7 +1041,7 @@ const SoDetail* SoSelectionElementAction::getElement() const // --------------------------------------------------------------- -SO_ACTION_SOURCE(SoVRMLAction); +SO_ACTION_SOURCE(SoVRMLAction) void SoVRMLAction::initClass() { @@ -1124,7 +1124,7 @@ bool SoFCSelectionRoot::StackComp::operator()(const Stack &a, const Stack &b) co } // --------------------------------------------------------------------------------- SoSeparator::CacheEnabled SoFCSeparator::CacheMode = SoSeparator::AUTO; -SO_NODE_SOURCE(SoFCSeparator); +SO_NODE_SOURCE(SoFCSeparator) SoFCSeparator::SoFCSeparator(bool trackCacheMode) :trackCacheMode(trackCacheMode) @@ -1159,7 +1159,7 @@ SoFCSelectionRoot::ColorStack SoFCSelectionRoot::SelColorStack; SoFCSelectionRoot::ColorStack SoFCSelectionRoot::HlColorStack; SoFCSelectionRoot* SoFCSelectionRoot::ShapeColorNode; -SO_NODE_SOURCE(SoFCSelectionRoot); +SO_NODE_SOURCE(SoFCSelectionRoot) SoFCSelectionRoot::SoFCSelectionRoot(bool trackCacheMode) :SoFCSeparator(trackCacheMode) @@ -1637,7 +1637,7 @@ int SoFCSelectionRoot::SelContext::merge(int status, SoFCSelectionContextBasePtr ///////////////////////////////////////////////////////////////////////////// -SO_NODE_SOURCE(SoFCPathAnnotation); +SO_NODE_SOURCE(SoFCPathAnnotation) SoFCPathAnnotation::SoFCPathAnnotation() { diff --git a/src/Gui/SoFCVectorizeSVGAction.cpp b/src/Gui/SoFCVectorizeSVGAction.cpp index ee6fc4859b30..490ccebf4011 100644 --- a/src/Gui/SoFCVectorizeSVGAction.cpp +++ b/src/Gui/SoFCVectorizeSVGAction.cpp @@ -370,7 +370,7 @@ void SoFCVectorizeSVGActionP::printImage(const SoVectorizeImage * item) const // ------------------------------------------------------- -SO_ACTION_SOURCE(SoFCVectorizeSVGAction); +SO_ACTION_SOURCE(SoFCVectorizeSVGAction) void SoFCVectorizeSVGAction::initClass(void) { diff --git a/src/Gui/SoFCVectorizeU3DAction.cpp b/src/Gui/SoFCVectorizeU3DAction.cpp index 6ca966708142..7dd04c5b182b 100644 --- a/src/Gui/SoFCVectorizeU3DAction.cpp +++ b/src/Gui/SoFCVectorizeU3DAction.cpp @@ -289,7 +289,7 @@ void SoFCVectorizeU3DActionP::printImage(const SoVectorizeImage * item) const // ------------------------------------------------------- -SO_ACTION_SOURCE(SoFCVectorizeU3DAction); +SO_ACTION_SOURCE(SoFCVectorizeU3DAction) void SoFCVectorizeU3DAction::initClass(void) { diff --git a/src/Gui/SoNavigationDragger.cpp b/src/Gui/SoNavigationDragger.cpp index 5d36a6dddc8f..9f4693ad5d3f 100644 --- a/src/Gui/SoNavigationDragger.cpp +++ b/src/Gui/SoNavigationDragger.cpp @@ -44,7 +44,7 @@ // describes the default geometry resources for this class. //#include "RotTransDraggerGeom.h" -SO_KIT_SOURCE(RotTransDragger); +SO_KIT_SOURCE(RotTransDragger) // Initializes the type ID for this dragger node. This diff --git a/src/Gui/SoTextLabel.cpp b/src/Gui/SoTextLabel.cpp index cd289cea78bd..ca562d19d2b7 100644 --- a/src/Gui/SoTextLabel.cpp +++ b/src/Gui/SoTextLabel.cpp @@ -94,7 +94,7 @@ App.ActiveDocument.addObject("App::InventorObject","iv").Buffer=s \endcode */ -SO_NODE_SOURCE(SoTextLabel); +SO_NODE_SOURCE(SoTextLabel) void SoTextLabel::initClass() { @@ -297,7 +297,7 @@ void SoTextLabel::GLRender(SoGLRenderAction *action) // ------------------------------------------------------ -SO_NODE_SOURCE(SoStringLabel); +SO_NODE_SOURCE(SoStringLabel) void SoStringLabel::initClass() { @@ -394,7 +394,7 @@ void SoStringLabel::GLRender(SoGLRenderAction *action) // ------------------------------------------------------ -SO_NODE_SOURCE(SoFrameLabel); +SO_NODE_SOURCE(SoFrameLabel) void SoFrameLabel::initClass() { @@ -569,7 +569,7 @@ void SoFrameLabel::GLRender(SoGLRenderAction *action) // ------------------------------------------------------ -SO_NODE_SOURCE(TranslateManip); +SO_NODE_SOURCE(TranslateManip) void TranslateManip::initClass() diff --git a/src/Gui/SplitView3DInventor.cpp b/src/Gui/SplitView3DInventor.cpp index 260b64d4f8ea..d5658172d930 100644 --- a/src/Gui/SplitView3DInventor.cpp +++ b/src/Gui/SplitView3DInventor.cpp @@ -42,7 +42,7 @@ using namespace Gui; -TYPESYSTEM_SOURCE_ABSTRACT(Gui::AbstractSplitView,Gui::MDIView); +TYPESYSTEM_SOURCE_ABSTRACT(Gui::AbstractSplitView,Gui::MDIView) AbstractSplitView::AbstractSplitView(Gui::Document* pcDocument, QWidget* parent, Qt::WindowFlags wflags) : MDIView(pcDocument,parent, wflags) @@ -699,7 +699,7 @@ Py::Object AbstractSplitViewPy::close(const Py::Tuple& args) // ------------------------------------------------------ -TYPESYSTEM_SOURCE_ABSTRACT(Gui::SplitView3DInventor, Gui::AbstractSplitView); +TYPESYSTEM_SOURCE_ABSTRACT(Gui::SplitView3DInventor, Gui::AbstractSplitView) SplitView3DInventor::SplitView3DInventor(int views, Gui::Document* pcDocument, QWidget* parent, Qt::WindowFlags wflags) : AbstractSplitView(pcDocument,parent, wflags) diff --git a/src/Gui/TouchpadNavigationStyle.cpp b/src/Gui/TouchpadNavigationStyle.cpp index d18fa06f84f2..20f2b35570ef 100644 --- a/src/Gui/TouchpadNavigationStyle.cpp +++ b/src/Gui/TouchpadNavigationStyle.cpp @@ -51,7 +51,7 @@ using namespace Gui; /* TRANSLATOR Gui::TouchpadNavigationStyle */ -TYPESYSTEM_SOURCE(Gui::TouchpadNavigationStyle, Gui::UserNavigationStyle); +TYPESYSTEM_SOURCE(Gui::TouchpadNavigationStyle, Gui::UserNavigationStyle) TouchpadNavigationStyle::TouchpadNavigationStyle() { diff --git a/src/Gui/Tree.cpp b/src/Gui/Tree.cpp index eeaa528ee2cf..d04d5e840a43 100644 --- a/src/Gui/Tree.cpp +++ b/src/Gui/Tree.cpp @@ -66,7 +66,7 @@ #include "Widgets.h" #include "ExpressionCompleter.h" -FC_LOG_LEVEL_INIT("Tree",false,true,true); +FC_LOG_LEVEL_INIT("Tree",false,true,true) #define _TREE_PRINT(_level,_func,_msg) \ _FC_PRINT(FC_LOG_INSTANCE,_level,_func, '['< #include -FC_LOG_LEVEL_INIT("ViewProviderPythonFeature",true,true); +FC_LOG_LEVEL_INIT("ViewProviderPythonFeature",true,true) using namespace Gui; diff --git a/src/Gui/propertyeditor/PropertyEditor.cpp b/src/Gui/propertyeditor/PropertyEditor.cpp index 98ce3ccdbe01..5ea7aa0b1ca3 100644 --- a/src/Gui/propertyeditor/PropertyEditor.cpp +++ b/src/Gui/propertyeditor/PropertyEditor.cpp @@ -45,7 +45,7 @@ #include "PropertyModel.h" #include "PropertyView.h" -FC_LOG_LEVEL_INIT("PropertyView",true,true); +FC_LOG_LEVEL_INIT("PropertyView",true,true) using namespace Gui::PropertyEditor; diff --git a/src/Gui/propertyeditor/PropertyItemDelegate.cpp b/src/Gui/propertyeditor/PropertyItemDelegate.cpp index 46af8cc37695..cbff438b4be2 100644 --- a/src/Gui/propertyeditor/PropertyItemDelegate.cpp +++ b/src/Gui/propertyeditor/PropertyItemDelegate.cpp @@ -38,7 +38,7 @@ #include "PropertyItem.h" #include "PropertyEditor.h" -FC_LOG_LEVEL_INIT("PropertyView",true,true); +FC_LOG_LEVEL_INIT("PropertyView",true,true) using namespace Gui::PropertyEditor;