[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=d57901a

The following commit has been merged in the master branch:
commit d57901ab55947c1f3bae152c7d30bd6704b056b7
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Tue Oct 23 14:14:03 2012 +0200

    Use option's palette instead of storing app's palette in class var
    
    Reviewed-by: Rohan Garg
    REVIEW: 107008
    BUG: 308820
    CCBUG: 308802
---
 abstract-contact-delegate.cpp | 10 ++++------
 abstract-contact-delegate.h   |  1 -
 contact-delegate-compact.cpp  |  8 ++++----
 contact-delegate.cpp          |  8 ++++----
 4 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/abstract-contact-delegate.cpp b/abstract-contact-delegate.cpp
index f5f2a05..6013036 100644
--- a/abstract-contact-delegate.cpp
+++ b/abstract-contact-delegate.cpp
@@ -42,14 +42,12 @@ const int SPACING = 2;
 const int ACCOUNT_ICON_SIZE = 16;
 
 AbstractContactDelegate::AbstractContactDelegate(QObject* parent)
-        : QStyledItemDelegate(parent), m_palette(0)
+        : QStyledItemDelegate(parent)
 {
-    m_palette = new QPalette(QApplication::palette());
 }
 
 AbstractContactDelegate::~AbstractContactDelegate()
 {
-    delete m_palette;
 }
 
 void AbstractContactDelegate::paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const
@@ -120,9 +118,9 @@ void AbstractContactDelegate::paintHeader(QPainter *painter, const QStyleOptionV
     QString groupHeaderString =  index.data(Qt::DisplayRole).toString().append(counts);
 
     if (option.state & QStyle::State_HasFocus) {
-        painter->setPen(m_palette->color(QPalette::Active, QPalette::HighlightedText));
+        painter->setPen(option.palette.color(QPalette::Active, QPalette::HighlightedText));
     } else {
-        painter->setPen(m_palette->color(QPalette::Active, QPalette::WindowText));
+        painter->setPen(option.palette.color(QPalette::Active, QPalette::WindowText));
     }
 
     painter->setFont(groupFont);
@@ -132,7 +130,7 @@ void AbstractContactDelegate::paintHeader(QPainter *painter, const QStyleOptionV
 
     QPen thinLinePen;
     thinLinePen.setWidth(0);
-    thinLinePen.setColor(m_palette->color(QPalette::Inactive, QPalette::Button));
+    thinLinePen.setColor(option.palette.color(QPalette::Inactive, QPalette::Button));
 
     painter->setPen(thinLinePen);
     painter->setRenderHint(QPainter::Antialiasing, false);
diff --git a/abstract-contact-delegate.h b/abstract-contact-delegate.h
index 920fd48..b96e027 100644
--- a/abstract-contact-delegate.h
+++ b/abstract-contact-delegate.h
@@ -53,7 +53,6 @@ protected:
     virtual void paintContact(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const = 0;
     /** The size hint for painting contact items*/
     virtual QSize sizeHintContact(const QStyleOptionViewItem& option, const QModelIndex& index) const = 0;
-    QPalette *m_palette;
 
 private:
     /** Paints header items*/
diff --git a/contact-delegate-compact.cpp b/contact-delegate-compact.cpp
index 1915397..f2cce42 100644
--- a/contact-delegate-compact.cpp
+++ b/contact-delegate-compact.cpp
@@ -119,9 +119,9 @@ void ContactDelegateCompact::paintContact(QPainter * painter, const QStyleOption
     const QFontMetrics nameFontMetrics(nameFont);
 
     if (option.state & QStyle::State_HasFocus) {
-        painter->setPen(m_palette->color(QPalette::Active, QPalette::HighlightedText));
+        painter->setPen(option.palette.color(QPalette::Active, QPalette::HighlightedText));
     } else {
-        painter->setPen(m_palette->color(QPalette::Active, QPalette::WindowText));
+        painter->setPen(option.palette.color(QPalette::Active, QPalette::WindowText));
     }
 
     painter->setFont(nameFont);
@@ -140,9 +140,9 @@ void ContactDelegateCompact::paintContact(QPainter * painter, const QStyleOption
     presenceMessageRect.setY(presenceMessageRect.y() + (presenceMessageRect.height()/2 - nameFontMetrics.height()/2));
 
     if (option.state & QStyle::State_HasFocus) {
-        painter->setPen(m_palette->color(QPalette::Disabled, QPalette::HighlightedText));
+        painter->setPen(option.palette.color(QPalette::Disabled, QPalette::HighlightedText));
     } else {
-        painter->setPen(m_palette->color(QPalette::Disabled, QPalette::WindowText));
+        painter->setPen(option.palette.color(QPalette::Disabled, QPalette::WindowText));
     }
 
     painter->drawText(presenceMessageRect,
diff --git a/contact-delegate.cpp b/contact-delegate.cpp
index f79b1d5..11ed9c8 100644
--- a/contact-delegate.cpp
+++ b/contact-delegate.cpp
@@ -134,9 +134,9 @@ void ContactDelegate::paintContact(QPainter *painter, const QStyleOptionViewItem
     const QFontMetrics nameFontMetrics(KGlobalSettings::generalFont());
 
     if (option.state & QStyle::State_HasFocus) {
-        painter->setPen(m_palette->color(QPalette::Active, QPalette::HighlightedText));
+        painter->setPen(option.palette.color(QPalette::Active, QPalette::HighlightedText));
     } else {
-        painter->setPen(m_palette->color(QPalette::Active, QPalette::WindowText));
+        painter->setPen(option.palette.color(QPalette::Active, QPalette::WindowText));
     }
 
     painter->drawText(userNameRect,
@@ -151,9 +151,9 @@ void ContactDelegate::paintContact(QPainter *painter, const QStyleOptionViewItem
 
     QColor fadingColor;
     if (option.state & QStyle::State_HasFocus) {
-        fadingColor = QColor(m_palette->color(QPalette::Disabled, QPalette::HighlightedText));
+        fadingColor = QColor(option.palette.color(QPalette::Disabled, QPalette::HighlightedText));
     } else {
-        fadingColor = QColor(m_palette->color(QPalette::Disabled, QPalette::WindowText));
+        fadingColor = QColor(option.palette.color(QPalette::Disabled, QPalette::WindowText));
     }
 
     // if the index is hovered, set animated alpha to the color

-- 
ktp-contact-list packaging