prep for LogVisor integration

This commit is contained in:
Jack Andersen 2015-07-03 12:40:34 -10:00
parent 84ca6a62e3
commit a186687488
4 changed files with 5 additions and 7 deletions

View File

@ -150,7 +150,9 @@ protected:
Header m_header; Header m_header;
std::vector<std::unique_ptr<IPartition>> m_partitions; std::vector<std::unique_ptr<IPartition>> m_partitions;
public: public:
DiscBase(std::unique_ptr<IDiscIO>&& dio); DiscBase(std::unique_ptr<IDiscIO>&& dio)
: m_discIO(std::move(dio)), m_header(*m_discIO.get()) {}
virtual bool commit()=0; virtual bool commit()=0;
inline const Header& getHeader() const {return m_header;} inline const Header& getHeader() const {return m_header;}
inline const IDiscIO& getDiscIO() const {return *m_discIO.get();} inline const IDiscIO& getDiscIO() const {return *m_discIO.get();}

View File

@ -2,6 +2,7 @@
#define __NOD_LIB__ #define __NOD_LIB__
#include <memory> #include <memory>
#include <LogVisor/LogVisor.hpp>
#include "Util.hpp" #include "Util.hpp"
namespace NOD namespace NOD

View File

@ -8,11 +8,6 @@
namespace NOD namespace NOD
{ {
DiscBase::DiscBase(std::unique_ptr<IDiscIO>&& dio)
: m_discIO(std::move(dio)), m_header(*m_discIO.get())
{
}
void DiscBase::IPartition::parseFST(IPartReadStream& s) void DiscBase::IPartition::parseFST(IPartReadStream& s)
{ {
std::unique_ptr<uint8_t[]> fst(new uint8_t[m_fstSz]); std::unique_ptr<uint8_t[]> fst(new uint8_t[m_fstSz]);

View File

@ -6,7 +6,7 @@ QT =
TARGET = NOD TARGET = NOD
QMAKE_CXXFLAGS += -maes QMAKE_CXXFLAGS += -maes
INCLUDEPATH += ../include INCLUDEPATH += ../include ../../../LogVisor/include
SOURCES += \ SOURCES += \
FileIOFILE.cpp \ FileIOFILE.cpp \