none

DSView/pv/device/devinst.cpp

@@ -214,8 +214,8 @@ bool DevInst::is_usable()
 }
 
 void DevInst::destroy(){
-	release();
-    delete this;
+	release(); 
+	//delete this;  //do not to destroy
 }
 
 } // device

DSView/pv/devicemanager.h

@@ -29,9 +29,6 @@
 #include <list>
 #include <map>
 #include <string>
-
-#include <boost/function.hpp>  
-
 #include <QObject>
 #include <QString>
 

DSView/pv/mainwindow.cpp

@@ -599,8 +599,9 @@ void MainWindow::device_changed(bool close)
         _sampling_bar->set_sampling(false);
         _session->set_default_device(boost::bind(&MainWindow::session_error, this,
                                                 QString(tr("Set Default Device failed")), _1));
-    }
-    update_device_list();
+    }    
+
+     update_device_list();
 }
 
 void MainWindow::on_run_stop()

DSView/pv/view/analogsignal.cpp

@@ -30,7 +30,6 @@
 #include "../view/view.h"
 #include "../device/devinst.h"
 
-using namespace boost;
 using namespace std;
 
 #define byte(x) uint##x##_t

DSView/pv/view/devmode.cpp

@@ -35,6 +35,7 @@
 #include <QRect>
 #include <QDebug>
 #include "../config/appconfig.h"
+#include "../ui/msgbox.h"
  
 
 namespace pv {
@@ -196,8 +197,10 @@ void DevMode::on_close()
     DevInst *dev_inst = _session->get_device();
     assert(dev_inst);
 
-    _session->close_file(dev_inst);
-    dev_changed(true);
+    if (MsgBox::Confirm("are you sure to close the device?")){
+        _session->close_file(dev_inst);
+        dev_changed(true);
+    }
 }
 
 void DevMode::mousePressEvent(QMouseEvent *event)

DSView/pv/view/dsosignal.cpp

@@ -28,14 +28,10 @@
 #include "pv/data/dsosnapshot.h"
 #include "view.h"
 #include "../sigsession.h"
-#include "../device/devinst.h"
-
- 
-
+#include "../device/devinst.h" 
 #include <QDebug>
 #include <QTimer>
-
-using namespace boost;
+ 
 using namespace std;
 
 namespace pv {

DSView/pv/view/groupsignal.cpp

@@ -26,8 +26,7 @@
 #include "pv/data/group.h"
 #include "pv/data/groupsnapshot.h"
 #include "view.h"
-
-using namespace boost;
+ 
 using namespace std;
 
 namespace pv {

DSView/pv/view/header.cpp

@@ -34,9 +34,7 @@
 #include "../device/devinst.h"
 
 #include <assert.h>
-
- 
- 
+  
 #include <QColorDialog>
 #include <QInputDialog>
 #include <QMenu>
@@ -45,8 +43,7 @@
 #include <QRect>
 #include <QStyleOption>
 #include <QApplication>
-
-using namespace boost;
+ 
 using namespace std;
 
 namespace pv {

DSView/pv/view/lissajoustrace.cpp

@@ -35,7 +35,7 @@
 #include <QDebug>
 #include <QTimer>
 
-using namespace boost;
+ 
 using namespace std;
 
 namespace pv {

DSView/pv/view/ruler.cpp

@@ -40,8 +40,7 @@
 #include <QTextStream>
 #include <QStyleOption>
  
-
-using namespace boost;
+ 
 using namespace std;
 
 namespace pv {

DSView/pv/view/viewport.cpp

@@ -42,8 +42,7 @@
  
 #include "../config/appconfig.h"
 #include "../dsvdef.h"
-
-using namespace boost;
+ 
 using namespace std;
 
 namespace pv {

DSView/pv/view/viewstatus.cpp

@@ -34,7 +34,7 @@
 #include "../view/trace.h"
 #include "../dialogs/dsomeasure.h"
 
-using namespace boost;
+ 
 using namespace std;
 
 namespace pv {

DSView/pv/view/xcursor.cpp

@@ -28,9 +28,7 @@
 #include "dsosignal.h"
 
 #include <QPainter>
- 
-
-using namespace boost;
+  
 using namespace std;
 
 namespace pv {

libsigrokdecode4DSL/srd.c

@@ -202,7 +202,7 @@ SRD_API int srd_init(const char *path)
 	PyImport_AppendInittab("sigrokdecode", PyInit_sigrokdecode);
 
 	/* Initialize the Python interpreter. */
-	Py_InitializeEx(0);
+    Py_InitializeEx(0);
 
 	/* Locations relative to the XDG system data directories. */
 	sys_datadirs = g_get_system_data_dirs();