summaryrefslogtreecommitdiffstats
path: root/examples/multimedia/audiodevices/audiodevices.h
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@trolltech.com>2010-01-08 11:55:25 (GMT)
committerOlivier Goffart <ogoffart@trolltech.com>2010-01-08 11:55:25 (GMT)
commit30d45394f59c25fc2c3e7e30da4e49bf9744de76 (patch)
tree8483a7b767bb36023f90bca39f8512dc11553f22 /examples/multimedia/audiodevices/audiodevices.h
parentd170179f00effe691de23167e02ff5aeecaeb054 (diff)
parent2e62227f950aac8205f2b67e4d7d046836b2c799 (diff)
downloadQt-30d45394f59c25fc2c3e7e30da4e49bf9744de76.zip
Qt-30d45394f59c25fc2c3e7e30da4e49bf9744de76.tar.gz
Qt-30d45394f59c25fc2c3e7e30da4e49bf9744de76.tar.bz2
Merge remote branch 'origin/master'
Diffstat (limited to 'examples/multimedia/audiodevices/audiodevices.h')
-rw-r--r--examples/multimedia/audiodevices/audiodevices.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/examples/multimedia/audiodevices/audiodevices.h b/examples/multimedia/audiodevices/audiodevices.h
index 5fe5547..bd4b7c4 100644
--- a/examples/multimedia/audiodevices/audiodevices.h
+++ b/examples/multimedia/audiodevices/audiodevices.h
@@ -49,7 +49,7 @@
class AudioDevicesBase : public QMainWindow, public Ui::AudioDevicesBase
{
public:
- AudioDevicesBase( QMainWindow *parent = 0, Qt::WFlags f = 0 );
+ AudioDevicesBase(QWidget *parent = 0, Qt::WFlags f = 0);
virtual ~AudioDevicesBase();
};
@@ -57,10 +57,10 @@ class AudioTest : public AudioDevicesBase
{
Q_OBJECT
public:
- AudioTest( QMainWindow *parent = 0, Qt::WFlags f = 0 );
+ AudioTest(QWidget *parent = 0, Qt::WFlags f = 0);
virtual ~AudioTest();
- QAudioDeviceInfo deviceInfo;
+ QAudioDeviceInfo deviceInfo;
QAudioFormat settings;
QAudio::Mode mode;