diff -r 2d2d25361590 -r d1838696558c iaupdate/IAD/firmwareupdate/inc/iaupdatefwsyncutil.h
--- a/iaupdate/IAD/firmwareupdate/inc/iaupdatefwsyncutil.h	Tue Sep 28 14:48:39 2010 +0300
+++ b/iaupdate/IAD/firmwareupdate/inc/iaupdatefwsyncutil.h	Thu Oct 14 14:11:30 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2005 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -70,22 +70,7 @@
         * @param aSource.
         * @return None
         */      		
-		static void StrAppend( TDes& aTarget, const TDesC& aSource );
-        
-        /**
-        * String insert tool
-        * @param aTarget.
-        * @param aSource.
-        * @return None
-        */      		
-		 static void StrInsert( TDes& aTarget, const TDesC& aSource );
-        
-        /**
-        * Convert string to int
-        * @param aText.
-        * @param aNum.
-        * @return None
-        */		
+
 		static TInt StrToInt( const TDesC& aText, TInt& aNum );
         
         /**
@@ -93,268 +78,10 @@
         * @param aText.
         * @return ETrue if empty
         */				
-		static TBool IsEmpty( const TDesC& aText );
-        
-        /**
-        * URI Parser
-        * @param aURI
-        * @param aAddress
-        * @param aPort
-        * @param aDocName
-        * @return None
-        */						
-        static void ParseURIL( const TDesC& aURI, 
-                               TDes& aAddress, 
-                               TDes& aPort, 
-                               TDes& aDocName );
-      
-        /**
-        * Returns formatted sync time
-        * @param aLastSync
-        * @return Sync time
-        */
-        static HBufC* SyncTimeLC( TTime aLastSync );
-        
-        /**
-        * Get data as text
-        * @param 
-        * @return 
-        */        
-        static void GetDateTextL( TDes& aText, TTime aDateTime );
-        
-        /**
-        * Get time as text 
-        * @param 
-        * @return 
-        */        
-		static void GetTimeTextL( TDes& aText, TTime aDateTime );
-        
-        /**
-        * Get data and time as text
-        * @param 
-        * @return 
-        */        
-		static void GetDateTimeTextL( TDes& aText, TTime aDateTime );
-        
-        /**
-        * Check if SettingEnforcement is set
-        * @param 
-        * @return Boolean
-        */        
-		static TBool SettingEnforcementStateL();
-
-        /**
-        * Check if SettingEnforcement is set (non-leaving)
-        * @param 
-        * @return Boolean
-        */        
-		static TBool SettingEnforcementState();
-
-    private:
-    
-        /**
-        * Check if sync has happened today
-        * @param atime
-        * @return Boolean
-        */    
-        static TBool IsToday( TTime aTime );
-        
-        /**
-        * Convert time to hometime
-        * @param aUniversalTime
-        * @return TTIme
-        */            
-        static TTime ConvertUniversalToHomeTime( const TTime& aUniversalTime );
 
 	};
 
-/**
-*  TStr contains descriptor operations with range checking.
-*/
-NONSHARABLE_CLASS (TStr)
-    {
-    public:
-        /**
-        * C++ default constructor.
-        */
-        TStr(const TDesC& aStr);
-       
-    public:
-        /**
-        * String manipulating tools
-        * @param aPos
-        * @param aLen
-        * @return TPtrC
-        */        
-        TPtrC Mid( TInt aPos, TInt aLen );
-        
-        /**
-        * String manipulating tools
-        * @param aPos
-        * @return TPtrC
-        */                
-        TPtrC Mid( TInt aPos );
 
-        /**
-        * String manipulating tools
-        * @param aPos
-        * @return TPtrC
-        */                
-        TPtrC Left( TInt aPos );
-        
-        /**
-        * String manipulating tools
-        * @param aPos
-        * @return TPtrC
-        */               
-        TPtrC Right( TInt aPos );
-        
-        /**
-        * String manipulating tools
-        * @param aStartPos
-        * @param aEndPos
-        * @return TPtrC
-        */               
-        TPtrC SubStr( TInt aStartPos, TInt aEndPos );
-
-        /**
-        * String manipulating tools
-        * @param aStartPos
-        * @param aEndPos
-        * @return TPtrC
-        */           
-        TPtrC SubStrEx( TInt aStartPos, TInt aEndPos );
-
-        /**
-        * String manipulating tools
-        * @return TInt
-        */           
-        TInt LastPos();
-
-        /**
-        * String manipulating tools
-        * @return TInt
-        */           
-        TInt Len();
-
-        /**
-        * String manipulating tools
-        * @param aPos
-        * @param aChar
-        * @return TBool
-        */           
-        TBool Compare( TInt aPos, TChar aChar );
-
-        /**
-        * String manipulating tools
-        * @param aStartPos
-        * @param aChar
-        * @return TInt
-        */
-        TInt Find( TInt aPos, TChar aChar );
-        
-    private:
-        // reference to descriptor
-		const TDesC& iStr;
-    };
-
-/**
-*  TURIParser is used for parsing URI.
-*/
-NONSHARABLE_CLASS (TURIParser)
-    {
-    public:
-        /**
-        * C++ default constructor.
-        */
-        TURIParser( const TDesC& aStr );
-       
-    public:
-        /**
-        * URI manipulating tools
-        * @param aText
-        * @return None
-        */    
-        void GetUriWithoutPort( TDes& aText );
-
-        /**
-        * URI manipulating tools
-        * @param aText
-        * @param aPort
-        * @return None
-        */            
-        void GetUri( TDes& aText, const TInt aPort );
-
-        /**
-        * URI manipulating tools
-        * @return TInt
-        */            
-        TInt Port();
-
-        /**
-        * URI manipulating tools
-        * @return TInt
-        */            
-        TInt DefaultPort();
-
-    private:
-        /**
-        * URI manipulating tools
-        * @return TPtrC
-        */          
-        TPtrC ParseHttp();
-
-        /**
-        * URI manipulating tools
-        * @return TPtrC
-        */              
-        TPtrC ParseAddress();
-
-        /**
-        * URI manipulating tools
-        * @return TPtrC
-        */              
-        TPtrC ParseDocument();
-
-        /**
-        * URI manipulating tools
-        * @param aPortNumber
-        * @return TInt
-        */              
-        TInt ParsePort(TInt& aPortNumber);
-
-        /**
-        * URI manipulating tools
-        * @return TPtrC
-        */              
-        TPtrC ParsePort();
-        
-     private:
-
-        /**
-        * URI manipulating tools
-        * @param aStartPos
-        * @param aEndPos
-        * @return None
-        */          
-        void GetHttpPos(TInt& aStartPos, TInt& aEndPos);
-
-        /**
-        * URI manipulating tools
-        * @return NOne
-        */             
-        void SkipHttp();
-  
-    private:
-        // reference to original URI text
-		const TDesC& iOriginalStr;
-		
-		// pointer to original URI text
-		TPtrC iPtr;
-		
-		//reference to Boolean variable which tells about Slash in URI
-		TBool iSlash;
-    };
 
 /**
 * MIAUpdateFWActiveCallerObserver
@@ -445,6 +172,6 @@
 		MIAUpdateFWActiveCallerObserver* iObserver;
     };
 
-#endif  // NSMLDMSYNCUTIL_H
+#endif  // IAUPDATEFWSYNCUTIL_H
 
 // End of File