Small fixes and tidy-ups spotted by cppcheck.

6 files changed, 7 insertions, 6 deletions

diff --git a/src/wx/audio_plot.cc b/src/wx/audio_plot.cc
index 641ddd503..16930ffd8 100644
--- a/src/wx/audio_plot.cc
+++ b/src/wx/audio_plot.cc
@@ -280,7 +280,7 @@ AudioPlot::plot_rms (wxGraphicsPath& path, int channel, Metrics const & metrics)
 			p += pow (*j, 2);
 		}
 
-		if (smoothing.size() > 0) {
+		if (!smoothing.empty ()) {
 			p = sqrt (p / smoothing.size ());
 		}
 
diff --git a/src/wx/content_menu.h b/src/wx/content_menu.h
index 77cf29a30..cd51e86f1 100644
--- a/src/wx/content_menu.h
+++ b/src/wx/content_menu.h
@@ -27,7 +27,7 @@
 
 class Film;
 
-class ContentMenu
+class ContentMenu : public boost::noncopyable
 {
 public:
 	ContentMenu (wxWindow* p);
diff --git a/src/wx/content_panel.h b/src/wx/content_panel.h
index 88aac7049..6b94e7d5b 100644
--- a/src/wx/content_panel.h
+++ b/src/wx/content_panel.h
@@ -33,7 +33,7 @@ class FilmEditor;
 class ContentSubPanel;
 class Film;
 
-class ContentPanel
+class ContentPanel : public boost::noncopyable
 {
 public:
 	ContentPanel (wxNotebook *, boost::shared_ptr<Film>);
diff --git a/src/wx/content_widget.h b/src/wx/content_widget.h
index b4d06286e..6f406dadb 100644
--- a/src/wx/content_widget.h
+++ b/src/wx/content_widget.h
@@ -41,7 +41,7 @@
  *  @param V Data type of state as used by the view.
  */
 template <class S, class T, typename U, typename V>
-class ContentWidget
+class ContentWidget : public boost::noncopyable
 {
 public:
 	/** @param parent Parent window.
diff --git a/src/wx/dcp_panel.h b/src/wx/dcp_panel.h
index ced6e6efd..060ec31ff 100644
--- a/src/wx/dcp_panel.h
+++ b/src/wx/dcp_panel.h
@@ -18,6 +18,7 @@
 */
 
 #include <boost/shared_ptr.hpp>
+#include <boost/noncopyable.hpp>
 
 class wxNotebook;
 class wxPanel;
@@ -32,7 +33,7 @@ class wxSizer;
 
 class Film;
 
-class DCPPanel
+class DCPPanel : public boost::noncopyable
 {
 public:
 	DCPPanel (wxNotebook *, boost::shared_ptr<Film>);
diff --git a/src/wx/job_manager_view.cc b/src/wx/job_manager_view.cc
index fd3ea6bf7..783535a12 100644
--- a/src/wx/job_manager_view.cc
+++ b/src/wx/job_manager_view.cc
@@ -36,7 +36,7 @@ using std::cout;
 using boost::shared_ptr;
 using boost::weak_ptr;
 
-class JobRecord
+class JobRecord : public boost::noncopyable
 {
 public:
 	JobRecord (shared_ptr<Job> job, wxScrolledWindow* window, wxPanel* panel, wxFlexGridSizer* table)