marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix the build on Linux 

With NULL, the function call was ambiguous. Use nullptr to choose the overload
taking a pointer and not the one taking an integer.
qteditor
Armin Burgmeier 2016-04-10 13:27:16 -07:00
parent d04c4a16ae
commit 0580132d81
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/editor/C4ConsoleQtPropListViewer.cpp
View File

@ -685,7 +685,7 @@ QModelIndex C4ConsoleQtPropListModel::index(int row, int column, const QModelInd
if (!parent.isValid())
{
// Top level has headers only
if (row == 0 || row == 1) return createIndex(row, column, NULL);
if (row == 0 || row == 1) return createIndex(row, column, nullptr);
return QModelIndex();
}
// Property?
@ -710,7 +710,7 @@ QModelIndex C4ConsoleQtPropListModel::parent(const QModelIndex &index) const
Property *prop = static_cast<Property *>(index.internalPointer());
if (!prop) return QModelIndex();
// Find list to use
return createIndex(prop->is_internal ? 1 : 0, 0, NULL);
return createIndex(prop->is_internal ? 1 : 0, 0, nullptr);
}
Qt::ItemFlags C4ConsoleQtPropListModel::flags(const QModelIndex &index) const