# HG changeset patch
# User Stefan Karlsson <stefan.karlsson@nokia.com>
# Date 1269950396 -3600
# Node ID b76d631296db42048099e2e5792909622310d3e3
# Parent  e8fef71da7c6e109dd1845e7c7205723fdf2272e# Parent  e35be9ff24b66bddff4dd6b360b297bff3c50af7
Merge.

diff -r e35be9ff24b6 -r b76d631296db contentpublishingsrv/contentpublishingserver/cpserver/inc/cpserver.h
--- a/contentpublishingsrv/contentpublishingserver/cpserver/inc/cpserver.h	Wed Mar 24 11:13:58 2010 +0900
+++ b/contentpublishingsrv/contentpublishingserver/cpserver/inc/cpserver.h	Tue Mar 30 12:59:56 2010 +0100
@@ -110,7 +110,7 @@
     /**
      * Returns notifications array
      */
-    RPointerArray<CLiwDefaultList>& CCPServer::GetNotifications( ); 
+    RPointerArray<CLiwDefaultList>& GetNotifications( ); 
 
 private:
     // From CActive
diff -r e35be9ff24b6 -r b76d631296db homescreenpluginsrv/hspsmanager/inc/hspsserverutil.h
--- a/homescreenpluginsrv/hspsmanager/inc/hspsserverutil.h	Wed Mar 24 11:13:58 2010 +0900
+++ b/homescreenpluginsrv/hspsmanager/inc/hspsserverutil.h	Tue Mar 30 12:59:56 2010 +0100
@@ -468,7 +468,7 @@
          * @param aFilename Referred file name or NULL
  		 * @return True if a file was referred from the declaration
          */
-        static TBool hspsServerUtil::IsFile(
+        static TBool IsFile(
                 const TDesC& aFileDeclaration,
                 TFileName& aFilename );
 
diff -r e35be9ff24b6 -r b76d631296db idlefw/plugins/devicestatus/inc/aioperatornamepublisher.h
--- a/idlefw/plugins/devicestatus/inc/aioperatornamepublisher.h	Wed Mar 24 11:13:58 2010 +0900
+++ b/idlefw/plugins/devicestatus/inc/aioperatornamepublisher.h	Tue Mar 30 12:59:56 2010 +0100
@@ -89,7 +89,7 @@
      * Check SPN status from PLMNField. Also check if current country and network
      * codes are in PLMNField.
      */
-    void CAiOperatorNamePublisher::CheckServiceProviderDisplayListStatus(
+    void CheckServiceProviderDisplayListStatus(
         TInt aMCC,
         TInt aMNC,
         TBool& aShowSPN,
diff -r e35be9ff24b6 -r b76d631296db menucontentsrv/srvinc/mcscachehandler.h
--- a/menucontentsrv/srvinc/mcscachehandler.h	Wed Mar 24 11:13:58 2010 +0900
+++ b/menucontentsrv/srvinc/mcscachehandler.h	Tue Mar 30 12:59:56 2010 +0100
@@ -71,7 +71,7 @@
     
     void RemoveNotExistItems();
 
-    void CMcsCacheHandler::RemoveItemsWithChangedAttributesL();
+    void RemoveItemsWithChangedAttributesL();
 
     
 private:    // data
@@ -83,4 +83,4 @@
     RMenuSrvAttrArray iAttrCache;
     };
 
-#endif // __MCSDRMHANDLER_H__
\ No newline at end of file
+#endif // __MCSDRMHANDLER_H__