#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 "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,
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);
#endif
// Parse arguments
- while (1) {
+ while (true) {
static const struct option long_options[] = {
{"help", no_argument, nullptr, 'h'},
{"version", no_argument, nullptr, 'V'},
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
// Run the application
ret = a.exec();
- } catch (std::exception e) {
+ } catch (exception e) {
qDebug() << e.what();
}
srd_exit();
#endif
- } while (0);
+ } while (false);
return ret;
}