From 9f9ba345cf8df0326d464146be4e2ac20970bdaf Mon Sep 17 00:00:00 2001 From: Jim Evins Date: Tue, 21 Mar 2017 23:21:35 -0400 Subject: [PATCH] Fixed a handful of errors flagged by clang-tidy. --- glabels/LabelEditor.cpp | 2 +- glabels/LabelModel.cpp | 2 ++ glabels/TemplatePicker.cpp | 2 +- glabels/XmlLabelParser.cpp | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/glabels/LabelEditor.cpp b/glabels/LabelEditor.cpp index fb7c844..954a806 100644 --- a/glabels/LabelEditor.cpp +++ b/glabels/LabelEditor.cpp @@ -889,7 +889,7 @@ namespace glabels case Handle::SW: x0 += x2 - mResizeObject->w().pt(); break; - defaule: + default: break; } } diff --git a/glabels/LabelModel.cpp b/glabels/LabelModel.cpp index 8a5a65c..aa16989 100644 --- a/glabels/LabelModel.cpp +++ b/glabels/LabelModel.cpp @@ -602,6 +602,8 @@ namespace glabels return object; } } + + return 0; } diff --git a/glabels/TemplatePicker.cpp b/glabels/TemplatePicker.cpp index fad858d..cd285f9 100644 --- a/glabels/TemplatePicker.cpp +++ b/glabels/TemplatePicker.cpp @@ -50,7 +50,7 @@ namespace glabels { foreach (Template *tmplate, tmplates) { - TemplatePickerItem *item = new TemplatePickerItem( tmplate, this ); + new TemplatePickerItem( tmplate, this ); } } diff --git a/glabels/XmlLabelParser.cpp b/glabels/XmlLabelParser.cpp index 2d79bc3..00c3ec9 100644 --- a/glabels/XmlLabelParser.cpp +++ b/glabels/XmlLabelParser.cpp @@ -256,6 +256,7 @@ namespace glabels if ( tmplate == 0 ) { qWarning() << "Unable to parse template"; + delete label; return 0; } label->setTmplate( tmplate );