HPCC-9085 Improve method names and remove unneeded IMPLEMENT_IINTERFACE

Signed-off-by: Anthony Fishbeck <Anthony.Fishbeck@lexisnexis.com>

common/thorhelper/thorxmlwrite.cpp

@@ -364,7 +364,7 @@ const char *CommonJsonWriter::checkItemName(const char *name)
     return checkItemName(item, name);
 }
 
-const char *CommonJsonWriter::checkItemNameInc(const char *name)
+const char *CommonJsonWriter::checkItemNameBeginNested(const char *name)
 {
     CJsonWriterItem *item = (arrays.length()) ? &arrays.tos() : NULL;
     name = checkItemName(item, name);
@@ -373,7 +373,7 @@ const char *CommonJsonWriter::checkItemNameInc(const char *name)
     return name;
 }
 
-const char *CommonJsonWriter::checkItemNameDec(const char *name)
+const char *CommonJsonWriter::checkItemNameEndNested(const char *name)
 {
     CJsonWriterItem *item = (arrays.length()) ? &arrays.tos() : NULL;
     if (item)
@@ -503,7 +503,7 @@ void CommonJsonWriter::outputBeginNested(const char *fieldname, bool nestChildre
 {
     flush(false);
     checkFormat(true, false, 1);
-    fieldname = checkItemNameInc(fieldname);
+    fieldname = checkItemNameBeginNested(fieldname);
     if (fieldname)
     {
         const char * sep = (fieldname) ? strchr(fieldname, '/') : NULL;
@@ -525,7 +525,7 @@ void CommonJsonWriter::outputEndNested(const char *fieldname)
 {
     flush(false);
     checkFormat(false, true, -1);
-    fieldname = checkItemNameDec(fieldname);
+    fieldname = checkItemNameEndNested(fieldname);
     if (fieldname)
     {
         const char * sep = (fieldname) ? strchr(fieldname, '/') : NULL;

common/thorhelper/thorxmlwrite.hpp

@@ -126,7 +126,6 @@ protected:
     {
     public:
         CJsonWriterItem(const char *_name) : name(_name), depth(0){}
-        IMPLEMENT_IINTERFACE;
 
         StringAttr name;
         unsigned depth;
@@ -134,8 +133,8 @@ protected:
 
     const char *checkItemName(CJsonWriterItem *item, const char *name);
     const char *checkItemName(const char *name);
-    const char *checkItemNameInc(const char *name);
-    const char *checkItemNameDec(const char *name);
+    const char *checkItemNameBeginNested(const char *name);
+    const char *checkItemNameEndNested(const char *name);
 
     IXmlStreamFlusher *flusher;
     CIArrayOf<CJsonWriterItem> arrays;