diff -r 17f382c040b1 -r 518105d52e45 videoplayerapp/videoplayerengine/tsrc/testvideoplayerengine/stub/inc/videoservices.h
--- a/videoplayerapp/videoplayerengine/tsrc/testvideoplayerengine/stub/inc/videoservices.h	Fri Jul 02 17:14:33 2010 +0300
+++ b/videoplayerapp/videoplayerengine/tsrc/testvideoplayerengine/stub/inc/videoservices.h	Thu Jul 08 13:05:19 2010 +0300
@@ -15,7 +15,7 @@
 *
 */
 
-// Version : %version: da1mmcf#4 %
+// Version : %version: da1mmcf#5 %
 
 #ifndef __VIDEOSERVICES_H__
 #define __VIDEOSERVICES_H__
@@ -27,101 +27,92 @@
 class VideoServiceUriFetch;
 class VideoServicePlay;
 class VideoServiceView;
-class QVideoPlayerEngine;
+class VideoPlayerEngine;
 
 class VideoServices : public QObject
 {
     Q_OBJECT
 
-public:
+    public:
 
-    /**
-     * Returns singleton instance for this class.
-     *
-     * WARNING! Not safe to call this from destructor of another function scope static object!
-     *
-     * @return The singleton instance.
-     */
-    static VideoServices *instance(QVideoPlayerEngine* engine = 0);
+        /**
+         * Returns singleton instance for this class.
+         * WARNING! Not safe to call this from destructor of another function scope static object!
+         * @return The singleton instance.
+         */
+        static VideoServices *instance( VideoPlayerEngine* engine = 0 );
 
-    /**
-     * Decreases the reference count, when count reaches zero cleanup is done.
-     *
-     */
-    void decreaseReferenceCount();
+        /**
+         * Decreases the reference count, when count reaches zero cleanup is done.
+         *
+         */
+        void decreaseReferenceCount();
 
-	enum TVideoService
-    {
-        ENoService,
-        EUriFetcher,
-        EPlayback,
-        EView
-    };
+        enum TVideoService
+        {
+            ENoService,
+            EUriFetcher,
+            EPlayback,
+            EView
+        };
 
-    /**
-     * Returns service active status
-     *
-     * @return bool true if active, false if not active
-     *
-     */
-    VideoServices::TVideoService currentService();
+        /**
+         * Returns service active status
+         * @return bool true if active, false if not active
+         */
+        VideoServices::TVideoService currentService();
 
-private:
-
-    /**
-     * Constructor
-     */
-    VideoServices();
+    private:
+ 
+        /**
+         * Constructor
+         */
+        VideoServices();
 
-    /**
-     * Constructor
-     */
-    VideoServices(QVideoPlayerEngine* engine);
+        /**
+         * Constructor
+         */
+        VideoServices( VideoPlayerEngine* engine );
 
-    /**
-     * Destructor.
-     */
-    virtual ~VideoServices();
+        /**
+         * Destructor.
+         */
+        virtual ~VideoServices();
 
-    void setCurrentService(VideoServices::TVideoService service);
+        void setCurrentService( VideoServices::TVideoService service );
 
-    Q_DISABLE_COPY(VideoServices)
+        Q_DISABLE_COPY( VideoServices )
 
-signals:
+    signals:
 	void activated( int command );
 
-private:
-
-    /**
-     * Singleton instance.
-     */
-    static VideoServices* mInstance;
+    private:
 
-    VideoServiceUriFetch* mServiceUriFetch;
+        /**
+         * Singleton instance.
+         */
+        static VideoServices*        mInstance;
 
-    VideoServicePlay* mServicePlay;
-    
-    VideoServiceView* mServiceView;
-
-    VideoServices::TVideoService mCurrentService;
+        VideoServiceUriFetch*        mServiceUriFetch;
+        VideoServicePlay*            mServicePlay;    
+        VideoServiceView*            mServiceView;
+        VideoServices::TVideoService mCurrentService;
 
-    friend class VideoServiceUriFetch;
+        friend class VideoServiceUriFetch;
+        friend class VideoServicePlay;    
+        friend class VideoServiceView;
 
-    friend class VideoServicePlay;
-    
-    friend class VideoServiceView;
-
-public:
+    public:
 
-    /**
-     * Reference count.
-     */
-    static int mReferenceCount;
+        /**
+         * Reference count.
+         */
+        static int mReferenceCount;
 
-    /*
-     * indicate fetch service and attach operation has been selected
-     */
-    bool         mFetchSelected;
+        /*
+         * indicate fetch service and attach operation has been selected
+         */
+        bool mFetchSelected;
 
 };