[libcamera-devel] [PATCH 1/6] cam: options: move enum OptionArgument

Niklas Söderlund niklas.soderlund at ragnatech.se
Mon Jan 28 01:41:04 CET 2019


The enumeration of the different possibilities for arguments can be used
by other parser then OptionsParser. Move it outside the class to make it
ready to be used by other parsers.

Signed-off-by: Niklas Söderlund <niklas.soderlund at ragnatech.se>
---
 src/cam/main.cpp  |  3 +--
 src/cam/options.h | 12 ++++++------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/cam/main.cpp b/src/cam/main.cpp
index cb98d302dcf30331..bde47a8f17983912 100644
--- a/src/cam/main.cpp
+++ b/src/cam/main.cpp
@@ -38,8 +38,7 @@ static int parseOptions(int argc, char *argv[])
 	OptionsParser parser;
 
 	parser.addOption(OptCamera, "Specify which camera to operate on",
-			 "camera", OptionsParser::ArgumentRequired,
-			 "camera");
+			 "camera", ArgumentRequired, "camera");
 	parser.addOption(OptHelp, "Display this help message", "help");
 	parser.addOption(OptList, "List all cameras", "list");
 
diff --git a/src/cam/options.h b/src/cam/options.h
index f99ea7300a71c24f..491f6a316fffbe5b 100644
--- a/src/cam/options.h
+++ b/src/cam/options.h
@@ -11,15 +11,15 @@
 #include <map>
 #include <vector>
 
+enum OptionArgument {
+	ArgumentNone,
+	ArgumentRequired,
+	ArgumentOptional,
+};
+
 class OptionsParser
 {
 public:
-	enum OptionArgument {
-		ArgumentNone,
-		ArgumentRequired,
-		ArgumentOptional,
-	};
-
 	class Options {
 	public:
 		Options();
-- 
2.20.1



More information about the libcamera-devel mailing list