--- a/coreapplicationuis/SysAp/Inc/sysapdefaultkeyhandler.h	Fri Jun 11 13:48:03 2010 +0300
+++ b/coreapplicationuis/SysAp/Inc/sysapdefaultkeyhandler.h	Wed Jun 23 18:22:59 2010 +0300
@@ -21,10 +21,13 @@
 
 #include <e32base.h>
 #include <coedef.h>
-#include <AknCapServerClient.h>
+//#include <AknCapServerClient.h>
 
+class RWindowGroup;
 class MSysapCallback;
-class RAknKeylock2;
+
+//class RAknKeylock2;
+//class CSysApAppUi;
 
 
 /**
@@ -49,7 +52,7 @@
         * @param aCallback reference to System Application callback interface.
         * @return pointer to a new instance of CSysApDefaultKeyHandler.
         */
-        static CSysApDefaultKeyHandler* NewL( MSysapCallback& callback );
+        static CSysApDefaultKeyHandler* NewL(MSysapCallback& callback);
 
         /**
         * Destructor.
@@ -85,7 +88,7 @@
         *
         * @param aCallback reference to System Application callback interface.
         */
-        CSysApDefaultKeyHandler( MSysapCallback& callback );
+        CSysApDefaultKeyHandler(MSysapCallback& callback );
 
     private:
     
@@ -162,7 +165,10 @@
         TBool DoShowKeysLockedNote();
         
     private: // data
-
+        
+        // Our window group from SysappUi
+ //       RWindowGroup& iRootWindowGroup;
+        
         /**
         * Reference to callback object.
         */
@@ -182,7 +188,7 @@
         * Pointer to sysap-owned RAknKeylock2*
         * Not own.
         */
-        RAknKeylock2* iKeylock;
+//        RAknKeylock2* iKeylock;
         
         /**
         * Handle of the captured camera key event.
@@ -222,7 +228,7 @@
         /**
         * Avkon UI Server
         */
-        RAknUiServer iAknUiServer;
+//        RAknUiServer iAknUiServer;
         
     };