X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=main.cpp;h=089deee756db87024ef5fe698a8be7335726debc;hb=aa90e86b1c25f67ea64d7bec0560f531c67bc853;hp=c0ac04b475d49b9ac2330856ceded776ab34e292;hpb=e8d009288de28cb194bc7964f96677c2baf900c9;p=pulseview.git

diff --git a/main.cpp b/main.cpp
index c0ac04b..089deee 100644
--- a/main.cpp
+++ b/main.cpp
@@ -23,22 +23,22 @@
 #endif
 
 #include <stdint.h>
-#include <libsigrok/libsigrok.hpp>
+#include <libsigrokcxx/libsigrokcxx.hpp>
 
 #include <getopt.h>
 
 #include <QDebug>
 
 #ifdef ENABLE_SIGNALS
-#include "signalhandler.h"
+#include "signalhandler.hpp"
 #endif
 
-#include "pv/application.h"
-#include "pv/devicemanager.h"
-#include "pv/mainwindow.h"
+#include "pv/application.hpp"
+#include "pv/devicemanager.hpp"
+#include "pv/mainwindow.hpp"
 #ifdef ANDROID
 #include <libsigrokandroidutils/libsigrokandroidutils.h>
-#include "android/loghandler.h"
+#include "android/loghandler.hpp"
 #endif
 
 #include "config.h"
@@ -56,9 +56,11 @@ void usage()
 		"  %s [OPTION…] [FILE] — %s\n"
 		"\n"
 		"Help Options:\n"
-		"  -l, --loglevel                  Set libsigrok/libsigrokdecode loglevel\n"
-		"  -V, --version                   Show release version\n"
 		"  -h, -?, --help                  Show help option\n"
+		"\n"
+		"Application Options:\n"
+		"  -V, --version                   Show release version\n"
+		"  -l, --loglevel                  Set libsigrok/libsigrokdecode loglevel\n"
 		"\n", PV_BIN_NAME, PV_DESCRIPTION);
 }
 
@@ -78,9 +80,9 @@ int main(int argc, char *argv[])
 	// Parse arguments
 	while (1) {
 		static const struct option long_options[] = {
-			{"loglevel", required_argument, 0, 'l'},
-			{"version", no_argument, 0, 'V'},
 			{"help", no_argument, 0, 'h'},
+			{"version", no_argument, 0, 'V'},
+			{"loglevel", required_argument, 0, 'l'},
 			{0, 0, 0, 0}
 		};
 
@@ -90,6 +92,16 @@ int main(int argc, char *argv[])
 			break;
 
 		switch (c) {
+		case 'h':
+		case '?':
+			usage();
+			return 0;
+
+		case 'V':
+			// Print version info
+			fprintf(stdout, "%s %s\n", PV_TITLE, PV_VERSION_STRING);
+			return 0;
+
 		case 'l':
 		{
 			const int loglevel = atoi(optarg);
@@ -101,16 +113,6 @@ int main(int argc, char *argv[])
 
 			break;
 		}
-
-		case 'V':
-			// Print version info
-			fprintf(stdout, "%s %s\n", PV_TITLE, PV_VERSION_STRING);
-			return 0;
-
-		case 'h':
-		case '?':
-			usage();
-			return 0;
 		}
 	}
 
@@ -154,7 +156,7 @@ int main(int argc, char *argv[])
 				QObject::connect(handler,
 					SIGNAL(term_received()),
 					&w, SLOT(close()));
-    			} else {
+			} else {
 				qWarning() <<
 					"Could not prepare signal handler.";
 			}