Permalink
Browse files

Ensure all Q_DISABLE_COPY macro usage is a private section

  • Loading branch information...
stuartm committed Dec 15, 2012
1 parent f1540fe commit 7dfc8a2d66a8ae991d475dbba59b637ac3f3ffd2
Showing with 6 additions and 3 deletions.
  1. +1 −1 mythtv/libs/libmythtv/mhegic.h
  2. +4 −2 mythtv/libs/libmythtv/netstream.h
  3. +1 −0 mythtv/libs/libmythui/mythuiimage.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
@@ -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
@@ -177,6 +177,7 @@ class MUI_PUBLIC MythUIImage : public MythUIType
friend class MythUITextEdit;
friend class ImageLoadThread;
private:
Q_DISABLE_COPY(MythUIImage)
};

0 comments on commit 7dfc8a2

Please sign in to comment.