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

Pointer cleanup (#242)

Browse Source 
- Made greater use of smart pointers, eliminating many instances of manual memory management
- Do not use pointers at all for many non-polymorphic classes
- Assorted other code cleanup
This commit is contained in:
Jaye Evins
2025-10-31 16:11:28 -04:00
committed by GitHub
parent fd10d88be5
commit 8c8e447336
159 changed files with 3364 additions and 4045 deletions
Download Patch File Download Diff File Expand all files Collapse all files
glabels/TemplatePicker.cpp
+10 -10
View File
@@ -112,11 +112,11 @@ namespace glabels
///
/// Set List of Templates to Pick From
///
void TemplatePicker::setTemplates( const QList<model::Template*>& tmplates )
void TemplatePicker::setTemplates( const QList<model::Template>& tmplates )
{
auto mode = model::Settings::templatePickerMode();
foreach (model::Template *tmplate, tmplates)
foreach (auto& tmplate, tmplates)
{
new TemplatePickerItem( tmplate, mode, this );
}
@@ -186,12 +186,12 @@ namespace glabels
{
if (auto* tItem = dynamic_cast<TemplatePickerItem *>(item(i)))
{
bool nameMask = tItem->tmplate()->name().contains( searchString, Qt::CaseInsensitive );
bool nameMask = tItem->tmplate().name().contains( searchString, Qt::CaseInsensitive );
bool sizeMask =
(isoMask && tItem->tmplate()->isSizeIso()) ||
(usMask && tItem->tmplate()->isSizeUs()) ||
(otherMask && tItem->tmplate()->isSizeOther());
(isoMask && tItem->tmplate().isSizeIso()) ||
(usMask && tItem->tmplate().isSizeUs()) ||
(otherMask && tItem->tmplate().isSizeOther());
bool categoryMask;
if ( anyCategory )
@@ -203,7 +203,7 @@ namespace glabels
categoryMask = false;
foreach ( QString id, categoryIds )
{
categoryMask = categoryMask || tItem->tmplate()->hasCategory( id );
categoryMask = categoryMask || tItem->tmplate().hasCategory( id );
}
}
@@ -239,7 +239,7 @@ namespace glabels
bool match = false;
foreach ( QString name, names )
{
if ( tItem->tmplate()->name() == name )
if ( tItem->tmplate().name() == name )
{
match = true;
break;
@@ -268,14 +268,14 @@ namespace glabels
///
/// Get Currently Selected Template
///
const model::Template* TemplatePicker::selectedTemplate() const
model::Template TemplatePicker::selectedTemplate() const
{
if ( auto* tItem = selectedItem() )
{
return tItem->tmplate();
}
return nullptr;
return model::Template();
}