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
Show stats Download patch file Download diff file Expand all files Collapse all files

60
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);
@ -312,12 +312,12 @@ public:
{ {
m_model->m_packageRoot->addDelegate(this); m_model->m_packageRoot->addDelegate(this);
} }
~PackageDelegate() ~PackageDelegate()
{ {
m_model->m_packageRoot->removeDelegate(this); m_model->m_packageRoot->removeDelegate(this);
} }
protected: protected:
virtual void catalogRefreshed(CatalogRef aCatalog, StatusCode aReason) virtual void catalogRefreshed(CatalogRef aCatalog, StatusCode aReason)
{ {
@ -330,13 +330,13 @@ protected:
<< QString::fromStdString(aCatalog->url()) << ":" << aReason << endl; << QString::fromStdString(aCatalog->url()) << ":" << aReason << endl;
} }
} }
virtual void startInstall(InstallRef aInstall) virtual void startInstall(InstallRef aInstall)
{ {
QModelIndex mi(indexForPackage(aInstall->package())); QModelIndex mi(indexForPackage(aInstall->package()));
m_model->dataChanged(mi, mi); m_model->dataChanged(mi, mi);
} }
virtual void installProgress(InstallRef aInstall, unsigned int bytes, unsigned int total) virtual void installProgress(InstallRef aInstall, unsigned int bytes, unsigned int total)
{ {
Q_UNUSED(bytes); Q_UNUSED(bytes);
@ -344,21 +344,21 @@ protected:
QModelIndex mi(indexForPackage(aInstall->package())); QModelIndex mi(indexForPackage(aInstall->package()));
m_model->dataChanged(mi, mi); m_model->dataChanged(mi, mi);
} }
virtual void finishInstall(InstallRef aInstall, StatusCode aReason) virtual void finishInstall(InstallRef aInstall, StatusCode aReason)
{ {
QModelIndex mi(indexForPackage(aInstall->package())); QModelIndex mi(indexForPackage(aInstall->package()));
m_model->dataChanged(mi, mi); m_model->dataChanged(mi, mi);
if ((aReason != USER_CANCELLED) && (aReason != STATUS_SUCCESS)) { if ((aReason != USER_CANCELLED) && (aReason != STATUS_SUCCESS)) {
m_model->installFailed(mi, aReason); m_model->installFailed(mi, aReason);
} }
if (aReason == STATUS_SUCCESS) { if (aReason == STATUS_SUCCESS) {
m_model->installSucceeded(mi); m_model->installSucceeded(mi);
} }
} }
virtual void dataForThumbnail(const std::string& aThumbnailUrl, virtual void dataForThumbnail(const std::string& aThumbnailUrl,
size_t length, const uint8_t* bytes) size_t length, const uint8_t* bytes)
{ {
@ -368,19 +368,19 @@ protected:
QString::fromStdString(aThumbnailUrl); QString::fromStdString(aThumbnailUrl);
return; return;
} }
QPixmap pix = QPixmap::fromImage(img); QPixmap pix = QPixmap::fromImage(img);
if (pix.height() > STANDARD_THUMBNAIL_HEIGHT) { if (pix.height() > STANDARD_THUMBNAIL_HEIGHT) {
pix = pix.scaledToHeight(STANDARD_THUMBNAIL_HEIGHT); pix = pix.scaledToHeight(STANDARD_THUMBNAIL_HEIGHT);
} }
m_model->m_thumbnailPixmapCache.insert(QString::fromStdString(aThumbnailUrl), m_model->m_thumbnailPixmapCache.insert(QString::fromStdString(aThumbnailUrl),
pix); pix);
// notify any affected items. Linear scan here avoids another map/dict // notify any affected items. Linear scan here avoids another map/dict
// structure. // structure.
PackageList::const_iterator it; PackageList::const_iterator it;
int i = 0; int i = 0;
for (it=m_model->m_packages.begin(); it != m_model->m_packages.end(); ++it, ++i) { for (it=m_model->m_packages.begin(); it != m_model->m_packages.end(); ++it, ++i) {
const string_list& urls((*it)->thumbnailUrls()); const string_list& urls((*it)->thumbnailUrls());
string_list::const_iterator cit = std::find(urls.begin(), urls.end(), aThumbnailUrl); string_list::const_iterator cit = std::find(urls.begin(), urls.end(), aThumbnailUrl);
@ -390,7 +390,7 @@ protected:
} }
} // of packages iteration } // of packages iteration
} }
private: private:
QModelIndex indexForPackage(const PackageRef& ref) const QModelIndex indexForPackage(const PackageRef& ref) const
{ {
@ -400,11 +400,11 @@ private:
if (it == m_model->m_packages.end()) { if (it == m_model->m_packages.end()) {
return QModelIndex(); return QModelIndex();
} }
size_t offset = it - m_model->m_packages.begin(); size_t offset = it - m_model->m_packages.begin();
return m_model->index(offset + m_model->m_items.size()); return m_model->index(offset + m_model->m_items.size());
} }
AircraftItemModel* m_model; AircraftItemModel* m_model;
}; };
@ -487,16 +487,16 @@ QVariant AircraftItemModel::data(const QModelIndex& index, int role) const
if (role == AircraftVariantRole) { if (role == AircraftVariantRole) {
return m_packageVariant.at(packageIndex); return m_packageVariant.at(packageIndex);
} }
const PackageRef& pkg(m_packages[packageIndex]); const PackageRef& pkg(m_packages[packageIndex]);
InstallRef ex = pkg->existingInstall(); InstallRef ex = pkg->existingInstall();
if (role == AircraftInstallPercentRole) { if (role == AircraftInstallPercentRole) {
return ex.valid() ? ex->downloadedPercent() : 0; return ex.valid() ? ex->downloadedPercent() : 0;
} else if (role == AircraftInstallDownloadedSizeRole) { } else if (role == AircraftInstallDownloadedSizeRole) {
return static_cast<quint64>(ex.valid() ? ex->downloadedBytes() : 0); return static_cast<quint64>(ex.valid() ? ex->downloadedBytes() : 0);
} }
quint32 variantIndex = m_packageVariant.at(packageIndex); quint32 variantIndex = m_packageVariant.at(packageIndex);
return dataFromPackage(pkg, variantIndex, role); return dataFromPackage(pkg, variantIndex, role);
} else { } else {
@ -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);
} }
@ -584,7 +584,7 @@ QVariant AircraftItemModel::dataFromPackage(const PackageRef& item, quint32 vari
if (role == Qt::DecorationRole) { if (role == Qt::DecorationRole) {
role = AircraftThumbnailRole; // use first thumbnail role = AircraftThumbnailRole; // use first thumbnail
} }
if (role == Qt::DisplayRole) { if (role == Qt::DisplayRole) {
return QString::fromStdString(item->name()); return QString::fromStdString(item->name());
} else if (role == AircraftPathRole) { } else if (role == AircraftPathRole) {
@ -646,17 +646,17 @@ 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();
} }
std::string thumbnailUrl = thumbnails.at(index); std::string thumbnailUrl = thumbnails.at(index);
QString urlQString(QString::fromStdString(thumbnailUrl)); QString urlQString(QString::fromStdString(thumbnailUrl));
if (m_thumbnailPixmapCache.contains(urlQString)) { if (m_thumbnailPixmapCache.contains(urlQString)) {
// cache hit, easy // cache hit, easy
return m_thumbnailPixmapCache.value(urlQString); return m_thumbnailPixmapCache.value(urlQString);
} }
// check the on-disk store. This relies on the order of thumbnails in the // check the on-disk store. This relies on the order of thumbnails in the
// results of thumbnailUrls and thumbnails corresponding // results of thumbnailUrls and thumbnails corresponding
InstallRef ex = p->existingInstall(); InstallRef ex = p->existingInstall();
@ -677,7 +677,7 @@ QVariant AircraftItemModel::packageThumbnail(PackageRef p, int index, bool downl
} }
} // of have thumbnail file names } // of have thumbnail file names
} // of have existing install } // of have existing install
if (download) { if (download) {
m_packageRoot->requestThumbnailData(thumbnailUrl); m_packageRoot->requestThumbnailData(thumbnailUrl);
} }
@ -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);
} }
@ -718,7 +718,7 @@ QModelIndex AircraftItemModel::indexOfAircraftURI(QUrl uri) const
} else { } else {
qWarning() << "Unknown aircraft URI scheme" << uri << uri.scheme(); qWarning() << "Unknown aircraft URI scheme" << uri << uri.scheme();
} }
return QModelIndex(); return QModelIndex();
} }
@ -750,7 +750,7 @@ void AircraftItemModel::onScanFinished()
void AircraftItemModel::installFailed(QModelIndex index, simgear::pkg::Delegate::StatusCode reason) void AircraftItemModel::installFailed(QModelIndex index, simgear::pkg::Delegate::StatusCode reason)
{ {
Q_ASSERT(index.row() >= m_items.size()); Q_ASSERT(index.row() >= m_items.size());
QString msg; QString msg;
switch (reason) { switch (reason) {
case Delegate::FAIL_CHECKSUM: case Delegate::FAIL_CHECKSUM:
@ -781,14 +781,14 @@ bool AircraftItemModel::isIndexRunnable(const QModelIndex& index) const
if (index.row() < m_items.size()) { if (index.row() < m_items.size()) {
return true; // local file, always runnable return true; // local file, always runnable
} }
quint32 packageIndex = index.row() - m_items.size(); quint32 packageIndex = index.row() - m_items.size();
const PackageRef& pkg(m_packages[packageIndex]); const PackageRef& pkg(m_packages[packageIndex]);
InstallRef ex = pkg->existingInstall(); InstallRef ex = pkg->existingInstall();
if (!ex.valid()) { if (!ex.valid()) {
return false; // not installed return false; // not installed
} }
return !ex->isDownloading(); return !ex->isDownloading();
} }

4
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());
@ -798,7 +798,7 @@ void LocationWidget::updateDescription()
m_ui->airportDiagram->setApproachExtensionDistance(m_ui->approachDistanceSpin->value()); m_ui->airportDiagram->setApproachExtensionDistance(m_ui->approachDistanceSpin->value());
} else { } else {
m_ui->airportDiagram->setApproachExtensionDistance(0.0); m_ui->airportDiagram->setApproachExtensionDistance(0.0);
} }
} else { } else {
} }