Diff of /libkwave/Triple.h [3e4acc] .. [1f6d2f] Maximize Restore

  Switch to side-by-side view

--- a/libkwave/Triple.h
+++ b/libkwave/Triple.h
@@ -20,68 +20,75 @@
 
 #include "config.h"
 
-template <class T1, class T2, class T3> class Triple
+namespace Kwave
 {
-public:
-    /** Stupid default constructor (sometimes needed but should not) */
-    Triple()
-	:m_first(),
-	 m_second(),
-	 m_third()
-    {}
 
-    /** Constructor with initialization data */
-    Triple(const T1 &first, const T2 &second, const T3 &third)
-	:m_first(first),
-	 m_second(second),
-	 m_third(third)
-    {}
+    template <class T1, class T2, class T3> class Triple
+    {
+    public:
+	/** Stupid default constructor (sometimes needed but should not) */
+	Triple()
+	    :m_first(),
+	    m_second(),
+	    m_third()
+	{}
 
-    /** Copy constructor */
-    Triple(const Triple &copy)
-	:m_first(copy.first()),
-	 m_second(copy.second()),
-	 m_third(copy.third())
-    {}
+	/** Constructor with initialization data */
+	Triple(const T1 &first, const T2 &second, const T3 &third)
+	    :m_first(first),
+	    m_second(second),
+	    m_third(third)
+	{}
 
-    /** Destructor */
-    virtual ~Triple() {}
+	/** Copy constructor */
+	Triple(const Triple &copy)
+	    :m_first(copy.first()),
+	    m_second(copy.second()),
+	    m_third(copy.third())
+	{}
 
-    /** assignment operator */
-    Triple<T1,T2,T3> &operator = (const Triple<T1,T2,T3> &t2) {
-	m_first  = t2.first();
-	m_second = t2.second();
-	m_third  = t2.third();
-	return *this;
-    }
+	/** Destructor */
+	virtual ~Triple() {}
 
-    /** compare operator */
-    inline bool operator==(const Triple<T1,T2,T3> &t2) {
-	return (
-	    ( m_first  == t2.first()  ) &&
-	    ( m_second == t2.second() ) &&
-	    ( m_third  == t2.third()  )
-	);
-    }
+	/** assignment operator */
+	Triple<T1,T2,T3> &operator = (const Triple<T1,T2,T3> &t2) {
+	    m_first  = t2.first();
+	    m_second = t2.second();
+	    m_third  = t2.third();
+	    return *this;
+	}
 
-    /** returns a reference to the firstelement */
-    inline const T1 &first() const { return m_first;  }
+	/** compare operator */
+	inline bool operator==(const Triple<T1,T2,T3> &t2) {
+	    return (
+		( m_first  == t2.first()  ) &&
+		( m_second == t2.second() ) &&
+		( m_third  == t2.third()  )
+	    );
+	}
 
-    /** returns a reference to the second element */
-    inline const T2 &second() const { return m_second; }
+	/** returns a reference to the firstelement */
+	inline const T1 &first() const { return m_first;  }
 
-    /** returns a reference to the third element */
-    inline const T3 &third()  const { return m_third;  }
+	/** returns a reference to the second element */
+	inline const T2 &second() const { return m_second; }
 
-private:
-    /** first element */
-    T1 m_first;
+	/** returns a reference to the third element */
+	inline const T3 &third()  const { return m_third;  }
 
-    /** second element */
-    T2 m_second;
+    private:
+	/** first element */
+	T1 m_first;
 
-    /** guess what... */
-    T3 m_third;
-};
+	/** second element */
+	T2 m_second;
+
+	/** guess what... */
+	T3 m_third;
+    };
+}
 
 #endif /* _TRIPLE_H_ */
+
+//***************************************************************************
+//***************************************************************************