X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=main.cpp;h=d0ca64a2483a85fb7cdac23c5a7170c1c3f02d34;hp=78a131a5f1e108c9548cc34f1f19ea5bea6e6abb;hb=0bd39c0c6fcf31063fca364bfdb23d3d40914ba1;hpb=f74015db20c1ac85df6397df7199a030e6db828f

diff --git a/main.cpp b/main.cpp
index 78a131a5..d0ca64a2 100644
--- a/main.cpp
+++ b/main.cpp
@@ -14,20 +14,20 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef ENABLE_DECODE
 #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>
 
 #include <QDebug>
+#include <QSettings>
 
 #ifdef ENABLE_SIGNALS
 #include "signalhandler.hpp"
@@ -45,11 +45,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,
@@ -70,8 +74,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);
 
@@ -82,7 +86,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'},
@@ -117,6 +121,11 @@ int main(int argc, char *argv[])
 			srd_log_loglevel_set(loglevel);
 #endif
 
+			if (loglevel >= 5) {
+				const QSettings settings;
+				qDebug() << "Settings:" << settings.fileName()
+					<< "format" << settings.format();
+			}
 			break;
 		}
 
@@ -133,10 +142,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
@@ -183,7 +193,7 @@ int main(int argc, char *argv[])
 			// Run the application
 			ret = a.exec();
 
-		} catch (std::exception e) {
+		} catch (exception e) {
 			qDebug() << e.what();
 		}
 
@@ -192,7 +202,7 @@ int main(int argc, char *argv[])
 		srd_exit();
 #endif
 
-	} while (0);
+	} while (false);
 
 	return ret;
 }