[Libreoffice-commits] core.git: starmath/inc starmath/source
Jan-Marek Glogowski (via logerrit)
logerrit at kemper.freedesktop.org
Wed May 15 09:52:59 UTC 2019
starmath/inc/ElementsDockingWindow.hxx | 26 +++++++-------------------
starmath/source/ElementsDockingWindow.cxx | 5 +----
2 files changed, 8 insertions(+), 23 deletions(-)
New commits:
commit fb978737245bcde30ad4861c40c476b6da53eea3
Author: Jan-Marek Glogowski <glogow at fbihome.de>
AuthorDate: Tue May 14 11:44:04 2019 +0200
Commit: Jan-Marek Glogowski <glogow at fbihome.de>
CommitDate: Wed May 15 11:51:41 2019 +0200
SM constify SmElement
Change-Id: I6334a6c87cb548c434f0dae05e7cb2cc6e6fd66a
Reviewed-on: https://gerrit.libreoffice.org/72316
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow at fbihome.de>
diff --git a/starmath/inc/ElementsDockingWindow.hxx b/starmath/inc/ElementsDockingWindow.hxx
index 1e938f3e30e0..133c480d7100 100644
--- a/starmath/inc/ElementsDockingWindow.hxx
+++ b/starmath/inc/ElementsDockingWindow.hxx
@@ -34,6 +34,7 @@ class SmElement
std::unique_ptr<SmNode> mpNode;
OUString const maText;
OUString const maHelpText;
+
public:
Point mBoxLocation;
Size mBoxSize;
@@ -41,21 +42,11 @@ public:
SmElement(std::unique_ptr<SmNode>&& pNode, const OUString& aText, const OUString& aHelpText);
virtual ~SmElement();
- const std::unique_ptr<SmNode>& getNode();
- const OUString& getText()
- {
- return maText;
- }
-
- const OUString& getHelpText()
- {
- return maHelpText;
- }
-
- virtual bool isSeparator()
- {
- return false;
- }
+ const std::unique_ptr<SmNode>& getNode() const;
+ const OUString& getText() const { return maText; }
+ const OUString& getHelpText() const { return maHelpText; }
+
+ virtual bool isSeparator() const { return false; }
};
class SmElementSeparator : public SmElement
@@ -63,10 +54,7 @@ class SmElementSeparator : public SmElement
public:
SmElementSeparator();
- virtual bool isSeparator() override
- {
- return true;
- }
+ bool isSeparator() const override { return true; }
};
class SmElementsControl : public Control
diff --git a/starmath/source/ElementsDockingWindow.cxx b/starmath/source/ElementsDockingWindow.cxx
index f093723daf2a..95df76c4ec63 100644
--- a/starmath/source/ElementsDockingWindow.cxx
+++ b/starmath/source/ElementsDockingWindow.cxx
@@ -48,10 +48,7 @@ SmElement::SmElement(std::unique_ptr<SmNode>&& pNode, const OUString& aText, con
SmElement::~SmElement()
{}
-const std::unique_ptr<SmNode>& SmElement::getNode()
-{
- return mpNode;
-}
+const std::unique_ptr<SmNode>& SmElement::getNode() const { return mpNode; }
SmElementSeparator::SmElementSeparator() :
SmElement(std::unique_ptr<SmNode>(), OUString(), OUString())
More information about the Libreoffice-commits
mailing list