diff --git a/src/App/Document.cpp b/src/App/Document.cpp index be68a1bf5..3080acac9 100644 --- a/src/App/Document.cpp +++ b/src/App/Document.cpp @@ -1967,7 +1967,8 @@ int Document::recompute() std::vector Document::topologicalSort() const { - // topological sort algorithm described here: https://de.wikipedia.org/wiki/Topologische_Sortierung#Algorithmus_f.C3.BCr_das_Topologische_Sortieren + // topological sort algorithm described here: + // https://de.wikipedia.org/wiki/Topologische_Sortierung#Algorithmus_f.C3.BCr_das_Topologische_Sortieren vector < App::DocumentObject* > ret; ret.reserve(d->objectArray.size()); map < App::DocumentObject*,int > countMap; @@ -2004,7 +2005,7 @@ int Document::recompute() { int objectCount = 0; // delete recompute log - for( auto LogEntry: _RecomputeLog) + for (auto LogEntry: _RecomputeLog) delete LogEntry; _RecomputeLog.clear(); @@ -2035,9 +2036,10 @@ int Document::recompute() } #ifdef FC_DEBUG // check if all objects are recalculated which were thouched - for (auto objectIt : d->objectArray) + for (auto objectIt : d->objectArray) { if (objectIt->isTouched()) cerr << "Document::recompute(): " << objectIt->getNameInDocument() << " still touched after recompute" << endl; + } #endif return objectCount; @@ -2692,11 +2694,12 @@ PyObject * Document::getPyObject(void) std::vector Document::getRootObjects() const { - std::vector < App::DocumentObject* > ret; + std::vector < App::DocumentObject* > ret; - for (auto objectIt : d->objectArray) - if (objectIt->getInList().size() == 0) - ret.push_back(objectIt); + for (auto objectIt : d->objectArray) { + if (objectIt->getInList().empty()) + ret.push_back(objectIt); + } - return ret; -} \ No newline at end of file + return ret; +} diff --git a/src/App/DocumentObject.cpp b/src/App/DocumentObject.cpp index 94525ac60..8584b00fa 100644 --- a/src/App/DocumentObject.cpp +++ b/src/App/DocumentObject.cpp @@ -341,7 +341,9 @@ bool DocumentObject::isInInList(DocumentObject *linkTo) const #endif } -bool DocumentObject::_isInOutListRecursive(const DocumentObject *act, const DocumentObject* test, const DocumentObject* checkObj, int depth) const +bool DocumentObject::_isInOutListRecursive(const DocumentObject *act, + const DocumentObject* test, + const DocumentObject* checkObj, int depth) const { #ifndef USE_OLD_DAG std::vector outList = act->getOutList(); diff --git a/src/App/DocumentObjectPyImp.cpp b/src/App/DocumentObjectPyImp.cpp index 10803d735..8bb44c0d0 100644 --- a/src/App/DocumentObjectPyImp.cpp +++ b/src/App/DocumentObjectPyImp.cpp @@ -210,14 +210,14 @@ Py::List DocumentObjectPy::getInList(void) const Py::List DocumentObjectPy::getInListRecursive(void) const { Py::List ret; - try{ - + try { std::vector list = getDocumentObjectPtr()->getInListRecursive(); for (std::vector::iterator It = list.begin(); It != list.end(); ++It) ret.append(Py::Object((*It)->getPyObject(), true)); - }catch (const Base::Exception& e) { + } + catch (const Base::Exception& e) { throw Py::IndexError(e.what()); } return ret; @@ -238,7 +238,6 @@ Py::List DocumentObjectPy::getOutListRecursive(void) const { Py::List ret; try { - std::vector list = getDocumentObjectPtr()->getOutListRecursive(); // creat the python list for the output diff --git a/src/App/PropertyLinks.cpp b/src/App/PropertyLinks.cpp index 216a6b7ea..a05c6d337 100644 --- a/src/App/PropertyLinks.cpp +++ b/src/App/PropertyLinks.cpp @@ -373,12 +373,12 @@ PropertyLinkSub::~PropertyLinkSub() // Base class implementer void PropertyLinkSub::setValue(App::DocumentObject * lValue, const std::vector &SubList) -{ +{ aboutToSetValue(); #ifndef USE_OLD_DAG - if(_pcLinkSub) + if (_pcLinkSub) _pcLinkSub->_removeBackLink(static_cast(getContainer())); - if(lValue) + if (lValue) lValue->_addBackLink(static_cast(getContainer())); #endif _pcLinkSub=lValue; @@ -574,7 +574,7 @@ void PropertyLinkSubList::setValue(DocumentObject* lValue,const char* SubName) //maintain backlinks for(auto *obj : _lValueList) obj->_removeBackLink(static_cast(getContainer())); - if(lValue) + if (lValue) lValue->_addBackLink(static_cast(getContainer())); #endif diff --git a/src/FCConfig.h b/src/FCConfig.h index eca969c0a..08c15f9f1 100644 --- a/src/FCConfig.h +++ b/src/FCConfig.h @@ -37,90 +37,90 @@ // First check for *WIN64* since the *WIN32* are also set on 64-bit platforms #if defined(WIN64) || defined(_WIN64) || defined(__WIN64__) -# ifndef FC_OS_WIN32 -# define FC_OS_WIN32 -# endif -# ifndef FC_OS_WIN64 -# define FC_OS_WIN64 -# endif +# ifndef FC_OS_WIN32 +# define FC_OS_WIN32 +# endif +# ifndef FC_OS_WIN64 +# define FC_OS_WIN64 +# endif #elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__) -# ifndef FC_OS_WIN32 -# define FC_OS_WIN32 -# endif -# if defined(__MINGW32__) -# if HAVE_CONFIG_H -# include -# endif // HAVE_CONFIG_H -//# define HAVE_INT8_T -//# define HAVE_UINT8_T -//# define HAVE_INT16_T -//# define HAVE_UINT16_T -//# define HAVE_INT32_T -//# define HAVE_UINT32_T -//# define HAVE_INT64_T -//# define HAVE_UINT64_T -//# define HAVE_INTPTR_T -//# define HAVE_UINTPTR_T -# endif +# ifndef FC_OS_WIN32 +# define FC_OS_WIN32 +# endif +# if defined(__MINGW32__) +# if HAVE_CONFIG_H +# include +# endif // HAVE_CONFIG_H +//# define HAVE_INT8_T +//# define HAVE_UINT8_T +//# define HAVE_INT16_T +//# define HAVE_UINT16_T +//# define HAVE_INT32_T +//# define HAVE_UINT32_T +//# define HAVE_INT64_T +//# define HAVE_UINT64_T +//# define HAVE_INTPTR_T +//# define HAVE_UINTPTR_T +# endif #elif defined(__MWERKS__) && defined(__INTEL__) -# ifndef FC_OS_WIN32 -# define FC_OS_WIN32 -# endif +# ifndef FC_OS_WIN32 +# define FC_OS_WIN32 +# endif #elif defined(__APPLE__) -# ifndef FC_OS_MACOSX -# define FC_OS_MACOSX -# endif +# ifndef FC_OS_MACOSX +# define FC_OS_MACOSX +# endif #elif defined(linux) || defined(__linux) || defined(__linux__) || defined(__GLIBC__) -# ifndef FC_OS_LINUX -# define FC_OS_LINUX -# endif +# ifndef FC_OS_LINUX +# define FC_OS_LINUX +# endif #elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) -# ifndef FC_OS_BSD -# define FC_OS_BSD -# endif +# ifndef FC_OS_BSD +# define FC_OS_BSD +# endif #elif defined(__CYGWIN__) -# ifndef FC_OS_CYGWIN -# define FC_OS_CYGWIN +# ifndef FC_OS_CYGWIN +# define FC_OS_CYGWIN // Avoid conflicts with Inventor -# define HAVE_INT8_T -# define HAVE_UINT8_T -# define HAVE_INT16_T -# define HAVE_UINT16_T -# define HAVE_INT32_T -# define HAVE_UINT32_T -# define HAVE_INT64_T -# define HAVE_UINT64_T -# define HAVE_INTPTR_T -# define HAVE_UINTPTR_T +# define HAVE_INT8_T +# define HAVE_UINT8_T +# define HAVE_INT16_T +# define HAVE_UINT16_T +# define HAVE_INT32_T +# define HAVE_UINT32_T +# define HAVE_INT64_T +# define HAVE_UINT64_T +# define HAVE_INTPTR_T +# define HAVE_UINTPTR_T #endif //#elif defined(sun) || defined(__sun) || defined(__sun__) -//# if defined(__SVR4) -//# define _FC_OS_SOLARIS -//# else -//# define _FC_OS_SUN_ -//# endif +//# if defined(__SVR4) +//# define _FC_OS_SOLARIS +//# else +//# define _FC_OS_SUN_ +//# endif //#elif defined(hpux) || defined(__hpux) || defined(__hpux__) -//# define FC_OS_HPUX_ +//# define FC_OS_HPUX_ //#elif defined(__FreeBSD__) -//# define FC_OS_FREEBSD +//# define FC_OS_FREEBSD //#elif defined(__NetBSD__) -//# define FC_OS_NETBSD +//# define FC_OS_NETBSD //#elif defined(__OpenBSD__) -//# define FC_OS_OPENBSD +//# define FC_OS_OPENBSD //#elif defined(sgi) || defined(__sgi) -//# define FC_OS_IRIX +//# define FC_OS_IRIX //#elif defined(_AIX) -//# define FC_OS_AIX +//# define FC_OS_AIX //#elif defined(__GNU__) -//# define FC_OS_GNU +//# define FC_OS_GNU #else -# error "FreeCAD is not ported to this OS yet. For help see www.freecadweb.org" +# error "FreeCAD is not ported to this OS yet. For help see www.freecadweb.org" #endif #ifdef FC_OS_WIN32 -# define PATHSEP '\\' +# define PATHSEP '\\' #else -# define PATHSEP '/' +# define PATHSEP '/' #endif //************************************************************************** @@ -132,7 +132,7 @@ #ifndef HAVE_INT8_T #define HAVE_INT8_T -typedef signed char int8_t; +typedef signed char int8_t; #endif #ifndef HAVE_UINT8_T @@ -178,20 +178,20 @@ typedef unsigned __int64 uint64_t; // Open CasCade #ifdef _MSC_VER -# ifndef WNT -# define WNT -# endif -# ifndef WIN32 -# define WIN32 -# endif -# ifndef _WINDOWS -# define _WINDOWS -# endif +# ifndef WNT +# define WNT +# endif +# ifndef WIN32 +# define WIN32 +# endif +# ifndef _WINDOWS +# define _WINDOWS +# endif #endif #ifdef FC_OS_LINUX -# define LIN -# define LININTEL +# define LIN +# define LININTEL //# define NO_CXX_EXCEPTION #endif @@ -199,19 +199,19 @@ typedef unsigned __int64 uint64_t; /// enables the use of the OCC DocumentBrowser #ifndef FC_OS_LINUX -# define FC_USE_OCAFBROWSER +# define FC_USE_OCAFBROWSER #endif #ifdef FC_OCC_DEBUG -# ifdef FC_DEBUG -# define DEBUG 1 -# else -# undef DEBUG -# ifndef NDEBUG -# define NDEBUG -# endif -# endif +# ifdef FC_DEBUG +# define DEBUG 1 +# else +# undef DEBUG +# ifndef NDEBUG +# define NDEBUG +# endif +# endif #endif @@ -281,49 +281,49 @@ typedef unsigned __int64 uint64_t; // Don't catch C++ exceptions in DEBUG! #ifdef FC_DEBUG # define DONT_CATCH_CXX_EXCEPTIONS 1 -# define DBG_TRY -# define DBG_CATCH(X) +# define DBG_TRY +# define DBG_CATCH(X) #else /// used to switch a catch with the debug state -# define DBG_TRY try { +# define DBG_TRY try { /// see docu DBGTRY -# define DBG_CATCH(X) }catch(...) { X } +# define DBG_CATCH(X) } catch (...) { X } #endif //************************************************************************** // Windows import export DLL defines #if defined (FC_OS_WIN32) || defined(FC_OS_CYGWIN) -# ifdef FCApp -# define AppExport __declspec(dllexport) -# define DataExport __declspec(dllexport) -# else -# define AppExport __declspec(dllimport) -# define DataExport __declspec(dllimport) -# endif -# ifdef FCBase -# define BaseExport __declspec(dllexport) -# else -# define BaseExport __declspec(dllimport) -# endif -# ifdef FCGui -# define GuiExport __declspec(dllexport) -# else -# define GuiExport __declspec(dllimport) -# endif +# ifdef FCApp +# define AppExport __declspec(dllexport) +# define DataExport __declspec(dllexport) +# else +# define AppExport __declspec(dllimport) +# define DataExport __declspec(dllimport) +# endif +# ifdef FCBase +# define BaseExport __declspec(dllexport) +# else +# define BaseExport __declspec(dllimport) +# endif +# ifdef FCGui +# define GuiExport __declspec(dllexport) +# else +# define GuiExport __declspec(dllimport) +# endif #else -# ifndef BaseExport -# define BaseExport -# endif -# ifndef GuiExport -# define GuiExport -# endif -# ifndef AppExport -# define AppExport -# endif -# ifndef DataExport -# define DataExport -# endif +# ifndef BaseExport +# define BaseExport +# endif +# ifndef GuiExport +# define GuiExport +# endif +# ifndef AppExport +# define AppExport +# endif +# ifndef DataExport +# define DataExport +# endif #endif