Adjusted SignalHandler style to match the rest of PulseView

diff --git a/main.cpp b/main.cpp
index 3fcfcc776626130ab732b2dd23f2d6ba4d14babf..42e4a7c17062f863e987a4d68d81c313663d062f 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -127,14 +127,14 @@ int main(int argc, char *argv[])
                        pv::MainWindow w(open_file);
                        w.show();
 
-                       if(SignalHandler::prepareSignals()) {
-                               SignalHandler *const signalHandler =
+                       if(SignalHandler::prepare_signals()) {
+                               SignalHandler *const handler =
                                        new SignalHandler(&w);
-                               QObject::connect(signalHandler,
-                                       SIGNAL(sigIntReceived()),
+                               QObject::connect(handler,
+                                       SIGNAL(int_received()),
                                        &w, SLOT(close()));
-                               QObject::connect(signalHandler,
-                                       SIGNAL(sigTermReceived()),
+                               QObject::connect(handler,
+                                       SIGNAL(term_received()),
                                        &w, SLOT(close()));
                        } else {
                                qWarning() <<

diff --git a/signalhandler.cpp b/signalhandler.cpp
index a3ef6b82e8755c7d579da5e46f2f199395138acf..f136a5234281038a4e4daec3fd61658193966f73 100644 (file)
--- a/signalhandler.cpp
+++ b/signalhandler.cpp
@@ -1,23 +1,22 @@
 /*
-
-Copyright 2013 Adam Reichold
-
-This file is part of qpdfview.
-
-qpdfview is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-qpdfview is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with qpdfview.  If not, see <http://www.gnu.org/licenses/>.
-
-*/
+ * This file is part of the PulseView project.
+ *
+ * Copyright (C) 2013 Adam Reichold
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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
+ */
 
 #include "signalhandler.h"
 
@@ -27,68 +26,59 @@ along with qpdfview.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <QSocketNotifier>
 
-int SignalHandler::s_sockets[2];
+int SignalHandler::_sockets[2];
 
-bool SignalHandler::prepareSignals()
+bool SignalHandler::prepare_signals()
 {
-    if(socketpair(AF_UNIX, SOCK_STREAM, 0, s_sockets) != 0)
-    {
-        return false;
-    }
+       if(socketpair(AF_UNIX, SOCK_STREAM, 0, _sockets) != 0)
+               return false;
 
-    struct sigaction sigAction;
+       struct sigaction sig_action;
 
-    sigAction.sa_handler = SignalHandler::handleSignals;
-    sigemptyset(&sigAction.sa_mask);
-    sigAction.sa_flags = SA_RESTART;
+       sig_action.sa_handler = SignalHandler::handle_signals;
+       sigemptyset(&sig_action.sa_mask);
+       sig_action.sa_flags = SA_RESTART;
 
-    if(sigaction(SIGINT, &sigAction, 0) != 0)
-    {
-        close(s_sockets[0]);
-        close(s_sockets[1]);
+       if(sigaction(SIGINT, &sig_action, 0) != 0 ||
+               sigaction(SIGTERM, &sig_action, 0) != 0) {
+               close(_sockets[0]);
+               close(_sockets[1]);
+               return false;
+       }
 
-        return false;
-    }
-
-    if(sigaction(SIGTERM, &sigAction, 0) != 0)
-    {
-        close(s_sockets[0]);
-        close(s_sockets[1]);
-
-        return false;
-    }
-
-    return true;
+       return true;
 }
 
 SignalHandler::SignalHandler(QObject* parent) : QObject(parent),
-    m_socketNotifier(0)
+       _socket_notifier(0)
 {
-    m_socketNotifier = new QSocketNotifier(s_sockets[1], QSocketNotifier::Read, this);
-    connect(m_socketNotifier, SIGNAL(activated(int)), SLOT(on_socketNotifier_activated()));
+       _socket_notifier = new QSocketNotifier(_sockets[1],
+               QSocketNotifier::Read, this);
+       connect(_socket_notifier, SIGNAL(activated(int)),
+               SLOT(on_socket_notifier_activated()));
 }
 
-void SignalHandler::on_socketNotifier_activated()
+void SignalHandler::on_socket_notifier_activated()
 {
-    m_socketNotifier->setEnabled(false);
-
-    int sigNumber;
-    read(s_sockets[1], &sigNumber, sizeof(int));
-
-    switch(sigNumber)
-    {
-    case SIGINT:
-        emit sigIntReceived();
-        break;
-    case SIGTERM:
-        emit sigTermReceived();
-        break;
-    }
-
-    m_socketNotifier->setEnabled(true);
+       _socket_notifier->setEnabled(false);
+
+       int sig_number;
+       read(_sockets[1], &sig_number, sizeof(int));
+
+       switch(sig_number)
+       {
+       case SIGINT:
+               emit int_received();
+               break;
+       case SIGTERM:
+               emit term_received();
+               break;
+       }
+
+       _socket_notifier->setEnabled(true);
 }
 
-void SignalHandler::handleSignals(int sigNumber)
+void SignalHandler::handle_signals(int sig_number)
 {
-    write(s_sockets[0], &sigNumber, sizeof(int));
+       write(_sockets[0], &sig_number, sizeof(int));
 }

diff --git a/signalhandler.h b/signalhandler.h
index 48017629b35cad4f037bc459a7c23493e82ffa7e..7ecd612993a1f5c6d156fc41f00ee02055e3e671 100644 (file)
--- a/signalhandler.h
+++ b/signalhandler.h
@@ -1,23 +1,22 @@
 /*
-
-Copyright 2013 Adam Reichold
-
-This file is part of qpdfview.
-
-qpdfview is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-qpdfview is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with qpdfview.  If not, see <http://www.gnu.org/licenses/>.
-
-*/
+ * This file is part of the PulseView project.
+ *
+ * Copyright (C) 2013 Adam Reichold
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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
+ */
 
 #ifndef SIGNALHANDLER_H
 #define SIGNALHANDLER_H
@@ -28,27 +27,29 @@ class QSocketNotifier;
 
 class SignalHandler : public QObject
 {
-    Q_OBJECT
+       Q_OBJECT
 
 public:
-    static bool prepareSignals();
+       static bool prepare_signals();
 
-    explicit SignalHandler(QObject* parent = 0);
+public:
+       explicit SignalHandler(QObject* parent = NULL);
 
 signals:
-    void sigIntReceived();
-    void sigTermReceived();
+       void int_received();
+       void term_received();
 
 private slots:
-    void on_socketNotifier_activated();
+       void on_socket_notifier_activated();
 
 private:
-    static int s_sockets[2];
-
-    static void handleSignals(int sigNumber);
+       static void handle_signals(int sig_number);
 
-    QSocketNotifier* m_socketNotifier;
+private:
+       QSocketNotifier* _socket_notifier;
 
+private:
+       static int _sockets[2];
 };
 
 #endif // SIGNALHANDLER_H