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 dvb

This commit is contained in:
Matthias Koefferlein 2019-11-06 01:04:47 +01:00
parent c8aa926fb0 f2fafd1bad
commit 14e20b597b
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/edt/edt/edtPCellParametersPage.cc
View File

@ -284,6 +284,8 @@ PCellParametersPage::setup (const db::Layout *layout, lay::LayoutView *view, int
ul->setText (tl::to_qstring (p->get_unit ()));
inner_grid->addWidget (f, row, 1);
connect (le, SIGNAL (editingFinished ()), this, SLOT (activated ()));
}
break;
@ -295,6 +297,8 @@ PCellParametersPage::setup (const db::Layout *layout, lay::LayoutView *view, int
le->setEnabled (! p->is_readonly ());
m_widgets.push_back (le);
inner_grid->addWidget (le, row, 1);
connect (le, SIGNAL (editingFinished ()), this, SLOT (activated ()));
}
break;
@ -315,6 +319,8 @@ PCellParametersPage::setup (const db::Layout *layout, lay::LayoutView *view, int
cbx->setEnabled (! p->is_readonly ());
m_widgets.push_back (cbx);
inner_grid->addWidget (cbx, row, 1);
connect (cbx, SIGNAL (stateChanged (int)), this, SLOT (activated ()));
}
break;
@ -336,7 +342,7 @@ PCellParametersPage::setup (const db::Layout *layout, lay::LayoutView *view, int
}
}
connect (cb, SIGNAL (activated (int)), this, SLOT (activated (int)));
connect (cb, SIGNAL (activated (int)), this, SLOT (activated ()));
cb->setEnabled (! p->is_readonly ());
cb->setMinimumContentsLength (30);
cb->setSizeAdjustPolicy (QComboBox::AdjustToMinimumContentsLengthWithIcon);
@ -381,7 +387,7 @@ PCellParametersPage::set_state (const State &s)
}
void
PCellParametersPage::activated (int)
PCellParametersPage::activated ()
{
// does a coerce and update
get_parameters ();

2
src/edt/edt/edtPCellParametersPage.h
View File

@ -111,7 +111,7 @@ public:
void set_parameters (const std::vector<tl::Variant> &values);
public slots:
void activated (int);
void activated ();
void clicked ();
private:

4
src/pya/pya/pyaConvert.h
View File

@ -142,7 +142,7 @@ struct test_type_func<__int128>
{
bool operator() (PyObject *rval, bool loose)
{
return test_type<int> (rval, loose);
return test_type_func<int> () (rval, loose);
}
};
#endif
@ -582,7 +582,7 @@ struct c2python_func<unsigned long long>
#if defined(HAVE_64BIT_COORD)
template <>
struct c2python_func<const __int128 &>
struct c2python_func<__int128>
{
PyObject *operator() (const __int128 &c)
{