Browse Source

Refactor writeBytes to _writeBytes

QGC4.4
Nate Weibley 9 years ago
parent
commit
fe8ff69e24
  1. 2
      src/comm/BluetoothLink.cc
  2. 2
      src/comm/BluetoothLink.h
  3. 4
      src/comm/LinkInterface.h
  4. 2
      src/comm/LogReplayLink.cc
  5. 2
      src/comm/LogReplayLink.h
  6. 2
      src/comm/MockLink.cc
  7. 2
      src/comm/MockLink.h
  8. 2
      src/comm/QGCFlightGearLink.cc
  9. 2
      src/comm/QGCFlightGearLink.h
  10. 4
      src/comm/QGCHilLink.h
  11. 2
      src/comm/QGCJSBSimLink.cc
  12. 2
      src/comm/QGCJSBSimLink.h
  13. 2
      src/comm/QGCXPlaneLink.cc
  14. 2
      src/comm/QGCXPlaneLink.h
  15. 2
      src/comm/SerialLink.cc
  16. 2
      src/comm/SerialLink.h
  17. 2
      src/comm/TCPLink.cc
  18. 2
      src/comm/TCPLink.h
  19. 2
      src/comm/UDPLink.cc
  20. 2
      src/comm/UDPLink.h
  21. 2
      src/comm/XbeeLink.cpp
  22. 2
      src/comm/XbeeLink.h

2
src/comm/BluetoothLink.cc

@ -89,7 +89,7 @@ QString BluetoothLink::getName() const
return _config->name(); return _config->name();
} }
void BluetoothLink::writeBytes(const QByteArray bytes) void BluetoothLink::_writeBytes(const QByteArray bytes)
{ {
if(_targetSocket) if(_targetSocket)
{ {

2
src/comm/BluetoothLink.h

@ -193,7 +193,7 @@ private:
void _restartConnection (); void _restartConnection ();
private slots: private slots:
void writeBytes (const QByteArray bytes); void _writeBytes (const QByteArray bytes);
private: private:
void _createSocket (); void _createSocket ();

4
src/comm/LinkInterface.h

@ -163,7 +163,7 @@ public slots:
} }
private slots: private slots:
virtual void writeBytes(const QByteArray) = 0; virtual void _writeBytes(const QByteArray) = 0;
signals: signals:
void autoconnectChanged(bool autoconnect); void autoconnectChanged(bool autoconnect);
@ -220,7 +220,7 @@ protected:
memset(_outDataWriteAmounts,0, sizeof(_outDataWriteAmounts)); memset(_outDataWriteAmounts,0, sizeof(_outDataWriteAmounts));
memset(_outDataWriteTimes, 0, sizeof(_outDataWriteTimes)); memset(_outDataWriteTimes, 0, sizeof(_outDataWriteTimes));
QObject::connect(this, &LinkInterface::_invokeWriteBytes, this, &LinkInterface::writeBytes); QObject::connect(this, &LinkInterface::_invokeWriteBytes, this, &LinkInterface::_writeBytes);
qRegisterMetaType<LinkInterface*>("LinkInterface*"); qRegisterMetaType<LinkInterface*>("LinkInterface*");
} }

2
src/comm/LogReplayLink.cc

@ -151,7 +151,7 @@ void LogReplayLink::_replayError(const QString& errorMsg)
} }
/// Since this is log replay, we just drops writes on the floor /// Since this is log replay, we just drops writes on the floor
void LogReplayLink::writeBytes(const QByteArray bytes) void LogReplayLink::_writeBytes(const QByteArray bytes)
{ {
Q_UNUSED(bytes); Q_UNUSED(bytes);
} }

2
src/comm/LogReplayLink.h

@ -99,7 +99,7 @@ public:
bool disconnect(void); bool disconnect(void);
private slots: private slots:
virtual void writeBytes(const QByteArray bytes); virtual void _writeBytes(const QByteArray bytes);
signals: signals:
void logFileStats(bool logTimestamped, int logDurationSecs, int binaryBaudRate); void logFileStats(bool logTimestamped, int logDurationSecs, int binaryBaudRate);

2
src/comm/MockLink.cc

@ -313,7 +313,7 @@ void MockLink::respondWithMavlinkMessage(const mavlink_message_t& msg)
} }
/// @brief Called when QGC wants to write bytes to the MAV /// @brief Called when QGC wants to write bytes to the MAV
void MockLink::writeBytes(const QByteArray bytes) void MockLink::_writeBytes(const QByteArray bytes)
{ {
if (_inNSH) { if (_inNSH) {
_handleIncomingNSHBytes(bytes.constData(), bytes.count()); _handleIncomingNSHBytes(bytes.constData(), bytes.count());

2
src/comm/MockLink.h

@ -151,7 +151,7 @@ public:
static MockLink* startAPMArduPlaneMockLink (bool sendStatusText); static MockLink* startAPMArduPlaneMockLink (bool sendStatusText);
private slots: private slots:
virtual void writeBytes(const QByteArray bytes); virtual void _writeBytes(const QByteArray bytes);
private slots: private slots:
void _run1HzTasks(void); void _run1HzTasks(void);

2
src/comm/QGCFlightGearLink.cc

@ -244,7 +244,7 @@ void QGCFlightGearLink::updateControls(quint64 time, float rollAilerons, float p
} }
} }
void QGCFlightGearLink::writeBytes(const QByteArray data) void QGCFlightGearLink::_writeBytes(const QByteArray data)
{ {
//#define QGCFlightGearLink_DEBUG //#define QGCFlightGearLink_DEBUG
#ifdef QGCFlightGearLink_DEBUG #ifdef QGCFlightGearLink_DEBUG

2
src/comm/QGCFlightGearLink.h

@ -129,7 +129,7 @@ private slots:
* @param data Pointer to the data byte array * @param data Pointer to the data byte array
* @param size The size of the bytes array * @param size The size of the bytes array
**/ **/
void writeBytes(const QByteArray data); void _writeBytes(const QByteArray data);
public slots: public slots:
bool connectSimulation(); bool connectSimulation();

4
src/comm/QGCHilLink.h

@ -73,7 +73,7 @@ public slots:
virtual bool disconnectSimulation() = 0; virtual bool disconnectSimulation() = 0;
private slots: private slots:
virtual void writeBytes(const QByteArray) = 0; virtual void _writeBytes(const QByteArray) = 0;
protected: protected:
virtual void setName(QString name) = 0; virtual void setName(QString name) = 0;
@ -81,7 +81,7 @@ protected:
QGCHilLink() : QGCHilLink() :
QThread() QThread()
{ {
connect(this, &QGCHilLink::_invokeWriteBytes, this, &QGCHilLink::writeBytes); connect(this, &QGCHilLink::_invokeWriteBytes, this, &QGCHilLink::_writeBytes);
} }
signals: signals:

2
src/comm/QGCJSBSimLink.cc

@ -255,7 +255,7 @@ void QGCJSBSimLink::updateControls(quint64 time, float rollAilerons, float pitch
//qDebug() << "Updated controls" << state; //qDebug() << "Updated controls" << state;
} }
void QGCJSBSimLink::writeBytes(const QByteArray data) void QGCJSBSimLink::_writeBytes(const QByteArray data)
{ {
//#define QGCJSBSimLink_DEBUG //#define QGCJSBSimLink_DEBUG
#ifdef QGCJSBSimLink_DEBUG #ifdef QGCJSBSimLink_DEBUG

2
src/comm/QGCJSBSimLink.h

@ -122,7 +122,7 @@ private slots:
* @param data Pointer to the data byte array * @param data Pointer to the data byte array
* @param size The size of the bytes array * @param size The size of the bytes array
**/ **/
void writeBytes(const QByteArray data); void _writeBytes(const QByteArray data);
public slots: public slots:
bool connectSimulation(); bool connectSimulation();

2
src/comm/QGCXPlaneLink.cc

@ -448,7 +448,7 @@ Eigen::Matrix3f euler_to_wRo(double yaw, double pitch, double roll) {
return wRo; return wRo;
} }
void QGCXPlaneLink::writeBytes(const QByteArray data) void QGCXPlaneLink::_writeBytes(const QByteArray data)
{ {
if (data.isEmpty()) return; if (data.isEmpty()) return;

2
src/comm/QGCXPlaneLink.h

@ -134,7 +134,7 @@ private slots:
* @param data Pointer to the data byte array * @param data Pointer to the data byte array
* @param size The size of the bytes array * @param size The size of the bytes array
**/ **/
void writeBytes(const QByteArray data); void _writeBytes(const QByteArray data);
public slots: public slots:
bool connectSimulation(); bool connectSimulation();

2
src/comm/SerialLink.cc

@ -82,7 +82,7 @@ bool SerialLink::_isBootloader()
return false; return false;
} }
void SerialLink::writeBytes(const QByteArray data) void SerialLink::_writeBytes(const QByteArray data)
{ {
if(_port && _port->isOpen()) { if(_port && _port->isOpen()) {
_logOutputDataRate(data.size(), QDateTime::currentMSecsSinceEpoch()); _logOutputDataRate(data.size(), QDateTime::currentMSecsSinceEpoch());

2
src/comm/SerialLink.h

@ -164,7 +164,7 @@ private slots:
* @param data Pointer to the data byte array * @param data Pointer to the data byte array
* @param size The size of the bytes array * @param size The size of the bytes array
**/ **/
void writeBytes(const QByteArray data); void _writeBytes(const QByteArray data);
public slots: public slots:
void linkError(QSerialPort::SerialPortError error); void linkError(QSerialPort::SerialPortError error);

2
src/comm/TCPLink.cc

@ -88,7 +88,7 @@ void TCPLink::_writeDebugBytes(const QByteArray data)
} }
#endif #endif
void TCPLink::writeBytes(const QByteArray data) void TCPLink::_writeBytes(const QByteArray data)
{ {
#ifdef TCPLINK_READWRITE_DEBUG #ifdef TCPLINK_READWRITE_DEBUG
_writeDebugBytes(data); _writeDebugBytes(data);

2
src/comm/TCPLink.h

@ -154,7 +154,7 @@ public:
private slots: private slots:
// From LinkInterface // From LinkInterface
void writeBytes(const QByteArray data); void _writeBytes(const QByteArray data);
public slots: public slots:
void waitForBytesWritten(int msecs); void waitForBytesWritten(int msecs);

2
src/comm/UDPLink.cc

@ -147,7 +147,7 @@ void UDPLink::removeHost(const QString& host)
_config->removeHost(host); _config->removeHost(host);
} }
void UDPLink::writeBytes(const QByteArray data) void UDPLink::_writeBytes(const QByteArray data)
{ {
if (!_socket) if (!_socket)
return; return;

2
src/comm/UDPLink.h

@ -208,7 +208,7 @@ private slots:
* @param data Pointer to the data byte array * @param data Pointer to the data byte array
* @param size The size of the bytes array * @param size The size of the bytes array
**/ **/
void writeBytes(const QByteArray data); void _writeBytes(const QByteArray data);
protected: protected:

2
src/comm/XbeeLink.cpp

@ -172,7 +172,7 @@ void XbeeLink::_disconnect(void)
emit disconnected(); emit disconnected();
} }
void XbeeLink::writeBytes(const QByteArray bytes) void XbeeLink::_writeBytes(const QByteArray bytes)
{ {
if(!xbee_nsenddata(this->m_xbeeCon,const_cast<char*>(bytes.data()),bytes.size())) // return value of 0 is successful written if(!xbee_nsenddata(this->m_xbeeCon,const_cast<char*>(bytes.data()),bytes.size())) // return value of 0 is successful written
{ {

2
src/comm/XbeeLink.h

@ -46,7 +46,7 @@ public:
qint64 getCurrentInDataRate() const; qint64 getCurrentInDataRate() const;
private slots: // virtual functions from LinkInterface private slots: // virtual functions from LinkInterface
void writeBytes(const QByteArray bytes); void _writeBytes(const QByteArray bytes);
protected slots: // virtual functions from LinkInterface protected slots: // virtual functions from LinkInterface
void readBytes(); void readBytes();

Loading…
Cancel
Save