Skip to content
Snippets Groups Projects
Commit 67920deb authored by marco's avatar marco
Browse files

fix warnings of gfx/gui module when compiling with clang++

git-svn-id: https://dng.biozentrum.unibas.ch/svn/openstructure/trunk@2544 5a81b35b-ba03-0410-adc8-b2c5c5119f08
parent bc3f186d
No related branches found
No related tags found
No related merge requests found
......@@ -179,7 +179,7 @@ private:
STEREO_CONF=6,
ATOM_ID1=0,
ATOM_ID2=1,
BOND_ORDER=2,
BOND_ORDER=2
} PropIndex;
char last_;
int indices_[10];
......
......@@ -59,7 +59,7 @@ enum TransformTarget {
TRANSFORM_RIGID,
TRANSFORM_TORSION,
TRANSFORM_ANGLE,
TRANSFORM_ROTAMER,
TRANSFORM_ROTAMER
};
class DLLEXPORT_OST_GFX InputEvent {
......
......@@ -32,7 +32,7 @@ typedef enum {
GLOW_RENDER_PASS,
/// \brief renders objects with solid color as used for shadow map
/// generation
OPAQUE_RENDER_PASS,
OPAQUE_RENDER_PASS
} RenderPass;
}}
......
......@@ -72,7 +72,7 @@ std::pair<bool,bool> KeyEventTransition::checkEvent(QKeyEvent* event)
MouseEventTransition::MouseEventTransition(QEvent::Type type,Qt::MouseButton button,Qt::KeyboardModifiers modifiers, State* target, bool swallow_event, TransitionGuard* guard):
TransitionBase(target,guard),
type_(type),
button_(button_),
button_(button),
modifiers_(modifiers),
swallow_(swallow_event)
{
......
......@@ -34,7 +34,7 @@ public:
typedef enum {
LeftButton=Qt::LeftButton,
RightButton=Qt::RightButton,
MiddleButton=Qt::MidButton,
MiddleButton=Qt::MidButton
} Button;
typedef int Buttons;
public:
......
......@@ -20,8 +20,8 @@
namespace ost { namespace gui {
template class DLLEXPORT_OST_GUI ToolOptionNum<int,ToolOption::INT>;
template class DLLEXPORT_OST_GUI ToolOptionNum<float,ToolOption::FLOAT>;
template class TEMPLATE_DEF_EXPORT ToolOptionNum<int,ToolOption::INT>;
template class TEMPLATE_DEF_EXPORT ToolOptionNum<float,ToolOption::FLOAT>;
ToolOption::ToolOption(const String& key, const String& verbose_name,
Type type):
......
......@@ -54,7 +54,7 @@ private:
template <typename T, ToolOption::Type C>
class DLLEXPORT_OST_GUI ToolOptionNum : public ToolOption {
class DLLEXPORT ToolOptionNum : public ToolOption {
public:
ToolOptionNum(const String& key, const String& verbose_name, T default_v,
T min_value=std::numeric_limits<T>::min(),
......@@ -87,11 +87,14 @@ private:
typedef ToolOptionNum<int, ToolOption::INT> ToolOptionInt;
typedef ToolOptionNum<float, ToolOption::FLOAT> ToolOptionFloat;
#ifndef _MSC_VER
extern template class ToolOptionNum<int,ToolOption::INT>;
extern template class ToolOptionNum<float,ToolOption::FLOAT>;
#if !defined(_MSC_VER)
extern template class ToolOptionNum<int,ToolOption::INT>;
extern template class ToolOptionNum<float,ToolOption::FLOAT>;
#endif
class DLLEXPORT_OST_GUI ToolOptionEnum : public ToolOption {
public:
struct Tuple {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment