Differential D14443 Diff 38664 src/kitemviews/kstandarditemmodel.cpp

Changeset View

Standalone View

View Options

src/kitemviews/kstandarditemmodel.cpp

Show All 33 Lines32{
34 m_items.clear(); 34​ m_items.clear();
35 m_indexesForItems.clear(); 35​ m_indexesForItems.clear();
36} 36​}
37 37​
38void KStandardItemModel::insertItem(int index, KStandardItem* item) 38​void KStandardItemModel::insertItem(int index, KStandardItem* item)
39{ 39​{
40 if (index < 0 || index > count() || !item) { 40​ if (index < 0 || index > count() || !item) {
41 delete item; 41​ delete item;
42​ item = nullptr;
42 return; 43​ return;
43 } 44​ }
44 45​
45 if (!m_indexesForItems.contains(item)) { 46​ if (!m_indexesForItems.contains(item)) {
46 item->m_model = this; 47​ item->m_model = this;
47 m_items.insert(index, item); 48​ m_items.insert(index, item);
48 m_indexesForItems.insert(item, index); 49​ m_indexesForItems.insert(item, index);
49 50​
Show All 9 Lines
59 emit itemsInserted(KItemRangeList() << KItemRange(index, 1)); 60​ emit itemsInserted(KItemRangeList() << KItemRange(index, 1));
60 } 61​ }
61} 62​}
62 63​
63void KStandardItemModel::changeItem(int index, KStandardItem* item) 64​void KStandardItemModel::changeItem(int index, KStandardItem* item)
64{ 65​{
65 if (index < 0 || index >= count() || !item) { 66​ if (index < 0 || index >= count() || !item) {
66 delete item; 67​ delete item;
68​ item = nullptr;
elvisangelaccioUnsubmitted
Not Done

Same here, but ok. This one could make sense in case one day someone removes the return.

elvisangelaccio: Same here, but ok. This one could make sense in case one day someone removes the return.
67 return; 69​ return;
68 } 70​ }
69 71​
70 item->m_model = this; 72​ item->m_model = this;
71 73​
72 QSet<QByteArray> changedRoles; 74​ QSet<QByteArray> changedRoles;
73 75​
74 KStandardItem* oldItem = m_items[index]; 76​ KStandardItem* oldItem = m_items[index];
▲ Show 20 Lines • Show All 155 Lines • ▼ Show 20 Line(s)230{
230 Q_UNUSED(changedRoles); 232​ Q_UNUSED(changedRoles);
231} 233​}
232 234​
233void KStandardItemModel::onItemRemoved(int index, KStandardItem* removedItem) 235​void KStandardItemModel::onItemRemoved(int index, KStandardItem* removedItem)
234{ 236​{
235 Q_UNUSED(index); 237​ Q_UNUSED(index);
236 Q_UNUSED(removedItem); 238​ Q_UNUSED(removedItem);
237} 239​}
238 ​
elvisangelaccioUnsubmitted
Not Done

Unrelated whitespace change

elvisangelaccio: Unrelated whitespace change