Started switching OpenSpace projects to nested namespaces

Various cleanups
This commit is contained in:
Alexander Bock
2017-07-15 20:01:55 -04:00
parent 9d4215695d
commit 4dba552fd1
331 changed files with 1126 additions and 1917 deletions

View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -38,7 +38,7 @@
#include <iostream>
namespace {
const std::string _loggerCat = "TransferFunction";
const char* _loggerCat = "TransferFunction";
ghoul::opengl::Texture::FilterMode filtermode = ghoul::opengl::Texture::FilterMode::Linear;
ghoul::opengl::Texture::WrappingMode wrappingmode = ghoul::opengl::Texture::WrappingMode::ClampToEdge;
@@ -52,11 +52,11 @@ namespace {
return false;
}
}
}
} // namespace
namespace openspace {
TransferFunction::TransferFunction(const std::string& filepath, TfChangedCallback tfChangedCallback) : _filepath(filepath) {
setPath(filepath);
setCallback(tfChangedCallback);