diff options
author | Lorn Potter <lorn.potter@nokia.com> | 2010-08-03 19:14:44 (GMT) |
---|---|---|
committer | Lorn Potter <lorn.potter@nokia.com> | 2010-08-03 19:14:44 (GMT) |
commit | be83848d31513dfbfffb1e0c43d32b7c27dcefce (patch) | |
tree | c8b965626afcb18cfaca0f26e39596ac4dd6f0a8 /src/3rdparty/phonon/mmf/abstractplayer.h | |
parent | 7a2d31989f0f50a34550be846a6f632c2f9e3f59 (diff) | |
parent | 11ad3b195d98b0a2234105da24d1faffd7ef95d6 (diff) | |
download | Qt-be83848d31513dfbfffb1e0c43d32b7c27dcefce.zip Qt-be83848d31513dfbfffb1e0c43d32b7c27dcefce.tar.gz Qt-be83848d31513dfbfffb1e0c43d32b7c27dcefce.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Conflicts:
src/plugins/bearer/connman/qconnmanengine.cpp
Diffstat (limited to 'src/3rdparty/phonon/mmf/abstractplayer.h')
-rw-r--r-- | src/3rdparty/phonon/mmf/abstractplayer.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/3rdparty/phonon/mmf/abstractplayer.h b/src/3rdparty/phonon/mmf/abstractplayer.h index 30d5243..dd98c7c 100644 --- a/src/3rdparty/phonon/mmf/abstractplayer.h +++ b/src/3rdparty/phonon/mmf/abstractplayer.h @@ -26,8 +26,6 @@ along with this library. If not, see <http://www.gnu.org/licenses/>. #include "abstractvideooutput.h" -class RFile; - QT_BEGIN_NAMESPACE namespace Phonon @@ -54,7 +52,7 @@ class AbstractPlayer : public QObject public: AbstractPlayer(const AbstractPlayer *player); - virtual void open(const Phonon::MediaSource&, RFile&) = 0; + virtual void open() = 0; virtual void close() = 0; // MediaObjectInterface (implemented) |