more flag operators declaration in SIP, better use of flags in data d…

…efined button
qgis · Sep 1, 2014 · 5b1a516f2ecfb673e8d360ec734665a7a34a05bc · 5b1a516
1 parent 8a65115
commit 5b1a516f2ecfb673e8d360ec734665a7a34a05bc
Unified Split

Showing with 12 additions and 6 deletions.

+3 −1 python/gui/qgsdatadefinedbutton.sip

+2 −0 python/gui/qgsfieldproxymodel.sip

+2 −0 python/gui/qgsmaplayeractionregistry.sip

+3 −3 src/gui/qgsdatadefinedbutton.cpp

+2 −2 src/gui/qgsdatadefinedbutton.h
diff --git a/python/gui/qgsdatadefinedbutton.sip b/python/gui/qgsdatadefinedbutton.sip
@@ -6,10 +6,10 @@ class QgsDataDefinedButton :  QToolButton
   public:
     enum DataType
     {
-      AnyType,
       String,
       Int,
       Double,
+      AnyType
     };
     typedef QFlags<QgsDataDefinedButton::DataType> DataTypes;
 
@@ -207,3 +207,5 @@ class QgsDataDefinedButton :  QToolButton
     void setField( QString field );
 
 };
+
+QFlags<QgsDataDefinedButton::DataType> operator|(QgsDataDefinedButton::DataType f1, QFlags<QgsDataDefinedButton::DataType> f2);
diff --git a/python/gui/qgsfieldproxymodel.sip b/python/gui/qgsfieldproxymodel.sip
@@ -45,3 +45,5 @@ class QgsFieldProxyModel : QSortFilterProxyModel
     bool lessThan( const QModelIndex &left, const QModelIndex &right ) const;
 };
 
+QFlags<QgsFieldProxyModel::Filter> operator|(QgsFieldProxyModel::Filter f1, QFlags<QgsFieldProxyModel::Filter> f2);
+
diff --git a/python/gui/qgsmaplayeractionregistry.sip b/python/gui/qgsmaplayeractionregistry.sip
@@ -45,6 +45,8 @@ class QgsMapLayerAction : QAction
 
 };
 
+QFlags<QgsMapLayerAction::Target> operator|(QgsMapLayerAction::Target f1, QFlags<QgsMapLayerAction::Target> f2);
+
 class QgsMapLayerActionRegistry : QObject
 {
 %TypeHeaderCode

diff --git a/src/gui/qgsdatadefinedbutton.cpp b/src/gui/qgsdatadefinedbutton.cpp
@@ -131,15 +131,15 @@ void QgsDataDefinedButton::init( const QgsVectorLayer* vl,
   mDataTypesString = QString( "" );
 
   QStringList ts;
-  if ( mDataTypes.testFlag( AnyType ) || mDataTypes.testFlag( String ) )
+  if ( mDataTypes.testFlag( String ) )
   {
     ts << tr( "string" );
   }
-  if ( mDataTypes.testFlag( AnyType ) || mDataTypes.testFlag( Int ) )
+  if ( mDataTypes.testFlag( Int ) )
   {
     ts << tr( "int" );
   }
-  if ( mDataTypes.testFlag( AnyType ) || mDataTypes.testFlag( Double ) )
+  if ( mDataTypes.testFlag( Double ) )
   {
     ts << tr( "double" );
   }

diff --git a/src/gui/qgsdatadefinedbutton.h b/src/gui/qgsdatadefinedbutton.h
@@ -39,10 +39,10 @@ class GUI_EXPORT QgsDataDefinedButton: public QToolButton
   public:
     enum DataType
     {
-      AnyType  = 0,
       String  = 1,
       Int     = 2,
-      Double  = 4
+      Double  = 4,
+      AnyType = String | Int | Double
     };
     Q_DECLARE_FLAGS( DataTypes, DataType )