sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-27 00:33:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix Windows build

Browse Source
This commit is contained in:
Nathan Woodrow 2017-05-22 01:27:12 +01:00
parent 1577a57a19
commit 3cd714affe
2 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/core/expression/qgsexpressionutils.cpp
View File

@ -16,6 +16,18 @@
#include "qgsexpressionutils.h"
#include "qgsexpressionnode.h"
constexpr QgsExpressionUtils::TVL QgsExpressionUtils::AND[3][3];
constexpr QgsExpressionUtils::TVL QgsExpressionUtils::OR[3][3];
constexpr QgsExpressionUtils::TVL QgsExpressionUtils::NOT[3];
QgsExpressionUtils::TVL QgsExpressionUtils::AND[3][3] =
{
// false true unknown
{ False, False, False }, // false
{ False, True, Unknown }, // true
{ False, Unknown, Unknown } // unknown
};
QgsExpressionUtils::TVL QgsExpressionUtils::OR[3][3] =
{
{ False, True, Unknown }, // false
{ True, True, True }, // true
{ Unknown, True, Unknown } // unknown
};
QgsExpressionUtils::TVL QgsExpressionUtils::NOT[3] = { True, False, Unknown };

17
src/core/expression/qgsexpressionutils.h
View File

@ -45,22 +45,11 @@ class QgsExpressionUtils
};
static constexpr TVL AND[3][3] =
{
// false true unknown
{ False, False, False }, // false
{ False, True, Unknown }, // true
{ False, Unknown, Unknown } // unknown
};
static TVL AND[3][3];
static constexpr TVL OR[3][3] =
{
{ False, True, Unknown }, // false
{ True, True, True }, // true
{ Unknown, True, Unknown } // unknown
};
static TVL OR[3][3];
static constexpr TVL NOT[3] = { True, False, Unknown };
static TVL NOT[3];
#define TVL_True QVariant( 1 )
#define TVL_False QVariant( 0 )