comparison transform/Transform.cpp @ 935:f960d67ce842 tonioni

Merge from branch warnfix_no_size_t
author Chris Cannam
date Wed, 18 Jun 2014 13:42:01 +0100
parents 06579b8ffb7b
children 58c4d69b4dd8
comparison
equal deleted inserted replaced
925:3efc20c59a94 935:f960d67ce842
64 64
65 QDomElement transformElt = doc.firstChildElement("transform"); 65 QDomElement transformElt = doc.firstChildElement("transform");
66 QDomNamedNodeMap attrNodes = transformElt.attributes(); 66 QDomNamedNodeMap attrNodes = transformElt.attributes();
67 QXmlAttributes attrs; 67 QXmlAttributes attrs;
68 68
69 for (unsigned int i = 0; i < attrNodes.length(); ++i) { 69 for (int i = 0; i < attrNodes.length(); ++i) {
70 QDomAttr attr = attrNodes.item(i).toAttr(); 70 QDomAttr attr = attrNodes.item(i).toAttr();
71 if (!attr.isNull()) attrs.append(attr.name(), "", "", attr.value()); 71 if (!attr.isNull()) attrs.append(attr.name(), "", "", attr.value());
72 } 72 }
73 73
74 setFromXmlAttributes(attrs); 74 setFromXmlAttributes(attrs);
317 Transform::setSummaryType(SummaryType type) 317 Transform::setSummaryType(SummaryType type)
318 { 318 {
319 m_summaryType = type; 319 m_summaryType = type;
320 } 320 }
321 321
322 size_t 322 int
323 Transform::getStepSize() const 323 Transform::getStepSize() const
324 { 324 {
325 return m_stepSize; 325 return m_stepSize;
326 } 326 }
327 327
328 void 328 void
329 Transform::setStepSize(size_t s) 329 Transform::setStepSize(int s)
330 { 330 {
331 m_stepSize = s; 331 m_stepSize = s;
332 } 332 }
333 333
334 size_t 334 int
335 Transform::getBlockSize() const 335 Transform::getBlockSize() const
336 { 336 {
337 return m_blockSize; 337 return m_blockSize;
338 } 338 }
339 339
340 void 340 void
341 Transform::setBlockSize(size_t s) 341 Transform::setBlockSize(int s)
342 { 342 {
343 m_blockSize = s; 343 m_blockSize = s;
344 } 344 }
345 345
346 WindowType 346 WindowType