From afe00c12f43dfa5a3b399ed59635c92db2eed83e Mon Sep 17 00:00:00 2001
From: Fred Gleason <fredg@paravelsystems.com>
Date: Wed, 3 Apr 2024 12:47:54 -0400
Subject: [PATCH] 2024-04-02 Fred Gleason <fredg@paravelsystems.com> 	*
 Removed JSON generation methods.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
---
 ChangeLog     |   2 +
 lib/rdweb.cpp | 159 +-------------------------------------------------
 lib/rdweb.h   |  16 +----
 3 files changed, 4 insertions(+), 173 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index dd049e80..7ade6350 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24690,3 +24690,5 @@
 	* Refactored the PAD subsystem to use native Qt JSON methods.
 2024-04-02 Fred Gleason <fredg@paravelsystems.com>
 	* Modified the Sound Panel classes to use native Qt JSON methods.
+2024-04-02 Fred Gleason <fredg@paravelsystems.com>
+	* Removed JSON generation methods.
diff --git a/lib/rdweb.cpp b/lib/rdweb.cpp
index a210eff5..18ffccfd 100644
--- a/lib/rdweb.cpp
+++ b/lib/rdweb.cpp
@@ -3,7 +3,7 @@
 // Functions for interfacing with web components using the
 // Common Gateway Interface (CGI) Standard 
 //
-//   (C) Copyright 1996-2021 Fred Gleason <fredg@paravelsystems.com>
+//   (C) Copyright 1996-2024 Fred Gleason <fredg@paravelsystems.com>
 //
 //   This program is free software; you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License version 2 as
@@ -195,163 +195,6 @@ QString RDXmlUnescape(const QString &str)
 }
 
 
-QString RDJsonPadding(int padding)
-{
-  QString ret="";
-
-  for(int i=0;i<padding;i++) {
-    ret+=" ";
-  }
-  return ret;
-}
-
-
-QString RDJsonEscape(const QString &str)
-{
-  QString ret;
-
-  for(int i=0;i<str.length();i++) {
-    QChar c=str.at(i);
-    switch(c.category()) {
-    case QChar::Other_Control:
-      ret+=QString::asprintf("\\u%04X",c.unicode());
-      break;
-
-    default:
-      switch(c.unicode()) {
-      case 0x22:   // Quote
-	ret+="\\\"";
-	break;
-
-      case 0x5C:   // Backslash
-	ret+="\\\\";
-	break;
-
-      default:
-	ret+=c;
-	break;
-      }
-      break;
-    }
-  }
-
-  return ret;
-}
-
-
-QString RDJsonNullField(const QString &name,int padding,bool final)
-{
-  QString comma=",";
-
-  if(final) {
-    comma="";
-  }
-
-  return RDJsonPadding(padding)+"\""+name+"\": null"+comma+"\r\n";
-}
-
-
-QString RDJsonField(const QString &name,bool value,int padding,bool final)
-{
-  QString comma=",";
-
-  if(final) {
-    comma="";
-  }
-
-  if(value) {
-    return RDJsonPadding(padding)+"\""+name+"\": true"+comma+"\r\n";
-  }
-  return RDJsonPadding(padding)+"\""+name+"\": false"+comma+"\r\n";
-}
-
-
-QString RDJsonField(const QString &name,int value,int padding,bool final)
-{
-  QString comma=",";
-
-  if(final) {
-    comma="";
-  }
-
-  return RDJsonPadding(padding)+"\""+name+"\": "+QString::asprintf("%d",value)+
-    comma+"\r\n";
-}
-
-
-QString RDJsonField(const QString &name,unsigned value,int padding,bool final)
-{
-  QString comma=",";
-
-  if(final) {
-    comma="";
-  }
-
-  return RDJsonPadding(padding)+"\""+name+"\": "+QString::asprintf("%u",value)+
-    comma+"\r\n";
-}
-
-
-QString RDJsonField(const QString &name,const QString &value,int padding,
-		    bool final)
-{
-  QString ret;
-  QString comma=",";
-
-  if(final) {
-    comma="";
-  }
-
-  ret=RDJsonEscape(value);
-  /*
-  for(int i=0;i<value.length();i++) {
-    QChar c=value.at(i);
-    switch(c.category()) {
-    case QChar::Other_Control:
-      ret+=QString::asprintf("\\u%04X",c.unicode());
-      break;
-
-    default:
-      switch(c.unicode()) {
-      case 0x22:   // Quote
-	ret+="\\\"";
-	break;
-
-      case 0x5C:   // Backslash
-	ret+="\\\\";
-	break;
-
-      default:
-	ret+=c;
-	break;
-      }
-      break;
-    }
-  }
-  */
-
-  return RDJsonPadding(padding)+"\""+name+"\": \""+ret+"\""+comma+"\r\n";
-}
-
-
-QString RDJsonField(const QString &name,const QDateTime &value,int padding,
-		    bool final)
-{
-  QString comma=",";
-
-  if(final) {
-    comma="";
-  }
-
-  if(!value.isValid()) {
-    return RDJsonNullField(name,padding,final);
-  }
-  return RDJsonPadding(padding)+"\""+name+"\": \""+
-    RDWriteXmlDateTime(value)+"\""+
-    comma+"\r\n";
-}
-
-
 QString RDUrlEscape(const QString &str)
 {
   /*
diff --git a/lib/rdweb.h b/lib/rdweb.h
index e06628ba..116a8ede 100644
--- a/lib/rdweb.h
+++ b/lib/rdweb.h
@@ -3,7 +3,7 @@
 // Functions for interfacing with web components using the
 // Common Gateway Interface (CGI) Standard 
 //
-//   (C) Copyright 1996-2021 Fred Gleason <fredg@paravelsystems.com>
+//   (C) Copyright 1996-2024 Fred Gleason <fredg@paravelsystems.com>
 //
 //   This program is free software; you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License version 2 as
@@ -53,20 +53,6 @@ extern QString RDXmlField(const QString &tag,const QTime &value,
 extern QString RDXmlField(const QString &tag);
 extern QString RDXmlEscape(const QString &str);
 extern QString RDXmlUnescape(const QString &str);
-extern QString RDJsonPadding(int padding);
-extern QString RDJsonEscape(const QString &str);
-extern QString RDJsonNullField(const QString &name,int padding=0,
-			       bool final=false);
-extern QString RDJsonField(const QString &name,bool value,int padding=0,
-			   bool final=false);
-extern QString RDJsonField(const QString &name,int value,int padding=0,
-			   bool final=false);
-extern QString RDJsonField(const QString &name,unsigned value,int padding=0,
-			   bool final=false);
-extern QString RDJsonField(const QString &name,const QString &value,
-			   int padding=0,bool final=false);
-extern QString RDJsonField(const QString &name,const QDateTime &value,
-			   int padding=0,bool final=false);
 extern QString RDUrlEscape(const QString &str);
 extern QString RDUrlUnescape(const QString &str);