summaryrefslogtreecommitdiffstats
path: root/kmix/mixer.h
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-11 06:00:15 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-11 06:00:15 +0000
commitb1057f437bf65300831a0ccb45b920787c6b318d (patch)
treef8a73db06ca1180d0da0ba6dfbe786197b4f4bc3 /kmix/mixer.h
parent4ddfca384ced9ad654213aef9dc2c3973720b980 (diff)
downloadtdemultimedia-b1057f437bf65300831a0ccb45b920787c6b318d.tar.gz
tdemultimedia-b1057f437bf65300831a0ccb45b920787c6b318d.zip
TQt4 port kdemultimedia
This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1236079 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kmix/mixer.h')
-rw-r--r--kmix/mixer.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/kmix/mixer.h b/kmix/mixer.h
index 80bd24ae..0b6d25c2 100644
--- a/kmix/mixer.h
+++ b/kmix/mixer.h
@@ -44,6 +44,7 @@ class KConfig;
class Mixer : public TQObject, virtual public MixerIface
{
Q_OBJECT
+ TQ_OBJECT
public:
enum MixerError { ERR_PERM=1, ERR_WRITE, ERR_READ, ERR_NODEV, ERR_NOTSUPP,
@@ -54,7 +55,7 @@ class Mixer : public TQObject, virtual public MixerIface
static int numDrivers();
- MixDevice* find(TQString& devPK);
+ MixDevice* tqfind(TQString& devPK);
void volumeSave( KConfig *config );
void volumeLoad( KConfig *config );