Session: Don't reset session name for file devices

[pulseview.git] / signalhandler.cpp

diff --git a/signalhandler.cpp b/signalhandler.cpp
index 66acc1fd7aaf71b24b350c6509f3460a6463ac04..f262d6639fe6dc6582de6f7251c4cad58cc69e6b 100644 (file)
--- a/signalhandler.cpp
+++ b/signalhandler.cpp
@@ -14,15 +14,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "signalhandler.hpp"
 
-#include <assert.h>
-#include <signal.h>
-#include <stdlib.h>
+#include <cassert>
+#include <csignal>
+#include <cstdlib>
+
 #include <sys/socket.h>
 #include <unistd.h>
 
@@ -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,8 +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();
        }
@@ -87,8 +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();
        }