fixed class name conflict

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@199 90c681e8-e032-0410-971d-27865f9a5e38

2 files changed, 9 insertions, 4 deletions

diff --git a/src/mainvisual.cpp b/src/mainvisual.cpp
index cbd30a6dc..5bdcbf5cb 100644
--- a/src/mainvisual.cpp
+++ b/src/mainvisual.cpp
@@ -212,9 +212,9 @@ void MainVisual::mousePressEvent (QMouseEvent *e)
     else
     {
         if (!m_vis)
-            setVisual(new Analyzer);
+            setVisual(new mainvisual::Analyzer);
         else if (m_vis->name() == "Analyzer")
-            setVisual(new Scope);
+            setVisual(new mainvisual::Scope);
         else if (m_vis->name() == "Scope")
             setVisual(0);
 
@@ -294,9 +294,9 @@ void MainVisual::updateSettings()
         visName == "Off";
 
     if (visName == "Analyzer")
-        setVisual(new Analyzer);
+        setVisual(new mainvisual::Analyzer);
     else if (visName == "Scope")
-        setVisual(new Scope);
+        setVisual(new mainvisual::Scope);
     else
         setVisual(0);
 
@@ -432,6 +432,8 @@ void MainVisual::readSettings()
     updateSettings();
 }
 
+using namespace mainvisual;
+
 Analyzer::Analyzer()
         : m_analyzerBarWidth ( 4 ), m_fps ( 20 )
 {
diff --git a/src/mainvisual.h b/src/mainvisual.h
index 5357dd310..5c5b76256 100644
--- a/src/mainvisual.h
+++ b/src/mainvisual.h
@@ -120,6 +120,8 @@ private:
     QAction *m_peaksAction;
 };
 
+namespace mainvisual
+{
 class Analyzer : public VisualBase
 {
 public:
@@ -165,5 +167,6 @@ private:
     int m_intern_vis_data[75];
     Skin *m_skin;
 };
+}
 
 #endif