10 files changed, 32 insertions, 32 deletions
diff --git a/TAO/tests/Xt_Stopwatch/Client.h b/TAO/tests/Xt_Stopwatch/Client.h
index d46ed4ca6f1..f2a869ca3a3 100644
--- a/TAO/tests/Xt_Stopwatch/Client.h
+++ b/TAO/tests/Xt_Stopwatch/Client.h
@@ -24,7 +24,7 @@ public:
   Client (CORBA::ORB_ptr orb);
 
   ///Dtor..
-  ~Client (void);
+  ~Client ();
 
   /// The callbacks
   static void start_callback (Widget w,
@@ -35,8 +35,8 @@ public:
                               XtPointer call_data);
 
   /// The hooks...
-  void start_hook (void);
-  void stop_hook (void);
+  void start_hook ();
+  void stop_hook ();
 
   /// Adds the callbacks to the GUI underneath.....
   void add_callback (Control &);
diff --git a/TAO/tests/Xt_Stopwatch/Control.cpp b/TAO/tests/Xt_Stopwatch/Control.cpp
index b539334d7f8..f276b040571 100644
--- a/TAO/tests/Xt_Stopwatch/Control.cpp
+++ b/TAO/tests/Xt_Stopwatch/Control.cpp
@@ -25,12 +25,12 @@ Control::Control (Widget &parent)
                                           0);
 }
 
-Control::~Control (void)
+Control::~Control ()
 {
 }
 
 void
-Control::manage (void)
+Control::manage ()
 {
   XtManageChild (frame_);
   XtManageChild (rowcolumn_);
@@ -39,13 +39,13 @@ Control::manage (void)
 }
 
 Widget &
-Control::startwidget (void)
+Control::startwidget ()
 {
   return this->startwidget_;
 }
 
 Widget &
-Control::stopwidget (void)
+Control::stopwidget ()
 {
   return this->stopwidget_;
 }
diff --git a/TAO/tests/Xt_Stopwatch/Control.h b/TAO/tests/Xt_Stopwatch/Control.h
index 2a80f83d474..959acddd14e 100644
--- a/TAO/tests/Xt_Stopwatch/Control.h
+++ b/TAO/tests/Xt_Stopwatch/Control.h
@@ -27,16 +27,16 @@ class Control
   Control (Widget &parent);
 
   /// Destructor
-  virtual ~Control (void);
+  virtual ~Control ();
 
   /// Manage the widget
-  virtual void manage (void);
+  virtual void manage ();
 
   /// Return the start widget
-  Widget& startwidget (void);
+  Widget& startwidget ();
 
   /// Return the stop widget..
-  Widget& stopwidget (void);
+  Widget& stopwidget ();
 
  private:
   /// A frame widget...
diff --git a/TAO/tests/Xt_Stopwatch/Stopwatch_display.cpp b/TAO/tests/Xt_Stopwatch/Stopwatch_display.cpp
index fb6095fd925..b3826ed29f9 100644
--- a/TAO/tests/Xt_Stopwatch/Stopwatch_display.cpp
+++ b/TAO/tests/Xt_Stopwatch/Stopwatch_display.cpp
@@ -17,13 +17,13 @@ Stopwatch_display::Stopwatch_display (Widget &parent)
                                  0);
 }
 
-Stopwatch_display::~Stopwatch_display (void)
+Stopwatch_display::~Stopwatch_display ()
 {
   //No-op
 }
 
 void
-Stopwatch_display::manage (void)
+Stopwatch_display::manage ()
 {
   XtManageChild (this->frame_);
   XtManageChild (this->label_);
diff --git a/TAO/tests/Xt_Stopwatch/Stopwatch_display.h b/TAO/tests/Xt_Stopwatch/Stopwatch_display.h
index fcba4acadd9..1c255ddfb33 100644
--- a/TAO/tests/Xt_Stopwatch/Stopwatch_display.h
+++ b/TAO/tests/Xt_Stopwatch/Stopwatch_display.h
@@ -23,10 +23,10 @@ public:
   Stopwatch_display (Widget &parent);
 
   /// Destructor
-  virtual ~Stopwatch_display (void);
+  virtual ~Stopwatch_display ();
 
   /// Manage the widget
-  virtual void manage (void);
+  virtual void manage ();
 
   /// Change the displayed time
   void set_time (CORBA::Float value);
diff --git a/TAO/tests/Xt_Stopwatch/client.cpp b/TAO/tests/Xt_Stopwatch/client.cpp
index 7dd4d0ad804..b0fd70e1e59 100644
--- a/TAO/tests/Xt_Stopwatch/client.cpp
+++ b/TAO/tests/Xt_Stopwatch/client.cpp
@@ -52,7 +52,7 @@ Client::Client (CORBA::ORB_ptr orb)
 {
 }
 
-Client::~Client (void)
+Client::~Client ()
 {
 }
 
@@ -130,7 +130,7 @@ Client::stop_callback (Widget /*widget*/,
 }
 
 void
-Client::start_hook (void)
+Client::start_hook ()
 {
   try
     {
@@ -145,7 +145,7 @@ Client::start_hook (void)
 }
 
 void
-Client::stop_hook (void)
+Client::stop_hook ()
 {
   try
     {
diff --git a/TAO/tests/Xt_Stopwatch/test_i.cpp b/TAO/tests/Xt_Stopwatch/test_i.cpp
index 5f7a480883e..b348655e7d8 100644
--- a/TAO/tests/Xt_Stopwatch/test_i.cpp
+++ b/TAO/tests/Xt_Stopwatch/test_i.cpp
@@ -7,19 +7,19 @@ Stopwatch_imp::Stopwatch_imp (CORBA::ORB_ptr orb, Timer_imp *timer)
 }
 
 void
-Stopwatch_imp::start (void)
+Stopwatch_imp::start ()
 {
   this->timer_->start ();
 }
 
 void
-Stopwatch_imp::stop (void)
+Stopwatch_imp::stop ()
 {
   this->timer_->stop ();
 }
 
 void
-Stopwatch_imp::shutdown (void)
+Stopwatch_imp::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Xt_Stopwatch/test_i.h b/TAO/tests/Xt_Stopwatch/test_i.h
index 9e720422d35..7621b3e4ecb 100644
--- a/TAO/tests/Xt_Stopwatch/test_i.h
+++ b/TAO/tests/Xt_Stopwatch/test_i.h
@@ -29,11 +29,11 @@ public:
   Stopwatch_imp (CORBA::ORB_ptr, Timer_imp *);
 
   // = The Simple_Server methods.
-  void start (void);
+  void start ();
 
-  void stop (void);
+  void stop ();
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// The ORB
diff --git a/TAO/tests/Xt_Stopwatch/timer.cpp b/TAO/tests/Xt_Stopwatch/timer.cpp
index 06050a3169a..af6f071c6b5 100644
--- a/TAO/tests/Xt_Stopwatch/timer.cpp
+++ b/TAO/tests/Xt_Stopwatch/timer.cpp
@@ -17,7 +17,7 @@ Timer_imp::~Timer_imp ()
 }
 
 void
-Timer_imp::start (void)
+Timer_imp::start ()
 {
   // Reset the elapsed time
   this->counter_ = 0;
@@ -37,7 +37,7 @@ Timer_imp::start (void)
 }
 
 void
-Timer_imp::stop (void)
+Timer_imp::stop ()
 {
     // Remove the current timeout function, if any
   if (this->id_)
@@ -47,7 +47,7 @@ Timer_imp::stop (void)
 }
 
 CORBA::Float
-Timer_imp::elapsed_time(void)
+Timer_imp::elapsed_time()
 {
     return ((CORBA::Float) counter_ * interval_ / 1000.0 );
 }
@@ -63,7 +63,7 @@ Timer_imp::tick_callback (XtPointer client_data,
 
 
 void
-Timer_imp::tick (void)
+Timer_imp::tick ()
 {
   // Increment a counter for each tick
   counter_++;
diff --git a/TAO/tests/Xt_Stopwatch/timer.h b/TAO/tests/Xt_Stopwatch/timer.h
index 3870a4c7599..a9fd30dc470 100644
--- a/TAO/tests/Xt_Stopwatch/timer.h
+++ b/TAO/tests/Xt_Stopwatch/timer.h
@@ -29,13 +29,13 @@ class Timer_imp
   virtual ~Timer_imp ();
 
   /// Resets, and starts the clock ticking
-  void start (void);
+  void start ();
 
   /// Stops the clock
-  void stop (void);
+  void stop ();
 
   /// Returns time since timer started
-  CORBA::Float  elapsed_time (void);
+  CORBA::Float  elapsed_time ();
 
  private:
   /// Static member function used for TimeOut callback.
@@ -43,7 +43,7 @@ class Timer_imp
                              XtIntervalId *);
 
   /// Called every interval_ milliseconds
-  void tick (void);
+  void tick ();
 
   /// Called at each clock tick...
   virtual void report_time (CORBA::Float);