make clang-format using clang-format-3.6

1 files changed, 78 insertions, 92 deletions

diff --git a/src/OptionHandlerImpl.h b/src/OptionHandlerImpl.h
index 7dc0295c..dbee5a77 100644
--- a/src/OptionHandlerImpl.h
+++ b/src/OptionHandlerImpl.h
@@ -49,14 +49,13 @@ struct Pref;
 
 class BooleanOptionHandler : public AbstractOptionHandler {
 public:
-  BooleanOptionHandler(PrefPtr pref,
-                       const char* description = NO_DESCRIPTION,
+  BooleanOptionHandler(PrefPtr pref, const char* description = NO_DESCRIPTION,
                        const std::string& defaultValue = NO_DEFAULT_VALUE,
                        OptionHandler::ARG_TYPE argType = OptionHandler::REQ_ARG,
                        char shortName = 0);
   virtual ~BooleanOptionHandler();
-  virtual void parseArg(Option& option, const std::string& optarg) const
-    CXX11_OVERRIDE;
+  virtual void parseArg(Option& option,
+                        const std::string& optarg) const CXX11_OVERRIDE;
   virtual std::string createPossibleValuesString() const CXX11_OVERRIDE;
 };
 
@@ -64,15 +63,14 @@ class IntegerRangeOptionHandler : public AbstractOptionHandler {
 private:
   int32_t min_;
   int32_t max_;
+
 public:
-  IntegerRangeOptionHandler(PrefPtr pref,
-                            const char* description,
-                            const std::string& defaultValue,
-                            int32_t min, int32_t max,
-                            char shortName = 0);
+  IntegerRangeOptionHandler(PrefPtr pref, const char* description,
+                            const std::string& defaultValue, int32_t min,
+                            int32_t max, char shortName = 0);
   virtual ~IntegerRangeOptionHandler();
-  virtual void parseArg(Option& option, const std::string& optarg) const
-    CXX11_OVERRIDE;
+  virtual void parseArg(Option& option,
+                        const std::string& optarg) const CXX11_OVERRIDE;
   virtual std::string createPossibleValuesString() const CXX11_OVERRIDE;
 };
 
@@ -80,17 +78,15 @@ class NumberOptionHandler : public AbstractOptionHandler {
 private:
   int64_t min_;
   int64_t max_;
+
 public:
-  NumberOptionHandler(PrefPtr pref,
-                      const char* description = NO_DESCRIPTION,
+  NumberOptionHandler(PrefPtr pref, const char* description = NO_DESCRIPTION,
                       const std::string& defaultValue = NO_DEFAULT_VALUE,
-                      int64_t min = -1,
-                      int64_t max = -1,
-                      char shortName = 0);
+                      int64_t min = -1, int64_t max = -1, char shortName = 0);
   virtual ~NumberOptionHandler();
 
-  virtual void parseArg(Option& option, const std::string& optarg) const
-    CXX11_OVERRIDE;
+  virtual void parseArg(Option& option,
+                        const std::string& optarg) const CXX11_OVERRIDE;
   void parseArg(Option& option, int64_t number) const;
   virtual std::string createPossibleValuesString() const CXX11_OVERRIDE;
 };
@@ -100,18 +96,18 @@ public:
   UnitNumberOptionHandler(PrefPtr pref,
                           const char* description = NO_DESCRIPTION,
                           const std::string& defaultValue = NO_DEFAULT_VALUE,
-                          int64_t min = -1,
-                          int64_t max = -1,
+                          int64_t min = -1, int64_t max = -1,
                           char shortName = 0);
   virtual ~UnitNumberOptionHandler();
-  virtual void parseArg(Option& option, const std::string& optarg) const
-    CXX11_OVERRIDE;
+  virtual void parseArg(Option& option,
+                        const std::string& optarg) const CXX11_OVERRIDE;
 };
 
 class FloatNumberOptionHandler : public AbstractOptionHandler {
 private:
   double min_;
   double max_;
+
 public:
   FloatNumberOptionHandler(PrefPtr pref,
                            const char* description = NO_DESCRIPTION,
@@ -119,8 +115,8 @@ public:
                            double min = -1, double max = -1,
                            char shortName = 0);
   virtual ~FloatNumberOptionHandler();
-  virtual void parseArg(Option& option, const std::string& optarg) const
-    CXX11_OVERRIDE;
+  virtual void parseArg(Option& option,
+                        const std::string& optarg) const CXX11_OVERRIDE;
   virtual std::string createPossibleValuesString() const CXX11_OVERRIDE;
 };
 
@@ -128,16 +124,16 @@ class DefaultOptionHandler : public AbstractOptionHandler {
 private:
   std::string possibleValuesString_;
   bool allowEmpty_;
+
 public:
-  DefaultOptionHandler(PrefPtr pref,
-                       const char* description = NO_DESCRIPTION,
+  DefaultOptionHandler(PrefPtr pref, const char* description = NO_DESCRIPTION,
                        const std::string& defaultValue = NO_DEFAULT_VALUE,
                        const std::string& possibleValuesString = A2STR::NIL,
                        OptionHandler::ARG_TYPE argType = OptionHandler::REQ_ARG,
                        char shortName = 0);
   virtual ~DefaultOptionHandler();
-  virtual void parseArg(Option& option, const std::string& optarg) const
-    CXX11_OVERRIDE;
+  virtual void parseArg(Option& option,
+                        const std::string& optarg) const CXX11_OVERRIDE;
   virtual std::string createPossibleValuesString() const CXX11_OVERRIDE;
   void setAllowEmpty(bool allow);
 };
@@ -146,44 +142,40 @@ class CumulativeOptionHandler : public AbstractOptionHandler {
 private:
   std::string delim_;
   std::string possibleValuesString_;
+
 public:
-  CumulativeOptionHandler(PrefPtr pref,
-                          const char* description,
-                          const std::string& defaultValue,
-                          const std::string& delim,
-                          const std::string& possibleValuesString = A2STR::NIL,
-                          OptionHandler::ARG_TYPE argType =
-                          OptionHandler::REQ_ARG,
-                          char shortName = 0);
+  CumulativeOptionHandler(
+      PrefPtr pref, const char* description, const std::string& defaultValue,
+      const std::string& delim,
+      const std::string& possibleValuesString = A2STR::NIL,
+      OptionHandler::ARG_TYPE argType = OptionHandler::REQ_ARG,
+      char shortName = 0);
   virtual ~CumulativeOptionHandler();
-  virtual void parseArg(Option& option, const std::string& optarg) const
-    CXX11_OVERRIDE;
+  virtual void parseArg(Option& option,
+                        const std::string& optarg) const CXX11_OVERRIDE;
   virtual std::string createPossibleValuesString() const CXX11_OVERRIDE;
 };
 
 class IndexOutOptionHandler : public AbstractOptionHandler {
 public:
-  IndexOutOptionHandler(PrefPtr pref,
-                        const char* description,
+  IndexOutOptionHandler(PrefPtr pref, const char* description,
                         char shortName = 0);
   virtual ~IndexOutOptionHandler();
-  virtual void parseArg(Option& option, const std::string& optarg) const
-    CXX11_OVERRIDE;
+  virtual void parseArg(Option& option,
+                        const std::string& optarg) const CXX11_OVERRIDE;
   virtual std::string createPossibleValuesString() const CXX11_OVERRIDE;
 };
 
 class ChecksumOptionHandler : public AbstractOptionHandler {
 public:
-  ChecksumOptionHandler(PrefPtr pref,
-                        const char* description,
+  ChecksumOptionHandler(PrefPtr pref, const char* description,
                         char shortName = 0);
-  ChecksumOptionHandler(PrefPtr pref,
-                        const char* description,
+  ChecksumOptionHandler(PrefPtr pref, const char* description,
                         std::vector<std::string> acceptableTypes,
                         char shortName = 0);
   virtual ~ChecksumOptionHandler();
-  virtual void parseArg(Option& option, const std::string& optarg) const
-    CXX11_OVERRIDE;
+  virtual void parseArg(Option& option,
+                        const std::string& optarg) const CXX11_OVERRIDE;
   virtual std::string createPossibleValuesString() const CXX11_OVERRIDE;
 
 private:
@@ -195,15 +187,15 @@ private:
 class ParameterOptionHandler : public AbstractOptionHandler {
 private:
   std::vector<std::string> validParamValues_;
+
 public:
-  ParameterOptionHandler(PrefPtr pref,
-                         const char* description,
+  ParameterOptionHandler(PrefPtr pref, const char* description,
                          const std::string& defaultValue,
                          std::vector<std::string> validParamValues,
                          char shortName = 0);
   virtual ~ParameterOptionHandler();
-  virtual void parseArg(Option& option, const std::string& optarg) const
-    CXX11_OVERRIDE;
+  virtual void parseArg(Option& option,
+                        const std::string& optarg) const CXX11_OVERRIDE;
   virtual std::string createPossibleValuesString() const CXX11_OVERRIDE;
 };
 
@@ -211,18 +203,16 @@ class HostPortOptionHandler : public AbstractOptionHandler {
 private:
   PrefPtr hostOptionName_;
   PrefPtr portOptionName_;
+
 public:
-  HostPortOptionHandler(PrefPtr pref,
-                        const char* description,
-                        const std::string& defaultValue,
-                        PrefPtr hostOptionName,
-                        PrefPtr portOptionName,
-                        char shortName = 0);
+  HostPortOptionHandler(PrefPtr pref, const char* description,
+                        const std::string& defaultValue, PrefPtr hostOptionName,
+                        PrefPtr portOptionName, char shortName = 0);
   virtual ~HostPortOptionHandler();
-  virtual void parseArg(Option& option, const std::string& optarg) const
-    CXX11_OVERRIDE;
-  void setHostAndPort
-  (Option& option, const std::string& hostname, uint16_t port) const;
+  virtual void parseArg(Option& option,
+                        const std::string& optarg) const CXX11_OVERRIDE;
+  void setHostAndPort(Option& option, const std::string& hostname,
+                      uint16_t port) const;
   virtual std::string createPossibleValuesString() const CXX11_OVERRIDE;
 };
 
@@ -230,65 +220,61 @@ class HttpProxyOptionHandler : public AbstractOptionHandler {
 private:
   PrefPtr proxyUserPref_;
   PrefPtr proxyPasswdPref_;
+
 public:
-  HttpProxyOptionHandler(PrefPtr pref,
-                         const char* description,
-                         const std::string& defaultValue,
-                         char shortName = 0);
+  HttpProxyOptionHandler(PrefPtr pref, const char* description,
+                         const std::string& defaultValue, char shortName = 0);
   virtual ~HttpProxyOptionHandler();
-  virtual void parseArg(Option& option, const std::string& optarg) const
-    CXX11_OVERRIDE;
+  virtual void parseArg(Option& option,
+                        const std::string& optarg) const CXX11_OVERRIDE;
   virtual std::string createPossibleValuesString() const CXX11_OVERRIDE;
 };
 
 class LocalFilePathOptionHandler : public AbstractOptionHandler {
 private:
   bool acceptStdin_;
+
 public:
-  LocalFilePathOptionHandler
-  (PrefPtr pref,
-   const char* description = NO_DESCRIPTION,
-   const std::string& defaultValue = NO_DEFAULT_VALUE,
-   bool acceptStdin = false,
-   char shortName = 0);
-  virtual void parseArg(Option& option, const std::string& optarg) const
-    CXX11_OVERRIDE;
+  LocalFilePathOptionHandler(PrefPtr pref,
+                             const char* description = NO_DESCRIPTION,
+                             const std::string& defaultValue = NO_DEFAULT_VALUE,
+                             bool acceptStdin = false, char shortName = 0);
+  virtual void parseArg(Option& option,
+                        const std::string& optarg) const CXX11_OVERRIDE;
   virtual std::string createPossibleValuesString() const CXX11_OVERRIDE;
 };
 
-class PrioritizePieceOptionHandler:public AbstractOptionHandler {
+class PrioritizePieceOptionHandler : public AbstractOptionHandler {
 public:
-  PrioritizePieceOptionHandler
-  (PrefPtr pref,
-   const char* description = NO_DESCRIPTION,
-   const std::string& defaultValue = NO_DEFAULT_VALUE,
-   char shortName = 0);
-  virtual void parseArg(Option& option, const std::string& optarg) const
-    CXX11_OVERRIDE;
+  PrioritizePieceOptionHandler(
+      PrefPtr pref, const char* description = NO_DESCRIPTION,
+      const std::string& defaultValue = NO_DEFAULT_VALUE, char shortName = 0);
+  virtual void parseArg(Option& option,
+                        const std::string& optarg) const CXX11_OVERRIDE;
   virtual std::string createPossibleValuesString() const CXX11_OVERRIDE;
 };
 
 // This class is used to deprecate option and optionally handle its
 // option value using replacing option.
-class DeprecatedOptionHandler:public OptionHandler {
+class DeprecatedOptionHandler : public OptionHandler {
 private:
   OptionHandler* depOptHandler_;
   const OptionHandler* repOptHandler_;
   bool stillWork_;
   std::string additionalMessage_;
+
 public:
   // depOptHandler is deprecated option and repOptHandler is replacing
   // new option. If there is no replacing option, specify nullptr.  If
   // there is no replacing option, but the option still lives, give
   // true to stillWork. Set additional message to additionalMessage.
-  DeprecatedOptionHandler
-  (OptionHandler* depOptHandler,
-   const OptionHandler* repOptHandler = nullptr,
-   bool stillWork = false,
-   std::string additionalMessage = "");
+  DeprecatedOptionHandler(OptionHandler* depOptHandler,
+                          const OptionHandler* repOptHandler = nullptr,
+                          bool stillWork = false,
+                          std::string additionalMessage = "");
   virtual ~DeprecatedOptionHandler();
-  virtual void parse(Option& option, const std::string& arg) const
-    CXX11_OVERRIDE;
+  virtual void parse(Option& option,
+                     const std::string& arg) const CXX11_OVERRIDE;
   virtual std::string createPossibleValuesString() const CXX11_OVERRIDE;
   virtual bool hasTag(uint32_t tag) const CXX11_OVERRIDE;
   virtual void addTag(uint32_t tag) CXX11_OVERRIDE;