diff -r c2723022b173 -r 0b3b35f560f2 src/documentmanager.h --- a/src/documentmanager.h Thu Mar 09 12:50:14 2017 +0200 +++ b/src/documentmanager.h Sun Mar 12 11:03:44 2017 +0200 @@ -20,6 +20,7 @@ #include #include "main.h" #include "hierarchyelement.h" +#include "librarycollection.h" class Model; @@ -38,14 +39,14 @@ void clear(); LDDocument* createNew(); LDDocument* findDocumentByName (QString name); - QString findDocumentPath (QString relpath, bool subdirs); + QString findDocumentPath (QString relpath); LDDocument* getDocumentByName (QString filename); bool isSafeToCloseAll(); void loadFileContents(QIODevice* fp, Model& model, int* numWarnings, bool* ok); void loadLogoedStuds(); LDDocument* openDocument (QString path, bool search, bool implicit, LDDocument* fileToOverride = nullptr, bool* aborted = nullptr); - QFile* openLDrawFile (QString relpath, bool subdirs, QString* pathpointer); + QFile* openLDrawFile (QString relpath, QString* pathpointer); void openMainModel (QString path); bool preInline (LDDocument* doc, Model& model, bool deep, bool renderinline); @@ -58,6 +59,7 @@ Q_SLOT void printParseErrorMessage(QString message); Documents m_documents; + LibraryCollection m_libraries; bool m_loadingMainFile; bool m_isLoadingLogoedStuds; LDDocument* m_logoedStud;