Commit 5b77e9b2 authored by Ilya Kitaev's avatar Ilya Kitaev Committed by Andreas Bircher

Replaced QGCRingBuffer with QRingBuffer (from Qt)

Conflicts:
	libs/mavlink/include/mavlink/v1.0
	mavlink_generator
	src/GPS/Drivers
parent 59994aed
......@@ -48,9 +48,14 @@
//
#include "qserialport.h"
#include "private/qringbuffer_p.h"
#include <QDebug>
QT_BEGIN_NAMESPACE
class QGCRingBuffer
{
public:
......@@ -318,8 +323,8 @@ public:
int timeoutValue(int msecs, int elapsed);
qint64 readBufferMaxSize;
QGCRingBuffer readBuffer;
QGCRingBuffer writeBuffer;
QRingBuffer readBuffer;
QRingBuffer writeBuffer;
QSerialPort::SerialPortError error;
QString systemLocation;
qint32 inputBaudRate;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment