Use range-based for loops more often.

[pulseview.git] / signalhandler.cpp

diff --git a/signalhandler.cpp b/signalhandler.cpp
index 71f66f559b4b6b5711b83dfafce691e8aa2dc17c..4736292cb63ddee8c06791ea3584b01497e81bc8 100644 (file)
--- a/signalhandler.cpp
+++ b/signalhandler.cpp
@@ -33,7 +33,7 @@ int SignalHandler::sockets_[2];
 
 bool SignalHandler::prepare_signals()
 {
-       if(socketpair(AF_UNIX, SOCK_STREAM, 0, sockets_) != 0)
+       if (socketpair(AF_UNIX, SOCK_STREAM, 0, sockets_) != 0)
                return false;
 
        struct sigaction sig_action;
@@ -42,8 +42,8 @@ bool SignalHandler::prepare_signals()
        sigemptyset(&sig_action.sa_mask);
        sig_action.sa_flags = SA_RESTART;
 
-       if(sigaction(SIGINT, &sig_action, 0) != 0 ||
-               sigaction(SIGTERM, &sig_action, 0) != 0) {
+       if (sigaction(SIGINT, &sig_action, nullptr) != 0 ||
+               sigaction(SIGTERM, &sig_action, nullptr) != 0) {
                close(sockets_[0]);
                close(sockets_[1]);
                return false;
@@ -53,7 +53,7 @@ bool SignalHandler::prepare_signals()
 }
 
 SignalHandler::SignalHandler(QObject* parent) : QObject(parent),
-       socket_notifier_(0)
+       socket_notifier_(nullptr)
 {
        socket_notifier_ = new QSocketNotifier(sockets_[1],
                QSocketNotifier::Read, this);
@@ -66,7 +66,7 @@ void SignalHandler::on_socket_notifier_activated()
        socket_notifier_->setEnabled(false);
 
        int sig_number;
-       if(read(sockets_[1], &sig_number, sizeof(int)) != sizeof(int)) {
+       if (read(sockets_[1], &sig_number, sizeof(int)) != sizeof(int)) {
                qDebug() << "Failed to catch signal";
                abort();
        }
@@ -86,7 +86,7 @@ void SignalHandler::on_socket_notifier_activated()
 
 void SignalHandler::handle_signals(int sig_number)
 {
-       if(write(sockets_[0], &sig_number, sizeof(int)) != sizeof(int)) {
+       if (write(sockets_[0], &sig_number, sizeof(int)) != sizeof(int)) {
                // Failed to handle signal
                abort();
        }