X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=main.cpp;h=2119b81e50d778daf1ca3e2b6ba4fc09bd8b3f97;hp=0881c184a913d3c704abffca86e50485166e2da9;hb=0402d7a3e425c56321234e4bb546d9b698c6d237;hpb=09f55d9665efb3b17ba7de4bae47be6989e884fe

diff --git a/main.cpp b/main.cpp
index 0881c184..2119b81e 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>
@@ -49,6 +49,10 @@ 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'},
@@ -182,7 +186,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 +195,7 @@ int main(int argc, char *argv[])
 		srd_exit();
 #endif
 
-	} while (0);
+	} while (false);
 
 	return ret;
 }