From 44485e712d043398fed396d010af613d79c672f4 Mon Sep 17 00:00:00 2001
From: Lars Luthman <lars.luthman@gmail.com>
Date: Fri, 10 Apr 2009 14:42:35 +0000
Subject: Fixed namespace collision in Track

---
diff --git a/src/libdinoseq/track.cpp b/src/libdinoseq/track.cpp
index 103bf9a..1262446 100644
--- a/src/libdinoseq/track.cpp
+++ b/src/libdinoseq/track.cpp
@@ -30,6 +30,9 @@
 #include "track.hpp"
 
 
+using namespace sigc;
+
+
 namespace Dino {
 
 
diff --git a/src/libdinoseq/track.hpp b/src/libdinoseq/track.hpp
index bee40f2..88e7269 100644
--- a/src/libdinoseq/track.hpp
+++ b/src/libdinoseq/track.hpp
@@ -31,7 +31,6 @@
 
 
 using namespace Glib;
-using namespace sigc;
 using namespace std;
 using namespace xmlpp;
 
@@ -194,13 +193,13 @@ namespace Dino {
     
     /// @name Signals
     //@{
-    signal<void, const string&> signal_name_changed;
-    signal<void, int> signal_pattern_added; 
-    signal<void, int> signal_pattern_removed;
-    signal<void, int, int, int> signal_sequence_entry_added;
-    signal<void, int, int, int> signal_sequence_entry_changed;
-    signal<void, int> signal_sequence_entry_removed;
-    signal<void, int> signal_length_changed;
+    sigc::signal<void, const string&> signal_name_changed;
+    sigc::signal<void, int> signal_pattern_added; 
+    sigc::signal<void, int> signal_pattern_removed;
+    sigc::signal<void, int, int, int> signal_sequence_entry_added;
+    sigc::signal<void, int, int, int> signal_sequence_entry_changed;
+    sigc::signal<void, int> signal_sequence_entry_removed;
+    sigc::signal<void, int> signal_length_changed;
     //@}
     
   private:
--
cgit v0.8.2