From 67920debb57e419cbf6105cec72df531a16e4233 Mon Sep 17 00:00:00 2001
From: marco <marco@5a81b35b-ba03-0410-adc8-b2c5c5119f08>
Date: Thu, 8 Jul 2010 07:55:43 +0000
Subject: [PATCH] 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
---
modules/conop/src/chemdict_tool.cc | 2 +-
modules/gfx/src/input.hh | 2 +-
modules/gfx/src/render_pass.hh | 2 +-
modules/gui/src/python_shell/transition.cc | 2 +-
modules/gui/src/tools/mouse_event.hh | 2 +-
modules/gui/src/tools/tool_option.cc | 4 ++--
modules/gui/src/tools/tool_option.hh | 11 +++++++----
7 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/modules/conop/src/chemdict_tool.cc b/modules/conop/src/chemdict_tool.cc
index 865425d8c..156b7f2d1 100644
--- a/modules/conop/src/chemdict_tool.cc
+++ b/modules/conop/src/chemdict_tool.cc
@@ -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];
diff --git a/modules/gfx/src/input.hh b/modules/gfx/src/input.hh
index 0ff9915e1..43c311e34 100644
--- a/modules/gfx/src/input.hh
+++ b/modules/gfx/src/input.hh
@@ -59,7 +59,7 @@ enum TransformTarget {
TRANSFORM_RIGID,
TRANSFORM_TORSION,
TRANSFORM_ANGLE,
- TRANSFORM_ROTAMER,
+ TRANSFORM_ROTAMER
};
class DLLEXPORT_OST_GFX InputEvent {
diff --git a/modules/gfx/src/render_pass.hh b/modules/gfx/src/render_pass.hh
index dd7a34a33..70173c6ca 100644
--- a/modules/gfx/src/render_pass.hh
+++ b/modules/gfx/src/render_pass.hh
@@ -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;
}}
diff --git a/modules/gui/src/python_shell/transition.cc b/modules/gui/src/python_shell/transition.cc
index e39ac8099..0803e185b 100644
--- a/modules/gui/src/python_shell/transition.cc
+++ b/modules/gui/src/python_shell/transition.cc
@@ -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)
{
diff --git a/modules/gui/src/tools/mouse_event.hh b/modules/gui/src/tools/mouse_event.hh
index 28f1e0445..234ee6d4c 100644
--- a/modules/gui/src/tools/mouse_event.hh
+++ b/modules/gui/src/tools/mouse_event.hh
@@ -34,7 +34,7 @@ public:
typedef enum {
LeftButton=Qt::LeftButton,
RightButton=Qt::RightButton,
- MiddleButton=Qt::MidButton,
+ MiddleButton=Qt::MidButton
} Button;
typedef int Buttons;
public:
diff --git a/modules/gui/src/tools/tool_option.cc b/modules/gui/src/tools/tool_option.cc
index d29197f26..699a4e60d 100644
--- a/modules/gui/src/tools/tool_option.cc
+++ b/modules/gui/src/tools/tool_option.cc
@@ -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):
diff --git a/modules/gui/src/tools/tool_option.hh b/modules/gui/src/tools/tool_option.hh
index ac7525351..793974be0 100644
--- a/modules/gui/src/tools/tool_option.hh
+++ b/modules/gui/src/tools/tool_option.hh
@@ -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 {
--
GitLab