X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fviewitemowner.hpp;h=dcec370f3fcd18afabfceba48dbc49dbe9fd10a5;hp=49c251e7828c99098c15b65cb978157c5e9ae06f;hb=6f925ba9d6faf1077b73c5a5808259576081716a;hpb=4ca23e7d62d75523710fe4117f904ded4d26544a

diff --git a/pv/view/viewitemowner.hpp b/pv/view/viewitemowner.hpp
index 49c251e..dcec370 100644
--- a/pv/view/viewitemowner.hpp
+++ b/pv/view/viewitemowner.hpp
@@ -14,23 +14,27 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEW_VIEWITEMOWNER_HPP
-#define PULSEVIEW_PV_VIEW_VIEWITEMOWNER_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEWITEMOWNER_HPP
+#define PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEWITEMOWNER_HPP
 
 #include <memory>
 #include <vector>
 
 #include "viewitemiterator.hpp"
 
+using std::dynamic_pointer_cast;
+using std::shared_ptr;
+using std::vector;
+
 namespace pv {
 
 class Session;
 
-namespace view {
+namespace views {
+namespace TraceView {
 
 class ViewItem;
 class View;
@@ -38,7 +42,7 @@ class View;
 class ViewItemOwner
 {
 public:
-	typedef std::vector< std::shared_ptr<ViewItem> > item_list;
+	typedef vector< shared_ptr<ViewItem> > item_list;
 	typedef ViewItemIterator<ViewItemOwner, ViewItem> iterator;
 	typedef ViewItemIterator<const ViewItemOwner, ViewItem> const_iterator;
 
@@ -75,10 +79,10 @@ public:
 	 * Creates a list of descendant signals filtered by type.
 	 */
 	template<class T>
-	std::vector< std::shared_ptr<T> > list_by_type() {
-		std::vector< std::shared_ptr<T> > items;
+	vector< shared_ptr<T> > list_by_type() {
+		vector< shared_ptr<T> > items;
 		for (const auto &r : *this) {
-			std::shared_ptr<T> p = std::dynamic_pointer_cast<T>(r);
+			shared_ptr<T> p = dynamic_pointer_cast<T>(r);
 			if (p)
 				items.push_back(p);
 		}
@@ -90,7 +94,8 @@ protected:
 	item_list items_;
 };
 
-} // view
-} // pv
+} // namespace TraceView
+} // namespace views
+} // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_VIEWITEMOWNER_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEWITEMOWNER_HPP