diff --git a/mythtv/libs/libmythtv/mhegic.h b/mythtv/libs/libmythtv/mhegic.h index fcad95fd985..58d7d6d30da 100644 --- a/mythtv/libs/libmythtv/mhegic.h +++ b/mythtv/libs/libmythtv/mhegic.h @@ -15,7 +15,6 @@ class NetStream; class MHInteractionChannel : public QObject { Q_OBJECT - Q_DISABLE_COPY(MHInteractionChannel) public: MHInteractionChannel(QObject* parent = 0); @@ -41,6 +40,7 @@ private slots: void slotFinished(QObject*); private: + Q_DISABLE_COPY(MHInteractionChannel) mutable QMutex m_mutex; typedef QHash< QString, NetStream* > map_t; map_t m_pending; // Pending requests diff --git a/mythtv/libs/libmythtv/netstream.h b/mythtv/libs/libmythtv/netstream.h index b505f226f79..0614f69d9f0 100644 --- a/mythtv/libs/libmythtv/netstream.h +++ b/mythtv/libs/libmythtv/netstream.h @@ -30,7 +30,6 @@ class NetStreamAbort; class NetStream : public QObject { Q_OBJECT - Q_DISABLE_COPY(NetStream) public: enum EMode { kNeverCache, kPreferCache, kAlwaysCache }; @@ -86,6 +85,8 @@ private slots: void slotReadyRead(); private: + Q_DISABLE_COPY(NetStream) + bool Request(const QUrl &); const int m_id; // Unique request ID @@ -109,7 +110,6 @@ private slots: class NAMThread : public QThread { Q_OBJECT - Q_DISABLE_COPY(NAMThread) // Use manager() to create NAMThread(); @@ -137,6 +137,8 @@ private slots: void quit(); private: + Q_DISABLE_COPY(NAMThread) + volatile bool m_bQuit; QSemaphore m_running; mutable QMutex m_mutex; // Protects r/w access to the following data diff --git a/mythtv/libs/libmythui/mythuiimage.h b/mythtv/libs/libmythui/mythuiimage.h index 522f38ac994..90901d35d74 100644 --- a/mythtv/libs/libmythui/mythuiimage.h +++ b/mythtv/libs/libmythui/mythuiimage.h @@ -177,6 +177,7 @@ class MUI_PUBLIC MythUIImage : public MythUIType friend class MythUITextEdit; friend class ImageLoadThread; + private: Q_DISABLE_COPY(MythUIImage) };