luke
/
klayout
mirror of https://github.com/KLayout/klayout.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into lefdef-enhancments

This commit is contained in:
Matthias Koefferlein 2020-07-31 00:58:24 +02:00
parent f7d5385fcc f2b678cb7b
commit 37544e5e23
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/laybasic/laybasic/layNetlistBrowserModel.cc
View File

@ -31,7 +31,9 @@
#include <QWidget>
#include <QTreeView>
#include <QUrl>
#include <QUrlQuery>
#if QT_VERSION >= 0x050000
# include <QUrlQuery>
#endif
namespace lay
{
@ -1325,7 +1327,7 @@ NetlistModelItemData::child (size_t n)
std::pair<const db::Circuit *, const db::Circuit *>
NetlistModelItemData::circuits_of_this ()
{
return std::pair<const db::Circuit *, const db::Circuit *> (0, 0);
return std::pair<const db::Circuit *, const db::Circuit *> ((const db::Circuit *) 0, (const db::Circuit *) 0);
}
std::pair<const db::Circuit *, const db::Circuit *>
@ -1356,7 +1358,7 @@ NetlistModelItemData::derived_from_circuits (const std::pair<const db::Circuit *
std::pair<const db::Device *, const db::Device *>
NetlistModelItemData::devices_of_this ()
{
return std::pair<const db::Device *, const db::Device *> (0, 0);
return std::pair<const db::Device *, const db::Device *> ((const db::Device *) 0, (const db::Device *) 0);
}
std::pair<const db::Device *, const db::Device *>
@ -1387,7 +1389,7 @@ NetlistModelItemData::derived_from_devices (const std::pair<const db::Device *,
std::pair<const db::Pin *, const db::Pin *>
NetlistModelItemData::pins_of_this ()
{
return std::pair<const db::Pin *, const db::Pin *> (0, 0);
return std::pair<const db::Pin *, const db::Pin *> ((const db::Pin *) 0, (const db::Pin *) 0);
}
std::pair<const db::Pin *, const db::Pin *>
@ -1418,7 +1420,7 @@ NetlistModelItemData::derived_from_pins (const std::pair<const db::Pin *, const
std::pair<const db::SubCircuit *, const db::SubCircuit *>
NetlistModelItemData::subcircuits_of_this ()
{
return std::pair<const db::SubCircuit *, const db::SubCircuit *> (0, 0);
return std::pair<const db::SubCircuit *, const db::SubCircuit *> ((const db::SubCircuit *) 0, (const db::SubCircuit *) 0);
}
std::pair<const db::SubCircuit *, const db::SubCircuit *>
@ -1449,7 +1451,7 @@ NetlistModelItemData::derived_from_subcircuits (const std::pair<const db::SubCir
std::pair<const db::Net *, const db::Net *>
NetlistModelItemData::nets_of_this ()
{
return std::pair<const db::Net *, const db::Net *> (0, 0);
return std::pair<const db::Net *, const db::Net *> ((const db::Net *) 0, (const db::Net *) 0);
}
std::pair<const db::Net *, const db::Net *>