diff -r bab96b7ed1a4 -r f39ed5e045e0 phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_cppluginloader.cpp
--- a/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_cppluginloader.cpp	Tue Jun 15 14:14:38 2010 +0100
+++ b/phonesettings/cpphonesettingsplugins/tsrc/mocks/mock_cppluginloader.cpp	Thu Jul 22 16:33:21 2010 +0100
@@ -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 )
+}
 
-