From acda14b82957d9a848a5083df6f9b98d05c29fba Mon Sep 17 00:00:00 2001
From: Joel Holdsworth <joel@airwebreathe.org.uk>
Date: Thu, 20 Dec 2012 20:27:54 +0000
Subject: [PATCH] Moved pv::About into the pv::dialogs::About namespace

---
 CMakeLists.txt             | 6 +++---
 pv/{ => dialogs}/about.cpp | 2 ++
 pv/{ => dialogs}/about.h   | 2 ++
 pv/{ => dialogs}/about.ui  | 0
 pv/mainwindow.cpp          | 4 ++--
 5 files changed, 9 insertions(+), 5 deletions(-)
 rename pv/{ => dialogs}/about.cpp (98%)
 rename pv/{ => dialogs}/about.h (96%)
 rename pv/{ => dialogs}/about.ui (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 52c5b566..e1893b6c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -80,7 +80,6 @@ configure_file (
 
 set(pulseview_SOURCES
 	main.cpp
-	pv/about.cpp
 	pv/analogdata.cpp
 	pv/analogdatasnapshot.cpp
 	pv/datasnapshot.cpp
@@ -90,6 +89,7 @@ set(pulseview_SOURCES
 	pv/samplingbar.cpp
 	pv/signaldata.cpp
 	pv/sigsession.cpp
+	pv/dialogs/about.cpp
 	pv/view/analogsignal.cpp
 	pv/view/cursor.cpp
 	pv/view/header.cpp
@@ -102,10 +102,10 @@ set(pulseview_SOURCES
 )
 
 set(pulseview_HEADERS
-	pv/about.h
 	pv/mainwindow.h
 	pv/samplingbar.h
 	pv/sigsession.h
+	pv/dialogs/about.h
 	pv/view/cursor.h
 	pv/view/header.h
 	pv/view/ruler.h
@@ -115,7 +115,7 @@ set(pulseview_HEADERS
 )
 
 set(pulseview_FORMS
-	pv/about.ui
+	pv/dialogs/about.ui
 )
 
 set(pulseview_RESOURCES
diff --git a/pv/about.cpp b/pv/dialogs/about.cpp
similarity index 98%
rename from pv/about.cpp
rename to pv/dialogs/about.cpp
index 48c1f59e..a7778549 100644
--- a/pv/about.cpp
+++ b/pv/dialogs/about.cpp
@@ -35,6 +35,7 @@ extern "C" {
 }
 
 namespace pv {
+namespace dialogs {
 
 About::About(QWidget *parent) :
 	QDialog(parent),
@@ -111,4 +112,5 @@ About::~About()
 	delete ui;
 }
 
+} // namespace dialogs
 } // namespace pv
diff --git a/pv/about.h b/pv/dialogs/about.h
similarity index 96%
rename from pv/about.h
rename to pv/dialogs/about.h
index 5b845cb4..cc153add 100644
--- a/pv/about.h
+++ b/pv/dialogs/about.h
@@ -32,6 +32,7 @@ class About;
 }
 
 namespace pv {
+namespace dialogs {
 
 class About : public QDialog
 {
@@ -46,6 +47,7 @@ private:
 	std::auto_ptr<QTextDocument> supportedDoc;
 };
 
+} // namespace dialogs
 } // namespace pv
 
 #endif // PULSEVIEW_PV_ABOUT_H
diff --git a/pv/about.ui b/pv/dialogs/about.ui
similarity index 100%
rename from pv/about.ui
rename to pv/dialogs/about.ui
diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 3f338a12..d8083b5f 100644
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -32,9 +32,9 @@ extern "C" {
 #include <QVBoxLayout>
 #include <QWidget>
 
-#include "about.h"
 #include "mainwindow.h"
 #include "samplingbar.h"
+#include "dialogs/about.h"
 #include "pv/view/view.h"
 
 extern "C" {
@@ -183,7 +183,7 @@ void MainWindow::on_actionViewShowCursors_triggered()
 
 void MainWindow::on_actionAbout_triggered()
 {
-	About dlg(this);
+	dialogs::About dlg(this);
 	dlg.exec();
 }
 
-- 
2.30.2