Check dynamic casts for null.

This commit is contained in:
Jim Evins
2018-01-02 03:03:59 -05:00
parent b2859d47bb
commit 26f10d7faf
+11 -9
View File
@@ -63,8 +63,8 @@ namespace glabels
{
foreach ( QListWidgetItem *item, findItems( "*", Qt::MatchWildcard ) )
{
auto *tItem = dynamic_cast<TemplatePickerItem *>(item);
if (auto *tItem = dynamic_cast<TemplatePickerItem *>(item))
{
bool nameMask = tItem->tmplate()->name().contains( searchString, Qt::CaseInsensitive );
bool sizeMask =
@@ -98,6 +98,7 @@ namespace glabels
}
}
}
}
///
@@ -107,8 +108,8 @@ namespace glabels
{
foreach ( QListWidgetItem *item, findItems( "*", Qt::MatchWildcard ) )
{
auto *tItem = dynamic_cast<TemplatePickerItem *>(item);
if (auto *tItem = dynamic_cast<TemplatePickerItem *>(item))
{
bool match = false;
foreach ( QString name, names )
{
@@ -130,6 +131,7 @@ namespace glabels
}
}
}
}
///
@@ -138,15 +140,15 @@ namespace glabels
const model::Template *TemplatePicker::selectedTemplate()
{
QList<QListWidgetItem *> items = selectedItems();
if ( items.isEmpty() )
if ( !items.isEmpty() )
{
return nullptr;
}
else
if (auto *tItem = dynamic_cast<TemplatePickerItem*>(items.first()))
{
auto *tItem = dynamic_cast<TemplatePickerItem*>(items.first());
return tItem->tmplate();
}
}
return nullptr;
}
} // namespace glabels