From 6a196bf69d106931777cd372765d3de993d97564 Mon Sep 17 00:00:00 2001 From: Chris Holland Date: Wed, 4 Nov 2020 16:57:47 -0500 Subject: [PATCH] Move m_textInfo to fix ctor warning, and document why it's protected. --- src/kitemviews/kstandarditemlistwidget.cpp | 2 +- src/kitemviews/kstandarditemlistwidget.h | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/kitemviews/kstandarditemlistwidget.cpp b/src/kitemviews/kstandarditemlistwidget.cpp index 60a087a44..83dc0394d 100644 --- a/src/kitemviews/kstandarditemlistwidget.cpp +++ b/src/kitemviews/kstandarditemlistwidget.cpp @@ -232,6 +232,7 @@ void KStandardItemListWidgetInformant::calculateDetailsLayoutItemSizeHints(QVect KStandardItemListWidget::KStandardItemListWidget(KItemListWidgetInformant* informant, QGraphicsItem* parent) : KItemListWidget(informant, parent), + m_textInfo(), m_isCut(false), m_isHidden(false), m_customizedFont(), @@ -247,7 +248,6 @@ KStandardItemListWidget::KStandardItemListWidget(KItemListWidgetInformant* infor m_scaledPixmapSize(), m_iconRect(), m_hoverPixmap(), - m_textInfo(), m_textRect(), m_sortedVisibleRoles(), m_expansionArea(), diff --git a/src/kitemviews/kstandarditemlistwidget.h b/src/kitemviews/kstandarditemlistwidget.h index cda7cbfd1..c19f1759d 100644 --- a/src/kitemviews/kstandarditemlistwidget.h +++ b/src/kitemviews/kstandarditemlistwidget.h @@ -171,13 +171,11 @@ protected: void hideEvent(QHideEvent* event) override; bool event(QEvent *event) override; -protected: struct TextInfo { QPointF pos; QStaticText staticText; }; - QHash m_textInfo; public slots: void finishRoleEditing(); @@ -227,6 +225,9 @@ private: */ static qreal columnPadding(const KItemListStyleOption& option); +protected: + QHash m_textInfo; // PlacesItemListWidget needs to access this + private: bool m_isCut; bool m_isHidden; -- 2.47.3