diff -r 35baca0e7a2e -r 023eef975703 javamanager/javacaptain/extensionplugins/settingslistener/src.s60/settingslistenerimpl.h
--- a/javamanager/javacaptain/extensionplugins/settingslistener/src.s60/settingslistenerimpl.h	Tue Jul 06 20:36:19 2010 +0300
+++ b/javamanager/javacaptain/extensionplugins/settingslistener/src.s60/settingslistenerimpl.h	Fri Jul 09 16:35:45 2010 +0300
@@ -20,14 +20,13 @@
 #ifndef SETTINGSLISTENERIMPL_H
 #define SETTINGSLISTENERIMPL_H
 
-#include "javaosheaders.h"
-
-#include "settingslistenerinterface.h"
-
 #include <vector>
 #include <memory>
 #include <cenrepnotifyhandler.h>
 
+#include "javaosheaders.h"
+#include "settingslistenerinterface.h"
+
 namespace java
 {
 namespace captain
@@ -43,15 +42,14 @@
     virtual ~SettingsListenerImpl();
 
     // SystemSettingsChangeListenerInterface
-    virtual void StartListening();
-    virtual void StopListening();
+    virtual void startListening();
+    virtual void stopListening();
 
 private:
     void cleanUp();
-    int createCenRepKeyListener(TUid aRepoId, TUint32 aKeyId,
-                            CCenRepNotifyHandler::TCenRepKeyType aKeyType,
-                            std::auto_ptr<CenRepListener>& aListener);
-    int createCenRepListener(TUid aRepoId, CenRepListener*& aListener);
+    CenRepListener* createCenRepKeyListener(TUid aRepoId, TUint32 aKeyId,
+                                            CCenRepNotifyHandler::TCenRepKeyType aKeyType,
+                                            TInt& aErrorCode);
 
     CoreInterface* mCore;  // resource not owned
     typedef std::vector<CenRepListener*> crListeners_t;