From f0cd9d4eeedb19ee6b2c12d554d00fe1432e9eba Mon Sep 17 00:00:00 2001 From: "craig.p.drummond" Date: Wed, 3 Sep 2014 18:25:55 +0000 Subject: [PATCH] Put msleep into Thread class --- support/thread.h | 4 +++- support/utils.cpp | 6 +----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/support/thread.h b/support/thread.h index b40ba403d..5ead63c2a 100644 --- a/support/thread.h +++ b/support/thread.h @@ -60,10 +60,12 @@ public: Thread(const QString &name, QObject *p=0); virtual ~Thread(); + // Make QThread::msleep accessible! + using QThread::msleep; + virtual void run(); public Q_SLOTS: void stop() { quit(); } }; #endif - diff --git a/support/utils.cpp b/support/utils.cpp index 8121dec1e..52004b7a5 100644 --- a/support/utils.cpp +++ b/support/utils.cpp @@ -24,6 +24,7 @@ #include "utils.h" #include "config.h" #include "localize.h" +#include "thread.h" #include #include #include @@ -294,11 +295,6 @@ bool Utils::createWorldReadableDir(const QString &dir, const QString &base, cons #endif } -struct Thread : public QThread -{ - using QThread::msleep; -}; - void Utils::msleep(int msecs) { Thread::msleep(msecs);