From 87a96ba7098fadc3e4bc8bd8dc9a666d87a63ec7 Mon Sep 17 00:00:00 2001 From: Dmitri Naumov <dmitri.naumov@ufz.de> Date: Tue, 3 Dec 2019 17:37:11 +0100 Subject: [PATCH] Add missing semicolons; --- .../VtkVis/VtkCompositeThresholdFilter.cpp | 2 +- Applications/DataExplorer/VtkVis/VtkRaster.cpp | 10 ++++++---- Applications/DataExplorer/VtkVis/VtkVisTabWidget.cpp | 2 +- Applications/FileIO/GocadIO/GocadAsciiReader.cpp | 2 +- Applications/FileIO/XmlIO/Qt/XmlPrjInterface.cpp | 4 ++-- .../Utils/FileConverter/GocadTSurfaceReader.cpp | 2 +- Applications/Utils/MeshEdit/Vtu2Grid.cpp | 2 +- .../Utils/MeshGeoTools/createIntermediateRasters.cpp | 2 +- GeoLib/IO/XmlIO/Qt/XmlGmlInterface.cpp | 2 +- 9 files changed, 15 insertions(+), 13 deletions(-) diff --git a/Applications/DataExplorer/VtkVis/VtkCompositeThresholdFilter.cpp b/Applications/DataExplorer/VtkVis/VtkCompositeThresholdFilter.cpp index 3a0e0c28dae..ede58aae2f0 100644 --- a/Applications/DataExplorer/VtkVis/VtkCompositeThresholdFilter.cpp +++ b/Applications/DataExplorer/VtkVis/VtkCompositeThresholdFilter.cpp @@ -59,7 +59,7 @@ void VtkCompositeThresholdFilter::init() } else { - WARN("Threshold filter could not find an array on its input object!") + WARN("Threshold filter could not find an array on its input object!"); return; } diff --git a/Applications/DataExplorer/VtkVis/VtkRaster.cpp b/Applications/DataExplorer/VtkVis/VtkRaster.cpp index cb46709dcd3..ec3d8f4436d 100644 --- a/Applications/DataExplorer/VtkVis/VtkRaster.cpp +++ b/Applications/DataExplorer/VtkVis/VtkRaster.cpp @@ -256,7 +256,8 @@ vtkImageAlgorithm* VtkRaster::loadImageFromTIFF(const std::string& fileName, } XTIFFClose(tiff); - ERR("VtkRaster::loadImageFromTIFF() - File not recognised as GeoTIFF-Image.") + ERR("VtkRaster::loadImageFromTIFF() - File not recognised as " + "GeoTIFF-Image."); return nullptr; } @@ -363,9 +364,10 @@ bool VtkRaster::readWorldFile(std::string const& filename, } double const delta_y = BaseLib::str2number<double>(line); if (delta_x != -delta_y) - WARN("Anisotropic pixel size detected (%f vs %f). An isotropic " - "spacing of %f is assumed, be aware results may be wrong.", - delta_x, delta_y, delta_x) + WARN( + "Anisotropic pixel size detected (%f vs %f). An isotropic " + "spacing of %f is assumed, be aware results may be wrong.", + delta_x, delta_y, delta_x); // x-translation if (!std::getline(in, line)) { diff --git a/Applications/DataExplorer/VtkVis/VtkVisTabWidget.cpp b/Applications/DataExplorer/VtkVis/VtkVisTabWidget.cpp index 22edd13194a..ec6eee99112 100644 --- a/Applications/DataExplorer/VtkVis/VtkVisTabWidget.cpp +++ b/Applications/DataExplorer/VtkVis/VtkVisTabWidget.cpp @@ -249,7 +249,7 @@ void VtkVisTabWidget::buildProportiesDialog(VtkVisPipelineItem* item) VtkAlgorithmProperties* algProps = item->getVtkProperties(); if (algProps == nullptr) - WARN("VtkAlgorithmProperties null!") + WARN("VtkAlgorithmProperties null!"); // Retrieve algorithm properties if (item->compositeFilter()) diff --git a/Applications/FileIO/GocadIO/GocadAsciiReader.cpp b/Applications/FileIO/GocadIO/GocadAsciiReader.cpp index eb854b46bc9..9a74dcff8dd 100644 --- a/Applications/FileIO/GocadIO/GocadAsciiReader.cpp +++ b/Applications/FileIO/GocadIO/GocadAsciiReader.cpp @@ -650,7 +650,7 @@ bool readFile(std::string const& file_name, std::unique_ptr<MeshLib::Mesh> mesh(readData(in, type, mesh_name)); if (mesh == nullptr) { - ERR("File parsing aborted...") + ERR("File parsing aborted..."); return false; } meshes.push_back(std::move(mesh)); diff --git a/Applications/FileIO/XmlIO/Qt/XmlPrjInterface.cpp b/Applications/FileIO/XmlIO/Qt/XmlPrjInterface.cpp index ec6a803d1cb..d2d73642c0b 100644 --- a/Applications/FileIO/XmlIO/Qt/XmlPrjInterface.cpp +++ b/Applications/FileIO/XmlIO/Qt/XmlPrjInterface.cpp @@ -114,7 +114,7 @@ int XmlPrjInterface::readFile(const QString& fileName) { if (!meshes_node.isElement()) { - ERR("Expected an XML element node.") + ERR("Expected an XML element node."); return 0; } if (meshes_node.nodeName() != "mesh") @@ -134,7 +134,7 @@ int XmlPrjInterface::readFile(const QString& fileName) if (!node_text.isText()) { ERR("Expected an XML element node named 'mesh' to contain " - "text.") + "text."); return 0; } read_single_mesh(path + node_text.toText().data().trimmed()); diff --git a/Applications/Utils/FileConverter/GocadTSurfaceReader.cpp b/Applications/Utils/FileConverter/GocadTSurfaceReader.cpp index 97614837021..f86f6804872 100644 --- a/Applications/Utils/FileConverter/GocadTSurfaceReader.cpp +++ b/Applications/Utils/FileConverter/GocadTSurfaceReader.cpp @@ -65,7 +65,7 @@ int main(int argc, char* argv[]) if (export_lines_arg.isSet() && export_surfaces_arg.isSet()) { ERR("Both the 'lines-only'-flag and 'surfaces-only'-flag are set. Only " - "one is allowed at a time.") + "one is allowed at a time."); return 2; } diff --git a/Applications/Utils/MeshEdit/Vtu2Grid.cpp b/Applications/Utils/MeshEdit/Vtu2Grid.cpp index 5e797717530..37baa463bf7 100644 --- a/Applications/Utils/MeshEdit/Vtu2Grid.cpp +++ b/Applications/Utils/MeshEdit/Vtu2Grid.cpp @@ -184,7 +184,7 @@ int main (int argc, char* argv[]) ((!y_arg.isSet() && z_arg.isSet()))) { ERR("For equilateral cubes, only x needs to be set. For unequal " - "cuboids, all three edge lengths (x/y/z) need to be specified.") + "cuboids, all three edge lengths (x/y/z) need to be specified."); return -1; } diff --git a/Applications/Utils/MeshGeoTools/createIntermediateRasters.cpp b/Applications/Utils/MeshGeoTools/createIntermediateRasters.cpp index bf9e53eaf26..3b660c78b7f 100644 --- a/Applications/Utils/MeshGeoTools/createIntermediateRasters.cpp +++ b/Applications/Utils/MeshGeoTools/createIntermediateRasters.cpp @@ -86,7 +86,7 @@ int main(int argc, char* argv[]) } if (h1.n_rows != h2.n_rows) { - ERR("Raster height is not the same in both raster files.\n") + ERR("Raster height is not the same in both raster files.\n"); errors_found = true; } diff --git a/GeoLib/IO/XmlIO/Qt/XmlGmlInterface.cpp b/GeoLib/IO/XmlIO/Qt/XmlGmlInterface.cpp index 3d600256106..319d5ff33bb 100644 --- a/GeoLib/IO/XmlIO/Qt/XmlGmlInterface.cpp +++ b/GeoLib/IO/XmlIO/Qt/XmlGmlInterface.cpp @@ -100,7 +100,7 @@ int XmlGmlInterface::readFile(const QString &fileName) { if (type_node.toElement().text().isEmpty()) { - ERR("XmlGmlInterface::readFile(): <name>-tag is empty.") + ERR("XmlGmlInterface::readFile(): <name>-tag is empty."); deleteGeometry(std::move(points), std::move(polylines), std::move(surfaces)); return 0; -- GitLab