From f1792b188cf916c936a4fb95a2e7985a59c9410e Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Thu, 5 Jan 2012 15:12:09 +1000 Subject: [PATCH] Unbreaking git.. I ctrl-z'd something by accident before the previous push.. --- SleepLib/session.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/SleepLib/session.cpp b/SleepLib/session.cpp index 09607971..48d67304 100644 --- a/SleepLib/session.cpp +++ b/SleepLib/session.cpp @@ -451,8 +451,8 @@ bool Session::StoreEvents(QString filename) } bool Session::LoadEvents(QString filename) { - quint32 t32,magicnum,machid,sessid; - quint16 t16,version,type,crc16,machtype,compmethod; + quint32 magicnum,machid,sessid; + quint16 version,type,crc16,machtype,compmethod; quint8 t8; qint32 datasize; @@ -473,7 +473,6 @@ bool Session::LoadEvents(QString filename) header.setVersion(QDataStream::Qt_4_6); header.setByteOrder(QDataStream::LittleEndian); - bool compressed=true; header >> magicnum; // Magic Number (quint32) header >> version; // Version (quint16) header >> type; // File type (quint16) @@ -515,7 +514,7 @@ bool Session::LoadEvents(QString filename) } else { databytes=temp; } - } + } else databytes=temp; if (version>=10) { if (databytes.size()!=datasize) { @@ -629,8 +628,6 @@ bool Session::LoadEvents(QString filename) } } - zzzzz; deliberately breaking git.. - if (version