From 4af65e63296707e95ae6541d39076a7a37d9cb6f Mon Sep 17 00:00:00 2001
From: Duncan Runnacles <drrunnacles@googlemail.com>
Date: Mon, 11 Jan 2016 14:52:20 +0000
Subject: [PATCH] Set default margin units to MM

---
 src/app/qgsdecorationcopyright.cpp  | 2 +-
 src/app/qgsdecorationitem.cpp       | 2 +-
 src/app/qgsdecorationnortharrow.cpp | 2 +-
 src/app/qgsdecorationscalebar.cpp   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/app/qgsdecorationcopyright.cpp b/src/app/qgsdecorationcopyright.cpp
index 02ea0409d33..21d9b7eea24 100644
--- a/src/app/qgsdecorationcopyright.cpp
+++ b/src/app/qgsdecorationcopyright.cpp
@@ -47,7 +47,7 @@ QgsDecorationCopyright::QgsDecorationCopyright( QObject* parent )
     , mMarginVertical( 0 )
 {
   mPlacement = BottomRight;
-  mMarginUnit = QgsSymbolV2::Pixel;
+  mMarginUnit = QgsSymbolV2::MM;
 
   setName( "Copyright Label" );
   // initialise default values in the gui
diff --git a/src/app/qgsdecorationitem.cpp b/src/app/qgsdecorationitem.cpp
index fed028dd245..daca5a6dd65 100644
--- a/src/app/qgsdecorationitem.cpp
+++ b/src/app/qgsdecorationitem.cpp
@@ -46,7 +46,7 @@ QgsDecorationItem::QgsDecorationItem( QObject* parent )
     : QObject( parent )
     , mEnabled( false )
     , mPlacement( TopLeft )
-    , mMarginUnit( QgsSymbolV2::Pixel )
+    , mMarginUnit( QgsSymbolV2::MM )
 {
 }
 
diff --git a/src/app/qgsdecorationnortharrow.cpp b/src/app/qgsdecorationnortharrow.cpp
index bfe866cae8c..82e8971428c 100644
--- a/src/app/qgsdecorationnortharrow.cpp
+++ b/src/app/qgsdecorationnortharrow.cpp
@@ -62,7 +62,7 @@ QgsDecorationNorthArrow::QgsDecorationNorthArrow( QObject* parent )
     , mMarginVertical( 0 )
 {
   mPlacement = BottomLeft;
-  mMarginUnit = QgsSymbolV2::Pixel;
+  mMarginUnit = QgsSymbolV2::MM;
 
   setName( "North Arrow" );
   projectRead();
diff --git a/src/app/qgsdecorationscalebar.cpp b/src/app/qgsdecorationscalebar.cpp
index 9a46931b2dd..8b861187dff 100644
--- a/src/app/qgsdecorationscalebar.cpp
+++ b/src/app/qgsdecorationscalebar.cpp
@@ -55,7 +55,7 @@ QgsDecorationScaleBar::QgsDecorationScaleBar( QObject* parent )
     , mMarginVertical( 0 )
 {
   mPlacement = TopLeft;
-  mMarginUnit = QgsSymbolV2::Pixel;
+  mMarginUnit = QgsSymbolV2::MM;
   mStyleLabels << tr( "Tick Down" ) << tr( "Tick Up" )
   << tr( "Bar" ) << tr( "Box" );