Merge pull request #957 from ThomasZecha/current

Fix build issues
ra3xdh · Sep 24, 2024 · 0a0a477 · 0a0a477
2 parents 4a9a5a4 + ca16d22
commit 0a0a477
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 21 deletions.
diff --git a/qucs/components/component.cpp b/qucs/components/component.cpp
@@ -741,7 +741,7 @@ QString Component::netlist() {
 QString Component::form_spice_param_list(QStringList &ignore_list, QStringList &convert_list) {
     QString par_str = "";
 
-    for (unsigned int i = 0; i < Props.count(); i++) {
+    for (int i = 0; i < Props.count(); i++) {
         if (!ignore_list.contains(Props.at(i)->Name)) {
             QString unit, nam;
             if (convert_list.contains(Props.at(i)->Name)) {
@@ -1112,7 +1112,7 @@ bool Component::load(const QString &_s) {
             (*p1)->Name = n.section('=', 0, 0);
             n = n.section('=', 1);
             // allocate memory for a new property (e.g. for equations)
-            if (Props.size() < (counts >> 1)) {
+            if (static_cast<unsigned int>(Props.size()) < (counts >> 1)) {
               int index = std::distance(Props.begin(), p1);
               Props.insert(index + 1, new Property("y", "1", true));
               p1 = Props.begin() + index;

diff --git a/qucs/components/diode.cpp b/qucs/components/diode.cpp
@@ -125,7 +125,7 @@ QString Diode::spice_netlist(bool isXyce)
     QString par_str;
     //= form_spice_param_list(spice_incompat,spice_tr);
 
-    for (unsigned int i=0;i<Props.count();i++) {
+    for (int i=0;i<Props.count();i++) {
         if (!spice_incompat.contains(Props.at(i)->Name)) {
             if (Props.at(i)->Name == "Ikf") { // Bug Ngspice37
                 if (Props.at(i)->Value == "0") continue; // convergence error if Ikf=0

diff --git a/qucs/components/equation.cpp b/qucs/components/equation.cpp
@@ -97,7 +97,7 @@ Element* Equation::info(QString& Name, char* &BitmapFile, bool getNewOne)
 QString Equation::getVAvariables()
 {
     QStringList vars;
-    for (unsigned int i=0;i<Props.count()-1;i++) {
+    for (int i=0;i<Props.count()-1;i++) {
         vars.append(Props.at(i)->Name);
     }
 
@@ -107,7 +107,7 @@ QString Equation::getVAvariables()
 QString Equation::getVAExpressions()
 {
     QString s;
-    for (unsigned int i=0;i<Props.count()-1;i++) {
+    for (int i=0;i<Props.count()-1;i++) {
         QStringList tokens;
         spicecompat::splitEqn(Props.at(i)->Value,tokens);
         vacompat::convert_functions(tokens);
@@ -138,7 +138,7 @@ QString Equation::getExpression(bool isXyce)
     QRegularExpression spicefp_pattern("^[\\+\\-]*\\d*\\.\\d+[A-Za-z]{,3}$"); // float and scaling suffix
     QRegularExpression spicedec_pattern("^[\\+\\-]*\\d+[A-Za-z]{,3}$"); // decimal and scaling suffix
 
-    for (unsigned int i=0;i<Props.count()-1;i++) {
+    for (int i=0;i<Props.count()-1;i++) {
         QStringList tokens;
         QString eqn = Props.at(i)->Value;
         spicecompat::splitEqn(eqn,tokens);
@@ -179,7 +179,7 @@ QString Equation::getEquations(QString sim, QStringList &dep_vars)
 
     QString s;
     dep_vars.clear();
-    for (unsigned int i=0;i<Props.count()-1;i++) {
+    for (int i=0;i<Props.count()-1;i++) {
         QStringList tokens;
         QString eqn = Props.at(i)->Value;
         spicecompat::splitEqn(eqn,tokens);
@@ -216,7 +216,7 @@ QString Equation::getNgspiceScript()
     s.clear();
     if (isActive != COMP_IS_ACTIVE) return QString("");
 
-    for (unsigned int i=0;i<Props.count()-1;i++) {
+    for (int i=0;i<Props.count()-1;i++) {
         QStringList tokens;
         QString eqn = Props.at(i)->Value;
         spicecompat::splitEqn(eqn,tokens);
@@ -240,7 +240,7 @@ void Equation::getNgnutmegVars(QStringList &vars, QStringList &sims)
 {
     vars.clear();
     sims.clear();
-    for (unsigned int i=0;i<Props.count()-1;i++) {
+    for (int i=0;i<Props.count()-1;i++) {
         QStringList tokens;
         QString eqn = Props.at(i)->Value;
         spicecompat::splitEqn(eqn,tokens);

diff --git a/qucs/components/source_ac.cpp b/qucs/components/source_ac.cpp
@@ -177,7 +177,7 @@ QString Source_ac::netlist()
       s += " "+p1->Connection->Name;   // node names
 
     // output all properties
-    for(unsigned int i=0; i <= Props.count()-2; i++)
+    for(int i=0; i <= Props.count()-2; i++)
       if(Props.at(i)->Name != "EnableTran")
         s += " "+Props.at(i)->Name+"=\""+Props.at(i)->Value+"\"";
 

diff --git a/qucs/components/vacomponent.cpp b/qucs/components/vacomponent.cpp
@@ -307,7 +307,7 @@ QString vacomponent::spice_netlist(bool isXyce)
     QString tmp_model = QString("mod_%1_%2").arg(Model).arg(Name);
     s += tmp_model + "\n";
     QString par_str;
-    for(unsigned int i = 0; i < Props.count(); i++) {
+    for(int i = 0; i < Props.count(); i++) {
         par_str += QString("%1=%2 ")
                 .arg(Props.at(i)->Name)
                 .arg(Props.at(i)->Value);

diff --git a/qucs/components/volt_ac.cpp b/qucs/components/volt_ac.cpp
@@ -120,7 +120,7 @@ QString Volt_ac::netlist()
     s += " "+p1->Connection->Name;   // node names
 
   // output all properties
-  for(unsigned int i=0; i <= Props.count()-3; i++)
+  for(int i=0; i <= Props.count()-3; i++)
     if(Props.at(i)->Name != "Symbol")
       s += " "+Props.at(i)->Name+"=\""+Props.at(i)->Value+"\"";
 

diff --git a/qucs/components/vrect.cpp b/qucs/components/vrect.cpp
@@ -121,7 +121,7 @@ QString vRect::netlist()
     s += " "+p1->Connection->Name;   // node names
 
   // output all properties
-  for(unsigned int i=0; i <= Props.count()-2; i++)
+  for(int i=0; i <= Props.count()-2; i++)
     if(Props.at(i)->Name != "U0")
       s += " "+Props.at(i)->Name+"=\""+Props.at(i)->Value+"\"";
 

diff --git a/qucs/qucs_actions.cpp b/qucs/qucs_actions.cpp
@@ -443,8 +443,6 @@ void QucsApp::slotInsertEquation(bool on)
       view->selElem = new Equation();
   }
 
-  Schematic *Doc = (Schematic*)DocumentTab->currentWidget();
-
   MouseMoveAction = &MouseActions::MMoveElement;
   MousePressAction = &MouseActions::MPressElement;
 }
@@ -475,8 +473,6 @@ void QucsApp::slotInsertGround(bool on)
 
   view->selElem = new Ground();
 
-  Schematic *Doc = (Schematic*)DocumentTab->currentWidget();
-
   MouseMoveAction = &MouseActions::MMoveElement;
   MousePressAction = &MouseActions::MPressElement;
 }

diff --git a/qucs/schematic_file.cpp b/qucs/schematic_file.cpp
@@ -1396,7 +1396,6 @@ void Schematic::propagateNode(QStringList& Collect,
   Q3PtrList<Node> Cons;
   Node *p2;
   Wire *pw;
-  Element *pe;
 
   Cons.append(pn);
   for(p2 = Cons.first(); p2 != 0; p2 = Cons.next())

diff --git a/qucs/spicecomponents/sp_options.cpp b/qucs/spicecomponents/sp_options.cpp
@@ -79,12 +79,12 @@ QString SpiceOptions::getExpression(bool isXyce)
     s.clear();
     if (isXyce) {
         s += QString(".OPTIONS %1 ").arg(Props.at(0)->Value);
-        for (unsigned int i=1;i<Props.count();i++) {
+        for (int i=1;i<Props.count();i++) {
             s += QString(" %1 = %2 ").arg(Props.at(i)->Name).arg(Props.at(i)->Value);
         }
         s += "\n";
     } else {
-        for (unsigned int i=1;i<Props.count();i++) {
+        for (int i=1;i<Props.count();i++) {
             s += QString(".OPTION %1 = %2\n").arg(Props.at(i)->Name).arg(Props.at(i)->Value);
         }
     }

diff --git a/qucsator_rf b/qucsator_rf
+2 −0		src/CMakeLists.txt
+47 −48		src/check_citi.cpp
+2 −2		src/check_mdl.cpp
+19 −19		src/circuit.cpp
+1 −1		src/components/devices/thyristor.cpp
+1 −1		src/components/microstrip/bondwire.cpp
+1 −1		src/components/microstrip/bondwire.h
+5 −1		src/converter/CMakeLists.txt
+1 −1		src/converter/check_spice.cpp
+25 −12		src/converter/parse_spice.ypp
+2 −2		src/converter/parse_vcd.ypp
+67 −8		src/converter/scan_spice.lpp
+1 −1		src/environment.cpp
+2 −1		src/equation.cpp
+8 −8		src/evaluate.cpp
+4 −4		src/hbsolver.cpp
+3 −3		src/interface/e_trsolver.cpp
+1 −1		src/module.cpp
+1 −1		src/nasolver.cpp
+1 −1		src/parse_citi.ypp
+16 −10		src/parse_csv.ypp
+1 −1		src/parse_dataset.ypp
+1 −1		src/parse_mdl.ypp
+4 −5		src/parse_netlist.ypp
+1 −10		src/parse_touchstone.ypp
+1 −1		src/parse_zvr.ypp
+1 −1		src/scan_csv.lpp
+1 −1		src/spline.cpp
+9 −0		src/strlist.cpp
+1 −0		src/strlist.h
+4 −4		src/tmatrix.cpp
+4 −4		src/tvector.cpp
+26 −5		src/vector.cpp
+3 −0		tests/basic/components/csv/qucs_csv.csv
+23 −0		tests/basic/components/spfile/bjt.cir