SIM/qucs_s
1
0
Fork 0
mirror of https://github.com/ra3xdh/qucs_s synced 2025-03-28 21:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

replace foreach macro

Browse Source
This commit is contained in:
Krasilnikov Sergey 2023-01-15 01:17:09 +03:00
parent 2a76359bfd
commit b70e615020
119 changed files with 2235 additions and 2309 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
qucs-activefilter/filter.cpp
View File

@ -229,46 +229,48 @@ void Filter::calcFirstOrder()
}
void Filter::createPartList(QStringList &lst)
{
lst<<QObject::tr("Part list");
lst<<"Stage# C1(uF) C2(uF) R1(kOhm) R2(kOhm) R3(kOhm) R4(kOhm) R5(kOhm) R6(kOhm)";
RC_elements stage;
foreach (stage,Sections) {
QString suff1,suff2;
double C1=autoscaleCapacitor(stage.C1,suff1);
double C2=autoscaleCapacitor(stage.C2,suff2);
lst<<QString("%1%2%3%4%5%6%7%8%9%10%11").arg(stage.N,6).arg(C1,10,'f',3).arg(suff1).arg(C2,10,'f',3).arg(suff2)
.arg(stage.R1,10,'f',3).arg(stage.R2,10,'f',3).arg(stage.R3,10,'f',3).arg(stage.R4,10,'f',3).arg(stage.R5,10,'f',3).arg(stage.R6,10,'f',3);
void Filter::createPartList(QStringList &lst) {
lst << QObject::tr("Part list");
lst << "Stage# C1(uF) C2(uF) R1(kOhm) R2(kOhm) R3(kOhm) R4(kOhm) R5(kOhm) R6(kOhm)";
for (const auto &stage: Sections) {
QString suff1, suff2;
double C1 = autoscaleCapacitor(stage.C1, suff1);
double C2 = autoscaleCapacitor(stage.C2, suff2);
lst << QString("%1%2%3%4%5%6%7%8%9%10%11")
.arg(stage.N, 6)
.arg(C1, 10, 'f', 3)
.arg(suff1)
.arg(C2, 10, 'f', 3)
.arg(suff2)
.arg(stage.R1, 10, 'f', 3)
.arg(stage.R2, 10, 'f', 3)
.arg(stage.R3, 10, 'f', 3)
.arg(stage.R4, 10, 'f', 3)
.arg(stage.R5, 10, 'f', 3)
.arg(stage.R6, 10, 'f', 3);
}
}
void Filter::createPolesZerosList(QStringList &lst)
{
lst<<QString(QObject::tr("Filter order = %1")).arg(order);
void Filter::createPolesZerosList(QStringList &lst) {
lst << QString(QObject::tr("Filter order = %1")).arg(order);
if (!Zeros.isEmpty()) {
lst<<""<<QObject::tr("Zeros list Pk=Re+j*Im");
std::complex<float> zero;
foreach(zero,Zeros) {
lst<<QString::number(zero.real()) + " + j*" + QString::number(zero.imag());
lst << "" << QObject::tr("Zeros list Pk=Re+j*Im");
for (std::complex<float> zero: Zeros) {
lst << QString::number(zero.real()) + " + j*" + QString::number(zero.imag());
}
}
if ((ftype==Filter::BandPass)||(ftype==Filter::BandStop)) {
lst<<""<<QObject::tr("LPF prototype poles list Pk=Re+j*Im");
if ((ftype == Filter::BandPass) || (ftype == Filter::BandStop)) {
lst << "" << QObject::tr("LPF prototype poles list Pk=Re+j*Im");
} else {
lst<<""<<QObject::tr("Poles list Pk=Re+j*Im");
lst << "" << QObject::tr("Poles list Pk=Re+j*Im");
}
std::complex<float> pole;
foreach(pole,Poles) {
lst<<QString::number(pole.real()) + " + j*" + QString::number(pole.imag());
for (std::complex<float> pole: Poles) {
lst << QString::number(pole.real()) + " + j*" + QString::number(pole.imag());
}
lst<<"";
lst << "";
}
void Filter::createFirstOrderComponentsHPF(QString &s,RC_elements stage,int dx)
@ -341,8 +343,7 @@ double Filter::autoscaleCapacitor(double C, QString &suffix)
bool Filter::checkRCL()
{
RC_elements sec;
foreach (sec,Sections) {
for (auto &sec : Sections) {
if (std::isnan(sec.R1)||
std::isnan(sec.R2)||
std::isnan(sec.R3)||

6
qucs-activefilter/transferfuncdialog.cpp
View File

@ -47,10 +47,9 @@ TransferFuncDialog::TransferFuncDialog(QVector<long double> &a, QVector<long dou
tblA->setFixedWidth(150);
if (!a.isEmpty()) {
long double num;
int i = a.count()-1;
foreach (num,a) {
for (auto& num : a) {
QTableWidgetItem *it = new QTableWidgetItem(QString::number((double)num));
tblA->setItem(i,0,it);
i--;
@ -68,10 +67,9 @@ TransferFuncDialog::TransferFuncDialog(QVector<long double> &a, QVector<long dou
tblB->setFixedWidth(150);
if (!b.isEmpty()) {
long double num;
int i = b.count()-1;
foreach (num,b) {
for (auto& num :b) {
QTableWidgetItem *it = new QTableWidgetItem(QString::number((double)num));
tblB->setItem(i,0,it);
i--;

2
qucs/components/EKV26MOS.cpp
View File

@ -275,7 +275,7 @@ QString EKV26MOS::netlist()
QString s = Model+":"+Name;
// output all node names
foreach(Port *p1, Ports)
for (Port *p1 : Ports)
s += " "+p1->Connection->Name; // node names
// output type npn/pnp property

2
qucs/components/ampere_ac.cpp
View File

@ -80,7 +80,7 @@ Element* Ampere_ac::info(QString& Name, char* &BitmapFile, bool getNewOne)
QString Ampere_ac::spice_netlist(bool)
{
QString s = spicecompat::check_refdes(Name,SpiceModel);
foreach(Port *p1, Ports) {
for (Port *p1 : Ports) {
QString nam = p1->Connection->Name;
if (nam=="gnd") nam = "0";
s += " "+ nam; // node names

6
qucs/components/bjt.cpp
View File

@ -46,7 +46,7 @@ QString BJT::spice_netlist(bool)
QList<int> pin_seq;
pin_seq<<1<<0<<2; // Pin sequence: CBE
// output all node names
foreach(int pin, pin_seq) {
for (int pin : pin_seq) {
QString nam = Ports.at(pin)->Connection->Name;
if (nam=="gnd") nam = "0";
s += " "+ nam; // node names
@ -123,12 +123,12 @@ QString BJT::netlist()
QString s = "BJT:"+Name;
// output all node names
foreach(Port *p1, Ports)
for (Port *p1 : Ports)
s += " "+p1->Connection->Name; // node names
s += " "+Ports.at(1)->Connection->Name; // connect substrate to collector
// output all properties
for(Property *p2 = Props.first(); p2 != 0; p2 = Props.next())
for(Property *p2 = Props.first(); p2 != nullptr; p2 = Props.next())
s += " "+p2->Name+"=\""+p2->Value+"\"";
return s + '\n';

2
qucs/components/bjtsub.cpp
View File

@ -204,7 +204,7 @@ QString BJTsub::spice_netlist(bool)
QList<int> pin_seq;
pin_seq<<1<<0<<2<<3; // Pin sequence: CBE
// output all node names
foreach(int pin, pin_seq) {
for (int pin : pin_seq) {
QString nam = Ports.at(pin)->Connection->Name;
if (nam=="gnd") nam = "0";
s += " "+ nam; // node names

87
qucs/components/component.cpp
View File

@ -210,7 +210,7 @@ void Component::paint(ViewPainter *p)
a = b = 0;
QRect r, t;
foreach(Text *pt, Texts) {
for (Text *pt : Texts) {
t.setRect(x, y+b, 0, 0);
p->Painter->drawText(t, Qt::AlignLeft|Qt::TextDontClip, pt->s, &r);
b += r.height();
@ -234,26 +234,26 @@ void Component::paint(ViewPainter *p)
else { // normal components go here
// paint all lines
foreach(qucs::Line *p1, Lines) {
for (qucs::Line *p1 : Lines) {
p->Painter->setPen(p1->style);
p->drawLine(cx+p1->x1, cy+p1->y1, cx+p1->x2, cy+p1->y2);
}
// paint all arcs
foreach(qucs::Arc *p3, Arcs) {
for (qucs::Arc *p3 : Arcs) {
p->Painter->setPen(p3->style);
p->drawArc(cx+p3->x, cy+p3->y, p3->w, p3->h, p3->angle, p3->arclen);
}
// paint all rectangles
foreach(qucs::Area *pa, Rects) {
for (qucs::Area *pa : Rects) {
p->Painter->setPen(pa->Pen);
p->Painter->setBrush(pa->Brush);
p->drawRect(cx+pa->x, cy+pa->y, pa->w, pa->h);
}
// paint all ellipses
foreach(qucs::Area *pa, Ellips) {
for (qucs::Area *pa : Ellips) {
p->Painter->setPen(pa->Pen);
p->Painter->setBrush(pa->Brush);
p->drawEllipse(cx+pa->x, cy+pa->y, pa->w, pa->h);
@ -267,7 +267,7 @@ void Component::paint(ViewPainter *p)
QTransform wm = p->Painter->worldTransform();
// write all text
foreach(Text *pt, Texts) {
for (Text *pt : Texts) {
p->Painter->setWorldTransform(
QTransform(pt->mCos, -pt->mSin, pt->mSin, pt->mCos,
p->DX + float(cx+pt->x) * p->Scale,
@ -277,13 +277,10 @@ void Component::paint(ViewPainter *p)
newFont.setUnderline(pt->under);
p->Painter->setFont(newFont);
p->Painter->setPen(pt->Color);
if (0) {
p->Painter->drawText(0, 0, 0, 0, Qt::AlignLeft|Qt::TextDontClip, pt->s);
} else {
int w, h;
w = p->drawTextMapped (pt->s, 0, 0, &h);
Q_UNUSED(w);
}
int w, h;
w = p->drawTextMapped(pt->s, 0, 0, &h);
Q_UNUSED(w);
Q_UNUSED(w)
}
p->Painter->setWorldTransform(wm);
p->Painter->setWorldMatrixEnabled(false);
@ -344,7 +341,7 @@ void Component::paintScheme(Schematic *p)
a = b = 0;
QSize r;
foreach(Text *pt, Texts) {
for (Text *pt : Texts) {
r = metrics.size(0, pt->s);
b += r.height();
if(a < r.width()) a = r.width();
@ -365,21 +362,21 @@ void Component::paintScheme(Schematic *p)
}
// paint all lines
foreach(qucs::Line *p1, Lines)
for(qucs::Line *p1 : Lines)
p->PostPaintEvent(_Line,cx+p1->x1, cy+p1->y1, cx+p1->x2, cy+p1->y2);
// paint all ports
foreach(Port *p2, Ports)
for (Port *p2 : Ports)
if(p2->avail) p->PostPaintEvent(_Ellipse,cx+p2->x-4, cy+p2->y-4, 8, 8);
foreach(qucs::Arc *p3, Arcs) // paint all arcs
for (qucs::Arc *p3 : Arcs) // paint all arcs
p->PostPaintEvent(_Arc,cx+p3->x, cy+p3->y, p3->w, p3->h, p3->angle, p3->arclen);
foreach(qucs::Area *pa, Rects) // paint all rectangles
for (qucs::Area *pa : Rects) // paint all rectangles
p->PostPaintEvent(_Rect,cx+pa->x, cy+pa->y, pa->w, pa->h);
foreach(qucs::Area *pa, Ellips) // paint all ellipses
for (qucs::Area *pa : Ellips) // paint all ellipses
p->PostPaintEvent(_Ellipse,cx+pa->x, cy+pa->y, pa->w, pa->h);
}
@ -387,12 +384,12 @@ void Component::paintScheme(Schematic *p)
// For output on a printer device.
void Component::print(ViewPainter *p, float FontScale)
{
foreach(Text *pt, Texts)
for (Text *pt : Texts)
pt->Size *= FontScale;
paint(p);
foreach(Text *pt, Texts)
for (Text *pt : Texts)
pt->Size /= FontScale;
}
@ -407,7 +404,7 @@ void Component::rotate()
int tmp, dx, dy;
// rotate all lines
foreach(qucs::Line *p1, Lines) {
for (qucs::Line *p1 : Lines) {
tmp = -p1->x1;
p1->x1 = p1->y1;
p1->y1 = tmp;
@ -417,14 +414,14 @@ void Component::rotate()
}
// rotate all ports
foreach(Port *p2, Ports) {
for (Port *p2 : Ports) {
tmp = -p2->x;
p2->x = p2->y;
p2->y = tmp;
}
// rotate all arcs
foreach(qucs::Arc *p3, Arcs) {
for (qucs::Arc *p3 : Arcs) {
tmp = -p3->x;
p3->x = p3->y;
p3->y = tmp - p3->w;
@ -436,7 +433,7 @@ void Component::rotate()
}
// rotate all rectangles
foreach(qucs::Area *pa, Rects) {
for(qucs::Area *pa : Rects) {
tmp = -pa->x;
pa->x = pa->y;
pa->y = tmp - pa->w;
@ -446,7 +443,7 @@ void Component::rotate()
}
// rotate all ellipses
foreach(qucs::Area *pa, Ellips) {
for (qucs::Area *pa : Ellips) {
tmp = -pa->x;
pa->x = pa->y;
pa->y = tmp - pa->w;
@ -457,7 +454,7 @@ void Component::rotate()
// rotate all text
float ftmp;
foreach(Text *pt, Texts) {
for (Text *pt : Texts) {
tmp = -pt->x;
pt->x = pt->y;
pt->y = tmp;
@ -507,17 +504,17 @@ void Component::mirrorX()
if(Ports.count() < 1) return; // do not rotate components without ports
// mirror all lines
foreach(qucs::Line *p1, Lines) {
for (qucs::Line *p1 : Lines) {
p1->y1 = -p1->y1;
p1->y2 = -p1->y2;
}
// mirror all ports
foreach(Port *p2, Ports)
for (Port *p2 : Ports)
p2->y = -p2->y;
// mirror all arcs
foreach(qucs::Arc *p3, Arcs) {
for (qucs::Arc *p3 : Arcs) {
p3->y = -p3->y - p3->h;
if(p3->angle > 16*180) p3->angle -= 16*360;
p3->angle = -p3->angle; // mirror
@ -526,16 +523,16 @@ void Component::mirrorX()
}
// mirror all rectangles
foreach(qucs::Area *pa, Rects)
for (qucs::Area *pa : Rects)
pa->y = -pa->y - pa->h;
// mirror all ellipses
foreach(qucs::Area *pa, Ellips)
for (qucs::Area *pa : Ellips)
pa->y = -pa->y - pa->h;
QFont f = QucsSettings.font;
// mirror all text
foreach(Text *pt, Texts) {
for (Text *pt : Texts) {
f.setPointSizeF(pt->Size);
// use the screen-compatible metric
QFontMetrics smallMetrics(f, 0);
@ -546,11 +543,11 @@ void Component::mirrorX()
int tmp = y1;
y1 = -y2; y2 = -tmp; // mirror boundings
// use the screen-compatible metric
QFontMetrics metrics(QucsSettings.font, 0); // get size of text
QFontMetrics metrics(QucsSettings.font, nullptr); // get size of text
int dy = 0;
if(showName)
dy = metrics.lineSpacing(); // for "Name"
for(Property *pp = Props.first(); pp != 0; pp = Props.next())
for(Property *pp = Props.first(); pp != nullptr; pp = Props.next())
if(pp->display) dy += metrics.lineSpacing();
if((tx > x1) && (tx < x2)) ty = -ty-dy; // mirror text position
else ty = y1+ty+y2;
@ -570,34 +567,34 @@ void Component::mirrorY()
if(Ports.count() < 1) return; // do not rotate components without ports
// mirror all lines
foreach(qucs::Line *p1, Lines) {
for (qucs::Line *p1 : Lines) {
p1->x1 = -p1->x1;
p1->x2 = -p1->x2;
}
// mirror all ports
foreach(Port *p2, Ports)
for (Port *p2 : Ports)
p2->x = -p2->x;
// mirror all arcs
foreach(qucs::Arc *p3, Arcs) {
for (qucs::Arc *p3 : Arcs) {
p3->x = -p3->x - p3->w;
p3->angle = 16*180 - p3->angle - p3->arclen; // mirror
if(p3->angle < 0) p3->angle += 16*360; // angle has to be > 0
}
// mirror all rectangles
foreach(qucs::Area *pa, Rects)
for (qucs::Area *pa : Rects)
pa->x = -pa->x - pa->w;
// mirror all ellipses
foreach(qucs::Area *pa, Ellips)
for (qucs::Area *pa : Ellips)
pa->x = -pa->x - pa->w;
int tmp;
QFont f = QucsSettings.font;
// mirror all text
foreach(Text *pt, Texts) {
for (Text *pt : Texts) {
f.setPointSizeF(pt->Size);
// use the screen-compatible metric
QFontMetrics smallMetrics(f, 0);
@ -633,11 +630,11 @@ QString Component::netlist()
QString s = Model+":"+Name;
// output all node names
foreach(Port *p1, Ports)
for (Port *p1 : Ports)
s += " "+p1->Connection->Name; // node names
// output all properties
for(Property *p2 = Props.first(); p2 != 0; p2 = Props.next())
for(Property *p2 = Props.first(); p2 != nullptr; p2 = Props.next())
if(p2->Name != "Symbol")
s += " "+p2->Name+"=\""+p2->Value+"\"";
@ -1460,7 +1457,7 @@ QString GateComponent::netlist()
QString s = Model+":"+Name;
// output all node names
foreach(Port *pp, Ports)
for (Port *pp : Ports)
s += " "+pp->Connection->Name; // node names
// output all properties
@ -1475,7 +1472,7 @@ QString GateComponent::netlist()
QString GateComponent::spice_netlist(bool isXyce)
{
if (isXyce) return QString("");
if (isXyce) return {""};
QString s = SpiceModel + Name;
QString tmp_model = "model_" + Name;

2
qucs/components/diode.cpp
View File

@ -104,7 +104,7 @@ QString Diode::spice_netlist(bool isXyce)
QList<int> pin_seq;
pin_seq<<1<<0; // Pin sequence: CBE
// output all node names
foreach(int pin, pin_seq) {
for (int pin : pin_seq) {
QString nam = Ports.at(pin)->Connection->Name;
if (nam=="gnd") nam = "0";
s += " "+ nam; // node names

2
qucs/components/ecvs.cpp
View File

@ -95,7 +95,7 @@ QString ecvs::netlist()
QString s = Model+":"+Name;
// output all node names
foreach(Port *p1, Ports)
for (Port *p1 : Ports)
s += " "+p1->Connection->Name; // node names
// output all properties

2
qucs/components/eqndefined.cpp
View File

@ -84,7 +84,7 @@ QString EqnDefined::netlist()
QString e = "\n";
// output all node names
foreach(Port *p1, Ports)
for (Port *p1 : Ports)
s += " "+p1->Connection->Name; // node names
// output all properties

4
qucs/components/equation.cpp
View File

@ -250,7 +250,7 @@ void Equation::getNgnutmegVars(QStringList &vars, QStringList &sims)
}
}
}
foreach (QString var,vars) {
for (const QString& var : vars) {
QString sim;
int idx = vars.indexOf(var);
if (idx>=0) sim = sims.at(idx);
@ -258,7 +258,7 @@ void Equation::getNgnutmegVars(QStringList &vars, QStringList &sims)
QString eqn = getProperty(var)->Value;
QStringList tokens;
spicecompat::splitEqn(eqn,tokens);
foreach (QString tok,tokens) {
for (const QString& tok : tokens) {
int idx1 = vars.indexOf(tok);
if ((idx1>=0)&&(sims[idx1]!="all")) sims[idx]=sims[idx1];
}

2
qucs/components/hic0_full.cpp
View File

@ -347,7 +347,7 @@ QString hic0_full::netlist()
QString s = "hic0_full:"+Name;
// output all node names
foreach(Port *pp, Ports)
for (Port *pp : Ports)
s += " "+pp->Connection->Name; // node names
// output type npn/pnp property

2
qucs/components/hicumL0V1p2.cpp
View File

@ -365,7 +365,7 @@ QString hicumL0V1p2::netlist()
QString s = "hicumL0V1p2:"+Name;
// output all node names
foreach(Port *pp, Ports)
for (Port *pp : Ports)
s += " "+pp->Connection->Name; // node names
// output type npn/pnp property

31
qucs/components/hicumL0V1p2g.cpp
View File

@ -371,24 +371,23 @@ void hicumL0V1p2g::createSymbol()
x2 = 30; y2 = 30;
}
QString hicumL0V1p2g::netlist()
{
QString s = "hicumL0V1p2g:"+Name;
QString hicumL0V1p2g::netlist() {
QString s = "hicumL0V1p2g:" + Name;
// output all node names
foreach(Port *pp, Ports)
s += " "+pp->Connection->Name; // node names
// output all node names
for (Port *pp: Ports)
s += " " + pp->Connection->Name; // node names
// output type npn/pnp property
Property *p2 = Props.first();
if(p2->Value == "npn")
s += " npn=\"1\"";
else
s += " pnp=\"1\"";
// output type npn/pnp property
Property *p2 = Props.first();
if (p2->Value == "npn")
s += " npn=\"1\"";
else
s += " pnp=\"1\"";
// output all remaining properties
for(p2 = Props.next(); p2 != 0; p2 = Props.next())
s += " "+p2->Name+"=\""+p2->Value+"\"";
// output all remaining properties
for (p2 = Props.next(); p2 != 0; p2 = Props.next())
s += " " + p2->Name + "=\"" + p2->Value + "\"";
return s + '\n';
return s + '\n';
}

2
qucs/components/hicumL0V1p3.cpp
View File

@ -383,7 +383,7 @@ QString hicumL0V1p3::netlist()
QString s = "hicumL0V1p3:"+Name;
// output all node names
foreach(Port *pp, Ports)
for (Port *pp : Ports)
s += " "+pp->Connection->Name; // node names
// output type npn/pnp property

2
qucs/components/iexp.cpp
View File

@ -97,7 +97,7 @@ Element* iExp::info(QString& Name, char* &BitmapFile, bool getNewOne)
QString iExp::spice_netlist(bool)
{
QString s = spicecompat::check_refdes(Name,SpiceModel);
foreach(Port *p1, Ports) {
for (Port *p1 : Ports) {
QString nam = p1->Connection->Name;
if (nam=="gnd") nam = "0";
s += " "+ nam; // node names

2
qucs/components/ifile.cpp
View File

@ -93,7 +93,7 @@ QString iFile::netlist()
QString s = Model+":"+Name;
// output all node names
foreach(Port *p1, Ports)
for (Port *p1 : Ports)
s += " "+p1->Connection->Name; // node names
// output file properties

2
qucs/components/ipulse.cpp
View File

@ -91,7 +91,7 @@ QString iPulse::spice_netlist(bool)
{
QString s = spicecompat::check_refdes(Name,SpiceModel);
foreach(Port *p1, Ports) {
for (Port *p1 : Ports) {
QString nam = p1->Connection->Name;
if (nam=="gnd") nam = "0";
s += " "+ nam; // node names

2
qucs/components/irect.cpp
View File

@ -81,7 +81,7 @@ QString iRect::spice_netlist(bool)
{
QString s = spicecompat::check_refdes(Name,SpiceModel);
foreach(Port *p1, Ports) {
for (Port *p1 : Ports) {
QString nam = p1->Connection->Name;
if (nam=="gnd") nam = "0";
s += " "+ nam; // node names

2
qucs/components/jfet.cpp
View File

@ -97,7 +97,7 @@ QString JFET::spice_netlist(bool isXyce)
QList<int> pin_seq;
pin_seq<<1<<0<<2; // Pin sequence: DGS
// output all node names
foreach(int pin, pin_seq) {
for (int pin : pin_seq) {
QString nam = Ports.at(pin)->Connection->Name;
if (nam=="gnd") nam = "0";
s += " "+ nam; // node names

8
qucs/components/libcomp.cpp
View File

@ -317,7 +317,7 @@ QString LibComp::netlist()
QString s = "Sub:"+Name; // output as subcircuit
// output all node names
foreach(Port *p1, Ports)
for (Port *p1 : Ports)
s += " "+p1->Connection->Name; // node names
// output property
@ -369,7 +369,7 @@ QString LibComp::vhdlCode(int)
QString LibComp::spice_netlist(bool)
{
QString s = SpiceModel + Name + " 0 "; // connect ground of subckt to circuit ground
foreach(Port *p1, Ports)
for (Port *p1 : Ports)
s += " "+p1->Connection->Name; // node names
s += " " + createType();
@ -391,7 +391,7 @@ QStringList LibComp::getAttachedIFS()
int r = loadSection("Spice",content,&includes,&attach);
if (r<0) return ifs_lst;
foreach(QString file,attach) {
for (const QString& file : attach) {
if (file.endsWith(".ifs")) ifs_lst.append(getSubcircuitFile()+'/'+file);
}
return ifs_lst;
@ -405,7 +405,7 @@ QStringList LibComp::getAttachedMOD()
int r = loadSection("Spice",content,&includes,&attach);
if (r<0) return mod_lst;
foreach(QString file,attach) {
for (const QString& file : attach) {
if (file.endsWith(".mod")) mod_lst.append(getSubcircuitFile()+'/'+file);
}
return mod_lst;

6
qucs/components/mosfet.cpp
View File

@ -127,7 +127,7 @@ QString MOSFET::netlist()
QString s = "MOSFET:"+Name;
// output all node names
foreach(Port *p1, Ports)
for (Port *p1 : Ports)
s += " "+p1->Connection->Name; // node names
s += " "+Ports.at(2)->Connection->Name; // connect substrate to source
@ -144,7 +144,7 @@ QString MOSFET::spice_netlist(bool isXyce)
QList<int> pin_seq;
pin_seq<<1<<0<<2<<2; // Pin sequence: DGS; coonect substrate to source
// output all node names
foreach(int pin, pin_seq) {
for (int pin : pin_seq) {
QString nam = Ports.at(pin)->Connection->Name;
if (nam=="gnd") nam = "0";
s += " "+ nam; // node names
@ -164,7 +164,7 @@ QString MOSFET::spice_netlist(bool isXyce)
QStringList check_defaults_list;
QString unit;
check_defaults_list<<"Nsub"<<"Nss";
foreach (QString parnam,check_defaults_list) { // Check some parameters for default value (zero)
for (const QString& parnam : check_defaults_list) { // Check some parameters for default value (zero)
double val,fac; // And reduce parameter list
misc::str2num(getProperty(parnam)->Value,val,unit,fac);
if ((val *= fac)==0.0) {

4
qucs/components/mosfet_sub.cpp
View File

@ -151,7 +151,7 @@ QString MOSFET_sub::spice_netlist(bool isXyce)
QList<int> pin_seq;
pin_seq<<1<<0<<2<<3; // Pin sequence: DGS
// output all node names
foreach(int pin, pin_seq) {
for (int pin : pin_seq) {
QString nam = Ports.at(pin)->Connection->Name;
if (nam=="gnd") nam = "0";
s += " "+ nam; // node names
@ -170,7 +170,7 @@ QString MOSFET_sub::spice_netlist(bool isXyce)
QStringList check_defaults_list;
QString unit;
check_defaults_list<<"Nsub"<<"Nss";
foreach (QString parnam,check_defaults_list) { // Check some parameters for default value (zero)
for (const QString& parnam : check_defaults_list) { // Check some parameters for default value (zero)
double val,fac; // And reduce parameter list
misc::str2num(getProperty(parnam)->Value,val,unit,fac);
if ((val *= fac)==0.0) {

2
qucs/components/mutualx.cpp
View File

@ -77,7 +77,7 @@ QString MutualX::netlist()
QString s = Model + ":" + Name;
// output all node names
foreach(Port *p1, Ports) {
for (Port *p1 : Ports) {
s += " "+p1->Connection->Name; // node names
}

2
qucs/components/param_sweep.cpp
View File

@ -268,7 +268,7 @@ QString Param_Sweep::netlist()
QString s = Model+":"+Name;
// output all node names
foreach(Port *p1, Ports)
for (Port *p1 : Ports)
s += " "+p1->Connection->Name; // node names
// output all properties

2
qucs/components/relais.cpp
View File

@ -90,7 +90,7 @@ QString Relais::spice_netlist(bool isXyce)
QList<int> seq; // nodes sequence
seq<<1<<2<<0<<3;
// output all node names
foreach(int i, seq) {
for (int i : seq) {
QString nam = Ports.at(i)->Connection->Name;
if (nam=="gnd") nam = "0";
s += " "+ nam; // node names

2
qucs/components/rfedd.cpp
View File

@ -84,7 +84,7 @@ QString RFedd::netlist()
QString n, p;
// output all node names
foreach(Port *p1, Ports)
for (Port *p1 : Ports)
s += " "+p1->Connection->Name; // node names
// output all properties

2
qucs/components/rfedd2p.cpp
View File

@ -81,7 +81,7 @@ QString RFedd2P::netlist()
QString n, p;
// output all node names
foreach(Port *p1, Ports)
for (Port *p1 : Ports)
s += " "+p1->Connection->Name; // node names
// output all properties

4
qucs/components/source_ac.cpp
View File

@ -95,7 +95,7 @@ Element* Source_ac::info(QString& Name, char* &BitmapFile, bool getNewOne)
QString Source_ac::ngspice_netlist()
{
QString s = QString("V%1").arg(Name);
foreach(Port *p1, Ports) {
for (Port *p1 : Ports) {
QString nam = p1->Connection->Name;
if (nam=="gnd") nam = "0";
s += " "+ nam; // node names
@ -117,7 +117,7 @@ QString Source_ac::ngspice_netlist()
QString Source_ac::xyce_netlist()
{
QString s = spicecompat::check_refdes(Name,SpiceModel);
foreach(Port *p1, Ports) {
for (Port *p1 : Ports) {
QString nam = p1->Connection->Name;
if (nam=="gnd") nam = "0";
s += " "+ nam; // node names

2
qucs/components/sparamfile.cpp
View File

@ -112,7 +112,7 @@ QString SParamFile::netlist()
QString s = Model+":"+Name;
// output all node names
foreach(Port *p1, Ports)
for (Port *p1 : Ports)
s += " "+p1->Connection->Name; // node names
// output all properties

2
qucs/components/spicedialog.cpp
View File

@ -473,7 +473,7 @@ bool SpiceDialog::loadSpiceNetList(const QString& s)
{
PortsList->clear();
QStringList ports = pp->Value.split(',');
foreach(QString port, ports) {
for (const QString& port : ports) {
PortsList->addItem(port);
}
}

8
qucs/components/spicefile.cpp
View File

@ -157,7 +157,7 @@ QString SpiceFile::netlist()
return QString(""); // no ports, no subcircuit instance
QString s = "Sub:"+Name; // SPICE netlist is subcircuit
foreach(Port *pp, Ports)
for (Port *pp : Ports)
s += " "+pp->Connection->Name; // output all node names
QString f = misc::properFileName(Props.first()->Value);
@ -583,8 +583,8 @@ void SpiceFile::slotExited()
QString SpiceFile::spice_netlist(bool)
{
QStringList ports_lst = Props.at(1)->Value.split(",");
for (QStringList::iterator it = ports_lst.begin();it != ports_lst.end();it++) {
if (it->startsWith("_net")) (*it).remove(0,4);
for (auto & it : ports_lst) {
if (it.startsWith("_net")) it.remove(0,4);
}
QStringList nod_lst;
QString compname = spicecompat::getSubcktName(getSubcircuitFile());
@ -598,7 +598,7 @@ QString SpiceFile::spice_netlist(bool)
QString s = spicecompat::check_refdes(Name,SpiceModel);
//foreach(Port *p1, Ports) {
foreach(int i,seq) {
for (int i : seq) {
s += " "+Ports.at(i)->Connection->Name; // node names
}

4
qucs/components/subcircuit.cpp
View File

@ -209,7 +209,7 @@ QString Subcircuit::netlist()
QString s = Model+":"+Name;
// output all node names
foreach(Port *p1, Ports)
for (Port *p1 : Ports)
s += " "+p1->Connection->Name; // node names
// type for subcircuit
@ -227,7 +227,7 @@ QString Subcircuit::spice_netlist(bool)
QString s;
QString f = misc::properFileName(Props.first()->Value);
s += spicecompat::check_refdes(Name,SpiceModel);
foreach(Port *p1, Ports) {
for (Port *p1 : Ports) {
QString nam = p1->Connection->Name;
if (nam=="gnd") nam = "0";
s += " "+nam; // node names

2
qucs/components/vccs.cpp
View File

@ -114,7 +114,7 @@ QString VCCS::spice_netlist(bool)
QList<int> seq; // nodes sequence
seq<<1<<2<<0<<3;
// output all node names
foreach(int i, seq) {
for (int i : seq) {
QString nam = Ports.at(i)->Connection->Name;
if (nam=="gnd") nam = "0";
s += " "+ nam; // node names

2
qucs/components/vcvs.cpp
View File

@ -113,7 +113,7 @@ QString VCVS::spice_netlist(bool)
QList<int> seq; // nodes sequence
seq<<1<<2<<0<<3;
// output all node names
foreach(int i, seq) {
for (int i : seq) {
QString nam = Ports.at(i)->Connection->Name;
if (nam=="gnd") nam = "0";
s += " "+ nam; // node names

2
qucs/components/vexp.cpp
View File

@ -98,7 +98,7 @@ Element* vExp::info(QString& Name, char* &BitmapFile, bool getNewOne)
QString vExp::spice_netlist(bool)
{
QString s = spicecompat::check_refdes(Name,SpiceModel);
foreach(Port *p1, Ports) {
for (Port *p1 : Ports) {
QString nam = p1->Connection->Name;
if (nam=="gnd") nam = "0";
s += " "+ nam; // node names

2
qucs/components/vfile.cpp
View File

@ -95,7 +95,7 @@ QString vFile::netlist()
QString s = Model+":"+Name;
// output all node names
foreach(Port *p1, Ports)
for (Port *p1 : Ports)
s += " "+p1->Connection->Name; // node names
// output file properties

2
qucs/components/volt_ac.cpp
View File

@ -79,7 +79,7 @@ Element* Volt_ac::info(QString& Name, char* &BitmapFile, bool getNewOne)
QString Volt_ac::spice_netlist(bool)
{
QString s = spicecompat::check_refdes(Name,SpiceModel);
foreach(Port *p1, Ports) {
for (Port *p1 : Ports) {
QString nam = p1->Connection->Name;
if (nam=="gnd") nam = "0";
s += " "+ nam; // node names

2
qucs/components/volt_dc.cpp
View File

@ -63,7 +63,7 @@ Component* Volt_dc::newOne()
QString Volt_dc::spice_netlist(bool)
{
QString s = spicecompat::check_refdes(Name,SpiceModel);
foreach(Port *p1, Ports) {
for (Port *p1 : Ports) {
QString nam = p1->Connection->Name;
if (nam=="gnd") nam = "0";
s += " "+ nam; // node names

2
qucs/components/vpulse.cpp
View File

@ -77,7 +77,7 @@ QString vPulse::spice_netlist(bool)
{
QString s = spicecompat::check_refdes(Name,SpiceModel);
foreach(Port *p1, Ports) {
for (Port *p1 : Ports) {
QString nam = p1->Connection->Name;
if (nam=="gnd") nam = "0";
s += " "+ nam; // node names

2
qucs/components/vrect.cpp
View File

@ -76,7 +76,7 @@ QString vRect::spice_netlist(bool)
{
QString s = spicecompat::check_refdes(Name,SpiceModel);
foreach(Port *p1, Ports) {
for (Port *p1 : Ports) {
QString nam = p1->Connection->Name;
if (nam=="gnd") nam = "0";
s += " "+ nam; // node names

3202
qucs/diagrams/diagram.cpp
View File

File diff suppressed because it is too large Load Diff

4
qucs/diagrams/diagramdialog.cpp
View File

@ -792,7 +792,7 @@ DiagramDialog::DiagramDialog(Diagram *d, QWidget *parent, Graph *currentGraph)
// ...........................................................
// put all graphs into the ListBox
Row = 0;
foreach(Graph *pg, Diag->Graphs) {
for (Graph *pg : Diag->Graphs) {
GraphList->insertItem(Row, pg->Var);
if(pg == currentGraph) {
GraphList->setCurrentRow(Row); // select current graph
@ -1486,7 +1486,7 @@ void DiagramDialog::slotSetGraphStyle(int style)
*/
void DiagramDialog::copyDiagramGraphs()
{
foreach(Graph *pg, Diag->Graphs)
for (Graph *pg : Diag->Graphs)
Graphs.append(pg->sameNewOne());
}

4
qucs/diagrams/graph.cpp
View File

@ -103,7 +103,7 @@ QString Graph::save()
" "+QString::number(numMode)+" "+QString::number(Style)+
" "+QString::number(yAxisNo)+">";
foreach(Marker *pm, Markers)
for (Marker *pm : Markers)
s += "\n\t "+pm->save();
return s;
@ -258,7 +258,7 @@ Graph* Graph::sameNewOne()
pg->numMode = numMode;
pg->yAxisNo = yAxisNo;
foreach(Marker *pm, Markers)
for (Marker *pm : Markers)
pg->Markers.append(pm->sameNewOne(pg));
return pg;

8
qucs/diagrams/rect3ddiagram.cpp
View File

@ -390,7 +390,7 @@ void Rect3DDiagram::removeHiddenLines(char *zBuffer, tBound *Bounds)
tPoint3D *p;
int i, j, z, dx, dy, Size=0;
// pre-calculate buffer size to avoid reallocations in the first step
foreach(Graph *g, Graphs)
for (Graph *g : Graphs)
if(g->cPointsY)
Size += g->axis(0)->count * g->countY;
@ -410,7 +410,7 @@ void Rect3DDiagram::removeHiddenLines(char *zBuffer, tBound *Bounds)
tPointZ *zp = zMem, *zp_tmp;
// ...............................................................
foreach(Graph *g, Graphs) {
for (Graph *g : Graphs) {
pz = g->cPointsY;
if(!pz) continue;
@ -533,7 +533,7 @@ void Rect3DDiagram::removeHiddenLines(char *zBuffer, tBound *Bounds)
tPoint3D *MemEnd = Mem + malloc_8xsize*2*Size - 5; // limit of buffer
zp = zMem;
foreach(Graph *g, Graphs) {
for (Graph *g : Graphs) {
if(!g->cPointsY) continue;
dx = g->axis(0)->count;
if(g->countY > 1) dy = g->axis(1)->count;
@ -788,7 +788,7 @@ void Rect3DDiagram::createAxis(Axis *Axis, bool Right,
y = y1_ - int(double(valid)*cos_phi);
if(Axis->Label.isEmpty()) {
// write all labels ----------------------------------------
foreach(Graph *pg, Graphs) {
for (Graph *pg : Graphs) {
if(Axis != &zAxis) {
if(!pg->cPointsY) continue;
if(valid < 0) {

6
qucs/diagrams/tabdiagram.cpp
View File

@ -55,7 +55,7 @@ void TabDiagram::paint(ViewPainter *p)
void TabDiagram::paintDiagram(ViewPainter *p)
{
// paint all lines
foreach(qucs::Line *pl, Lines) {
for (qucs::Line *pl : Lines) {
p->Painter->setPen(pl->style);
p->drawLine(cx+pl->x1, cy-pl->y1, cx+pl->x2, cy-pl->y2);
}
@ -109,7 +109,7 @@ void TabDiagram::paintDiagram(ViewPainter *p)
p->Painter->setPen(Qt::black);
// write whole text
foreach(Text *pt, Texts)
for (Text *pt : Texts)
p->drawText(pt->s, cx+pt->x, cy-pt->y);
@ -243,7 +243,7 @@ int TabDiagram::calcDiagram()
firstGraph = g;
// ................................................
// all dependent variables
foreach(Graph *g, Graphs) {
for (Graph *g : Graphs) {
y = y2-tHeight-5;
colWidth = 0;

10
qucs/diagrams/timingdiagram.cpp
View File

@ -54,14 +54,14 @@ void TimingDiagram::paint(ViewPainter *p)
void TimingDiagram::paintDiagram(ViewPainter *p)
{
// paint all lines
foreach(qucs::Line *pl, Lines) {
for(qucs::Line *pl : Lines) {
p->Painter->setPen(pl->style);
p->drawLine(cx+pl->x1, cy-pl->y1, cx+pl->x2, cy-pl->y2);
}
p->Painter->setPen(Qt::black);
// write whole text
foreach(Text *pt, Texts)
for(Text *pt : Texts)
p->drawText(pt->s, cx+pt->x, cy-pt->y);
@ -187,7 +187,7 @@ int TimingDiagram::calcDiagram()
// First check the maximum bit number of all vectors.
colWidth = 0;
foreach(Graph *g, Graphs)
for (Graph *g : Graphs)
if(g->cPointsY) {
if(g->Var.right(2) == ".X") {
z = strlen((char*)g->cPointsY);
@ -228,7 +228,7 @@ if(!firstGraph->isEmpty()) {
y -= 5;
// write all dependent variable names to get width of first column
foreach(Graph *g, Graphs) {
for (Graph *g : Graphs) {
if(y < tHeight) break;
Str = g->Var;
colWidth = checkColumnWidth(Str, metrics, colWidth, x, y);
@ -276,7 +276,7 @@ if(!firstGraph->isEmpty()) {
QPen Pen;
int yLast, yNow;
y = y2-tHeight-9;
foreach(Graph *g, Graphs) {
for (Graph *g : Graphs) {
if(y < tHeight) {
// mark lack of space with a small arrow
Lines.append(new qucs::Line(4, 6, 4, -7, QPen(Qt::red,2)));

2
qucs/diagrams/truthdiagram.cpp
View File

@ -154,7 +154,7 @@ int TruthDiagram::calcDiagram()
firstGraph = g;
// ................................................
// all dependent variables
foreach(Graph *g ,Graphs) {
for (Graph *g : Graphs) {
y = y2-tHeight-5;
Str = g->Var;

4
qucs/dialogs/librarydialog.cpp
View File

@ -507,12 +507,12 @@ void LibraryDialog::slotSave()
XSPICE_CMbuilder *bld = new XSPICE_CMbuilder(Doc);
QStringList srcs,dsts;
bld->getModIfsFileList(srcs);
foreach(QString ifl,srcs) {
for (QString& ifl : srcs) {
QString ofl=ifl;
intoFile(ifl,ofl,dsts);
}
QString s = "<SpiceAttach ";
foreach (QString f,dsts) {
for (const QString& f : dsts) {
s += " \"" + f + "\"";
}
s += ">\n";

4
qucs/dialogs/qucssettingsdialog.cpp
View File

@ -1076,7 +1076,7 @@ void QucsSettingsDialog::slotRemovePath()
// get the selected items from the table
QList<QTableWidgetItem *> selectedPaths = pathsTableWidget->selectedItems();
foreach (QTableWidgetItem * item, selectedPaths)
for (QTableWidgetItem * item : selectedPaths)
{
QString path = item->text();
//removedPaths.append(path);
@ -1101,7 +1101,7 @@ void QucsSettingsDialog::makePathTable()
pathsTableWidget->setRowCount(0);
// fill listview with the list of paths
foreach (QString pathstr, currentPaths)
for (const QString& pathstr : currentPaths)
{
int row = pathsTableWidget->rowCount();
pathsTableWidget->setRowCount(row+1);

55
qucs/extsimkernels/abstractspicekernel.cpp
View File

@ -264,16 +264,15 @@ void AbstractSpiceKernel::createSubNetlsit(QTextStream &stream, bool lib)
}
}
std::sort(ports.begin(), ports.end());
QPair<int,QString> pp;
if (lib) header += " gnd "; // Ground node forwarding for Library
foreach(pp,ports) {
for (const auto& pp : ports) {
header += pp.second + " ";
}
Painting *pi;
for(pi = Sch->SymbolPaints.first(); pi != 0; pi = Sch->SymbolPaints.next())
if(pi->Name == ".ID ") {
ID_Text *pid = (ID_Text*)pi;
Painting *pai;
for(pai = Sch->SymbolPaints.first(); pai != 0; pai = Sch->SymbolPaints.next())
if(pai->Name == ".ID ") {
ID_Text *pid = (ID_Text*)pai;
QList<SubParameter *>::const_iterator it;
for(it = pid->Parameter.constBegin(); it != pid->Parameter.constEnd(); it++) {
header += (*it)->Name + " "; // keep 'Name' unchanged
@ -413,7 +412,7 @@ void AbstractSpiceKernel::parseHBOutput(QString ngspice_file, QList<QList<double
vars1.removeFirst();
vars1.removeFirst();
QStringList norm_vars;
foreach(QString v, vars1) { // Normalize variables
for (const QString& v : vars1) { // Normalize variables
QString nv = v;
nv.remove(0,3).chop(1); // extract variable between "Re|Im(" and ")"
if (!norm_vars.contains(nv))
@ -459,9 +458,12 @@ void AbstractSpiceKernel::parseFourierOutput(QString ngspice_file, QList<QList<d
if (lin.isEmpty()) continue;
if (lin.contains("Fourier analysis for")) {
QStringList tokens = lin.split(sep,qucs::SkipEmptyParts);
QString var;
foreach(var,tokens) {
if (var.contains('(')&&var.contains(')')) break;
QString var; // TODO chech
for (const QString& var1 : tokens) {
if (var1.contains('(')&&var1.contains(')')) {
var = var1;
break;
}
}
if (var.endsWith(':')) var.chop(1);
@ -561,7 +563,7 @@ void AbstractSpiceKernel::parsePZOutput(QString ngspice_file, QList<QList<double
if (lines.count("PZ analysis")>1) ParSwp = true;
foreach (QString lin, lines) { // Extract poles
for (const QString& lin : lines) { // Extract poles
if (lin.contains(var + "(")) {
if (!var_list.contains(var)) {
var_list.append(var+"_number");
@ -637,7 +639,7 @@ void AbstractSpiceKernel::parseDC_OPoutput(QString ngspice_file)
if (ofile.open(QFile::ReadOnly)) {
QTextStream ngsp_data(&ofile);
QStringList lines = ngsp_data.readAll().split("\n");
foreach (QString lin,lines) {
for (const QString& lin : lines) {
if (lin.contains('=')) {
QString nod = lin.section('=',0,0).remove(' ');
double val = lin.section('=',1,1).toDouble();
@ -1044,10 +1046,12 @@ void AbstractSpiceKernel::convertToQucsData(const QString &qucs_dataset)
{
if (DC_OP_only) { // Don't touch existing datasets when only DC was simulated
// It's need to show DC bias on schematic only
foreach(QString output,output_files) {
QString full_outfile = workdir+QDir::separator()+output;
if (output.endsWith(".dc_op")) parseDC_OPoutput(full_outfile);
else if (output.endsWith(".dc_op_xyce")) parseDC_OPoutputXY(full_outfile);
for (const QString& outputfile : output_files) {
QString full_outfile = workdir+QDir::separator()+outputfile;
if (outputfile.endsWith(".dc_op")) {
parseDC_OPoutput(full_outfile);
} else if (outputfile.endsWith(".dc_op_xyce")) {
parseDC_OPoutputXY(full_outfile); }
}
return;
}
@ -1061,8 +1065,7 @@ void AbstractSpiceKernel::convertToQucsData(const QString &qucs_dataset)
QString sim,indep;
QStringList indep_vars;
QString ngspice_output_filename;
foreach(ngspice_output_filename,output_files) { // For every simulation convert results to Qucs dataset
for (const QString& ngspice_output_filename : output_files) { // For every simulation convert results to Qucs dataset
QList< QList<double> > sim_points;
QStringList var_list;
QString swp_var,swp_var2;
@ -1166,7 +1169,7 @@ void AbstractSpiceKernel::convertToQucsData(const QString &qucs_dataset)
normalizeVarsNames(var_list);
QString indep = var_list.first();
QList<double> sim_point;
//QList<double> sim_point;
if (hasParSweep) {
@ -1184,7 +1187,7 @@ void AbstractSpiceKernel::convertToQucsData(const QString &qucs_dataset)
}
ds_stream<<QString("<indep %1 %2>\n").arg(swp_var).arg(swp_var_val.count());
foreach (QString val,swp_var_val) {
for (const QString& val : swp_var_val) {
ds_stream<<val<<"\n";
}
ds_stream<<"</indep>\n";
@ -1192,7 +1195,7 @@ void AbstractSpiceKernel::convertToQucsData(const QString &qucs_dataset)
else indep += " " + swp_var;
if (hasDblParSweep) {
ds_stream<<QString("<indep %1 %2>\n").arg(swp_var2).arg(swp_var2_val.count());
foreach (QString val,swp_var2_val) {
for (const QString& val : swp_var2_val) {
ds_stream<<val<<"\n";
}
ds_stream<<"</indep>\n";
@ -1200,7 +1203,7 @@ void AbstractSpiceKernel::convertToQucsData(const QString &qucs_dataset)
}
} else if (!indep.isEmpty()) {
ds_stream<<QString("<indep %1 %2>\n").arg(indep).arg(sim_points.count()); // output indep var: TODO: parameter sweep
foreach (sim_point,sim_points) {
for (auto& sim_point : sim_points) {
ds_stream<<QString::number(sim_point.at(0),'e',12)<<"\n";
}
ds_stream<<"</indep>\n";
@ -1209,7 +1212,7 @@ void AbstractSpiceKernel::convertToQucsData(const QString &qucs_dataset)
for(int i=1;i<var_list.count();i++) { // output dep var
if (indep.isEmpty()) ds_stream<<QString("<indep %1 %2>\n").arg(var_list.at(i)).arg(sim_points.count());
else ds_stream<<QString("<dep %1 %2>\n").arg(var_list.at(i)).arg(indep);
foreach (sim_point,sim_points) {
for (auto& sim_point : sim_points) {
if (isComplex) {
double re=sim_point.at(2*(i-1)+1);
double im = sim_point.at(2*i);
@ -1245,7 +1248,7 @@ void AbstractSpiceKernel::convertToQucsData(const QString &qucs_dataset)
*/
void AbstractSpiceKernel::removeAllSimulatorOutputs()
{
foreach(QString output_filename,output_files) {
for (const QString& output_filename : output_files) {
QString full_outfile = workdir+QDir::separator()+output_filename;
QFile::remove(full_outfile);
}
@ -1274,8 +1277,8 @@ void AbstractSpiceKernel::normalizeVarsNames(QStringList &var_list)
HB = true;
}
for(auto it = var_list.begin();it!=var_list.end();it++) { // For subcircuit nodes output i.e. v(X1:n1)
(*it).replace(":","_"); // colon symbol is reserved in Qucs as dataset specifier
for(auto & it : var_list) { // For subcircuit nodes output i.e. v(X1:n1)
it.replace(":","_"); // colon symbol is reserved in Qucs as dataset specifier
}
QStringList::iterator it=var_list.begin();

32
qucs/extsimkernels/codemodelgen.cpp
View File

@ -169,7 +169,7 @@ bool CodeModelGen::createIFSfromEDD(QTextStream &stream, Schematic *sch, Compone
stream<<QString("Spice_Model_Name: %1\n").arg(base.toLower());
stream<<"Description: \" \"\n\n";
foreach(QString pp,ports) {
for(const QString& pp : ports) {
stream<<"\nPORT_TABLE:\n";
stream<<QString("Port_Name: %1\n").arg(pp);
stream<<"Description: \" \"\n";
@ -192,7 +192,7 @@ bool CodeModelGen::createIFSfromEDD(QTextStream &stream, Schematic *sch, Compone
spicecompat::splitEqn(Ieqn,tokens);
spicecompat::splitEqn(Qeqn,tokens1);
tokens.append(tokens1);
foreach(QString tok,tokens){
for(QString& tok : tokens){
bool isNum = true;
tok.toFloat(&isNum);
QRegExp inp_pattern("[IV][0-9]+");
@ -206,7 +206,7 @@ bool CodeModelGen::createIFSfromEDD(QTextStream &stream, Schematic *sch, Compone
scanEquations(sch,pars,dummy1,dummy2); // Recursively extract all parameter from Eqns.
// Form parameter table
foreach(QString par,pars) {
for (const QString& par : pars) {
stream<<"PARAMETER_TABLE:\n";
stream<<QString("Parameter_Name: %1\n").arg(par.toLower());
stream<<"Description: \" \"\n"
@ -260,7 +260,7 @@ bool CodeModelGen::createMODfromEDD(QTextStream &stream, Schematic *sch, Compone
stream<<"{\n";
QStringList pars,init_pars,Ieqns,Qeqns,InitEqns,inputs;
foreach(QString port,ports) {
for (const QString& port : ports) {
QString Ieqn,Qeqn;
for(int i=0;i<Nbranch;i++) {
QString net1 = pc->Ports.at(2*i)->Connection->Name;
@ -281,7 +281,7 @@ bool CodeModelGen::createMODfromEDD(QTextStream &stream, Schematic *sch, Compone
spicecompat::splitEqn(Ieqn,tokens);
spicecompat::splitEqn(Qeqn,tokens1);
tokens.append(tokens1);
foreach(QString tok,tokens){
for (QString& tok : tokens){
bool isNum = true;
tok.toFloat(&isNum);
QRegExp inp_pattern("[IV][0-9]+");
@ -295,7 +295,7 @@ bool CodeModelGen::createMODfromEDD(QTextStream &stream, Schematic *sch, Compone
scanEquations(sch,pars,init_pars,InitEqns);
QStringList inputs_old; // Variables for charge eqns.
foreach(QString inp,inputs) {
for (const QString& inp : inputs) {
inputs_old.append(inp+"_old");
}
@ -337,7 +337,7 @@ bool CodeModelGen::createMODfromEDD(QTextStream &stream, Schematic *sch, Compone
stream<<"\tdouble delta_t;\n\n";
stream<<"\tif(INIT) {\n";
foreach (QString par, pars) {
for (const QString& par : pars) {
stream<<"\t\t"+ par + " = PARAM(" + par.toLower() + ");\n";
}
auto it_ip=init_pars.begin();
@ -353,10 +353,10 @@ bool CodeModelGen::createMODfromEDD(QTextStream &stream, Schematic *sch, Compone
stream<<"\tif (ANALYSIS != AC) {\n";
stream<<"\tif (TIME == 0) {\n";
//QStringList::iterator it1 = inputs.begin();
for(auto it1 = inputs.begin();it1!=inputs.end();it1++) {
QString vv = *it1; // Get input voltage number
for(auto & input : inputs) {
QString vv = input; // Get input voltage number
int vn = vv.remove(0,1).toInt()-1;
stream<<QString("\t\t%1_old = %1 = INPUT(%2);\n").arg(*it1).arg(ports.at(vn));
stream<<QString("\t\t%1_old = %1 = INPUT(%2);\n").arg(input).arg(ports.at(vn));
}
for (int i=0;i<ports.count();i++) {
stream<<QString("\t\tQ%1=0.0;\n").arg(i);
@ -365,10 +365,10 @@ bool CodeModelGen::createMODfromEDD(QTextStream &stream, Schematic *sch, Compone
stream<<"\t} else {\n";
// Get input voltages
//QStringList::iterator it = inputs.begin();
for(auto it = inputs.begin();it!=inputs.end();it++) {
QString vv = *it; // Get input voltage number
for(auto & input : inputs) {
QString vv = input; // Get input voltage number
int vn = vv.remove(0,1).toInt()-1;
stream<<QString("\t\t%1 = INPUT(%2);\n").arg(*it).arg(ports.at(vn));
stream<<QString("\t\t%1 = INPUT(%2);\n").arg(input).arg(ports.at(vn));
}
// Time variable for charge eqns.
stream<<"\t\tdelta_t=TIME-T(1);\n";
@ -386,7 +386,7 @@ bool CodeModelGen::createMODfromEDD(QTextStream &stream, Schematic *sch, Compone
stream<<QString("\t\tcQ%1 = (%2)/(delta_t+1e-20);\n").arg(i).arg(rCeq);
}
}
foreach(QString inp,inputs) {
for (const QString& inp : inputs) {
stream<<QString("\t\t%1_old = %1;\n").arg(inp);
}
stream<<"\t}\n";
@ -584,7 +584,7 @@ void CodeModelGen::scanEquations(Schematic *sch,QStringList &pars,
QStringList &init_pars, QStringList &InitEqns)
{
bool found = false;
for(Component *pc=sch->DocComps.first();pc!=0;pc=sch->DocComps.next()) {
for(Component *pc=sch->DocComps.first();pc!=nullptr;pc=sch->DocComps.next()) {
if(pc->Model=="Eqn") {
int Np = pc->Props.count();
for(int i=0;i<Np-1;i++) {
@ -603,7 +603,7 @@ void CodeModelGen::scanEquations(Schematic *sch,QStringList &pars,
GinacConvToC(InitEqn,res);
InitEqn = res;
InitEqns.append(InitEqn);
foreach(QString tok,tokens) {
for (QString& tok : tokens) {
bool isNum = true;
tok.toFloat(&isNum);
if ((!isGinacFunc(tok))&&(!isNum))

6
qucs/extsimkernels/customsimdialog.cpp
View File

@ -161,7 +161,7 @@ void CustomSimDialog::slotFindVars()
QStringList strings = edtCode->toPlainText().split('\n');
foreach(QString line,strings) {
for (const QString& line : strings) {
QRegExp let_pattern("^\\s*let\\s+[A-Za-z]+\\w*\\s*\\=\\s*[A-Za-z]+.*$");
if (let_pattern.exactMatch(line)) {
QString var = line.section('=',0,0);
@ -181,7 +181,7 @@ void CustomSimDialog::slotFindOutputs()
if (isXyceScr) {
QRegExp print_ex("^\\s*\\.print\\s.*");
print_ex.setCaseSensitivity(Qt::CaseInsensitive);
foreach(QString line,strings) {
for (const QString& line : strings) {
if (print_ex.exactMatch(line)) {
QRegExp file_ex("\\s*file\\s*=\\s*");
file_ex.setCaseSensitivity(Qt::CaseInsensitive);
@ -195,7 +195,7 @@ void CustomSimDialog::slotFindOutputs()
} else {
QRegExp write_ex("^\\s*write\\s.*");
write_ex.setCaseSensitivity(Qt::CaseInsensitive);
foreach(QString line,strings) {
for (const QString& line : strings) {
if (write_ex.exactMatch(line)) {
outps.append(line.section(QRegExp("\\s"),1,1,QString::SectionSkipEmpty));
}

6
qucs/extsimkernels/ngspice.cpp
View File

@ -153,10 +153,9 @@ void Ngspice::createNetlist(QTextStream &stream, int ,
}
}
QString sim;
outputs.clear();
foreach(sim, simulations) {
for (const QString& sim : simulations) {
bool hasParSWP = false;
bool hasDblSWP = false;
@ -298,10 +297,9 @@ void Ngspice::createNetlist(QTextStream &stream, int ,
continue;
}
QString nod;
QString nods;
nods.clear();
foreach (nod,vars) {
for (const QString& nod : vars) {
if (!nod.endsWith("#branch")) {
nods += QString("v(%1) ").arg(nod);
} else {

46
qucs/extsimkernels/qucs2spice.cpp
View File

@ -31,20 +31,20 @@
namespace qucs2spice
{
QString convert_rcl(QString line);
QString convert_rcl(const QString& line);
QString convert_header(QString line);
QString convert_diode(QString line,bool xyce=false);
QString convert_jfet(QString line, bool xyce=false);
QString convert_mosfet(QString line, bool xyce=false);
QString convert_bjt(QString line);
QString convert_cccs(QString line);
QString convert_ccvs(QString line);
QString convert_ccs(QString line, bool voltage);
QString convert_vccs(QString line);
QString convert_vcvs(QString line);
QString convert_vcs(QString line, bool voltage);
QString convert_dc_src(QString line);
QString convert_edd(QString line, QStringList &EqnsAndVars);
QString convert_cccs(const QString& line);
QString convert_ccvs(const QString& line);
QString convert_ccs(const QString& line, bool voltage);
QString convert_vccs(const QString& line);
QString convert_vcvs(const QString& line);
QString convert_vcs(const QString& line, bool voltage);
QString convert_dc_src(const QString& line);
QString convert_edd(const QString& line, QStringList &EqnsAndVars);
QString convert_subckt(QString line);
QString convert_gyrator(QString line);
@ -85,7 +85,7 @@ QString qucs2spice::convert_netlist(QString netlist, bool xyce)
QStringList EqnsAndVars;
foreach(QString line,net_lst) { // Find equations
for (QString line : net_lst) { // Find equations
if (eqn_pattern.exactMatch(line)) {
line.remove(QRegExp("^[ \t]*Eqn:[A-Za-z]+\\w+\\s+"));
ExtractVarsAndValues(line,EqnsAndVars);
@ -96,7 +96,7 @@ QString qucs2spice::convert_netlist(QString netlist, bool xyce)
EqnsAndVars.removeAll("yes");
foreach(QString line,net_lst) {
for (QString& line : net_lst) {
if (subckt_head_pattern.exactMatch(line)) {
if (ends_pattern.exactMatch(line)) s += ".ENDS\n";
else s += convert_header(line);
@ -122,7 +122,7 @@ QString qucs2spice::convert_netlist(QString netlist, bool xyce)
return s;
}
QString qucs2spice::convert_rcl(QString line)
QString qucs2spice::convert_rcl(const QString& line)
{
QString s="";
QStringList lst = line.split(" ",qucs::SkipEmptyParts);
@ -256,14 +256,14 @@ QString qucs2spice::convert_bjt(QString line)
QStringList spice_incompat; // spice incompatibel parameters;
spice_incompat<<"Type="<<"Area="<<"Temp="<<"Ffe="<<"Kb="<<"Ab="<<"Fb=";
for(int i=0;i<lst.count();i++) {
QString s1 = lst.at(i);
const QString& s1 = lst.at(i);
if (s1.startsWith("Type=\"npn\"")) {
Typ = "NPN";
} else if (s1.startsWith("Type=\"pnp\"")) {
Typ = "PNP";
} else {
bool is_incompat = false;
foreach (QString incompat,spice_incompat) {
for (const QString& incompat : spice_incompat) {
if (s1.startsWith(incompat)) {
is_incompat = true;
break;
@ -279,17 +279,17 @@ QString qucs2spice::convert_bjt(QString line)
return s;
}
QString qucs2spice::convert_cccs(QString line)
QString qucs2spice::convert_cccs(const QString& line)
{
return convert_ccs(line,false);
}
QString qucs2spice::convert_ccvs(QString line)
QString qucs2spice::convert_ccvs(const QString& line)
{
return convert_ccs(line,true);
}
QString qucs2spice::convert_ccs(QString line, bool voltage)
QString qucs2spice::convert_ccs(const QString& line, bool voltage)
{
QStringList lst = line.split(" ",qucs::SkipEmptyParts);
QString name = lst.takeFirst();
@ -311,17 +311,17 @@ QString qucs2spice::convert_ccs(QString line, bool voltage)
return s;
}
QString qucs2spice::convert_vccs(QString line)
QString qucs2spice::convert_vccs(const QString& line)
{
return convert_vcs(line,false);
}
QString qucs2spice::convert_vcvs(QString line)
QString qucs2spice::convert_vcvs(const QString& line)
{
return convert_vcs(line,true);
}
QString qucs2spice::convert_vcs(QString line,bool voltage)
QString qucs2spice::convert_vcs(const QString& line,bool voltage)
{
QStringList lst = line.split(" ",qucs::SkipEmptyParts);
QString name = lst.takeFirst();
@ -343,7 +343,7 @@ QString qucs2spice::convert_vcs(QString line,bool voltage)
return s;
}
QString qucs2spice::convert_dc_src(QString line)
QString qucs2spice::convert_dc_src(const QString& line)
{
QString s="";
QStringList lst = line.split(" ",qucs::SkipEmptyParts);
@ -358,14 +358,14 @@ QString qucs2spice::convert_dc_src(QString line)
return s;
}
QString qucs2spice::convert_edd(QString line, QStringList &EqnsAndVars)
QString qucs2spice::convert_edd(const QString& line, QStringList &EqnsAndVars)
{
QString s="";
QStringList lst = line.split(" ",qucs::SkipEmptyParts);
QStringList nods;
QString nam = lst.takeFirst().remove(':');
foreach (QString str,lst) {
for (const QString& str : lst) {
if (!str.contains('=')) {
//str.replace("gnd","0");
nods.append(str);

8
qucs/extsimkernels/spicecompat.cpp
View File

@ -182,7 +182,7 @@ bool spicecompat::containNodes(QStringList &tokens, QStringList &vars)
QStringList system_vars;
system_vars.clear();
system_vars<<"frequency"<<"acfrequency"<<"time"<<"hbfrequncy";
foreach (QString tok,tokens) {
for (const QString& tok : tokens) {
if (var_pattern.exactMatch(tok)) return true;
if (disto_var.exactMatch(tok)) return true;
if (system_vars.contains(tok)) return true;
@ -303,14 +303,14 @@ int spicecompat::getPins(const QString &file, const QString &compname, QStringLi
* \param subfilename file containing subcircuit definition
* \return .SUBCKT entry name
*/
QString spicecompat::getSubcktName(QString subfilename)
QString spicecompat::getSubcktName(const QString& subfilename)
{
QString s = "";
QFile sub_file(subfilename);
if (sub_file.open(QIODevice::ReadOnly)) {
QStringList lst = QString(sub_file.readAll()).split("\n");
foreach (QString str, lst) {
for (const QString& str : lst) {
QRegExp subckt_header("^\\s*\\.(S|s)(U|u)(B|b)(C|c)(K|k)(T|t)\\s.*");
if (subckt_header.exactMatch(str)) {
QRegExp sep("\\s");
@ -329,7 +329,7 @@ QString spicecompat::getSubcktName(QString subfilename)
* \param sweep Sweep designation in Qucs notation
* \return Sweep designation in SPICE notation
*/
QString spicecompat::convert_sweep_type(QString sweep)
QString spicecompat::convert_sweep_type(const QString& sweep)
{
if (sweep=="lin") return QString("lin");
if (sweep=="log") return QString("dec");

4
qucs/extsimkernels/spicecompat.h
View File

@ -21,8 +21,8 @@ namespace spicecompat {
QString normalize_node_name(QString nod);
QString convert_relative_filename(QString filename);
int getPins(const QString &file, const QString &compname, QStringList &pin_names);
QString getSubcktName(QString subfilename);
QString convert_sweep_type(QString sweep);
QString getSubcktName(const QString& subfilename);
QString convert_sweep_type(const QString& sweep);
bool check_nodename(QString &node);
QString getDefaultSimulatorName();

2
qucs/extsimkernels/verilogawriter.cpp
View File

@ -162,7 +162,7 @@ bool VerilogAwriter::createVA_module(QTextStream &stream, Schematic *sch)
QString s = pc->Ports.first()->Connection->Name;
if (!ports.contains(s)) ports.append(s);
} else {
foreach(Port *pp,pc->Ports) { // Find all signals
for (Port *pp : pc->Ports) { // Find all signals
QString s = pp->Connection->Name;
if (!nodes.contains(s)) nodes.append(s);
}

26
qucs/extsimkernels/xspice_cmbuilder.cpp
View File

@ -189,7 +189,7 @@ void XSPICE_CMbuilder::createCModelTree(QString &output)
*/
bool XSPICE_CMbuilder::ModIfsPairProcessed(const QString &mod, const QString &ifs)
{
foreach (QStringList lst, mod_ifs_pairs) {
for (QStringList lst : mod_ifs_pairs) {
if ((lst.at(0)==mod)&&(lst.at(1)==ifs)) return true;
}
return false;
@ -383,8 +383,8 @@ QString XSPICE_CMbuilder::getNgspiceRoot()
if (!inf.exists()) { // It may be in $PATH
char *p = getenv("PATH");
QStringList paths;
if (p!=NULL) paths = QString(p).split(':');
foreach (QString pp,paths) {
if (p!=nullptr) paths = QString(p).split(':');
for (const QString& pp : paths) {
inf.setFile(pp+QDir::separator()+QucsSettings.NgspiceExecutable);
if (inf.exists()) s = inf.canonicalPath();
}
@ -395,24 +395,6 @@ QString XSPICE_CMbuilder::getNgspiceRoot()
bool XSPICE_CMbuilder::removeDir(const QString &dirName)
{
bool result = true;
QDir dir(dirName);
if (dir.exists(dirName)) {
Q_FOREACH(QFileInfo info, dir.entryInfoList(QDir::NoDotAndDotDot | QDir::System | QDir::Hidden | QDir::AllDirs | QDir::Files, QDir::DirsFirst)) {
if (info.isDir()) {
result = removeDir(info.absoluteFilePath());
}
else {
result = QFile::remove(info.absoluteFilePath());
}
if (!result) {
return result;
}
}
result = dir.rmdir(dirName);
}
return result;
return dir.removeRecursively();
}

2
qucs/extsimkernels/xspice_cmbuilder.h
View File

@ -57,7 +57,7 @@ private:
void ExtractModIfsFiles(QStringList &objects, QStringList &lst_entries,
const QString &prefix, QString &output);
bool ModIfsPairProcessed(const QString &mod, const QString &ifs);
QString getNgspiceRoot();
static QString getNgspiceRoot();
};
#endif // XSPICE_CMBUILDER_H

6
qucs/extsimkernels/xyce.cpp
View File

@ -137,9 +137,9 @@ void Xyce::createNetlist(QTextStream &stream, int , QStringList &simulations,
QFileInfo inf(Sch->DocName);
QString basenam = inf.baseName();
QString nod,nods;
QString nods;
nods.clear();
foreach (nod,vars) {
for (auto& nod :vars) {
if (!nod.startsWith("I(")) {
nods += QString("v(%1) ").arg(nod);
} else {
@ -311,7 +311,7 @@ void Xyce::slotSimulate()
QFile::remove(workdir+"spice4qucs.sens_tr.cir.SENS.prn");
QFile::remove(workdir+"spice4qucs.sens_tr.cir.TRADJ.prn");
foreach(QString sim,simulationsQueue) {
for (const QString& sim : simulationsQueue) {
QStringList sim_lst;
sim_lst.clear();
sim_lst.append(sim);

23
qucs/imagewriter.cpp
View File

@ -38,9 +38,9 @@ ImageWriter::~ImageWriter()
}
void
ImageWriter::noGuiPrint(QWidget *doc, QString printFile, QString color)
ImageWriter::noGuiPrint(QWidget *doc, const QString& printFile, const QString& color)
{
Schematic *sch = static_cast<Schematic*>(doc);
Schematic *sch = dynamic_cast<Schematic*>(doc);
const int bourder = 30;
int w,h,wsel,hsel,
xmin, ymin, xmin_sel, ymin_sel;
@ -131,7 +131,7 @@ QString ImageWriter::getLastSavedFile()
// FIXME: should check if filename exists and not silently overwrite
int ImageWriter::print(QWidget *doc)
{
Schematic *sch = static_cast<Schematic*>(doc);
Schematic *sch = dynamic_cast<Schematic*>(doc);
const int border = 30;
int w,h,wsel,hsel,
@ -328,7 +328,7 @@ void ImageWriter::getSelAreaWidthAndHeight(Schematic *sch, int &wsel, int &hsel,
}
}
for(Wire *pw = sch->Wires->first(); pw != 0; pw = sch->Wires->next()) {
for(Wire *pw = sch->Wires->first(); pw != nullptr; pw = sch->Wires->next()) {
if (pw->isSelected) {
if(pw->x1 < xmin) xmin = pw->x1;
@ -348,7 +348,7 @@ void ImageWriter::getSelAreaWidthAndHeight(Schematic *sch, int &wsel, int &hsel,
}
}
for(Node *pn = sch->Nodes->first(); pn != 0; pn = sch->Nodes->next()) {
for(Node *pn = sch->Nodes->first(); pn != nullptr; pn = sch->Nodes->next()) {
WireLabel *pl = pn->Label;
if(pl) { // check position of node label
if (pl->isSelected) {
@ -362,19 +362,16 @@ void ImageWriter::getSelAreaWidthAndHeight(Schematic *sch, int &wsel, int &hsel,
}
}
for(Diagram *pd = sch->Diagrams->first(); pd != 0; pd =sch-> Diagrams->next()) {
for(Diagram *pd = sch->Diagrams->first(); pd != nullptr; pd =sch-> Diagrams->next()) {
if (pd->isSelected) {
int x1,y1,x2,y2;
pd->Bounding(x1,y1,x2,y2);
updateMinMax(xmin,xmax,ymin,ymax,x1,x2,y1,y2);
foreach (Graph *pg, pd->Graphs) {
foreach (Marker *pm, pg->Markers) {
for (auto& pg: qAsConst(pd->Graphs)) {
for (auto& pm: qAsConst(pg->Markers)) {
if (pm->isSelected) {
int x1,y1,x2,y2;
//int x1,y1,x2,y2;
pm->Bounding(x1,y1,x2,y2);
updateMinMax(xmin,xmax,ymin,ymax,x1,x2,y1,y2);
}
@ -383,7 +380,7 @@ void ImageWriter::getSelAreaWidthAndHeight(Schematic *sch, int &wsel, int &hsel,
}
}
for(Painting *pp = sch->Paintings->first(); pp != 0; pp = sch->Paintings->next()) {
for(Painting *pp = sch->Paintings->first(); pp != nullptr; pp = sch->Paintings->next()) {
if (pp->isSelected) {
int x1,y1,x2,y2;

4
qucs/imagewriter.h
View File

@ -33,7 +33,7 @@ public:
ImageWriter (QString lastfile);
virtual ~ImageWriter ();
int print(QWidget *);
void noGuiPrint(QWidget *, QString printFile, QString color);
void noGuiPrint(QWidget *, const QString& printFile, const QString& color);
QString getLastSavedFile();
@ -44,7 +44,7 @@ private:
void getSchWidthAndHeight(Schematic *sch, int &w, int &h, int &xmin, int &ymin);
void getSelAreaWidthAndHeight(Schematic *sch, int &wsel, int& hsel, int& xmin_sel_, int& ymin_sel_);
void updateMinMax(int &xmin, int &xmax, int &ymin, int &ymax, int x1, int x2, int y1m, int y2);
static void updateMinMax(int &xmin, int &xmax, int &ymin, int &ymax, int x1, int x2, int y1m, int y2);
};
#endif

30
qucs/main.cpp
View File

@ -276,7 +276,7 @@ bool saveApplSettings()
settings.remove("Paths");
settings.beginWriteArray("Paths");
int i = 0;
foreach(QString path, qucsPathList) {
for (QString& path: qucsPathList) {
settings.setArrayIndex(i);
settings.setValue("path", path);
i++;
@ -530,7 +530,7 @@ void createIcons() {
Module::registerModules ();
QStringList cats = Category::getCategories ();
foreach(QString category, cats) {
for (const QString& category: cats) {
QList<Module *> Comps;
Comps = Category::getModules(category);
@ -541,7 +541,7 @@ void createIcons() {
char * File;
QString Name;
foreach (Module *Mod, Comps) {
for (Module *Mod: Comps) {
if (Mod->info) {
Element *e = (Mod->info) (Name, File, true);
@ -557,11 +557,11 @@ void createIcons() {
QGraphicsScene *scene = new QGraphicsScene();
foreach (qucs::Line *l, Lines) {
for (qucs::Line *l : Lines) {
scene->addLine(l->x1, l->y1, l->x2, l->y2, l->style);
}
foreach(struct qucs::Arc *a, Arcs) {
for (struct qucs::Arc *a: Arcs) {
// we need an open item here; QGraphisEllipseItem draws a filled ellipse and doesn't do the job here...
QPainterPath *path = new QPainterPath();
// the components do not contain the angles in degrees but in 1/16th degrees -> conversion needed
@ -570,19 +570,19 @@ void createIcons() {
scene->addPath(*path);
}
foreach(qucs::Area *a, Rects) {
for(qucs::Area *a: Rects) {
scene->addRect(a->x, a->y, a->w, a->h, a->Pen, a->Brush);
}
foreach(qucs::Area *a, Ellips) {
for(qucs::Area *a: Ellips) {
scene->addEllipse(a->x, a->y, a->w, a->h, a->Pen, a->Brush);
}
foreach(Port *p, Ports) {
for(Port *p: Ports) {
scene->addEllipse(p->x-4, p->y-4, 8, 8, QPen(Qt::red));
}
foreach(Text *t, Texts) {
for(Text *t: Texts) {
QFont myFont;
myFont.setPointSize(10);
QGraphicsTextItem* item = new QGraphicsTextItem(t->s);
@ -664,7 +664,7 @@ void createDocData() {
int nComps = 0;
// table for quick reference, schematic and netlist entry
foreach(QString category, cats) {
for (const QString& category: cats) {
QList<Module *> Comps;
Comps = Category::getModules(category);
@ -684,7 +684,7 @@ void createDocData() {
int num = 0; // component id inside category
foreach (Module *Mod, Comps) {
for (Module *Mod: Comps) {
num += 1;
nComps += 1;
@ -720,7 +720,7 @@ void createDocData() {
QStringList compProps;
compProps << "# Note: auto-generated file (changes will be lost on update)";
compProps << QString("# %1; %2; %3; %4").arg( "Name", "Value", "Display", "Description");
foreach(Property *prop, c->Props) {
for (Property *prop : c->Props) {
compProps << QString("%1; \"%2\"; %3; \"%4\"").arg(
prop->Name,
prop->Value,
@ -755,7 +755,7 @@ void createListComponentEntry(){
Module::registerModules ();
QStringList cats = Category::getCategories ();
// table for quick reference, schematic and netlist entry
foreach(QString category, cats) {
for (QString category: cats) {
QList<Module *> Comps;
Comps = Category::getModules(category);
@ -766,7 +766,7 @@ void createListComponentEntry(){
char * File;
QString Name;
foreach (Module *Mod, Comps) {
for (Module *Mod: Comps) {
Element *e = (Mod->info) (Name, File, true);
Component *c = (Component* ) e;
@ -775,7 +775,7 @@ void createListComponentEntry(){
// add dummy ports/wires, avoid segfault
int port = 0;
foreach (Port *p, c->Ports) {
for (Port *p: c->Ports) {
Node *n = new Node(0,0);
n->Name="_net"+QString::number(port);
p->Connection = n;

15
qucs/mouseactions.cpp
View File

@ -49,8 +49,8 @@
#include <QLineEdit>
#include <QDebug>
#include <limits.h>
#include <stdlib.h>
#include <climits>
#include <cstdlib>
#define DOC_X_POS(x) (int(float(x)/Doc->Scale) + Doc->ViewX1)
@ -933,9 +933,8 @@ void MouseActions::MPressLabel(Schematic *Doc, QMouseEvent*, float fX, float fY)
if(Name.isEmpty()) return;
*/
if(pe) {
if(((Conductor*)pe)->Label)
delete ((Conductor*)pe)->Label; // delete old name
((Conductor*)pe)->Label = 0;
delete ((Conductor*)pe)->Label; // delete old name
((Conductor*)pe)->Label = nullptr;
}
int xl = x+30;
@ -1670,8 +1669,8 @@ void MouseActions::MReleaseResizeDiagram(Schematic *Doc, QMouseEvent *Event)
Diagram *pd = (Diagram*)focusElement;
pd->updateGraphData();
foreach(Graph *pg, pd->Graphs)
foreach(Marker *pm, pg->Markers) {
for (Graph *pg : pd->Graphs)
for(Marker *pm : pg->Markers) {
pm->x1 += MAx3; // correct changes due to move of diagram corner
pm->y1 += MAy3;
}
@ -1680,7 +1679,7 @@ void MouseActions::MReleaseResizeDiagram(Schematic *Doc, QMouseEvent *Event)
pd->Bounding(x1, x2, y1, y2);
Doc->enlargeView(x1, x2, y1, y2);
QucsMain->MouseMoveAction = 0;
QucsMain->MouseMoveAction = nullptr;
QucsMain->MousePressAction = &MouseActions::MPressSelect;
QucsMain->MouseReleaseAction = &MouseActions::MReleaseSelect;
QucsMain->MouseDoubleClickAction = &MouseActions::MDoubleClickSelect;

2
qucs/paintings/id_dialog.cpp
View File

@ -296,7 +296,7 @@ void ID_Dialog::slotOk()
if(changed)
idText->Parameter.swap(scratch);
foreach(SubParameter *p, scratch) {
for (SubParameter *p : scratch) {
delete p;
}

60
qucs/qucs.cpp
View File

@ -466,7 +466,7 @@ void QucsApp::fillLibrariesTreeView ()
QDir LibDir(QucsSettings.LibDir);
LibFiles = LibDir.entryList(QStringList("*.lib"), QDir::Files, QDir::Name);
QStringList blacklist = getBlacklistedLibraries(QucsSettings.LibDir);
foreach(QString ss, blacklist) { // exclude blacklisted files
for (const QString& ss: blacklist) { // exclude blacklisted files
LibFiles.removeAll(ss);
}
@ -483,18 +483,18 @@ void QucsApp::fillLibrariesTreeView ()
nameAndFileName.append (parsedlibrary.name);
nameAndFileName.append (QucsSettings.LibDir + *it);
QTreeWidgetItem* newlibitem = new QTreeWidgetItem((QTreeWidget*)0, nameAndFileName);
QTreeWidgetItem* newlibitem = new QTreeWidgetItem((QTreeWidget*)nullptr, nameAndFileName);
switch (result)
{
case QUCS_COMP_LIB_IO_ERROR:
{
QString filename = getLibAbsPath(libPath);
QMessageBox::critical(0, tr ("Error"), tr("Cannot open \"%1\".").arg (filename));
QMessageBox::critical(nullptr, tr ("Error"), tr("Cannot open \"%1\".").arg (filename));
return;
}
case QUCS_COMP_LIB_CORRUPT:
QMessageBox::critical(0, tr("Error"), tr("Library is corrupt."));
QMessageBox::critical(nullptr, tr("Error"), tr("Library is corrupt."));
return;
default:
break;
@ -539,7 +539,7 @@ void QucsApp::fillLibrariesTreeView ()
const QDir& UsrLibDir(UserLibDir);
LibFiles = UsrLibDir.entryList(QStringList("*.lib"), QDir::Files, QDir::Name);
blacklist = getBlacklistedLibraries(QucsSettings.LibDir);
foreach(QString ss, blacklist) { // exclude blacklisted files
for (const QString& ss : blacklist) { // exclude blacklisted files
LibFiles.removeAll(ss);
}
int UserLibCount = LibFiles.count();
@ -669,7 +669,7 @@ void QucsApp::fillComboBox (bool setAll)
CompChoose->insertItem(CompChoose->count(), QObject::tr("paintings"));
} else {
QStringList cats = Category::getCategories ();
foreach (QString it, cats) {
for (const QString& it : cats) {
CompChoose->insertItem(CompChoose->count(), it);
}
}
@ -803,12 +803,12 @@ void QucsApp::slotSearchComponent(const QString &searchText)
QString Name;
char * File;
QList<Module *> Comps;
iconCompInfoStruct iconCompInfo;
iconCompInfoStruct iconCompInfo{};
QVariant v;
QStringList cats = Category::getCategories ();
int catIdx = 0;
foreach(QString it, cats) {
for (const QString& it : cats) {
// this will go also over the "verilog-a user devices" category, if present
// but since modules there have no 'info' function it won't handle them
Comps = Category::getModules(it);
@ -1356,31 +1356,7 @@ bool QucsApp::recurRemove(const QString &Path)
{
bool result = true;
QDir projDir = QDir(Path);
if (projDir.exists(Path)) {
Q_FOREACH(QFileInfo info,
projDir.entryInfoList(
QDir::AllDirs | QDir::NoDotAndDotDot | QDir::Hidden | QDir::AllEntries, QDir::DirsFirst)) {
if (info.isDir()) {
result = recurRemove(info.absoluteFilePath());
if (!result) {
QMessageBox::information(this, tr("Info"),
tr("Cannot remove directory: %1").arg(Path));
return false;
}
}
else if(info.isFile()) {
result = QFile::remove(info.absoluteFilePath());
if (!result) {
QMessageBox::information(this, tr("Info"),
tr("Cannot delete file: %1").arg(info.fileName()));
return false;
}
}
}
result = projDir.rmdir(Path);
}
return result;
return projDir.removeRecursively();
}
// ----------------------------------------------------------
@ -2854,13 +2830,13 @@ void QucsApp::updateSchNameHash(void)
// clear out any existing hash table entries
schNameHash.clear();
foreach (QString qucspath, qucsPathList) {
for (const QString& qucspath : qucsPathList) {
QDir thispath(qucspath);
// get all the schematic files in the directory
QFileInfoList schfilesList = thispath.entryInfoList( nameFilter, QDir::Files );
// put each one in the hash table with the unique key the base name of
// the file, note this will overwrite the value if the key already exists
foreach (QFileInfo schfile, schfilesList) {
for (const QFileInfo& schfile : schfilesList) {
QString bn = schfile.completeBaseName();
schNameHash[schfile.completeBaseName()] = schfile.absoluteFilePath();
}
@ -2871,7 +2847,7 @@ void QucsApp::updateSchNameHash(void)
QFileInfoList schfilesList = thispath.entryInfoList( nameFilter, QDir::Files );
// put each one in the hash table with the unique key the base name of
// the file, note this will overwrite the value if the key already exists
foreach (QFileInfo schfile, schfilesList) {
for (const QFileInfo& schfile : schfilesList) {
schNameHash[schfile.completeBaseName()] = schfile.absoluteFilePath();
}
}
@ -2879,7 +2855,7 @@ void QucsApp::updateSchNameHash(void)
// -----------------------------------------------------------
// Searches the qucs path list for all spice files and creates
// a hash for lookup later
void QucsApp::updateSpiceNameHash(void)
void QucsApp::updateSpiceNameHash()
{
// update the list of paths to search in qucsPathList, this
// removes nonexisting entries
@ -2895,13 +2871,13 @@ void QucsApp::updateSpiceNameHash(void)
// clear out any existing hash table entries
spiceNameHash.clear();
foreach (QString qucspath, qucsPathList) {
for (const QString& qucspath : qucsPathList) {
QDir thispath(qucspath);
// get all the schematic files in the directory
QFileInfoList spicefilesList = thispath.entryInfoList( QucsSettings.spiceExtensions, QDir::Files );
// put each one in the hash table with the unique key the base name of
// the file, note this will overwrite the value if the key already exists
foreach (QFileInfo spicefile, spicefilesList) {
for (const QFileInfo& spicefile : spicefilesList) {
QString bn = spicefile.completeBaseName();
schNameHash[spicefile.completeBaseName()] = spicefile.absoluteFilePath();
}
@ -2912,14 +2888,14 @@ void QucsApp::updateSpiceNameHash(void)
QFileInfoList spicefilesList = thispath.entryInfoList( QucsSettings.spiceExtensions, QDir::Files );
// put each one in the hash table with the unique key the base name of
// the file, note this will overwrite the value if the key already exists
foreach (QFileInfo spicefile, spicefilesList) {
for (const QFileInfo& spicefile : spicefilesList) {
spiceNameHash[spicefile.completeBaseName()] = spicefile.absoluteFilePath();
}
}
// -----------------------------------------------------------
// update the list of paths, pruning non-existing paths
void QucsApp::updatePathList(void)
void QucsApp::updatePathList()
{
// check each path actually exists, if not remove it
QMutableListIterator<QString> i(qucsPathList);
@ -2941,7 +2917,7 @@ void QucsApp::updatePathList(QStringList newPathList)
qucsPathList.clear();
// copy the new path into the path list
foreach(QString path, newPathList)
for (const QString& path : newPathList)
{
qucsPathList.append(path);
}

2
qucs/qucs.h
View File

@ -254,7 +254,7 @@ private:
void switchSchematicDoc(bool);
void switchEditMode(bool);
void changeSchematicSymbolMode(Schematic*);
bool recurRemove(const QString &);
static bool recurRemove(const QString &);
void closeFile(int);
void updateRecentFilesList(QString s);

443
qucs/schematic.cpp
View File

@ -635,115 +635,114 @@ void Schematic::print(QPrinter*, QPainter *Painter, bool printAll, bool fitToPag
}
void Schematic::paintSchToViewpainter(ViewPainter *p, bool printAll, bool toImage, int screenDpiX, int printerDpiX)
{
void Schematic::paintSchToViewpainter(ViewPainter *p, bool printAll, bool toImage, int screenDpiX, int printerDpiX) {
bool selected;
if (printAll) {
int x2,y2;
if (sizeOfFrame(x2,y2)) paintFrame(p);
int x2, y2;
if (sizeOfFrame(x2, y2)) paintFrame(p);
}
for(Component *pc = Components->first(); pc != 0; pc = Components->next())
if(pc->isSelected || printAll) {
selected = pc->isSelected;
pc->isSelected = false;
if (toImage) {
pc->paint(p);
} else {
pc->print(p, (float)screenDpiX / (float)printerDpiX);
for (Component *pc = Components->first(); pc != 0; pc = Components->next())
if (pc->isSelected || printAll) {
selected = pc->isSelected;
pc->isSelected = false;
if (toImage) {
pc->paint(p);
} else {
pc->print(p, (float) screenDpiX / (float) printerDpiX);
}
pc->isSelected = selected;
}
pc->isSelected = selected;
}
for(Wire *pw = Wires->first(); pw != 0; pw = Wires->next()) {
if(pw->isSelected || printAll) {
selected = pw->isSelected;
pw->isSelected = false;
pw->paint(p); // paint all selected wires
pw->isSelected = selected;
}
if(pw->Label)
if(pw->Label->isSelected || printAll) {
selected = pw->Label->isSelected;
pw->Label->isSelected = false;
pw->Label->paint(p);
pw->Label->isSelected = selected;
for (Wire *pw = Wires->first(); pw != 0; pw = Wires->next()) {
if (pw->isSelected || printAll) {
selected = pw->isSelected;
pw->isSelected = false;
pw->paint(p); // paint all selected wires
pw->isSelected = selected;
}
if (pw->Label)
if (pw->Label->isSelected || printAll) {
selected = pw->Label->isSelected;
pw->Label->isSelected = false;
pw->Label->paint(p);
pw->Label->isSelected = selected;
}
}
Element *pe;
for(Node *pn = Nodes->first(); pn != 0; pn = Nodes->next()) {
for(pe = pn->Connections.first(); pe != 0; pe = pn->Connections.next())
if(pe->isSelected || printAll) {
pn->paint(p); // paint all nodes with selected elements
break;
}
if(pn->Label)
if(pn->Label->isSelected || printAll) {
selected = pn->Label->isSelected;
pn->Label->isSelected = false;
pn->Label->paint(p);
pn->Label->isSelected = selected;
}
for (Node *pn = Nodes->first(); pn != 0; pn = Nodes->next()) {
for (pe = pn->Connections.first(); pe != 0; pe = pn->Connections.next())
if (pe->isSelected || printAll) {
pn->paint(p); // paint all nodes with selected elements
break;
}
if (pn->Label)
if (pn->Label->isSelected || printAll) {
selected = pn->Label->isSelected;
pn->Label->isSelected = false;
pn->Label->paint(p);
pn->Label->isSelected = selected;
}
}
for(Painting *pp = Paintings->first(); pp != 0; pp = Paintings->next())
if(pp->isSelected || printAll) {
selected = pp->isSelected;
pp->isSelected = false;
pp->paint(p); // paint all selected paintings
pp->isSelected = selected;
}
for(Diagram *pd = Diagrams->first(); pd != 0; pd = Diagrams->next())
if(pd->isSelected || printAll) {
// if graph or marker is selected, deselect during printing
foreach(Graph *pg, pd->Graphs) {
if(pg->isSelected) pg->Type |= 1; // remember selection
pg->isSelected = false;
foreach(Marker *pm, pg->Markers) {
if(pm->isSelected) pm->Type |= 1; // remember selection
pm->isSelected = false;
}
for (Painting *pp = Paintings->first(); pp != 0; pp = Paintings->next())
if (pp->isSelected || printAll) {
selected = pp->isSelected;
pp->isSelected = false;
pp->paint(p); // paint all selected paintings
pp->isSelected = selected;
}
selected = pd->isSelected;
pd->isSelected = false;
pd->paintDiagram(p); // paint all selected diagrams with graphs and markers
pd->paintMarkers(p,printAll);
pd->isSelected = selected;
for (Diagram *pd = Diagrams->first(); pd != 0; pd = Diagrams->next())
if (pd->isSelected || printAll) {
// if graph or marker is selected, deselect during printing
for (Graph *pg: pd->Graphs) {
if (pg->isSelected) pg->Type |= 1; // remember selection
pg->isSelected = false;
for (Marker *pm: pg->Markers) {
if (pm->isSelected) pm->Type |= 1; // remember selection
pm->isSelected = false;
}
}
// revert selection of graphs and markers
foreach(Graph *pg, pd->Graphs) {
if(pg->Type & 1) pg->isSelected = true;
pg->Type &= -2;
foreach(Marker *pm, pg->Markers) {
if(pm->Type & 1) pm->isSelected = true;
pm->Type &= -2;
}
}
}
selected = pd->isSelected;
pd->isSelected = false;
pd->paintDiagram(p); // paint all selected diagrams with graphs and markers
pd->paintMarkers(p, printAll);
pd->isSelected = selected;
if(showBias > 0) { // show DC bias points in schematic ?
int x, y, z;
for(Node* pn = Nodes->first(); pn != 0; pn = Nodes->next()) {
if(pn->Name.isEmpty()) continue;
x = pn->cx;
y = pn->cy + 4;
z = pn->x1;
if(z & 1) x -= p->Painter->fontMetrics().boundingRect(pn->Name).width();
if(!(z & 2)) {
y -= (p->LineSpacing>>1) + 4;
if(z & 1) x -= 4;
else x += 4;
// revert selection of graphs and markers
for (Graph *pg: pd->Graphs) {
if (pg->Type & 1) pg->isSelected = true;
pg->Type &= -2;
for (Marker *pm: pg->Markers) {
if (pm->Type & 1) pm->isSelected = true;
pm->Type &= -2;
}
}
}
if (showBias > 0) { // show DC bias points in schematic ?
int x, y, z;
for (Node *pn = Nodes->first(); pn != 0; pn = Nodes->next()) {
if (pn->Name.isEmpty()) continue;
x = pn->cx;
y = pn->cy + 4;
z = pn->x1;
if (z & 1) x -= p->Painter->fontMetrics().boundingRect(pn->Name).width();
if (!(z & 2)) {
y -= (p->LineSpacing >> 1) + 4;
if (z & 1) x -= 4;
else x += 4;
}
if (z & 0x10)
p->Painter->setPen(Qt::darkGreen); // green for currents
else
p->Painter->setPen(Qt::blue); // blue for voltages
p->drawText(pn->Name, x, y);
}
if(z & 0x10)
p->Painter->setPen(Qt::darkGreen); // green for currents
else
p->Painter->setPen(Qt::blue); // blue for voltages
p->drawText(pn->Name, x, y);
}
}
}
@ -1006,9 +1005,9 @@ void Schematic::sizeOfAll(int& xmin, int& ymin, int& xmax, int& ymax)
if(y1 < ymin) ymin = y1;
if(y2 > ymax) ymax = y2;
foreach(Graph *pg, pd->Graphs)
for (Graph *pg : pd->Graphs)
// test all markers of diagram
foreach(Marker *pm, pg->Markers) {
for (Marker *pm : pg->Markers) {
pm->Bounding(x1, y1, x2, y2);
if(x1 < xmin) xmin = x1;
if(x2 > xmax) xmax = x2;
@ -1018,7 +1017,7 @@ void Schematic::sizeOfAll(int& xmin, int& ymin, int& xmax, int& ymax)
}
// find boundings of all Paintings
for(pp = Paintings->first(); pp != 0; pp = Paintings->next()) {
for(pp = Paintings->first(); pp != nullptr; pp = Paintings->next()) {
pp->Bounding(x1, y1, x2, y2);
if(x1 < xmin) xmin = x1;
if(x2 > xmax) xmax = x2;
@ -1056,7 +1055,7 @@ bool Schematic::rotateElements()
Component *pc;
WireLabel *pl;
// re-insert elements
foreach(Element *pe, ElementCache)
for (Element *pe : ElementCache)
switch(pe->Type) {
case isComponent:
case isAnalogComponent:
@ -1150,7 +1149,7 @@ bool Schematic::mirrorXComponents()
Component *pc;
WireLabel *pl;
// re-insert elements
foreach(Element *pe, ElementCache)
for (Element *pe : ElementCache)
switch(pe->Type) {
case isComponent:
case isAnalogComponent:
@ -1218,7 +1217,7 @@ bool Schematic::mirrorYComponents()
Component *pc;
WireLabel *pl;
// re-insert elements
foreach(Element *pe, ElementCache)
for (Element *pe : ElementCache)
switch(pe->Type) {
case isComponent:
case isAnalogComponent:
@ -1717,139 +1716,137 @@ bool Schematic::redo()
// ---------------------------------------------------
// Sets selected elements on grid.
bool Schematic::elementsOnGrid()
{
int x, y, No;
bool count = false;
WireLabel *pl, *pLabel;
Q3PtrList<WireLabel> LabelCache;
bool Schematic::elementsOnGrid() {
int x, y, No;
bool count = false;
WireLabel *pl, *pLabel;
Q3PtrList<WireLabel> LabelCache;
// test all components
Components->setAutoDelete(false);
for(Component *pc = Components->last(); pc != 0; pc = Components->prev())
if(pc->isSelected) {
// test all components
Components->setAutoDelete(false);
for (Component *pc = Components->last(); pc != nullptr; pc = Components->prev())
if (pc->isSelected) {
// rescue non-selected node labels
foreach(Port *pp, pc->Ports)
if(pp->Connection->Label)
if(pp->Connection->Connections.count() < 2) {
LabelCache.append(pp->Connection->Label);
pp->Connection->Label->pOwner = 0;
pp->Connection->Label = 0;
}
// rescue non-selected node labels
for (Port *pp: pc->Ports)
if (pp->Connection->Label)
if (pp->Connection->Connections.count() < 2) {
LabelCache.append(pp->Connection->Label);
pp->Connection->Label->pOwner = 0;
pp->Connection->Label = 0;
}
x = pc->cx;
y = pc->cy;
No = Components->at();
deleteComp(pc);
setOnGrid(pc->cx, pc->cy);
insertRawComponent(pc);
Components->at(No); // restore current list position
pc->isSelected = false;
count = true;
x = pc->cx;
y = pc->cy;
No = Components->at();
deleteComp(pc);
setOnGrid(pc->cx, pc->cy);
insertRawComponent(pc);
Components->at(No); // restore current list position
pc->isSelected = false;
count = true;
x -= pc->cx;
y -= pc->cy; // re-insert node labels and correct position
for(pl = LabelCache.first(); pl != 0; pl = LabelCache.next()) {
pl->cx -= x;
pl->cy -= y;
insertNodeLabel(pl);
}
LabelCache.clear();
}
Components->setAutoDelete(true);
Wires->setAutoDelete(false);
// test all wires and wire labels
for(Wire *pw = Wires->last(); pw != 0; pw = Wires->prev()) {
pl = pw->Label;
pw->Label = 0;
if(pw->isSelected) {
// rescue non-selected node label
pLabel = 0;
if(pw->Port1->Label) {
if(pw->Port1->Connections.count() < 2) {
pLabel = pw->Port1->Label;
pw->Port1->Label = 0;
x -= pc->cx;
y -= pc->cy; // re-insert node labels and correct position
for (pl = LabelCache.first(); pl != 0; pl = LabelCache.next()) {
pl->cx -= x;
pl->cy -= y;
insertNodeLabel(pl);
}
LabelCache.clear();
}
}
else if(pw->Port2->Label) {
if(pw->Port2->Connections.count() < 2) {
pLabel = pw->Port2->Label;
pw->Port2->Label = 0;
Components->setAutoDelete(true);
Wires->setAutoDelete(false);
// test all wires and wire labels
for (Wire *pw = Wires->last(); pw != 0; pw = Wires->prev()) {
pl = pw->Label;
pw->Label = nullptr;
if (pw->isSelected) {
// rescue non-selected node label
pLabel = nullptr;
if (pw->Port1->Label) {
if (pw->Port1->Connections.count() < 2) {
pLabel = pw->Port1->Label;
pw->Port1->Label = nullptr;
}
} else if (pw->Port2->Label) {
if (pw->Port2->Connections.count() < 2) {
pLabel = pw->Port2->Label;
pw->Port2->Label = nullptr;
}
}
No = Wires->at();
deleteWire(pw);
setOnGrid(pw->x1, pw->y1);
setOnGrid(pw->x2, pw->y2);
insertWire(pw);
Wires->at(No); // restore current list position
pw->isSelected = false;
count = true;
if (pl)
setOnGrid(pl->cx, pl->cy);
if (pLabel) {
setOnGrid(pLabel->cx, pLabel->cy);
insertNodeLabel(pLabel);
}
}
}
No = Wires->at();
deleteWire(pw);
setOnGrid(pw->x1, pw->y1);
setOnGrid(pw->x2, pw->y2);
insertWire(pw);
Wires->at(No); // restore current list position
pw->isSelected = false;
count = true;
if(pl)
setOnGrid(pl->cx, pl->cy);
if(pLabel) {
setOnGrid(pLabel->cx, pLabel->cy);
insertNodeLabel(pLabel);
}
}
if(pl) {
pw->Label = pl;
if(pl->isSelected) {
setOnGrid(pl->x1, pl->y1);
pl->isSelected = false;
count = true;
}
}
}
Wires->setAutoDelete(true);
// test all node labels
for(Node *pn = Nodes->first(); pn != 0; pn = Nodes->next())
if(pn->Label)
if(pn->Label->isSelected) {
setOnGrid(pn->Label->x1, pn->Label->y1);
pn->Label->isSelected = false;
count = true;
}
// test all diagrams
for(Diagram *pd = Diagrams->last(); pd != 0; pd = Diagrams->prev()) {
if(pd->isSelected) {
setOnGrid(pd->cx, pd->cy);
pd->isSelected = false;
count = true;
}
foreach(Graph *pg,pd->Graphs)
// test markers of diagram
foreach(Marker *pm, pg->Markers)
if(pm->isSelected) {
x = pm->x1 + pd->cx;
y = pm->y1 + pd->cy;
setOnGrid(x, y);
pm->x1 = x - pd->cx;
pm->y1 = y - pd->cy;
pm->isSelected = false;
count = true;
if (pl) {
pw->Label = pl;
if (pl->isSelected) {
setOnGrid(pl->x1, pl->y1);
pl->isSelected = false;
count = true;
}
}
}
}
Wires->setAutoDelete(true);
// test all paintings
for(Painting *pa = Paintings->last(); pa != 0; pa = Paintings->prev())
if(pa->isSelected) {
setOnGrid(pa->cx, pa->cy);
pa->isSelected = false;
count = true;
// test all node labels
for (Node *pn = Nodes->first(); pn != 0; pn = Nodes->next())
if (pn->Label)
if (pn->Label->isSelected) {
setOnGrid(pn->Label->x1, pn->Label->y1);
pn->Label->isSelected = false;
count = true;
}
// test all diagrams
for (Diagram *pd = Diagrams->last(); pd != 0; pd = Diagrams->prev()) {
if (pd->isSelected) {
setOnGrid(pd->cx, pd->cy);
pd->isSelected = false;
count = true;
}
for (Graph *pg: pd->Graphs)
// test markers of diagram
for (Marker *pm: pg->Markers)
if (pm->isSelected) {
x = pm->x1 + pd->cx;
y = pm->y1 + pd->cy;
setOnGrid(x, y);
pm->x1 = x - pd->cx;
pm->y1 = y - pd->cy;
pm->isSelected = false;
count = true;
}
}
if(count) setChanged(true, true);
return count;
// test all paintings
for (Painting *pa = Paintings->last(); pa != 0; pa = Paintings->prev())
if (pa->isSelected) {
setOnGrid(pa->cx, pa->cy);
pa->isSelected = false;
count = true;
}
if (count) setChanged(true, true);
return count;
}
// ---------------------------------------------------
@ -2090,7 +2087,7 @@ void Schematic::contentsDropEvent(QDropEvent *Event)
d->DocChanged = true;
// URI: file:/home/linuxuser/Desktop/example.sch
foreach(QUrl url, urls) {
for (QUrl url : urls) {
App->gotoPage(QDir::toNativeSeparators(url.toLocalFile()));
}
@ -2106,8 +2103,8 @@ void Schematic::contentsDropEvent(QDropEvent *Event)
App->view->MPressElement(this, &e, x, y);
if(App->view->selElem) delete App->view->selElem;
App->view->selElem = 0; // no component selected
delete App->view->selElem;
App->view->selElem = nullptr; // no component selected
if(formerAction)
formerAction->setChecked(true); // restore old action
@ -2117,7 +2114,7 @@ void Schematic::contentsDropEvent(QDropEvent *Event)
void Schematic::contentsDragEnterEvent(QDragEnterEvent *Event)
{
//FIXME: the function of drag library component seems not working?
formerAction = 0;
formerAction = nullptr;
dragIsOkay = false;
// file dragged in ?

10
qucs/schematic.h
View File

@ -227,9 +227,9 @@ public:
Element* selectElement(float, float, bool, int *index=0);
void deselectElements(Element*);
int selectElements(int, int, int, int, bool);
void selectMarkers();
void newMovingWires(Q3PtrList<Element>*, Node*, int);
int selectElements(int, int, int, int, bool) const;
void selectMarkers() const;
void newMovingWires(Q3PtrList<Element>*, Node*, int) const;
int copySelectedElements(Q3PtrList<Element>*);
bool deleteElements();
bool aligning(int);
@ -244,11 +244,11 @@ public:
bool activateSpecifiedComponent(int, int);
bool activateSelectedComponents();
void setCompPorts(Component*);
Component* selectCompText(int, int, int&, int&);
Component* selectCompText(int, int, int&, int&) const;
Component* searchSelSubcircuit();
Component* selectedComponent(int, int);
void deleteComp(Component*);
Component* getComponentByName(QString compname);
Component* getComponentByName(const QString& compname);
void oneLabel(Node*);
int placeNodeLabel(WireLabel*);

90
qucs/schematic_element.cpp
View File

@ -1135,10 +1135,10 @@ Element* Schematic::selectElement(float fX, float fY, bool flag, int *index)
for(Diagram *pd = Diagrams->last(); pd != 0; pd = Diagrams->prev())
{
foreach(Graph *pg, pd->Graphs)
for (Graph *pg : pd->Graphs)
{
// test markers of graphs
foreach(Marker *pm, pg->Markers)
for (Marker *pm : pg->Markers)
{
if(pm->getSelected(x-pd->cx, y-pd->cy))
{
@ -1202,7 +1202,7 @@ Element* Schematic::selectElement(float fX, float fY, bool flag, int *index)
}
// test graphs of diagram
foreach(Graph *pg, pd->Graphs)
for (Graph *pg : pd->Graphs)
{
if(pg->getSelected(x-pd->cx, pd->cy-y) >= 0)
{
@ -1458,12 +1458,12 @@ void Schematic::deselectElements(Element *e)
if(e != pd) pd->isSelected = false;
// test graphs of diagram
foreach(Graph *pg, pd->Graphs)
for (Graph *pg : pd->Graphs)
{
if(e != pg) pg->isSelected = false;
// test markers of graph
foreach(Marker *pm, pg->Markers)
for (Marker *pm : pg->Markers)
if(e != pm) pm->isSelected = false;
}
@ -1476,7 +1476,7 @@ void Schematic::deselectElements(Element *e)
// ---------------------------------------------------
// Selects elements that lie within the rectangle x1/y1, x2/y2.
int Schematic::selectElements(int x1, int y1, int x2, int y2, bool flag)
int Schematic::selectElements(int x1, int y1, int x2, int y2, bool flag) const
{
int z=0; // counts selected elements
int cx1, cy1, cx2, cy2;
@ -1492,7 +1492,7 @@ int Schematic::selectElements(int x1, int y1, int x2, int y2, bool flag)
y2 = cy2;
// test all components
for(Component *pc = Components->first(); pc != 0; pc = Components->next())
for(Component *pc = Components->first(); pc != nullptr; pc = Components->next())
{
pc->Bounding(cx1, cy1, cx2, cy2);
if(cx1 >= x1) if(cx2 <= x2) if(cy1 >= y1) if(cy2 <= y2)
@ -1506,21 +1506,23 @@ int Schematic::selectElements(int x1, int y1, int x2, int y2, bool flag)
Wire *pw;
for(pw = Wires->first(); pw != 0; pw = Wires->next()) // test all wires
for (pw = Wires->first(); pw != nullptr; pw = Wires->next()) // test all wires
{
if(pw->x1 >= x1) if(pw->x2 <= x2) if(pw->y1 >= y1) if(pw->y2 <= y2)
{
if (pw->x1 >= x1)
if (pw->x2 <= x2)
if (pw->y1 >= y1)
if (pw->y2 <= y2) {
pw->isSelected = true;
z++;
continue;
}
if(pw->isSelected &= flag) z++;
if (pw->isSelected &= flag) z++;
}
// test all wire labels *********************************
WireLabel *pl=0;
for(pw = Wires->first(); pw != 0; pw = Wires->next())
WireLabel *pl=nullptr;
for(pw = Wires->first(); pw != nullptr; pw = Wires->next())
{
if(pw->Label)
{
@ -1559,12 +1561,12 @@ int Schematic::selectElements(int x1, int y1, int x2, int y2, bool flag)
for(Diagram *pd = Diagrams->first(); pd != 0; pd = Diagrams->next())
{
// test graphs of diagram
foreach(Graph *pg, pd->Graphs)
for (Graph *pg : pd->Graphs)
{
if(pg->isSelected &= flag) z++;
// test markers of graph
foreach(Marker *pm, pg->Markers)
for (Marker *pm : pg->Markers)
{
pm->Bounding(cx1, cy1, cx2, cy2);
if(cx1 >= x1) if(cx2 <= x2) if(cy1 >= y1) if(cy2 <= y2)
@ -1606,11 +1608,11 @@ int Schematic::selectElements(int x1, int y1, int x2, int y2, bool flag)
// ---------------------------------------------------
// Selects all markers.
void Schematic::selectMarkers()
void Schematic::selectMarkers() const
{
for(Diagram *pd = Diagrams->first(); pd != 0; pd = Diagrams->next())
foreach(Graph *pg, pd->Graphs)
foreach(Marker *pm, pg->Markers)
for (Graph *pg : pd->Graphs)
for (Marker *pm : pg->Markers)
pm->isSelected = true;
}
@ -1618,7 +1620,7 @@ void Schematic::selectMarkers()
// For moving elements: If the moving element is connected to a not
// moving element, insert two wires. If the connected element is already
// a wire, use this wire. Otherwise create new wire.
void Schematic::newMovingWires(Q3PtrList<Element> *p, Node *pn, int pos)
void Schematic::newMovingWires(Q3PtrList<Element> *p, Node *pn, int pos) const
{
Element *pe;
@ -1641,7 +1643,7 @@ void Schematic::newMovingWires(Q3PtrList<Element> *p, Node *pn, int pos)
// .................................................
long mask = 1, invMask = 3;
Wire *pw2=0, *pw = (Wire*)pe;
Wire *pw2=nullptr, *pw = (Wire*)pe;
Node *pn2 = pw->Port1;
if(pn2 == pn) pn2 = pw->Port2;
@ -1667,7 +1669,7 @@ void Schematic::newMovingWires(Q3PtrList<Element> *p, Node *pn, int pos)
if(pw->isHorizontal()) mask = 2;
if(pw2 == 0) // place new wire between component and old wire
if(pw2 == nullptr) // place new wire between component and old wire
{
pn = pn2;
mask ^= 3;
@ -1692,7 +1694,7 @@ void Schematic::newMovingWires(Q3PtrList<Element> *p, Node *pn, int pos)
invMask ^= 3;
// .................................................
// create new wire ?
if(pw2 == 0)
if(pw2 == nullptr)
{
if(pw->Port1 != (Node*)(uintptr_t)mask)
p->insert(pos,
@ -1715,7 +1717,7 @@ void Schematic::newMovingWires(Q3PtrList<Element> *p, Node *pn, int pos)
if(pw2->Port1 != pn2)
{
pw2->Port1 = (Node*)0;
pw2->Port1 = (Node*)nullptr;
pw2->Port2->State |= mask;
pw2->Port2 = (Node*)(uintptr_t)mask;
}
@ -1723,7 +1725,7 @@ void Schematic::newMovingWires(Q3PtrList<Element> *p, Node *pn, int pos)
{
pw2->Port1->State |= mask;
pw2->Port1 = (Node*)(uintptr_t)mask;
pw2->Port2 = (Node*)0;
pw2->Port2 = (Node*)nullptr;
}
return;
}
@ -1752,14 +1754,14 @@ int Schematic::copySelectedElements(Q3PtrList<Element> *p)
// test all components *********************************
// Insert components before wires in order to prevent short-cut removal.
for(pc = Components->first(); pc != 0; )
for(pc = Components->first(); pc != nullptr; )
if(pc->isSelected)
{
p->append(pc);
count++;
// delete all port connections
foreach(Port *pp, pc->Ports)
for (Port *pp : pc->Ports)
{
pp->Connection->Connections.removeRef((Element*)pc);
pp->Connection->State = 4;
@ -1771,7 +1773,7 @@ int Schematic::copySelectedElements(Q3PtrList<Element> *p)
else pc = Components->next();
// test all wires and wire labels ***********************
for(pw = Wires->first(); pw != 0; )
for(pw = Wires->first(); pw != nullptr; )
{
if(pw->Label) if(pw->Label->isSelected)
p->append(pw->Label);
@ -1797,18 +1799,18 @@ int Schematic::copySelectedElements(Q3PtrList<Element> *p)
pc = (Component*)p->first();
for(i=0; i<count; i++)
{
foreach(Port *pp, pc->Ports)
for (Port *pp : pc->Ports)
newMovingWires(p, pp->Connection, count);
p->findRef(pc); // back to the real current pointer
pc = (Component*)p->next();
}
for(pe = (Element*)pc; pe != 0; pe = p->next()) // new wires
for(pe = (Element*)pc; pe != nullptr; pe = p->next()) // new wires
if(pe->isSelected)
break;
for(pw = (Wire*)pe; pw != 0; pw = (Wire*)p->next())
for(pw = (Wire*)pe; pw != nullptr; pw = (Wire*)p->next())
if(pw->Type == isWire) // not working on labels
{
newMovingWires(p, pw->Port1, count);
@ -1878,7 +1880,7 @@ int Schematic::copySelectedElements(Q3PtrList<Element> *p)
}
else
{
foreach(Graph *pg, pd->Graphs)
for (Graph *pg : pd->Graphs)
{
QMutableListIterator<Marker *> im(pg->Markers);
Marker *pm;
@ -2484,7 +2486,7 @@ void Schematic::insertComponentNodes(Component *c, bool noOptimize)
if (c->Ports.empty()) return;
// connect every node of the component to corresponding schematic node
foreach(Port *pp, c->Ports)
for (Port *pp : c->Ports)
pp->Connection = insertNode(pp->x+c->cx, pp->y+c->cy, c);
if(noOptimize) return;
@ -2550,7 +2552,7 @@ void Schematic::recreateComponent(Component *Comp)
// Save the labels whose node is not connected to somewhere else.
// Otherwise the label would be deleted.
pl = plMem = (WireLabel**)malloc(PortCount * sizeof(WireLabel*));
foreach(Port *pp, Comp->Ports)
for (Port *pp : Comp->Ports)
if(pp->Connection->Connections.count() < 2)
{
*(pl++) = pp->Connection->Label;
@ -2581,7 +2583,7 @@ void Schematic::recreateComponent(Component *Comp)
{
// restore node labels
pl = plMem;
foreach(Port *pp, Comp->Ports)
for (Port *pp : Comp->Ports)
{
if(*pl != 0)
{
@ -2754,7 +2756,7 @@ void Schematic::setCompPorts(Component *pc)
WireLabel *pl;
Q3PtrList<WireLabel> LabelCache;
foreach(Port *pp, pc->Ports)
for (Port *pp : pc->Ports)
{
pp->Connection->Connections.removeRef((Element*)pc);// delete connections
switch(pp->Connection->Connections.count())
@ -2778,7 +2780,7 @@ void Schematic::setCompPorts(Component *pc)
// Re-connect component node to schematic node. This must be done completely
// after the first loop in order to avoid problems with node labels.
foreach(Port *pp, pc->Ports)
for (Port *pp : pc->Ports)
pp->Connection = insertNode(pp->x+pc->cx, pp->y+pc->cy, pc);
for(pl = LabelCache.first(); pl != 0; pl = LabelCache.next())
@ -2787,7 +2789,7 @@ void Schematic::setCompPorts(Component *pc)
// ---------------------------------------------------
// Returns a pointer of the component on whose text x/y points.
Component* Schematic::selectCompText(int x_, int y_, int& w, int& h)
Component* Schematic::selectCompText(int x_, int y_, int& w, int& h) const
{
int a, b, dx, dy;
for(Component *pc = Components->first(); pc != 0; pc = Components->next())
@ -2843,11 +2845,11 @@ Component* Schematic::selectedComponent(int x, int y)
void Schematic::deleteComp(Component *c)
{
// delete all port connections
foreach(Port *pn, c->Ports)
for (Port *pn : c->Ports)
switch(pn->Connection->Connections.count())
{
case 1 :
if(pn->Connection->Label) delete pn->Connection->Label;
delete pn->Connection->Label;
Nodes->removeRef(pn->Connection); // delete open nodes
pn->Connection = 0; // (auto-delete)
break;
@ -2863,12 +2865,12 @@ void Schematic::deleteComp(Component *c)
Components->removeRef(c); // delete component
}
Component* Schematic::getComponentByName(QString compname)
Component* Schematic::getComponentByName(const QString& compname)
{
for(Component *pc = DocComps.first(); pc != 0; pc = DocComps.next()) {
for(Component *pc = DocComps.first(); pc != nullptr; pc = DocComps.next()) {
if (pc->Name == compname) return pc;
}
return NULL;
return nullptr;
}
// ---------------------------------------------------
@ -2892,7 +2894,7 @@ int Schematic::copyComponents(int& x1, int& y1, int& x2, int& y2,
ElementCache->append(pc);
// rescue non-selected node labels
foreach(Port *pp, pc->Ports)
for (Port *pp : pc->Ports)
if(pp->Connection->Label)
if(pp->Connection->Connections.count() < 2)
{
@ -2934,7 +2936,7 @@ void Schematic::copyComponents2(int& x1, int& y1, int& x2, int& y2,
ElementCache->append(pc);
// rescue non-selected node labels
foreach(Port *pp, pc->Ports)
for (Port *pp : pc->Ports)
if(pp->Connection->Label)
if(pp->Connection->Connections.count() < 2)
{

8
qucs/schematic_file.cpp
View File

@ -676,7 +676,7 @@ void Schematic::simpleInsertComponent(Component *c)
Node *pn;
int x, y;
// connect every node of component
foreach(Port *pp, c->Ports) {
for (Port *pp : c->Ports) {
x = pp->x+c->cx;
y = pp->y+c->cy;
@ -692,7 +692,7 @@ void Schematic::simpleInsertComponent(Component *c)
break;
}
if(pn == 0) { // create new node, if no existing one lies at this position
if(pn == nullptr) { // create new node, if no existing one lies at this position
pn = new Node(x, y);
DocNodes.append(pn);
}
@ -1330,7 +1330,7 @@ bool Schematic::throughAllComps(QTextStream *stream, int& countInit,
{
i = 0;
// apply in/out signal types of subcircuit
foreach(Port *pp, pc->Ports)
for (Port *pp : pc->Ports)
{
pp->Type = it.value().PortTypes[i];
pp->Connection->DType = pp->Type;
@ -1368,7 +1368,7 @@ bool Schematic::throughAllComps(QTextStream *stream, int& countInit,
{
i = 0;
// save in/out signal types of subcircuit
foreach(Port *pp, pc->Ports)
for (Port *pp : pc->Ports)
{
//if(i>=d->PortTypes.count())break;
pp->Type = d->PortTypes[i];

2
qucs/spicecomponents/C_SPICE.cpp
View File

@ -81,7 +81,7 @@ QString C_SPICE::netlist()
QString C_SPICE::spice_netlist(bool)
{
QString s = spicecompat::check_refdes(Name,SpiceModel);
foreach(Port *p1, Ports) {
for (Port *p1 : Ports) {
QString nam = p1->Connection->Name;
if (nam=="gnd") nam = "0";
s += " "+ nam+" "; // node names

2
qucs/spicecomponents/DIODE_SPICE.cpp
View File

@ -87,7 +87,7 @@ QString DIODE_SPICE::netlist()
QString DIODE_SPICE::spice_netlist(bool)
{
QString s = spicecompat::check_refdes(Name,SpiceModel);
foreach(Port *p1, Ports) {
for (Port *p1 : Ports) {
QString nam = p1->Connection->Name;
if (nam=="gnd") nam = "0";
s += " "+ nam+" "; // node names

2
qucs/spicecomponents/K_SPICE.cpp
View File

@ -78,7 +78,7 @@ QString K_SPICE::netlist()
QString K_SPICE::spice_netlist(bool)
{
QString s = spicecompat::check_refdes(Name,SpiceModel);
foreach(Port *p1, Ports) {
for (Port *p1 : Ports) {
QString nam = p1->Connection->Name;
if (nam=="gnd") nam = "0";
s += " "+ nam+" "; // node names

2
qucs/spicecomponents/LTL_SPICE.cpp
View File

@ -91,7 +91,7 @@ QString LTL_SPICE::netlist()
QString LTL_SPICE::spice_netlist(bool)
{
QString s = spicecompat::check_refdes(Name,SpiceModel);
foreach(Port *p1, Ports) {
for (Port *p1 : Ports) {
QString nam = p1->Connection->Name;
if (nam=="gnd") nam = "0";
s += " "+ nam; // node names

2
qucs/spicecomponents/LTRA_SPICE.cpp
View File

@ -97,7 +97,7 @@ QString LTRA_SPICE::netlist()
QString LTRA_SPICE::spice_netlist(bool)
{
QString s = spicecompat::check_refdes(Name,SpiceModel);
foreach(Port *p1, Ports) {
for (Port *p1 : Ports) {
QString nam = p1->Connection->Name;
if (nam=="gnd") nam = "0";
s += " "+ nam+" "; // node names

2
qucs/spicecomponents/L_SPICE.cpp
View File

@ -86,7 +86,7 @@ QString L_SPICE::netlist()
QString L_SPICE::spice_netlist(bool)
{
QString s = spicecompat::check_refdes(Name,SpiceModel);
foreach(Port *p1, Ports) {
for (Port *p1 : Ports) {
QString nam = p1->Connection->Name;
if (nam=="gnd") nam = "0";
s += " "+ nam+" "; // node names

2
qucs/spicecomponents/MESFET_SPICE.cpp
View File

@ -89,7 +89,7 @@ QString MESFET_SPICE::netlist()
QString MESFET_SPICE::spice_netlist(bool)
{
QString s = spicecompat::check_refdes(Name,SpiceModel);
foreach(Port *p1, Ports) {
for (Port *p1 : Ports) {
QString nam = p1->Connection->Name;
if (nam=="gnd") nam = "0";
s += " "+ nam+" "; // node names

2
qucs/spicecomponents/MOS_SPICE.cpp
View File

@ -223,7 +223,7 @@ void MOS_SPICE::createSymbol()
QString MOS_SPICE::spice_netlist(bool)
{
QString s = spicecompat::check_refdes(Name,Props.at(0)->Value);
foreach(Port *p1, Ports) {
for (Port *p1 : Ports) {
QString nam = p1->Connection->Name;
if (nam=="gnd") nam = "0";
s += " "+ nam+" "; // node names

2
qucs/spicecomponents/NJF_SPICE.cpp
View File

@ -95,7 +95,7 @@ QString NJF_SPICE::netlist()
QString NJF_SPICE::spice_netlist(bool)
{
QString s = spicecompat::check_refdes(Name,SpiceModel);
foreach(Port *p1, Ports) {
for (Port *p1 : Ports) {
QString nam = p1->Connection->Name;
if (nam=="gnd") nam = "0";
s += " "+ nam+" "; // node names

2
qucs/spicecomponents/NMOS_SPICE.cpp
View File

@ -105,7 +105,7 @@ QString NMOS_SPICE::netlist()
QString NMOS_SPICE::spice_netlist(bool)
{
QString s = spicecompat::check_refdes(Name,SpiceModel);
foreach(Port *p1, Ports) {
for (Port *p1 : Ports) {
QString nam = p1->Connection->Name;
if (nam=="gnd") nam = "0";
s += " "+ nam+" "; // node names

2
qucs/spicecomponents/NPN_SPICE.cpp
View File

@ -97,7 +97,7 @@ QString NPN_SPICE::netlist()
QString NPN_SPICE::spice_netlist(bool)
{
QString s = spicecompat::check_refdes(Name,SpiceModel);
foreach(Port *p1, Ports) {
for (Port *p1 : Ports) {
QString nam = p1->Connection->Name;
if (nam=="gnd") nam = "0";
s += " "+ nam+" "; // node names

2
qucs/spicecomponents/PJF_SPICE.cpp
View File

@ -95,7 +95,7 @@ QString PJF_SPICE::netlist()
QString PJF_SPICE::spice_netlist(bool)
{
QString s = spicecompat::check_refdes(Name,SpiceModel);
foreach(Port *p1, Ports) {
for (Port *p1 : Ports) {
QString nam = p1->Connection->Name;
if (nam=="gnd") nam = "0";
s += " "+ nam+" "; // node names

2
qucs/spicecomponents/PMF_MESFET_SPICE.cpp
View File

@ -89,7 +89,7 @@ QString PMF_MESFET_SPICE::netlist()
QString PMF_MESFET_SPICE::spice_netlist(bool)
{
QString s = spicecompat::check_refdes(Name,SpiceModel);
foreach(Port *p1, Ports) {
for (Port *p1 : Ports) {
QString nam = p1->Connection->Name;
if (nam=="gnd") nam = "0";
s += " "+ nam+" "; // node names

2
qucs/spicecomponents/PMOS_SPICE.cpp
View File

@ -105,7 +105,7 @@ QString PMOS_SPICE::netlist()
QString PMOS_SPICE::spice_netlist(bool)
{
QString s = spicecompat::check_refdes(Name,SpiceModel);
foreach(Port *p1, Ports) {
for (Port *p1 : Ports) {
QString nam = p1->Connection->Name;
if (nam=="gnd") nam = "0";
s += " "+ nam+" "; // node names

2
qucs/spicecomponents/PNP_SPICE.cpp
View File

@ -98,7 +98,7 @@ QString PNP_SPICE::netlist()
QString PNP_SPICE::spice_netlist(bool)
{
QString s = spicecompat::check_refdes(Name,SpiceModel);
foreach(Port *p1, Ports) {
for (Port *p1 : Ports) {
QString nam = p1->Connection->Name;
if (nam=="gnd") nam = "0";
s += " "+ nam+" "; // node names

2
qucs/spicecomponents/R_SPICE.cpp
View File

@ -85,7 +85,7 @@ QString R_SPICE::netlist()
QString R_SPICE::spice_netlist(bool)
{
QString s = spicecompat::check_refdes(Name,SpiceModel);
foreach(Port *p1, Ports) {
for (Port *p1 : Ports) {
QString nam = p1->Connection->Name;
if (nam=="gnd") nam = "0";
s += " "+ nam+" "; // node names

2
qucs/spicecomponents/S4Q_I.cpp
View File

@ -79,7 +79,7 @@ Element* S4Q_I::info(QString& Name, char* &BitmapFile, bool getNewOne)
QString S4Q_I::spice_netlist(bool)
{
QString s = spicecompat::check_refdes(Name,SpiceModel);
foreach(Port *p1, Ports) {
for (Port *p1 : Ports) {
QString nam = p1->Connection->Name;
if (nam=="gnd") nam = "0";
s += " "+ nam+" "; // node names

2
qucs/spicecomponents/S4Q_Ieqndef.cpp
View File

@ -89,7 +89,7 @@ QString S4Q_Ieqndef::netlist()
QString S4Q_Ieqndef::spice_netlist(bool)
{
QString s = spicecompat::check_refdes(Name,SpiceModel);
foreach(Port *p1, Ports) {
for (Port *p1 : Ports) {
QString nam = p1->Connection->Name;
if (nam=="gnd") nam = "0";
s += " "+ nam + " "; // node names

2
qucs/spicecomponents/S4Q_S.cpp
View File

@ -96,7 +96,7 @@ Element* S4Q_S::info(QString& Name, char* &BitmapFile, bool getNewOne)
QString S4Q_S::spice_netlist(bool)
{
QString s = spicecompat::check_refdes(Name,SpiceModel);
foreach(Port *p1, Ports) {
for (Port *p1 : Ports) {
QString nam = p1->Connection->Name;
if (nam=="gnd") nam = "0";
s += " "+ nam+" "; // node names

2
qucs/spicecomponents/S4Q_V.cpp
View File

@ -80,7 +80,7 @@ Element* S4Q_V::info(QString& Name, char* &BitmapFile, bool getNewOne)
QString S4Q_V::spice_netlist(bool)
{
QString s = spicecompat::check_refdes(Name,SpiceModel);
foreach(Port *p1, Ports) {
for (Port *p1 : Ports) {
QString nam = p1->Connection->Name;
if (nam=="gnd") nam = "0";
s += " "+ nam+" "; // node names

2
qucs/spicecomponents/S4Q_W.cpp
View File

@ -84,7 +84,7 @@ Element* S4Q_W::info(QString& Name, char* &BitmapFile, bool getNewOne)
QString S4Q_W::spice_netlist(bool)
{
QString s = spicecompat::check_refdes(Name,SpiceModel);
foreach(Port *p1, Ports) {
for (Port *p1 : Ports) {
QString nam = p1->Connection->Name;
if (nam=="gnd") nam = "0";
s += " "+ nam+" "; // node names

2
qucs/spicecomponents/UDRCTL_SPICE.cpp
View File

@ -95,7 +95,7 @@ QString UDRCTL_SPICE::netlist()
QString UDRCTL_SPICE::spice_netlist(bool)
{
QString s = spicecompat::check_refdes(Name,SpiceModel);
foreach(Port *p1, Ports) {
for (Port *p1 : Ports) {
QString nam = p1->Connection->Name;
if (nam=="gnd") nam = "0";
s += " "+ nam+" "; // node names

2
qucs/spicecomponents/eNL.cpp
View File

@ -82,7 +82,7 @@ QString eNL::netlist()
QString eNL::spice_netlist(bool)
{
QString s = spicecompat::check_refdes(Name,SpiceModel);
foreach(Port *p1, Ports) {
for (Port *p1 : Ports) {
QString nam = p1->Connection->Name;
if (nam=="gnd") nam = "0";
s += " "+ nam; // node names

2
qucs/spicecomponents/gNL.cpp
View File

@ -82,7 +82,7 @@ QString gNL::netlist()
QString gNL::spice_netlist(bool)
{
QString s = spicecompat::check_refdes(Name,SpiceModel);
foreach(Port *p1, Ports) {
for (Port *p1 : Ports) {
QString nam = p1->Connection->Name;
if (nam=="gnd") nam = "0";
s += " "+ nam; // node names

2
qucs/spicecomponents/iAmpMod.cpp
View File

@ -89,7 +89,7 @@ QString iAmpMod::netlist()
QString iAmpMod::spice_netlist(bool)
{
QString s = spicecompat::check_refdes(Name,SpiceModel);
foreach(Port *p1, Ports) {
for (Port *p1 : Ports) {
QString nam = p1->Connection->Name;
if (nam=="gnd") nam = "0";
s += " "+ nam; // node names

2
qucs/spicecomponents/iPWL.cpp
View File

@ -91,7 +91,7 @@ QString iPWL::netlist()
QString iPWL::spice_netlist(bool)
{
QString s = spicecompat::check_refdes(Name,SpiceModel);
foreach(Port *p1, Ports) {
for (Port *p1 : Ports) {
QString nam = p1->Connection->Name;
if (nam=="gnd") nam = "0";
s += " "+ nam+" "; // node names

2
qucs/spicecomponents/iTRNOISE.cpp
View File

@ -100,7 +100,7 @@ QString iTRNOISE::netlist()
QString iTRNOISE::spice_netlist(bool)
{
QString s = spicecompat::check_refdes(Name,SpiceModel);
foreach(Port *p1, Ports) {
for (Port *p1 : Ports) {
QString nam = p1->Connection->Name;
if (nam=="gnd") nam = "0";
s += " "+ nam; // node names

2
qucs/spicecomponents/isffm.cpp
View File

@ -89,7 +89,7 @@ QString iSffm::netlist()
QString iSffm::spice_netlist(bool)
{
QString s = spicecompat::check_refdes(Name,SpiceModel);
foreach(Port *p1, Ports) {
for (Port *p1 : Ports) {
QString nam = p1->Connection->Name;
if (nam=="gnd") nam = "0";
s += " "+ nam; // node names

Some files were not shown because too many files have changed in this diff Show More