[mapguide-commits] r7299 - in trunk/MgDev: Common/MapGuideCommon/Services Common/PlatformBase/Services Server/src/Services/Feature
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Fri Jan 11 20:16:28 PST 2013
Author: jng
Date: 2013-01-11 20:16:28 -0800 (Fri, 11 Jan 2013)
New Revision: 7299
Modified:
trunk/MgDev/Common/MapGuideCommon/Services/ProxyDataReader.h
trunk/MgDev/Common/MapGuideCommon/Services/ProxyFeatureReader.h
trunk/MgDev/Common/MapGuideCommon/Services/ProxyGwsFeatureReader.cpp
trunk/MgDev/Common/MapGuideCommon/Services/ProxyGwsFeatureReader.h
trunk/MgDev/Common/MapGuideCommon/Services/ProxySqlDataReader.h
trunk/MgDev/Common/PlatformBase/Services/Reader.h
trunk/MgDev/Server/src/Services/Feature/ServerDataReader.h
trunk/MgDev/Server/src/Services/Feature/ServerFeatureReader.h
trunk/MgDev/Server/src/Services/Feature/ServerGwsFeatureReader.h
trunk/MgDev/Server/src/Services/Feature/ServerSqlDataReader.h
Log:
Post-merge tab cleanup
Modified: trunk/MgDev/Common/MapGuideCommon/Services/ProxyDataReader.h
===================================================================
--- trunk/MgDev/Common/MapGuideCommon/Services/ProxyDataReader.h 2013-01-12 03:54:41 UTC (rev 7298)
+++ trunk/MgDev/Common/MapGuideCommon/Services/ProxyDataReader.h 2013-01-12 04:16:28 UTC (rev 7299)
@@ -522,7 +522,7 @@
///
/// \param str
/// Destination string.
- ///
+ ///
virtual string GetResponseElementName();
///////////////////////////////////////////////////////////////////////////
@@ -532,7 +532,7 @@
///
/// \param str
/// Destination string.
- ///
+ ///
virtual string GetBodyElementName();
///////////////////////////////////////////////////////////////////////////
Modified: trunk/MgDev/Common/MapGuideCommon/Services/ProxyFeatureReader.h
===================================================================
--- trunk/MgDev/Common/MapGuideCommon/Services/ProxyFeatureReader.h 2013-01-12 03:54:41 UTC (rev 7298)
+++ trunk/MgDev/Common/MapGuideCommon/Services/ProxyFeatureReader.h 2013-01-12 04:16:28 UTC (rev 7299)
@@ -495,7 +495,7 @@
///
/// \param str
/// Destination string.
- ///
+ ///
virtual string GetResponseElementName();
///////////////////////////////////////////////////////////////////////////
@@ -505,7 +505,7 @@
///
/// \param str
/// Destination string.
- ///
+ ///
virtual string GetBodyElementName();
///////////////////////////////////////////////////////////////////////////
Modified: trunk/MgDev/Common/MapGuideCommon/Services/ProxyGwsFeatureReader.cpp
===================================================================
--- trunk/MgDev/Common/MapGuideCommon/Services/ProxyGwsFeatureReader.cpp 2013-01-12 03:54:41 UTC (rev 7298)
+++ trunk/MgDev/Common/MapGuideCommon/Services/ProxyGwsFeatureReader.cpp 2013-01-12 04:16:28 UTC (rev 7299)
@@ -821,24 +821,24 @@
void MgProxyGwsFeatureReader::HeaderToStringUtf8(string& str)
{
- Ptr<MgClassDefinition> classDef = this->GetClassDefinition();
+ Ptr<MgClassDefinition> classDef = this->GetClassDefinition();
if (classDef != NULL)
- {
- classDef->ToXml(str);
- }
+ {
+ classDef->ToXml(str);
+ }
}
void MgProxyGwsFeatureReader::CurrentToStringUtf8(string& str)
{
- if (NULL != (MgFeatureSet*)m_set)
- {
- Ptr<MgPropertyCollection> propCol = m_set->GetFeatureAt(m_currRecord-1);
- INT32 cnt = propCol->GetCount();
- if (propCol != NULL && cnt > 0)
- {
- propCol->ToFeature(str);
- }
- }
+ if (NULL != (MgFeatureSet*)m_set)
+ {
+ Ptr<MgPropertyCollection> propCol = m_set->GetFeatureAt(m_currRecord-1);
+ INT32 cnt = propCol->GetCount();
+ if (propCol != NULL && cnt > 0)
+ {
+ propCol->ToFeature(str);
+ }
+ }
}
void MgProxyGwsFeatureReader::SetService(MgFeatureService* service)
Modified: trunk/MgDev/Common/MapGuideCommon/Services/ProxyGwsFeatureReader.h
===================================================================
--- trunk/MgDev/Common/MapGuideCommon/Services/ProxyGwsFeatureReader.h 2013-01-12 03:54:41 UTC (rev 7298)
+++ trunk/MgDev/Common/MapGuideCommon/Services/ProxyGwsFeatureReader.h 2013-01-12 04:16:28 UTC (rev 7299)
@@ -469,7 +469,7 @@
///
/// \param str
/// Destination string.
- ///
+ ///
virtual string GetResponseElementName();
///////////////////////////////////////////////////////////////////////////
@@ -479,50 +479,50 @@
///
/// \param str
/// Destination string.
- ///
+ ///
virtual string GetBodyElementName();
- ///////////////////////////////////////////////////////////////////////////
+ ///////////////////////////////////////////////////////////////////////////
/// \brief
/// Returns the start of the response as a UTF-8 string. The mime
/// type must be a text type, for example text/xml.
///
/// \param str
/// Destination string.
- ///
- void ResponseStartUtf8(string& str);
+ ///
+ void ResponseStartUtf8(string& str);
- ///////////////////////////////////////////////////////////////////////////
+ ///////////////////////////////////////////////////////////////////////////
/// \brief
/// Returns the end of the response as a UTF-8 string. The mime
/// type must be a text type, for example text/xml.
///
/// \param str
/// Destination string.
- ///
- void ResponseEndUtf8(string& str);
+ ///
+ void ResponseEndUtf8(string& str);
- ///////////////////////////////////////////////////////////////////////////
+ ///////////////////////////////////////////////////////////////////////////
/// \brief
/// Returns the start of the response body as a UTF-8 string. The mime
/// type must be a text type, for example text/xml.
///
/// \param str
/// Destination string.
- ///
- void BodyStartUtf8(string& str);
+ ///
+ void BodyStartUtf8(string& str);
- ///////////////////////////////////////////////////////////////////////////
+ ///////////////////////////////////////////////////////////////////////////
/// \brief
/// Returns the end of the response body as a UTF-8 string. The mime
/// type must be a text type, for example text/xml.
///
/// \param str
/// Destination string.
- ///
- void BodyEndUtf8(string& str);
+ ///
+ void BodyEndUtf8(string& str);
- ///////////////////////////////////////////////////////////////////////////
+ ///////////////////////////////////////////////////////////////////////////
/// \brief
/// Returns the contents of the header in this reader as a UTF-8 string. The mime
/// type must be a text type, for example text/xml.
@@ -532,7 +532,7 @@
///
void HeaderToStringUtf8(string& str);
- ///////////////////////////////////////////////////////////////////////////
+ ///////////////////////////////////////////////////////////////////////////
/// \brief
/// Returns the contents of the current record/feature in the reader as a UTF-8 string. The mime
/// type must be a text type, for example text/xml.
Modified: trunk/MgDev/Common/MapGuideCommon/Services/ProxySqlDataReader.h
===================================================================
--- trunk/MgDev/Common/MapGuideCommon/Services/ProxySqlDataReader.h 2013-01-12 03:54:41 UTC (rev 7298)
+++ trunk/MgDev/Common/MapGuideCommon/Services/ProxySqlDataReader.h 2013-01-12 04:16:28 UTC (rev 7299)
@@ -492,7 +492,7 @@
///
/// \param str
/// Destination string.
- ///
+ ///
virtual string GetResponseElementName();
///////////////////////////////////////////////////////////////////////////
@@ -502,7 +502,7 @@
///
/// \param str
/// Destination string.
- ///
+ ///
virtual string GetBodyElementName();
///////////////////////////////////////////////////////////////////////////
Modified: trunk/MgDev/Common/PlatformBase/Services/Reader.h
===================================================================
--- trunk/MgDev/Common/PlatformBase/Services/Reader.h 2013-01-12 03:54:41 UTC (rev 7298)
+++ trunk/MgDev/Common/PlatformBase/Services/Reader.h 2013-01-12 04:16:28 UTC (rev 7299)
@@ -1145,7 +1145,7 @@
///
/// \param str
/// Destination string.
- ///
+ ///
virtual string GetResponseElementName() = 0;
///////////////////////////////////////////////////////////////////////////
@@ -1155,60 +1155,60 @@
///
/// \param str
/// Destination string.
- ///
+ ///
virtual string GetBodyElementName() = 0;
- ///////////////////////////////////////////////////////////////////////////
+ ///////////////////////////////////////////////////////////////////////////
/// \brief
/// Returns the start of the response as a UTF-8 string. The mime
/// type must be a text type, for example text/xml.
///
/// \param str
/// Destination string.
- ///
- virtual void ResponseStartUtf8(string& str) = 0;
+ ///
+ virtual void ResponseStartUtf8(string& str) = 0;
- ///////////////////////////////////////////////////////////////////////////
+ ///////////////////////////////////////////////////////////////////////////
/// \brief
/// Returns the end of the response as a UTF-8 string. The mime
/// type must be a text type, for example text/xml.
///
/// \param str
/// Destination string.
- ///
- virtual void ResponseEndUtf8(string& str) = 0;
+ ///
+ virtual void ResponseEndUtf8(string& str) = 0;
- ///////////////////////////////////////////////////////////////////////////
+ ///////////////////////////////////////////////////////////////////////////
/// \brief
/// Returns the start of the response body as a UTF-8 string. The mime
/// type must be a text type, for example text/xml.
///
/// \param str
/// Destination string.
- ///
- virtual void BodyStartUtf8(string& str) = 0;
+ ///
+ virtual void BodyStartUtf8(string& str) = 0;
- ///////////////////////////////////////////////////////////////////////////
+ ///////////////////////////////////////////////////////////////////////////
/// \brief
/// Returns the end of the response body as a UTF-8 string. The mime
/// type must be a text type, for example text/xml.
///
/// \param str
/// Destination string.
- ///
- virtual void BodyEndUtf8(string& str) = 0;
+ ///
+ virtual void BodyEndUtf8(string& str) = 0;
- ///////////////////////////////////////////////////////////////////////////
+ ///////////////////////////////////////////////////////////////////////////
/// \brief
/// Returns the contents of the header in this reader as a UTF-8 string. The mime
/// type must be a text type, for example text/xml.
///
/// \param str
/// Destination string.
- ///
+ ///
virtual void HeaderToStringUtf8(string& str) = 0;
- ///////////////////////////////////////////////////////////////////////////
+ ///////////////////////////////////////////////////////////////////////////
/// \brief
/// Returns the contents of the current record/feature in the reader as a UTF-8 string. The mime
/// type must be a text type, for example text/xml.
Modified: trunk/MgDev/Server/src/Services/Feature/ServerDataReader.h
===================================================================
--- trunk/MgDev/Server/src/Services/Feature/ServerDataReader.h 2013-01-12 03:54:41 UTC (rev 7298)
+++ trunk/MgDev/Server/src/Services/Feature/ServerDataReader.h 2013-01-12 04:16:28 UTC (rev 7299)
@@ -443,7 +443,7 @@
///
/// \param str
/// Destination string.
- ///
+ ///
string GetResponseElementName();
///////////////////////////////////////////////////////////////////////////
@@ -453,7 +453,7 @@
///
/// \param str
/// Destination string.
- ///
+ ///
string GetBodyElementName();
///////////////////////////////////////////////////////////////////////////
Modified: trunk/MgDev/Server/src/Services/Feature/ServerFeatureReader.h
===================================================================
--- trunk/MgDev/Server/src/Services/Feature/ServerFeatureReader.h 2013-01-12 03:54:41 UTC (rev 7298)
+++ trunk/MgDev/Server/src/Services/Feature/ServerFeatureReader.h 2013-01-12 04:16:28 UTC (rev 7299)
@@ -408,7 +408,7 @@
///
/// \param str
/// Destination string.
- ///
+ ///
string GetResponseElementName();
///////////////////////////////////////////////////////////////////////////
@@ -418,7 +418,7 @@
///
/// \param str
/// Destination string.
- ///
+ ///
string GetBodyElementName();
///////////////////////////////////////////////////////////////////////////
Modified: trunk/MgDev/Server/src/Services/Feature/ServerGwsFeatureReader.h
===================================================================
--- trunk/MgDev/Server/src/Services/Feature/ServerGwsFeatureReader.h 2013-01-12 03:54:41 UTC (rev 7298)
+++ trunk/MgDev/Server/src/Services/Feature/ServerGwsFeatureReader.h 2013-01-12 04:16:28 UTC (rev 7299)
@@ -400,7 +400,7 @@
///
/// \param str
/// Destination string.
- ///
+ ///
string GetResponseElementName();
///////////////////////////////////////////////////////////////////////////
@@ -410,50 +410,50 @@
///
/// \param str
/// Destination string.
- ///
+ ///
string GetBodyElementName();
- ///////////////////////////////////////////////////////////////////////////
+ ///////////////////////////////////////////////////////////////////////////
/// \brief
/// Returns the start of the response as a UTF-8 string. The mime
/// type must be a text type, for example text/xml.
///
/// \param str
/// Destination string.
- ///
- void ResponseStartUtf8(string& str);
+ ///
+ void ResponseStartUtf8(string& str);
- ///////////////////////////////////////////////////////////////////////////
+ ///////////////////////////////////////////////////////////////////////////
/// \brief
/// Returns the end of the response as a UTF-8 string. The mime
/// type must be a text type, for example text/xml.
///
/// \param str
/// Destination string.
- ///
- void ResponseEndUtf8(string& str);
+ ///
+ void ResponseEndUtf8(string& str);
- ///////////////////////////////////////////////////////////////////////////
+ ///////////////////////////////////////////////////////////////////////////
/// \brief
/// Returns the start of the response body as a UTF-8 string. The mime
/// type must be a text type, for example text/xml.
///
/// \param str
/// Destination string.
- ///
- void BodyStartUtf8(string& str);
+ ///
+ void BodyStartUtf8(string& str);
- ///////////////////////////////////////////////////////////////////////////
+ ///////////////////////////////////////////////////////////////////////////
/// \brief
/// Returns the end of the response body as a UTF-8 string. The mime
/// type must be a text type, for example text/xml.
///
/// \param str
/// Destination string.
- ///
- void BodyEndUtf8(string& str);
+ ///
+ void BodyEndUtf8(string& str);
- ///////////////////////////////////////////////////////////////////////////
+ ///////////////////////////////////////////////////////////////////////////
/// \brief
/// Returns the contents of the header in this reader as a UTF-8 string. The mime
/// type must be a text type, for example text/xml.
@@ -463,7 +463,7 @@
///
void HeaderToStringUtf8(string& str);
- ///////////////////////////////////////////////////////////////////////////
+ ///////////////////////////////////////////////////////////////////////////
/// \brief
/// Returns the contents of the current record/feature in the reader as a UTF-8 string. The mime
/// type must be a text type, for example text/xml.
Modified: trunk/MgDev/Server/src/Services/Feature/ServerSqlDataReader.h
===================================================================
--- trunk/MgDev/Server/src/Services/Feature/ServerSqlDataReader.h 2013-01-12 03:54:41 UTC (rev 7298)
+++ trunk/MgDev/Server/src/Services/Feature/ServerSqlDataReader.h 2013-01-12 04:16:28 UTC (rev 7299)
@@ -418,7 +418,7 @@
///
/// \param str
/// Destination string.
- ///
+ ///
string GetResponseElementName();
///////////////////////////////////////////////////////////////////////////
@@ -428,7 +428,7 @@
///
/// \param str
/// Destination string.
- ///
+ ///
string GetBodyElementName();
///////////////////////////////////////////////////////////////////////////
More information about the mapguide-commits
mailing list