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:
@@ -22,34 +22,23 @@
|
||||
#ifndef OAK_XMLREADLOOP_H
|
||||
#define OAK_XMLREADLOOP_H
|
||||
|
||||
#include <QXmlStreamReader>
|
||||
// Base declarations (XMLAttributeLoop macro + void* overload) from shared layer
|
||||
#include "oakutil/xmlutils.h"
|
||||
|
||||
#include "node/param.h"
|
||||
#include "render/cancelatom.h"
|
||||
#include "undo/undocommand.h"
|
||||
|
||||
namespace olive
|
||||
{
|
||||
|
||||
class Block;
|
||||
class Node;
|
||||
class NodeInput;
|
||||
class NodeGroup;
|
||||
|
||||
#define XMLAttributeLoop(reader, item) \
|
||||
foreach (const QXmlStreamAttribute &item, reader->attributes())
|
||||
|
||||
/**
|
||||
* @brief Workaround for QXmlStreamReader::readNextStartElement not detecting the end of a document
|
||||
*
|
||||
* Since Qt's default function doesn't exit at the end of the document, it ends up consistently
|
||||
* throwing a "premature end of document" error. We have our own function here that does essentially
|
||||
* the same thing but fixes that issue.
|
||||
*
|
||||
* See also: https://stackoverflow.com/questions/46346450/qt-qxmlstreamreader-always-returns-premature-end-of-document-error
|
||||
* @brief Engine-internal overload with typed CancelAtom pointer
|
||||
*/
|
||||
bool xml_read_next_start_element(QXmlStreamReader *reader,
|
||||
CancelAtom *cancel_atom = nullptr);
|
||||
inline bool xml_read_next_start_element(QXmlStreamReader *reader,
|
||||
CancelAtom *cancel_atom)
|
||||
{
|
||||
return xml_read_next_start_element(reader,
|
||||
static_cast<void *>(cancel_atom));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user