Merge pull request #371 from OpenSpace/misc/cleanup

Misc/cleanup

include/openspace/properties/matrix/mat3x2property.h

@@ -29,12 +29,10 @@
 
 #include <ghoul/glm.h>
 
-namespace openspace {
-namespace properties {
+namespace openspace::properties {
 
 REGISTER_NUMERICALPROPERTY_HEADER(Mat3x2Property, glm::mat3x2);
 
-} // namespace properties
-} // namespace openspace
+} // namespace openspace::properties
 
 #endif // __OPENSPACE_CORE___MAT3X2PROPERTY___H__

include/openspace/properties/matrix/mat3x4property.h

@@ -29,12 +29,10 @@
 
 #include <ghoul/glm.h>
 
-namespace openspace {
-namespace properties {
+namespace openspace::properties {
 
 REGISTER_NUMERICALPROPERTY_HEADER(Mat3x4Property, glm::mat3x4);
 
-} // namespace properties
-} // namespace openspace
+} // namespace openspace::properties
 
 #endif // __OPENSPACE_CORE___MAT3X4PROPERTY___H__

include/openspace/properties/matrix/mat4property.h

@@ -29,12 +29,10 @@
 
 #include <ghoul/glm.h>
 
-namespace openspace {
-namespace properties {
+namespace openspace::properties {
 
 REGISTER_NUMERICALPROPERTY_HEADER(Mat4Property, glm::mat4x4);
 
-} // namespace properties
-} // namespace openspace
+} // namespace openspace::properties
 
 #endif // __OPENSPACE_CORE___MAT4PROPERTY___H__

include/openspace/properties/matrix/mat4x2property.h

@@ -29,12 +29,10 @@
 
 #include <ghoul/glm.h>
 
-namespace openspace {
-namespace properties {
+namespace openspace::properties {
 
 REGISTER_NUMERICALPROPERTY_HEADER(Mat4x2Property, glm::mat4x2);
 
-} // namespace properties
-} // namespace openspace
+} // namespace openspace::properties
 
 #endif // __OPENSPACE_CORE___MAT4X2PROPERTY___H__

include/openspace/properties/matrix/mat4x3property.h

@@ -29,12 +29,10 @@
 
 #include <ghoul/glm.h>
 
-namespace openspace {
-namespace properties {
+namespace openspace::properties {
 
 REGISTER_NUMERICALPROPERTY_HEADER(Mat4x3Property, glm::mat4x3);
 
-} // namespace properties
-} // namespace openspace
+} // namespace openspace::properties
 
 #endif // __OPENSPACE_CORE___MAT4X3PROPERTY___H__

include/openspace/properties/numericalproperty.h

@@ -27,8 +27,7 @@
 
 #include <openspace/properties/templateproperty.h>
 
-namespace openspace {
-namespace properties {
+namespace openspace::properties {
 
 template <typename T>
 class NumericalProperty : public TemplateProperty<T> {
@@ -73,8 +72,7 @@ protected:
     T _stepping;
 };
 
-} // namespace properties
-} // namespace openspace
+} // namespace openspace::properties
 
 #include "openspace/properties/numericalproperty.inl"
 

include/openspace/properties/numericalproperty.inl

@@ -24,8 +24,7 @@
 
 #include <ghoul/lua/ghoul_lua.h>
 
-namespace openspace {
-namespace properties {
+namespace openspace::properties {
 
 #define REGISTER_NUMERICALPROPERTY_HEADER(CLASS_NAME, TYPE)                              \
     typedef NumericalProperty<TYPE> CLASS_NAME;                                          \
@@ -361,5 +360,4 @@ std::string NumericalProperty<T>::generateAdditionalDescription() const {
     return result;
 }
 
-} // namespace properties
-} // namespace openspace
+} // namespace openspace::properties

include/openspace/properties/optionproperty.h

@@ -29,8 +29,7 @@
 
 #include <vector>
 
-namespace openspace {
-namespace properties {
+namespace openspace::properties {
 
 /**
  * The OptionProperty is a property that provides a number of predefined (using the 
@@ -131,7 +130,6 @@ private:
     DisplayType _displayType;
 };
 
-} // namespace properties
-} // namespace openspace
+} // namespace openspace::properties
 
 #endif // __OPENSPACE_CORE___OPTIONPROPERTY___H__

include/openspace/properties/property.h

@@ -28,13 +28,13 @@
 #include <openspace/properties/propertydelegate.h>
 
 #include <ghoul/misc/dictionary.h>
+
 #include <functional>
 #include <string>
 
 struct lua_State;
 
-namespace openspace {
-namespace properties {
+namespace openspace::properties {
 
 class PropertyOwner;
 
@@ -417,7 +417,6 @@ private:
     OnChangeHandle _currentHandleValue;
 };
 
-} // namespace properties
-} // namespace openspace
+} // namespace openspace::properties
 
 #endif // __OPENSPACE_CORE___PROPERTY___H__

include/openspace/properties/propertydelegate.h

@@ -29,8 +29,7 @@
 
 struct lua_State;
 
-namespace openspace {
-namespace properties {
+namespace openspace::properties {
 
 /**
  * The PropertyDelegate class is used by (among others) the TemplateProperty and the
@@ -158,8 +157,7 @@ public:
     static bool toString(std::string& outValue, U inValue);
 };
 
-} // namespace properties
-} // namespace openspace
+} // namespace openspace::properties
 
 #include <openspace/properties/propertydelegate.inl>
 

include/openspace/properties/propertydelegate.inl

@@ -24,8 +24,7 @@
 
 #include <typeinfo>
 
-namespace openspace {
-namespace properties {
+namespace openspace::properties {
 
 template <typename T>
 std::string PropertyDelegate<T>::className() {
@@ -95,5 +94,4 @@ U PropertyDelegate<T>::fromString(std::string value, bool& success) {
         "Unimplemented PropertyDelegate::fromString specialization");
 }
 
-} // namespace properties
-} // namespace openspace
+} // namespace openspace::properties

include/openspace/properties/propertyowner.h

@@ -29,8 +29,7 @@
 #include <string>
 #include <vector>
 
-namespace openspace {
-namespace properties {
+namespace openspace::properties {
 
 class Property;
 
@@ -236,7 +235,6 @@ private:
     std::vector<std::string> _tags;
 };
 
-}  // namespace properties
-}  // namespace openspace
+}  // namespace openspace::properties
 
 #endif // __OPENSPACE_CORE___PROPERTYOWNER___H__

include/openspace/properties/scalar/boolproperty.h

@@ -42,12 +42,10 @@
 
 #include <openspace/properties/numericalproperty.h>
 
-namespace openspace {
-namespace properties {
+namespace openspace::properties {
 
 REGISTER_TEMPLATEPROPERTY_HEADER(BoolProperty, bool);
 
-} // namespace properties
-} // namespace openspace
+} // namespace openspace::properties
 
 #endif // __OPENSPACE_CORE___BOOLPROPERTY___H__

include/openspace/properties/scalar/charproperty.h

@@ -42,12 +42,10 @@
 
 #include <openspace/properties/numericalproperty.h>
 
-namespace openspace {
-namespace properties {
+namespace openspace::properties {
 
 REGISTER_NUMERICALPROPERTY_HEADER(CharProperty, char);
 
-} // namespace properties
-} // namespace openspace
+} // namespace openspace::properties
 
 #endif // __OPENSPACE_CORE___CHARPROPERTY___H__

include/openspace/properties/scalar/doubleproperty.h

@@ -42,12 +42,10 @@
 
 #include <openspace/properties/numericalproperty.h>
 
-namespace openspace {
-namespace properties {
+namespace openspace::properties {
 
 REGISTER_NUMERICALPROPERTY_HEADER(DoubleProperty, double);
 
-} // namespace properties
-} // namespace openspace
+} // namespace openspace::properties
 
 #endif // __OPENSPACE_CORE___DOUBLEPROPERTY___H__

include/openspace/properties/scalar/floatproperty.h

@@ -42,12 +42,10 @@
 
 #include <openspace/properties/numericalproperty.h>
 
-namespace openspace {
-namespace properties {
+namespace openspace::properties {
 
 REGISTER_NUMERICALPROPERTY_HEADER(FloatProperty, float);
 
-} // namespace properties
-} // namespace openspace
+} // namespace openspace::properties
 
 #endif // __OPENSPACE_CORE___FLOATPROPERTY___H__

include/openspace/properties/scalar/intproperty.h

@@ -42,12 +42,10 @@
 
 #include <openspace/properties/numericalproperty.h>
 
-namespace openspace {
-namespace properties {
+namespace openspace::properties {
 
 REGISTER_NUMERICALPROPERTY_HEADER(IntProperty, int);
 
-} // namespace properties
-} // namespace openspace
+} // namespace openspace::properties
 
 #endif // __OPENSPACE_CORE___INTPROPERTY___H__

include/openspace/properties/scalar/longdoubleproperty.h

@@ -42,12 +42,10 @@
 
 #include <openspace/properties/numericalproperty.h>
 
-namespace openspace {
-namespace properties {
+namespace openspace::properties {
 
 REGISTER_NUMERICALPROPERTY_HEADER(LongDoubleProperty, long double);
 
-} // namespace properties
-} // namespace openspace
+} // namespace openspace::properties
 
 #endif // __OPENSPACE_CORE___LONGDOUBLEPROPERTY___H__

include/openspace/properties/scalar/longlongproperty.h

@@ -42,12 +42,10 @@
 
 #include <openspace/properties/numericalproperty.h>
 
-namespace openspace {
-namespace properties {
+namespace openspace::properties {
 
 REGISTER_NUMERICALPROPERTY_HEADER(LongLongProperty, long long);
 
-} // namespace properties
-} // namespace openspace
+} // namespace openspace::properties
 
 #endif // __OPENSPACE_CORE___LONGLONGPROPERTY___H__

include/openspace/properties/scalar/longproperty.h

@@ -42,12 +42,10 @@
 
 #include <openspace/properties/numericalproperty.h>
 
-namespace openspace {
-namespace properties {
+namespace openspace::properties {
 
 REGISTER_NUMERICALPROPERTY_HEADER(LongProperty, long);
 
-} // namespace properties
-} // namespace openspace
+} // namespace openspace::properties
 
 #endif // __OPENSPACE_CORE___LONGPROPERTY___H__