Fix template magic in group view.

This commit is contained in:
Petr Mrázek 2014-02-09 21:14:34 +01:00
parent ba401922e1
commit 1f218bb8cd

View File

@ -798,7 +798,7 @@ QPair<Group *, int> GroupView::rowDropPos(const QPoint &pos)
{ {
if (pos.y() > y && pos.y() < (y + cat->headerHeight())) if (pos.y() > y && pos.y() < (y + cat->headerHeight()))
{ {
return qMakePair(nullptr, -1); return qMakePair<Group*, int>(nullptr, -1);
} }
y += cat->totalHeight() + m_categoryMargin; y += cat->totalHeight() + m_categoryMargin;
if (pos.y() < y) if (pos.y() < y)
@ -809,7 +809,7 @@ QPair<Group *, int> GroupView::rowDropPos(const QPoint &pos)
} }
if (category == 0) if (category == 0)
{ {
return qMakePair(nullptr, -1); return qMakePair<Group*, int>(nullptr, -1);
} }
} }
@ -836,7 +836,7 @@ QPair<Group *, int> GroupView::rowDropPos(const QPoint &pos)
} }
if (internalColumn == -1) if (internalColumn == -1)
{ {
return qMakePair(nullptr, -1); return qMakePair<Group*, int>(nullptr, -1);
} }
} }
@ -856,13 +856,13 @@ QPair<Group *, int> GroupView::rowDropPos(const QPoint &pos)
} }
if (internalRow == -1) if (internalRow == -1)
{ {
return qMakePair(nullptr, -1); return qMakePair<Group*, int>(nullptr, -1);
} }
// this happens if we're in the margin between a one category and another // this happens if we're in the margin between a one category and another
// categories header // categories header
if (internalRow > (indices.size() / itemsPerRow())) if (internalRow > (indices.size() / itemsPerRow()))
{ {
return qMakePair(nullptr, -1); return qMakePair<Group*, int>(nullptr, -1);
} }
} }