From f4c92e1c49680738bde7d5fa08153fa914ac2920 Mon Sep 17 00:00:00 2001
From: Joel Holdsworth <joel@airwebreathe.org.uk>
Date: Sat, 16 Mar 2013 08:22:29 +0000
Subject: [PATCH] Moved SamplingBar into pv::toolbars namespace

---
 CMakeLists.txt                    | 4 ++--
 pv/mainwindow.cpp                 | 4 ++--
 pv/mainwindow.h                   | 4 +++-
 pv/{ => toolbars}/samplingbar.cpp | 2 ++
 pv/{ => toolbars}/samplingbar.h   | 8 +++++---
 5 files changed, 14 insertions(+), 8 deletions(-)
 rename pv/{ => toolbars}/samplingbar.cpp (99%)
 rename pv/{ => toolbars}/samplingbar.h (91%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8c18ad7..fc8fb4c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -91,7 +91,6 @@ configure_file (
 set(pulseview_SOURCES
 	main.cpp
 	pv/mainwindow.cpp
-	pv/samplingbar.cpp
 	pv/sigsession.cpp
 	pv/data/analog.cpp
 	pv/data/analogsnapshot.cpp
@@ -107,6 +106,7 @@ set(pulseview_SOURCES
 	pv/prop/property.cpp
 	pv/prop/binding/binding.cpp
 	pv/prop/binding/deviceoptions.cpp
+	pv/toolbars/samplingbar.cpp
 	pv/view/analogsignal.cpp
 	pv/view/cursor.cpp
 	pv/view/header.cpp
@@ -120,11 +120,11 @@ set(pulseview_SOURCES
 
 set(pulseview_HEADERS
 	pv/mainwindow.h
-	pv/samplingbar.h
 	pv/sigsession.h
 	pv/dialogs/about.h
 	pv/dialogs/connect.h
 	pv/dialogs/deviceoptions.h
+	pv/toolbars/samplingbar.h
 	pv/view/cursor.h
 	pv/view/header.h
 	pv/view/ruler.h
diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 90ac324..e2f29e3 100644
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -34,9 +34,9 @@
 #include <QWidget>
 
 #include "mainwindow.h"
-#include "samplingbar.h"
 #include "dialogs/about.h"
 #include "dialogs/connect.h"
+#include "toolbars/samplingbar.h"
 #include "view/view.h"
 
 /* __STDC_FORMAT_MACROS is required for PRIu64 and friends (in C++). */
@@ -181,7 +181,7 @@ void MainWindow::setup_ui()
 	_toolbar->addAction(_action_view_zoom_out);
 	addToolBar(_toolbar);
 
-	_sampling_bar = new SamplingBar(this);
+	_sampling_bar = new toolbars::SamplingBar(this);
 	scan_devices();
 	connect(_sampling_bar, SIGNAL(run_stop()), this,
 		SLOT(run_stop()));
diff --git a/pv/mainwindow.h b/pv/mainwindow.h
index 3887717..47d3e66 100644
--- a/pv/mainwindow.h
+++ b/pv/mainwindow.h
@@ -37,7 +37,9 @@ class QWidget;
 
 namespace pv {
 
+namespace toolbars {
 class SamplingBar;
+}
 
 namespace view {
 class View;
@@ -106,7 +108,7 @@ private:
 	QVBoxLayout *_vertical_layout;
 
 	QToolBar *_toolbar;
-	SamplingBar *_sampling_bar;
+	toolbars::SamplingBar *_sampling_bar;
 };
 
 } // namespace pv
diff --git a/pv/samplingbar.cpp b/pv/toolbars/samplingbar.cpp
similarity index 99%
rename from pv/samplingbar.cpp
rename to pv/toolbars/samplingbar.cpp
index 24fcc40..d42e6de 100644
--- a/pv/samplingbar.cpp
+++ b/pv/toolbars/samplingbar.cpp
@@ -34,6 +34,7 @@
 #include <pv/dialogs/deviceoptions.h>
 
 namespace pv {
+namespace toolbars {
 
 const uint64_t SamplingBar::RecordLengths[20] = {
 	1000,
@@ -285,4 +286,5 @@ void SamplingBar::configure()
 	update_sample_rate_selector_value();
 }
 
+} // namespace toolbars
 } // namespace pv
diff --git a/pv/samplingbar.h b/pv/toolbars/samplingbar.h
similarity index 91%
rename from pv/samplingbar.h
rename to pv/toolbars/samplingbar.h
index 7034962..3502e25 100644
--- a/pv/samplingbar.h
+++ b/pv/toolbars/samplingbar.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_SAMPLINGBAR_H
-#define PULSEVIEW_PV_SAMPLINGBAR_H
+#ifndef PULSEVIEW_PV_TOOLBARS_SAMPLINGBAR_H
+#define PULSEVIEW_PV_TOOLBARS_SAMPLINGBAR_H
 
 #include <stdint.h>
 
@@ -34,6 +34,7 @@ struct st_dev_inst;
 class QAction;
 
 namespace pv {
+namespace toolbars {
 
 class SamplingBar : public QToolBar
 {
@@ -84,6 +85,7 @@ private:
 	QToolButton _run_stop_button;
 };
 
+} // namespace toolbars
 } // namespace pv
 
-#endif // PULSEVIEW_PV_SAMPLINGBAR_H
+#endif // PULSEVIEW_PV_TOOLBARS_SAMPLINGBAR_H
-- 
2.30.2