diff options
Diffstat (limited to 'src/menu')
48 files changed, 49 insertions, 57 deletions
diff --git a/src/menu/application.cpp b/src/menu/application.cpp index a5b90796..92e6b8a8 100644 --- a/src/menu/application.cpp +++ b/src/menu/application.cpp @@ -244,4 +244,4 @@ namespace usdx { return running; } -}; +} diff --git a/src/menu/application.hpp b/src/menu/application.hpp index 151b34ae..a47bd42a 100644 --- a/src/menu/application.hpp +++ b/src/menu/application.hpp @@ -81,6 +81,6 @@ namespace usdx bool is_running(void) const; }; -}; +} #endif diff --git a/src/menu/background.cpp b/src/menu/background.cpp index 5cd2b90a..4839d05b 100644 --- a/src/menu/background.cpp +++ b/src/menu/background.cpp @@ -39,4 +39,4 @@ namespace usdx { return parent; } -}; +} diff --git a/src/menu/background.hpp b/src/menu/background.hpp index a971416c..0a7bee49 100644 --- a/src/menu/background.hpp +++ b/src/menu/background.hpp @@ -52,6 +52,6 @@ namespace usdx */ const DrawableControl& get_parent(void) const; }; -}; +} #endif diff --git a/src/menu/background_color.cpp b/src/menu/background_color.cpp index 031ffe26..12ec6c7c 100644 --- a/src/menu/background_color.cpp +++ b/src/menu/background_color.cpp @@ -67,4 +67,4 @@ namespace usdx glDisableClientState(GL_VERTEX_ARRAY); glDisableClientState(GL_COLOR_ARRAY); } -}; +} diff --git a/src/menu/background_color.hpp b/src/menu/background_color.hpp index 79059471..4b724982 100644 --- a/src/menu/background_color.hpp +++ b/src/menu/background_color.hpp @@ -60,7 +60,6 @@ namespace usdx const RgbColor &color); }; -}; - +} #endif diff --git a/src/menu/background_image.cpp b/src/menu/background_image.cpp index 87ca4c36..7ffb8009 100644 --- a/src/menu/background_image.cpp +++ b/src/menu/background_image.cpp @@ -76,4 +76,4 @@ namespace usdx glDisableClientState(GL_VERTEX_ARRAY); glDisableClientState(GL_TEXTURE_COORD_ARRAY); } -}; +} diff --git a/src/menu/background_image.hpp b/src/menu/background_image.hpp index 8b28a2e3..14c034e3 100644 --- a/src/menu/background_image.hpp +++ b/src/menu/background_image.hpp @@ -76,7 +76,6 @@ namespace usdx virtual ~BackgroundImage(); }; -}; - +} #endif diff --git a/src/menu/clipping_helper.cpp b/src/menu/clipping_helper.cpp index 1a92d3f1..a4cd6e9e 100644 --- a/src/menu/clipping_helper.cpp +++ b/src/menu/clipping_helper.cpp @@ -76,4 +76,4 @@ namespace usdx glDisable(GL_SCISSOR_TEST); } } -}; +} diff --git a/src/menu/clipping_helper.hpp b/src/menu/clipping_helper.hpp index cbcf7320..5a18e94b 100644 --- a/src/menu/clipping_helper.hpp +++ b/src/menu/clipping_helper.hpp @@ -71,6 +71,6 @@ namespace usdx ClippingHelper(const Container*, const Rectangle<int>&); virtual ~ClippingHelper(); }; -}; +} #endif diff --git a/src/menu/container.cpp b/src/menu/container.cpp index 6b7e9180..59cd9531 100644 --- a/src/menu/container.cpp +++ b/src/menu/container.cpp @@ -167,4 +167,4 @@ namespace usdx return this; } -}; +} diff --git a/src/menu/container.hpp b/src/menu/container.hpp index 67bbb3c4..046aa045 100644 --- a/src/menu/container.hpp +++ b/src/menu/container.hpp @@ -112,7 +112,7 @@ namespace usdx */ boost::signals2::signal<void ()> window_coords_change; }; -}; +} #endif diff --git a/src/menu/control.cpp b/src/menu/control.cpp index ca7ad610..dd3c8af9 100644 --- a/src/menu/control.cpp +++ b/src/menu/control.cpp @@ -81,4 +81,4 @@ namespace usdx { slaves.remove(slave); } -}; +} diff --git a/src/menu/control.hpp b/src/menu/control.hpp index a4314579..4000a5df 100644 --- a/src/menu/control.hpp +++ b/src/menu/control.hpp @@ -68,6 +68,6 @@ namespace usdx */ const Control* get_owner(void) const; }; -}; +} #endif diff --git a/src/menu/drawable.cpp b/src/menu/drawable.cpp index c78bbfa6..796730e0 100644 --- a/src/menu/drawable.cpp +++ b/src/menu/drawable.cpp @@ -35,7 +35,7 @@ namespace usdx if (visible) { draw(); } - }; + } void Drawable::set_visible(bool value) { @@ -46,4 +46,4 @@ namespace usdx { return visible; } -}; +} diff --git a/src/menu/drawable.hpp b/src/menu/drawable.hpp index 08471471..575295fa 100644 --- a/src/menu/drawable.hpp +++ b/src/menu/drawable.hpp @@ -70,6 +70,6 @@ namespace usdx */ virtual const bool is_visible(void) const; }; -}; +} #endif diff --git a/src/menu/drawable_control.cpp b/src/menu/drawable_control.cpp index f30980cb..5d450bb6 100644 --- a/src/menu/drawable_control.cpp +++ b/src/menu/drawable_control.cpp @@ -299,4 +299,4 @@ namespace usdx { on_mouse_dbl_click(button, p); } -}; +} diff --git a/src/menu/drawable_control.hpp b/src/menu/drawable_control.hpp index 0aa64cb8..f5aa10c2 100644 --- a/src/menu/drawable_control.hpp +++ b/src/menu/drawable_control.hpp @@ -162,6 +162,6 @@ namespace usdx boost::signals2::signal<void (uint8_t, const Point<int>&)> on_mouse_dbl_click; }; -}; +} #endif diff --git a/src/menu/event_manager.cpp b/src/menu/event_manager.cpp index 5b2e49df..57182fbd 100644 --- a/src/menu/event_manager.cpp +++ b/src/menu/event_manager.cpp @@ -114,5 +114,4 @@ namespace usdx } } } -}; - +} diff --git a/src/menu/event_manager.hpp b/src/menu/event_manager.hpp index 5f02e66d..e8d42c3d 100644 --- a/src/menu/event_manager.hpp +++ b/src/menu/event_manager.hpp @@ -128,7 +128,6 @@ namespace usdx boost::signals2::signal<void (uint8_t, const Point<int>&)> mouse_down; boost::signals2::signal<void (uint8_t, const Point<int>&)> mouse_up; }; -}; - +} #endif diff --git a/src/menu/frame.cpp b/src/menu/frame.cpp index ef12fef1..f86b6b2b 100644 --- a/src/menu/frame.cpp +++ b/src/menu/frame.cpp @@ -60,4 +60,4 @@ namespace usdx c->setFrame(self); } } -}; +} diff --git a/src/menu/frame.hpp b/src/menu/frame.hpp index a67c0354..f6a25f58 100644 --- a/src/menu/frame.hpp +++ b/src/menu/frame.hpp @@ -55,7 +55,7 @@ namespace usdx virtual ~Frame(); }; -}; +} #endif diff --git a/src/menu/gl_delayed_allocation.cpp b/src/menu/gl_delayed_allocation.cpp index f30b15d5..bf4e7986 100644 --- a/src/menu/gl_delayed_allocation.cpp +++ b/src/menu/gl_delayed_allocation.cpp @@ -91,4 +91,4 @@ namespace usdx dispose_done.notify_all(); } } -}; +} diff --git a/src/menu/gl_delayed_allocation.hpp b/src/menu/gl_delayed_allocation.hpp index 92fe3600..d32c2109 100644 --- a/src/menu/gl_delayed_allocation.hpp +++ b/src/menu/gl_delayed_allocation.hpp @@ -60,6 +60,6 @@ namespace usdx virtual void enable(void); virtual void disable(void); }; -}; +} #endif diff --git a/src/menu/modelview_matrix_cache.cpp b/src/menu/modelview_matrix_cache.cpp index 180f8af4..f8e44fb5 100644 --- a/src/menu/modelview_matrix_cache.cpp +++ b/src/menu/modelview_matrix_cache.cpp @@ -40,4 +40,4 @@ namespace usdx { glLoadMatrixf(cache); } -}; +} diff --git a/src/menu/modelview_matrix_cache.hpp b/src/menu/modelview_matrix_cache.hpp index 766ac46a..65dc4e1b 100644 --- a/src/menu/modelview_matrix_cache.hpp +++ b/src/menu/modelview_matrix_cache.hpp @@ -40,6 +40,6 @@ namespace usdx void restore(void) const; }; -}; +} #endif diff --git a/src/menu/mouse_event.cpp b/src/menu/mouse_event.cpp index 71508667..814e179c 100644 --- a/src/menu/mouse_event.cpp +++ b/src/menu/mouse_event.cpp @@ -80,4 +80,4 @@ namespace usdx return event; } -}; +} diff --git a/src/menu/mouse_event.hpp b/src/menu/mouse_event.hpp index ecb1e4ae..5e783a25 100644 --- a/src/menu/mouse_event.hpp +++ b/src/menu/mouse_event.hpp @@ -57,6 +57,6 @@ namespace usdx Event direction); }; -}; +} #endif diff --git a/src/menu/mouse_manager.cpp b/src/menu/mouse_manager.cpp index 3b4eb268..3be6cb1b 100644 --- a/src/menu/mouse_manager.cpp +++ b/src/menu/mouse_manager.cpp @@ -136,4 +136,4 @@ namespace usdx last_active = NULL; } } -}; +} diff --git a/src/menu/mouse_manager.hpp b/src/menu/mouse_manager.hpp index fe71ead3..90e896c5 100644 --- a/src/menu/mouse_manager.hpp +++ b/src/menu/mouse_manager.hpp @@ -65,6 +65,6 @@ namespace usdx */ void deactivate_control(const DrawableControl* control); }; -}; +} #endif diff --git a/src/menu/software_mouse_pointer.cpp b/src/menu/software_mouse_pointer.cpp index e4d51d8e..39ee1318 100644 --- a/src/menu/software_mouse_pointer.cpp +++ b/src/menu/software_mouse_pointer.cpp @@ -156,5 +156,4 @@ namespace usdx boost::shared_lock<boost::shared_mutex> lock(down_mutex); return down; } -}; - +} diff --git a/src/menu/software_mouse_pointer.hpp b/src/menu/software_mouse_pointer.hpp index ff9fe4a4..49ab53b5 100644 --- a/src/menu/software_mouse_pointer.hpp +++ b/src/menu/software_mouse_pointer.hpp @@ -74,7 +74,7 @@ namespace usdx bool is_down(void) const; }; -}; +} #endif diff --git a/src/menu/static.cpp b/src/menu/static.cpp index 16e378e8..584c02a3 100644 --- a/src/menu/static.cpp +++ b/src/menu/static.cpp @@ -187,5 +187,4 @@ namespace usdx { return stroke_width; } -}; - +} diff --git a/src/menu/static.hpp b/src/menu/static.hpp index d8ba2066..5c115e93 100644 --- a/src/menu/static.hpp +++ b/src/menu/static.hpp @@ -74,6 +74,6 @@ namespace usdx virtual void set_stroke_width(const float stroke_width); float get_stroke_width(void) const; }; -}; +} #endif diff --git a/src/menu/static_rectangle.cpp b/src/menu/static_rectangle.cpp index 83cf6487..d5bdea20 100644 --- a/src/menu/static_rectangle.cpp +++ b/src/menu/static_rectangle.cpp @@ -50,4 +50,4 @@ namespace usdx { glDrawArrays(GL_QUADS, 0, 4); } -}; +} diff --git a/src/menu/static_rectangle.hpp b/src/menu/static_rectangle.hpp index 7cee1a94..69f402c2 100644 --- a/src/menu/static_rectangle.hpp +++ b/src/menu/static_rectangle.hpp @@ -41,7 +41,6 @@ namespace usdx StaticRectangle(const RgbColor& stroke, const Dimension<int>& rect); virtual ~StaticRectangle(); }; -}; - +} #endif diff --git a/src/menu/text.cpp b/src/menu/text.cpp index 37cf99a5..c4cd709a 100644 --- a/src/menu/text.cpp +++ b/src/menu/text.cpp @@ -150,5 +150,5 @@ namespace usdx { return auto_size; } -}; +} diff --git a/src/menu/text.hpp b/src/menu/text.hpp index d5798c8e..49c42a73 100644 --- a/src/menu/text.hpp +++ b/src/menu/text.hpp @@ -108,7 +108,7 @@ namespace usdx void set_auto_size(const bool value); bool get_auto_size(void) const; }; -}; +} #endif diff --git a/src/menu/texture.cpp b/src/menu/texture.cpp index 4ad0c39e..27d0a1f3 100644 --- a/src/menu/texture.cpp +++ b/src/menu/texture.cpp @@ -131,4 +131,4 @@ namespace usdx glDisable(GL_TEXTURE_2D); } -}; +} diff --git a/src/menu/texture.hpp b/src/menu/texture.hpp index 9dfa2fa1..9353ad7e 100644 --- a/src/menu/texture.hpp +++ b/src/menu/texture.hpp @@ -90,6 +90,6 @@ namespace usdx virtual void enable(void); virtual void disable(void); }; -}; +} #endif diff --git a/src/menu/texture_colorized.cpp b/src/menu/texture_colorized.cpp index 756bf3f3..2db55596 100644 --- a/src/menu/texture_colorized.cpp +++ b/src/menu/texture_colorized.cpp @@ -27,4 +27,4 @@ namespace usdx { -}; +} diff --git a/src/menu/texture_colorized.hpp b/src/menu/texture_colorized.hpp index 9259bf55..f2ed406a 100644 --- a/src/menu/texture_colorized.hpp +++ b/src/menu/texture_colorized.hpp @@ -45,6 +45,6 @@ namespace usdx TextureColorized(); virtual ~TextureColorized(); }; -}; +} #endif diff --git a/src/menu/texture_transparent.cpp b/src/menu/texture_transparent.cpp index 252c8cd1..0fde627c 100644 --- a/src/menu/texture_transparent.cpp +++ b/src/menu/texture_transparent.cpp @@ -27,4 +27,4 @@ namespace usdx { -}; +} diff --git a/src/menu/texture_transparent.hpp b/src/menu/texture_transparent.hpp index 5b575b8e..167228a6 100644 --- a/src/menu/texture_transparent.hpp +++ b/src/menu/texture_transparent.hpp @@ -46,6 +46,6 @@ namespace usdx float get_alpha(void) const; void set_alpha(float alpha); }; -}; +} #endif diff --git a/src/menu/timer.cpp b/src/menu/timer.cpp index d091aed5..567860c2 100644 --- a/src/menu/timer.cpp +++ b/src/menu/timer.cpp @@ -59,4 +59,4 @@ namespace usdx { ready = true; } -}; +} diff --git a/src/menu/timer.hpp b/src/menu/timer.hpp index a76a4411..d2cd700b 100644 --- a/src/menu/timer.hpp +++ b/src/menu/timer.hpp @@ -47,7 +47,7 @@ namespace usdx bool is_ready(void); void abort(void); }; -}; +} #endif diff --git a/src/menu/vertical_text_alignment.cpp b/src/menu/vertical_text_alignment.cpp index 5f82e796..85bfbc5a 100644 --- a/src/menu/vertical_text_alignment.cpp +++ b/src/menu/vertical_text_alignment.cpp @@ -53,5 +53,5 @@ namespace usdx { offset.set_y(((box.get_height() - font.get_height()) / 2) + font.get_bottom()); } -}; +} diff --git a/src/menu/vertical_text_alignment.hpp b/src/menu/vertical_text_alignment.hpp index a417df9f..bfa78f5c 100644 --- a/src/menu/vertical_text_alignment.hpp +++ b/src/menu/vertical_text_alignment.hpp @@ -75,7 +75,6 @@ namespace usdx virtual void align(Point<int>&, const Rectangle<int>&, const Dimension<int>&) const; }; -}; - +} #endif |