From 8a484ef90105b163363ee53942f2f81d932a7c6c Mon Sep 17 00:00:00 2001 From: Simon De Backer Date: Sun, 16 Aug 2020 14:23:25 +0200 Subject: [PATCH] Improve code style --- .../diagramevent/diagrameventaddelement.cpp | 2 +- sources/diagramevent/diagrameventaddimage.cpp | 22 ++++++++-------- sources/diagramevent/diagrameventaddimage.h | 26 +++++++++---------- sources/diagramevent/diagrameventaddtext.cpp | 22 +++++++++------- sources/diagramevent/diagrameventaddtext.h | 10 +++---- 5 files changed, 43 insertions(+), 39 deletions(-) diff --git a/sources/diagramevent/diagrameventaddelement.cpp b/sources/diagramevent/diagrameventaddelement.cpp index eff821ce7..a780ec70e 100644 --- a/sources/diagramevent/diagrameventaddelement.cpp +++ b/sources/diagramevent/diagrameventaddelement.cpp @@ -243,7 +243,7 @@ void DiagramEventAddElement::addElement() if (m_diagram->freezeNewConductors() || m_diagram->project()->isFreezeNewConductors()) { conductor->setFreezeLabel(true); } - } + } m_diagram -> undoStack().push(undo_object); element->setUpFormula(); diff --git a/sources/diagramevent/diagrameventaddimage.cpp b/sources/diagramevent/diagrameventaddimage.cpp index ac61233d5..b17e74628 100644 --- a/sources/diagramevent/diagrameventaddimage.cpp +++ b/sources/diagramevent/diagrameventaddimage.cpp @@ -27,11 +27,11 @@ @param diagram : diagram where operate this event */ DiagramEventAddImage::DiagramEventAddImage(Diagram *diagram) : - DiagramEventInterface(diagram), - m_image (nullptr), - m_is_added (false) + DiagramEventInterface(diagram), + m_image (nullptr), + m_is_added (false) { - openDialog(); + openDialog(); } /** @@ -39,14 +39,14 @@ DiagramEventAddImage::DiagramEventAddImage(Diagram *diagram) : */ DiagramEventAddImage::~DiagramEventAddImage() { - if (m_running || m_abort) - { - if (m_is_added) m_diagram->removeItem(m_image); - delete m_image; - } + if (m_running || m_abort) + { + if (m_is_added) m_diagram->removeItem(m_image); + delete m_image; + } - foreach (QGraphicsView *view, m_diagram->views()) - view->setContextMenuPolicy((Qt::DefaultContextMenu)); + foreach (QGraphicsView *view, m_diagram->views()) + view->setContextMenuPolicy((Qt::DefaultContextMenu)); } /** diff --git a/sources/diagramevent/diagrameventaddimage.h b/sources/diagramevent/diagrameventaddimage.h index d6d3ca504..f48b38a66 100644 --- a/sources/diagramevent/diagrameventaddimage.h +++ b/sources/diagramevent/diagrameventaddimage.h @@ -29,23 +29,23 @@ class DiagramImageItem; */ class DiagramEventAddImage : public DiagramEventInterface { - Q_OBJECT + Q_OBJECT - public: - DiagramEventAddImage(Diagram *diagram); - ~DiagramEventAddImage() override; + public: + DiagramEventAddImage(Diagram *diagram); + ~DiagramEventAddImage() override; - void mousePressEvent (QGraphicsSceneMouseEvent *event) override; - void mouseMoveEvent (QGraphicsSceneMouseEvent *event) override; - void mouseDoubleClickEvent (QGraphicsSceneMouseEvent *event) override; - void wheelEvent (QGraphicsSceneWheelEvent *event) override; + void mousePressEvent (QGraphicsSceneMouseEvent *event) override; + void mouseMoveEvent (QGraphicsSceneMouseEvent *event) override; + void mouseDoubleClickEvent (QGraphicsSceneMouseEvent *event) override; + void wheelEvent (QGraphicsSceneWheelEvent *event) override; - bool isNull () const; - private: - void openDialog(); + bool isNull () const; + private: + void openDialog(); - DiagramImageItem *m_image; - bool m_is_added; + DiagramImageItem *m_image; + bool m_is_added; }; #endif // DIAGRAMEVENTADDIMAGE_H diff --git a/sources/diagramevent/diagrameventaddtext.cpp b/sources/diagramevent/diagrameventaddtext.cpp index dd7e1fd7f..0be6ba235 100644 --- a/sources/diagramevent/diagrameventaddtext.cpp +++ b/sources/diagramevent/diagrameventaddtext.cpp @@ -27,7 +27,7 @@ @param diagram : the diagram where this event must operate */ DiagramEventAddText::DiagramEventAddText(Diagram *diagram) : - DiagramEventInterface(diagram) + DiagramEventInterface(diagram) {} /** @@ -42,13 +42,17 @@ DiagramEventAddText::~DiagramEventAddText() */ void DiagramEventAddText::mousePressEvent(QGraphicsSceneMouseEvent *event) { - if (event->button() == Qt::LeftButton) - { - IndependentTextItem *text = new IndependentTextItem(); - m_diagram -> undoStack().push(new AddItemCommand(text, m_diagram, event->scenePos())); - text->setTextInteractionFlags(Qt::TextEditorInteraction); - text->setFocus(Qt::MouseFocusReason); - emit finish(); + if (event->button() == Qt::LeftButton) + { + IndependentTextItem *text = new IndependentTextItem(); + m_diagram -> undoStack().push( + new AddItemCommand( + text, + m_diagram, + event->scenePos())); + text->setTextInteractionFlags(Qt::TextEditorInteraction); + text->setFocus(Qt::MouseFocusReason); + emit finish(); event->setAccepted(true); - } + } } diff --git a/sources/diagramevent/diagrameventaddtext.h b/sources/diagramevent/diagrameventaddtext.h index 8f44d6bd1..58d3abdb9 100644 --- a/sources/diagramevent/diagrameventaddtext.h +++ b/sources/diagramevent/diagrameventaddtext.h @@ -28,13 +28,13 @@ class Diagram; */ class DiagramEventAddText : public DiagramEventInterface { - Q_OBJECT + Q_OBJECT - public: - DiagramEventAddText(Diagram *diagram); - ~DiagramEventAddText() override; + public: + DiagramEventAddText(Diagram *diagram); + ~DiagramEventAddText() override; - void mousePressEvent (QGraphicsSceneMouseEvent *event) override; + void mousePressEvent (QGraphicsSceneMouseEvent *event) override; }; #endif // DIAGRAMEVENTADDTEXT_H