10 files changed, 10 insertions, 17 deletions
diff --git a/src/3rdparty/phonon/mmf/abstractaudioeffect.cpp b/src/3rdparty/phonon/mmf/abstractaudioeffect.cpp
index 665b9e4..b3155a6 100644
--- a/src/3rdparty/phonon/mmf/abstractaudioeffect.cpp
+++ b/src/3rdparty/phonon/mmf/abstractaudioeffect.cpp
@@ -16,7 +16,6 @@ along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
-#include <AudioEffectBase.h>
 #include "mediaobject.h"
 
 #include "abstractaudioeffect.h"
diff --git a/src/3rdparty/phonon/mmf/abstractaudioeffect.h b/src/3rdparty/phonon/mmf/abstractaudioeffect.h
index cf2fb3c..9957e25 100644
--- a/src/3rdparty/phonon/mmf/abstractaudioeffect.h
+++ b/src/3rdparty/phonon/mmf/abstractaudioeffect.h
@@ -23,12 +23,12 @@ along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <QScopedPointer>
 
+#include <AudioEffectBase.h>
+
 #include <Phonon/EffectInterface>
 #include <Phonon/EffectParameter>
 #include "audioplayer.h"
 
-class CAudioEffect;
-
 QT_BEGIN_NAMESPACE
 
 namespace Phonon
diff --git a/src/3rdparty/phonon/mmf/audioequalizer.cpp b/src/3rdparty/phonon/mmf/audioequalizer.cpp
index 013412d..78c6ff7 100644
--- a/src/3rdparty/phonon/mmf/audioequalizer.cpp
+++ b/src/3rdparty/phonon/mmf/audioequalizer.cpp
@@ -16,8 +16,6 @@ along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
-#include <AudioEqualizerBase.h>
-
 #include "audioequalizer.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/3rdparty/phonon/mmf/audioequalizer.h b/src/3rdparty/phonon/mmf/audioequalizer.h
index d072bf1..6415411 100644
--- a/src/3rdparty/phonon/mmf/audioequalizer.h
+++ b/src/3rdparty/phonon/mmf/audioequalizer.h
@@ -19,10 +19,9 @@ along with this library.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef PHONON_MMF_AUDIOEQUALIZER_H
 #define PHONON_MMF_AUDIOEQUALIZER_H
 
+#include <AudioEqualizerBase.h>
 #include "abstractaudioeffect.h"
 
-class CAudioEqualizer;
-
 QT_BEGIN_NAMESPACE
 
 namespace Phonon
diff --git a/src/3rdparty/phonon/mmf/bassboost.cpp b/src/3rdparty/phonon/mmf/bassboost.cpp
index f3db9d9..fc88d03 100644
--- a/src/3rdparty/phonon/mmf/bassboost.cpp
+++ b/src/3rdparty/phonon/mmf/bassboost.cpp
@@ -16,8 +16,6 @@ along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
-#include <BassBoostBase.h>
-
 #include "bassboost.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/3rdparty/phonon/mmf/bassboost.h b/src/3rdparty/phonon/mmf/bassboost.h
index 68ea272..c16393a 100644
--- a/src/3rdparty/phonon/mmf/bassboost.h
+++ b/src/3rdparty/phonon/mmf/bassboost.h
@@ -19,10 +19,9 @@ along with this library.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef PHONON_MMF_BASSBOOST_H
 #define PHONON_MMF_BASSBOOST_H
 
+#include <BassBoostBase.h>
 #include "abstractaudioeffect.h"
 
-class CBassBoost;
-
 QT_BEGIN_NAMESPACE
 
 namespace Phonon
diff --git a/src/3rdparty/phonon/mmf/effectfactory.h b/src/3rdparty/phonon/mmf/effectfactory.h
index d5dde27..e83ad15 100644
--- a/src/3rdparty/phonon/mmf/effectfactory.h
+++ b/src/3rdparty/phonon/mmf/effectfactory.h
@@ -65,7 +65,7 @@ private:
      * the default constructor.
      */
     inline EffectFactory();
-    Q_DISABLE_COPY(EffectFactory);
+    Q_DISABLE_COPY(EffectFactory)
 };
 }
 }
diff --git a/src/3rdparty/phonon/mmf/mediaobject.cpp b/src/3rdparty/phonon/mmf/mediaobject.cpp
index f09b488..cf968f3 100644
--- a/src/3rdparty/phonon/mmf/mediaobject.cpp
+++ b/src/3rdparty/phonon/mmf/mediaobject.cpp
@@ -369,12 +369,12 @@ void MMF::MediaObject::setVideoOutput(VideoOutput* videoOutput)
 }
 
 
-AbstractPlayer *MediaObject::abstractPlayer() const
+AbstractPlayer *MMF::MediaObject::abstractPlayer() const
 {
     return m_player.data();
 }
 
-bool MediaObject::activateOnMediaObject(MediaObject *)
+bool MMF::MediaObject::activateOnMediaObject(MediaObject *)
 {
     // Guess what, we do nothing.
     return true;
diff --git a/src/3rdparty/phonon/mmf/mmf_medianode.cpp b/src/3rdparty/phonon/mmf/mmf_medianode.cpp
index 54c51a0..a9eee58 100644
--- a/src/3rdparty/phonon/mmf/mmf_medianode.cpp
+++ b/src/3rdparty/phonon/mmf/mmf_medianode.cpp
@@ -63,14 +63,14 @@ MMF::MediaNode *MMF::MediaNode::target() const
     return m_target;
 }
 
-bool MediaNode::applyNodesOnMediaObject(MediaNode *)
+bool MMF::MediaNode::applyNodesOnMediaObject(MediaNode *)
 {
     // Algorithmically, this can be expressed in a more efficient way by
     // exercising available assumptions, but it complicates code for input
     // data(length of the graph) which typically is very small.
 
     // First, we go to the very beginning of the graph.
-    MediaNode *current = this;
+	MMF::MediaNode *current = this;
     do {
         MediaNode *const candidate = current->source();
         if (candidate)
diff --git a/src/plugins/phonon/mmf/plugin/plugin.pro b/src/plugins/phonon/mmf/plugin/plugin.pro
index c343831..e24252c 100644
--- a/src/plugins/phonon/mmf/plugin/plugin.pro
+++ b/src/plugins/phonon/mmf/plugin/plugin.pro
@@ -74,7 +74,7 @@ LIBS += -lefsrv             # For file server
 LIBS += -lapgrfx -lapmime   # For recognizer
 
 # These are for effects.
-LIBS += -lAudioEqualizerEffect.lib -lBassBoostEffect.lib -lDistanceAttenuationEffect.lib -lDopplerBase.lib -lEffectBase.lib -lEnvironmentalReverbEffect.lib -lListenerDopplerEffect.lib -lListenerLocationEffect.lib -lListenerOrientationEffect.lib -lLocationBase.lib -lLoudnessEffect.lib -lOrientationBase.lib -lRoomLevelEffect.lib -lSourceDopplerEffect.lib -lSourceLocationEffect.lib -lSourceOrientationEffect.lib -lStereoWideningEffect.lib
+LIBS += -lAudioEqualizerEffect -lBassBoostEffect -lDistanceAttenuationEffect -lDopplerBase -lEffectBase -lEnvironmentalReverbEffect -lListenerDopplerEffect -lListenerLocationEffect -lListenerOrientationEffect -lLocationBase -lLoudnessEffect -lOrientationBase -lRoomLevelEffect -lSourceDopplerEffect -lSourceLocationEffect -lSourceOrientationEffect -lStereoWideningEffect
 
 # This is needed for having the .qtplugin file properly created on Symbian.
 QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/phonon_backend