This is the merging of the GUI API cleanup branch that was developed in svn+ssh:...

[features.git] / src / frontends / qt3 / qtTimeout.C

diff --git a/src/frontends/qt3/qtTimeout.C b/src/frontends/qt3/qtTimeout.C
index 241932b4a0e88d19574fea9d7cd33e7ee953bba3..61f8e70beb8ebcee0d482adaf4aea35c33094724 100644 (file)
--- a/src/frontends/qt3/qtTimeout.C
+++ b/src/frontends/qt3/qtTimeout.C
@@ -14,6 +14,9 @@
 
 #include "debug.h"
 
+// stupid Qt
+#undef emit
+
 
 Timeout::Timeout(unsigned int msec, Type t)
        : pimpl_(new qtTimeout(*this)), type(t), timeout_ms(msec)