From 17dd66fe8a35764fa41b6127e44e8e3b35df1ccd Mon Sep 17 00:00:00 2001
From: Thomas Fischer <thomas.fischer@ufz.de>
Date: Wed, 23 Jan 2013 10:31:46 +0100
Subject: [PATCH] Small changes to fix compile errors in OGS-6.
---
Utils/FileConverter/ConvertSHPToGLI.cpp | 11 +++++------
.../FileConverter/generateBCFromPolyline.cpp | 16 ++++++++--------
Utils/FileConverter/generateBCandGLI.cpp | 19 +++++++++++--------
3 files changed, 24 insertions(+), 22 deletions(-)
diff --git a/Utils/FileConverter/ConvertSHPToGLI.cpp b/Utils/FileConverter/ConvertSHPToGLI.cpp
index a0e2756aecd..2403b1ee88d 100644
--- a/Utils/FileConverter/ConvertSHPToGLI.cpp
+++ b/Utils/FileConverter/ConvertSHPToGLI.cpp
@@ -27,14 +27,12 @@
#include "XmlIO/XmlGmlInterface.h"
#include "XmlIO/XmlStnInterface.h"
-// GEO
+// GeoLib
#include "GEOObjects.h"
#include "Point.h"
-#include "ProjectData.h"
#include "Station.h"
-#include "problem.h"
-Problem* aproblem = NULL;
+#include "OGS/ProjectData.h"
void convertPoints (DBFHandle dbf_handle,
std::string const& out_fname,
@@ -80,8 +78,9 @@ void convertPoints (DBFHandle dbf_handle,
double x(DBFReadDoubleAttribute(dbf_handle, k, x_id));
double y(DBFReadDoubleAttribute(dbf_handle, k, y_id));
double z(0.0);
- if (z_id != std::numeric_limits<size_t>::max()) z = DBFReadDoubleAttribute(dbf_handle, k,
- z_id);
+ if (z_id != std::numeric_limits<size_t>::max())
+ z = DBFReadDoubleAttribute(dbf_handle, k,
+ z_id);
name = "";
if (!name_component_ids.empty()) {
diff --git a/Utils/FileConverter/generateBCFromPolyline.cpp b/Utils/FileConverter/generateBCFromPolyline.cpp
index 507bbbd0a48..911cd6c8572 100644
--- a/Utils/FileConverter/generateBCFromPolyline.cpp
+++ b/Utils/FileConverter/generateBCFromPolyline.cpp
@@ -12,19 +12,20 @@
*
*/
-// GEO
+#include <fstream>
+
+#include <QString>
+
+// GeoLib
#include "GEOObjects.h"
#include "PolylineVec.h"
-#include "ProjectData.h"
+
+// OGS
+#include "OGS/ProjectData.h"
// FileIO
#include "XmlIO/XmlGmlInterface.h"
-#include "problem.h"
-Problem* aproblem = NULL;
-
-#include <QString>
-
int main (int argc, char* argv[])
{
if (argc == 1)
@@ -112,4 +113,3 @@ int main (int argc, char* argv[])
delete project_data;
}
-
diff --git a/Utils/FileConverter/generateBCandGLI.cpp b/Utils/FileConverter/generateBCandGLI.cpp
index cb48b597ee2..3cde8638447 100644
--- a/Utils/FileConverter/generateBCandGLI.cpp
+++ b/Utils/FileConverter/generateBCandGLI.cpp
@@ -12,20 +12,23 @@
*
*/
-// GEO
+// STL
+#include <algorithm>
+#include <fstream>
+
+// Qt
+#include <QString>
+
+// GeoLib
#include "GEOObjects.h"
-#include "ProjectData.h"
#include "SurfaceVec.h"
+// OgsLib
+#include "OGS/ProjectData.h"
+
// FileIO
#include "XmlIO/XmlGmlInterface.h"
-#include "problem.h"
-Problem* aproblem = NULL;
-
-#include <algorithm>
-#include <QString>
-
int main (int argc, char* argv[])
{
if (argc == 1)
--
GitLab