Fixed some compiler warnings.

This commit is contained in:
Matthias Koefferlein 2021-07-17 22:03:22 +02:00
parent 054bfa3be4
commit 3f3f4c9173
9 changed files with 12 additions and 12 deletions

View File

@ -122,7 +122,7 @@ struct box_scanner_receiver
* The finish method is called when an object is no longer in the queue and can be
* discarded.
*/
virtual void finish (const Obj * /*obj*/, const Prop & /*prop*/) { }
virtual void finish (const Obj * /*obj*/, Prop /*prop*/) { }
/**
* @brief Callback for an interaction of o1 with o2.
@ -130,7 +130,7 @@ struct box_scanner_receiver
* This method is called when the object o1 interacts with o2 within the current
* definition.
*/
virtual void add (const Obj * /*o1*/, const Prop & /*p1*/, const Obj * /*o2*/, const Prop & /*p2*/) { }
virtual void add (const Obj * /*o1*/, Prop /*p1*/, const Obj * /*o2*/, Prop /*p2*/) { }
/**
* @brief Indicates whether the scanner may stop
@ -1043,7 +1043,7 @@ public:
/**
* @brief Implementation of the box scanner receiver class
*/
void finish (const Obj *obj, const Prop &prop)
void finish (const Obj *obj, Prop prop)
{
om_iterator_type omi = m_om.find (om_key_type (obj, prop));
if (omi != m_om.end ()) {
@ -1089,7 +1089,7 @@ public:
/**
* @brief Implementation of the box scanner receiver class
*/
void add (const Obj *o1, const Prop &p1, const Obj *o2, const Prop &p2)
void add (const Obj *o1, Prop p1, const Obj *o2, Prop p2)
{
om_iterator_type om1 = m_om.find (om_key_type (o1, p1));
om_iterator_type om2 = m_om.find (om_key_type (o2, p2));

View File

@ -108,7 +108,7 @@ static inline bool shields (const db::EdgePair &ep, const db::Edge &q)
}
void
Edge2EdgeCheckBase::finish (const Edge *o, const size_t &p)
Edge2EdgeCheckBase::finish (const Edge *o, size_t p)
{
if (m_has_negative_edge_output && m_pass == 1 && m_pseudo_edges.find (std::make_pair (*o, p)) == m_pseudo_edges.end ()) {

View File

@ -611,7 +611,7 @@ public:
/**
* @brief Reimplementation of the box_scanner_receiver interface
*/
void finish (const Edge *o, const size_t &);
void finish (const Edge *o, size_t);
/**
* @brief Gets a value indicating whether the check requires different layers

View File

@ -708,7 +708,7 @@ TechSetupDialog::update ()
}
int
TechSetupDialog::exec (db::Technologies &technologies)
TechSetupDialog::exec_dialog (db::Technologies &technologies)
{
if (s_first_show) {
TipDialog td (this,

View File

@ -149,7 +149,7 @@ public:
TechSetupDialog (QWidget *parent);
~TechSetupDialog ();
int exec (db::Technologies &technologies);
int exec_dialog (db::Technologies &technologies);
protected slots:
void current_tech_changed (QTreeWidgetItem *current, QTreeWidgetItem *previous);

View File

@ -436,7 +436,7 @@ TechnologyController::show_editor ()
{
db::Technologies new_tech = *db::Technologies ().instance ();
if (mp_editor && mp_editor->exec (new_tech)) {
if (mp_editor && mp_editor->exec_dialog (new_tech)) {
std::string err_msg;

View File

@ -669,7 +669,7 @@ LibrariesView::do_update_content (int lib_index)
mp_cell_lists.pop_back ();
}
for (size_t i = imin; i < m_libraries.size () && i < mp_selector->count () && i <= imax; ++i) {
for (size_t i = imin; i < m_libraries.size () && i < size_t (mp_selector->count ()) && i <= imax; ++i) {
mp_selector->setItemText (int (i), tl::to_qstring (display_string (int (i))));
}
while (mp_selector->count () < int (m_libraries.size ())) {

View File

@ -3037,7 +3037,7 @@ DXFReader::read_int64 ()
if (! ex.try_read (x) || ! ex.at_end ()) {
error ("Expected an ASCII numerical value");
}
if (x < std::numeric_limits<long long>::min() || x > std::numeric_limits<long long>::max()) {
if (x < double (std::numeric_limits<long long>::min()) || x > double (std::numeric_limits<long long>::max())) {
error ("Value is out of limits for a 64 bit signed integer");
}
return (long long) x;

View File

@ -1428,7 +1428,7 @@ NetTracerDialog::get_trace_depth()
QString depth = depth_le->text ().trimmed ();
if (! depth.isEmpty ()) {
tl::from_string (tl::to_string (depth), n);
if (n < 0 || n > std::numeric_limits<size_t>::max ()) {
if (n < 0 || n > double (std::numeric_limits<size_t>::max ())) {
n = 0.0;
}
}