Mercurial > hg > svgui
diff widgets/PluginParameterDialog.cpp @ 810:b68af2be4545 tonioni
Merge from branch warnfix_no_size_t
author | Chris Cannam |
---|---|
date | Wed, 18 Jun 2014 13:42:25 +0100 |
parents | e4773943c9c1 |
children | 4a578a360011 |
line wrap: on
line diff
--- a/widgets/PluginParameterDialog.cpp Mon Jun 16 12:50:27 2014 +0100 +++ b/widgets/PluginParameterDialog.cpp Wed Jun 18 13:42:25 2014 +0100 @@ -51,7 +51,7 @@ m_blockSize(0), m_windowType(HanningWindow), m_parameterBox(0), - m_selectionOnly(false) + m_currentSelectionOnly(false) { setWindowTitle(tr("Plugin Parameters")); @@ -540,15 +540,15 @@ } void -PluginParameterDialog::getProcessingParameters(size_t &blockSize) const +PluginParameterDialog::getProcessingParameters(int &blockSize) const { blockSize = m_blockSize; return; } void -PluginParameterDialog::getProcessingParameters(size_t &stepSize, - size_t &blockSize, +PluginParameterDialog::getProcessingParameters(int &stepSize, + int &blockSize, WindowType &windowType) const { stepSize = m_stepSize;