diff --git a/python/core/composer/qgsatlascomposition.sip b/python/core/composer/qgsatlascomposition.sip
index 17084fb8d40..4f4bc116a6d 100644
--- a/python/core/composer/qgsatlascomposition.sip
+++ b/python/core/composer/qgsatlascomposition.sip
@@ -70,7 +70,7 @@ public:
 
     QString sortKeyAttributeName() const;
     void setSortKeyAttributeName( QString fieldName );
-    
+
     int sortKeyAttributeIndex() const /Deprecated/;
     void setSortKeyAttributeIndex( int idx ) /Deprecated/;
 
diff --git a/python/gui/qgsmaplayermodel.sip b/python/gui/qgsmaplayermodel.sip
index 7f3e54f40ee..46676ff2bc6 100644
--- a/python/gui/qgsmaplayermodel.sip
+++ b/python/gui/qgsmaplayermodel.sip
@@ -11,7 +11,7 @@ class QgsMapLayerModel : QAbstractItemModel
 %TypeHeaderCode
 #include "qgsmaplayermodel.h"
 %End
-    
+
   public:
     static const int LayerIdRole;
 
diff --git a/src/gui/qgsfieldmodel.cpp b/src/gui/qgsfieldmodel.cpp
index 28cebf09d6d..2e5977353ae 100644
--- a/src/gui/qgsfieldmodel.cpp
+++ b/src/gui/qgsfieldmodel.cpp
@@ -19,9 +19,6 @@
 #include "qgslogger.h"
 
 
-const int QgsFieldModel::FieldIndexRole = Qt::UserRole + 1;
-const int QgsFieldModel::FieldNameRole = Qt::UserRole + 2;
-
 QgsFieldModel::QgsFieldModel( QObject *parent )
     : QAbstractItemModel( parent )
     , mLayer( NULL )
diff --git a/src/gui/qgsfieldmodel.h b/src/gui/qgsfieldmodel.h
index f0ecb34e4b0..060ccad3d65 100644
--- a/src/gui/qgsfieldmodel.h
+++ b/src/gui/qgsfieldmodel.h
@@ -32,7 +32,7 @@ class GUI_EXPORT QgsFieldModel : public QAbstractItemModel
 {
     Q_OBJECT
   public:
-    static const int FieldNameRole, FieldIndexRole;
+    enum { FieldNameRole = Qt::UserRole + 1, FieldIndexRole = Qt::UserRole + 2 };
 
     /**
      * @brief QgsFieldModel creates a model to display the fields of a given layer