diff -r ba76fc04e6c2 -r 6b911d05207e phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_cppluginloader.cpp
--- a/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_cppluginloader.cpp	Fri Jun 04 10:19:18 2010 +0100
+++ b/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_cppluginloader.cpp	Wed Jun 23 18:12:20 2010 +0300
@@ -20,26 +20,21 @@
 #include "cppluginloader.h"
 
 // ============================ MEMBER FUNCTIONS ===============================
-
 // -----------------------------------------------------------------------------
-// CpPluginLoader::loadCpPlugin
+// CpPluginLoader::loadCpPluginInterface
 // -----------------------------------------------------------------------------
 //
-CpPluginInterface * CpPluginLoader::loadCpPlugin( 
-        const QString & pluginFile )
-    {
+CpPluginInterface *CpPluginLoader::loadCpPluginInterface(const QString &pluginFile)
+{
     SMC_MOCK_METHOD1( CpPluginInterface *, const QString &, pluginFile )
-    }
-
+}
 
 // -----------------------------------------------------------------------------
-// CpPluginLoader::loadPlatCpPlugin
+// CpPluginLoader::loadCpLauncherInterface
 // -----------------------------------------------------------------------------
 //
-CpPluginPlatInterface * CpPluginLoader::loadPlatCpPlugin( 
-        const QString & pluginFile )
-    {
-    SMC_MOCK_METHOD1( CpPluginPlatInterface *, const QString &, pluginFile )
-    }
+CpLauncherInterface *CpPluginLoader::loadCpLauncherInterface(const QString &pluginFile)
+{
+    SMC_MOCK_METHOD1( CpLauncherInterface *, const QString &, pluginFile )
+}
 
-