From 6e113e6176669876faa3cf7bd7402112299ce8f2 Mon Sep 17 00:00:00 2001
From: Marco Martin <notmart@gmail.com>
Date: Tue, 14 May 2013 20:37:16 +0200
Subject: [PATCH] rename MarginEdge

---
 src/plasma/framesvg.cpp | 2 +-
 src/plasma/framesvg.h   | 2 +-
 src/plasma/plasma.h     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/plasma/framesvg.cpp b/src/plasma/framesvg.cpp
index ae84e6d39..b96b24459 100644
--- a/src/plasma/framesvg.cpp
+++ b/src/plasma/framesvg.cpp
@@ -386,7 +386,7 @@ QSizeF FrameSvg::frameSize() const
     }
 }
 
-qreal FrameSvg::marginSize(const Plasma::MarginEdge edge) const
+qreal FrameSvg::marginSize(const Plasma::Types::MarginEdge edge) const
 {
     if (d->frames[d->prefix]->noBorderPadding) {
         return .0;
diff --git a/src/plasma/framesvg.h b/src/plasma/framesvg.h
index 70572ed57..482956de1 100644
--- a/src/plasma/framesvg.h
+++ b/src/plasma/framesvg.h
@@ -140,7 +140,7 @@ class PLASMA_EXPORT FrameSvg : public Svg
          * @param edge the margin edge we want, top, bottom, left or right
          * @return the margin size
          */
-        Q_INVOKABLE qreal marginSize(const Plasma::MarginEdge edge) const;
+        Q_INVOKABLE qreal marginSize(const Plasma::Types::MarginEdge edge) const;
 
         /**
          * Convenience method that extracts the size of the four margins
diff --git a/src/plasma/plasma.h b/src/plasma/plasma.h
index 359922e9c..96c9ec018 100644
--- a/src/plasma/plasma.h
+++ b/src/plasma/plasma.h
@@ -312,7 +312,7 @@ PLASMA_EXPORT Types::Direction locationToInverseDirection(Types::Location locati
 //typedef Types::IntervalAlignment IntervalAlignment;
 //typedef Types::ImmutabilityType ImmutabilityType;
 //typedef Types::ComponentType ComponentType;
-typedef Types::MarginEdge MarginEdge;
+//typedef Types::MarginEdge MarginEdge;
 typedef Types::MessageButton MessageButton;
 typedef Types::ItemStatus ItemStatus;
 typedef Types::TrustLevel TrustLevel;