New feature CDL netlist export

-introduced new parameter for cdl-type netlist export to Component::spice_netlist
 derivatives under spicecomponents/

Signed-off-by: ThomasZecha <zecha@ihp-microelectronics.com>

qucs/spicecomponents/BJT_SPICE.cpp

@@ -186,7 +186,7 @@ QString BJT_SPICE::netlist()
     return QString();
 }
 
-QString BJT_SPICE::spice_netlist(bool)
+QString BJT_SPICE::spice_netlist(bool, bool)
 {
     QString ltr =getProperty("Letter")->Value;
     QString s = spicecompat::check_refdes(Name,ltr);

qucs/spicecomponents/BJT_SPICE.h

@@ -36,7 +36,7 @@ public:
 protected:
   void createSymbol();
   QString netlist();
-  QString spice_netlist(bool isXyce = false);
+  QString spice_netlist(bool isXyce = false, bool isCdl = false);
 };
 
 #endif // NPN_SPICE_H

qucs/spicecomponents/C_SPICE.cpp

@@ -109,7 +109,7 @@ QString C_SPICE::netlist()
     return QString();
 }
 
-QString C_SPICE::spice_netlist(bool)
+QString C_SPICE::spice_netlist(bool, bool)
 {
     QString ltr = getProperty("Letter")->Value;
     QString s = spicecompat::check_refdes(Name,ltr);

qucs/spicecomponents/C_SPICE.h

@@ -33,7 +33,7 @@ public:
 protected:
   void createSymbol();
   QString netlist();
-  QString spice_netlist(bool isXyce = false);
+  QString spice_netlist(bool isXyce = false, bool isCdl = false);
 };
 
 #endif // C_SPICE_H

qucs/spicecomponents/DIODE_SPICE.cpp

@@ -114,7 +114,7 @@ QString DIODE_SPICE::netlist()
     return QString();
 }
 
-QString DIODE_SPICE::spice_netlist(bool)
+QString DIODE_SPICE::spice_netlist(bool, bool)
 {
     QString ltr = getProperty("Letter")->Value;
     QString s = spicecompat::check_refdes(Name,ltr);

qucs/spicecomponents/DIODE_SPICE.h

@@ -33,7 +33,7 @@ public:
 protected:
   void createSymbol();
   QString netlist();
-  QString spice_netlist(bool isXyce = false);
+  QString spice_netlist(bool isXyce = false, bool isCdl = false);
 };
 
 #endif // DIODE_SPICE_H

qucs/spicecomponents/Icouple.cpp

@@ -100,7 +100,7 @@ QString Icouple::netlist()
     return QString();
 }
 
-QString Icouple::spice_netlist(bool)
+QString Icouple::spice_netlist(bool, bool)
 {
   
     QString s = spicecompat::check_refdes(Name,SpiceModel);

qucs/spicecomponents/Icouple.h

@@ -31,7 +31,7 @@ public:
   static Element* info(QString&, char* &, bool getNewOne=false);
 protected:
   QString netlist();
-  QString spice_netlist(bool isXyce = false);
+  QString spice_netlist(bool isXyce = false, bool isCdl = false);
 };
 
 #endif // Icouple

qucs/spicecomponents/K_SPICE.cpp

@@ -75,7 +75,7 @@ QString K_SPICE::netlist()
     return QString();
 }
 
-QString K_SPICE::spice_netlist(bool)
+QString K_SPICE::spice_netlist(bool, bool)
 {
 	QString s = spicecompat::check_refdes(Name,SpiceModel);
     for (Port *p1 : Ports) {

qucs/spicecomponents/K_SPICE.h

@@ -31,7 +31,7 @@ public:
   static Element* info(QString&, char* &, bool getNewOne=false);
 protected:
   QString netlist();
-  QString spice_netlist(bool isXyce = false);
+  QString spice_netlist(bool isXyce = false, bool isCdl = false);
 };
 
 #endif // K_SPICE_H

qucs/spicecomponents/LTL_SPICE.cpp

@@ -88,7 +88,7 @@ QString LTL_SPICE::netlist()
     return QString();
 }
 
-QString LTL_SPICE::spice_netlist(bool)
+QString LTL_SPICE::spice_netlist(bool, bool)
 {
     QString s = spicecompat::check_refdes(Name,SpiceModel);
     for (Port *p1 : Ports) {

qucs/spicecomponents/LTL_SPICE.h

@@ -29,7 +29,7 @@ public:
   static Element* info(QString&, char* &, bool getNewOne=false);
 protected:
   QString netlist();
-  QString spice_netlist(bool isXyce = false);
+  QString spice_netlist(bool isXyce = false, bool isCdl = false);
 };
 
 #endif // LTL_SPICE_H

qucs/spicecomponents/LTRA_SPICE.cpp

@@ -94,7 +94,7 @@ QString LTRA_SPICE::netlist()
     return QString();
 }
 
-QString LTRA_SPICE::spice_netlist(bool)
+QString LTRA_SPICE::spice_netlist(bool, bool)
 {
     QString s = spicecompat::check_refdes(Name,SpiceModel);
     for (Port *p1 : Ports) {

qucs/spicecomponents/LTRA_SPICE.h

@@ -29,7 +29,7 @@ public:
   static Element* info(QString&, char* &, bool getNewOne=false);
 protected:
   QString netlist();
-  QString spice_netlist(bool isXyce = false);
+  QString spice_netlist(bool isXyce = false, bool isCdl = false);
 };
 
 #endif // LTRA_SPICE_H

qucs/spicecomponents/L_SPICE.cpp

@@ -83,7 +83,7 @@ QString L_SPICE::netlist()
     return QString();
 }
 
-QString L_SPICE::spice_netlist(bool)
+QString L_SPICE::spice_netlist(bool, bool)
 {
     QString s = spicecompat::check_refdes(Name,SpiceModel);
     for (Port *p1 : Ports) {

qucs/spicecomponents/L_SPICE.h

@@ -31,7 +31,7 @@ public:
   static Element* info(QString&, char* &, bool getNewOne=false);
 protected:
   QString netlist();
-  QString spice_netlist(bool isXyce = false);
+  QString spice_netlist(bool isXyce = false, bool isCdl = false);
 };
 
 #endif // L_SPICE_H

qucs/spicecomponents/MESFET_SPICE.cpp

@@ -86,7 +86,7 @@ QString MESFET_SPICE::netlist()
     return QString();
 }
 
-QString MESFET_SPICE::spice_netlist(bool)
+QString MESFET_SPICE::spice_netlist(bool, bool)
 {
     QString s = spicecompat::check_refdes(Name,SpiceModel);
     for (Port *p1 : Ports) {

qucs/spicecomponents/MESFET_SPICE.h

@@ -31,7 +31,7 @@ public:
   static Element* info(QString&, char* &, bool getNewOne=false);
 protected:
   QString netlist();
-  QString spice_netlist(bool isXyce = false);
+  QString spice_netlist(bool isXyce = false, bool isCdl = false);
 };
 
 #endif // MESFET_SPICE_H

qucs/spicecomponents/MOS_SPICE.cpp

@@ -225,7 +225,7 @@ void MOS_SPICE::createSymbol()
     x2 =   4; y2 =  30;
 }
 
-QString MOS_SPICE::spice_netlist(bool)
+QString MOS_SPICE::spice_netlist(bool, bool)
 {
     QString s = spicecompat::check_refdes(Name,Props.at(0)->Value);
     for (Port *p1 : Ports) {

qucs/spicecomponents/MOS_SPICE.h

@@ -38,7 +38,7 @@ public:
 protected:
   void createSymbol();
   QString netlist();
-  QString spice_netlist(bool isXyce = false);
+  QString spice_netlist(bool isXyce = false, bool isCdl = false);
 };
 
 #endif // MOS_SPICE_H

qucs/spicecomponents/NJF_SPICE.cpp

@@ -93,7 +93,7 @@ QString NJF_SPICE::netlist()
     return QString();
 }
 
-QString NJF_SPICE::spice_netlist(bool)
+QString NJF_SPICE::spice_netlist(bool, bool)
 {
     QString s = spicecompat::check_refdes(Name,SpiceModel);
     for (Port *p1 : Ports) {

qucs/spicecomponents/NJF_SPICE.h

@@ -31,7 +31,7 @@ public:
   static Element* info(QString&, char* &, bool getNewOne=false);
 protected:
   QString netlist();
-  QString spice_netlist(bool isXyce = false);
+  QString spice_netlist(bool isXyce = false, bool isCdl = false);
 };
 
 #endif // NJF_SPICE_H

qucs/spicecomponents/NMOS_SPICE.cpp

@@ -102,7 +102,7 @@ QString NMOS_SPICE::netlist()
     return QString();
 }
 
-QString NMOS_SPICE::spice_netlist(bool)
+QString NMOS_SPICE::spice_netlist(bool, bool)
 {
     QString s = spicecompat::check_refdes(Name,SpiceModel);
     for (Port *p1 : Ports) {

qucs/spicecomponents/NMOS_SPICE.h

@@ -31,7 +31,7 @@ public:
   static Element* info(QString&, char* &, bool getNewOne=false);
 protected:
   QString netlist();
-  QString spice_netlist(bool isXyce = false);
+  QString spice_netlist(bool isXyce = false, bool isCdl = false);
 };
 
 #endif // NMOS_SPICE_H

qucs/spicecomponents/NPN_SPICE.cpp

@@ -94,7 +94,7 @@ QString NPN_SPICE::netlist()
     return QString();
 }
 
-QString NPN_SPICE::spice_netlist(bool)
+QString NPN_SPICE::spice_netlist(bool, bool)
 {
     QString s = spicecompat::check_refdes(Name,SpiceModel);
     for (Port *p1 : Ports) {

qucs/spicecomponents/NPN_SPICE.h

@@ -31,7 +31,7 @@ public:
   static Element* info(QString&, char* &, bool getNewOne=false);
 protected:
   QString netlist();
-  QString spice_netlist(bool isXyce = false);
+  QString spice_netlist(bool isXyce = false, bool isCdl = false);
 };
 
 #endif // NPN_SPICE_H

qucs/spicecomponents/PJF_SPICE.cpp

@@ -93,7 +93,7 @@ QString PJF_SPICE::netlist()
     return QString();
 }
 
-QString PJF_SPICE::spice_netlist(bool)
+QString PJF_SPICE::spice_netlist(bool, bool)
 {
     QString s = spicecompat::check_refdes(Name,SpiceModel);
     for (Port *p1 : Ports) {

qucs/spicecomponents/PJF_SPICE.h

@@ -31,7 +31,7 @@ public:
   static Element* info(QString&, char* &, bool getNewOne=false);
 protected:
   QString netlist();
-  QString spice_netlist(bool isXyce = false);
+  QString spice_netlist(bool isXyce = false, bool isCdl = false);
 };
 
 #endif // PJF_SPICE_H

qucs/spicecomponents/PMF_MESFET_SPICE.cpp

@@ -86,7 +86,7 @@ QString PMF_MESFET_SPICE::netlist()
     return QString();
 }
 
-QString PMF_MESFET_SPICE::spice_netlist(bool)
+QString PMF_MESFET_SPICE::spice_netlist(bool, bool)
 {
     QString s = spicecompat::check_refdes(Name,SpiceModel);
     for (Port *p1 : Ports) {

qucs/spicecomponents/PMF_MESFET_SPICE.h

@@ -31,7 +31,7 @@ public:
   static Element* info(QString&, char* &, bool getNewOne=false);
 protected:
   QString netlist();
-  QString spice_netlist(bool isXyce = false);
+  QString spice_netlist(bool isXyce = false, bool isCdl = false);
 };
 
 #endif // PMF_MESFET_SPICE_H

qucs/spicecomponents/PMOS_SPICE.cpp

@@ -102,7 +102,7 @@ QString PMOS_SPICE::netlist()
     return QString();
 }
 
-QString PMOS_SPICE::spice_netlist(bool)
+QString PMOS_SPICE::spice_netlist(bool, bool)
 {
     QString s = spicecompat::check_refdes(Name,SpiceModel);
     for (Port *p1 : Ports) {

qucs/spicecomponents/PMOS_SPICE.h

@@ -31,7 +31,7 @@ public:
   static Element* info(QString&, char* &, bool getNewOne=false);
 protected:
   QString netlist();
-  QString spice_netlist(bool isXyce = false);
+  QString spice_netlist(bool isXyce = false, bool isCdl = false);
 };
 
 #endif // PMOS_SPICE_H

qucs/spicecomponents/PNP_SPICE.cpp

@@ -95,7 +95,7 @@ QString PNP_SPICE::netlist()
     return QString();
 }
 
-QString PNP_SPICE::spice_netlist(bool)
+QString PNP_SPICE::spice_netlist(bool, bool)
 {
     QString s = spicecompat::check_refdes(Name,SpiceModel);
     for (Port *p1 : Ports) {

qucs/spicecomponents/PNP_SPICE.h

@@ -31,7 +31,7 @@ public:
   static Element* info(QString&, char* &, bool getNewOne=false);
 protected:
   QString netlist();
-  QString spice_netlist(bool isXyce = false);
+  QString spice_netlist(bool isXyce = false, bool isCdl = false);
 };
 
 #endif // PNP_SPICE_H

qucs/spicecomponents/R_SPICE.cpp

@@ -113,7 +113,7 @@ QString R_SPICE::netlist()
     return QString();
 }
 
-QString R_SPICE::spice_netlist(bool)
+QString R_SPICE::spice_netlist(bool, bool)
 {
     QString ltr = getProperty("Letter")->Value;
     QString s = spicecompat::check_refdes(Name,ltr);

qucs/spicecomponents/R_SPICE.h

@@ -33,7 +33,7 @@ public:
 protected:
   void createSymbol();
   QString netlist();
-  QString spice_netlist(bool isXyce = false);
+  QString spice_netlist(bool isXyce = false, bool isCdl = false);
 };
 
 #endif // R_SPICE_H

qucs/spicecomponents/S4Q_I.cpp

@@ -77,7 +77,7 @@ Element* S4Q_I::info(QString& Name, char* &BitmapFile, bool getNewOne)
   return 0;
 }
 
-QString S4Q_I::spice_netlist(bool)
+QString S4Q_I::spice_netlist(bool, bool)
 {
     QString s = spicecompat::check_refdes(Name,SpiceModel);
     for (Port *p1 : Ports) {

qucs/spicecomponents/S4Q_I.h

@@ -32,7 +32,7 @@ public:
   Component* newOne();
   static Element* info(QString&, char* &, bool getNewOne=false);
 protected:
-  QString spice_netlist(bool isXyce = false);
+  QString spice_netlist(bool isXyce = false, bool isCdl = false);
 };
 
 #endif

qucs/spicecomponents/S4Q_Ieqndef.cpp

@@ -86,7 +86,7 @@ QString S4Q_Ieqndef::netlist()
     return QString();
 }
 
-QString S4Q_Ieqndef::spice_netlist(bool)
+QString S4Q_Ieqndef::spice_netlist(bool, bool)
 {
     QString s = spicecompat::check_refdes(Name,SpiceModel);
     for (Port *p1 : Ports) {

qucs/spicecomponents/S4Q_Ieqndef.h

@@ -11,7 +11,7 @@ public:
   static Element* info(QString&, char* &, bool getNewOne=false);
 protected:
   QString netlist();
-  QString spice_netlist(bool isXyce = false);
+  QString spice_netlist(bool isXyce = false, bool isCdl = false);
   QString va_code();
 };
 

qucs/spicecomponents/S4Q_S.cpp

@@ -93,7 +93,7 @@ Element* S4Q_S::info(QString& Name, char* &BitmapFile, bool getNewOne)
  //   return QString();
 //}
 
-QString S4Q_S::spice_netlist(bool)
+QString S4Q_S::spice_netlist(bool, bool)
 {
     QString s = spicecompat::check_refdes(Name,SpiceModel);
     for (Port *p1 : Ports) {

qucs/spicecomponents/S4Q_S.h

@@ -32,7 +32,7 @@ public:
   Component* newOne();
   static Element* info(QString&, char* &, bool getNewOne=false);
 protected:
-  QString spice_netlist(bool isXyce = false);
+  QString spice_netlist(bool isXyce = false, bool isCdl = false);
 };
 
 #endif

qucs/spicecomponents/S4Q_V.cpp

@@ -77,7 +77,7 @@ Element* S4Q_V::info(QString& Name, char* &BitmapFile, bool getNewOne)
   return 0;
 }
 
-QString S4Q_V::spice_netlist(bool)
+QString S4Q_V::spice_netlist(bool, bool)
 {
     QString s = spicecompat::check_refdes(Name,SpiceModel);
     for (Port *p1 : Ports) {

qucs/spicecomponents/S4Q_V.h

@@ -32,7 +32,7 @@ public:
   Component* newOne();
   static Element* info(QString&, char* &, bool getNewOne=false);
 protected:
-  QString spice_netlist(bool isXyce = false);
+  QString spice_netlist(bool isXyce = false, bool isCdl = false);
 };
 
 #endif

qucs/spicecomponents/S4Q_W.cpp

@@ -81,7 +81,7 @@ Element* S4Q_W::info(QString& Name, char* &BitmapFile, bool getNewOne)
   return 0;
 }
 
-QString S4Q_W::spice_netlist(bool)
+QString S4Q_W::spice_netlist(bool, bool)
 {
     QString s = spicecompat::check_refdes(Name,SpiceModel);
     for (Port *p1 : Ports) {

qucs/spicecomponents/S4Q_W.h

@@ -32,7 +32,7 @@ public:
   Component* newOne();
   static Element* info(QString&, char* &, bool getNewOne=false);
 protected:
-  QString spice_netlist(bool isXyce = false);
+  QString spice_netlist(bool isXyce = false, bool isCdl = false);
 };
 
 #endif

qucs/spicecomponents/SDTF.cpp

@@ -83,7 +83,7 @@ QString SDTF::netlist()
     return QString();
 }
 
-QString SDTF::spice_netlist(bool)
+QString SDTF::spice_netlist(bool, bool)
 {
   
     QString s = spicecompat::check_refdes(Name,SpiceModel);

qucs/spicecomponents/SDTF.h

@@ -31,7 +31,7 @@ public:
   static Element* info(QString&, char* &, bool getNewOne=false);
 protected:
   QString netlist();
-  QString spice_netlist(bool isXyce = false);
+  QString spice_netlist(bool isXyce = false, bool isCdl = false);
 };
 
 #endif // SDTF_H

qucs/spicecomponents/UDRCTL_SPICE.cpp

@@ -92,7 +92,7 @@ QString UDRCTL_SPICE::netlist()
     return QString();
 }
 
-QString UDRCTL_SPICE::spice_netlist(bool)
+QString UDRCTL_SPICE::spice_netlist(bool, bool)
 {
     QString s = spicecompat::check_refdes(Name,SpiceModel);
     for (Port *p1 : Ports) {

qucs/spicecomponents/UDRCTL_SPICE.h

@@ -22,7 +22,7 @@ class UDRCTL_SPICE : public Component {
   protected:
 //    void createSymbol();
     QString netlist();
-    QString spice_netlist(bool isXyce = false);
+    QString spice_netlist(bool isXyce = false, bool isCdl = false);
 };
 
 #endif /* UDRCTL_SPICE_H */

qucs/spicecomponents/XAPWL.cpp

@@ -83,7 +83,7 @@ QString XAPWL::netlist()
     return QString();
 }
 
-QString XAPWL::spice_netlist(bool)
+QString XAPWL::spice_netlist(bool, bool)
 {
   
     QString s = spicecompat::check_refdes(Name,SpiceModel);

qucs/spicecomponents/XAPWL.h

@@ -31,7 +31,7 @@ public:
   static Element* info(QString&, char* &, bool getNewOne=false);
 protected:
   QString netlist();
-  QString spice_netlist(bool isXyce = false);
+  QString spice_netlist(bool isXyce = false, bool isCdl = false);
 };
 
 #endif // XAPWL_H

qucs/spicecomponents/core.cpp

@@ -90,7 +90,7 @@ QString core::netlist()
     return QString();
 }
 
-QString core::spice_netlist(bool)
+QString core::spice_netlist(bool, bool)
 {
   
     QString s = spicecompat::check_refdes(Name,SpiceModel);

qucs/spicecomponents/core.h

@@ -31,7 +31,7 @@ public:
   static Element* info(QString&, char* &, bool getNewOne=false);
 protected:
   QString netlist();
-  QString spice_netlist(bool isXyce = false);
+  QString spice_netlist(bool isXyce = false, bool isCdl = false);
 };
 
 #endif // core_H

qucs/spicecomponents/eNL.cpp

@@ -82,7 +82,7 @@ QString eNL::netlist()
     return QString();
 }
 
-QString eNL::spice_netlist(bool)
+QString eNL::spice_netlist(bool, bool)
 {
     QString s = spicecompat::check_refdes(Name,SpiceModel);
     for (Port *p1 : Ports) {

qucs/spicecomponents/eNL.h

@@ -28,7 +28,7 @@ public:
   static Element* info(QString&, char* &, bool getNewOne=false);
 protected:
   QString netlist();
-  QString spice_netlist(bool isXyce = false);
+  QString spice_netlist(bool isXyce = false, bool isCdl = false);
 };
 
 #endif // ENL_H

qucs/spicecomponents/gNL.cpp

@@ -81,7 +81,7 @@ QString gNL::netlist()
     return QString();
 }
 
-QString gNL::spice_netlist(bool)
+QString gNL::spice_netlist(bool, bool)
 {
     QString s = spicecompat::check_refdes(Name,SpiceModel);
     for (Port *p1 : Ports) {

qucs/spicecomponents/gNL.h

@@ -28,7 +28,7 @@ public:
   static Element* info(QString&, char* &, bool getNewOne=false);
 protected:
   QString netlist();
-  QString spice_netlist(bool isXyce = false);
+  QString spice_netlist(bool isXyce = false, bool isCdl = false);
 };
 
 #endif // GNL_H

qucs/spicecomponents/iAmpMod.cpp

@@ -89,7 +89,7 @@ QString iAmpMod::netlist()
     return QString();
 }
 
-QString iAmpMod::spice_netlist(bool)
+QString iAmpMod::spice_netlist(bool, bool)
 {
     QString s = spicecompat::check_refdes(Name,SpiceModel);
     for (Port *p1 : Ports) {

qucs/spicecomponents/iAmpMod.h

@@ -31,7 +31,7 @@ public:
   static Element* info(QString&, char* &, bool getNewOne=false);
 protected:
   QString netlist();
-  QString spice_netlist(bool isXyce = false);
+  QString spice_netlist(bool isXyce = false, bool isCdl = false);
 };
 
 #endif // IAMPMOD_H

qucs/spicecomponents/iPWL.cpp

@@ -90,7 +90,7 @@ QString iPWL::netlist()
     return QString();
 }
 
-QString iPWL::spice_netlist(bool)
+QString iPWL::spice_netlist(bool, bool)
 {
   QString s = spicecompat::check_refdes(Name,SpiceModel);
 

qucs/spicecomponents/iPWL.h

@@ -31,7 +31,7 @@ public:
   static Element* info(QString&, char* &, bool getNewOne=false);
 protected:
   QString netlist();
-  QString spice_netlist(bool isXyce = false);
+  QString spice_netlist(bool isXyce = false, bool isCdl = false);
 };
 
 #endif // IPWL_H

qucs/spicecomponents/iTRNOISE.cpp

@@ -98,7 +98,7 @@ QString iTRNOISE::netlist()
     return QString();
 }
 
-QString iTRNOISE::spice_netlist(bool)
+QString iTRNOISE::spice_netlist(bool, bool)
 {
     QString s = spicecompat::check_refdes(Name,SpiceModel);
     for (Port *p1 : Ports) {

qucs/spicecomponents/iTRNOISE.h

@@ -31,7 +31,7 @@ public:
   static Element* info(QString&, char* &, bool getNewOne=false);
 protected:
   QString netlist();
-  QString spice_netlist(bool isXyce = false);
+  QString spice_netlist(bool isXyce = false, bool isCdl = false);
 };
 
 #endif // ITRNOISE_H

qucs/spicecomponents/isffm.cpp

@@ -89,7 +89,7 @@ QString iSffm::netlist()
     return QString();
 }
 
-QString iSffm::spice_netlist(bool)
+QString iSffm::spice_netlist(bool, bool)
 {
     QString s = spicecompat::check_refdes(Name,SpiceModel);
     for (Port *p1 : Ports) {

qucs/spicecomponents/isffm.h

@@ -25,7 +25,7 @@ public:
   static Element* info(QString&, char* &, bool getNewOne=false);
 protected:
   QString netlist();
-  QString spice_netlist(bool isXyce = false);
+  QString spice_netlist(bool isXyce = false, bool isCdl = false);
 };
 
 #endif // ISFFM_H

qucs/spicecomponents/sp_customsim.cpp

@@ -66,7 +66,7 @@ Element* SpiceCustomSim::info(QString& Name, char* &BitmapFile, bool getNewOne)
   return 0;
 }
 
-QString SpiceCustomSim::spice_netlist(bool isXyce)
+QString SpiceCustomSim::spice_netlist(bool isXyce, bool)
 {
     QString s = "";
     if (isXyce) return s;

qucs/spicecomponents/sp_customsim.h

@@ -29,7 +29,7 @@ public:
   static Element* info(QString&, char* &, bool getNewOne=false);
 
 protected:
-  QString spice_netlist(bool isXyce = false);
+  QString spice_netlist(bool isXyce = false, bool isCdl = false);
 };
 
 #endif

qucs/spicecomponents/sp_disto.cpp

@@ -61,7 +61,7 @@ Element* SpiceDisto::info(QString& Name, char* &BitmapFile, bool getNewOne)
   return 0;
 }
 
-QString SpiceDisto::spice_netlist(bool isXyce)
+QString SpiceDisto::spice_netlist(bool isXyce, bool)
 {
     QString s;
     if (!isXyce) {

qucs/spicecomponents/sp_disto.h

@@ -29,7 +29,7 @@ public:
   static Element* info(QString&, char* &, bool getNewOne=false);
 
 protected:
-  QString spice_netlist(bool isXyce = false);
+  QString spice_netlist(bool isXyce = false, bool isCdl = false);
 };
 
 #endif

qucs/spicecomponents/sp_fourier.cpp

@@ -54,7 +54,7 @@ Element* SpiceFourier::info(QString& Name, char* &BitmapFile, bool getNewOne)
   return 0;
 }
 
-QString SpiceFourier::spice_netlist(bool isXyce)
+QString SpiceFourier::spice_netlist(bool isXyce, bool)
 {
     QString s;
     QString f0 = spicecompat::normalize_value(Props.at(2)->Value);

qucs/spicecomponents/sp_fourier.h

@@ -29,7 +29,7 @@ public:
   static Element* info(QString&, char* &, bool getNewOne=false);
 
 protected:
-  QString spice_netlist(bool isXyce = false);
+  QString spice_netlist(bool isXyce = false, bool isCdl = false);
   Qt::GlobalColor color() const override { return Qt::darkRed; }
 };
 

qucs/spicecomponents/sp_noise.cpp

@@ -64,7 +64,7 @@ Element* SpiceNoise::info(QString& Name, char* &BitmapFile, bool getNewOne)
   return 0;
 }
 
-QString SpiceNoise::spice_netlist(bool isXyce)
+QString SpiceNoise::spice_netlist(bool isXyce, bool)
 {
     QString s;
     QString fstart = spicecompat::normalize_value(Props.at(1)->Value); // Start freq.

qucs/spicecomponents/sp_noise.h

@@ -29,7 +29,7 @@ public:
   static Element* info(QString&, char* &, bool getNewOne=false);
 
 protected:
-  QString spice_netlist(bool isXyce = false);
+  QString spice_netlist(bool isXyce = false, bool isCdl = false);
 };
 
 #endif

qucs/spicecomponents/sp_pz.cpp

@@ -58,7 +58,7 @@ Element* SpicePZ::info(QString& Name, char* &BitmapFile, bool getNewOne)
   return 0;
 }
 
-QString SpicePZ::spice_netlist(bool isXyce)
+QString SpicePZ::spice_netlist(bool isXyce, bool)
 {
     QString s;
     QString out = "spice4qucs." + Name.toLower() + ".cir.pz";

qucs/spicecomponents/sp_pz.h

@@ -29,7 +29,7 @@ public:
   static Element* info(QString&, char* &, bool getNewOne=false);
 
 protected:
-  QString spice_netlist(bool isXyce = false);
+  QString spice_netlist(bool isXyce = false, bool isCdl = false);
 };
 
 #endif

qucs/spicecomponents/sp_sens.cpp

@@ -59,7 +59,7 @@ Element* SpiceSENS::info(QString& Name, char* &BitmapFile, bool getNewOne)
   return 0;
 }
 
-QString SpiceSENS::spice_netlist(bool isXyce)
+QString SpiceSENS::spice_netlist(bool isXyce, bool)
 {
     QString s;
     s.clear();

qucs/spicecomponents/sp_sens.h

@@ -29,7 +29,7 @@ public:
   static Element* info(QString&, char* &, bool getNewOne=false);
 
 protected:
-  QString spice_netlist(bool isXyce = false);
+  QString spice_netlist(bool isXyce = false, bool isCdl = false);
 };
 
 #endif

qucs/spicecomponents/sp_sens_ac.cpp

@@ -59,7 +59,7 @@ Element* SpiceSENS_AC::info(QString& Name, char* &BitmapFile, bool getNewOne)
   return 0;
 }
 
-QString SpiceSENS_AC::spice_netlist(bool isXyce)
+QString SpiceSENS_AC::spice_netlist(bool isXyce, bool)
 {
     QString s;
     s.clear();

qucs/spicecomponents/sp_sens_ac.h

@@ -29,7 +29,7 @@ public:
   static Element* info(QString&, char* &, bool getNewOne=false);
 
 protected:
-  QString spice_netlist(bool isXyce = false);
+  QString spice_netlist(bool isXyce = false, bool isCdl = false);
 };
 
 #endif

qucs/spicecomponents/sp_sens_tr_xyce.cpp

@@ -62,7 +62,7 @@ Element* SpiceSENS_TR_Xyce::info(QString& Name, char* &BitmapFile, bool getNewOn
   return 0;
 }
 
-QString SpiceSENS_TR_Xyce::spice_netlist(bool isXyce)
+QString SpiceSENS_TR_Xyce::spice_netlist(bool isXyce, bool)
 {
     QString s;
     s.clear();

qucs/spicecomponents/sp_sens_tr_xyce.h

@@ -29,7 +29,7 @@ public:
   static Element* info(QString&, char* &, bool getNewOne=false);
 
 protected:
-  QString spice_netlist(bool isXyce = false);
+  QString spice_netlist(bool isXyce = false, bool isCdl = false);
   Qt::GlobalColor color() const override { return Qt::darkGreen; }
 };
 

qucs/spicecomponents/sp_sens_xyce.cpp

@@ -60,7 +60,7 @@ Element* SpiceSENS_Xyce::info(QString& Name, char* &BitmapFile, bool getNewOne)
   return 0;
 }
 
-QString SpiceSENS_Xyce::spice_netlist(bool isXyce)
+QString SpiceSENS_Xyce::spice_netlist(bool isXyce, bool)
 {
     QString s;
     s.clear();

qucs/spicecomponents/sp_sens_xyce.h

@@ -29,7 +29,7 @@ public:
   static Element* info(QString&, char* &, bool getNewOne=false);
 
 protected:
-  QString spice_netlist(bool isXyce = false);
+  QString spice_netlist(bool isXyce = false, bool isCdl = false);
   Qt::GlobalColor color() const override { return Qt::darkGreen; }
 };
 

qucs/spicecomponents/sp_spectrum.cpp

@@ -57,7 +57,7 @@ Element* SpiceFFT::info(QString& Name, char* &BitmapFile, bool getNewOne)
   return 0;
 }
 
-QString SpiceFFT::spice_netlist(bool isXyce)
+QString SpiceFFT::spice_netlist(bool isXyce, bool)
 {
     Q_UNUSED(isXyce);
 

qucs/spicecomponents/sp_spectrum.h

@@ -29,7 +29,7 @@ public:
   static Element* info(QString&, char* &, bool getNewOne=false);
 
 protected:
-  QString spice_netlist(bool isXyce = false);
+  QString spice_netlist(bool isXyce = false, bool isCdl = false);
 };
 
 #endif

qucs/spicecomponents/spicegeneric.cpp

@@ -134,7 +134,7 @@ QString SpiceGeneric::netlist()
     return QString();
 }
 
-QString SpiceGeneric::spice_netlist(bool)
+QString SpiceGeneric::spice_netlist(bool, bool)
 {
     // form RefDes from unique device letter and device name
     QString s = Props.at(1)->Value + Name;

qucs/spicecomponents/spicegeneric.h

@@ -37,7 +37,7 @@ private:
 protected:
   QString netlist();
   void createSymbol();
-  QString spice_netlist(bool isXyce);
+  QString spice_netlist(bool isXyce, bool isCdl = false);
 
 };
 

qucs/spicecomponents/spicelibcomp.cpp

@@ -218,7 +218,7 @@ int SpiceLibComp::loadSymbol(const QString& DocName)
   return -8;   // field not closed
 }
 
-QString SpiceLibComp::spice_netlist(bool)
+QString SpiceLibComp::spice_netlist(bool, bool)
 {
   QString s = QStringLiteral("X%1 ").arg(Name);
   QString pins = getProperty("PinAssign")->Value;

qucs/spicecomponents/spicelibcomp.h

@@ -30,7 +30,7 @@ public:
   QString getSpiceLibrary();
 
 protected:
-  QString spice_netlist(bool isXyce);
+  QString spice_netlist(bool isXyce, bool isCdl = false);
   void createSymbol();
   void remakeSymbol(int No, QStringList &pin_names);
   int  loadSymbol(const QString&);

qucs/spicecomponents/src_eqndef.cpp

@@ -67,7 +67,7 @@ QString Src_eqndef::netlist()
     return QString();
 }
 
-QString Src_eqndef::spice_netlist(bool)
+QString Src_eqndef::spice_netlist(bool, bool)
 {
     QString s = spicecompat::check_refdes(Name,SpiceModel);
     for (Port *p1 : Ports) {

qucs/spicecomponents/src_eqndef.h

@@ -11,7 +11,7 @@ public:
   static Element* info(QString&, char* &, bool getNewOne=false);
 protected:
   QString netlist();
-  QString spice_netlist(bool isXyce = false);
+  QString spice_netlist(bool isXyce = false, bool isCdl = false);
   QString va_code();
 };
 

qucs/spicecomponents/vAmpMod.cpp

@@ -91,7 +91,7 @@ QString vAmpMod::netlist()
     return QString();
 }
 
-QString vAmpMod::spice_netlist(bool)
+QString vAmpMod::spice_netlist(bool, bool)
 {
     QString s = spicecompat::check_refdes(Name,SpiceModel);
     for (Port *p1 : Ports) {

qucs/spicecomponents/vAmpMod.h

@@ -31,7 +31,7 @@ public:
   static Element* info(QString&, char* &, bool getNewOne=false);
 protected:
   QString netlist();
-  QString spice_netlist(bool isXyce = false);
+  QString spice_netlist(bool isXyce = false, bool isCdl = false);
 };
 
 #endif // VAMPMOD_H

qucs/spicecomponents/vPWL.cpp

@@ -89,7 +89,7 @@ QString vPWL::netlist()
     return QString();
 }
 
-QString vPWL::spice_netlist(bool)
+QString vPWL::spice_netlist(bool, bool)
 {
     QString s = spicecompat::check_refdes(Name,SpiceModel);
     for (Port *p1 : Ports) {

qucs/spicecomponents/vPWL.h

@@ -31,7 +31,7 @@ public:
   static Element* info(QString&, char* &, bool getNewOne=false);
 protected:
   QString netlist();
-  QString spice_netlist(bool isXyce = false);
+  QString spice_netlist(bool isXyce = false, bool isCdl = false);
 };
 
 #endif // VPWL_H

qucs/spicecomponents/vTRNOISE.cpp

@@ -94,7 +94,7 @@ QString vTRNOISE::netlist()
     return QString();
 }
 
-QString vTRNOISE::spice_netlist(bool)
+QString vTRNOISE::spice_netlist(bool, bool)
 {
     QString s = spicecompat::check_refdes(Name,SpiceModel);
     for (Port *p1 : Ports) {

qucs/spicecomponents/vTRNOISE.h

@@ -31,7 +31,7 @@ public:
   static Element* info(QString&, char* &, bool getNewOne=false);
 protected:
   QString netlist();
-  QString spice_netlist(bool isXyce = false);
+  QString spice_netlist(bool isXyce = false, bool isCdl = false);
 };
 
 #endif // VTRNOISE_H

qucs/spicecomponents/vTRRANDOM.cpp

@@ -96,7 +96,7 @@ QString vTRRANDOM::netlist()
     return QString();
 }
 
-QString vTRRANDOM::spice_netlist(bool)
+QString vTRRANDOM::spice_netlist(bool, bool)
 {
     QString s = spicecompat::check_refdes(Name,SpiceModel);
     for (Port *p1 : Ports) {

qucs/spicecomponents/vTRRANDOM.h

@@ -31,7 +31,7 @@ public:
   static Element* info(QString&, char* &, bool getNewOne=false);
 protected:
   QString netlist();
-  QString spice_netlist(bool isXyce = false);
+  QString spice_netlist(bool isXyce = false, bool isCdl = false);
 };
 
 #endif // VTRRANDOM_H