comparison dsp/segmentation/Segmenter.h @ 493:bb78ca3fe7de

Remove "using" from some headers

 #define QM_DSP_SEGMENTER_H
 
 #include <vector>
 #include <iostream>
 
-using std::vector;
-using std::ostream;
-
 class Segment
 {
 public:
     int start;              // in samples
     int end;

 class Segmentation
 {
 public:
     int nsegtypes;          // number of segment types, so possible types are {0,1,...,nsegtypes-1}
     int samplerate;
-    vector<Segment> segments;       
+    std::vector<Segment> segments;       
 };
 
-ostream& operator<<(ostream& os, const Segmentation& s);
+std::ostream& operator<<(std::ostream& os, const Segmentation& s);
 
 class Segmenter
 {
 public:
     Segmenter() {}

     virtual void segment() = 0;                                             // call once all the features have been extracted
     virtual void segment(int m) = 0;                                // specify desired number of segment-types
     virtual void clear() { features.clear(); }
     const Segmentation& getSegmentation() const { return segmentation; } 
 protected:
-    vector<vector<double> > features;
+    std::vector<std::vector<double> > features;
     Segmentation segmentation;
     int samplerate;
 };
 
 #endif