From 84cf46bcd2298c3a56d226b7110d98746086ed80 Mon Sep 17 00:00:00 2001
From: Matthias Koefferlein <matthias@koefferlein.de>
Date: Wed, 27 Dec 2017 19:54:06 +0100
Subject: [PATCH] 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.

---
 src/lay/lay/layApplication.cc |  4 ++--
 src/lay/lay/layApplication.h  | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/lay/lay/layApplication.cc b/src/lay/lay/layApplication.cc
index b955c681c..b69552d4e 100644
--- a/src/lay/lay/layApplication.cc
+++ b/src/lay/lay/layApplication.cc
@@ -1252,7 +1252,7 @@ dump_children (QObject *obj, int level = 0)
 }
 
 void
-ApplicationBase::process_events (QEventLoop::ProcessEventsFlags /*flags*/, bool /*silent*/)
+ApplicationBase::process_events_impl (QEventLoop::ProcessEventsFlags /*flags*/, bool /*silent*/)
 {
   //  The base class implementation does nothing ..
 }
@@ -1486,7 +1486,7 @@ GuiApplication::setup ()
 }
 
 void
-GuiApplication::process_events (QEventLoop::ProcessEventsFlags flags, bool silent)
+GuiApplication::process_events_impl (QEventLoop::ProcessEventsFlags flags, bool silent)
 {
   if (mp_mw) {
 
diff --git a/src/lay/lay/layApplication.h b/src/lay/lay/layApplication.h
index 87682c295..25feef38e 100644
--- a/src/lay/lay/layApplication.h
+++ b/src/lay/lay/layApplication.h
@@ -162,14 +162,17 @@ public:
    *  handling for the "close application window" case and a "silent" mode. In that mode, processing
    *  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
    */
   void process_events ()
   {
-    process_events (QEventLoop::AllEvents);
+    process_events_impl (QEventLoop::AllEvents);
   }
 
   /**
@@ -337,6 +340,7 @@ protected:
   virtual void start_recording ();
   virtual lay::PluginRoot *plugin_root () const = 0;
   virtual void finish ();
+  virtual void process_events_impl (QEventLoop::ProcessEventsFlags flags, bool silent = false);
 
 private:
   std::vector<std::string> scan_global_modules ();
@@ -428,17 +432,13 @@ public:
     return mp_mw;
   }
 
-  /**
-   *  @brief Reimplementation of ApplicationBase interface
-   */
-  virtual void process_events (QEventLoop::ProcessEventsFlags flags, bool silent);
-
 protected:
   virtual void setup ();
   virtual void shutdown ();
   virtual void finish ();
   virtual void prepare_recording (const std::string &gtf_record, bool gtf_save_incremental);
   virtual void start_recording ();
+  virtual void process_events_impl (QEventLoop::ProcessEventsFlags flags, bool silent);
 
   virtual lay::PluginRoot *plugin_root () const;