Seth/sethLabels
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Check dynamic casts for null.

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