summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLawrence Rust <lvr@softsystem.co.uk>2011-03-16 03:14:23 (GMT)
committer Mark Kendall <mkendall@mythtv.org>2011-03-16 03:15:37 (GMT)
commitdf16df93d3bff56405c7f4378cd7bf98af52a366 (patch)
tree7c18db0d9d79cfdfeffaed1bbad52973bb64f244
parentf525415a9bf32c6c1be8c57ceec067c10ccff9ad (diff)
OSX: Cross compilation fixes for mythmusic.
Signed-off-by: Mark Kendall <mkendall@mythtv.org> (cherry picked from commit 3860dd2b6022b1bb4198eebc8cf79c1206c77f8c)
-rw-r--r--mythplugins/mythmusic/mythmusic/cddecoder.h1
-rw-r--r--mythplugins/mythmusic/mythmusic/visualize.h11
2 files changed, 6 insertions, 6 deletions
diff --git a/mythplugins/mythmusic/mythmusic/cddecoder.h b/mythplugins/mythmusic/mythmusic/cddecoder.h
index 454f913..e92d6f7 100644
--- a/mythplugins/mythmusic/mythmusic/cddecoder.h
+++ b/mythplugins/mythmusic/mythmusic/cddecoder.h
@@ -7,6 +7,7 @@
#if CONFIG_DARWIN
#include <vector>
+using std::vector;
#endif
#if defined(__linux__) || defined(__FreeBSD__)
diff --git a/mythplugins/mythmusic/mythmusic/visualize.h b/mythplugins/mythmusic/mythmusic/visualize.h
index 20826c7..1c18041 100644
--- a/mythplugins/mythmusic/mythmusic/visualize.h
+++ b/mythplugins/mythmusic/mythmusic/visualize.h
@@ -13,8 +13,7 @@
#define VISUALIZE_H
// C++ headers
-#include <vector>
-using namespace std;
+#include <QVector>
// MythTV headers
#include <visual.h>
@@ -66,8 +65,8 @@ class Spectrum : public VisualBase
inline double clamp(double cur, double max, double min);
QColor startColor, targetColor;
- vector<QRect> rects;
- vector<double> magnitudes;
+ QVector<QRect> rects;
+ QVector<double> magnitudes;
QSize size;
LogScale scale;
double scaleFactor, falloff;
@@ -161,8 +160,8 @@ class Gears : public QGLWidget, public VisualBase
private:
QColor startColor, targetColor;
- vector<QRect> rects;
- vector<double> magnitudes;
+ QVector<QRect> rects;
+ QVector<double> magnitudes;
QSize size;
LogScale scale;
double scaleFactor, falloff;