Remodel section handling: Use constants

1 files changed, 13 insertions, 5 deletions

diff --git a/src/command_line_options.cpp b/src/command_line_options.cpp
index fd72641..bd085fc 100644
--- a/src/command_line_options.cpp
+++ b/src/command_line_options.cpp
@@ -18,18 +18,20 @@ CommandLineOptions::CommandLineOptions(int argc, char * const argv[]) {
 		{"pvs", no_argument, NULL, 'p'},
 		{"runscript", no_argument, NULL, 'S'},
 		{"size", required_argument, NULL, 's'},
+		{"tab", required_argument, NULL, 'T'},
 		{"theme", required_argument, NULL, 't'},
 		{"url", required_argument, NULL, 'u'},
 		{"version", no_argument, NULL, 'v'},
 		{"xpath", required_argument, NULL, 'x'},
-		{"tab", required_argument, NULL, 'T'},
+		{"location-mode", required_argument, NULL, 'locm'},
+		{"template-mode", required_argument, NULL, 'tmpm'},
 		{0, 0, 0, 0}
 	};
 
 	int c;
 
 	// Again, please sort alphabetically in getopt_long call and switch statement
-    while ((c = getopt_long(argc, argv, "b:c:Dd:Ff:hP:pSs:t:T:u:vx:?", longOptions, NULL)) != -1) {
+    while ((c = getopt_long(argc, argv, "b:c:Dd:Ff:hl:P:pSs:t:T:u:vx:?", longOptions, NULL)) != -1) {
         switch (c) {
         case 'b':
         	options.insert("base", optarg);
@@ -53,15 +55,15 @@ CommandLineOptions::CommandLineOptions(int argc, char * const argv[]) {
         case '?':
             options.insert("usage", "usage");
             break;
-        case 'P':
-            options.insert("pool", optarg);
-            break;
         case 'l':
             options.insert("locations", optarg);
             break;
         case 'p':
             options.insert("pvs", "pvs");
             break;
+        case 'P':
+            options.insert("pool", optarg);
+            break;
         case 'S':
         	options.insert("runscript", optarg);
         	break;
@@ -83,6 +85,12 @@ CommandLineOptions::CommandLineOptions(int argc, char * const argv[]) {
         case 'x':
             options.insert("xpath", optarg);
             break;
+        case 'locm':
+            options.insert("location-mode", optarg);
+            break;
+        case 'tmpm':
+            options.insert("template-mode", optarg);
+            break;
         default:
             options.insert("error", "error");
             break;