comparison main/PreferencesDialog.cpp @ 940:440ead77632b

Merge from branch cxx11
author Chris Cannam
date Mon, 20 Apr 2015 09:22:46 +0100
parents 6de549288477
children c9d87032f3da 28ccb621d1af
comparison
equal deleted inserted replaced
939:2c5f8da27f72 940:440ead77632b
120 propertyLayout->setCurrentIndex(pl); 120 propertyLayout->setCurrentIndex(pl);
121 121
122 connect(propertyLayout, SIGNAL(currentIndexChanged(int)), 122 connect(propertyLayout, SIGNAL(currentIndexChanged(int)),
123 this, SLOT(propertyLayoutChanged(int))); 123 this, SLOT(propertyLayoutChanged(int)));
124 124
125
126 125
127 m_tuningFrequency = prefs->getTuningFrequency(); 126 m_tuningFrequency = prefs->getTuningFrequency();
128 127
129 QDoubleSpinBox *frequency = new QDoubleSpinBox; 128 QDoubleSpinBox *frequency = new QDoubleSpinBox;
130 frequency->setMinimum(100.0); 129 frequency->setMinimum(100.0);