Update .clang-format file & apply clang-format to whole project

samples/getopt-test.cpp

@@ -31,105 +31,88 @@
 #endif
 #include <iostream>
 
-#define Safe(x) (x?x:"unknown")
+#define Safe(x) (x ? x : "unknown")
 const char* optstring = ":hVvqfbuktTFa:Y:O:D:r:p:P:d:e:i:c:m:M:l:S:g:K:n:Q:";
 
 // *****************************************************************************
 // class Params
 class Params : public Util::Getopt {
+ public:
+  /*!
+    @brief Call Getopt::getopt() with optstring, to initiate command line
+           argument parsing, perform consistency checks after all command line
+           arguments are parsed.
 
-public:
-    /*!
-      @brief Call Getopt::getopt() with optstring, to initiate command line
-             argument parsing, perform consistency checks after all command line
-             arguments are parsed.
+    @param argc Argument count as passed to main() on program invocation.
+    @param argv Argument array as passed to main() on program invocation.
 
-      @param argc Argument count as passed to main() on program invocation.
-      @param argv Argument array as passed to main() on program invocation.
+    @return 0 if successful, >0 in case of errors.
+   */
+  int getopt(int argc, char** const argv) {
+    int rc = Util::Getopt::getopt(argc, argv, ::optstring);
+    std::cout << "Params::getopt()"
+              << " rc = " << rc << std::endl;
+    return rc;
+  }
 
-      @return 0 if successful, >0 in case of errors.
-     */
-    int getopt(int argc, char** const argv)
-    {
-        int rc = Util::Getopt::getopt(argc, argv, ::optstring);
-    	std::cout << "Params::getopt()"
-    	          << " rc = " << rc
-    	          << std::endl;
-    	return rc ;
-    }
+  //! Handle options and their arguments.
+  int option(int opt, const std::string& optarg, int optopt) override {
+    std::cout << "Params::option()"
+              << " opt = " << opt << " optarg = " << optarg << " optopt = " << optopt << std::endl;
+    return 0;
+  }
 
-    //! Handle options and their arguments.
-    int option(int opt, const std::string& optarg, int optopt) override
-    {
-    	std::cout << "Params::option()"
-    	          << " opt = "    << opt
-    	          << " optarg = " << optarg
-    	          << " optopt = " << optopt
-    	          << std::endl;
-    	return 0;
-    }
+  //! Handle non-option parameters.
+  int nonoption(const std::string& argv) override {
+    std::cout << "Params::nonoption()"
+              << " " << argv << std::endl;
+    return 0;
+  }
+};  // class Params
 
-    //! Handle non-option parameters.
-    int nonoption(const std::string& argv) override
-    {
-    	std::cout << "Params::nonoption()"
-    	          << " " << argv
-    	          << std::endl;
-    	return 0 ;
-    }
-}; // class Params
-
-int main(int argc, char** const argv)
-{
-	Exiv2::XmpParser::initialize();
-	::atexit(Exiv2::XmpParser::terminate);
+int main(int argc, char** const argv) {
+  Exiv2::XmpParser::initialize();
+  ::atexit(Exiv2::XmpParser::terminate);
 #ifdef EXV_ENABLE_BMFF
-    Exiv2::enableBMFF();
+  Exiv2::enableBMFF();
 #endif
 
-	int n;
+  int n;
 
 #ifdef EXV_HAVE_UNISTD_H
-	std::cout << "standard getopt()" << std::endl;
-	do {
-	    n = ::getopt(argc,argv,::optstring);
-	    if ( n >= 0 ) {
-            auto N = static_cast<char>(n);
-            std::cout << n << " = " << N;
-        } else {
-            std::cout << n ;
-        }
-        std::cout << " optind = " << ::optind
-				  << " opterr = " << ::opterr
-				  << " optopt = " << ::optopt
-				  << " optarg = " << Safe(::optarg)
-				  << std::endl;
-	} while ( n >= 0 );
-	std::cout << std::endl;
+  std::cout << "standard getopt()" << std::endl;
+  do {
+    n = ::getopt(argc, argv, ::optstring);
+    if (n >= 0) {
+      auto N = static_cast<char>(n);
+      std::cout << n << " = " << N;
+    } else {
+      std::cout << n;
+    }
+    std::cout << " optind = " << ::optind << " opterr = " << ::opterr << " optopt = " << ::optopt
+              << " optarg = " << Safe(::optarg) << std::endl;
+  } while (n >= 0);
+  std::cout << std::endl;
 #endif
 
-	std::cout << "homemade getopt()" << std::endl;
-	do {
-	    n = Util::getopt(argc,argv,::optstring);
-	    if ( n >= 0 ) {
-            auto N = static_cast<char>(n);
-            std::cout << n << " = " << N;
-        } else {
-            std::cout << n ;
-        }
-        std::cout << " optind = " << Util::optind
-				  << " opterr = " << Util::opterr
-				  << " optopt = " << Util::optopt
-				  << " optarg = " << Safe(Util::optarg)
-				  << std::endl;
+  std::cout << "homemade getopt()" << std::endl;
+  do {
+    n = Util::getopt(argc, argv, ::optstring);
+    if (n >= 0) {
+      auto N = static_cast<char>(n);
+      std::cout << n << " = " << N;
+    } else {
+      std::cout << n;
+    }
+    std::cout << " optind = " << Util::optind << " opterr = " << Util::opterr << " optopt = " << Util::optopt
+              << " optarg = " << Safe(Util::optarg) << std::endl;
 
-	} while ( n >= 0 );
-	std::cout << std::endl;
+  } while (n >= 0);
+  std::cout << std::endl;
 
-    // Handle command line arguments
-    Params params;
-    params.getopt(argc, argv);
+  // Handle command line arguments
+  Params params;
+  params.getopt(argc, argv);
 
-    return 0;
+  return 0;
 }
-