rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-30 08:24:11 +01:00
Code Issues Releases Activity

OP-1170 Got rid of all compiler warnings in utils library.

Browse Source
This commit is contained in:
m_thread 2014-02-27 09:16:33 +01:00
parent ae72735a50
commit 43bd1f3c69
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ground/openpilotgcs/src/libs/utils/logfile.cpp
View File

@ -105,7 +105,7 @@ void LogFile::timerFired()
// TODO: going back in time will be a problem // TODO: going back in time will be a problem
while ((m_lastPlayed + ((time - m_timeOffset) * m_playbackSpeed) > m_lastTimeStamp)) { while ((m_lastPlayed + ((time - m_timeOffset) * m_playbackSpeed) > m_lastTimeStamp)) {
m_lastPlayed += ((time - m_timeOffset) * m_playbackSpeed); m_lastPlayed += ((time - m_timeOffset) * m_playbackSpeed);
if (m_file.bytesAvailable() < sizeof(dataSize)) { if (m_file.bytesAvailable() < (qint64)sizeof(dataSize)) {
stopReplay(); stopReplay();
return; return;
} }
@ -129,7 +129,7 @@ void LogFile::timerFired()
emit readyRead(); emit readyRead();
if (m_file.bytesAvailable() < sizeof(m_lastTimeStamp)) { if (m_file.bytesAvailable() < (qint64)sizeof(m_lastTimeStamp)) {
stopReplay(); stopReplay();
return; return;
} }

4
ground/openpilotgcs/src/libs/utils/xmlconfig.cpp
View File

@ -63,7 +63,7 @@ bool XmlConfig::readXmlFile(QIODevice &device, QSettings::SettingsMap &map)
.arg(errorLine) .arg(errorLine)
.arg(errorColumn) .arg(errorColumn)
.arg(errorStr); .arg(errorStr);
qFatal(err.toLatin1().data()); qFatal("%s", err.toLatin1().data());
return false; return false;
} }
root = domDoc.documentElement(); root = domDoc.documentElement();
@ -99,7 +99,7 @@ void XmlConfig::handleNode(QDomElement *node, QSettings::SettingsMap &map, QStri
} }
// qDebug() << "Node: " << ": " << path << " Children: " << node->childNodes().length(); // qDebug() << "Node: " << ": " << path << " Children: " << node->childNodes().length();
for (uint i = 0; i < node->childNodes().length(); ++i) { for (int i = 0; i < node->childNodes().length(); ++i) {
QDomNode child = node->childNodes().item(i); QDomNode child = node->childNodes().item(i);
if (child.isElement()) { if (child.isElement()) {
handleNode(static_cast<QDomElement *>(&child), map, path); handleNode(static_cast<QDomElement *>(&child), map, path);