Merge remote-tracking branch 'origin/KDE/4.9'

[dolphin.git] / src / kitemviews / kstandarditemlistwidget.h

diff --git a/src/kitemviews/kstandarditemlistwidget.h b/src/kitemviews/kstandarditemlistwidget.h
index 462d83d0fad1b8b8785ffff9aa0f7971164582c7..386f60e4b1178df1df326d61cdd22cbe5621fb52 100644 (file)
--- a/src/kitemviews/kstandarditemlistwidget.h
+++ b/src/kitemviews/kstandarditemlistwidget.h
@@ -120,7 +120,7 @@ protected:
      */
     virtual QFont customizedFont(const QFont& baseFont) const;
 
-    virtual QPalette::ColorRole normalTextColorPalette() const;
+    virtual QPalette::ColorRole normalTextColorRole() const;
 
     void setTextColor(const QColor& color);
     QColor textColor() const;
@@ -241,6 +241,7 @@ private:
     QPixmap m_rating;
 
     KItemListRoleEditor* m_roleEditor;
+    KItemListRoleEditor* m_oldRoleEditor;
 
     friend class KStandardItemListWidgetInformant; // Accesses private static methods to be able to
                                                    // share a common layout calculation