Move m_textInfo to fix ctor warning, and document why it's protected.

diff --git a/src/kitemviews/kstandarditemlistwidget.cpp b/src/kitemviews/kstandarditemlistwidget.cpp
index 60a087a44f90761f32b44a9532a85e985d403126..83dc0394da28e3112608c9fabbd384745d6530a0 100644 (file)
--- 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),
 
 KStandardItemListWidget::KStandardItemListWidget(KItemListWidgetInformant* informant, QGraphicsItem* parent) :
     KItemListWidget(informant, parent),

+    m_textInfo(),

     m_isCut(false),
     m_isHidden(false),
     m_customizedFont(),
     m_isCut(false),
     m_isHidden(false),
     m_customizedFont(),


@@ -247,7 +248,6 @@ KStandardItemListWidget::KStandardItemListWidget(KItemListWidgetInformant* infor
     m_scaledPixmapSize(),
     m_iconRect(),
     m_hoverPixmap(),
     m_scaledPixmapSize(),
     m_iconRect(),
     m_hoverPixmap(),

-    m_textInfo(),

     m_textRect(),
     m_sortedVisibleRoles(),
     m_expansionArea(),
     m_textRect(),
     m_sortedVisibleRoles(),
     m_expansionArea(),

diff --git a/src/kitemviews/kstandarditemlistwidget.h b/src/kitemviews/kstandarditemlistwidget.h
index cda7cbfd101e1c9b916709b8dd1084110c20b884..c19f1759db4302b3d4644326bba0ae841eca9505 100644 (file)
--- 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;
 
     void hideEvent(QHideEvent* event) override;
     bool event(QEvent *event) override;
 

-protected:

     struct TextInfo
     {
         QPointF pos;
         QStaticText staticText;
     };
     struct TextInfo
     {
         QPointF pos;
         QStaticText staticText;
     };

-    QHash<QByteArray, TextInfo*> m_textInfo;

 
 public slots:
     void finishRoleEditing();
 
 public slots:
     void finishRoleEditing();


@@ -227,6 +225,9 @@ private:
      */
     static qreal columnPadding(const KItemListStyleOption& option);
 
      */
     static qreal columnPadding(const KItemListStyleOption& option);
 

+protected:
+    QHash<QByteArray, TextInfo*> m_textInfo; // PlacesItemListWidget needs to access this
+

 private:
     bool m_isCut;
     bool m_isHidden;
 private:
     bool m_isCut;
     bool m_isHidden;