diff -r 21fe8338c6bf -r 4bfa887905cf videocollection/tsrc/stubs/src/videooperatorservice.cpp
--- a/videocollection/tsrc/stubs/src/videooperatorservice.cpp	Fri Aug 06 09:43:48 2010 +0300
+++ b/videocollection/tsrc/stubs/src/videooperatorservice.cpp	Mon Aug 23 14:27:29 2010 +0300
@@ -23,6 +23,9 @@
 #include "videooperatorservicedata.h"
 #include "videocollectionviewutils.h"
 #include "videocollectioncenrepdefs.h"
+#define private public
+#include "videooperatorservice_p.h"
+#undef private
 
 QList<QString> VideoOperatorServiceData::mTitles;
 QList<QString> VideoOperatorServiceData::mIcons;
@@ -33,19 +36,23 @@
 int VideoOperatorServiceData::mTitleCallCount = 0;
 int VideoOperatorServiceData::mIconResourceCallCount = 0;
 int VideoOperatorServiceData::mLaunchServiceCallCount = 0;
-int VideoOperatorServiceData::mLaunchApplicationLCallCount = 0;
 
 // ---------------------------------------------------------------------------
 // Constructor
 // ---------------------------------------------------------------------------
 //
 VideoOperatorService::VideoOperatorService(QObject *parent) : 
-    QObject(parent)
+    QObject(parent), d_ptr(new VideoOperatorServicePrivate())
 {
-    mTitle = "";
-    mIconResource = "";
-    mServiceUri = "";
-    mApplicationUid = 0;
+}
+
+// ---------------------------------------------------------------------------
+// Destructor
+// ---------------------------------------------------------------------------
+//
+VideoOperatorService::~VideoOperatorService()
+{
+    delete d_ptr;
 }
 
 // ---------------------------------------------------------------------------
@@ -54,30 +61,34 @@
 //
 bool VideoOperatorService::load(int titleKey, int iconKey, int serviceUriKey, int appUidKey)
 {
-    VideoOperatorServiceData::mLoadCallCount++;
-    
-    if(VideoOperatorServiceData::mTitles.count() > 0)
-    {
-        mTitle = VideoOperatorServiceData::mTitles.takeFirst();
-    }
-    if(VideoOperatorServiceData::mIcons.count() > 0)
+    Q_UNUSED(titleKey);
+    Q_UNUSED(iconKey);
+    Q_UNUSED(serviceUriKey);
+    Q_UNUSED(appUidKey);
+    if(d_ptr)
     {
-        mIconResource = VideoOperatorServiceData::mIcons.takeFirst();
+        if(!VideoOperatorServiceData::mTitles.isEmpty())
+        {
+            d_ptr->mTitle = VideoOperatorServiceData::mTitles.takeFirst();
+        }
+         
+        if(!VideoOperatorServiceData::mUris.isEmpty())
+        {
+            d_ptr->mServiceUri = VideoOperatorServiceData::mUris.takeFirst();
+        }
+        
+        if(!VideoOperatorServiceData::mIcons.isEmpty())
+        {
+            d_ptr->mIconResource = VideoOperatorServiceData::mIcons.takeFirst();
+        }        
     }
-    if(VideoOperatorServiceData::mUris.count() > 0)
-    {
-        mServiceUri = VideoOperatorServiceData::mUris.takeFirst();
-    }
-    if(VideoOperatorServiceData::mUids.count() > 0)
-    {
-        mApplicationUid = VideoOperatorServiceData::mUids.takeFirst();
-    }
+    VideoOperatorServiceData::mLoadCallCount++;
 
     // Icon is required, either service uri or application uid is required.
-    if(mIconResource.isEmpty() && (mServiceUri.isEmpty() || mApplicationUid > 0))
+    if(d_ptr->mIconResource.isEmpty() || (d_ptr->mServiceUri.isEmpty() && d_ptr->mApplicationUid <= 0))
     {
         return false;
-    }    
+    }
     return true;
 }
 
@@ -88,7 +99,7 @@
 const QString VideoOperatorService::title() const
 {
     VideoOperatorServiceData::mTitleCallCount++;
-    return mTitle;
+    return d_ptr->mTitle;
 }
 
 // ---------------------------------------------------------------------------
@@ -98,7 +109,7 @@
 const QString VideoOperatorService::iconResource() const
 {
     VideoOperatorServiceData::mIconResourceCallCount++;
-    return mIconResource;
+    return d_ptr->mIconResource;
 }
 
 // ---------------------------------------------------------------------------
@@ -110,15 +121,4 @@
     VideoOperatorServiceData::mLaunchServiceCallCount++;
 }
 
-// ---------------------------------------------------------------------------
-// launchApplicationL
-// ---------------------------------------------------------------------------
-//
-void VideoOperatorService::launchApplicationL(const TUid uid, TInt viewId)
-{
-    Q_UNUSED(uid);
-    Q_UNUSED(viewId);
-    VideoOperatorServiceData::mLaunchApplicationLCallCount++;
-}
-
 // End of file.