From c3b38bda08f555b6ae4b99fcef49c41711cb9b0a Mon Sep 17 00:00:00 2001 From: wmayer Date: Thu, 17 Nov 2022 23:50:34 +0100 Subject: [PATCH] App: [skip ci] fix warnings reported by GH actions --- src/App/Document.cpp | 25 +++++++++++++++---------- src/App/Link.cpp | 2 +- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/src/App/Document.cpp b/src/App/Document.cpp index 2c03c50354..d3d9f966aa 100644 --- a/src/App/Document.cpp +++ b/src/App/Document.cpp @@ -821,8 +821,8 @@ void Document::exportGraphviz(std::ostream& out) const graph_traits::edge_iterator ei, ei_end; tie(ei, ei_end) = edges(DepList); for (; ei != ei_end; ++ei) { - in_edges.insert(std::make_pair(target(*ei, DepList), *ei)); - out_edges.insert(std::make_pair(source(*ei, DepList), *ei)); + in_edges.insert(std::make_pair(target(*ei, DepList), *ei)); + out_edges.insert(std::make_pair(source(*ei, DepList), *ei)); } // Go through dependency graph and remove nodes with either no input or output @@ -924,13 +924,15 @@ void Document::exportGraphviz(std::ostream& out) const //} bool Document::checkOnCycle() -{/* +{ +#if 0 std::vector < default_color_type > color(num_vertices(_DepList), white_color); graph_traits < DependencyList >::vertex_iterator vi, vi_end; for (tie(vi, vi_end) = vertices(_DepList); vi != vi_end; ++vi) if (color[*vi] == white_color) if (_has_cycle_dfs(_DepList, *vi, &color[0])) - return true; */ + return true; +#endif return false; } @@ -971,7 +973,7 @@ bool Document::undo(int id) } - for(auto & obj:d->objectArray) { + for(auto & obj : d->objectArray) { if(obj->testStatus(ObjectStatus::PendingTransactionUpdate)) { obj->onUndoRedoFinished(); obj->setStatus(ObjectStatus::PendingTransactionUpdate,false); @@ -1020,7 +1022,7 @@ bool Document::redo(int id) mRedoTransactions.pop_back(); } - for(auto & obj:d->objectArray) { + for(auto & obj : d->objectArray) { if(obj->testStatus(ObjectStatus::PendingTransactionUpdate)) { obj->onUndoRedoFinished(); obj->setStatus(ObjectStatus::PendingTransactionUpdate,false); @@ -1288,7 +1290,8 @@ int Document::getTransactionID(bool undo, unsigned pos) const { if(pos>=mUndoTransactions.size()) return 0; auto rit = mUndoTransactions.rbegin(); - for(;pos;++rit,--pos); + for(;pos;++rit,--pos) + continue; return (*rit)->getID(); } if(pos>=mRedoTransactions.size()) @@ -2986,11 +2989,13 @@ void Document::getLinksTo(std::set &links, { std::map > linkMap; - for(auto o : !objs.empty()?objs:d->objectArray) { - if(o == obj) continue; + for(auto o : !objs.empty() ? objs : d->objectArray) { + if (o == obj) + continue; auto linked = o; - if(options & GetLinkArrayElement) + if (options & GetLinkArrayElement) { linked = o->getLinkedObject(false); + } else { auto ext = o->getExtensionByType(true); if(ext) diff --git a/src/App/Link.cpp b/src/App/Link.cpp index 6229399dd1..f4483d4e28 100644 --- a/src/App/Link.cpp +++ b/src/App/Link.cpp @@ -128,7 +128,7 @@ const bool & LinkParams::getCopyOnChangeApplyToAll() { // Auto generated code. See class document of LinkParams. const bool & LinkParams::defaultCopyOnChangeApplyToAll() { - const static bool def = true; + static const bool def = true; return def; }