X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=317f3c9a701383793d869f5fda7e6a8aee42eea4;hb=819f4c25391a9c74d3d2f528d462142d5c4aad4d;hp=6cb482873baee69b1e9fde71634aeba27649da61;hpb=d1e7d82c6327c15f38d66602e65c4d3abe114df7;p=pulseview.git diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp index 6cb4828..317f3c9 100644 --- a/pv/mainwindow.cpp +++ b/pv/mainwindow.cpp @@ -18,7 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifdef ENABLE_DECODE #include +#endif #include #include @@ -42,7 +44,9 @@ #include "toolbars/samplingbar.h" #include "view/logicsignal.h" #include "view/view.h" +#ifdef ENABLE_DECODE #include "widgets/decodermenu.h" +#endif /* __STDC_FORMAT_MACROS is required for PRIu64 and friends (in C++). */ #define __STDC_FORMAT_MACROS @@ -52,8 +56,7 @@ #include #include -using namespace boost; -using namespace std; +using std::list; namespace pv { @@ -194,6 +197,7 @@ void MainWindow::setup_ui() menu_view->addAction(action_view_show_cursors); // Decoders Menu +#ifdef ENABLE_DECODE QMenu *const menu_decoders = new QMenu; menu_decoders->setTitle(QApplication::translate( "MainWindow", "&Decoders", 0, QApplication::UnicodeUTF8)); @@ -206,6 +210,7 @@ void MainWindow::setup_ui() this, SLOT(add_decoder(srd_decoder*))); menu_decoders->addMenu(menu_decoders_add); +#endif // Help Menu QMenu *const menu_help = new QMenu; @@ -220,7 +225,9 @@ void MainWindow::setup_ui() menu_bar->addAction(menu_file->menuAction()); menu_bar->addAction(menu_view->menuAction()); +#ifdef ENABLE_DECODE menu_bar->addAction(menu_decoders->menuAction()); +#endif menu_bar->addAction(menu_help->menuAction()); setMenuBar(menu_bar); @@ -380,8 +387,12 @@ void MainWindow::on_actionAbout_triggered() void MainWindow::add_decoder(srd_decoder *decoder) { +#ifdef ENABLE_DECODE assert(decoder); _session.add_decoder(decoder); +#else + (void)decoder; +#endif } void MainWindow::run_stop()