fly/flightgear
1
0
Fork 0
Code Activity

Fix Linux compilation issues.

Browse source
This commit is contained in:
James Turner 2015-11-14 16:45:04 +00:00
parent 9ab672abd8
commit 6ec9c36afb
2 changed files with 32 additions and 32 deletions

10
src/GUI/AircraftModel.cxx
View file

@ -138,7 +138,7 @@ QPixmap AircraftItem::thumbnail() const
} }
static int CACHE_VERSION = 3; static quint32 CACHE_VERSION = 3;
class AircraftScanThread : public QThread class AircraftScanThread : public QThread
{ {
@ -200,7 +200,7 @@ private:
return; // mis-matched cache, version, drop return; // mis-matched cache, version, drop
} }
for (int i=0; i<count; ++i) { for (quint32 i=0; i<count; ++i) {
AircraftItemPtr item(new AircraftItem); AircraftItemPtr item(new AircraftItem);
item->fromDataStream(ds); item->fromDataStream(ds);
@ -531,7 +531,7 @@ QVariant AircraftItemModel::dataFromItem(AircraftItemPtr item, quint32 variantIn
} }
if (variantIndex) { if (variantIndex) {
if (variantIndex <= item->variants.count()) { if (variantIndex <= static_cast<quint32>(item->variants.count())) {
// show the selected variant // show the selected variant
item = item->variants.at(variantIndex - 1); item = item->variants.at(variantIndex - 1);
} }
@ -646,7 +646,7 @@ QVariant AircraftItemModel::dataFromPackage(const PackageRef& item, quint32 vari
QVariant AircraftItemModel::packageThumbnail(PackageRef p, int index, bool download) const QVariant AircraftItemModel::packageThumbnail(PackageRef p, int index, bool download) const
{ {
const string_list& thumbnails(p->thumbnailUrls()); const string_list& thumbnails(p->thumbnailUrls());
if (index >= thumbnails.size()) { if (index >= static_cast<int>(thumbnails.size())) {
return QVariant(); return QVariant();
} }
@ -709,7 +709,7 @@ QModelIndex AircraftItemModel::indexOfAircraftURI(QUrl uri) const
QString ident = uri.path(); QString ident = uri.path();
PackageRef pkg = m_packageRoot->getPackageById(ident.toStdString()); PackageRef pkg = m_packageRoot->getPackageById(ident.toStdString());
if (pkg) { if (pkg) {
for (int i=0; i < m_packages.size(); ++i) { for (size_t i=0; i < m_packages.size(); ++i) {
if (m_packages[i] == pkg) { if (m_packages[i] == pkg) {
return index(m_items.size() + i); return index(m_items.size() + i);
} }

2
src/GUI/LocationWidget.cxx
View file

@ -441,7 +441,7 @@ void LocationWidget::saveSettings()
settings.setValue("location-lon", m_geodLocation.getLongitudeDeg()); settings.setValue("location-lon", m_geodLocation.getLongitudeDeg());
} else if (m_location) { } else if (m_location) {
settings.setValue("location-id", m_location->guid()); settings.setValue("location-id", static_cast<qlonglong>(m_location->guid()));
} }
settings.setValue("altitude", m_ui->altitudeSpinbox->value()); settings.setValue("altitude", m_ui->altitudeSpinbox->value());