X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=signalhandler.cpp;h=4736292cb63ddee8c06791ea3584b01497e81bc8;hp=a236535ce1c6fe35724136e2ce5404b8c4f2fd5a;hb=c9da51187f8db0c9822d544a0253e0e7a58945d7;hpb=e9213170687cf4afd14e20acdc690ff9381d94ae

diff --git a/signalhandler.cpp b/signalhandler.cpp
index a236535c..4736292c 100644
--- a/signalhandler.cpp
+++ b/signalhandler.cpp
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include "signalhandler.h"
+#include "signalhandler.hpp"
 
 #include <assert.h>
 #include <signal.h>
@@ -29,11 +29,11 @@
 #include <QDebug>
 #include <QSocketNotifier>
 
-int SignalHandler::_sockets[2];
+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,10 +42,10 @@ 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) {
-		close(_sockets[0]);
-		close(_sockets[1]);
+	if (sigaction(SIGINT, &sig_action, nullptr) != 0 ||
+		sigaction(SIGTERM, &sig_action, nullptr) != 0) {
+		close(sockets_[0]);
+		close(sockets_[1]);
 		return false;
 	}
 
@@ -53,21 +53,20 @@ bool SignalHandler::prepare_signals()
 }
 
 SignalHandler::SignalHandler(QObject* parent) : QObject(parent),
-	_socket_notifier(0)
+	socket_notifier_(nullptr)
 {
-	_socket_notifier = new QSocketNotifier(_sockets[1],
+	socket_notifier_ = new QSocketNotifier(sockets_[1],
 		QSocketNotifier::Read, this);
-	connect(_socket_notifier, SIGNAL(activated(int)),
+	connect(socket_notifier_, SIGNAL(activated(int)),
 		SLOT(on_socket_notifier_activated()));
 }
 
 void SignalHandler::on_socket_notifier_activated()
 {
-	_socket_notifier->setEnabled(false);
+	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();
 	}
@@ -82,13 +81,12 @@ void SignalHandler::on_socket_notifier_activated()
 		break;
 	}
 
-	_socket_notifier->setEnabled(true);
+	socket_notifier_->setEnabled(true);
 }
 
 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();
 	}