Skip to content
Snippets Groups Projects
Commit 724bd63b authored by Wuttke, Joachim's avatar Wuttke, Joachim Committed by Wuttke, Joachim
Browse files

ba3d: fix closing-namespace comments

parent 1cab2450
Branches
Tags
1 merge request!135Bring namespaces under hierarchy
...@@ -18,7 +18,6 @@ static_assert(QT_VERSION >= QT_VERSION_CHECK(5, 5, 1), ...@@ -18,7 +18,6 @@ static_assert(QT_VERSION >= QT_VERSION_CHECK(5, 5, 1),
"requires Qt >= 5.5.1, have " QT_VERSION_STR); "requires Qt >= 5.5.1, have " QT_VERSION_STR);
namespace GUI::RealSpace { namespace GUI::RealSpace {
//------------------------------------------------------------------------------
Vector3D::Vector3D() : Vector3D(0, 0, 0) {} Vector3D::Vector3D() : Vector3D(0, 0, 0) {}
...@@ -86,7 +85,6 @@ Vector3D operator-(const Vector3D& _1, const Vector3D& _2) ...@@ -86,7 +85,6 @@ Vector3D operator-(const Vector3D& _1, const Vector3D& _2)
return Vector3D(_1.x - _2.x, _1.y - _2.y, _1.z - _2.z); return Vector3D(_1.x - _2.x, _1.y - _2.y, _1.z - _2.z);
} }
//------------------------------------------------------------------------------
Range::Range(float r1, float r2) : min(qMin(r1, r2)), max(qMax(r1, r2)) {} Range::Range(float r1, float r2) : min(qMin(r1, r2)), max(qMax(r1, r2)) {}
...@@ -100,7 +98,6 @@ float Range::mid() const ...@@ -100,7 +98,6 @@ float Range::mid() const
return (min + max) / 2; return (min + max) / 2;
} }
//------------------------------------------------------------------------------
VectorRange::VectorRange(Range x_, Range y_, Range z_) : x(x_), y(y_), z(z_) {} VectorRange::VectorRange(Range x_, Range y_, Range z_) : x(x_), y(y_), z(z_) {}
...@@ -124,5 +121,4 @@ float VectorRange::length() const ...@@ -124,5 +121,4 @@ float VectorRange::length() const
return Vector3D(x.size(), y.size(), z.size()).length(); return Vector3D(x.size(), y.size(), z.size()).length();
} }
//------------------------------------------------------------------------------ } // namespace GUI::RealSpace
} // namespace RealSpace
...@@ -109,5 +109,6 @@ private: ...@@ -109,5 +109,6 @@ private:
GeometryStore& geometryStore(); // simpleton GeometryStore& geometryStore(); // simpleton
} // namespace RealSpace } // namespace GUI::RealSpace
#endif // BORNAGAIN_GUI_BA3D_MODEL_GEOMETRY_H #endif // BORNAGAIN_GUI_BA3D_MODEL_GEOMETRY_H
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
// include to use geometry basics, without details // include to use geometry basics, without details
namespace GUI::RealSpace { namespace GUI::RealSpace {
//------------------------------------------------------------------------------
class Geometry; class Geometry;
...@@ -64,6 +63,7 @@ struct KeyHash { ...@@ -64,6 +63,7 @@ struct KeyHash {
}; };
} // namespace GeometricID } // namespace GeometricID
} // namespace RealSpace
} // namespace GUI::RealSpace
#endif // BORNAGAIN_GUI_BA3D_MODEL_GEOMETRY_INC_H #endif // BORNAGAIN_GUI_BA3D_MODEL_GEOMETRY_INC_H
...@@ -24,5 +24,7 @@ class Layer : public Object { ...@@ -24,5 +24,7 @@ class Layer : public Object {
public: public:
Layer(VectorRange); Layer(VectorRange);
}; };
} // namespace RealSpace
} // namespace GUI::RealSpace
#endif // BORNAGAIN_GUI_BA3D_MODEL_LAYER_H #endif // BORNAGAIN_GUI_BA3D_MODEL_LAYER_H
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
#include <QVector> #include <QVector>
namespace GUI::RealSpace { namespace GUI::RealSpace {
//------------------------------------------------------------------------------
class Canvas; class Canvas;
class Object; class Object;
...@@ -62,5 +61,6 @@ private: ...@@ -62,5 +61,6 @@ private:
void drawBlend(Canvas&) const; void drawBlend(Canvas&) const;
}; };
} // namespace RealSpace } // namespace GUI::RealSpace
#endif // BORNAGAIN_GUI_BA3D_MODEL_MODEL_H #endif // BORNAGAIN_GUI_BA3D_MODEL_MODEL_H
...@@ -55,5 +55,6 @@ private: ...@@ -55,5 +55,6 @@ private:
void draw(Canvas&); void draw(Canvas&);
}; };
} // namespace RealSpace } // namespace GUI::RealSpace
#endif // BORNAGAIN_GUI_BA3D_MODEL_OBJECT_H #endif // BORNAGAIN_GUI_BA3D_MODEL_OBJECT_H
...@@ -224,5 +224,7 @@ class AnisoPyramid : public Particle { ...@@ -224,5 +224,7 @@ class AnisoPyramid : public Particle {
public: public:
AnisoPyramid(float L, float W, float H, float alpha); AnisoPyramid(float L, float W, float H, float alpha);
}; };
} // namespace RealSpace::Particles
} // namespace GUI::RealSpace::Particles
#endif // BORNAGAIN_GUI_BA3D_MODEL_PARTICLES_H #endif // BORNAGAIN_GUI_BA3D_MODEL_PARTICLES_H
...@@ -24,7 +24,7 @@ namespace GUI::RealSpace { ...@@ -24,7 +24,7 @@ namespace GUI::RealSpace {
class Geometry; class Geometry;
// GL buffer //! GL buffer
class Buffer final : protected QOpenGLFunctions { class Buffer final : protected QOpenGLFunctions {
public: public:
Buffer(Geometry const&); Buffer(Geometry const&);
...@@ -36,7 +36,7 @@ private: ...@@ -36,7 +36,7 @@ private:
QOpenGLBuffer m_glBuffer; QOpenGLBuffer m_glBuffer;
}; };
// Buffer for drawing 3D Coordinate Axes on canvas //! Buffer for drawing 3D Coordinate Axes on canvas
class Buffer3DAxes final : protected QOpenGLFunctions { class Buffer3DAxes final : protected QOpenGLFunctions {
public: public:
Buffer3DAxes(); Buffer3DAxes();
...@@ -48,5 +48,6 @@ private: ...@@ -48,5 +48,6 @@ private:
QOpenGLBuffer m_glBuffer3DAxes; QOpenGLBuffer m_glBuffer3DAxes;
}; };
} // namespace RealSpace } // namespace GUI::RealSpace
#endif // BORNAGAIN_GUI_BA3D_VIEW_BUFFER_H #endif // BORNAGAIN_GUI_BA3D_VIEW_BUFFER_H
...@@ -80,5 +80,6 @@ private: ...@@ -80,5 +80,6 @@ private:
QMatrix4x4 matModel3DAxes; QMatrix4x4 matModel3DAxes;
}; };
} // namespace RealSpace } // namespace GUI::RealSpace
#endif // BORNAGAIN_GUI_BA3D_VIEW_CAMERA_H #endif // BORNAGAIN_GUI_BA3D_VIEW_CAMERA_H
...@@ -97,5 +97,6 @@ private: ...@@ -97,5 +97,6 @@ private:
bool m_isInitializedGL; bool m_isInitializedGL;
}; };
} // namespace RealSpace } // namespace GUI::RealSpace
#endif // BORNAGAIN_GUI_BA3D_VIEW_CANVAS_H #endif // BORNAGAIN_GUI_BA3D_VIEW_CANVAS_H
...@@ -45,5 +45,6 @@ private: ...@@ -45,5 +45,6 @@ private:
int locAxis; int locAxis;
}; };
} // namespace RealSpace } // namespace GUI::RealSpace
#endif // BORNAGAIN_GUI_BA3D_VIEW_PROGRAM_H #endif // BORNAGAIN_GUI_BA3D_VIEW_PROGRAM_H
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
#include <QWidget> #include <QWidget>
namespace GUI::RealSpace { namespace GUI::RealSpace {
//------------------------------------------------------------------------------
class Model; class Model;
class Canvas; class Canvas;
...@@ -47,6 +46,6 @@ private: ...@@ -47,6 +46,6 @@ private:
Canvas* canvas; Canvas* canvas;
}; };
//------------------------------------------------------------------------------ } // namespace GUI::RealSpace
} // namespace RealSpace
#endif // BORNAGAIN_GUI_BA3D_WIDGET_H #endif // BORNAGAIN_GUI_BA3D_WIDGET_H
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment