Fix bug in SPYWAIT helpers

SPYWAIT was a macro that could evaluate an expression twice, which is
not what we want to do.

Author: equalsraf

test/common.h

@@ -3,7 +3,14 @@
 
 // This is just a fix for QSignalSpy::wait
 // http://stackoverflow.com/questions/22390208/google-test-mock-with-qt-signals
-#define SPYWAIT(spy) (spy.count()>0||spy.wait())
-#define SPYWAIT2(spy, time) (spy.count()>0||spy.wait(time))
+bool SPYWAIT(QSignalSpy &spy, int timeout=10000)
+{
+	return spy.count()>0||spy.wait(timeout);
+}
+
+bool SPYWAIT2(QSignalSpy &spy, int timeout=5000)
+{
+	return spy.count()>0||spy.wait(timeout);
+}
 
 #endif