--- a/hotspotfw/hsserver/inc/hotspotserver.h	Wed Feb 03 12:16:50 2010 +0000
+++ b/hotspotfw/hsserver/inc/hotspotserver.h	Fri Mar 05 17:02:18 2010 -0800
@@ -252,7 +252,7 @@
         * @param aLoginTimerValue, set login timer value,
         * @param aLogoutTimerValue, set logout timer value.
         */        
-        void CHotSpotServer::SetTimerValues(
+        void SetTimerValues(
                 TUid aClientUid,
                 TUint aLoginTimerValue,
                 TUint aLogoutTimerValue );
@@ -264,7 +264,7 @@
         * @param aClientUid, client UID to find.
         * @return matching index if UID was found, otherwise KErrNotFound.
         */        
-        TInt CHotSpotServer::FindClientUid( TUid aClientUid );
+        TInt FindClientUid( TUid aClientUid );
         
     public: // Functions from base classes
 

--- a/wlanutilities/wlansniffer/aiplugin/inc/wsfaiplugin.h	Wed Feb 03 12:16:50 2010 +0000
+++ b/wlanutilities/wlansniffer/aiplugin/inc/wsfaiplugin.h	Fri Mar 05 17:02:18 2010 -0800
@@ -94,23 +94,23 @@
         * Steps 
         * @param ptr Pointer to an instance of this class
         */
-        static TInt CWsfAiPlugin::DoRefreshingStepL( TAny* ptr );
+        static TInt DoRefreshingStepL( TAny* ptr );
         
         /**
         * Steps the refresh animation
         */                
-        void CWsfAiPlugin::DoRefreshingStepL();
+        void DoRefreshingStepL();
         
         /**
         * Steps 
         * @param ptr Pointer to an instance of this class
         */
-        static TInt CWsfAiPlugin::DoConnectingStepL( TAny* ptr );
+        static TInt DoConnectingStepL( TAny* ptr );
         
         /**
         * Steps the refresh animation
         */                
-        void CWsfAiPlugin::DoConnectingStepL();
+        void DoConnectingStepL();
     
     public:     // from CAiContentPublisher
         

--- a/wlanutilities/wlansniffer/aiplugin/inc/wsfaipublishobserver.h	Wed Feb 03 12:16:50 2010 +0000
+++ b/wlanutilities/wlansniffer/aiplugin/inc/wsfaipublishobserver.h	Fri Mar 05 17:02:18 2010 -0800
@@ -23,7 +23,8 @@
 
 class CAknIconArray;
 class CEikLabel;
-class CArrayFix< TInt >;
+template<class> class CArrayFix;
+
 /**
  *  Abstract interface for wlan active idle plugin
  *

--- a/wlanutilities/wlansniffer/mainapplication/inc/wsfmainviewcontainer.h	Wed Feb 03 12:16:50 2010 +0000
+++ b/wlanutilities/wlansniffer/mainapplication/inc/wsfmainviewcontainer.h	Fri Mar 05 17:02:18 2010 -0800
@@ -245,13 +245,12 @@
          * Steps the connecting animation
          * @param ptr Pointer to an instance of this class
          */
-        static TInt CWsfMainViewContainer::DoConnectingAnimationStepL( 
-                                                                TAny* ptr );
+        static TInt DoConnectingAnimationStepL( TAny* ptr );
         
         /**
          * Steps the connecting animation
          */                
-        void CWsfMainViewContainer::DoConnectingAnimationStepL();
+        void DoConnectingAnimationStepL();
 
         /**
          *  Initialize the connecting animation