From 896f553bb0cf5acd3803a9f9589f84c12fd191ef Mon Sep 17 00:00:00 2001 From: Christoph Lehmann <christoph.lehmann@ufz.de> Date: Tue, 2 Feb 2016 17:14:22 +0100 Subject: [PATCH] renamed ConfigTree source files --- Applications/ApplicationsLib/ProjectData.cpp | 2 +- Applications/ApplicationsLib/ProjectData.h | 2 +- BaseLib/{ConfigTreeNew-impl.h => ConfigTree-impl.h} | 2 +- BaseLib/{ConfigTreeNew.cpp => ConfigTree.cpp} | 2 +- BaseLib/{ConfigTreeNew.h => ConfigTree.h} | 2 +- BaseLib/ConfigTreeUtil.h | 2 +- FileIO/XmlIO/Boost/BoostXmlGmlInterface.h | 2 +- MathLib/LinAlg/Eigen/EigenLinearSolver.cpp | 2 +- MathLib/LinAlg/Eigen/EigenLinearSolver.h | 2 +- MathLib/LinAlg/EigenLis/EigenLisLinearSolver.cpp | 2 +- MathLib/LinAlg/EigenLis/EigenLisLinearSolver.h | 2 +- MathLib/LinAlg/LinearSolverOptions.h | 2 +- MathLib/LinAlg/Lis/LisLinearSolver.h | 2 +- MathLib/LinAlg/Lis/LisOption.h | 2 +- MathLib/LinAlg/PETSc/PETScLinearSolver.h | 2 +- MathLib/LinAlg/Solvers/GaussAlgorithm.h | 2 +- NumLib/TimeStepping/Algorithms/FixedTimeStepping.cpp | 2 +- NumLib/TimeStepping/Algorithms/FixedTimeStepping.h | 2 +- ProcessLib/InitialCondition.cpp | 2 +- ProcessLib/InitialCondition.h | 2 +- ProcessLib/NeumannBcConfig.h | 2 +- ProcessLib/Parameter.h | 2 +- ProcessLib/Process.h | 2 +- ProcessLib/ProcessVariable.cpp | 2 +- ProcessLib/UniformDirichletBoundaryCondition.h | 2 +- Tests/BaseLib/TestConfigTree.cpp | 2 +- 26 files changed, 26 insertions(+), 26 deletions(-) rename BaseLib/{ConfigTreeNew-impl.h => ConfigTree-impl.h} (99%) rename BaseLib/{ConfigTreeNew.cpp => ConfigTree.cpp} (99%) rename BaseLib/{ConfigTreeNew.h => ConfigTree.h} (99%) diff --git a/Applications/ApplicationsLib/ProjectData.cpp b/Applications/ApplicationsLib/ProjectData.cpp index 7289c5fbe33..2d72aad9c7e 100644 --- a/Applications/ApplicationsLib/ProjectData.cpp +++ b/Applications/ApplicationsLib/ProjectData.cpp @@ -28,7 +28,7 @@ #include "FileIO/XmlIO/Boost/BoostXmlGmlInterface.h" #include "FileIO/readMeshFromFile.h" -#include "BaseLib/ConfigTreeNew.h" +#include "BaseLib/ConfigTree.h" namespace detail { diff --git a/Applications/ApplicationsLib/ProjectData.h b/Applications/ApplicationsLib/ProjectData.h index 6850837e749..af31f06faf8 100644 --- a/Applications/ApplicationsLib/ProjectData.h +++ b/Applications/ApplicationsLib/ProjectData.h @@ -15,7 +15,7 @@ #include <memory> -#include "BaseLib/ConfigTreeNew.h" +#include "BaseLib/ConfigTree.h" #include "GeoLib/GEOObjects.h" diff --git a/BaseLib/ConfigTreeNew-impl.h b/BaseLib/ConfigTree-impl.h similarity index 99% rename from BaseLib/ConfigTreeNew-impl.h rename to BaseLib/ConfigTree-impl.h index 55ca2fe37af..5e83580f3a9 100644 --- a/BaseLib/ConfigTreeNew-impl.h +++ b/BaseLib/ConfigTree-impl.h @@ -7,7 +7,7 @@ * */ -#include "ConfigTreeNew.h" +#include "ConfigTree.h" namespace BaseLib { diff --git a/BaseLib/ConfigTreeNew.cpp b/BaseLib/ConfigTree.cpp similarity index 99% rename from BaseLib/ConfigTreeNew.cpp rename to BaseLib/ConfigTree.cpp index 76712ac3775..c43f8ff73a3 100644 --- a/BaseLib/ConfigTreeNew.cpp +++ b/BaseLib/ConfigTree.cpp @@ -8,7 +8,7 @@ */ #include <logog/include/logog.hpp> -#include "ConfigTreeNew.h" +#include "ConfigTree.h" // Explicitly instantiate the boost::property_tree::ptree which is a typedef to // the following basic_ptree. diff --git a/BaseLib/ConfigTreeNew.h b/BaseLib/ConfigTree.h similarity index 99% rename from BaseLib/ConfigTreeNew.h rename to BaseLib/ConfigTree.h index e776b28ef77..728ac8a78c1 100644 --- a/BaseLib/ConfigTreeNew.h +++ b/BaseLib/ConfigTree.h @@ -631,7 +631,7 @@ private: } -#include "ConfigTreeNew-impl.h" +#include "ConfigTree-impl.h" #endif // BASELIB_CONFIGTREE_H_ diff --git a/BaseLib/ConfigTreeUtil.h b/BaseLib/ConfigTreeUtil.h index 8fa18613ff1..c8b67c972d2 100644 --- a/BaseLib/ConfigTreeUtil.h +++ b/BaseLib/ConfigTreeUtil.h @@ -10,7 +10,7 @@ #ifndef BASELIB_CONFIGTREEUTIL #define BASELIB_CONFIGTREEUTIL -#include "ConfigTreeNew.h" +#include "ConfigTree.h" namespace BaseLib { diff --git a/FileIO/XmlIO/Boost/BoostXmlGmlInterface.h b/FileIO/XmlIO/Boost/BoostXmlGmlInterface.h index 1a711c0c64d..4fe364ea88a 100644 --- a/FileIO/XmlIO/Boost/BoostXmlGmlInterface.h +++ b/FileIO/XmlIO/Boost/BoostXmlGmlInterface.h @@ -20,7 +20,7 @@ #include <vector> -#include "BaseLib/ConfigTreeNew.h" +#include "BaseLib/ConfigTree.h" #include "FileIO/XmlIO/XMLInterface.h" namespace GeoLib diff --git a/MathLib/LinAlg/Eigen/EigenLinearSolver.cpp b/MathLib/LinAlg/Eigen/EigenLinearSolver.cpp index e8ebda34ad8..cf975bed091 100644 --- a/MathLib/LinAlg/Eigen/EigenLinearSolver.cpp +++ b/MathLib/LinAlg/Eigen/EigenLinearSolver.cpp @@ -11,7 +11,7 @@ #include <logog/include/logog.hpp> -#include "BaseLib/ConfigTreeNew.h" +#include "BaseLib/ConfigTree.h" #include "EigenVector.h" #include "EigenMatrix.h" #include "EigenTools.h" diff --git a/MathLib/LinAlg/Eigen/EigenLinearSolver.h b/MathLib/LinAlg/Eigen/EigenLinearSolver.h index 5a6bbc56cca..4b8d2992517 100644 --- a/MathLib/LinAlg/Eigen/EigenLinearSolver.h +++ b/MathLib/LinAlg/Eigen/EigenLinearSolver.h @@ -13,7 +13,7 @@ #include <vector> -#include "BaseLib/ConfigTreeNew.h" +#include "BaseLib/ConfigTree.h" #include "EigenVector.h" #include "EigenOption.h" diff --git a/MathLib/LinAlg/EigenLis/EigenLisLinearSolver.cpp b/MathLib/LinAlg/EigenLis/EigenLisLinearSolver.cpp index e51b6a64484..a8147a30487 100644 --- a/MathLib/LinAlg/EigenLis/EigenLisLinearSolver.cpp +++ b/MathLib/LinAlg/EigenLis/EigenLisLinearSolver.cpp @@ -14,7 +14,7 @@ #endif #include <logog/include/logog.hpp> -#include "BaseLib/ConfigTreeNew.h" +#include "BaseLib/ConfigTree.h" #include "MathLib/LinAlg/Eigen/EigenMatrix.h" #include "MathLib/LinAlg/Eigen/EigenVector.h" #include "MathLib/LinAlg/Lis/LisMatrix.h" diff --git a/MathLib/LinAlg/EigenLis/EigenLisLinearSolver.h b/MathLib/LinAlg/EigenLis/EigenLisLinearSolver.h index 03c7f24eb56..bbe710b9f86 100644 --- a/MathLib/LinAlg/EigenLis/EigenLisLinearSolver.h +++ b/MathLib/LinAlg/EigenLis/EigenLisLinearSolver.h @@ -14,7 +14,7 @@ #include <lis.h> -#include "BaseLib/ConfigTreeNew.h" +#include "BaseLib/ConfigTree.h" #include "MathLib/LinAlg/Lis/LisOption.h" namespace MathLib diff --git a/MathLib/LinAlg/LinearSolverOptions.h b/MathLib/LinAlg/LinearSolverOptions.h index 33133ba5175..9a3156b05c8 100644 --- a/MathLib/LinAlg/LinearSolverOptions.h +++ b/MathLib/LinAlg/LinearSolverOptions.h @@ -1,6 +1,6 @@ #pragma once -#include "BaseLib/ConfigTreeNew.h" +#include "BaseLib/ConfigTree.h" namespace MathLib { diff --git a/MathLib/LinAlg/Lis/LisLinearSolver.h b/MathLib/LinAlg/Lis/LisLinearSolver.h index 96b65dc8c11..7f2db77d7d1 100644 --- a/MathLib/LinAlg/Lis/LisLinearSolver.h +++ b/MathLib/LinAlg/Lis/LisLinearSolver.h @@ -20,7 +20,7 @@ #include <lis.h> -#include "BaseLib/ConfigTreeNew.h" +#include "BaseLib/ConfigTree.h" #include "LisOption.h" #include "LisVector.h" diff --git a/MathLib/LinAlg/Lis/LisOption.h b/MathLib/LinAlg/Lis/LisOption.h index a12d8a56a01..74776c98bd7 100644 --- a/MathLib/LinAlg/Lis/LisOption.h +++ b/MathLib/LinAlg/Lis/LisOption.h @@ -20,7 +20,7 @@ #include <logog/include/logog.hpp> -#include "BaseLib/ConfigTreeNew.h" +#include "BaseLib/ConfigTree.h" #include "MathLib/LinAlg/LinearSolverOptions.h" namespace MathLib diff --git a/MathLib/LinAlg/PETSc/PETScLinearSolver.h b/MathLib/LinAlg/PETSc/PETScLinearSolver.h index 35010ab6e51..01719de7df0 100644 --- a/MathLib/LinAlg/PETSc/PETScLinearSolver.h +++ b/MathLib/LinAlg/PETSc/PETScLinearSolver.h @@ -23,7 +23,7 @@ #include "logog/include/logog.hpp" -#include "BaseLib/ConfigTreeNew.h" +#include "BaseLib/ConfigTree.h" #include "PETScMatrix.h" #include "PETScVector.h" diff --git a/MathLib/LinAlg/Solvers/GaussAlgorithm.h b/MathLib/LinAlg/Solvers/GaussAlgorithm.h index 3f52e7ed485..21b045aab2d 100644 --- a/MathLib/LinAlg/Solvers/GaussAlgorithm.h +++ b/MathLib/LinAlg/Solvers/GaussAlgorithm.h @@ -18,7 +18,7 @@ #include <cstddef> -#include "BaseLib/ConfigTreeNew.h" +#include "BaseLib/ConfigTree.h" #include "../Dense/DenseMatrix.h" #include "TriangularSolve.h" diff --git a/NumLib/TimeStepping/Algorithms/FixedTimeStepping.cpp b/NumLib/TimeStepping/Algorithms/FixedTimeStepping.cpp index 63e84648b1f..999dcb23eaa 100644 --- a/NumLib/TimeStepping/Algorithms/FixedTimeStepping.cpp +++ b/NumLib/TimeStepping/Algorithms/FixedTimeStepping.cpp @@ -17,7 +17,7 @@ #include <limits> #include <cassert> -#include "BaseLib/ConfigTreeNew.h" +#include "BaseLib/ConfigTree.h" #include "logog/include/logog.hpp" namespace NumLib diff --git a/NumLib/TimeStepping/Algorithms/FixedTimeStepping.h b/NumLib/TimeStepping/Algorithms/FixedTimeStepping.h index ff892c927bc..c54ec87ce83 100644 --- a/NumLib/TimeStepping/Algorithms/FixedTimeStepping.h +++ b/NumLib/TimeStepping/Algorithms/FixedTimeStepping.h @@ -14,7 +14,7 @@ #include <vector> -#include "BaseLib/ConfigTreeNew.h" +#include "BaseLib/ConfigTree.h" #include "ITimeStepAlgorithm.h" namespace NumLib diff --git a/ProcessLib/InitialCondition.cpp b/ProcessLib/InitialCondition.cpp index 89f5e10b9cd..159736c54a2 100644 --- a/ProcessLib/InitialCondition.cpp +++ b/ProcessLib/InitialCondition.cpp @@ -16,7 +16,7 @@ #include "MeshLib/Elements/Element.h" #include "MeshLib/Mesh.h" -#include "BaseLib/ConfigTreeNew.h" +#include "BaseLib/ConfigTree.h" namespace ProcessLib { diff --git a/ProcessLib/InitialCondition.h b/ProcessLib/InitialCondition.h index 850da20fa27..a0a82855115 100644 --- a/ProcessLib/InitialCondition.h +++ b/ProcessLib/InitialCondition.h @@ -11,7 +11,7 @@ #define PROCESS_LIB_INITIAL_CONDITION_H_ #include <cassert> -#include "BaseLib/ConfigTreeNew.h" +#include "BaseLib/ConfigTree.h" #include "MeshLib/Node.h" #include "MeshLib/PropertyVector.h" diff --git a/ProcessLib/NeumannBcConfig.h b/ProcessLib/NeumannBcConfig.h index 2ac0ef47bdb..1664b26fb0f 100644 --- a/ProcessLib/NeumannBcConfig.h +++ b/ProcessLib/NeumannBcConfig.h @@ -12,7 +12,7 @@ #include "logog/include/logog.hpp" -#include "BaseLib/ConfigTreeNew.h" +#include "BaseLib/ConfigTree.h" #include "MathLib/ConstantFunction.h" #include "MeshGeoToolsLib/BoundaryElementsSearcher.h" #include "MeshLib/Elements/Element.h" diff --git a/ProcessLib/Parameter.h b/ProcessLib/Parameter.h index 9d7555c3204..4a3d09753cd 100644 --- a/ProcessLib/Parameter.h +++ b/ProcessLib/Parameter.h @@ -15,7 +15,7 @@ #include <logog/include/logog.hpp> #include <boost/optional.hpp> -#include "BaseLib/ConfigTreeNew.h" +#include "BaseLib/ConfigTree.h" #include "MeshLib/Elements/Element.h" namespace MeshLib diff --git a/ProcessLib/Process.h b/ProcessLib/Process.h index 8828b124915..ae2c5a9f490 100644 --- a/ProcessLib/Process.h +++ b/ProcessLib/Process.h @@ -19,7 +19,7 @@ #include "AssemblerLib/ComputeSparsityPattern.h" #include "AssemblerLib/LocalToGlobalIndexMap.h" #include "AssemblerLib/VectorMatrixAssembler.h" -#include "BaseLib/ConfigTreeNew.h" +#include "BaseLib/ConfigTree.h" #include "FileIO/VtkIO/VtuInterface.h" #include "MathLib/LinAlg/ApplyKnownSolution.h" #include "MathLib/LinAlg/SetMatrixSparsity.h" diff --git a/ProcessLib/ProcessVariable.cpp b/ProcessLib/ProcessVariable.cpp index 51f70ee6c95..d873d937d0c 100644 --- a/ProcessLib/ProcessVariable.cpp +++ b/ProcessLib/ProcessVariable.cpp @@ -14,7 +14,7 @@ #include "GeoLib/GEOObjects.h" #include "MeshLib/Mesh.h" -#include "BaseLib/ConfigTreeNew.h" +#include "BaseLib/ConfigTree.h" namespace ProcessLib { diff --git a/ProcessLib/UniformDirichletBoundaryCondition.h b/ProcessLib/UniformDirichletBoundaryCondition.h index 3078bf2a2b4..80627072198 100644 --- a/ProcessLib/UniformDirichletBoundaryCondition.h +++ b/ProcessLib/UniformDirichletBoundaryCondition.h @@ -17,7 +17,7 @@ #include "NumericsConfig.h" // for GlobalIndexType -#include "BaseLib/ConfigTreeNew.h" +#include "BaseLib/ConfigTree.h" #include "AssemblerLib/LocalToGlobalIndexMap.h" #include "MeshGeoToolsLib/MeshNodeSearcher.h" diff --git a/Tests/BaseLib/TestConfigTree.cpp b/Tests/BaseLib/TestConfigTree.cpp index 0b0e627febf..d92e7eb411f 100644 --- a/Tests/BaseLib/TestConfigTree.cpp +++ b/Tests/BaseLib/TestConfigTree.cpp @@ -13,7 +13,7 @@ #include <boost/property_tree/xml_parser.hpp> #include <sstream> -#include "BaseLib/ConfigTreeNew.h" +#include "BaseLib/ConfigTree.h" // make useful line numbers appear in the output of gtest #define EXPECT_ERR_WARN(cbs, error, warning) do { \ -- GitLab