Browse Source

Replaced QGCRingBuffer with QRingBuffer (from Qt)

Conflicts:
	libs/mavlink/include/mavlink/v1.0
	mavlink_generator
	src/GPS/Drivers
QGC4.4
Ilya Kitaev 8 years ago committed by Andreas Bircher
parent
commit
5b77e9b298
  1. 9
      libs/qtandroidserialport/src/qserialport_p.h

9
libs/qtandroidserialport/src/qserialport_p.h

@ -48,9 +48,14 @@ @@ -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: @@ -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;

Loading…
Cancel
Save