diff --git a/apps/OpenSpace/main.cpp b/apps/OpenSpace/main.cpp index 986a1908fc..0e3594f689 100644 --- a/apps/OpenSpace/main.cpp +++ b/apps/OpenSpace/main.cpp @@ -67,11 +67,11 @@ namespace { -const char* _loggerCat = "main"; +constexpr const char* _loggerCat = "main"; sgct::Engine* SgctEngine; -const char* OpenVRTag = "OpenVR"; -const char* SpoutTag = "Spout"; +constexpr const char* OpenVRTag = "OpenVR"; +constexpr const char* SpoutTag = "Spout"; #ifdef WIN32 diff --git a/ext/ghoul b/ext/ghoul index 6223b049a2..7a4076c453 160000 --- a/ext/ghoul +++ b/ext/ghoul @@ -1 +1 @@ -Subproject commit 6223b049a2052910a99e5956b183a2d30c30d836 +Subproject commit 7a4076c453a58ac750feb08f9e93d0bde3fd2e1d diff --git a/modules/base/rendering/modelgeometry.cpp b/modules/base/rendering/modelgeometry.cpp index 05897f1ba7..76b463aa30 100644 --- a/modules/base/rendering/modelgeometry.cpp +++ b/modules/base/rendering/modelgeometry.cpp @@ -36,11 +36,11 @@ #include namespace { - const char* _loggerCat = "ModelGeometry"; + constexpr const char* _loggerCat = "ModelGeometry"; - const char* KeyType = "Type"; - const char* KeyGeomModelFile = "GeometryFile"; - const int8_t CurrentCacheVersion = 3; + constexpr const char* KeyType = "Type"; + constexpr const char* KeyGeomModelFile = "GeometryFile"; + constexpr const int8_t CurrentCacheVersion = 3; } // namespace namespace openspace::modelgeometry { diff --git a/modules/debugging/rendering/debugrenderer.cpp b/modules/debugging/rendering/debugrenderer.cpp index 5f6ebcc8ac..d29a1c24a8 100644 --- a/modules/debugging/rendering/debugrenderer.cpp +++ b/modules/debugging/rendering/debugrenderer.cpp @@ -35,7 +35,7 @@ #include namespace { - const char* _loggerCat = "DebugRenderer"; + constexpr const char* _loggerCat = "DebugRenderer"; } // namespace namespace openspace { diff --git a/modules/digitaluniverse/rendering/renderablebillboardscloud.cpp b/modules/digitaluniverse/rendering/renderablebillboardscloud.cpp index 2700b1f5f1..b931e75ee6 100644 --- a/modules/digitaluniverse/rendering/renderablebillboardscloud.cpp +++ b/modules/digitaluniverse/rendering/renderablebillboardscloud.cpp @@ -49,20 +49,20 @@ #include namespace { - const char* _loggerCat = "RenderableBillboardsCloud"; - const char* KeyFile = "File"; - const char* keyColor = "Color"; - const char* keyUnit = "Unit"; - const char* MeterUnit = "m"; - const char* KilometerUnit = "Km"; - const char* ParsecUnit = "pc"; - const char* KiloparsecUnit = "Kpc"; - const char* MegaparsecUnit = "Mpc"; - const char* GigaparsecUnit = "Gpc"; - const char* GigalightyearUnit = "Gly"; + constexpr const char* _loggerCat = "RenderableBillboardsCloud"; + constexpr const char* KeyFile = "File"; + constexpr const char* keyColor = "Color"; + constexpr const char* keyUnit = "Unit"; + constexpr const char* MeterUnit = "m"; + constexpr const char* KilometerUnit = "Km"; + constexpr const char* ParsecUnit = "pc"; + constexpr const char* KiloparsecUnit = "Kpc"; + constexpr const char* MegaparsecUnit = "Mpc"; + constexpr const char* GigaparsecUnit = "Gpc"; + constexpr const char* GigalightyearUnit = "Gly"; - const int8_t CurrentCacheVersion = 1; - const double PARSEC = 0.308567756E17; + constexpr int8_t CurrentCacheVersion = 1; + constexpr double PARSEC = 0.308567756E17; static const openspace::properties::Property::PropertyInfo SpriteTextureInfo = { "Texture", diff --git a/modules/digitaluniverse/rendering/renderabledumeshes.cpp b/modules/digitaluniverse/rendering/renderabledumeshes.cpp index bef3fa63e4..04f9183b0f 100644 --- a/modules/digitaluniverse/rendering/renderabledumeshes.cpp +++ b/modules/digitaluniverse/rendering/renderabledumeshes.cpp @@ -47,19 +47,19 @@ #include namespace { - const char* _loggerCat = "RenderableDUMeshes"; - const char* KeyFile = "File"; - const char* keyColor = "Color"; - const char* keyUnit = "Unit"; - const char* MeterUnit = "m"; - const char* KilometerUnit = "Km"; - const char* ParsecUnit = "pc"; - const char* KiloparsecUnit = "Kpc"; - const char* MegaparsecUnit = "Mpc"; - const char* GigaparsecUnit = "Gpc"; - const char* GigalightyearUnit = "Gly"; + constexpr const char* _loggerCat = "RenderableDUMeshes"; + constexpr const char* KeyFile = "File"; + constexpr const char* keyColor = "Color"; + constexpr const char* keyUnit = "Unit"; + constexpr const char* MeterUnit = "m"; + constexpr const char* KilometerUnit = "Km"; + constexpr const char* ParsecUnit = "pc"; + constexpr const char* KiloparsecUnit = "Kpc"; + constexpr const char* MegaparsecUnit = "Mpc"; + constexpr const char* GigaparsecUnit = "Gpc"; + constexpr const char* GigalightyearUnit = "Gly"; - const int8_t CurrentCacheVersion = 1; + constexpr const int8_t CurrentCacheVersion = 1; const float PARSEC = 0.308567756E17; static const openspace::properties::Property::PropertyInfo TransparencyInfo = { diff --git a/modules/digitaluniverse/rendering/renderableplanescloud.cpp b/modules/digitaluniverse/rendering/renderableplanescloud.cpp index 2a6612c8cd..c2d2afbf0a 100644 --- a/modules/digitaluniverse/rendering/renderableplanescloud.cpp +++ b/modules/digitaluniverse/rendering/renderableplanescloud.cpp @@ -49,19 +49,19 @@ #include namespace { - const char* _loggerCat = "RenderablePlanesCloud"; - const char* KeyFile = "File"; - const char* keyUnit = "Unit"; - const char* MeterUnit = "m"; - const char* KilometerUnit = "Km"; - const char* ParsecUnit = "pc"; - const char* KiloparsecUnit = "Kpc"; - const char* MegaparsecUnit = "Mpc"; - const char* GigaparsecUnit = "Gpc"; - const char* GigalightyearUnit = "Gly"; + constexpr const char* _loggerCat = "RenderablePlanesCloud"; + constexpr const char* KeyFile = "File"; + constexpr const char* keyUnit = "Unit"; + constexpr const char* MeterUnit = "m"; + constexpr const char* KilometerUnit = "Km"; + constexpr const char* ParsecUnit = "pc"; + constexpr const char* KiloparsecUnit = "Kpc"; + constexpr const char* MegaparsecUnit = "Mpc"; + constexpr const char* GigaparsecUnit = "Gpc"; + constexpr const char* GigalightyearUnit = "Gly"; - const int8_t CurrentCacheVersion = 2; - const float PARSEC = 0.308567756E17f; + constexpr int8_t CurrentCacheVersion = 2; + constexpr float PARSEC = 0.308567756E17f; enum BlendMode { BlendModeNormal = 0, diff --git a/modules/digitaluniverse/rendering/renderablepoints.cpp b/modules/digitaluniverse/rendering/renderablepoints.cpp index 0724b35305..4f84585cc4 100644 --- a/modules/digitaluniverse/rendering/renderablepoints.cpp +++ b/modules/digitaluniverse/rendering/renderablepoints.cpp @@ -44,20 +44,20 @@ #include namespace { - const char* _loggerCat = "RenderablePoints"; - const char* KeyFile = "File"; - const char* keyColor = "Color"; - const char* keyUnit = "Unit"; - const char* MeterUnit = "m"; - const char* KilometerUnit = "Km"; - const char* ParsecUnit = "pc"; - const char* KiloparsecUnit = "Kpc"; - const char* MegaparsecUnit = "Mpc"; - const char* GigaparsecUnit = "Gpc"; - const char* GigalightyearUnit = "Gly"; + constexpr const char* _loggerCat = "RenderablePoints"; + constexpr const char* KeyFile = "File"; + constexpr const char* keyColor = "Color"; + constexpr const char* keyUnit = "Unit"; + constexpr const char* MeterUnit = "m"; + constexpr const char* KilometerUnit = "Km"; + constexpr const char* ParsecUnit = "pc"; + constexpr const char* KiloparsecUnit = "Kpc"; + constexpr const char* MegaparsecUnit = "Mpc"; + constexpr const char* GigaparsecUnit = "Gpc"; + constexpr const char* GigalightyearUnit = "Gly"; - const int8_t CurrentCacheVersion = 1; - const double PARSEC = 0.308567756E17; + constexpr int8_t CurrentCacheVersion = 1; + constexpr double PARSEC = 0.308567756E17; static const openspace::properties::Property::PropertyInfo SpriteTextureInfo = { "Texture", diff --git a/modules/fieldlinessequence/util/fieldlinesstate.cpp b/modules/fieldlinessequence/util/fieldlinesstate.cpp index d55ba96569..2c07472ba7 100644 --- a/modules/fieldlinessequence/util/fieldlinesstate.cpp +++ b/modules/fieldlinessequence/util/fieldlinesstate.cpp @@ -33,10 +33,10 @@ #include namespace { - const char* _loggerCat = "FieldlinesState"; - const int CurrentVersion = 0; + constexpr const char* _loggerCat = "FieldlinesState"; + constexpr const int CurrentVersion = 0; using json = nlohmann::json; -} +} // namespace namespace openspace { diff --git a/modules/globebrowsing/cache/memoryawaretilecache.cpp b/modules/globebrowsing/cache/memoryawaretilecache.cpp index ab4cf6ec52..65d75d83bc 100644 --- a/modules/globebrowsing/cache/memoryawaretilecache.cpp +++ b/modules/globebrowsing/cache/memoryawaretilecache.cpp @@ -36,7 +36,7 @@ #include namespace { - const char* _loggerCat = "MemoryAwareTileCache"; + constexpr const char* _loggerCat = "MemoryAwareTileCache"; static const openspace::properties::Property::PropertyInfo CpuAllocatedDataInfo = { "CpuAllocatedTileData", diff --git a/modules/globebrowsing/globebrowsingmodule.cpp b/modules/globebrowsing/globebrowsingmodule.cpp index b8fd5a5626..d3bed24ac7 100644 --- a/modules/globebrowsing/globebrowsingmodule.cpp +++ b/modules/globebrowsing/globebrowsingmodule.cpp @@ -60,7 +60,7 @@ #include "globebrowsingmodule_lua.inl" namespace { - const char* _loggerCat = "GlobeBrowsingModule"; + constexpr const char* _loggerCat = "GlobeBrowsingModule"; #ifdef GLOBEBROWSING_USE_GDAL openspace::GlobeBrowsingModule::Capabilities diff --git a/modules/globebrowsing/meshes/trianglesoup.cpp b/modules/globebrowsing/meshes/trianglesoup.cpp index 7ae355db65..bc5bf4e7ed 100644 --- a/modules/globebrowsing/meshes/trianglesoup.cpp +++ b/modules/globebrowsing/meshes/trianglesoup.cpp @@ -27,7 +27,7 @@ #include namespace { - const char* _loggerCat = "TriangleSoup"; + constexpr const char* _loggerCat = "TriangleSoup"; } namespace openspace::globebrowsing { diff --git a/modules/globebrowsing/other/pixelbuffer.cpp b/modules/globebrowsing/other/pixelbuffer.cpp index 001a2a8018..70ff7480f0 100644 --- a/modules/globebrowsing/other/pixelbuffer.cpp +++ b/modules/globebrowsing/other/pixelbuffer.cpp @@ -26,7 +26,7 @@ #include namespace { - const char* _loggerCat = "PixelBuffer"; + constexpr const char* _loggerCat = "PixelBuffer"; } // namespace namespace openspace::globebrowsing { diff --git a/modules/globebrowsing/rendering/layer/layer.cpp b/modules/globebrowsing/rendering/layer/layer.cpp index 76fe4e1766..5ccd0a997c 100644 --- a/modules/globebrowsing/rendering/layer/layer.cpp +++ b/modules/globebrowsing/rendering/layer/layer.cpp @@ -32,16 +32,16 @@ namespace openspace::globebrowsing { namespace { - const char* _loggerCat = "Layer"; + constexpr const char* _loggerCat = "Layer"; - const char* keyName = "Name"; - const char* keyDescription = "Description"; - const char* keyEnabled = "Enabled"; - const char* keyLayerGroupID = "LayerGroupID"; - const char* keySettings = "Settings"; - const char* keyAdjustment = "Adjustment"; - const char* KeyBlendMode = "BlendMode"; - const char* KeyPadTiles = "PadTiles"; + constexpr const char* keyName = "Name"; + constexpr const char* keyDescription = "Description"; + constexpr const char* keyEnabled = "Enabled"; + constexpr const char* keyLayerGroupID = "LayerGroupID"; + constexpr const char* keySettings = "Settings"; + constexpr const char* keyAdjustment = "Adjustment"; + constexpr const char* KeyBlendMode = "BlendMode"; + constexpr const char* KeyPadTiles = "PadTiles"; static const openspace::properties::Property::PropertyInfo TypeInfo = { "Type", diff --git a/modules/globebrowsing/rendering/layer/layergroup.cpp b/modules/globebrowsing/rendering/layer/layergroup.cpp index df0105a357..2fda7d9674 100644 --- a/modules/globebrowsing/rendering/layer/layergroup.cpp +++ b/modules/globebrowsing/rendering/layer/layergroup.cpp @@ -27,8 +27,9 @@ #include namespace { - const char* _loggerCat = "LayerGroup"; - const char* KeyFallback = "Fallback"; + constexpr const char* _loggerCat = "LayerGroup"; + constexpr const char* KeyFallback = "Fallback"; + static const openspace::properties::Property::PropertyInfo BlendTileInfo = { "BlendTileLevels", "Blend between levels", diff --git a/modules/globebrowsing/rendering/layer/layermanager.cpp b/modules/globebrowsing/rendering/layer/layermanager.cpp index d3a870d063..ff7208e526 100644 --- a/modules/globebrowsing/rendering/layer/layermanager.cpp +++ b/modules/globebrowsing/rendering/layer/layermanager.cpp @@ -29,7 +29,7 @@ #include namespace { - const char* _loggerCat = "LayerManager"; + constexpr const char* _loggerCat = "LayerManager"; } // namespace namespace openspace::globebrowsing { diff --git a/modules/globebrowsing/tile/asynctiledataprovider.cpp b/modules/globebrowsing/tile/asynctiledataprovider.cpp index 990752cecd..2be127d321 100644 --- a/modules/globebrowsing/tile/asynctiledataprovider.cpp +++ b/modules/globebrowsing/tile/asynctiledataprovider.cpp @@ -40,7 +40,7 @@ namespace openspace::globebrowsing { namespace { - const char* _loggerCat = "AsyncTileDataProvider"; + constexpr const char* _loggerCat = "AsyncTileDataProvider"; } // namespace AsyncTileDataProvider::AsyncTileDataProvider(const std::string& name, diff --git a/modules/globebrowsing/tile/rawtiledatareader/gdalwrapper.cpp b/modules/globebrowsing/tile/rawtiledatareader/gdalwrapper.cpp index 0dbfd0fbdf..c919f67877 100644 --- a/modules/globebrowsing/tile/rawtiledatareader/gdalwrapper.cpp +++ b/modules/globebrowsing/tile/rawtiledatareader/gdalwrapper.cpp @@ -46,7 +46,7 @@ #endif // WIN32 namespace { - const char* _loggerCat = "GdalWrapper"; + constexpr const char* _loggerCat = "GdalWrapper"; static const openspace::properties::Property::PropertyInfo LogGdalErrorInfo = { "LogGdalErrors", diff --git a/modules/globebrowsing/tile/rawtiledatareader/tiledatatype.cpp b/modules/globebrowsing/tile/rawtiledatareader/tiledatatype.cpp index ae7b55fe98..8d585addbe 100644 --- a/modules/globebrowsing/tile/rawtiledatareader/tiledatatype.cpp +++ b/modules/globebrowsing/tile/rawtiledatareader/tiledatatype.cpp @@ -41,7 +41,7 @@ #include namespace { - const char* _loggerCat = "TileDataType"; + constexpr const char* _loggerCat = "TileDataType"; } // namespace namespace openspace::globebrowsing::tiledatatype { diff --git a/modules/globebrowsing/tile/tileprovider/temporaltileprovider.cpp b/modules/globebrowsing/tile/tileprovider/temporaltileprovider.cpp index 60a3eeb5d2..952fb9160b 100644 --- a/modules/globebrowsing/tile/tileprovider/temporaltileprovider.cpp +++ b/modules/globebrowsing/tile/tileprovider/temporaltileprovider.cpp @@ -36,12 +36,12 @@ #include namespace { - const char* _loggerCat = "TemporalTileProvider"; + constexpr const char* _loggerCat = "TemporalTileProvider"; - const char* KeyFilePath = "FilePath"; - const char* KeyBasePath = "BasePath"; - const char* KeyPreCacheStartTime = "PreCacheStartTime"; - const char* KeyPreCacheEndTime = "PreCacheEndTime"; + constexpr const char* KeyFilePath = "FilePath"; + constexpr const char* KeyBasePath = "BasePath"; + constexpr const char* KeyPreCacheStartTime = "PreCacheStartTime"; + constexpr const char* KeyPreCacheEndTime = "PreCacheEndTime"; static const openspace::properties::Property::PropertyInfo FilePathInfo = { "FilePath", diff --git a/modules/iswa/rendering/datacygnet.cpp b/modules/iswa/rendering/datacygnet.cpp index dfa24757a1..3b205187dd 100644 --- a/modules/iswa/rendering/datacygnet.cpp +++ b/modules/iswa/rendering/datacygnet.cpp @@ -33,7 +33,7 @@ #include namespace { - const char* _loggerCat = "DataCygnet"; + constexpr const char* _loggerCat = "DataCygnet"; static const openspace::properties::Property::PropertyInfo DataOptionsInfo = { "DataOptions", diff --git a/modules/iswa/rendering/dataplane.cpp b/modules/iswa/rendering/dataplane.cpp index 5b6659dc2f..805225c5c4 100644 --- a/modules/iswa/rendering/dataplane.cpp +++ b/modules/iswa/rendering/dataplane.cpp @@ -28,7 +28,7 @@ #include namespace { - const char* _loggerCat = "DataPlane"; + constexpr const char* _loggerCat = "DataPlane"; } // namespace namespace openspace { diff --git a/modules/iswa/rendering/datasphere.cpp b/modules/iswa/rendering/datasphere.cpp index ddf7d98326..fe717aab49 100644 --- a/modules/iswa/rendering/datasphere.cpp +++ b/modules/iswa/rendering/datasphere.cpp @@ -34,7 +34,7 @@ #endif namespace { - const char* _loggerCat = "DataSphere"; + constexpr const char* _loggerCat = "DataSphere"; } // namespace namespace openspace { diff --git a/modules/iswa/rendering/iswabasegroup.cpp b/modules/iswa/rendering/iswabasegroup.cpp index e1805de35d..01c22392df 100644 --- a/modules/iswa/rendering/iswabasegroup.cpp +++ b/modules/iswa/rendering/iswabasegroup.cpp @@ -36,7 +36,7 @@ #include namespace { - const char* _loggerCat = "IswaBaseGroup"; + constexpr const char* _loggerCat = "IswaBaseGroup"; using json = nlohmann::json; static const openspace::properties::Property::PropertyInfo EnabledInfo = { diff --git a/modules/iswa/rendering/iswacygnet.cpp b/modules/iswa/rendering/iswacygnet.cpp index a3fac10b68..208709f1db 100644 --- a/modules/iswa/rendering/iswacygnet.cpp +++ b/modules/iswa/rendering/iswacygnet.cpp @@ -34,7 +34,7 @@ #include namespace { - const char* _loggerCat = "IswaCygnet"; + constexpr const char* _loggerCat = "IswaCygnet"; static const openspace::properties::Property::PropertyInfo DeleteInfo = { "Delete", diff --git a/modules/iswa/rendering/iswadatagroup.cpp b/modules/iswa/rendering/iswadatagroup.cpp index 9b6dfaf0a0..13294de9ad 100644 --- a/modules/iswa/rendering/iswadatagroup.cpp +++ b/modules/iswa/rendering/iswadatagroup.cpp @@ -36,7 +36,7 @@ #include namespace { - const char* _loggerCat = "IswaDataGroup"; + constexpr const char* _loggerCat = "IswaDataGroup"; using json = nlohmann::json; static const openspace::properties::Property::PropertyInfo UseLogInfo = { diff --git a/modules/iswa/rendering/iswakameleongroup.cpp b/modules/iswa/rendering/iswakameleongroup.cpp index 303a4baa1b..db56f72679 100644 --- a/modules/iswa/rendering/iswakameleongroup.cpp +++ b/modules/iswa/rendering/iswakameleongroup.cpp @@ -36,7 +36,7 @@ #include namespace { - const char* _loggerCat = "IswaDataGroup"; + constexpr const char* _loggerCat = "IswaDataGroup"; using json = nlohmann::json; static const openspace::properties::Property::PropertyInfo ResolutionInfo = { diff --git a/modules/iswa/rendering/kameleonplane.cpp b/modules/iswa/rendering/kameleonplane.cpp index 950af58866..c9a1d3a5d1 100644 --- a/modules/iswa/rendering/kameleonplane.cpp +++ b/modules/iswa/rendering/kameleonplane.cpp @@ -32,7 +32,7 @@ namespace { using json = nlohmann::json; - const char* _loggerCat = "KameleonPlane"; + constexpr const char* _loggerCat = "KameleonPlane"; static const openspace::properties::Property::PropertyInfo FieldLineSeedsInfo = { "FieldlineSeedsIndexFile", diff --git a/modules/iswa/rendering/screenspacecygnet.cpp b/modules/iswa/rendering/screenspacecygnet.cpp index 28959ffb73..deef63d6aa 100644 --- a/modules/iswa/rendering/screenspacecygnet.cpp +++ b/modules/iswa/rendering/screenspacecygnet.cpp @@ -30,7 +30,7 @@ #include namespace { - const char* _loggerCat = "ScreenSpaceCygnet"; + constexpr const char* _loggerCat = "ScreenSpaceCygnet"; } // namespace namespace openspace { diff --git a/modules/iswa/rendering/texturecygnet.cpp b/modules/iswa/rendering/texturecygnet.cpp index b036fb71ff..7ede52651b 100644 --- a/modules/iswa/rendering/texturecygnet.cpp +++ b/modules/iswa/rendering/texturecygnet.cpp @@ -27,7 +27,7 @@ #include namespace { - const char* _loggerCat = "TextureCygnet"; + constexpr const char* _loggerCat = "TextureCygnet"; } // namespace namespace openspace { diff --git a/modules/iswa/rendering/textureplane.cpp b/modules/iswa/rendering/textureplane.cpp index 74d3567190..2fcddc2b0d 100644 --- a/modules/iswa/rendering/textureplane.cpp +++ b/modules/iswa/rendering/textureplane.cpp @@ -29,7 +29,7 @@ #include namespace { - const char* _loggerCat = "TexturePlane"; + constexpr const char* _loggerCat = "TexturePlane"; } // namespace namespace openspace { diff --git a/modules/iswa/util/dataprocessor.cpp b/modules/iswa/util/dataprocessor.cpp index c061df6e6c..7132ba55a2 100644 --- a/modules/iswa/util/dataprocessor.cpp +++ b/modules/iswa/util/dataprocessor.cpp @@ -28,7 +28,7 @@ #include namespace { - const char* _loggerCat = "DataProcessor"; + constexpr const char* _loggerCat = "DataProcessor"; } // namespace namespace openspace { diff --git a/modules/iswa/util/dataprocessorkameleon.cpp b/modules/iswa/util/dataprocessorkameleon.cpp index a1f572893f..50ab5ca565 100644 --- a/modules/iswa/util/dataprocessorkameleon.cpp +++ b/modules/iswa/util/dataprocessorkameleon.cpp @@ -28,7 +28,7 @@ #include namespace { - const char* _loggerCat = "DataProcessorKameleon"; + constexpr const char* _loggerCat = "DataProcessorKameleon"; } // namespace namespace openspace { diff --git a/modules/iswa/util/dataprocessortext.cpp b/modules/iswa/util/dataprocessortext.cpp index 11a35bc2e5..f2931c99c9 100644 --- a/modules/iswa/util/dataprocessortext.cpp +++ b/modules/iswa/util/dataprocessortext.cpp @@ -33,7 +33,7 @@ //#include namespace { - const char* _loggerCat = "DataProcessorText"; + constexpr const char* _loggerCat = "DataProcessorText"; } // namespace namespace openspace{ diff --git a/modules/iswa/util/iswamanager.cpp b/modules/iswa/util/iswamanager.cpp index 4177affd57..1568916b99 100644 --- a/modules/iswa/util/iswamanager.cpp +++ b/modules/iswa/util/iswamanager.cpp @@ -72,7 +72,7 @@ namespace { using json = nlohmann::json; - const char* _loggerCat = "IswaManager"; + constexpr const char* _loggerCat = "IswaManager"; } // namespace namespace openspace { diff --git a/modules/kameleonvolume/kameleonvolumereader.cpp b/modules/kameleonvolume/kameleonvolumereader.cpp index 5b644adf7d..2cdf3422a6 100644 --- a/modules/kameleonvolume/kameleonvolumereader.cpp +++ b/modules/kameleonvolume/kameleonvolumereader.cpp @@ -44,7 +44,7 @@ #endif // WIN32 namespace { - const char* _loggerCat = "KameleonVolumeReader"; + constexpr const char* _loggerCat = "KameleonVolumeReader"; } // namespace namespace openspace { diff --git a/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp b/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp index 98623b0a98..79da27d01f 100644 --- a/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp +++ b/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp @@ -42,22 +42,22 @@ #include namespace { - const char* _loggerCat = "RenderableKameleonVolume"; + constexpr const char* _loggerCat = "RenderableKameleonVolume"; - const char* KeyDimensions = "Dimensions"; - const char* KeyStepSize = "StepSize"; - const char* KeyTransferFunction = "TransferFunction"; - const char* KeySource = "Source"; - const char* KeyVariable = "Variable"; - const char* KeyLowerDomainBound = "LowerDomainBound"; - const char* KeyUpperDomainBound = "UpperDomainBound"; - const char* KeyDomainScale = "DomainScale"; - const char* KeyLowerValueBound = "LowerValueBound"; - const char* KeyUpperValueBound = "UpperValueBound"; - const char* KeyClipPlanes = "ClipPlanes"; - const char* KeyCache = "Cache"; - const char* KeyGridType = "GridType"; - const char* ValueSphericalGridType = "Spherical"; + constexpr const char* KeyDimensions = "Dimensions"; + constexpr const char* KeyStepSize = "StepSize"; + constexpr const char* KeyTransferFunction = "TransferFunction"; + constexpr const char* KeySource = "Source"; + constexpr const char* KeyVariable = "Variable"; + constexpr const char* KeyLowerDomainBound = "LowerDomainBound"; + constexpr const char* KeyUpperDomainBound = "UpperDomainBound"; + constexpr const char* KeyDomainScale = "DomainScale"; + constexpr const char* KeyLowerValueBound = "LowerValueBound"; + constexpr const char* KeyUpperValueBound = "UpperValueBound"; + constexpr const char* KeyClipPlanes = "ClipPlanes"; + constexpr const char* KeyCache = "Cache"; + constexpr const char* KeyGridType = "GridType"; + constexpr const char* ValueSphericalGridType = "Spherical"; static const openspace::properties::Property::PropertyInfo DimensionsInfo = { "Dimensions", diff --git a/modules/kameleonvolume/tasks/kameleonvolumetorawtask.cpp b/modules/kameleonvolume/tasks/kameleonvolumetorawtask.cpp index 7bd9e672a2..4b8f5a458b 100644 --- a/modules/kameleonvolume/tasks/kameleonvolumetorawtask.cpp +++ b/modules/kameleonvolume/tasks/kameleonvolumetorawtask.cpp @@ -38,19 +38,19 @@ #include namespace { - const char* KeyInput = "Input"; - const char* KeyRawVolumeOutput = "RawVolumeOutput"; - const char* KeyDictionaryOutput = "DictionaryOutput"; - const char* KeyDimensions = "Dimensions"; - const char* KeyVariable = "Variable"; - const char* KeyTime = "Time"; - const char* KeyLowerDomainBound = "LowerDomainBound"; - const char* KeyUpperDomainBound = "UpperDomainBound"; + constexpr const char* KeyInput = "Input"; + constexpr const char* KeyRawVolumeOutput = "RawVolumeOutput"; + constexpr const char* KeyDictionaryOutput = "DictionaryOutput"; + constexpr const char* KeyDimensions = "Dimensions"; + constexpr const char* KeyVariable = "Variable"; + constexpr const char* KeyTime = "Time"; + constexpr const char* KeyLowerDomainBound = "LowerDomainBound"; + constexpr const char* KeyUpperDomainBound = "UpperDomainBound"; - const char* KeyMinValue = "MinValue"; - const char* KeyMaxValue = "MaxValue"; + constexpr const char* KeyMinValue = "MinValue"; + constexpr const char* KeyMaxValue = "MaxValue"; - const char* _loggerCat = "KameleonVolumeToRawTask"; + constexpr const char* _loggerCat = "KameleonVolumeToRawTask"; } // namespace namespace openspace { diff --git a/modules/multiresvolume/rendering/atlasmanager.cpp b/modules/multiresvolume/rendering/atlasmanager.cpp index 389951a69b..7bd6ae71e4 100644 --- a/modules/multiresvolume/rendering/atlasmanager.cpp +++ b/modules/multiresvolume/rendering/atlasmanager.cpp @@ -34,7 +34,7 @@ #include namespace { - const char* _loggerCat = "AtlasManager"; + constexpr const char* _loggerCat = "AtlasManager"; } // namespace namespace openspace { diff --git a/modules/multiresvolume/rendering/brickmanager.cpp b/modules/multiresvolume/rendering/brickmanager.cpp index 1c308ad02d..fcc80f375f 100644 --- a/modules/multiresvolume/rendering/brickmanager.cpp +++ b/modules/multiresvolume/rendering/brickmanager.cpp @@ -32,7 +32,7 @@ #include namespace { - const char* _loggerCat = "BrickManager"; + constexpr const char* _loggerCat = "BrickManager"; } // namespace namespace openspace { diff --git a/modules/multiresvolume/rendering/errorhistogrammanager.cpp b/modules/multiresvolume/rendering/errorhistogrammanager.cpp index 9b230a32f3..78aeec9d17 100644 --- a/modules/multiresvolume/rendering/errorhistogrammanager.cpp +++ b/modules/multiresvolume/rendering/errorhistogrammanager.cpp @@ -35,7 +35,7 @@ #include namespace { - const char* _loggerCat = "ErrorHistogramManager"; + constexpr const char* _loggerCat = "ErrorHistogramManager"; } // namespace namespace openspace { diff --git a/modules/multiresvolume/rendering/histogrammanager.cpp b/modules/multiresvolume/rendering/histogrammanager.cpp index c8d23c4fb5..33662edb27 100644 --- a/modules/multiresvolume/rendering/histogrammanager.cpp +++ b/modules/multiresvolume/rendering/histogrammanager.cpp @@ -31,7 +31,7 @@ #include namespace { - const char* _loggerCat = "HistogramManager"; + constexpr const char* _loggerCat = "HistogramManager"; } // namespace namespace openspace { diff --git a/modules/multiresvolume/rendering/localerrorhistogrammanager.cpp b/modules/multiresvolume/rendering/localerrorhistogrammanager.cpp index a1cca18141..3d0d323f05 100644 --- a/modules/multiresvolume/rendering/localerrorhistogrammanager.cpp +++ b/modules/multiresvolume/rendering/localerrorhistogrammanager.cpp @@ -35,7 +35,7 @@ #include namespace { - const char* _loggerCat = "LocalErrorHistogramManager"; + constexpr const char* _loggerCat = "LocalErrorHistogramManager"; } // namespace namespace openspace { diff --git a/modules/multiresvolume/rendering/localtfbrickselector.cpp b/modules/multiresvolume/rendering/localtfbrickselector.cpp index c5426f95a5..7a1531b18b 100644 --- a/modules/multiresvolume/rendering/localtfbrickselector.cpp +++ b/modules/multiresvolume/rendering/localtfbrickselector.cpp @@ -31,7 +31,7 @@ #include namespace { - const char* _loggerCat = "LocalTfBrickSelector"; + constexpr const char* _loggerCat = "LocalTfBrickSelector"; } // namespace namespace openspace { diff --git a/modules/multiresvolume/rendering/renderablemultiresvolume.cpp b/modules/multiresvolume/rendering/renderablemultiresvolume.cpp index 20244b7ad6..74036467fe 100644 --- a/modules/multiresvolume/rendering/renderablemultiresvolume.cpp +++ b/modules/multiresvolume/rendering/renderablemultiresvolume.cpp @@ -64,19 +64,22 @@ #include namespace { - const char* _loggerCat = "RenderableMultiresVolume"; - const char* KeyDataSource = "Source"; - const char* KeyErrorHistogramsSource = "ErrorHistogramsSource"; - const char* KeyHints = "Hints"; - const char* KeyTransferFunction = "TransferFunction"; + constexpr const char* _loggerCat = "RenderableMultiresVolume"; + constexpr const char* KeyDataSource = "Source"; + constexpr const char* KeyErrorHistogramsSource = "ErrorHistogramsSource"; + constexpr const char* KeyHints = "Hints"; + constexpr const char* KeyTransferFunction = "TransferFunction"; - const char* KeyVolumeName = "VolumeName"; - const char* KeyBrickSelector = "BrickSelector"; - const char* KeyStartTime = "StartTime"; - const char* KeyEndTime = "EndTime"; - const char* GlslHelpersPath = "${MODULES}/multiresvolume/shaders/helpers_fs.glsl"; - const char* GlslHelperPath = "${MODULES}/multiresvolume/shaders/helper.glsl"; - const char* GlslHeaderPath = "${MODULES}/multiresvolume/shaders/header.glsl"; + constexpr const char* KeyVolumeName = "VolumeName"; + constexpr const char* KeyBrickSelector = "BrickSelector"; + constexpr const char* KeyStartTime = "StartTime"; + constexpr const char* KeyEndTime = "EndTime"; + constexpr const char* GlslHelpersPath = + "${MODULES}/multiresvolume/shaders/helpers_fs.glsl"; + constexpr const char* GlslHelperPath = + "${MODULES}/multiresvolume/shaders/helper.glsl"; + constexpr const char* GlslHeaderPath = + "${MODULES}/multiresvolume/shaders/header.glsl"; bool registeredGlslHelpers = false; static const openspace::properties::Property::PropertyInfo StepSizeCoefficientInfo = { diff --git a/modules/multiresvolume/rendering/shenbrickselector.cpp b/modules/multiresvolume/rendering/shenbrickselector.cpp index 2151514dfb..72ab90f144 100644 --- a/modules/multiresvolume/rendering/shenbrickselector.cpp +++ b/modules/multiresvolume/rendering/shenbrickselector.cpp @@ -25,7 +25,7 @@ #include namespace { - const char* _loggerCat = "ShenBrickSelector"; + constexpr const char* _loggerCat = "ShenBrickSelector"; } // namespace namespace openspace { diff --git a/modules/multiresvolume/rendering/simpletfbrickselector.cpp b/modules/multiresvolume/rendering/simpletfbrickselector.cpp index 6e20188591..27bb3f90d3 100644 --- a/modules/multiresvolume/rendering/simpletfbrickselector.cpp +++ b/modules/multiresvolume/rendering/simpletfbrickselector.cpp @@ -32,7 +32,7 @@ #include namespace { - const char* _loggerCat = "SimpleTfBrickSelector"; + constexpr const char* _loggerCat = "SimpleTfBrickSelector"; } // namespace namespace openspace { diff --git a/modules/multiresvolume/rendering/tfbrickselector.cpp b/modules/multiresvolume/rendering/tfbrickselector.cpp index 4406e88f17..8a73be7dc1 100644 --- a/modules/multiresvolume/rendering/tfbrickselector.cpp +++ b/modules/multiresvolume/rendering/tfbrickselector.cpp @@ -31,7 +31,7 @@ #include namespace { - const char* _loggerCat = "TfBrickSelector"; + constexpr const char* _loggerCat = "TfBrickSelector"; } // namespace namespace openspace { diff --git a/modules/multiresvolume/rendering/tsp.cpp b/modules/multiresvolume/rendering/tsp.cpp index b8c280775f..57c2b5c9e7 100644 --- a/modules/multiresvolume/rendering/tsp.cpp +++ b/modules/multiresvolume/rendering/tsp.cpp @@ -34,7 +34,7 @@ #include namespace { - const char* _loggerCat = "TSP"; + constexpr const char* _loggerCat = "TSP"; } // namespace namespace openspace { diff --git a/modules/space/rendering/renderableplanet.cpp b/modules/space/rendering/renderableplanet.cpp index 107dad267c..ad3478efa3 100644 --- a/modules/space/rendering/renderableplanet.cpp +++ b/modules/space/rendering/renderableplanet.cpp @@ -47,14 +47,14 @@ #include namespace { - const char* KeyGeometry = "Geometry"; - const char* KeyRadius = "Radius"; + constexpr const char* KeyGeometry = "Geometry"; + constexpr const char* KeyRadius = "Radius"; - static const char* _loggerCat = "RenderablePlanet"; + constexpr const char* _loggerCat = "RenderablePlanet"; - const char* keyShadowGroup = "Shadow_Group"; - const char* keyShadowSource = "Source"; - const char* keyShadowCaster = "Caster"; + constexpr const char* keyShadowGroup = "Shadow_Group"; + constexpr const char* keyShadowSource = "Source"; + constexpr const char* keyShadowCaster = "Caster"; static const openspace::properties::Property::PropertyInfo ColorTextureInfo = { "ColorTexture", diff --git a/modules/space/rendering/renderablestars.cpp b/modules/space/rendering/renderablestars.cpp index cb1d5f5440..a90e6fc53b 100644 --- a/modules/space/rendering/renderablestars.cpp +++ b/modules/space/rendering/renderablestars.cpp @@ -42,11 +42,11 @@ #include namespace { - const char* _loggerCat = "RenderableStars"; + constexpr const char* _loggerCat = "RenderableStars"; - const char* KeyFile = "File"; + constexpr const char* KeyFile = "File"; - const int8_t CurrentCacheVersion = 1; + constexpr int8_t CurrentCacheVersion = 1; struct ColorVBOLayout { std::array position; // (x,y,z,e) diff --git a/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp b/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp index 268871384e..52f7d53a80 100644 --- a/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp +++ b/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp @@ -43,13 +43,13 @@ #include namespace { - const char* _loggerCat = "RenderableModelProjection"; + constexpr const char* _loggerCat = "RenderableModelProjection"; - const char* keyGeometry = "Geometry"; - const char* keyProjection = "Projection"; - const char* keyBoundingSphereRadius = "BoundingSphereRadius"; + constexpr const char* keyGeometry = "Geometry"; + constexpr const char* keyProjection = "Projection"; + constexpr const char* keyBoundingSphereRadius = "BoundingSphereRadius"; - const char* DestinationFrame = "GALACTIC"; + constexpr const char* DestinationFrame = "GALACTIC"; static const openspace::properties::Property::PropertyInfo ColorTextureInfo = { "ColorTexture", diff --git a/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp b/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp index a08d1cb7eb..4471e33193 100644 --- a/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp +++ b/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp @@ -52,14 +52,14 @@ #endif namespace { - const char* _loggerCat = "RenderablePlanetProjection"; + constexpr const char* _loggerCat = "RenderablePlanetProjection"; - const char* KeyGeometry = "Geometry"; - const char* KeyProjection = "Projection"; + constexpr const char* KeyGeometry = "Geometry"; + constexpr const char* KeyProjection = "Projection"; - const char* KeyRadius = "Geometry.Radius"; + constexpr const char* KeyRadius = "Geometry.Radius"; // const char* keyShading = "PerformShading"; - const char* _mainFrame = "GALACTIC"; + constexpr const char* _mainFrame = "GALACTIC"; static const openspace::properties::Property::PropertyInfo ColorTextureInfo = { "ColorTexture", diff --git a/modules/spacecraftinstruments/util/imagesequencer.cpp b/modules/spacecraftinstruments/util/imagesequencer.cpp index 9561a17c66..09ed0bf9a0 100644 --- a/modules/spacecraftinstruments/util/imagesequencer.cpp +++ b/modules/spacecraftinstruments/util/imagesequencer.cpp @@ -50,7 +50,7 @@ #include namespace { - const char* _loggerCat = "ImageSequencer"; + constexpr const char* _loggerCat = "ImageSequencer"; } // namespace namespace openspace { diff --git a/modules/spacecraftinstruments/util/instrumentdecoder.cpp b/modules/spacecraftinstruments/util/instrumentdecoder.cpp index 7efded955b..9f5a26f8b9 100644 --- a/modules/spacecraftinstruments/util/instrumentdecoder.cpp +++ b/modules/spacecraftinstruments/util/instrumentdecoder.cpp @@ -29,10 +29,10 @@ #include namespace { - const char* _loggerCat = "InstrumentDecoder"; - const char* keyDetector = "DetectorType"; - const char* keySpice = "Spice"; - const char* keyStopCommand = "StopCommand"; + constexpr const char* _loggerCat = "InstrumentDecoder"; + constexpr const char* keyDetector = "DetectorType"; + constexpr const char* keySpice = "Spice"; + constexpr const char* keyStopCommand = "StopCommand"; } // namespace namespace openspace { diff --git a/modules/spacecraftinstruments/util/instrumenttimesparser.cpp b/modules/spacecraftinstruments/util/instrumenttimesparser.cpp index 4490b915e7..7db86b1c5d 100644 --- a/modules/spacecraftinstruments/util/instrumenttimesparser.cpp +++ b/modules/spacecraftinstruments/util/instrumenttimesparser.cpp @@ -45,13 +45,13 @@ #include namespace { - const char* _loggerCat = "InstrumentTimesParser"; + constexpr const char* _loggerCat = "InstrumentTimesParser"; - const char* PlaybookIdentifierName = "InstrumentTimesParser"; - const char* KeyTargetBody = "Target.Body"; - const char* KeyInstruments = "Instruments"; - const char* KeyInstrument = "Instrument"; - const char* KeyInstrumentFiles = "Files"; + constexpr const char* PlaybookIdentifierName = "InstrumentTimesParser"; + constexpr const char* KeyTargetBody = "Target.Body"; + constexpr const char* KeyInstruments = "Instruments"; + constexpr const char* KeyInstrument = "Instrument"; + constexpr const char* KeyInstrumentFiles = "Files"; } // namespace namespace openspace { diff --git a/modules/spacecraftinstruments/util/labelparser.cpp b/modules/spacecraftinstruments/util/labelparser.cpp index 1a9750ce61..b6a83847dd 100644 --- a/modules/spacecraftinstruments/util/labelparser.cpp +++ b/modules/spacecraftinstruments/util/labelparser.cpp @@ -47,11 +47,11 @@ #include namespace { - const char* _loggerCat = "LabelParser"; - const char* keySpecs = "Read"; - const char* keyConvert = "Convert"; + constexpr const char* _loggerCat = "LabelParser"; + constexpr const char* keySpecs = "Read"; + constexpr const char* keyConvert = "Convert"; - const char* PlaybookIdentifierName = "LabelParser"; + constexpr const char* PlaybookIdentifierName = "LabelParser"; } // namespace namespace openspace { diff --git a/modules/spacecraftinstruments/util/projectioncomponent.cpp b/modules/spacecraftinstruments/util/projectioncomponent.cpp index 3f894ff910..13a058b64a 100644 --- a/modules/spacecraftinstruments/util/projectioncomponent.cpp +++ b/modules/spacecraftinstruments/util/projectioncomponent.cpp @@ -43,34 +43,34 @@ #include namespace { - const char* keyPotentialTargets = "PotentialTargets"; + constexpr const char* keyPotentialTargets = "PotentialTargets"; - const char* keyInstrument = "Instrument.Name"; - const char* keyInstrumentFovy = "Instrument.Fovy"; - const char* keyInstrumentAspect = "Instrument.Aspect"; + constexpr const char* keyInstrument = "Instrument.Name"; + constexpr const char* keyInstrumentFovy = "Instrument.Fovy"; + constexpr const char* keyInstrumentAspect = "Instrument.Aspect"; - const char* keyTranslation = "DataInputTranslation"; + constexpr const char* keyTranslation = "DataInputTranslation"; - const char* keyProjObserver = "Observer"; - const char* keyProjTarget = "Target"; - const char* keyProjAberration = "Aberration"; + constexpr const char* keyProjObserver = "Observer"; + constexpr const char* keyProjTarget = "Target"; + constexpr const char* keyProjAberration = "Aberration"; - const char* keySequenceDir = "Sequence"; - const char* keySequenceType = "SequenceType"; + constexpr const char* keySequenceDir = "Sequence"; + constexpr const char* keySequenceType = "SequenceType"; - const char* keyNeedsTextureMapDilation = "TextureMap"; - const char* keyNeedsShadowing = "ShadowMap"; - const char* keyTextureMapAspectRatio = "AspectRatio"; + constexpr const char* keyNeedsTextureMapDilation = "TextureMap"; + constexpr const char* keyNeedsShadowing = "ShadowMap"; + constexpr const char* keyTextureMapAspectRatio = "AspectRatio"; - const char* sequenceTypeImage = "image-sequence"; - const char* sequenceTypePlaybook = "playbook"; - const char* sequenceTypeHybrid = "hybrid"; - const char* sequenceTypeInstrumentTimes = "instrument-times"; + constexpr const char* sequenceTypeImage = "image-sequence"; + constexpr const char* sequenceTypePlaybook = "playbook"; + constexpr const char* sequenceTypeHybrid = "hybrid"; + constexpr const char* sequenceTypeInstrumentTimes = "instrument-times"; const char* placeholderFile = "${OPENSPACE_DATA}/scene/common/textures/placeholder.png"; - const char* _loggerCat = "ProjectionComponent"; + constexpr const char* _loggerCat = "ProjectionComponent"; static const openspace::properties::Property::PropertyInfo ProjectionInfo = { "PerformProjection", diff --git a/modules/spacecraftinstruments/util/sequenceparser.cpp b/modules/spacecraftinstruments/util/sequenceparser.cpp index fce066925b..afd5b5f037 100644 --- a/modules/spacecraftinstruments/util/sequenceparser.cpp +++ b/modules/spacecraftinstruments/util/sequenceparser.cpp @@ -32,9 +32,9 @@ #include namespace { - const char* _loggerCat = "SequenceParser"; + constexpr const char* _loggerCat = "SequenceParser"; - const char* PlaybookIdentifierName = "Playbook"; + constexpr const char* PlaybookIdentifierName = "Playbook"; } // namespace namespace openspace { diff --git a/modules/touch/src/touchinteraction.cpp b/modules/touch/src/touchinteraction.cpp index 2a1eea319c..9bcb77fe04 100644 --- a/modules/touch/src/touchinteraction.cpp +++ b/modules/touch/src/touchinteraction.cpp @@ -65,7 +65,7 @@ #include namespace { - const char* _loggerCat = "TouchInteraction"; + constexpr const char* _loggerCat = "TouchInteraction"; static const openspace::properties::Property::PropertyInfo OriginInfo = { "Origin", diff --git a/modules/volume/rendering/renderabletimevaryingvolume.cpp b/modules/volume/rendering/renderabletimevaryingvolume.cpp index b2b8e05be9..26f3879d94 100644 --- a/modules/volume/rendering/renderabletimevaryingvolume.cpp +++ b/modules/volume/rendering/renderabletimevaryingvolume.cpp @@ -44,8 +44,8 @@ #include namespace { - const char* _loggerCat = "RenderableTimeVaryingVolume"; -} + constexpr const char* _loggerCat = "RenderableTimeVaryingVolume"; +} // namespace namespace { const char* KeyDimensions = "Dimensions"; diff --git a/src/engine/configurationmanager.cpp b/src/engine/configurationmanager.cpp index d72afc6453..a070a79aed 100644 --- a/src/engine/configurationmanager.cpp +++ b/src/engine/configurationmanager.cpp @@ -153,8 +153,8 @@ void ConfigurationManager::loadFromFile(const string& filename) { ghoul_assert(FileSys.fileExists(filename), "File must exist"); // ${BASE_PATH} - string basePathToken = FileSystem::TokenOpeningBraces + _keyBasePath - + FileSystem::TokenClosingBraces; + string basePathToken = FileSystem::TokenOpeningBraces + string(_keyBasePath) + + FileSystem::TokenClosingBraces; // Retrieving the directory in which the configuration file lies string absolutePath = FileSys.absolutePath(filename); diff --git a/src/engine/downloadmanager.cpp b/src/engine/downloadmanager.cpp index 9f621fdb9c..7155de7979 100644 --- a/src/engine/downloadmanager.cpp +++ b/src/engine/downloadmanager.cpp @@ -49,11 +49,11 @@ #endif namespace { - const char* _loggerCat = "DownloadManager"; + constexpr const char* _loggerCat = "DownloadManager"; - const char* RequestIdentifier = "identifier"; - const char* RequestFileVersion = "file_version"; - const char* RequestApplicationVersion = "application_version"; + constexpr const char* RequestIdentifier = "identifier"; + constexpr const char* RequestFileVersion = "file_version"; + constexpr const char* RequestApplicationVersion = "application_version"; struct ProgressInformation { std::shared_ptr future; diff --git a/src/engine/moduleengine.cpp b/src/engine/moduleengine.cpp index 88e59c8bdf..c636a6ddff 100644 --- a/src/engine/moduleengine.cpp +++ b/src/engine/moduleengine.cpp @@ -35,7 +35,7 @@ #include "moduleengine_lua.inl" namespace { - const char* _loggerCat = "ModuleEngine"; + constexpr const char* _loggerCat = "ModuleEngine"; } // namespace namespace openspace { diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp index 0f629da564..579ac61145 100644 --- a/src/engine/openspaceengine.cpp +++ b/src/engine/openspaceengine.cpp @@ -99,16 +99,16 @@ using namespace ghoul::logging; using namespace ghoul::cmdparser; namespace { - const char* _loggerCat = "OpenSpaceEngine"; - const char* SgctDefaultConfigFile = "${CONFIG}/single.xml"; + constexpr const char* _loggerCat = "OpenSpaceEngine"; + constexpr const char* SgctDefaultConfigFile = "${CONFIG}/single.xml"; - const char* SgctConfigArgumentCommand = "-config"; + constexpr const char* SgctConfigArgumentCommand = "-config"; - const char* PreInitializeFunction = "preInitialization"; - const char* PostInitializationFunction = "postInitialization"; + constexpr const char* PreInitializeFunction = "preInitialization"; + constexpr const char* PostInitializationFunction = "postInitialization"; - const int CacheVersion = 1; - const int DownloadVersion = 1; + constexpr const int CacheVersion = 1; + constexpr const int DownloadVersion = 1; const glm::ivec3 FontAtlasSize{ 1536, 1536, 1 }; @@ -806,26 +806,26 @@ void OpenSpaceEngine::writeDocumentation() { void OpenSpaceEngine::gatherCommandlineArguments() { commandlineArgumentPlaceholders.configurationName = ""; _commandlineParser->addCommand(std::make_unique>( - &commandlineArgumentPlaceholders.configurationName, "-config", "-c", + commandlineArgumentPlaceholders.configurationName, "-config", "-c", "Provides the path to the OpenSpace configuration file" )); commandlineArgumentPlaceholders.sgctConfigurationName = ""; _commandlineParser->addCommand(std::make_unique>( - &commandlineArgumentPlaceholders.sgctConfigurationName, "-sgct", "-s", + commandlineArgumentPlaceholders.sgctConfigurationName, "-sgct", "-s", "Provides the path to the SGCT configuration file, overriding the value set in " "the OpenSpace configuration file" )); commandlineArgumentPlaceholders.sceneName = ""; _commandlineParser->addCommand(std::make_unique>( - &commandlineArgumentPlaceholders.sceneName, "-scene", "", "Provides the path to " + commandlineArgumentPlaceholders.sceneName, "-scene", "", "Provides the path to " "the scene file, overriding the value set in the OpenSpace configuration file" )); commandlineArgumentPlaceholders.cacheFolder = ""; _commandlineParser->addCommand(std::make_unique>( - &commandlineArgumentPlaceholders.cacheFolder, "-cacheDir", "", "Provides the " + commandlineArgumentPlaceholders.cacheFolder, "-cacheDir", "", "Provides the " "path to a cache file, overriding the value set in the OpenSpace configuration " "file" )); diff --git a/src/interaction/navigationhandler.cpp b/src/interaction/navigationhandler.cpp index e370b8268c..95081b5fdd 100644 --- a/src/interaction/navigationhandler.cpp +++ b/src/interaction/navigationhandler.cpp @@ -41,11 +41,11 @@ #include namespace { - const char* _loggerCat = "NavigationHandler"; + constexpr const char* _loggerCat = "NavigationHandler"; - const char* KeyFocus = "Focus"; - const char* KeyPosition = "Position"; - const char* KeyRotation = "Rotation"; + constexpr const char* KeyFocus = "Focus"; + constexpr const char* KeyPosition = "Position"; + constexpr const char* KeyRotation = "Rotation"; static const openspace::properties::Property::PropertyInfo OriginInfo = { "Origin", diff --git a/src/network/networkengine.cpp b/src/network/networkengine.cpp index edea7cc398..c6bf7af2d0 100644 --- a/src/network/networkengine.cpp +++ b/src/network/networkengine.cpp @@ -37,14 +37,14 @@ #include namespace { - const char* _loggerCat = "NetworkEngine"; + constexpr const char* _loggerCat = "NetworkEngine"; - const char* StatusMessageIdentifierName = "StatusMessage"; - const char* MappingIdentifierIdentifierName = "IdentifierMapping"; - const char* InitialMessageFinishedIdentifierName = "InitialMessageFinished"; + constexpr const char* StatusMessageIdentifierName = "StatusMessage"; + constexpr const char* MappingIdentifierIdentifierName = "IdentifierMapping"; + constexpr const char* InitialMessageFinishedIdentifierName = "InitialMessageFinished"; - const char MessageTypeLuaScript = '0'; - const char MessageTypeExternalControlConnected = '1'; + constexpr const char MessageTypeLuaScript = '0'; + constexpr const char MessageTypeExternalControlConnected = '1'; } // namespace namespace openspace { diff --git a/src/network/parallelconnection.cpp b/src/network/parallelconnection.cpp index 2dd3159e37..5f29af4a9f 100644 --- a/src/network/parallelconnection.cpp +++ b/src/network/parallelconnection.cpp @@ -91,9 +91,9 @@ using SocketResultType = size_t; #include "parallelconnection_lua.inl" namespace { - const uint32_t ProtocolVersion = 2; - const size_t MaxLatencyDiffs = 64; - const char* _loggerCat = "ParallelConnection"; + constexpr const uint32_t ProtocolVersion = 2; + constexpr const size_t MaxLatencyDiffs = 64; + constexpr const char* _loggerCat = "ParallelConnection"; static const openspace::properties::Property::PropertyInfo PasswordInfo = { "Password", diff --git a/src/performance/performancemanager.cpp b/src/performance/performancemanager.cpp index a7921bd387..7a6a4abf7a 100644 --- a/src/performance/performancemanager.cpp +++ b/src/performance/performancemanager.cpp @@ -38,13 +38,13 @@ #include namespace { - const char* _loggerCat = "PerformanceManager"; + constexpr const char* _loggerCat = "PerformanceManager"; - const char* GlobalSharedMemoryName = "OpenSpacePerformanceMeasurementData"; + constexpr const char* GlobalSharedMemoryName = "OpenSpacePerformanceMeasurementData"; // Probably 255 performance blocks per node are enough, so we can get away with // 4 bytes (one uint8_t for the number, one uint8_t for the reference count to keep // the global memory alive, and 2 bytes to enforce alignment) - const size_t GlobalSharedMemorySize = 4; + constexpr const size_t GlobalSharedMemorySize = 4; struct GlobalMemory { uint8_t number; @@ -53,7 +53,7 @@ namespace { std::array alignment; }; - const char* LocalSharedMemoryNameBase = "PerformanceMeasurement_"; + constexpr const char* LocalSharedMemoryNameBase = "PerformanceMeasurement_"; } // namespace namespace openspace::performance { diff --git a/src/properties/optionproperty.cpp b/src/properties/optionproperty.cpp index a8eb37745f..81c4661d67 100644 --- a/src/properties/optionproperty.cpp +++ b/src/properties/optionproperty.cpp @@ -25,7 +25,7 @@ #include namespace { - const char* _loggerCat = "OptionProperty"; + constexpr const char* _loggerCat = "OptionProperty"; } // namespace namespace openspace::properties { diff --git a/src/properties/propertyowner.cpp b/src/properties/propertyowner.cpp index 9b5b415ea9..85b7cf984c 100644 --- a/src/properties/propertyowner.cpp +++ b/src/properties/propertyowner.cpp @@ -33,7 +33,7 @@ namespace openspace::properties { namespace { - const char* _loggerCat = "PropertyOwner"; + constexpr const char* _loggerCat = "PropertyOwner"; } // namespace diff --git a/src/properties/selectionproperty.cpp b/src/properties/selectionproperty.cpp index fbde88e714..331e0385e3 100644 --- a/src/properties/selectionproperty.cpp +++ b/src/properties/selectionproperty.cpp @@ -27,7 +27,7 @@ #include namespace { - const char* _loggerCat = "SelectionProperty"; + constexpr const char* _loggerCat = "SelectionProperty"; const char Delimiter = ','; } // namespace diff --git a/src/query/query.cpp b/src/query/query.cpp index 7ce43a5bc3..96eea1328f 100644 --- a/src/query/query.cpp +++ b/src/query/query.cpp @@ -38,7 +38,7 @@ #include namespace { - const char* _loggerCat = "Query"; + constexpr const char* _loggerCat = "Query"; } // namespace namespace openspace { diff --git a/src/rendering/abufferrenderer.cpp b/src/rendering/abufferrenderer.cpp index ba13ab46c3..2ffc7b37d4 100644 --- a/src/rendering/abufferrenderer.cpp +++ b/src/rendering/abufferrenderer.cpp @@ -45,12 +45,14 @@ #include namespace { - const char* _loggerCat = "ABufferRenderer"; - const char* BoundsFragmentShaderPath = "${SHADERS}/abuffer/boundsabuffer.frag"; - const char* RenderFragmentShaderPath = "${SHADERS}/abuffer/renderabuffer.frag"; - const int MaxRaycasters = 32; - const int MaxLayers = 32; - const int MaxAverageLayers = 8; + constexpr const char* _loggerCat = "ABufferRenderer"; + constexpr const char* BoundsFragmentShaderPath = + "${SHADERS}/abuffer/boundsabuffer.frag"; + constexpr const char* RenderFragmentShaderPath = + "${SHADERS}/abuffer/renderabuffer.frag"; + constexpr int MaxRaycasters = 32; + constexpr int MaxLayers = 32; + constexpr int MaxAverageLayers = 8; } // namespace namespace openspace { diff --git a/src/rendering/framebufferrenderer.cpp b/src/rendering/framebufferrenderer.cpp index e0e633c579..82455c01ca 100644 --- a/src/rendering/framebufferrenderer.cpp +++ b/src/rendering/framebufferrenderer.cpp @@ -43,13 +43,14 @@ #include namespace { - const char* _loggerCat = "FramebufferRenderer"; - const char* ExitFragmentShaderPath = "${SHADERS}/framebuffer/exitframebuffer.frag"; - const char* RaycastFragmentShaderPath = + constexpr const char* _loggerCat = "FramebufferRenderer"; + constexpr const char* ExitFragmentShaderPath = + "${SHADERS}/framebuffer/exitframebuffer.frag"; + constexpr const char* RaycastFragmentShaderPath = "${SHADERS}/framebuffer/raycastframebuffer.frag"; - const char* GetEntryInsidePath = "${SHADERS}/framebuffer/inside.glsl"; - const char* GetEntryOutsidePath = "${SHADERS}/framebuffer/outside.glsl"; - const char* RenderFragmentShaderPath = + constexpr const char* GetEntryInsidePath = "${SHADERS}/framebuffer/inside.glsl"; + constexpr const char* GetEntryOutsidePath = "${SHADERS}/framebuffer/outside.glsl"; + constexpr const char* RenderFragmentShaderPath = "${SHADERS}/framebuffer/renderframebuffer.frag"; } // namespace diff --git a/src/rendering/renderable.cpp b/src/rendering/renderable.cpp index 9917f825bb..b5fa2d57df 100644 --- a/src/rendering/renderable.cpp +++ b/src/rendering/renderable.cpp @@ -37,11 +37,11 @@ #include namespace { - const char* _loggerCat = "Renderable"; - const char* keyStart = "StartTime"; - const char* keyEnd = "EndTime"; - const char* KeyType = "Type"; - const char* KeyTag = "Tag"; + constexpr const char* _loggerCat = "Renderable"; + constexpr const char* keyStart = "StartTime"; + constexpr const char* keyEnd = "EndTime"; + constexpr const char* KeyType = "Type"; + constexpr const char* KeyTag = "Tag"; static const openspace::properties::Property::PropertyInfo EnabledInfo = { "Enabled", diff --git a/src/rendering/renderengine.cpp b/src/rendering/renderengine.cpp index e78c58d83d..657d451b09 100644 --- a/src/rendering/renderengine.cpp +++ b/src/rendering/renderengine.cpp @@ -81,15 +81,15 @@ #include "renderengine_lua.inl" namespace { - const char* _loggerCat = "RenderEngine"; + constexpr const char* _loggerCat = "RenderEngine"; - const char* KeyRenderingMethod = "RenderingMethod"; - const std::chrono::seconds ScreenLogTimeToLive(15); - const char* DefaultRenderingMethod = "ABuffer"; - const char* RenderFsPath = "${SHADERS}/render.frag"; + constexpr const char* KeyRenderingMethod = "RenderingMethod"; + constexpr const std::chrono::seconds ScreenLogTimeToLive(15); + constexpr const char* DefaultRenderingMethod = "ABuffer"; + constexpr const char* RenderFsPath = "${SHADERS}/render.frag"; - const char* KeyFontMono = "Mono"; - const char* KeyFontLight = "Light"; + constexpr const char* KeyFontMono = "Mono"; + constexpr const char* KeyFontLight = "Light"; static const openspace::properties::Property::PropertyInfo PerformanceInfo = { "PerformanceMeasurements", diff --git a/src/rendering/transferfunction.cpp b/src/rendering/transferfunction.cpp index 55828788a9..2c0d38f47b 100644 --- a/src/rendering/transferfunction.cpp +++ b/src/rendering/transferfunction.cpp @@ -38,7 +38,7 @@ #include namespace { - const char* _loggerCat = "TransferFunction"; + constexpr const char* _loggerCat = "TransferFunction"; // @TODO Replace with Filesystem::File extension bool hasExtension(const std::string& filepath, const std::string& extension) { diff --git a/src/scene/scene.cpp b/src/scene/scene.cpp index 6ff87f9d0f..415beb7644 100644 --- a/src/scene/scene.cpp +++ b/src/scene/scene.cpp @@ -64,7 +64,7 @@ #include "scene_lua.inl" namespace { - const char* _loggerCat = "Scene"; + constexpr const char* _loggerCat = "Scene"; } // namespace namespace openspace { diff --git a/src/scene/scenegraphnode.cpp b/src/scene/scenegraphnode.cpp index b753d66b2d..68f094d8f7 100644 --- a/src/scene/scenegraphnode.cpp +++ b/src/scene/scenegraphnode.cpp @@ -54,13 +54,13 @@ #include "scenegraphnode_doc.inl" namespace { - const char* _loggerCat = "SceneGraphNode"; - const char* KeyRenderable = "Renderable"; - const char* KeyGuiPath = "GuiPath"; + constexpr const char* _loggerCat = "SceneGraphNode"; + constexpr const char* KeyRenderable = "Renderable"; + constexpr const char* KeyGuiPath = "GuiPath"; - const char* keyTransformTranslation = "Transform.Translation"; - const char* keyTransformRotation = "Transform.Rotation"; - const char* keyTransformScale = "Transform.Scale"; + constexpr const char* keyTransformTranslation = "Transform.Translation"; + constexpr const char* keyTransformRotation = "Transform.Rotation"; + constexpr const char* keyTransformScale = "Transform.Scale"; } // namespace namespace openspace { diff --git a/src/scene/sceneloader.cpp b/src/scene/sceneloader.cpp index 9cde4d7430..35a83ea248 100644 --- a/src/scene/sceneloader.cpp +++ b/src/scene/sceneloader.cpp @@ -37,21 +37,21 @@ #include namespace { - const char* _loggerCat = "SceneLoader"; - const char* KeyPathScene = "ScenePath"; - const char* KeyModules = "Modules"; - const char* ModuleExtension = ".mod"; - const char* LicenseExtension = ".license"; + constexpr const char* _loggerCat = "SceneLoader"; + constexpr const char* KeyPathScene = "ScenePath"; + constexpr const char* KeyModules = "Modules"; + constexpr const char* ModuleExtension = ".mod"; + constexpr const char* LicenseExtension = ".license"; //const char* KeyPathModule = "ModulePath"; //const char* RootNodeName = "Root"; - const char* KeyName = "Name"; - const char* KeyParentName = "Parent"; + constexpr const char* KeyName = "Name"; + constexpr const char* KeyParentName = "Parent"; //const char* KeyDependencies = "Dependencies"; - const char* KeyCamera = "Camera"; - const char* KeyCameraFocus = "Focus"; - const char* KeyCameraPosition = "Position"; - const char* KeyCameraRotation = "Rotation"; + constexpr const char* KeyCamera = "Camera"; + constexpr const char* KeyCameraFocus = "Focus"; + constexpr const char* KeyCameraPosition = "Position"; + constexpr const char* KeyCameraRotation = "Rotation"; struct ModuleInformation { ghoul::Dictionary dictionary; diff --git a/src/scripting/scriptengine.cpp b/src/scripting/scriptengine.cpp index a00f3d72dd..4710d8c2db 100644 --- a/src/scripting/scriptengine.cpp +++ b/src/scripting/scriptengine.cpp @@ -41,9 +41,9 @@ #include "scriptengine_lua.inl" namespace { - const char* _loggerCat = "ScriptEngine"; + constexpr const char* _loggerCat = "ScriptEngine"; - const int TableOffset = -3; // -1 (top) -1 (first argument) -1 (second argument) + constexpr int TableOffset = -3; // -1 (top) -1 (first argument) -1 (second argument) } // namespace namespace openspace::scripting { diff --git a/src/util/blockplaneintersectiongeometry.cpp b/src/util/blockplaneintersectiongeometry.cpp index 9d3e5db589..0a6ab0ebb7 100644 --- a/src/util/blockplaneintersectiongeometry.cpp +++ b/src/util/blockplaneintersectiongeometry.cpp @@ -31,7 +31,7 @@ #include namespace { - const char* _loggerCat = "BlockPlaneIntersectionGeometry"; + constexpr const char* _loggerCat = "BlockPlaneIntersectionGeometry"; } // namespace namespace openspace { diff --git a/src/util/boxgeometry.cpp b/src/util/boxgeometry.cpp index fae2f1b238..15adb0575a 100644 --- a/src/util/boxgeometry.cpp +++ b/src/util/boxgeometry.cpp @@ -27,7 +27,7 @@ #include namespace { - const char* _loggerCat = "BoxGeometry"; + constexpr const char* _loggerCat = "BoxGeometry"; } // namespace namespace openspace { diff --git a/src/util/histogram.cpp b/src/util/histogram.cpp index f4276471b2..1318d68aa3 100644 --- a/src/util/histogram.cpp +++ b/src/util/histogram.cpp @@ -30,7 +30,7 @@ #include namespace { - const char* _loggerCat = "Histogram"; + constexpr const char* _loggerCat = "Histogram"; } // namespace namespace openspace { diff --git a/src/util/keys.cpp b/src/util/keys.cpp index 986eecc49e..916617c42c 100644 --- a/src/util/keys.cpp +++ b/src/util/keys.cpp @@ -31,7 +31,7 @@ #include namespace { - const char* _loggerCat = "Keys"; + constexpr const char* _loggerCat = "Keys"; } // namespace namespace openspace { diff --git a/src/util/openspacemodule.cpp b/src/util/openspacemodule.cpp index 2a5b036666..3a0694d68f 100644 --- a/src/util/openspacemodule.cpp +++ b/src/util/openspacemodule.cpp @@ -34,8 +34,8 @@ #include namespace { - const char* _loggerCat = "OpenSpaceModule"; - const char* ModuleBaseToken = "MODULE_"; + constexpr const char* _loggerCat = "OpenSpaceModule"; + constexpr const char* ModuleBaseToken = "MODULE_"; } // namespace namespace openspace { @@ -55,7 +55,7 @@ void OpenSpaceModule::initialize() { std::string moduleToken = ghoul::filesystem::FileSystem::TokenOpeningBraces + - ModuleBaseToken + + std::string(ModuleBaseToken) + upperName + ghoul::filesystem::FileSystem::TokenClosingBraces; diff --git a/src/util/powerscaledsphere.cpp b/src/util/powerscaledsphere.cpp index 2d5824f18b..2e50e5179e 100644 --- a/src/util/powerscaledsphere.cpp +++ b/src/util/powerscaledsphere.cpp @@ -28,7 +28,7 @@ #include namespace { - const char* _loggerCat = "PowerScaledSphere"; + constexpr const char* _loggerCat = "PowerScaledSphere"; } // namespace namespace openspace { diff --git a/src/util/spicemanager.cpp b/src/util/spicemanager.cpp index cd4fb99845..f1b7662a97 100644 --- a/src/util/spicemanager.cpp +++ b/src/util/spicemanager.cpp @@ -38,7 +38,7 @@ #include "SpiceZpr.h" namespace { - const char* _loggerCat = "SpiceManager"; + constexpr const char* _loggerCat = "SpiceManager"; // The value comes from // http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/getmsg_c.html diff --git a/src/util/taskloader.cpp b/src/util/taskloader.cpp index 009156c856..c8365b1fa7 100644 --- a/src/util/taskloader.cpp +++ b/src/util/taskloader.cpp @@ -34,8 +34,8 @@ #include namespace { - const char* _loggerCat = "TaskRunner"; -} + constexpr const char* _loggerCat = "TaskRunner"; +} // namespace namespace openspace { diff --git a/src/util/transformationmanager.cpp b/src/util/transformationmanager.cpp index 45223c770a..07336a1eba 100644 --- a/src/util/transformationmanager.cpp +++ b/src/util/transformationmanager.cpp @@ -27,7 +27,7 @@ #include namespace { - const char* _loggerCat = "TransformationManager"; + constexpr const char* _loggerCat = "TransformationManager"; } // namespace namespace openspace {