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

re/sniffer/snifferitem.h

@@ -2,7 +2,7 @@
 #define SNIFFERITEM_H
 
 #include <QVariant>
-#include <QTime>
+#include <QElapsedTimer>
 #include "can_structs.h"
 
 struct fstCan
@@ -50,7 +50,7 @@ private:
     quint64         mCurrentTime;
     quint64         mCurrSeqVal;
 
-    QTime           mTime;
+    QElapsedTimer   mTime;
 };
 
 #endif // SNIFFERITEM_H

re/sniffer/sniffermodel.cpp

@@ -137,7 +137,7 @@ QVariant SnifferModel::data(const QModelIndex &index, int role) const
 Qt::ItemFlags SnifferModel::flags(const QModelIndex &index) const
 {
     if (!index.isValid())
-        return 0;
+        return Qt::NoItemFlags;
 
     return QAbstractItemModel::flags(index);
 }