diff options
Diffstat (limited to 'TAO/examples/AMI/FL_Callback/Progress_i.cpp')
| -rw-r--r-- | TAO/examples/AMI/FL_Callback/Progress_i.cpp | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/TAO/examples/AMI/FL_Callback/Progress_i.cpp b/TAO/examples/AMI/FL_Callback/Progress_i.cpp index 4b1d16887bc..91e6c571118 100644 --- a/TAO/examples/AMI/FL_Callback/Progress_i.cpp +++ b/TAO/examples/AMI/FL_Callback/Progress_i.cpp @@ -2,17 +2,11 @@ #include "Progress_i.h" -#if defined(ACE_HAS_FL) - #include <FL/Fl_Slider.h> #include <FL/Fl_Button.h> -#if !defined(__ACE_INLINE__) -#include "Progress_i.i" -#endif /* __ACE_INLINE__ */ - -ACE_RCSID (FL_Cube, - test_i, +ACE_RCSID (FL_Cube, + test_i, "$Id$") Progress_i::Progress_i (Progress_Window *window) @@ -108,11 +102,11 @@ Progress_Window::sent_request (CORBA::Long id) if (id < 0 || id >= this->n_peers_) return; Fl_Slider *obj = - ACE_dynamic_cast (Fl_Slider*,this->request_progress_[id]); + dynamic_cast<Fl_Slider*> (this->request_progress_[id]); obj->value (obj->value () + 1); obj->redraw (); - int i = ACE_static_cast(int,obj->value ()); + int i = static_cast<int> (obj->value ()); if (i % 100 == 0) ACE_DEBUG ((LM_DEBUG, "Progress (%t) - recv reply %d\n", i)); } @@ -123,11 +117,11 @@ Progress_Window::recv_reply (CORBA::Long id) if (id < 0 || id >= this->n_peers_) return; Fl_Slider *obj = - ACE_dynamic_cast (Fl_Slider*,this->reply_progress_[id]); + dynamic_cast<Fl_Slider*> (this->reply_progress_[id]); obj->value (obj->value () + 1); obj->redraw (); - int i = ACE_static_cast(int,obj->value ()); + int i = static_cast<int> (obj->value ()); if (i % 100 == 0) ACE_DEBUG ((LM_DEBUG, "Progress (%t) - recv reply %d\n", i)); } @@ -147,7 +141,7 @@ void Progress_Window::start_callback (Fl_Widget* /* widget */, void *data) { - Progress_Window *self = ACE_static_cast (Progress_Window*, data); + Progress_Window *self = static_cast<Progress_Window*> (data); self->start (); } @@ -174,6 +168,3 @@ Progress_Window::start () ACE_ENDTRY; } } - - -#endif /* ACE_HAS_FL */ |