summaryrefslogtreecommitdiff
authorsimon <simon>2002-12-11 11:19:31 (UTC)
committer simon <simon>2002-12-11 11:19:31 (UTC)
commit03535484e54b2b2311d9d44670b417e2b81ae63b (patch) (side-by-side diff)
treee0f0e51469f54dcba338432baee622c58038b310
parentdd7fcdf1589c8513055f6475d3a1f33075d971d8 (diff)
downloadopie-03535484e54b2b2311d9d44670b417e2b81ae63b.zip
opie-03535484e54b2b2311d9d44670b417e2b81ae63b.tar.gz
opie-03535484e54b2b2311d9d44670b417e2b81ae63b.tar.bz2
- step three to make it compile with gcc2
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/threadutil.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/noncore/multimedia/opieplayer2/threadutil.h b/noncore/multimedia/opieplayer2/threadutil.h
index 2fd0c68..1411535 100644
--- a/noncore/multimedia/opieplayer2/threadutil.h
+++ b/noncore/multimedia/opieplayer2/threadutil.h
@@ -24,128 +24,129 @@
#include <qobject.h>
#include <qguardedptr.h>
class QSocketNotifier;
namespace ThreadUtil
{
class Mutex
{
friend class WaitCondition;
public:
Mutex();
~Mutex();
void lock();
void unlock();
bool tryLock();
bool isLocked();
private:
struct Data;
Data *d;
Mutex( const Mutex & );
Mutex &operator=( const Mutex & );
};
class AutoLock
{
public:
AutoLock( Mutex &mutex ) : m_mutex( mutex ) { m_mutex.lock(); }
~AutoLock() { m_mutex.unlock(); }
Mutex *operator &() const { return &m_mutex; }
private:
Mutex &m_mutex;
};
class WaitCondition
{
public:
WaitCondition();
~WaitCondition();
bool wait();
bool wait( Mutex &mutex );
void wakeOne();
void wakeAll();
private:
struct Data;
Data *d;
WaitCondition( const WaitCondition & );
WaitCondition &operator=( const WaitCondition & );
};
class Thread
{
public:
struct Data;
+ friend struct Data;
Thread();
virtual ~Thread();
void start();
void terminate();
bool wait();
bool isRunning() const;
static void exit();
protected:
virtual void run() = 0;
private:
Data *d;
};
class OnewayNotifier : public QObject
{
Q_OBJECT
public:
OnewayNotifier();
~OnewayNotifier();
void notify();
signals:
void awake();
private slots:
void wakeUp();
private:
int m_readFd;
int m_writeFd;
QSocketNotifier *m_notifier;
};
class Channel;
class ChannelMessage
{
friend class Channel;
public:
ChannelMessage( int type = -1 );
virtual ~ChannelMessage();
int type() const { return m_type; }
void reply();
private:
ChannelMessage( const ChannelMessage & );
ChannelMessage &operator=( const ChannelMessage );
int m_type;
bool m_isCall : 1;
bool m_replied : 1;
bool m_inEventHandler : 1;
Mutex m_guard;
WaitCondition m_condition;