Browse Source

Remove all Q_ASSERT instances from map engine.

QGC4.4
Gus Grubba 8 years ago
parent
commit
9fc0f88a2c
  1. 22
      src/QtLocationPlugin/QMLControl/QGCMapEngineManager.cc

22
src/QtLocationPlugin/QMLControl/QGCMapEngineManager.cc

@ -260,9 +260,10 @@ QGCMapEngineManager::deleteTileSet(QGCCachedTileSet* tileSet) @@ -260,9 +260,10 @@ QGCMapEngineManager::deleteTileSet(QGCCachedTileSet* tileSet)
if(tileSet->defaultSet()) {
for(int i = 0; i < _tileSets.count(); i++ ) {
QGCCachedTileSet* set = qobject_cast<QGCCachedTileSet*>(_tileSets.get(i));
Q_ASSERT(set);
if(set) {
set->setDeleting(true);
}
}
QGCResetTask* task = new QGCResetTask();
connect(task, &QGCResetTask::resetCompleted, this, &QGCMapEngineManager::_resetCompleted);
connect(task, &QGCMapTask::error, this, &QGCMapEngineManager::taskError);
@ -293,8 +294,7 @@ QGCMapEngineManager::_tileSetDeleted(quint64 setID) @@ -293,8 +294,7 @@ QGCMapEngineManager::_tileSetDeleted(quint64 setID)
int i = 0;
for(i = 0; i < _tileSets.count(); i++ ) {
QGCCachedTileSet* set = qobject_cast<QGCCachedTileSet*>(_tileSets.get(i));
Q_ASSERT(set);
if (set->setID() == setID) {
if (set && set->setID() == setID) {
setToDelete = set;
break;
}
@ -350,8 +350,7 @@ QGCMapEngineManager::_updateTotals(quint32 totaltiles, quint64 totalsize, quint3 @@ -350,8 +350,7 @@ QGCMapEngineManager::_updateTotals(quint32 totaltiles, quint64 totalsize, quint3
{
for(int i = 0; i < _tileSets.count(); i++ ) {
QGCCachedTileSet* set = qobject_cast<QGCCachedTileSet*>(_tileSets.get(i));
Q_ASSERT(set);
if (set->defaultSet()) {
if (set && set->defaultSet()) {
set->setSavedTileSize(totalsize);
set->setSavedTileCount(totaltiles);
set->setTotalTileCount(defaulttiles);
@ -368,8 +367,7 @@ QGCMapEngineManager::findName(const QString& name) @@ -368,8 +367,7 @@ QGCMapEngineManager::findName(const QString& name)
{
for(int i = 0; i < _tileSets.count(); i++ ) {
QGCCachedTileSet* set = qobject_cast<QGCCachedTileSet*>(_tileSets.get(i));
Q_ASSERT(set);
if (set->name() == name) {
if (set && set->name() == name) {
return true;
}
}
@ -381,20 +379,22 @@ void @@ -381,20 +379,22 @@ void
QGCMapEngineManager::selectAll() {
for(int i = 0; i < _tileSets.count(); i++ ) {
QGCCachedTileSet* set = qobject_cast<QGCCachedTileSet*>(_tileSets.get(i));
Q_ASSERT(set);
if(set) {
set->setSelected(true);
}
}
}
//-----------------------------------------------------------------------------
void
QGCMapEngineManager::selectNone() {
for(int i = 0; i < _tileSets.count(); i++ ) {
QGCCachedTileSet* set = qobject_cast<QGCCachedTileSet*>(_tileSets.get(i));
Q_ASSERT(set);
if(set) {
set->setSelected(false);
}
}
}
//-----------------------------------------------------------------------------
int
@ -402,8 +402,7 @@ QGCMapEngineManager::selectedCount() { @@ -402,8 +402,7 @@ QGCMapEngineManager::selectedCount() {
int count = 0;
for(int i = 0; i < _tileSets.count(); i++ ) {
QGCCachedTileSet* set = qobject_cast<QGCCachedTileSet*>(_tileSets.get(i));
Q_ASSERT(set);
if(set->selected()) {
if(set && set->selected()) {
count++;
}
}
@ -464,7 +463,6 @@ QGCMapEngineManager::exportSets(QString path) { @@ -464,7 +463,6 @@ QGCMapEngineManager::exportSets(QString path) {
QVector<QGCCachedTileSet*> sets;
for(int i = 0; i < _tileSets.count(); i++ ) {
QGCCachedTileSet* set = qobject_cast<QGCCachedTileSet*>(_tileSets.get(i));
Q_ASSERT(set);
if(set->selected()) {
sets.append(set);
}

Loading…
Cancel
Save