Merge branch 'master' of github.com:ufz/ogs

Conflicts:
	BaseLib/uniqueInsert.h
	MeshLib/Node.h

Gui/DataView/CondFromRasterDialog.h

@@ -50,7 +50,7 @@ private slots:
 
 signals:
 	void directNodesWritten(std::string);
-	void transmitDisValues(std::vector< std::pair<size_t,double> >);
+	void transmitDisValues(std::vector< std::pair<std::size_t,double> >);
 };
 
 #endif //CONDFROMRASTERDIALOG_H

Gui/DataView/DataView.h

@@ -83,7 +83,7 @@ private slots:
 
 signals:
 	void qualityCheckRequested(VtkMeshSource*);
-	void requestCondSetupDialog(const std::string&, const GeoLib::GEOTYPE, const size_t, bool on_points);
+	void requestCondSetupDialog(const std::string&, const GeoLib::GEOTYPE, const std::size_t, bool on_points);
 	void requestMeshRemoval(const QModelIndex&);
 	void requestDIRECTSourceTerms(const std::string, const std::vector<GeoLib::Point*>*);
 	void saveMeshAction();

Gui/DataView/DiagramView/DetailWindow.h

@@ -39,7 +39,7 @@ public:
 	 */
 	DetailWindow(DiagramList* list, QWidget* parent = 0);
 
-	DetailWindow(std::vector<size_t> data, QWidget* parent = 0);
+	DetailWindow(std::vector<std::size_t> data, QWidget* parent = 0);
 
 	~DetailWindow(void);
 

Gui/DataView/DiagramView/DiagramList.h

@@ -70,7 +70,7 @@ public:
 	 * \param i Number of the point to be returned.
 	 * \return true if everything is alright. false if the point does not exist.
 	 */
-	bool getPoint(QPointF &p, size_t i);
+	bool getPoint(QPointF &p, std::size_t i);
 
 	/// Returns the label associated with the x-axis
 	QString getXLabel() const { return _xLabel; }
@@ -136,7 +136,7 @@ public:
 	void setYUnit(QString unit) { _yUnit = unit; }
 
 	/// Returns the number of data points.
-	size_t size();
+	std::size_t size();
 
 	/// Returns the width of the bounding box of all data points within the list.
 	double width() const { return _maxX - _minX; }

Gui/DataView/DirectConditionGenerator.cpp

@@ -17,6 +17,7 @@
 #include "Mesh.h"
 
 #include <cmath>
+#include <limits>
 
 const std::vector< std::pair<size_t,double> >& DirectConditionGenerator::directToSurfaceNodes(const MeshLib::Mesh &mesh, const std::string &filename)
 {

Gui/DataView/DirectConditionGenerator.h

@@ -13,6 +13,7 @@
 #define DIRECTCONDITIONGENERATOR_H
 
 #include <vector>
+#include <string>
 
 namespace MeshLib {
 	class Mesh;
@@ -24,14 +25,14 @@ public:
 	DirectConditionGenerator() {};
 	~DirectConditionGenerator() {};
 
-	const std::vector< std::pair<size_t,double> >& directToSurfaceNodes(const MeshLib::Mesh &mesh, const std::string &filename);
+	const std::vector< std::pair<std::size_t,double> >& directToSurfaceNodes(const MeshLib::Mesh &mesh, const std::string &filename);
 
-	const std::vector< std::pair<size_t,double> >& directWithSurfaceIntegration(MeshLib::Mesh &mesh, const std::string &filename, double scaling);
+	const std::vector< std::pair<std::size_t,double> >& directWithSurfaceIntegration(MeshLib::Mesh &mesh, const std::string &filename, double scaling);
 
 	int writeToFile(const std::string &name) const;
 
 private:
-	std::vector< std::pair<size_t,double> > _direct_values;
+	std::vector< std::pair<std::size_t,double> > _direct_values;
 
 };
 

Gui/DataView/ElementTreeModel.h

@@ -35,7 +35,7 @@ public slots:
 	void clearView();
 
 	/// Extracts information of the element with the given index from the given grid.
-	void setElement(const MeshLib::Mesh* grid, const size_t elem_index);
+	void setElement(const MeshLib::Mesh* grid, const std::size_t elem_index);
 
 private:
 };

Gui/DataView/FEMConditionSetupDialog.h

@@ -80,7 +80,7 @@ private slots:
 
 	void directButton_pressed();
 
-	void addDisValues(std::vector< std::pair<size_t,double> > direct_values);
+	void addDisValues(std::vector< std::pair<std::size_t,double> > direct_values);
 
 	void copyCondOnPoints();
 

Gui/DataView/GEOModels.h

@@ -48,11 +48,11 @@ public slots:
 
 	virtual void addPointVec(std::vector<GeoLib::Point*>* points,
 	                         std::string &name,
-	                         std::map<std::string, size_t>* name_pnt_id_map = NULL,
+	                         std::map<std::string, std::size_t>* name_pnt_id_map = NULL,
 	                         double eps = sqrt(std::numeric_limits<double>::min()));
 	virtual bool appendPointVec(const std::vector<GeoLib::Point*> &points,
 	                            const std::string &name,
-	                            std::vector<size_t>* ids = NULL);
+	                            std::vector<std::size_t>* ids = NULL);
 	virtual bool removePointVec(const std::string &name);
 
 	virtual void addStationVec(std::vector<GeoLib::Point*>* stations,
@@ -62,14 +62,14 @@ public slots:
 
 	virtual void addPolylineVec(std::vector<GeoLib::Polyline*>* lines,
 	                            const std::string &name,
-	                            std::map<std::string,size_t>* ply_names = NULL);
+	                            std::map<std::string,std::size_t>* ply_names = NULL);
 	virtual bool appendPolylineVec(const std::vector<GeoLib::Polyline*> &polylines,
 	                               const std::string &name);
 	virtual bool removePolylineVec(const std::string &name);
 
 	virtual void addSurfaceVec(std::vector<GeoLib::Surface*>* surfaces,
 	                           const std::string &name,
-	                           std::map<std::string,size_t>* sfc_names = NULL);
+	                           std::map<std::string,std::size_t>* sfc_names = NULL);
 
 	/// @brief
 	/// @param surfaces The surface vector.
@@ -78,14 +78,14 @@ public slots:
 	virtual bool removeSurfaceVec(const std::string &name);
 
 	/// Adds the name 'new_name' for the geo-object specified by the parameters
-	void addNameForElement(const std::string &geometry_name, const GeoLib::GEOTYPE object_type, size_t id, std::string new_name);
+	void addNameForElement(const std::string &geometry_name, const GeoLib::GEOTYPE object_type, std::size_t id, std::string new_name);
 
 	/// Adds a generic name to all points that are part of the specified geo-object
 	void addNameForObjectPoints(const std::string &geometry_name, const GeoLib::GEOTYPE object_type, const std::string &geo_object_name, const std::string &new_name);
 
 	/// Calls all necessary functions to connect polyline-segments and update all views and windows.
 	void connectPolylineSegments(const std::string &geoName,
-	                             std::vector<size_t> indexlist,
+	                             std::vector<std::size_t> indexlist,
 	                             double proximity,
 	                             std::string ply_name,
 	                             bool closePly,

Gui/DataView/GMSHPrefsDialog.h

@@ -51,7 +51,7 @@ private slots:
 	void reject();
 
 signals:
-	void requestMeshing(std::vector<std::string> &, size_t, double, double, double, bool);
+	void requestMeshing(std::vector<std::string> &, std::size_t, double, double, double, bool);
 };
 
 #endif //GMSHPREFSDIALOG_H

Gui/DataView/GeoTreeModel.h

@@ -65,7 +65,7 @@ public:
 	 */
 	void removeGeoList(const std::string &name, GeoLib::GEOTYPE type = GeoLib::INVALID);
 
-	void setNameForItem(const std::string &name, GeoLib::GEOTYPE type, size_t id, std::string item_name);
+	void setNameForItem(const std::string &name, GeoLib::GEOTYPE type, std::size_t id, std::string item_name);
 
 	/*
 	 * Returns the geo-object specified by the given index.
@@ -82,14 +82,14 @@ private:
 	/// Adds children to the "Polylines" node
 	void addChildren(GeoObjectListItem* plyList,
 	                 const GeoLib::PolylineVec* polyline_vec,
-	                 size_t start_index,
-	                 size_t end_index);
+	                 std::size_t start_index,
+	                 std::size_t end_index);
 
 	/// Adds children to the "Surfaces" node
 	void addChildren(GeoObjectListItem* sfcList,
 	                 const GeoLib::SurfaceVec* surface_vec,
-	                 size_t start_index,
-	                 size_t end_index);
+	                 std::size_t start_index,
+	                 std::size_t end_index);
 
 	std::vector<GeoTreeItem*> _lists;
 };

Gui/DataView/GeoTreeView.h

@@ -71,9 +71,9 @@ signals:
 	void listRemoved(std::string name, GeoLib::GEOTYPE);
 	void loadFEMCondFileRequested(std::string);
 	void saveToFileRequested(QString, QString) const;
-	void requestCondSetupDialog(const std::string&, const GeoLib::GEOTYPE, const size_t, bool on_points);
+	void requestCondSetupDialog(const std::string&, const GeoLib::GEOTYPE, const std::size_t, bool on_points);
 	void requestLineEditDialog(const std::string&);
-	void requestNameChangeDialog(const std::string&, const GeoLib::GEOTYPE, const size_t);
+	void requestNameChangeDialog(const std::string&, const GeoLib::GEOTYPE, const std::size_t);
 	//void saveFEMConditionsRequested(QString, QString);
 };
 

Gui/DataView/LineEditDialog.h

@@ -33,7 +33,7 @@ public:
 	~LineEditDialog(void);
 
 private:
-	std::vector<size_t> getSelectedIndeces(QStringList list);
+	std::vector<std::size_t> getSelectedIndeces(QStringList list);
 
 	QStringListModel* _allPly;
 	QStringListModel* _selPly;
@@ -54,7 +54,7 @@ private slots:
 
 signals:
 	void connectPolylines(const std::string&,
-	                      std::vector<size_t>,
+	                      std::vector<std::size_t>,
 	                      double,
 	                      std::string,
 	                      bool,

Gui/DataView/LinearEditDialog.h

@@ -25,11 +25,11 @@ class LinearEditDialog : public QDialog, private Ui_LinearEdit
 	Q_OBJECT
 
 public:
-	LinearEditDialog(const GeoLib::Polyline &line, const std::vector<size_t> &dis_nodes, const std::vector<double> &dis_values, QDialog* parent = 0);
+	LinearEditDialog(const GeoLib::Polyline &line, const std::vector<std::size_t> &dis_nodes, const std::vector<double> &dis_values, QDialog* parent = 0);
 	~LinearEditDialog(void);
 
 private:
-	void setupDialog(const std::vector<size_t> &dis_nodes, const std::vector<double> &dis_values);
+	void setupDialog(const std::vector<std::size_t> &dis_nodes, const std::vector<double> &dis_values);
 
 	const GeoLib::Polyline _line;
 
@@ -43,7 +43,7 @@ private slots:
 	void reject();
 
 signals:
-	void transmitDisValues(std::vector< std::pair<size_t,double> >);
+	void transmitDisValues(std::vector< std::pair<std::size_t,double> >);
 };
 
 #endif //LINEAREDITDIALOG_H

Gui/DataView/MshLayerMapper.h

@@ -36,14 +36,14 @@ public:
 	 * \param thickness The thickness of each of these newly added layers
 	 * \return A mesh with the requested number of layers of prism/hex elements
 	 */
-	static MeshLib::Mesh* CreateLayers(const MeshLib::Mesh* mesh, size_t nLayers, double thickness);
+	static MeshLib::Mesh* CreateLayers(const MeshLib::Mesh* mesh, std::size_t nLayers, double thickness);
 
 	/// Maps the z-values of nodes in the designated layer of the given mesh according to the given raster.
-	static int LayerMapping(MeshLib::Mesh* msh, const std::string &rasterfile, 
-                            const size_t nLayers, const size_t layer_id, bool removeNoDataValues = false);
+	static int LayerMapping(MeshLib::Mesh* msh, const std::string &rasterfile,
+                            const std::size_t nLayers, const std::size_t layer_id, bool removeNoDataValues = false);
 
 	/// Blends a mesh with the surface given by dem_raster. Nodes and elements above the surface are either removed or adapted to fit the surface.
-	static MeshLib::Mesh* blendLayersWithSurface(MeshLib::Mesh* mesh, const size_t nLayers, const std::string &dem_raster);
+	static MeshLib::Mesh* blendLayersWithSurface(MeshLib::Mesh* mesh, const std::size_t nLayers, const std::string &dem_raster);
 
 private:
 	/// Checks if the given mesh is within the dimensions given by xDim and yDim.

Gui/DataView/MshQualitySelectionDialog.h

@@ -12,7 +12,7 @@
 #ifndef MSHQUALITYSELECTIONDIALOG_H
 #define MSHQUALITYSELECTIONDIALOG_H
 
-#include "MSHEnums.h"
+#include "MshEnums.h"
 #include "ui_MshQualitySelection.h"
 #include <QDialog>
 

Gui/DataView/NetCdfConfigureDialog.h

@@ -45,7 +45,7 @@ private slots:
 private:
 	void setVariableSelect();
 	void setDimensionSelect();
-	void getDimEdges(int dimId,size_t &size, double &firstValue, double &lastValue);
+	void getDimEdges(int dimId,std::size_t &size, double &firstValue, double &lastValue);
 	void getDaysTime(double minSince, QTime &time, int &days);
 	long convertDateToMinutes(QDateTime initialDateTime,QDate selectedDate, QTime selectedTime);
 	void createDataObject();
@@ -54,7 +54,7 @@ private:
 	int getDim4();
 	double getResolution();
 	QString setName();
-	void reverseNorthSouth(double* data, size_t width, size_t height);
+	void reverseNorthSouth(double* data, std::size_t width, std::size_t height);
 
 	NcFile *_currentFile;
 	NcVar *_currentVar;

Gui/DataView/SelectMeshDialog.h

@@ -57,7 +57,7 @@ private slots:
 	void reject();
 
 signals:
-	//void requestNameChange(const std::string&, const GeoLib::GEOTYPE, size_t, std::string);
+	//void requestNameChange(const std::string&, const GeoLib::GEOTYPE, std::size_t, std::string);
 };
 
 #endif //SELECTMESHDIALOG_H

Gui/DataView/SetNameDialog.h

@@ -32,7 +32,7 @@ public:
 	/// Constructor
 	SetNameDialog(const std::string &parent_name,
 				  const std::string &object_type_name,
-				  size_t id,
+				  std::size_t id,
 				  const std::string &old_name,
 				  QDialog* parent = 0);
 	~SetNameDialog();
@@ -49,7 +49,7 @@ private:
 
 	std::string _parent_name;
 	std::string _object_type_name;
-	size_t _id;
+	std::size_t _id;
 
 private slots:
 	/// Instructions if the OK-Button has been pressed.
@@ -59,7 +59,7 @@ private slots:
 	void reject();
 
 signals:
-	void requestNameChange(const std::string&, const GeoLib::GEOTYPE, size_t, std::string);
+	void requestNameChange(const std::string&, const GeoLib::GEOTYPE, std::size_t, std::string);
 };
 
 #endif //SETNAMEDIALOG_H

Gui/VtkAct/VtkCustomInteractorStyle.h

@@ -88,7 +88,7 @@ signals:
 	void cursorChanged(Qt::CursorShape);
 
 	/// @brief Emitted when a mesh element has been picked
-	void elementPicked(const MeshLib::Mesh*, const size_t);
+	void elementPicked(const MeshLib::Mesh*, const std::size_t);
 };
 
 #endif // VTKINTERACTORSTYLE_H