caiyu/nextpnr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Warnings noticed by clang

Browse Source
This commit is contained in:
Miodrag Milanovic 2020-01-18 15:34:58 +01:00
parent 38e3b6338c
commit d281e18113
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
3rdparty/QtPropertyBrowser/src/qttreepropertybrowser.cpp vendored
View File

@ -132,9 +132,9 @@ public:
protected: protected:
void mouseMoveEvent(QMouseEvent *event) override; void mouseMoveEvent(QMouseEvent *event) override;
void leaveEvent(QEvent *event) override; void leaveEvent(QEvent *event) override;
void keyPressEvent(QKeyEvent *event); void keyPressEvent(QKeyEvent *event) override;
void mousePressEvent(QMouseEvent *event); void mousePressEvent(QMouseEvent *event) override;
void drawRow(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const; void drawRow(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
Q_SIGNALS: Q_SIGNALS:
void hoverPropertyChanged(QtBrowserItem *item); void hoverPropertyChanged(QtBrowserItem *item);
@ -383,7 +383,7 @@ void QtPropertyEditorDelegate::paint(QPainter *painter, const QStyleOptionViewIt
opt.palette.setColor(QPalette::Text, opt.palette.color(QPalette::BrightText)); opt.palette.setColor(QPalette::Text, opt.palette.color(QPalette::BrightText));
} else { } else {
c = m_editorPrivate->calculatedBackgroundColor(m_editorPrivate->indexToBrowserItem(index)); c = m_editorPrivate->calculatedBackgroundColor(m_editorPrivate->indexToBrowserItem(index));
if (c.isValid() && (opt.features & QStyleOptionViewItemV2::Alternate)) if (c.isValid() && (opt.features & QStyleOptionViewItem::Alternate))
c = c.lighter(112); c = c.lighter(112);
} }
if (c.isValid()) if (c.isValid())

26
frontend/json_frontend.cc
View File

@ -46,7 +46,7 @@ struct JsonFrontendImpl
Func(mod.first, mod.second); Func(mod.first, mod.second);
} }
template <typename TFunc> void foreach_port(const ModuleDataType &mod, TFunc Func) const template <typename TFunc> void foreach_port(ModuleDataType &mod, TFunc Func) const
{ {
const auto &ports = mod["ports"]; const auto &ports = mod["ports"];
if (ports.is_null()) if (ports.is_null())
@ -55,7 +55,7 @@ struct JsonFrontendImpl
Func(port.first, port.second); Func(port.first, port.second);
} }
template <typename TFunc> void foreach_cell(const ModuleDataType &mod, TFunc Func) const template <typename TFunc> void foreach_cell(ModuleDataType &mod, TFunc Func) const
{ {
const auto &cells = mod["cells"]; const auto &cells = mod["cells"];
if (cells.is_null()) if (cells.is_null())
@ -64,7 +64,7 @@ struct JsonFrontendImpl
Func(cell.first, cell.second); Func(cell.first, cell.second);
} }
template <typename TFunc> void foreach_netname(const ModuleDataType &mod, TFunc Func) const template <typename TFunc> void foreach_netname(ModuleDataType &mod, TFunc Func) const
{ {
const auto &netnames = mod["netnames"]; const auto &netnames = mod["netnames"];
if (netnames.is_null()) if (netnames.is_null())
@ -85,7 +85,7 @@ struct JsonFrontendImpl
NPNR_ASSERT_FALSE("invalid json port direction"); NPNR_ASSERT_FALSE("invalid json port direction");
} }
PortType get_port_dir(const ModulePortDataType &port) const PortType get_port_dir(ModulePortDataType &port) const
{ {
return lookup_portdir(port["direction"].string_value()); return lookup_portdir(port["direction"].string_value());
} }
@ -102,9 +102,9 @@ struct JsonFrontendImpl
return upto.is_null() ? false : bool(upto.int_value()); return upto.is_null() ? false : bool(upto.int_value());
} }
const BitVectorDataType &get_port_bits(const ModulePortDataType &port) const { return port["bits"].array_items(); } BitVectorDataType &get_port_bits(ModulePortDataType &port) const { return port["bits"].array_items(); }
const std::string &get_cell_type(const CellDataType &cell) const { return cell["type"].string_value(); } const std::string &get_cell_type(CellDataType &cell) const { return cell["type"].string_value(); }
Property parse_property(const Json &val) const Property parse_property(const Json &val) const
{ {
@ -144,36 +144,36 @@ struct JsonFrontendImpl
} }
} }
template <typename TFunc> void foreach_port_dir(const CellDataType &cell, TFunc Func) const template <typename TFunc> void foreach_port_dir(CellDataType &cell, TFunc Func) const
{ {
for (const auto &pdir : cell["port_directions"].object_items()) for (const auto &pdir : cell["port_directions"].object_items())
Func(pdir.first, lookup_portdir(pdir.second.string_value())); Func(pdir.first, lookup_portdir(pdir.second.string_value()));
} }
template <typename TFunc> void foreach_port_conn(const CellDataType &cell, TFunc Func) const template <typename TFunc> void foreach_port_conn(CellDataType &cell, TFunc Func) const
{ {
for (const auto &pconn : cell["connections"].object_items()) for (const auto &pconn : cell["connections"].object_items())
Func(pconn.first, pconn.second.array_items()); Func(pconn.first, pconn.second.array_items());
} }
const BitVectorDataType &get_net_bits(const NetnameDataType &net) const { return net["bits"].array_items(); } BitVectorDataType &get_net_bits(NetnameDataType &net) const { return net["bits"].array_items(); }
int get_vector_length(const BitVectorDataType &bits) const { return int(bits.size()); } int get_vector_length(BitVectorDataType &bits) const { return int(bits.size()); }
bool is_vector_bit_constant(const BitVectorDataType &bits, int i) const bool is_vector_bit_constant(BitVectorDataType &bits, int i) const
{ {
NPNR_ASSERT(i < int(bits.size())); NPNR_ASSERT(i < int(bits.size()));
return bits[i].is_string(); return bits[i].is_string();
} }
char get_vector_bit_constval(const BitVectorDataType &bits, int i) const char get_vector_bit_constval(BitVectorDataType &bits, int i) const
{ {
auto s = bits.at(i).string_value(); auto s = bits.at(i).string_value();
NPNR_ASSERT(s.size() == 1); NPNR_ASSERT(s.size() == 1);
return s.at(0); return s.at(0);
} }
int get_vector_bit_signal(const BitVectorDataType &bits, int i) const int get_vector_bit_signal(BitVectorDataType &bits, int i) const
{ {
NPNR_ASSERT(bits.at(i).is_number()); NPNR_ASSERT(bits.at(i).is_number());
return bits.at(i).int_value(); return bits.at(i).int_value();