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

Fixed a compiler warning, build compatibility with Qt5

This commit is contained in:
Matthias Koefferlein 2019-05-06 19:06:06 +02:00
parent 90ef5f9c2e
commit 2302036d6f
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/laybasic/laybasic/layNetExportDialog.cc
View File

@ -165,7 +165,7 @@ END_PROTECTED
}
int
NetExportDialog::exec (lay::PluginRoot *plugin_root)
NetExportDialog::exec_dialog (lay::PluginRoot *plugin_root)
{
std::string v;
plugin_root->config_get (cfg_l2ndb_export_net_cell_prefix, v);

2
src/laybasic/laybasic/layNetExportDialog.h
View File

@ -74,7 +74,7 @@ public:
void set_start_layer_number (int ln);
int start_layer_number ();
int exec (lay::PluginRoot *mp_plugin_root);
int exec_dialog (lay::PluginRoot *mp_plugin_root);
protected:
void accept ();

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

@ -41,6 +41,9 @@
#include <QColorDialog>
#include <QRegExp>
#include <QKeyEvent>
#if QT_VERSION >= 0x050000
# include <QUrlQuery>
#endif
namespace lay
{
@ -267,7 +270,14 @@ void
NetlistBrowserPage::anchor_clicked (const QString &a)
{
QUrl url (a);
QString ids = url.queryItemValue (QString::fromUtf8 ("id"));
QString ids;
#if QT_VERSION >= 0x050000
ids = QUrlQuery (url.query ()).queryItemValue (QString::fromUtf8 ("id"));
#else
ids = url.queryItemValue (QString::fromUtf8 ("id"));
#endif
if (ids.isEmpty ()) {
return;
}
@ -1036,7 +1046,7 @@ NetlistBrowserPage::export_nets (const std::vector<const db::Net *> *nets)
const db::Cell &source_top = source_layout.cell (*source_layout.begin_top_down ());
std::auto_ptr<lay::NetExportDialog> dialog (new lay::NetExportDialog (this));
if (dialog->exec (mp_plugin_root)) {
if (dialog->exec_dialog (mp_plugin_root)) {
// NOTE: mp_view and database might get reset to 0 in create_layout
lay::LayoutView *view = mp_view;