feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils: Fix warnings in Treemodel

Browse Source 
We made a implicit const cast. Like it is said C-style can be harmful
because they are not const safe etc..

Change-Id: I6b41c10c18d37af4caf58574359fdce7d4a420ca
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Marco Bubke
2017-01-05 15:51:14 +01:00
parent e9a2996f8d
commit a8c14b558a
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/libs/utils/treemodel.cpp
View File

@@ -907,7 +907,7 @@ QModelIndex BaseTreeModel::parent(const QModelIndex &idx) const
const TreeItem *item = itemForIndex(idx); const TreeItem *item = itemForIndex(idx);
QTC_ASSERT(item, return QModelIndex()); QTC_ASSERT(item, return QModelIndex());
const TreeItem *parent = item->parent(); TreeItem *parent = item->parent();
if (!parent || parent == m_root) if (!parent || parent == m_root)
return QModelIndex(); return QModelIndex();
@@ -917,7 +917,7 @@ QModelIndex BaseTreeModel::parent(const QModelIndex &idx) const
for (int i = 0, n = grandparent->childCount(); i < n; ++i) for (int i = 0, n = grandparent->childCount(); i < n; ++i)
if (grandparent->childAt(i) == parent) if (grandparent->childAt(i) == parent)
return createIndex(i, 0, (void*) parent); return createIndex(i, 0, static_cast<void*>(parent));
return QModelIndex(); return QModelIndex();
} }
@@ -1043,11 +1043,11 @@ QModelIndex BaseTreeModel::index(int row, int column, const QModelIndex &parent)
if (!hasIndex(row, column, parent)) if (!hasIndex(row, column, parent))
return QModelIndex(); return QModelIndex();
const TreeItem *item = itemForIndex(parent); TreeItem *item = itemForIndex(parent);
QTC_ASSERT(item, return QModelIndex()); QTC_ASSERT(item, return QModelIndex());
if (row >= item->childCount()) if (row >= item->childCount())
return QModelIndex(); return QModelIndex();
return createIndex(row, column, (void*)(item->childAt(row))); return createIndex(row, column, static_cast<void*>(item->childAt(row)));
} }
TreeItem *BaseTreeModel::itemForIndex(const QModelIndex &idx) const TreeItem *BaseTreeModel::itemForIndex(const QModelIndex &idx) const