From b2859d47bbfeec57f455b0ec8f9aeb0ea4e037a1 Mon Sep 17 00:00:00 2001 From: Jim Evins Date: Mon, 1 Jan 2018 19:42:39 -0500 Subject: [PATCH] Correctly override ModelObject::can*() virtual methods. --- model/ModelLineObject.cpp | 4 ++-- model/ModelLineObject.h | 4 ++-- model/ModelShapeObject.cpp | 6 +++--- model/ModelShapeObject.h | 6 +++--- model/ModelTextObject.cpp | 2 +- model/ModelTextObject.h | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/model/ModelLineObject.cpp b/model/ModelLineObject.cpp index e1b4810..5d7b5e1 100644 --- a/model/ModelLineObject.cpp +++ b/model/ModelLineObject.cpp @@ -168,7 +168,7 @@ namespace glabels /// /// Can Line Color Capability Implementation /// - bool ModelLineObject::canLineColor() + bool ModelLineObject::canLineColor() const { return true; } @@ -177,7 +177,7 @@ namespace glabels /// /// Can Line Width Capability Implementation /// - bool ModelLineObject::canLineWidth() + bool ModelLineObject::canLineWidth() const { return true; } diff --git a/model/ModelLineObject.h b/model/ModelLineObject.h index bfe3877..16cfdb6 100644 --- a/model/ModelLineObject.h +++ b/model/ModelLineObject.h @@ -89,8 +89,8 @@ namespace glabels // Capability Implementations /////////////////////////////////////////////////////////////// public: - virtual bool canLineColor(); - virtual bool canLineWidth(); + bool canLineColor() const override; + bool canLineWidth() const override; /////////////////////////////////////////////////////////////// diff --git a/model/ModelShapeObject.cpp b/model/ModelShapeObject.cpp index 383f377..989f5af 100644 --- a/model/ModelShapeObject.cpp +++ b/model/ModelShapeObject.cpp @@ -183,7 +183,7 @@ namespace glabels /// /// Can Fill Capability Implementation /// - bool ModelShapeObject::canFill() + bool ModelShapeObject::canFill() const { return true; } @@ -192,7 +192,7 @@ namespace glabels /// /// Can Line Color Capability Implementation /// - bool ModelShapeObject::canLineColor() + bool ModelShapeObject::canLineColor() const { return true; } @@ -201,7 +201,7 @@ namespace glabels /// /// Can Line Width Capability Implementation /// - bool ModelShapeObject::canLineWidth() + bool ModelShapeObject::canLineWidth() const { return true; } diff --git a/model/ModelShapeObject.h b/model/ModelShapeObject.h index 658cc72..b33c5a3 100644 --- a/model/ModelShapeObject.h +++ b/model/ModelShapeObject.h @@ -91,9 +91,9 @@ namespace glabels // Capability Implementations /////////////////////////////////////////////////////////////// public: - virtual bool canFill(); - virtual bool canLineColor(); - virtual bool canLineWidth(); + bool canFill() const override; + bool canLineColor() const override; + bool canLineWidth() const override; /////////////////////////////////////////////////////////////// diff --git a/model/ModelTextObject.cpp b/model/ModelTextObject.cpp index c99b105..40cc969 100644 --- a/model/ModelTextObject.cpp +++ b/model/ModelTextObject.cpp @@ -453,7 +453,7 @@ namespace glabels /// /// Can Text Capability Implementation /// - bool ModelTextObject::canText() + bool ModelTextObject::canText() const { return true; } diff --git a/model/ModelTextObject.h b/model/ModelTextObject.h index e0efaf2..9021491 100644 --- a/model/ModelTextObject.h +++ b/model/ModelTextObject.h @@ -162,7 +162,7 @@ namespace glabels // Capability Implementations /////////////////////////////////////////////////////////////// public: - virtual bool canText(); + bool canText() const override; ///////////////////////////////////////////////////////////////