extend API of TimerFunction class

FreeCAD · Mar 31, 2017 · 4784751 · 4784751 · sukoi26 · Apr 1, 2017
1 parent 784edd3
commit 4784751
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/Gui/ActionFunction.cpp b/src/Gui/ActionFunction.cpp
@@ -119,7 +119,9 @@ class TimerFunctionPrivate
 {
 public:
     boost::function<void()> timeoutFunc;
+    boost::function<void(QObject*)> timeoutFuncQObject;
     bool autoDelete;
+    QPointer<QObject> argQObject;
 };
 }
 
@@ -139,6 +141,13 @@ void TimerFunction::setFunction(boost::function<void()> func)
     d->timeoutFunc = func;
 }
 
+void TimerFunction::setFunction(boost::function<void(QObject*)> func, QObject* args)
+{
+    Q_D(TimerFunction);
+    d->timeoutFuncQObject = func;
+    d->argQObject = args;
+}
+
 void TimerFunction::setAutoDelete(bool on)
 {
     Q_D(TimerFunction);
@@ -148,7 +157,10 @@ void TimerFunction::setAutoDelete(bool on)
 void TimerFunction::timeout()
 {
     Q_D(TimerFunction);
-    d->timeoutFunc();
+    if (d->timeoutFunc)
+        d->timeoutFunc();
+    else if (d->timeoutFuncQObject)
+        d->timeoutFuncQObject(d->argQObject);
     if (d->autoDelete)
         deleteLater();
 }

diff --git a/src/Gui/ActionFunction.h b/src/Gui/ActionFunction.h
@@ -98,6 +98,7 @@ class GuiExport TimerFunction : public QObject
     virtual ~TimerFunction();
 
     void setFunction(boost::function<void()> func);
+    void setFunction(boost::function<void(QObject*)> func, QObject* args);
     void setAutoDelete(bool);
 
 private Q_SLOTS: