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

Various warning fixes

Browse Source
This commit is contained in:
Miodrag Milanovic 2020-01-18 15:23:35 +01:00
parent b67ba18590
commit 38e3b6338c
6 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
3rdparty/QtPropertyBrowser/src/qteditorfactory.cpp vendored
View File

@ -2207,9 +2207,9 @@ void QtColorEditWidget::buttonClicked()
{ {
bool ok = false; bool ok = false;
QRgb oldRgba = m_color.rgba(); QRgb oldRgba = m_color.rgba();
QRgb newRgba = QColorDialog::getRgba(oldRgba, &ok, this); QColor newRgba = QColorDialog::getColor(oldRgba, this).rgba();
if (ok && newRgba != oldRgba) { if (newRgba.isValid() && newRgba.rgba() != oldRgba) {
setValue(QColor::fromRgba(newRgba)); setValue(newRgba);
emit valueChanged(m_color); emit valueChanged(m_color);
} }
} }

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

@ -609,7 +609,7 @@ void QtTreePropertyBrowserPrivate::propertyInserted(QtBrowserItem *index, QtBrow
m_indexToItem[index] = newItem; m_indexToItem[index] = newItem;
newItem->setFlags(newItem->flags() | Qt::ItemIsEditable); newItem->setFlags(newItem->flags() | Qt::ItemIsEditable);
m_treeWidget->setItemExpanded(newItem, true); newItem->setExpanded(true);
updateItem(newItem); updateItem(newItem);
} }

6
3rdparty/QtPropertyBrowser/src/qtvariantproperty.cpp vendored
View File

@ -576,7 +576,7 @@ void QtVariantPropertyManagerPrivate::slotValueChanged(QtProperty *property, con
void QtVariantPropertyManagerPrivate::slotValueChanged(QtProperty *property, const QKeySequence &val) void QtVariantPropertyManagerPrivate::slotValueChanged(QtProperty *property, const QKeySequence &val)
{ {
QVariant v; QVariant v;
qVariantSetValue(v, val); v.setValue(val);
valueChanged(property, v); valueChanged(property, v);
} }
@ -663,7 +663,7 @@ void QtVariantPropertyManagerPrivate::slotEnumIconsChanged(QtProperty *property,
{ {
if (QtVariantProperty *varProp = m_internalToProperty.value(property, 0)) { if (QtVariantProperty *varProp = m_internalToProperty.value(property, 0)) {
QVariant v; QVariant v;
qVariantSetValue(v, enumIcons); v.setValue(enumIcons);
emit q_ptr->attributeChanged(varProp, m_enumIconsAttribute, v); emit q_ptr->attributeChanged(varProp, m_enumIconsAttribute, v);
} }
} }
@ -1567,7 +1567,7 @@ QVariant QtVariantPropertyManager::attributeValue(const QtProperty *property, co
return enumManager->enumNames(internProp); return enumManager->enumNames(internProp);
if (attribute == d_ptr->m_enumIconsAttribute) { if (attribute == d_ptr->m_enumIconsAttribute) {
QVariant v; QVariant v;
qVariantSetValue(v, enumManager->enumIcons(internProp)); v.setValue(enumManager->enumIcons(internProp));
return v; return v;
} }
return QVariant(); return QVariant();

3
3rdparty/imgui/imgui_internal.h vendored
View File

@ -27,6 +27,9 @@
#pragma clang diagnostic ignored "-Wunused-function" // for stb_textedit.h #pragma clang diagnostic ignored "-Wunused-function" // for stb_textedit.h
#pragma clang diagnostic ignored "-Wmissing-prototypes" // for stb_textedit.h #pragma clang diagnostic ignored "-Wmissing-prototypes" // for stb_textedit.h
#pragma clang diagnostic ignored "-Wold-style-cast" #pragma clang diagnostic ignored "-Wold-style-cast"
#elif defined(__GNUC__) && __GNUC__ >= 8
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wclass-memaccess"
#endif #endif
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

11
generic/pack.cc
View File

@ -112,17 +112,6 @@ static void pack_nonlut_ffs(Context *ctx)
} }
} }
static bool net_is_constant(const Context *ctx, NetInfo *net, bool &value)
{
if (net == nullptr)
return false;
if (net->name == ctx->id("$PACKER_GND_NET") || net->name == ctx->id("$PACKER_VCC_NET")) {
value = (net->name == ctx->id("$PACKER_VCC_NET"));
return true;
} else {
return false;
}
}
// Merge a net into a constant net // Merge a net into a constant net
static void set_net_constant(const Context *ctx, NetInfo *orig, NetInfo *constnet, bool constval) static void set_net_constant(const Context *ctx, NetInfo *orig, NetInfo *constnet, bool constval)

2
gui/treemodel.cc
View File

@ -93,7 +93,7 @@ void IdStringList::updateElements(Context *ctx, std::vector<IdString> elements)
} }
// Sort new children // Sort new children
qSort(children_.begin(), children_.end(), [&](const Item *a, const Item *b) { std::sort(children_.begin(), children_.end(), [&](const Item *a, const Item *b) {
auto parts_a = alphaNumSplit(a->name()); auto parts_a = alphaNumSplit(a->name());
auto parts_b = alphaNumSplit(b->name()); auto parts_b = alphaNumSplit(b->name());