From f96c178ca60b46ba9f431bdbf7b00d8893ffd320 Mon Sep 17 00:00:00 2001 From: Bryant Mairs Date: Tue, 24 Jun 2014 22:37:51 -0700 Subject: [PATCH] QString::toAscii() doesn't exist in Qt5, using toLatin1() instead. --- src/GAudioOutput.cc | 2 +- src/comm/QGCFlightGearLink.cc | 2 +- src/comm/QGCJSBSimLink.cc | 2 +- src/comm/QGCParamID.h | 2 +- src/comm/QGCXPlaneLink.cc | 4 ++-- src/comm/XbeeLink.cpp | 2 +- src/uas/UAS.cc | 6 +++--- src/ui/MainWindow.cc | 2 +- src/ui/map3D/Q3DWidget.cc | 4 ++-- src/ui/mavlink/QGCMAVLinkMessageSender.cc | 6 +++--- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/GAudioOutput.cc b/src/GAudioOutput.cc index 35aef2f..9d479bc 100644 --- a/src/GAudioOutput.cc +++ b/src/GAudioOutput.cc @@ -223,7 +223,7 @@ bool GAudioOutput::say(QString text, int severity) text = "\\" + text; QStdWString str = text.toStdWString(); unsigned char str2[1024] = {}; - memcpy(str2, text.toAscii().data(), str.length()); + memcpy(str2, text.toLatin1().data(), str.length()); SpeakString(str2); res = true; #endif // Q_OS_MAC diff --git a/src/comm/QGCFlightGearLink.cc b/src/comm/QGCFlightGearLink.cc index ce54a3e..f570adf 100644 --- a/src/comm/QGCFlightGearLink.cc +++ b/src/comm/QGCFlightGearLink.cc @@ -236,7 +236,7 @@ void QGCFlightGearLink::updateControls(quint64 time, float rollAilerons, float p { QString state("%1\t%2\t%3\t%4\t%5\n"); state = state.arg(rollAilerons).arg(pitchElevator).arg(yawRudder).arg(true).arg(throttle); - writeBytes(state.toAscii().constData(), state.length()); + writeBytes(state.toLatin1().constData(), state.length()); //qDebug() << "Updated controls" << rollAilerons << pitchElevator << yawRudder << throttle; //qDebug() << "Updated controls" << state; } diff --git a/src/comm/QGCJSBSimLink.cc b/src/comm/QGCJSBSimLink.cc index 947161d..56f03d7 100644 --- a/src/comm/QGCJSBSimLink.cc +++ b/src/comm/QGCJSBSimLink.cc @@ -257,7 +257,7 @@ void QGCJSBSimLink::updateControls(quint64 time, float rollAilerons, float pitch { QString state("%1\t%2\t%3\t%4\t%5\n"); state = state.arg(rollAilerons).arg(pitchElevator).arg(yawRudder).arg(true).arg(throttle); - writeBytes(state.toAscii().constData(), state.length()); + writeBytes(state.toLatin1().constData(), state.length()); } else { diff --git a/src/comm/QGCParamID.h b/src/comm/QGCParamID.h index 2df351f..44f9dde 100644 --- a/src/comm/QGCParamID.h +++ b/src/comm/QGCParamID.h @@ -72,7 +72,7 @@ public: return static_cast(data); } int8_t* toInt8_t() const { - return (int8_t*)data.toAscii().data(); + return (int8_t*)data.toLatin1().data(); } protected: diff --git a/src/comm/QGCXPlaneLink.cc b/src/comm/QGCXPlaneLink.cc index f829b7e..2d35e0f 100644 --- a/src/comm/QGCXPlaneLink.cc +++ b/src/comm/QGCXPlaneLink.cc @@ -226,8 +226,8 @@ void QGCXPlaneLink::run() } ip.index = 0; - strncpy(ip.str_ipad_them, localAddrStr.toAscii(), qMin((int)sizeof(ip.str_ipad_them), 16)); - strncpy(ip.str_port_them, localPortStr.toAscii(), qMin((int)sizeof(ip.str_port_them), 6)); + strncpy(ip.str_ipad_them, localAddrStr.toLatin1(), qMin((int)sizeof(ip.str_ipad_them), 16)); + strncpy(ip.str_port_them, localPortStr.toLatin1(), qMin((int)sizeof(ip.str_port_them), 6)); ip.use_ip = 1; writeBytes((const char*)&ip, sizeof(ip)); diff --git a/src/comm/XbeeLink.cpp b/src/comm/XbeeLink.cpp index 767da68..337c961 100644 --- a/src/comm/XbeeLink.cpp +++ b/src/comm/XbeeLink.cpp @@ -73,7 +73,7 @@ bool XbeeLink::setPortName(QString portName) m_portName = new char[this->m_portNameLength]; for(int i=0;im_portName[i]=list[0][i].toAscii(); + this->m_portName[i]=list[0][i].toLatin1(); } this->m_portName[list[0].size()] = '\0'; } diff --git a/src/uas/UAS.cc b/src/uas/UAS.cc index da9c884..652ad6a 100644 --- a/src/uas/UAS.cc +++ b/src/uas/UAS.cc @@ -2563,7 +2563,7 @@ void UAS::setParameter(const int compId, const QString& paramId, const QVariant& switch ((int)value.type()) { case QVariant::Char: - union_value.param_float = (unsigned char)value.toChar().toAscii(); + union_value.param_float = (unsigned char)value.toChar().toLatin1(); p.param_type = MAV_PARAM_TYPE_INT8; break; case QVariant::Int: @@ -2588,7 +2588,7 @@ void UAS::setParameter(const int compId, const QString& paramId, const QVariant& switch ((int)value.type()) { case QVariant::Char: - union_value.param_int8 = (unsigned char)value.toChar().toAscii(); + union_value.param_int8 = (unsigned char)value.toChar().toLatin1(); p.param_type = MAV_PARAM_TYPE_INT8; break; case QVariant::Int: @@ -2621,7 +2621,7 @@ void UAS::setParameter(const int compId, const QString& paramId, const QVariant& // String characters if ((int)i < paramId.length()) { - p.param_id[i] = paramId.toAscii()[i]; + p.param_id[i] = paramId.toLatin1()[i]; } else { diff --git a/src/ui/MainWindow.cc b/src/ui/MainWindow.cc index eb6e525..dc832b7 100644 --- a/src/ui/MainWindow.cc +++ b/src/ui/MainWindow.cc @@ -1185,7 +1185,7 @@ void MainWindow::saveScreen() if (!screenFileName.isEmpty()) { - window.save(screenFileName, format.toAscii()); + window.save(screenFileName, format.toLatin1()); } } void MainWindow::enableDockWidgetTitleBars(bool enabled) diff --git a/src/ui/map3D/Q3DWidget.cc b/src/ui/map3D/Q3DWidget.cc index 54fc876..aa8918a 100644 --- a/src/ui/map3D/Q3DWidget.cc +++ b/src/ui/map3D/Q3DWidget.cc @@ -254,7 +254,7 @@ Q3DWidget::handleKeyPressEvent(QKeyEvent* event) { mOsgGW->getEventQueue()->keyPress( static_cast( - *(event->text().toAscii().data()))); + *(event->text().toLatin1().data()))); } } @@ -274,7 +274,7 @@ Q3DWidget::handleKeyReleaseEvent(QKeyEvent* event) { mOsgGW->getEventQueue()->keyRelease( static_cast( - *(event->text().toAscii().data()))); + *(event->text().toLatin1().data()))); } } diff --git a/src/ui/mavlink/QGCMAVLinkMessageSender.cc b/src/ui/mavlink/QGCMAVLinkMessageSender.cc index fabf249..6a93ed1 100644 --- a/src/ui/mavlink/QGCMAVLinkMessageSender.cc +++ b/src/ui/mavlink/QGCMAVLinkMessageSender.cc @@ -81,7 +81,7 @@ bool QGCMAVLinkMessageSender::sendMessage(unsigned int msgid) { // Single char char* b = ((char*)(m+messageInfo[msgid].fields[fieldid].wire_offset)); - *b = field->data(1, Qt::DisplayRole).toChar().toAscii(); + *b = field->data(1, Qt::DisplayRole).toChar().toLatin1(); } break; case MAVLINK_TYPE_UINT8_T: @@ -100,7 +100,7 @@ bool QGCMAVLinkMessageSender::sendMessage(unsigned int msgid) { // Single value uint8_t* u = (m+messageInfo[msgid].fields[fieldid].wire_offset); - *u = field->data(1, Qt::DisplayRole).toChar().toAscii(); + *u = field->data(1, Qt::DisplayRole).toChar().toLatin1(); } break; case MAVLINK_TYPE_INT8_T: @@ -119,7 +119,7 @@ bool QGCMAVLinkMessageSender::sendMessage(unsigned int msgid) { // Single value int8_t* u = reinterpret_cast(m+messageInfo[msgid].fields[fieldid].wire_offset); - *u = field->data(1, Qt::DisplayRole).toChar().toAscii(); + *u = field->data(1, Qt::DisplayRole).toChar().toLatin1(); } break; case MAVLINK_TYPE_INT16_T: