From 8eb993a7f81428b816d47887cd60139d1dfa7fff Mon Sep 17 00:00:00 2001 From: Vlad Pyatnichenko Date: Tue, 5 Apr 2016 20:31:05 +0300 Subject: Ensure backward compatibility and some cosmetic changes. --- README.md | 11 ++++++----- singleapplication.cpp | 2 +- singleapplication.h | 4 ++++ 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 754e6b4..f677ba6 100644 --- a/README.md +++ b/README.md @@ -39,11 +39,12 @@ The SingleApplication class implements a `showUp()` signal. You can bind to that Note that since `SingleApplication` extends the `QApplication` class you can do the following: ```cpp // Truly raise your window. -QObject::connect(&app, &SingleApplication::showUp, [&]{ - window.show(); - window.raise(); - window.activateWindow(); - }); // 'window' is your QWindow instance +QObject::connect(&app, &SingleApplication::showUp, [&] +{ + window.show(); + window.raise(); + window.activateWindow(); +}); // 'window' is your QWindow instance ``` Using `QApplication::instance()` is a neat way to get the `SingleApplication` instance at any place in your program. diff --git a/singleapplication.cpp b/singleapplication.cpp index 1c0d921..27e2bb1 100644 --- a/singleapplication.cpp +++ b/singleapplication.cpp @@ -115,7 +115,7 @@ SingleApplication::SingleApplication(int &argc, char *argv[]) // terminated. if( d->socket->waitForConnected(100) ) { - // Terminate the program using STDLib's exit function. + // Terminate the program using STDLib's exit function ::exit(EXIT_SUCCESS); } else { delete d->memory; diff --git a/singleapplication.h b/singleapplication.h index dc6beb3..91f5b11 100644 --- a/singleapplication.h +++ b/singleapplication.h @@ -2,6 +2,10 @@ #define SINGLE_APPLICATION_H #include +#ifndef QAPPLICATION_CLASS + #define QAPPLICATION_CLASS QApplication +#endif + #include QT_STRINGIFY(QAPPLICATION_CLASS) class SingleApplicationPrivate; -- cgit v1.2.1