From 5253dc4d474d9161139f96234be48526ed28eaba Mon Sep 17 00:00:00 2001
From: Collin Kidder <collink@kkmfg.com>
Date: Tue, 7 Jun 2016 10:01:00 -0400
Subject: [PATCH] Fixed a compile time bug in deltamodel. Whoops. Also fixed
 some warnings in graphing window.

---
 deltamodel.cpp     | 5 +++++
 graphingwindow.cpp | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/deltamodel.cpp b/deltamodel.cpp
index 98f88fa..4d501d2 100644
--- a/deltamodel.cpp
+++ b/deltamodel.cpp
@@ -8,6 +8,7 @@ DeltaModel::DeltaModel(QObject *parent)
 QVariant DeltaModel::headerData(int section, Qt::Orientation orientation, int role) const
 {
     // FIXME: Implement me!
+    return QVariant();
 }
 
 int DeltaModel::rowCount(const QModelIndex &parent) const
@@ -15,6 +16,8 @@ int DeltaModel::rowCount(const QModelIndex &parent) const
     if (!parent.isValid())
         return 0;
 
+    return 0;
+
     // FIXME: Implement me!
 }
 
@@ -23,6 +26,8 @@ int DeltaModel::columnCount(const QModelIndex &parent) const
     if (!parent.isValid())
         return 0;
 
+    return 0;
+
     // FIXME: Implement me!
 }
 
diff --git a/graphingwindow.cpp b/graphingwindow.cpp
index 6aff9ec..e555f0f 100644
--- a/graphingwindow.cpp
+++ b/graphingwindow.cpp
@@ -837,7 +837,7 @@ void GraphingWindow::loadDefinitions()
 
                             for (int b = 0; b < 8; b++)
                             {
-                                if (oldMask & (1 << b))
+                                if (oldMask & (1ull << b))
                                 {
                                     gp.startBit = (8 * oldEnd) + b;
                                     break;
@@ -846,7 +846,7 @@ void GraphingWindow::loadDefinitions()
 
                             for (int c = 7; c >= 0; c--)
                             {
-                                if ( oldMask & (1<<(((numBytes - 1) * 8) + c)) )
+                                if ( oldMask & (1ull << (((numBytes - 1) * 8) + c)) )
                                 {
                                     gp.numBits -= (7-c);
                                     break;
@@ -865,7 +865,7 @@ void GraphingWindow::loadDefinitions()
                             gp.numBits = 8;
                             for (int b = 0; b < 8; b++)
                             {
-                                if (oldMask & (1 << b))
+                                if (oldMask & (1ull << b))
                                 {
                                     gp.startBit = 8 * oldStart + b;
                                     gp.numBits = 8 - b;