diff --git a/Applications/FileIO/XmlIO/Qt/XmlGspInterface.cpp b/Applications/FileIO/XmlIO/Qt/XmlGspInterface.cpp index a41eab63349e2e23de4113c03317a1d4a6d5a934..8849e9ed18975ddfb88a45bbc412d8e7ef19cd06 100644 --- a/Applications/FileIO/XmlIO/Qt/XmlGspInterface.cpp +++ b/Applications/FileIO/XmlIO/Qt/XmlGspInterface.cpp @@ -18,29 +18,31 @@ #include <vector> #include <logog/include/logog.hpp> +#include <QFile> +#include <QFileInfo> +#include <QtXml/QDomDocument> + +#include "BaseLib/BuildInfo.h" +#include "BaseLib/FileTools.h" +#include "BaseLib/FileFinder.h" +#include "BaseLib/IO/Writer.h" #include "GeoLib/GEOObjects.h" #include "GeoLib/IO/XmlIO/Qt/XmlGmlInterface.h" #include "GeoLib/IO/XmlIO/Qt/XmlStnInterface.h" -#include "BaseLib/FileTools.h" -#include "BaseLib/FileFinder.h" -#include "BaseLib/IO/Writer.h" #include "MeshLib/IO/Legacy/MeshIO.h" #include "MeshLib/IO/readMeshFromFile.h" #include "MeshLib/Mesh.h" -#include <QFile> -#include <QFileInfo> -#include <QtXml/QDomDocument> namespace FileIO { XmlGspInterface::XmlGspInterface(DataHolderLib::Project& project) -: XMLInterface(), XMLQtInterface(BaseLib::FileFinder().getPath("OpenGeoSysProject.xsd")), +: XMLInterface(), XMLQtInterface(BaseLib::FileFinder(BaseLib::BuildInfo::app_xml_schema_path).getPath("OpenGeoSysProject.xsd")), _project(project) { } diff --git a/Applications/FileIO/XmlIO/Qt/XmlNumInterface.cpp b/Applications/FileIO/XmlIO/Qt/XmlNumInterface.cpp index 26c8c5bd217a1a8a8c16f34b722176a452d9a7f9..de89006fb69cc14bdb8d2b99f34cdab1502a8cae 100644 --- a/Applications/FileIO/XmlIO/Qt/XmlNumInterface.cpp +++ b/Applications/FileIO/XmlIO/Qt/XmlNumInterface.cpp @@ -20,13 +20,14 @@ #include <logog/include/logog.hpp> +#include "BaseLib/BuildInfo.h" #include "BaseLib/FileFinder.h" namespace FileIO { XmlNumInterface::XmlNumInterface() : - XMLInterface(), XMLQtInterface(BaseLib::FileFinder().getPath("OpenGeoSysNUM.xsd")) + XMLInterface(), XMLQtInterface(BaseLib::FileFinder(BaseLib::BuildInfo::app_xml_schema_path).getPath("OpenGeoSysNUM.xsd")) { } diff --git a/GeoLib/IO/XmlIO/Qt/XmlGmlInterface.cpp b/GeoLib/IO/XmlIO/Qt/XmlGmlInterface.cpp index 9279af2781e117ecbe2d08cba1fbf4caf29c5b41..2d529e578cc24ab9d4f0e886c87503990711ffc7 100644 --- a/GeoLib/IO/XmlIO/Qt/XmlGmlInterface.cpp +++ b/GeoLib/IO/XmlIO/Qt/XmlGmlInterface.cpp @@ -20,6 +20,7 @@ #include <logog/include/logog.hpp> +#include "BaseLib/BuildInfo.h" #include "BaseLib/FileFinder.h" #include "GeoLib/Triangle.h" @@ -28,7 +29,7 @@ namespace GeoLib namespace IO { XmlGmlInterface::XmlGmlInterface(GeoLib::GEOObjects& geo_objs) : - XMLInterface(), XMLQtInterface(BaseLib::FileFinder().getPath("OpenGeoSysGLI.xsd")), _geo_objs(geo_objs) + XMLInterface(), XMLQtInterface(BaseLib::FileFinder(BaseLib::BuildInfo::geo_xml_schema_path).getPath("OpenGeoSysGLI.xsd")), _geo_objs(geo_objs) { } diff --git a/GeoLib/IO/XmlIO/Qt/XmlStnInterface.cpp b/GeoLib/IO/XmlIO/Qt/XmlStnInterface.cpp index 43d2a7eb33e2455d0be54bbd9a556bfebec9e3e3..8cb78d0b40e833b9db74fcc0f1b0cd2dd5b3224b 100644 --- a/GeoLib/IO/XmlIO/Qt/XmlStnInterface.cpp +++ b/GeoLib/IO/XmlIO/Qt/XmlStnInterface.cpp @@ -21,6 +21,7 @@ #include <logog/include/logog.hpp> +#include "BaseLib/BuildInfo.h" #include "BaseLib/DateTools.h" #include "BaseLib/FileTools.h" #include "BaseLib/FileFinder.h" @@ -33,7 +34,7 @@ namespace GeoLib namespace IO { XmlStnInterface::XmlStnInterface(GeoLib::GEOObjects& geo_objs) : - XMLInterface(), XMLQtInterface(BaseLib::FileFinder().getPath("OpenGeoSysSTN.xsd")), _geo_objs(geo_objs) + XMLInterface(), XMLQtInterface(BaseLib::FileFinder(BaseLib::BuildInfo::geo_xml_schema_path).getPath("OpenGeoSysSTN.xsd")), _geo_objs(geo_objs) { }