Skip to content
Snippets Groups Projects
Commit 7ed9d84f authored by Lars Bilke's avatar Lars Bilke
Browse files

Fixed includes in OGSFileConverter.

parent 1de2d7b0
No related branches found
No related tags found
No related merge requests found
...@@ -4,14 +4,6 @@ set(SOURCES ...@@ -4,14 +4,6 @@ set(SOURCES
) )
include_directories( include_directories(
${PROJECT_SOURCE_DIR}/BaseLib
${PROJECT_SOURCE_DIR}/FileIO
${PROJECT_SOURCE_DIR}/GeoLib
${PROJECT_SOURCE_DIR}/MeshLib
${PROJECT_SOURCE_DIR}/Applications/DataExplorer/Base
${PROJECT_SOURCE_DIR}/Applications/DataExplorer/DataView
${PROJECT_SOURCE_DIR}/Applications/DataExplorer/VtkVis
# Qt generated file includes # Qt generated file includes
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
......
...@@ -13,14 +13,15 @@ ...@@ -13,14 +13,15 @@
*/ */
#include "FileListDialog.h" #include "FileListDialog.h"
#include "OGSError.h"
#include "StringTools.h"
#include <QSettings> #include <QSettings>
#include <QFileInfo> #include <QFileInfo>
#include <QFont> #include <QFont>
#include <QLineEdit> #include <QLineEdit>
#include "Applications/DataExplorer/Base/OGSError.h"
#include "BaseLib/StringTools.h"
FileListDialog::FileListDialog(FileType input, FileType output, QWidget* parent) FileListDialog::FileListDialog(FileType input, FileType output, QWidget* parent)
: QDialog(parent), _output_dir(""), _input_file_type(input), _output_file_type(output) : QDialog(parent), _output_dir(""), _input_file_type(input), _output_file_type(output)
{ {
...@@ -114,4 +115,3 @@ void FileListDialog::displayWarningLabel() const ...@@ -114,4 +115,3 @@ void FileListDialog::displayWarningLabel() const
this->warningLabel->setStyleSheet("QLabel { color : red; }"); this->warningLabel->setStyleSheet("QLabel { color : red; }");
this->warningLabel->setText("Warning: all scalar information except<br />MaterialIDs will be lost!"); this->warningLabel->setText("Warning: all scalar information except<br />MaterialIDs will be lost!");
} }
...@@ -15,21 +15,17 @@ ...@@ -15,21 +15,17 @@
#define BOOST_FILESYSTEM_VERSION 3 #define BOOST_FILESYSTEM_VERSION 3
#include "OGSFileConverter.h" #include "OGSFileConverter.h"
#include "FileListDialog.h"
#include "FileTools.h"
#include "OGSError.h"
#include <QFileInfo> #include <QFileInfo>
// conversion includes #include "FileListDialog.h"
#include "Applications/ApplicationsLib/ProjectData.h" #include "Applications/ApplicationsLib/ProjectData.h"
#include "StringTools.h" #include "Applications/DataExplorer/Base/OGSError.h"
#include "BaseLib/FileTools.h"
// geometry #include "BaseLib/StringTools.h"
#include "GEOObjects.h" #include "GeoLib/GEOObjects.h"
#include "GeoLib/IO/Legacy/OGSIOVer4.h" #include "GeoLib/IO/Legacy/OGSIOVer4.h"
#include "GeoLib/IO/XmlIO/Qt/XmlGmlInterface.h" #include "GeoLib/IO/XmlIO/Qt/XmlGmlInterface.h"
#include "MeshLib/IO/Legacy/MeshIO.h" #include "MeshLib/IO/Legacy/MeshIO.h"
#include "MeshLib/IO/VtkIO/VtuInterface.h" #include "MeshLib/IO/VtkIO/VtuInterface.h"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment