Small changes to fix compile errors in OGS-6.

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()) {

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;
 }
-

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)