Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix compilation under Qt 6.6 #732

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion canframemodel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ uint64_t CANFrameModel::getCANFrameVal(QVector<CANFrame> *frames, int row, Colum
return static_cast<uint64_t>(frame.payload().length());
case Column::ASCII: //sort both the same for now
case Column::Data:
for (int i = 0; i < std::min(frame.payload().length(), 8); i++) temp += (static_cast<uint64_t>(frame.payload()[i]) << (56 - (8 * i)));
for (int i = 0; i < std::min(static_cast<int>(frame.payload().length()), 8); i++) temp += (static_cast<uint64_t>(frame.payload()[i]) << (56 - (8 * i)));
//qDebug() << temp;
return temp;
case Column::NUM_COLUMN:
Expand Down
4 changes: 3 additions & 1 deletion connections/lawicel_serial.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -388,6 +388,7 @@ void LAWICELSerial::serialError(QSerialPort::SerialPortError err)
killConnection = true;
piStop();
break;
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
case QSerialPort::ParityError:
errMessage = "Parity error on serial port";
break;
Expand All @@ -397,6 +398,7 @@ void LAWICELSerial::serialError(QSerialPort::SerialPortError err)
case QSerialPort::BreakConditionError:
errMessage = "Break error on serial port";
break;
#endif
case QSerialPort::WriteError:
errMessage = "Write error on serial port";
piStop();
Expand Down Expand Up @@ -486,7 +488,7 @@ void LAWICELSerial::readSerialData()
//qDebug() << c << " " << QString::number(c, 16) << " " << QString(c);
debugBuild = debugBuild % QString::number(c, 16).rightJustified(2,'0') % " ";
//procRXChar(c);
mBuildLine.append(c);
mBuildLine.append(static_cast<char>(c));
if (c == 13) //all lawicel commands end in CR
{
qDebug() << "Got CR!";
Expand Down
2 changes: 1 addition & 1 deletion re/graphingwindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -782,7 +782,7 @@ void GraphingWindow::saveSpreadsheet()
for (auto && graph : graphParams) {
xMin = std::min(xMin, graph.x[0]);
xMax = std::max(xMax, graph.x[graph.x.count() - 1]);
maxCount = std::max(maxCount, graph.x.count());
maxCount = std::max(maxCount, static_cast<int>(graph.x.count()));
}
qDebug() << "xMin: " << xMin;
qDebug() << "xMax: " << xMax;
Expand Down