X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=main.cpp;h=690a559c29e9a8952b74e2a840475b227650d5b3;hp=039670649c61ba3e7197ad1b93a724ab3acd2e7f;hb=c063290ac7189bdd15221450f598504f43286b43;hpb=efdec55aec1a137460fa362a381ed1904182bfed

diff --git a/main.cpp b/main.cpp
index 03967064..690a559c 100644
--- a/main.cpp
+++ b/main.cpp
@@ -21,7 +21,7 @@
 #include <libsigrokdecode/libsigrokdecode.h> /* First, so we avoid a _POSIX_C_SOURCE warning. */
 #endif
 
-#include <stdint.h>
+#include <cstdint>
 #include <libsigrokcxx/libsigrokcxx.hpp>
 
 #include <getopt.h>
@@ -44,11 +44,15 @@
 #include "config.h"
 
 #ifdef _WIN32
-// The static qsvg lib is required for SVG graphics/icons (on Windows).
 #include <QtPlugin>
-Q_IMPORT_PLUGIN(qsvg)
+Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin)
+Q_IMPORT_PLUGIN(QSvgPlugin)
 #endif
 
+using std::exception;
+using std::shared_ptr;
+using std::string;
+
 void usage()
 {
 	fprintf(stdout,
@@ -69,8 +73,8 @@ void usage()
 int main(int argc, char *argv[])
 {
 	int ret = 0;
-	std::shared_ptr<sigrok::Context> context;
-	std::string open_file, open_file_format;
+	shared_ptr<sigrok::Context> context;
+	string open_file, open_file_format;
 
 	Application a(argc, argv);
 
@@ -81,7 +85,7 @@ int main(int argc, char *argv[])
 #endif
 
 	// Parse arguments
-	while (1) {
+	while (true) {
 		static const struct option long_options[] = {
 			{"help", no_argument, nullptr, 'h'},
 			{"version", no_argument, nullptr, 'V'},
@@ -132,10 +136,11 @@ int main(int argc, char *argv[])
 	if (argc - optind > 1) {
 		fprintf(stderr, "Only one file can be opened.\n");
 		return 1;
-	} else if (argc - optind == 1) {
-		open_file = argv[argc - 1];
 	}
 
+	if (argc - optind == 1)
+		open_file = argv[argc - 1];
+
 	// Initialise libsigrok
 	context = sigrok::Context::create();
 #ifdef ANDROID
@@ -182,7 +187,7 @@ int main(int argc, char *argv[])
 			// Run the application
 			ret = a.exec();
 
-		} catch (std::exception e) {
+		} catch (exception e) {
 			qDebug() << e.what();
 		}
 
@@ -191,7 +196,7 @@ int main(int argc, char *argv[])
 		srd_exit();
 #endif
 
-	} while (0);
+	} while (false);
 
 	return ret;
 }