fix windows build

qgis · Apr 4, 2014 · 8bd80f4 · 8bd80f4
1 parent 72b3812
commit 8bd80f4
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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