projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Print --help/--version output to stdout (not stderr).
[pulseview.git]
/
main.cpp
diff --git
a/main.cpp
b/main.cpp
index a7ab89fbf7422ada41d7050ac57715ce33f7f05d..e98506fcc0ea19d2d0dc2572252d3ab85748eca4 100644
(file)
--- a/
main.cpp
+++ b/
main.cpp
@@
-34,9
+34,12
@@
extern "C" {
#include "config.h"
#include "config.h"
+// Global pointer to our QApplication
+QApplication *g_app = NULL;
+
void usage()
{
void usage()
{
- fprintf(std
err
,
+ fprintf(std
out
,
"Usage:\n"
" %s — %s\n"
"\n"
"Usage:\n"
" %s — %s\n"
"\n"
@@
-47,15
+50,16
@@
void usage()
}
/*
}
/*
- * SIGINT handler (likely rec
ie
ved Ctrl-C from terminal)
+ * SIGINT handler (likely rec
ei
ved Ctrl-C from terminal)
*/
*/
-void sigint(int param)
+void sigint
_handler
(int param)
{
{
- (void) param;
-
- qDebug("pv: Recieved SIGINT");
-
- /* TODO: Handle SIGINT */
+ (void)param;
+
+ qDebug("Received SIGINT.");
+
+ if (g_app)
+ g_app->quit();
}
int main(int argc, char *argv[])
}
int main(int argc, char *argv[])
@@
-64,9
+68,11
@@
int main(int argc, char *argv[])
struct sr_context *sr_ctx = NULL;
// Register a SIGINT handler
struct sr_context *sr_ctx = NULL;
// Register a SIGINT handler
- signal
(SIGINT, sigint
);
+ signal
(SIGINT, sigint_handler
);
QApplication a(argc, argv);
QApplication a(argc, argv);
+ // Now we have an application to populate our global pointer
+ g_app = &a;
// Set some application metadata
QApplication::setApplicationVersion(PV_VERSION_STRING);
// Set some application metadata
QApplication::setApplicationVersion(PV_VERSION_STRING);
@@
-89,7
+95,7
@@
int main(int argc, char *argv[])
switch (c) {
case 'V':
// Print version info
switch (c) {
case 'V':
// Print version info
- fprintf(std
err
, "%s %s\n", PV_TITLE, PV_VERSION_STRING);
+ fprintf(std
out
, "%s %s\n", PV_TITLE, PV_VERSION_STRING);
return 0;
case 'h':
return 0;
case 'h':