Changeset View
Changeset View
Standalone View
Standalone View
src/kitemviews/kitemlistview.cpp
| Show First 20 Lines • Show All 299 Lines • ▼ Show 20 Line(s) | |||||
| 300 | KItemModelBase* KItemListView::model() const | 300 | KItemModelBase* KItemListView::model() const | ||
| 301 | { | 301 | { | ||
| 302 | return m_model; | 302 | return m_model; | ||
| 303 | } | 303 | } | ||
| 304 | 304 | | |||
| 305 | void KItemListView::setWidgetCreator(KItemListWidgetCreatorBase* widgetCreator) | 305 | void KItemListView::setWidgetCreator(KItemListWidgetCreatorBase* widgetCreator) | ||
| 306 | { | 306 | { | ||
| 307 | delete m_widgetCreator; | 307 | delete m_widgetCreator; | ||
| 308 | m_widgetCreator = nullptr; | ||||
broulik: You're re-assigning it to something else immediately after | |||||
| 308 | m_widgetCreator = widgetCreator; | 309 | m_widgetCreator = widgetCreator; | ||
| 309 | } | 310 | } | ||
Not needed, widgetCreator is a local variable that's going out of scope. elvisangelaccio: Not needed, `widgetCreator` is a local variable that's going out of scope. | |||||
| 310 | 311 | | |||
| 311 | KItemListWidgetCreatorBase* KItemListView::widgetCreator() const | 312 | KItemListWidgetCreatorBase* KItemListView::widgetCreator() const | ||
| 312 | { | 313 | { | ||
| 313 | if (!m_widgetCreator) { | 314 | if (!m_widgetCreator) { | ||
| 314 | m_widgetCreator = defaultWidgetCreator(); | 315 | m_widgetCreator = defaultWidgetCreator(); | ||
| 315 | } | 316 | } | ||
| 316 | return m_widgetCreator; | 317 | return m_widgetCreator; | ||
| 317 | } | 318 | } | ||
| 318 | 319 | | |||
| 319 | void KItemListView::setGroupHeaderCreator(KItemListGroupHeaderCreatorBase* groupHeaderCreator) | 320 | void KItemListView::setGroupHeaderCreator(KItemListGroupHeaderCreatorBase* groupHeaderCreator) | ||
| 320 | { | 321 | { | ||
| 321 | delete m_groupHeaderCreator; | 322 | delete m_groupHeaderCreator; | ||
| 323 | m_groupHeaderCreator = nullptr; | ||||
broulik: Same | |||||
| 322 | m_groupHeaderCreator = groupHeaderCreator; | 324 | m_groupHeaderCreator = groupHeaderCreator; | ||
| 323 | } | 325 | } | ||
elvisangelaccio: Same here. | |||||
| 324 | 326 | | |||
| 325 | KItemListGroupHeaderCreatorBase* KItemListView::groupHeaderCreator() const | 327 | KItemListGroupHeaderCreatorBase* KItemListView::groupHeaderCreator() const | ||
| 326 | { | 328 | { | ||
| 327 | if (!m_groupHeaderCreator) { | 329 | if (!m_groupHeaderCreator) { | ||
| 328 | m_groupHeaderCreator = defaultGroupHeaderCreator(); | 330 | m_groupHeaderCreator = defaultGroupHeaderCreator(); | ||
| 329 | } | 331 | } | ||
| 330 | return m_groupHeaderCreator; | 332 | return m_groupHeaderCreator; | ||
| 331 | } | 333 | } | ||
| ▲ Show 20 Lines • Show All 2370 Lines • ▼ Show 20 Line(s) | 2703 | { | |||
| 2702 | Q_ASSERT(m_createdWidgets.contains(widget)); | 2704 | Q_ASSERT(m_createdWidgets.contains(widget)); | ||
| 2703 | m_createdWidgets.remove(widget); | 2705 | m_createdWidgets.remove(widget); | ||
| 2704 | 2706 | | |||
| 2705 | if (m_recycleableWidgets.count() < 100) { | 2707 | if (m_recycleableWidgets.count() < 100) { | ||
| 2706 | m_recycleableWidgets.append(widget); | 2708 | m_recycleableWidgets.append(widget); | ||
| 2707 | widget->setVisible(false); | 2709 | widget->setVisible(false); | ||
| 2708 | } else { | 2710 | } else { | ||
| 2709 | delete widget; | 2711 | delete widget; | ||
| 2712 | widget = nullptr; | ||||
elvisangelaccio: Same here. | |||||
| 2710 | } | 2713 | } | ||
| 2711 | } | 2714 | } | ||
| 2712 | 2715 | | |||
| 2713 | QGraphicsWidget* KItemListCreatorBase::popRecycleableWidget() | 2716 | QGraphicsWidget* KItemListCreatorBase::popRecycleableWidget() | ||
| 2714 | { | 2717 | { | ||
| 2715 | if (m_recycleableWidgets.isEmpty()) { | 2718 | if (m_recycleableWidgets.isEmpty()) { | ||
| 2716 | return nullptr; | 2719 | return nullptr; | ||
| 2717 | } | 2720 | } | ||
| Show All 18 Lines | |||||
| 2736 | { | 2739 | { | ||
| 2737 | } | 2740 | } | ||
| 2738 | 2741 | | |||
| 2739 | void KItemListGroupHeaderCreatorBase::recycle(KItemListGroupHeader* header) | 2742 | void KItemListGroupHeaderCreatorBase::recycle(KItemListGroupHeader* header) | ||
| 2740 | { | 2743 | { | ||
| 2741 | header->setOpacity(1.0); | 2744 | header->setOpacity(1.0); | ||
| 2742 | pushRecycleableWidget(header); | 2745 | pushRecycleableWidget(header); | ||
| 2743 | } | 2746 | } | ||
| 2744 | | ||||
broulik: Unrelated whitespace change | |||||
You're re-assigning it to something else immediately after