platform/shared/db/DBAdapter.h in rhodes-5.5.18 vs platform/shared/db/DBAdapter.h in rhodes-6.0.11

@@ -165,11 +165,11 @@
 
     template<typename T1, typename T2>
     DBResultPtr executeSQL( const char* szSt, T1 p1, T2 p2 )
     {
         DBResultPtr res = prepareStatement(szSt);
-        if ( res->getStatement() == null )
+        if ( res->getStatement() == NULL )
             return res;
 
         bind(res->getStatement(), 1, p1);
         bind(res->getStatement(), 2, p2);
 
@@ -178,11 +178,11 @@
 
     template<typename T1, typename T2, typename T3>
     DBResultPtr executeSQL( const char* szSt, T1 p1, T2 p2, T3 p3 )
     {
         DBResultPtr res = prepareStatement(szSt);
-        if ( res->getStatement() == null )
+        if ( res->getStatement() == NULL )
             return res;
 
         bind(res->getStatement(), 1, p1);
         bind(res->getStatement(), 2, p2);
         bind(res->getStatement(), 3, p3);
@@ -192,11 +192,11 @@
 
     template<typename T1, typename T2, typename T3, typename T4>
     DBResultPtr executeSQL( const char* szSt, T1 p1, T2 p2, T3 p3, T4 p4 )
     {
         DBResultPtr res = prepareStatement(szSt);
-        if ( res->getStatement() == null )
+        if ( res->getStatement() == NULL )
             return res;
 
         bind(res->getStatement(), 1, p1);
         bind(res->getStatement(), 2, p2);
         bind(res->getStatement(), 3, p3);
@@ -207,11 +207,11 @@
 
     template<typename T1, typename T2, typename T3, typename T4, typename T5>
     DBResultPtr executeSQL( const char* szSt, T1 p1, T2 p2, T3 p3, T4 p4, T5 p5 )
     {
         DBResultPtr res = prepareStatement(szSt);
-        if ( res->getStatement() == null )
+        if ( res->getStatement() == NULL )
             return res;
 
         bind(res->getStatement(), 1, p1);
         bind(res->getStatement(), 2, p2);
         bind(res->getStatement(), 3, p3);
@@ -223,11 +223,11 @@
 
     template<typename T1, typename T2, typename T3, typename T4, typename T5, typename T6>
     DBResultPtr executeSQL( const char* szSt, T1 p1, T2 p2, T3 p3, T4 p4, T5 p5, T6 p6 )
     {
         DBResultPtr res = prepareStatement(szSt);
-        if ( res->getStatement() == null )
+        if ( res->getStatement() == NULL )
             return res;
 
         bind(res->getStatement(), 1, p1);
         bind(res->getStatement(), 2, p2);
         bind(res->getStatement(), 3, p3);
@@ -242,11 +242,11 @@
 
     template<typename T1, typename T2, typename T3, typename T4>
     DBResultPtr executeSQLReportNonUnique( const char* szSt, T1 p1, T2 p2, T3 p3, T4 p4 )
     {
         DBResultPtr res = prepareStatement(szSt);
-        if ( res->getStatement() == null )
+        if ( res->getStatement() == NULL )
             return res;
 
         bind(res->getStatement(), 1, p1);
         bind(res->getStatement(), 2, p2);
         bind(res->getStatement(), 3, p3);
@@ -258,11 +258,11 @@
 
     template<typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7>
     DBResultPtr executeSQLReportNonUnique( const char* szSt, T1 p1, T2 p2, T3 p3, T4 p4, T5 p5, T6 p6, T7 p7 )
     {
         DBResultPtr res = prepareStatement(szSt);
-        if ( res->getStatement() == null )
+        if ( res->getStatement() == NULL )
             return res;
 
         bind(res->getStatement(), 1, p1);
         bind(res->getStatement(), 2, p2);
         bind(res->getStatement(), 3, p3);
@@ -277,11 +277,11 @@
 
     template<typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7>
     DBResultPtr executeSQL( const char* szSt, T1 p1, T2 p2, T3 p3, T4 p4, T5 p5, T6 p6, T7 p7 )
     {
         DBResultPtr res = prepareStatement(szSt);
-        if ( res->getStatement() == null )
+        if ( res->getStatement() == NULL )
             return res;
 
         bind(res->getStatement(), 1, p1);
         bind(res->getStatement(), 2, p2);
         bind(res->getStatement(), 3, p3);
@@ -295,11 +295,11 @@
 
     template<typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8>
     DBResultPtr executeSQL( const char* szSt, T1 p1, T2 p2, T3 p3, T4 p4, T5 p5, T6 p6, T7 p7, T8 p8 )
     {
         DBResultPtr res = prepareStatement(szSt);
-        if ( res->getStatement() == null )
+        if ( res->getStatement() == NULL )
             return res;
 
         bind(res->getStatement(), 1, p1);
         bind(res->getStatement(), 2, p2);
         bind(res->getStatement(), 3, p3);
@@ -314,11 +314,11 @@
 
     template<typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8, typename T9>
     DBResultPtr executeSQL( const char* szSt, T1 p1, T2 p2, T3 p3, T4 p4, T5 p5, T6 p6, T7 p7, T8 p8, T9 p9 )
     {
         DBResultPtr res = prepareStatement(szSt);
-        if ( res->getStatement() == null )
+        if ( res->getStatement() == NULL )
             return res;
 
         bind(res->getStatement(), 1, p1);
         bind(res->getStatement(), 2, p2);
         bind(res->getStatement(), 3, p3);
@@ -334,10 +334,10 @@
 
     template<typename T1>
     DBResultPtr executeSQL( const char* szSt, T1 p1)
     {
         DBResultPtr res = prepareStatement(szSt);
-        if ( res->getStatement() == null )
+        if ( res->getStatement() == NULL )
             return res;
 
         bind(res->getStatement(), 1, p1);
         return executeStatement(res, szSt);
     }