--- a/svgt_plat/svgt_api/inc/SVGEngineInterfaceImpl.h	Sun Mar 14 13:12:18 2010 +0000
+++ b/svgt_plat/svgt_api/inc/SVGEngineInterfaceImpl.h	Sun Mar 28 16:38:08 2010 +0100
@@ -182,7 +182,7 @@
     {
     public:
 
-        IMPORT_C MSvgError* CSvgEngineInterfaceImpl::SaveSvgDom(TInt aHandle, const TDesC& aFileName, TInt aEngine = NULL);
+        IMPORT_C MSvgError* SaveSvgDom(TInt aHandle, const TDesC& aFileName, TInt aEngine = NULL);
 
         /**
          * Two phase construction

--- a/svgt_plat/svgt_api/inc/SvgJavaInterfaceImpl.h	Sun Mar 14 13:12:18 2010 +0000
+++ b/svgt_plat/svgt_api/inc/SvgJavaInterfaceImpl.h	Sun Mar 28 16:38:08 2010 +0100
@@ -2590,8 +2590,7 @@
      
      * changes made for Focus-in/focus-out bug(AMIA-6T8EEG)
      */
-    IMPORT_C void CSvgJavaInterfaceImpl::SvgDocumentFocusOut( SvgDocumentHandle aDocumentHandle,
-                             SvgElementHandle aElementHandle);
+    IMPORT_C void SvgDocumentFocusOut( SvgDocumentHandle aDocumentHandle, SvgElementHandle aElementHandle );
                              
 	/*
 	* Maps the PATH segment type from SVG to JSR.
@@ -2670,4 +2669,4 @@
 
 };
 
-#endif
\ No newline at end of file
+#endif

--- a/svgtopt/SVG/SVGEngine/inc/SVGEngineImpl.h	Sun Mar 14 13:12:18 2010 +0000
+++ b/svgtopt/SVG/SVGEngine/inc/SVGEngineImpl.h	Sun Mar 28 16:38:08 2010 +0100
@@ -822,7 +822,7 @@
 		*/                              
 		
 		void SetRenderingQuality( const TInt32 aRenderQuality);
-		void CSvgEngineImpl::ResetContext();
+		void ResetContext();
 
     private:
 

--- a/svgtopt/SVG/SVGImpl/inc/SVGAnimTimeController.h	Sun Mar 14 13:12:18 2010 +0000
+++ b/svgtopt/SVG/SVGImpl/inc/SVGAnimTimeController.h	Sun Mar 28 16:38:08 2010 +0100
@@ -57,7 +57,7 @@
          * @param
          * @return
          */
-        static CSvgAnimTimeController*  CSvgAnimTimeController::NewL();
+        static CSvgAnimTimeController* NewL();
 
         /**
          * Need method description

--- a/svgtopt/SVG/SVGImpl/inc/SVGAudioElementImpl.h	Sun Mar 14 13:12:18 2010 +0000
+++ b/svgtopt/SVG/SVGImpl/inc/SVGAudioElementImpl.h	Sun Mar 28 16:38:08 2010 +0100
@@ -77,7 +77,7 @@
          void  ConstructL(  const TUint8 aElemID,CSvgDocumentImpl* aDoc );
 
     public:
-        void CSvgAudioElementImpl::SetUriL( const TDesC& aUri );
+        void SetUriL( const TDesC& aUri );
 
         /**
          * Constructor for AudioElement

--- a/svgtopt/gfx2d/inc/GfxGeneralPath.h	Sun Mar 14 13:12:18 2010 +0000
+++ b/svgtopt/gfx2d/inc/GfxGeneralPath.h	Sun Mar 28 16:38:08 2010 +0100
@@ -266,8 +266,8 @@
          RArray<TUint32>* PointTypeArray();
          unsigned char* PathSegmentTypeArray();
          void PathSegmentTypeArray(unsigned char* aSegmentTypeArray);
-         TUint8 CGfxGeneralPath::Count();
-         void CGfxGeneralPath::Count(TUint8 aCount);
+         TUint8 Count();
+         void Count(TUint8 aCount);
 
         /**
          * Get the pointer to the coordinate array.