ChangeLogTag: Mon May 16 14:05:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

6 files changed, 28 insertions, 33 deletions

diff --git a/ace/Active_Map_Manager.h b/ace/Active_Map_Manager.h
index a80362da67c..7764ba11aa1 100644
--- a/ace/Active_Map_Manager.h
+++ b/ace/Active_Map_Manager.h
@@ -61,11 +61,11 @@ public:
   /// Size required to store information about active key.
   static size_t size (void);
 
-  /// Recover state of active key from <data>.  User must make sure
-  /// that <data> encoded using the <encode> method.
+  /// Recover state of active key from @a data.  User must make sure
+  /// that @a data encoded using the encode() method.
   void decode (const void *data);
 
-  /// Encode state of the active key into <data>.  <data> must be as
+  /// Encode state of the active key into @a data.  @a data must be as
   /// big as the value returned from <size>.
   void encode (void *data) const;
 
diff --git a/ace/Base_Thread_Adapter.h b/ace/Base_Thread_Adapter.h
index 24cd5b8c677..cd82e2b45ac 100644
--- a/ace/Base_Thread_Adapter.h
+++ b/ace/Base_Thread_Adapter.h
@@ -25,7 +25,7 @@
 #include "os_include/sys/os_time.h"
 #endif // ACE_USES_GPROF
 
-// Run the thread entry point for the <ACE_Thread_Adapter>.  This must
+// Run the thread entry point for the ACE_Thread_Adapter.  This must
 // be an extern "C" to make certain compilers happy...
 #if defined (ACE_PSOS)
 extern "C" void ace_thread_adapter (unsigned long args);
diff --git a/ace/Process.h b/ace/Process.h
index e7a75b4b4d9..c3966f1d91c 100644
--- a/ace/Process.h
+++ b/ace/Process.h
@@ -74,8 +74,8 @@ protected:
 
 public:
   /**
-   * If <inherit_environment> == 1, the new process will inherit the
-   * environment of the current process.  <command_line_buf_len> is the
+   * If @a inherit_environment == 1, the new process will inherit the
+   * environment of the current process.  @a command_line_buf_len is the
    * max strlen for command-line arguments.
    */
   ACE_Process_Options (int inherit_environment = 1,
@@ -107,7 +107,7 @@ public:
               ...);
 
   /**
-   * Set a single environment variable, <variable_name>.  Since
+   * Set a single environment variable, @a variable_name.  Since
    * different platforms separate each environment variable
    * differently, you must call this method once for each variable.
    * <format> can be any printf format string.  So options->setenv
@@ -118,10 +118,10 @@ public:
               const ACE_TCHAR *format,
               ...);
 
-  /// Same as above with argv format.  <envp> must be null terminated.
+  /// Same as above with argv format.  @a envp must be null terminated.
   int setenv (ACE_TCHAR *envp[]);
 
-  /// Set the working directory for the process.  strlen of <wd> must
+  /// Set the working directory for the process.  strlen of @a wd must
   /// be <= MAXPATHLEN.
   void working_directory (const char *wd);
 
@@ -131,8 +131,8 @@ public:
 #endif /* ACE_HAS_WCHAR */
 
   /**
-   * Set the command-line arguments.  <format> can use any printf
-   * formats.  The first token in <format> should be the path to the
+   * Set the command-line arguments.  @a format can use any printf
+   * formats.  The first token in @a format should be the path to the
    * application.  This can either be a full path, relative path, or
    * just an executable name.  If an executable name is used, we rely
    * on the platform's support for searching paths.  Since we need a
@@ -146,13 +146,13 @@ public:
   int command_line (const ACE_ANTI_TCHAR *format, ...);
 #endif /* ACE_HAS_WCHAR && !ACE_HAS_WINCE */
 
-  /// Same as above in argv format.  <argv> must be null terminated.
+  /// Same as above in argv format.  @a argv must be null terminated.
   int command_line (const ACE_TCHAR * const argv[]);
 
   // = Set/get the pathname used to name the process.
   /**
    * Specify the full path or relative path, or just the executable
-   * name for the process. If this is set, then <name> will be used to
+   * name for the process. If this is set, then @a name will be used to
    * create the process instead of argv[0] set in the command
    * line. This is here so that you can supply something other than
    * executable name as argv[0].
@@ -163,7 +163,6 @@ public:
   /// method is not called, this method will return argv[0].
   const ACE_TCHAR *process_name (void);
 
-  // = Set/get creation flags.
   /// Get the creation flags.
   u_long creation_flags (void) const;
 
@@ -203,17 +202,15 @@ public:
    */
   ACE_TCHAR *env_buf (void);
 
-  // = Get/set process group.
   /// Get the process group.  On UNIX, these methods are used by the
-  /// <ACE_Process_Manager> to manage groups of processes.
+  /// ACE_Process_Manager to manage groups of processes.
   pid_t getgroup (void) const;
 
   /// Set the process group.  On UNIX, these methods are used by the
-  /// <ACE_Process_Manager> to manage groups of processes.
+  /// ACE_Process_Manager to manage groups of processes.
   pid_t setgroup (pid_t pgrp);
 
-  /// Default is TRUE.
-  /// Allows disabling of handle inheritence.
+  /// Allows disabling of handle inheritence, default is TRUE.
   int handle_inheritence (void);
   void handle_inheritence (int);
 
@@ -309,8 +306,8 @@ public:
 protected:
 
 #if !defined (ACE_HAS_WINCE)
-  /// Add <assignment> to environment_buf_ and adjust
-  /// environment_argv_.  <len> is the strlen of <assignment>.
+  /// Add @a assignment to environment_buf_ and adjust
+  /// environment_argv_.  @a len is the strlen of @a assignment.
   int setenv_i (ACE_TCHAR *assignment, size_t len);
 
   /// Whether the child process inherits the current process
@@ -456,7 +453,7 @@ public:
   virtual int prepare (ACE_Process_Options &options);
 
   /**
-   * Launch a new process as described by <options>.  Returns the
+   * Launch a new process as described by @a options.  Returns the
    * process id of the newly spawned child on success or -1 on
    * failure.
    */
@@ -586,7 +583,7 @@ class ACE_Export ACE_Managed_Process : public ACE_Process
 public:
   ACE_Managed_Process ();
 
-  /// Cleanup by deleting <this>.
+  /// Cleanup by deleting @c this.
   virtual void unmanage (void);
 
 private:
diff --git a/ace/Process_Semaphore.h b/ace/Process_Semaphore.h
index e785bf62b1b..006cc963de0 100644
--- a/ace/Process_Semaphore.h
+++ b/ace/Process_Semaphore.h
@@ -99,7 +99,7 @@ public:
 
   /**
    * Conditionally acquire semaphore (i.e., won't block).  This calls
-   * <tryacquire> and is only here to make the <ACE_Process_Semaphore>
+   * <tryacquire> and is only here to make the ACE_Process_Semaphore
    * interface consistent with the other synchronization APIs.
    * Returns -1 on failure.  If we "failed" because someone else
    * already had the lock, <errno> is set to <EBUSY>.
@@ -107,7 +107,7 @@ public:
   int tryacquire_write (void);
 
   /**
-   * This is only here to make the <ACE_Process_Semaphore>
+   * This is only here to make the ACE_Process_Semaphore
    * interface consistent with the other synchronization APIs.
    * Assumes the caller has already acquired the semaphore using one of
    * the above calls, and returns 0 (success) always.
diff --git a/ace/QtReactor.cpp b/ace/QtReactor.cpp
index ab82e9c9944..10f66e42021 100644
--- a/ace/QtReactor.cpp
+++ b/ace/QtReactor.cpp
@@ -73,7 +73,7 @@ ACE_QtReactor::~ACE_QtReactor (void)
     MAP::ITERATOR iterEnd = this->read_notifier_.end ();
     while( iter != iterEnd )
     {
-        MAP::ENTRY &entry ( *iter );
+        MAP::ENTRY &entry = *iter;
         // QOBject destructor notifies qapplication (hopefully) on delete
         delete entry.int_id_;
         ++iter;
@@ -84,7 +84,7 @@ ACE_QtReactor::~ACE_QtReactor (void)
     this->write_notifier_.end ();
     while( iter != iterEnd )
     {
-        MAP::ENTRY &entry ( *iter );
+        MAP::ENTRY &entry = *iter;
         // QOBject destructor notifies qapplication (hopefully) on delete
         delete entry.int_id_;
         ++iter;
@@ -95,7 +95,7 @@ ACE_QtReactor::~ACE_QtReactor (void)
     this->exception_notifier_.end ();
     while( iter != iterEnd )
     {
-        MAP::ENTRY &entry ( *iter );
+        MAP::ENTRY &entry = *iter;
         // QOBject destructor notifies qapplication (hopefully) on delete
         delete entry.int_id_;
         ++iter;
@@ -621,8 +621,6 @@ ACE_QtReactor::wait_for_multiple_events (ACE_Select_Reactor_Handle_Set &handle_s
   // Timed out or input available
 }
 
-
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 template class ACE_Map_Entry<ACE_HANDLE, QSocketNotifier *>;
 template class ACE_Map_Manager<ACE_HANDLE, QSocketNotifier *, ACE_Null_Mutex>;
diff --git a/ace/QtReactor.h b/ace/QtReactor.h
index b336fdd3d13..f15e45bcbf6 100644
--- a/ace/QtReactor.h
+++ b/ace/QtReactor.h
@@ -198,9 +198,9 @@ private:
 
 private slots:
 
-// These are all part of the communication mechanism adopted in Qt.
-/// Dispatch a Read Event
-void read_event (int FD);
+    // These are all part of the communication mechanism adopted in Qt.
+    /// Dispatch a Read Event
+    void read_event (int FD);
 
     /// Dispatch a Write Event
     void write_event (int FD);