feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ModelEditor: Fix a number of trivial coverity issues

Browse Source 
Change-Id: Ie61e017b993ac788284611fb40052e5f59521a56
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Jochen Becher
2017-07-08 09:57:38 +02:00
parent 550ed2927d
commit 706b0874f5
14 changed files with 22 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libs/modelinglib/qmt/config/stereotypedefinitionparser.cpp
View File

@@ -117,7 +117,7 @@ StereotypeDefinitionParserError::~StereotypeDefinitionParserError()
class StereotypeDefinitionParser::StereotypeDefinitionParserPrivate
{
public:
TextScanner *m_scanner = 0;
TextScanner *m_scanner = nullptr;
};
@@ -134,8 +134,8 @@ public:
}
int m_keyword = -1;
ShapeValueF::Unit m_unit;
ShapeValueF::Origin m_origin;
ShapeValueF::Unit m_unit = ShapeValueF::UnitAbsolute;
ShapeValueF::Origin m_origin = ShapeValueF::OriginCenter;
};
StereotypeDefinitionParser::StereotypeDefinitionParser(QObject *parent)

4
src/libs/modelinglib/qmt/config/token.cpp
View File

@@ -46,10 +46,6 @@ Token::Token(Token::Type type, int subtype, const QString &text, const SourcePos
{
}
Token::~Token()
{
}
void Token::setType(Token::Type type)
{
m_type = type;

1
src/libs/modelinglib/qmt/config/token.h
View File

@@ -50,7 +50,6 @@ public:
Token();
Token(Type type, const QString &text, const SourcePos &sourcePos);
Token(Type type, int subtype, const QString &text, const SourcePos &sourcePos);
~Token();
Type type() const { return m_type; }
void setType(Type type);

4
src/libs/modelinglib/qmt/diagram_controller/dupdatevisitor.cpp
View File

@@ -154,7 +154,7 @@ void DUpdateVisitor::visitMRelation(const MRelation *relation)
// TODO improve performance of MDiagram::findDiagramElement
DObject *endAObject = dynamic_cast<DObject *>(m_diagram->findDiagramElement(drelation->endAUid()));
if (!endAObject || relation->endAUid() != endAObject->modelUid()) {
isUpdating(true);
(void) isUpdating(true);
endAObject = 0;
// TODO use DiagramController::findDelegate (and improve performance of that method)
foreach (DElement *diagramElement, m_diagram->diagramElements()) {
@@ -170,7 +170,7 @@ void DUpdateVisitor::visitMRelation(const MRelation *relation)
}
DObject *endBObject = dynamic_cast<DObject *>(m_diagram->findDiagramElement(drelation->endBUid()));
if (!endBObject || relation->endBUid() != endBObject->modelUid()) {
isUpdating(true);
(void) isUpdating(true);
endBObject = 0;
// TODO use DiagramController::findDelegate
foreach (DElement *diagramElement, m_diagram->diagramElements()) {

2
src/libs/modelinglib/qmt/diagram_scene/items/stereotypedisplayvisitor.cpp
View File

@@ -121,7 +121,7 @@ void StereotypeDisplayVisitor::visitDClass(const DClass *klass)
m_stereotypeIconElement = StereotypeIcon::ElementClass;
MClass *modelKlass = m_modelController->findObject<MClass>(klass->modelUid());
bool hasMembers = false;
if (!modelKlass->members().isEmpty() && klass->showAllMembers())
if (modelKlass && !modelKlass->members().isEmpty() && klass->showAllMembers())
hasMembers = true;
m_stereotypeSmartDisplay = hasMembers ? DObject::StereotypeDecoration : DObject::StereotypeIcon;
visitDObject(klass);

29
src/libs/modelinglib/qmt/model/mclassmember.cpp
View File

@@ -33,35 +33,6 @@ MClassMember::MClassMember(MemberType memberType)
{
}
MClassMember::MClassMember(const MClassMember &rhs)
: m_uid(rhs.m_uid),
m_stereotypes(rhs.m_stereotypes),
m_group(rhs.m_group),
m_declaration(rhs.m_declaration),
m_visibility(rhs.m_visibility),
m_memberType(rhs.m_memberType),
m_properties(rhs.m_properties)
{
}
MClassMember::~MClassMember()
{
}
MClassMember &MClassMember::operator=(const MClassMember &rhs)
{
if (this != &rhs) {
m_uid = rhs.m_uid;
m_stereotypes = rhs.m_stereotypes;
m_group = rhs.m_group;
m_declaration = rhs.m_declaration;
m_visibility = rhs.m_visibility;
m_memberType = rhs.m_memberType;
m_properties = rhs.m_properties;
}
return *this;
}
void MClassMember::setUid(const Uid &uid)
{
m_uid = uid;

4
src/libs/modelinglib/qmt/model/mclassmember.h
View File

@@ -69,10 +69,6 @@ public:
Q_DECLARE_FLAGS(Properties, Property)
explicit MClassMember(MemberType memberType = MemberUndefined);
MClassMember(const MClassMember &rhs);
~MClassMember();
MClassMember &operator=(const MClassMember &rhs);
Uid uid() const { return m_uid; }
void setUid(const Uid &uid);

6
src/libs/modelinglib/qmt/model_controller/modelcontroller.cpp
View File

@@ -505,9 +505,10 @@ private:
QMT_CHECK(object);
MObject *formerOwner = object->owner();
int formerRow = formerOwner->children().indexOf(object);
MObject *newOwner = m_modelController->findObject(m_ownerKey);
QMT_CHECK(newOwner);
emit m_modelController->beginMoveObject(formerRow, formerOwner);
formerOwner->decontrolChild(object);
MObject *newOwner = m_modelController->findObject(m_ownerKey);
newOwner->insertChild(m_indexOfElement, object);
int newRow = m_indexOfElement;
m_ownerKey = formerOwner->uid();
@@ -560,9 +561,10 @@ private:
QMT_CHECK(relation);
MObject *formerOwner = relation->owner();
int formerRow = formerOwner->relations().indexOf(relation);
MObject *newOwner = m_modelController->findObject(m_ownerKey);
QMT_CHECK(newOwner);
emit m_modelController->beginMoveRelation(formerRow, formerOwner);
formerOwner->decontrolRelation(relation);
MObject *newOwner = m_modelController->findObject(m_ownerKey);
newOwner->insertRelation(m_indexOfElement, relation);
int newRow = m_indexOfElement;
m_ownerKey = formerOwner->uid();

2
src/libs/modelinglib/qmt/model_ui/sortedtreemodel.h
View File

@@ -55,7 +55,7 @@ private:
void startDelayedSortTimer();
TreeModel *m_treeModel;
TreeModel *m_treeModel = nullptr;
QTimer m_delayedSortTimer;
};

1
src/libs/modelinglib/qmt/model_widgets_ui/propertiesviewmview.cpp
View File

@@ -639,6 +639,7 @@ void PropertiesView::MView::visitMInheritance(const MInheritance *inheritance)
QMT_CHECK(derivedClass);
setEndAName(tr("Derived class: %1").arg(derivedClass->name()));
MObject *baseClass = m_propertiesView->modelController()->findObject(inheritance->base());
QMT_CHECK(baseClass);
setEndBName(tr("Base class: %1").arg(baseClass->name()));
visitMRelation(inheritance);
}

2
src/libs/modelinglib/qmt/project/project.h
View File

@@ -52,7 +52,7 @@ public:
private:
Uid m_uid;
QString m_fileName;
MPackage *m_rootPackage;
MPackage *m_rootPackage = nullptr;
QString m_configPath;
};

2
src/libs/modelinglib/qmt/stereotype/iconshape.h
View File

@@ -42,9 +42,11 @@ class QMT_EXPORT IconShape
public:
IconShape();
IconShape(const IconShape &rhs);
IconShape(const IconShape &&) = delete;
~IconShape();
IconShape &operator=(const IconShape &rhs);
IconShape &operator=(const IconShape &&) = delete;
QSizeF size() const;
void setSize(const QSizeF &size);

15
src/libs/modelinglib/qmt/stereotype/stereotypeicon.cpp
View File

@@ -27,21 +27,6 @@
namespace qmt {
StereotypeIcon::StereotypeIcon()
: m_width(100.0),
m_height(100.0),
m_minWidth(-1),
m_minHeight(-1),
m_sizeLock(LockNone),
m_display(DisplaySmart),
m_textAlignment(TextalignBelow)
{
}
StereotypeIcon::~StereotypeIcon()
{
}
void StereotypeIcon::setId(const QString &id)
{
m_id = id;

17
src/libs/modelinglib/qmt/stereotype/stereotypeicon.h
View File

@@ -67,9 +67,6 @@ public:
TextalignNone
};
StereotypeIcon();
~StereotypeIcon();
QString id() const { return m_id; }
void setId(const QString &id);
QString title() const;
@@ -104,13 +101,13 @@ private:
QString m_title;
QSet<Element> m_elements;
QSet<QString> m_stereotypes;
qreal m_width;
qreal m_height;
qreal m_minWidth;
qreal m_minHeight;
SizeLock m_sizeLock;
Display m_display;
TextAlignment m_textAlignment;
qreal m_width = 100.0;
qreal m_height = 100.0;
qreal m_minWidth = -1;
qreal m_minHeight = -1;
SizeLock m_sizeLock = LockNone;
Display m_display = DisplaySmart;
TextAlignment m_textAlignment = TextalignBelow;
QColor m_baseColor;
IconShape m_iconShape;
};