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

Fixed an issue with the new process_events implementation: compiler resolution did not work well for the two types - one them them reimplemented and the other not.

This commit is contained in:
Matthias Koefferlein 2017-12-27 19:54:06 +01:00
parent 39d635c7d7
commit 84cf46bcd2
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lay/lay/layApplication.cc
View File

@ -1252,7 +1252,7 @@ dump_children (QObject *obj, int level = 0)
} }
void void
ApplicationBase::process_events (QEventLoop::ProcessEventsFlags /*flags*/, bool /*silent*/) ApplicationBase::process_events_impl (QEventLoop::ProcessEventsFlags /*flags*/, bool /*silent*/)
{ {
// The base class implementation does nothing .. // The base class implementation does nothing ..
} }
@ -1486,7 +1486,7 @@ GuiApplication::setup ()
} }
void void
GuiApplication::process_events (QEventLoop::ProcessEventsFlags flags, bool silent) GuiApplication::process_events_impl (QEventLoop::ProcessEventsFlags flags, bool silent)
{ {
if (mp_mw) { if (mp_mw) {

14
src/lay/lay/layApplication.h
View File

@ -162,14 +162,17 @@ public:
* handling for the "close application window" case and a "silent" mode. In that mode, processing * handling for the "close application window" case and a "silent" mode. In that mode, processing
* of deferred methods is disabled. * of deferred methods is disabled.
*/ */
virtual void process_events (QEventLoop::ProcessEventsFlags flags, bool silent = false); void process_events (QEventLoop::ProcessEventsFlags flags, bool silent = false)
{
process_events_impl (flags, silent);
}
/** /**
* @brief A shortcut for the default process_events * @brief A shortcut for the default process_events
*/ */
void process_events () void process_events ()
{ {
process_events (QEventLoop::AllEvents); process_events_impl (QEventLoop::AllEvents);
} }
/** /**
@ -337,6 +340,7 @@ protected:
virtual void start_recording (); virtual void start_recording ();
virtual lay::PluginRoot *plugin_root () const = 0; virtual lay::PluginRoot *plugin_root () const = 0;
virtual void finish (); virtual void finish ();
virtual void process_events_impl (QEventLoop::ProcessEventsFlags flags, bool silent = false);
private: private:
std::vector<std::string> scan_global_modules (); std::vector<std::string> scan_global_modules ();
@ -428,17 +432,13 @@ public:
return mp_mw; return mp_mw;
} }
/**
* @brief Reimplementation of ApplicationBase interface
*/
virtual void process_events (QEventLoop::ProcessEventsFlags flags, bool silent);
protected: protected:
virtual void setup (); virtual void setup ();
virtual void shutdown (); virtual void shutdown ();
virtual void finish (); virtual void finish ();
virtual void prepare_recording (const std::string &gtf_record, bool gtf_save_incremental); virtual void prepare_recording (const std::string &gtf_record, bool gtf_save_incremental);
virtual void start_recording (); virtual void start_recording ();
virtual void process_events_impl (QEventLoop::ProcessEventsFlags flags, bool silent);
virtual lay::PluginRoot *plugin_root () const; virtual lay::PluginRoot *plugin_root () const;