[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdesvn] src/svnfrontend: when textStatus() is svn_wc_status_conflicted, then the status is conflict
From:       Christian Ehrlicher <Ch.Ehrlicher () gmx ! de>
Date:       2016-05-16 20:00:21
Message-ID: E1b2Ogf-00009t-Bd () scm ! kde ! org
[Download RAW message or body]

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 conflicted, 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 = getWrapper();
         bool mod = false;
-        QPixmap p2 = QPixmap();
+        QPixmap p2;
         if (p_Item->m_Stat->nodeStatus() == svn_wc_status_conflicted) {
             m_bgColor = CONFLICT;
             if (overlay) {
@@ -443,7 +443,7 @@ QString SvnItem::infoText()const
             info_text = i18n("External");
             break;
         case svn_wc_status_conflicted: {
-            if (p_Item->m_Stat->textStatus() == svn_wc_status_modified)
+            if (p_Item->m_Stat->textStatus() == svn_wc_status_conflicted)
                 info_text = i18n("Conflict");
             else
                 info_text = i18n("Property conflicted");

[prev in list] [next in list] [prev in thread] [next in thread]