projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
About: Also show libsigrok libs and features.
[pulseview.git]
/
main.cpp
diff --git
a/main.cpp
b/main.cpp
index 039670649c61ba3e7197ad1b93a724ab3acd2e7f..d0ca64a2483a85fb7cdac23c5a7170c1c3f02d34 100644
(file)
--- a/
main.cpp
+++ b/
main.cpp
@@
-21,12
+21,13
@@
#include <libsigrokdecode/libsigrokdecode.h> /* First, so we avoid a _POSIX_C_SOURCE warning. */
#endif
#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 <libsigrokcxx/libsigrokcxx.hpp>
#include <getopt.h>
#include <QDebug>
+#include <QSettings>
#ifdef ENABLE_SIGNALS
#include "signalhandler.hpp"
#ifdef ENABLE_SIGNALS
#include "signalhandler.hpp"
@@
-44,11
+45,15
@@
#include "config.h"
#ifdef _WIN32
#include "config.h"
#ifdef _WIN32
-// The static qsvg lib is required for SVG graphics/icons (on Windows).
#include <QtPlugin>
#include <QtPlugin>
-Q_IMPORT_PLUGIN(qsvg)
+Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin)
+Q_IMPORT_PLUGIN(QSvgPlugin)
#endif
#endif
+using std::exception;
+using std::shared_ptr;
+using std::string;
+
void usage()
{
fprintf(stdout,
void usage()
{
fprintf(stdout,
@@
-69,8
+74,8
@@
void usage()
int main(int argc, char *argv[])
{
int ret = 0;
int main(int argc, char *argv[])
{
int ret = 0;
- s
td::s
hared_ptr<sigrok::Context> context;
- st
d::st
ring open_file, open_file_format;
+ shared_ptr<sigrok::Context> context;
+ string open_file, open_file_format;
Application a(argc, argv);
Application a(argc, argv);
@@
-81,7
+86,7
@@
int main(int argc, char *argv[])
#endif
// Parse arguments
#endif
// Parse arguments
- while (
1
) {
+ while (
true
) {
static const struct option long_options[] = {
{"help", no_argument, nullptr, 'h'},
{"version", no_argument, nullptr, 'V'},
static const struct option long_options[] = {
{"help", no_argument, nullptr, 'h'},
{"version", no_argument, nullptr, 'V'},
@@
-116,6
+121,11
@@
int main(int argc, char *argv[])
srd_log_loglevel_set(loglevel);
#endif
srd_log_loglevel_set(loglevel);
#endif
+ if (loglevel >= 5) {
+ const QSettings settings;
+ qDebug() << "Settings:" << settings.fileName()
+ << "format" << settings.format();
+ }
break;
}
break;
}
@@
-132,10
+142,11
@@
int main(int argc, char *argv[])
if (argc - optind > 1) {
fprintf(stderr, "Only one file can be opened.\n");
return 1;
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
// Initialise libsigrok
context = sigrok::Context::create();
#ifdef ANDROID
@@
-182,7
+193,7
@@
int main(int argc, char *argv[])
// Run the application
ret = a.exec();
// Run the application
ret = a.exec();
- } catch (
std::
exception e) {
+ } catch (exception e) {
qDebug() << e.what();
}
qDebug() << e.what();
}
@@
-191,7
+202,7
@@
int main(int argc, char *argv[])
srd_exit();
#endif
srd_exit();
#endif
- } while (
0
);
+ } while (
false
);
return ret;
}
return ret;
}