From 0de09e88255ba5d5e343062a8e3a797940bc9859 Mon Sep 17 00:00:00 2001
From: Mikel Johnson <mikel5764@gmail.com>
Date: Wed, 2 Dec 2020 11:24:03 +0300
Subject: [PATCH] [FrameSvg] Rename insetMargin to inset

---
 src/declarativeimports/core/framesvgitem.cpp | 8 ++++----
 src/declarativeimports/core/framesvgitem.h   | 2 +-
 src/plasma/framesvg.cpp                      | 4 ++--
 src/plasma/framesvg.h                        | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/declarativeimports/core/framesvgitem.cpp b/src/declarativeimports/core/framesvgitem.cpp
index 8f5f31fd7..d5c41e797 100644
--- a/src/declarativeimports/core/framesvgitem.cpp
+++ b/src/declarativeimports/core/framesvgitem.cpp
@@ -178,7 +178,7 @@ qreal FrameSvgItemMargins::left() const
     if (m_fixed) {
         return m_frameSvg->fixedMarginSize(Types::LeftMargin);
     } else if(m_inset){
-        return m_frameSvg->insetMarginSize(Types::LeftMargin);
+        return m_frameSvg->insetSize(Types::LeftMargin);
     } else {
         return m_frameSvg->marginSize(Types::LeftMargin);
     }
@@ -189,7 +189,7 @@ qreal FrameSvgItemMargins::top() const
     if (m_fixed) {
         return m_frameSvg->fixedMarginSize(Types::TopMargin);
     } else if(m_inset){
-        return m_frameSvg->insetMarginSize(Types::TopMargin);
+        return m_frameSvg->insetSize(Types::TopMargin);
     } else {
         return m_frameSvg->marginSize(Types::TopMargin);
     }
@@ -200,7 +200,7 @@ qreal FrameSvgItemMargins::right() const
     if (m_fixed) {
         return m_frameSvg->fixedMarginSize(Types::RightMargin);
     } else if(m_inset){
-        return m_frameSvg->insetMarginSize(Types::RightMargin);
+        return m_frameSvg->insetSize(Types::RightMargin);
     } else {
         return m_frameSvg->marginSize(Types::RightMargin);
     }
@@ -211,7 +211,7 @@ qreal FrameSvgItemMargins::bottom() const
     if (m_fixed) {
         return m_frameSvg->fixedMarginSize(Types::BottomMargin);
     } else if(m_inset){
-        return m_frameSvg->insetMarginSize(Types::BottomMargin);
+        return m_frameSvg->insetSize(Types::BottomMargin);
     } else {
         return m_frameSvg->marginSize(Types::BottomMargin);
     }
diff --git a/src/declarativeimports/core/framesvgitem.h b/src/declarativeimports/core/framesvgitem.h
index f1ebf0f39..2c2f1b67f 100644
--- a/src/declarativeimports/core/framesvgitem.h
+++ b/src/declarativeimports/core/framesvgitem.h
@@ -139,7 +139,7 @@ class FrameSvgItem : public QQuickItem
     Q_PROPERTY(QObject *fixedMargins READ fixedMargins CONSTANT)
 
     /**
-     * The margins of the inset
+     * The inset of the frame
      * read only
      * @see FrameSvgItemMargins
      * @since 5.77
diff --git a/src/plasma/framesvg.cpp b/src/plasma/framesvg.cpp
index b081c6c51..be7b852fb 100644
--- a/src/plasma/framesvg.cpp
+++ b/src/plasma/framesvg.cpp
@@ -218,7 +218,7 @@ qreal FrameSvg::marginSize(const Plasma::Types::MarginEdge edge) const
     }
 }
 
-qreal FrameSvg::insetMarginSize(const Plasma::Types::MarginEdge edge) const
+qreal FrameSvg::insetSize(const Plasma::Types::MarginEdge edge) const
 {
     if (!d->frame) {
         return .0;
@@ -296,7 +296,7 @@ void FrameSvg::getFixedMargins(qreal &left, qreal &top, qreal &right, qreal &bot
     bottom = d->frame->fixedBottomMargin;
 }
 
-void FrameSvg::getInsetMargins(qreal &left, qreal &top, qreal &right, qreal &bottom) const
+void FrameSvg::getInset(qreal &left, qreal &top, qreal &right, qreal &bottom) const
 {
     if (!d->frame || d->frame->noBorderPadding) {
         left = top = right = bottom = 0;
diff --git a/src/plasma/framesvg.h b/src/plasma/framesvg.h
index 990b813a6..94fa4b72d 100644
--- a/src/plasma/framesvg.h
+++ b/src/plasma/framesvg.h
@@ -168,7 +168,7 @@ public:
      * @return the margin size
      * @since 5.77
      */
-    Q_INVOKABLE qreal insetMarginSize(const Plasma::Types::MarginEdge edge) const;
+    Q_INVOKABLE qreal insetSize(const Plasma::Types::MarginEdge edge) const;
 
     /**
      * Convenience method that extracts the size of the four inset margins
@@ -179,7 +179,7 @@ public:
      * @param bottom bottom margin size
      * @since 5.77
      */
-    Q_INVOKABLE void getInsetMargins(qreal &left, qreal &top, qreal &right, qreal &bottom) const;
+    Q_INVOKABLE void getInset(qreal &left, qreal &top, qreal &right, qreal &bottom) const;
 
     /**
      * @return the rectangle of the center element, taking the margins into account.