Merge branch 'master' of github.com:collin80/SavvyCAN

re/sniffer/snifferitem.cpp

@@ -41,7 +41,7 @@ dc SnifferItem::dataChange(uchar i) const
             ((uchar*) &mLastMarker.data)[i] &&
             !((uchar*) &mNotch)[i] )
     {
-        return ((uchar*) &mCurrent.data)[i] >= ((uchar*) &mLast.data)[i] ? dc::INC : dc::DEC;
+        return ((uchar*) &mCurrent.data)[i] >= ((uchar*) &mLast.data)[i] ? dc::INC : dc::DEINC;
     }
 
     return dc::NO;

re/sniffer/snifferitem.h

@@ -15,7 +15,7 @@ enum dc
 {
     NO,
     INC,
-    DEC
+    DEINC
 };
 
 

re/sniffer/sniffermodel.cpp

@@ -75,7 +75,7 @@ QVariant SnifferModel::data(const QModelIndex &index, int role) const
                 {
                     case dc::INC:
                         return QBrush(Qt::green);
-                    case dc::DEC:
+                    case dc::DEINC:
                         return QBrush(Qt::red);
                     default:
                         break;