[vidalia-svn] r2772: Avoid confusing people who also read (or write) the spec. (vidalia/trunk/src/torcontrol)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2008-06-20 19:36:05 -0400 (Fri, 20 Jun 2008)
New Revision: 2772

Modified:
   vidalia/trunk/src/torcontrol/bootstrapstatusevent.cpp
   vidalia/trunk/src/torcontrol/bootstrapstatusevent.h
Log:
Avoid confusing people who also read (or write) the spec.


Modified: vidalia/trunk/src/torcontrol/bootstrapstatusevent.cpp
===================================================================
--- vidalia/trunk/src/torcontrol/bootstrapstatusevent.cpp	2008-06-20 23:25:20 UTC (rev 2771)
+++ vidalia/trunk/src/torcontrol/bootstrapstatusevent.cpp	2008-06-20 23:36:05 UTC (rev 2772)
@@ -24,7 +24,7 @@
                                            const QString &description,
                                            const QString &warning,
                                            tc::ConnectionStatusReason reason,
-                                           RecommendAction action)
+                                           Recommendation action)
   : ClientStatusEvent(severity, ClientStatusEvent::BootstrapStatus)
 {
   _status = status;
@@ -66,13 +66,13 @@
   return UnrecognizedStatus;
 }
 
-BootstrapStatusEvent::RecommendAction
+BootstrapStatusEvent::Recommendation
 BootstrapStatusEvent::actionFromString(const QString &str)
 {
   if (!str.compare("WARN", Qt::CaseInsensitive))
     return RecommendWarn;
   if (!str.compare("IGNORE", Qt::CaseInsensitive))
     return RecommendIgnore;
-  return UnrecognizedAction;
+  return UnrecognizedRecommendation;
 }
 

Modified: vidalia/trunk/src/torcontrol/bootstrapstatusevent.h
===================================================================
--- vidalia/trunk/src/torcontrol/bootstrapstatusevent.h	2008-06-20 23:25:20 UTC (rev 2771)
+++ vidalia/trunk/src/torcontrol/bootstrapstatusevent.h	2008-06-20 23:36:05 UTC (rev 2772)
@@ -45,8 +45,8 @@
   };
   /** Actions the Tor software might recommend controllers take in response to
    * a bootstrap status problem event. */
-  enum RecommendAction {
-    UnrecognizedAction,
+  enum Recommendation {
+    UnrecognizedRecommendation,
     RecommendIgnore,
     RecommendWarn
   };
@@ -57,7 +57,7 @@
                        const QString &description,
                        const QString &warning = QString(),
                        tc::ConnectionStatusReason reason = tc::UnrecognizedReason,
-                       RecommendAction action = UnrecognizedAction);
+                       Recommendation action = UnrecognizedRecommendation);
 
   /** Returns the BootstrapStatus enum value indicated by this bootstrap
    * status event. */
@@ -83,13 +83,13 @@
 
   /** Returns the action that the Tor software recommended be taken in
    * response to this bootstrap status event. */ 
-  RecommendAction recommendedAction() const { return _action; }
+  Recommendation recommendedAction() const { return _action; }
 
   /** Converts a string TAG value to a BootstrapStatus enum value. */
   static BootstrapStatus statusFromString(const QString &tag);
   /** Converts a string RECOMMENDATION value to a RecommendAction enum
    * value. */
-  static RecommendAction actionFromString(const QString &str);
+  static Recommendation actionFromString(const QString &str);
 
 private:
   /** Current bootstrapping status value.
@@ -119,11 +119,11 @@
    */
   tc::ConnectionStatusReason _reason;
 
-  /** RecommendAction enum value describing Tor's suggested response to this
+  /** Recommendation enum value describing Tor's suggested response to this
    * bootstrap status event.
    * \sa recommendedAction
    */
-  RecommendAction _action;
+  Recommendation _action;
 };
 
 #endif