R8 phase 1: extract app/engine shared utilities into shared/include/oakutil
Move the pure-header utilities shared by app/ and engine/ out of engine/common/ into a new shared/include/oakutil/ layer (define, lerp, decibel, digit, range, crashpadutils, autoscroll, qtutils, filefunctions declarations, and a trimmed xmlutils exposing a CancelAtom-free void* overload). engine/common/ keeps forwarding headers so internal include paths are unchanged; app/ now includes oakutil/* directly. engine/node/project.h gains an explicit NodeGroup forward declaration previously obtained transitively through the old xmlutils.h.
This commit is contained in:
@@ -27,13 +27,14 @@
|
||||
namespace olive
|
||||
{
|
||||
|
||||
bool xml_read_next_start_element(QXmlStreamReader *reader, CancelAtom *cancel_atom)
|
||||
bool xml_read_next_start_element(QXmlStreamReader *reader, void *cancel_atom)
|
||||
{
|
||||
CancelAtom *atom = static_cast<CancelAtom *>(cancel_atom);
|
||||
QXmlStreamReader::TokenType token;
|
||||
|
||||
while ((token = reader->readNext()) != QXmlStreamReader::Invalid &&
|
||||
token != QXmlStreamReader::EndDocument &&
|
||||
(!cancel_atom || !cancel_atom->is_cancelled())) {
|
||||
(!atom || !atom->is_cancelled())) {
|
||||
if (reader->isEndElement()) {
|
||||
return false;
|
||||
} else if (reader->isStartElement()) {
|
||||
|
||||
Reference in New Issue
Block a user