MainWindow: Tidied restore_ui_settings

[pulseview.git] / main.cpp

diff --git a/main.cpp b/main.cpp
index 8fac92340c1326b3aafd38a5d678b69a06b9046a..285c1535f3c20898307923de6c49ad08bcbfc899 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -23,7 +23,7 @@
 #endif
 
 #include <stdint.h>
-#include <libsigrok/libsigrok.hpp>
+#include <libsigrokcxx/libsigrokcxx.hpp>
 
 #include <getopt.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,18 +80,28 @@ 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}
                };
 
                const int c = getopt_long(argc, argv,
-                       "l:Vh?", long_options, NULL);
+                       "l:Vh?", long_options, nullptr);
                if (c == -1)
                        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;
                }
        }
 
@@ -127,7 +129,7 @@ int main(int argc, char *argv[])
 
 #ifdef ENABLE_DECODE
                // Initialise libsigrokdecode
-               if (srd_init(NULL) != SRD_OK) {
+               if (srd_init(nullptr) != SRD_OK) {
                        qDebug() << "ERROR: libsigrokdecode init failed.";
                        break;
                }
@@ -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.";
                        }