From 732b399495ec26a3770cae612c0fbcea1dcc3419 Mon Sep 17 00:00:00 2001 From: Guillaume Denneulin Date: Thu, 2 May 2013 16:01:08 +0200 Subject: PFW: Remove useless export date on top of settings XML file BZ: 105122 On line 3 of configurable domains xml files, a comment was added to specify date of files creation. This date makes all trivial merges on this file to fail, making rebases a harder task. Remove this comment as this kind of files are changed very often and as all modifications to this file are tracked with git. Change-Id: I4e8aedf95bbdea03137709f91242179d6acab5f3 Signed-off-by: Guillaume Denneulin Reviewed-on: http://android.intel.com:8080/105823 Reviewed-by: Rocard, KevinX Reviewed-by: Gonzalve, Sebastien Tested-by: Dixon, CharlesX Reviewed-by: buildbot Tested-by: buildbot --- xmlserializer/XmlMemoryDocSource.cpp | 16 ---------------- xmlserializer/XmlMemoryDocSource.h | 4 ---- 2 files changed, 20 deletions(-) (limited to 'xmlserializer') diff --git a/xmlserializer/XmlMemoryDocSource.cpp b/xmlserializer/XmlMemoryDocSource.cpp index 9f1c5ad..ffa86e3 100644 --- a/xmlserializer/XmlMemoryDocSource.cpp +++ b/xmlserializer/XmlMemoryDocSource.cpp @@ -67,9 +67,6 @@ bool CXmlMemoryDocSource::populate(CXmlSerializingContext& serializingContext) // Schema location docElement.setAttributeString("xsi:noNamespaceSchemaLocation", _strXmlSchemaFile); - - // Comment for date/time - docElement.setComment(string(" Exported on ") + getTimeAsString() + " from " + _strProduct + " version " + _strVersion + " "); } // Compose the xml document @@ -77,16 +74,3 @@ bool CXmlMemoryDocSource::populate(CXmlSerializingContext& serializingContext) return true; } - -string CXmlMemoryDocSource::getTimeAsString() -{ - char acBuf[200]; - time_t t; - struct tm *tmp; - t = time(NULL); - tmp = localtime(&t); - - strftime(acBuf, sizeof(acBuf), "%F, %T", tmp); - - return acBuf; -} diff --git a/xmlserializer/XmlMemoryDocSource.h b/xmlserializer/XmlMemoryDocSource.h index c507282..4a1de63 100644 --- a/xmlserializer/XmlMemoryDocSource.h +++ b/xmlserializer/XmlMemoryDocSource.h @@ -52,8 +52,4 @@ private: // Product and version info string _strProduct; string _strVersion; - - // Get the current system time - static string getTimeAsString(); - }; -- cgit v1.1