Commit e18bbd38 authored by Jan Möbius's avatar Jan Möbius

Merge branch 'fix-odr' into 'master'

Fix ODR violations by using VSI namespace.

See merge request !3
parents aca7ec1f 56c06e01
......@@ -43,11 +43,13 @@
#include <OpenFlipper/common/Types.hh>
#include "SelectionObjectMarker.hh"
namespace VSI {
//******************************************************************************
const ACG::Vec4f disabled_color (0.4f,0.4f,0.4f,1.0f);
const ACG::Vec4f selected_color (0.0f,1.0f,0.0f,0.5f);
static const ACG::Vec4f disabled_color (0.4f,0.4f,0.4f,1.0f);
static const ACG::Vec4f selected_color (0.0f,1.0f,0.0f,0.5f);
//******************************************************************************
......@@ -87,3 +89,4 @@ bool SelectionObjectMarker::blendForStencilRefNumber(GLuint _reference, GLenum &
return false;
}
} // namespace VSI
......@@ -48,6 +48,7 @@
#include <OpenFlipper/common/Types.hh>
#include <OpenFlipper/common/ViewObjectMarker.hh>
namespace VSI {
/** Object marker to visualize objectPickDialog selection
*/
class SelectionObjectMarker : public ViewObjectMarker
......@@ -59,4 +60,6 @@ class SelectionObjectMarker : public ViewObjectMarker
bool blendForStencilRefNumber (GLuint _reference, GLenum &_src, GLenum &_dst, ACG::Vec4f &_color);
};
} // namespce VSI
#endif
......@@ -51,6 +51,7 @@
#include <QtWidgets>
namespace VSI {
//******************************************************************************
......@@ -594,3 +595,6 @@ bool TreeModel::setData(const QModelIndex &_index, const QVariant &_value, int /
bool TreeModel::isRoot(TreeItem * _item) {
return ( _item == rootItem_ );
}
} // namespace VSI
......@@ -50,6 +50,8 @@
#include "TreeItem.hh"
namespace VSI {
class TreeModel : public QAbstractItemModel
{
Q_OBJECT
......@@ -169,5 +171,7 @@ private:
};
} // namespace VSI
#endif
......@@ -50,11 +50,12 @@
//== FORWARDDECLARATIONS ======================================================
class QComboBox;
class QPushButton;
class TreeModel;
//== NAMESPACES ===============================================================
namespace VSI {
class TreeModel;
//== CLASS DEFINITION =========================================================
/** Widget to configure object id inputs
......
......@@ -55,13 +55,14 @@ class QPushButton;
class QTreeView;
class QMouseEvent;
class TreeModel;
class SimpleViewer;
//== NAMESPACES ===============================================================
namespace VSI {
class TreeModel;
//== CLASS DEFINITION =========================================================
/** Widget to pick a object
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment