From kde-commits  Mon May 16 20:00:21 2016
From: Christian Ehrlicher <Ch.Ehrlicher () gmx ! de>
Date: Mon, 16 May 2016 20:00:21 +0000
To: kde-commits
Subject: [kdesvn] src/svnfrontend: when textStatus() is svn_wc_status_conflicted, then the status is conflict
Message-Id: <E1b2Ogf-00009t-Bd () scm ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=146342883317513

Git commit e781ef7353256e6429c38deecca09bbbddbf2263 by Christian Ehrlicher.
Committed on 16/05/2016 at 19:55.
Pushed by chehrlic into branch 'master'.

when textStatus() is svn_wc_status_conflicted, then the status is conflicte=
d, not when status is modified

M  +2    -2    src/svnfrontend/svnitem.cpp

http://commits.kde.org/kdesvn/e781ef7353256e6429c38deecca09bbbddbf2263

diff --git a/src/svnfrontend/svnitem.cpp b/src/svnfrontend/svnitem.cpp
index efc84e9..96a8a36 100644
--- a/src/svnfrontend/svnitem.cpp
+++ b/src/svnfrontend/svnitem.cpp
@@ -234,7 +234,7 @@ QPixmap SvnItem::getPixmap(const QPixmap &_p, int size,=
 bool overlay)
     } else if (isRealVersioned()) {
         SvnActions *wrap =3D getWrapper();
         bool mod =3D false;
-        QPixmap p2 =3D QPixmap();
+        QPixmap p2;
         if (p_Item->m_Stat->nodeStatus() =3D=3D svn_wc_status_conflicted) {
             m_bgColor =3D CONFLICT;
             if (overlay) {
@@ -443,7 +443,7 @@ QString SvnItem::infoText()const
             info_text =3D i18n("External");
             break;
         case svn_wc_status_conflicted: {
-            if (p_Item->m_Stat->textStatus() =3D=3D svn_wc_status_modified)
+            if (p_Item->m_Stat->textStatus() =3D=3D svn_wc_status_conflict=
ed)
                 info_text =3D i18n("Conflict");
             else
                 info_text =3D i18n("Property conflicted");