Remove unneeded 'extern "C"'.

[pulseview.git] / pv / mainwindow.cpp

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 3a59bea10bfa0fc6103a929d969e65060ad26b4f..6b0fa676303052cb9478f2e1f4eaff7abd3a1bbf 100644 (file)
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -18,9 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern "C" {
 #include <sigrokdecode.h>
-}
 
 #include <QAction>
 #include <QApplication>
@@ -37,7 +35,6 @@ extern "C" {
 #include "dialogs/about.h"
 #include "view/view.h"
 
-extern "C" {
 /* __STDC_FORMAT_MACROS is required for PRIu64 and friends (in C++). */
 #define __STDC_FORMAT_MACROS
 #include <inttypes.h>
@@ -45,7 +42,7 @@ extern "C" {
 #include <stdarg.h>
 #include <glib.h>
 #include <libsigrok/libsigrok.h>
-}
+
 
 namespace pv {
 
@@ -92,9 +89,18 @@ void MainWindow::setup_ui()
        _action_open->setIcon(QIcon::fromTheme("document-open",
                QIcon(":/icons/document-open.png")));
        _action_open->setObjectName(QString::fromUtf8("actionOpen"));
-
        _menu_file->addAction(_action_open);
 
+       _menu_file->addSeparator();
+
+       _action_quit = new QAction(this);
+       _action_quit->setText(QApplication::translate(
+               "MainWindow", "&Quit", 0, QApplication::UnicodeUTF8));
+       _action_quit->setIcon(QIcon::fromTheme("application-exit",
+               QIcon(":/icons/application-exit.png")));
+       _action_quit->setObjectName(QString::fromUtf8("actionQuit"));
+       _menu_file->addAction(_action_quit);
+
        // View Menu
        _menu_view = new QMenu(_menu_bar);
        _menu_view->setTitle(QApplication::translate(
@@ -177,6 +183,11 @@ void MainWindow::on_actionOpen_triggered()
        _session.load_file(file_name.toStdString());
 }
 
+void MainWindow::on_actionQuit_triggered()
+{
+       close();
+}
+
 void MainWindow::on_actionViewZoomIn_triggered()
 {
        _view->zoom(1);