Commit 9fc0f88a authored by Gus Grubba's avatar Gus Grubba

Remove all Q_ASSERT instances from map engine.

parent deccc03e
...@@ -260,8 +260,9 @@ QGCMapEngineManager::deleteTileSet(QGCCachedTileSet* tileSet) ...@@ -260,8 +260,9 @@ QGCMapEngineManager::deleteTileSet(QGCCachedTileSet* tileSet)
if(tileSet->defaultSet()) { if(tileSet->defaultSet()) {
for(int i = 0; i < _tileSets.count(); i++ ) { for(int i = 0; i < _tileSets.count(); i++ ) {
QGCCachedTileSet* set = qobject_cast<QGCCachedTileSet*>(_tileSets.get(i)); QGCCachedTileSet* set = qobject_cast<QGCCachedTileSet*>(_tileSets.get(i));
Q_ASSERT(set); if(set) {
set->setDeleting(true); set->setDeleting(true);
}
} }
QGCResetTask* task = new QGCResetTask(); QGCResetTask* task = new QGCResetTask();
connect(task, &QGCResetTask::resetCompleted, this, &QGCMapEngineManager::_resetCompleted); connect(task, &QGCResetTask::resetCompleted, this, &QGCMapEngineManager::_resetCompleted);
...@@ -293,8 +294,7 @@ QGCMapEngineManager::_tileSetDeleted(quint64 setID) ...@@ -293,8 +294,7 @@ QGCMapEngineManager::_tileSetDeleted(quint64 setID)
int i = 0; int i = 0;
for(i = 0; i < _tileSets.count(); i++ ) { for(i = 0; i < _tileSets.count(); i++ ) {
QGCCachedTileSet* set = qobject_cast<QGCCachedTileSet*>(_tileSets.get(i)); QGCCachedTileSet* set = qobject_cast<QGCCachedTileSet*>(_tileSets.get(i));
Q_ASSERT(set); if (set && set->setID() == setID) {
if (set->setID() == setID) {
setToDelete = set; setToDelete = set;
break; 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++ ) { for(int i = 0; i < _tileSets.count(); i++ ) {
QGCCachedTileSet* set = qobject_cast<QGCCachedTileSet*>(_tileSets.get(i)); QGCCachedTileSet* set = qobject_cast<QGCCachedTileSet*>(_tileSets.get(i));
Q_ASSERT(set); if (set && set->defaultSet()) {
if (set->defaultSet()) {
set->setSavedTileSize(totalsize); set->setSavedTileSize(totalsize);
set->setSavedTileCount(totaltiles); set->setSavedTileCount(totaltiles);
set->setTotalTileCount(defaulttiles); 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++ ) { for(int i = 0; i < _tileSets.count(); i++ ) {
QGCCachedTileSet* set = qobject_cast<QGCCachedTileSet*>(_tileSets.get(i)); QGCCachedTileSet* set = qobject_cast<QGCCachedTileSet*>(_tileSets.get(i));
Q_ASSERT(set); if (set && set->name() == name) {
if (set->name() == name) {
return true; return true;
} }
} }
...@@ -381,8 +379,9 @@ void ...@@ -381,8 +379,9 @@ void
QGCMapEngineManager::selectAll() { QGCMapEngineManager::selectAll() {
for(int i = 0; i < _tileSets.count(); i++ ) { for(int i = 0; i < _tileSets.count(); i++ ) {
QGCCachedTileSet* set = qobject_cast<QGCCachedTileSet*>(_tileSets.get(i)); QGCCachedTileSet* set = qobject_cast<QGCCachedTileSet*>(_tileSets.get(i));
Q_ASSERT(set); if(set) {
set->setSelected(true); set->setSelected(true);
}
} }
} }
...@@ -391,8 +390,9 @@ void ...@@ -391,8 +390,9 @@ void
QGCMapEngineManager::selectNone() { QGCMapEngineManager::selectNone() {
for(int i = 0; i < _tileSets.count(); i++ ) { for(int i = 0; i < _tileSets.count(); i++ ) {
QGCCachedTileSet* set = qobject_cast<QGCCachedTileSet*>(_tileSets.get(i)); QGCCachedTileSet* set = qobject_cast<QGCCachedTileSet*>(_tileSets.get(i));
Q_ASSERT(set); if(set) {
set->setSelected(false); set->setSelected(false);
}
} }
} }
...@@ -402,8 +402,7 @@ QGCMapEngineManager::selectedCount() { ...@@ -402,8 +402,7 @@ QGCMapEngineManager::selectedCount() {
int count = 0; int count = 0;
for(int i = 0; i < _tileSets.count(); i++ ) { for(int i = 0; i < _tileSets.count(); i++ ) {
QGCCachedTileSet* set = qobject_cast<QGCCachedTileSet*>(_tileSets.get(i)); QGCCachedTileSet* set = qobject_cast<QGCCachedTileSet*>(_tileSets.get(i));
Q_ASSERT(set); if(set && set->selected()) {
if(set->selected()) {
count++; count++;
} }
} }
...@@ -464,7 +463,6 @@ QGCMapEngineManager::exportSets(QString path) { ...@@ -464,7 +463,6 @@ QGCMapEngineManager::exportSets(QString path) {
QVector<QGCCachedTileSet*> sets; QVector<QGCCachedTileSet*> sets;
for(int i = 0; i < _tileSets.count(); i++ ) { for(int i = 0; i < _tileSets.count(); i++ ) {
QGCCachedTileSet* set = qobject_cast<QGCCachedTileSet*>(_tileSets.get(i)); QGCCachedTileSet* set = qobject_cast<QGCCachedTileSet*>(_tileSets.get(i));
Q_ASSERT(set);
if(set->selected()) { if(set->selected()) {
sets.append(set); sets.append(set);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment