diff -r fa9941cf3867 -r 667e88a979d7 featuremgmt/featuremgr/src/serverexe/featmgrfeatureregistry.h
--- a/featuremgmt/featuremgr/src/serverexe/featmgrfeatureregistry.h	Fri Mar 12 15:51:02 2010 +0200
+++ b/featuremgmt/featuremgr/src/serverexe/featmgrfeatureregistry.h	Mon Mar 15 12:46:30 2010 +0200
@@ -108,12 +108,12 @@
         /**
         * Merges features to common feature array from plugin.
         */
-        void MergePluginFeatures( RArray<FeatureInfoCommand::TFeature>& aList );
+        void MergePluginFeaturesL( RArray<FeatureInfoCommand::TFeature>& aList );
 
         /**
         * Merges features to common feature array from plugin.
         */
-        void MergePluginFeatures( RFeatureArray& aList );
+        void MergePluginFeaturesL( RFeatureArray& aList );
 
         /**
         * Returns feature support status.
@@ -161,7 +161,7 @@
 		 * This function will handle the required notifications for new, deleted and changed features
 		 * after a restore operation has taken place.
          */ 
-        TInt HandleRestoredFeatureNotificationsL( void );
+        void HandleRestoredFeatureNotificationsL();
         
         /**
 		 * Returns the fully qualified path and filename for the runtime feature data file.
@@ -243,7 +243,7 @@
         void ValidateHeaderL( RFileReadStream& stream, TUint32& count, TUint32& countDSRs );
         void WriteHeaderAndEntriesL( RFileWriteStream &aStream, RFeatureServerArray& aArray );
         TInt ValidateFeatureFlag(TBitFlags32 aFlags);
-        TInt ValidateRuntimeFeatureFlagL(TBitFlags32 aFlags);
+        void ValidateRuntimeFeatureFlagL(TBitFlags32 aFlags);
         
      private: