comparison main/PreferencesDialog.cpp @ 547:8103ad8eef87

Merge from qt5 branch. Next release will require qt5
author Chris Cannam
date Thu, 09 May 2013 17:20:24 +0100
parents e5e6625deb85
children ba338234c001 86d1f640ae1e
comparison
equal deleted inserted replaced
544:4163ddee7c00 547:8103ad8eef87
40 #include "widgets/IconLoader.h" 40 #include "widgets/IconLoader.h"
41 #include "base/Preferences.h" 41 #include "base/Preferences.h"
42 #include "audioio/AudioTargetFactory.h" 42 #include "audioio/AudioTargetFactory.h"
43 #include "base/ResourceFinder.h" 43 #include "base/ResourceFinder.h"
44 44
45 PreferencesDialog::PreferencesDialog(QWidget *parent, Qt::WFlags flags) : 45 PreferencesDialog::PreferencesDialog(QWidget *parent) :
46 QDialog(parent, flags), 46 QDialog(parent),
47 m_audioDevice(0), 47 m_audioDevice(0),
48 m_changesOnRestart(false) 48 m_changesOnRestart(false)
49 { 49 {
50 setWindowTitle(tr("Sonic Visualiser: Application Preferences")); 50 setWindowTitle(tr("Sonic Visualiser: Application Preferences"));
51 51