fix a case insensitive bug

Author: IOBYTE

lib/importproject.cpp

@@ -760,9 +760,9 @@ namespace {
 
         // Replace "And" and "Or" with "&&" and "||"
         for (Token *tok = tokenlist.front(); tok; tok = tok->next()) {
-            if (tok->str() == "And")
+            if (caseInsensitiveStringCompare(tok->str(), "and") == 0)
                 tok->str("&&");
-            else if (tok->str() == "Or")
+            else if (caseInsensitiveStringCompare(tok->str(), "or") == 0)
                 tok->str("||");
         }
 

test/testimportproject.cpp

@@ -694,6 +694,8 @@ class TestImportProject : public TestFixture {
         ASSERT(!cppcheck::testing::evaluateVcxprojCondition("!('$(Configuration)|$(Platform)' == 'Debug|Win32' )", "Debug", "Win32"));
         ASSERT(cppcheck::testing::evaluateVcxprojCondition(" '$(Configuration)' == 'Debug' And '$(Platform)' == 'Win32'", "Debug", "Win32"));
         ASSERT(cppcheck::testing::evaluateVcxprojCondition(" '$(Configuration)' == 'Debug' Or '$(Platform)' == 'Win32'", "Release", "Win32"));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition(" '$(Configuration)' == 'Debug' and '$(Platform)' == 'Win32'", "Debug", "Win32"));
+        ASSERT(cppcheck::testing::evaluateVcxprojCondition(" '$(Configuration)' == 'Debug' or '$(Platform)' == 'Win32'", "Release", "Win32"));
         ASSERT(cppcheck::testing::evaluateVcxprojCondition(" $(Configuration.StartsWith('Debug'))", "Debug-AddressSanitizer", "Win32"));
         ASSERT(cppcheck::testing::evaluateVcxprojCondition(" $(Configuration.EndsWith('AddressSanitizer'))", "Debug-AddressSanitizer", "Win32"));
         ASSERT(cppcheck::testing::evaluateVcxprojCondition(" $(Configuration.Contains('Address'))", "Debug-AddressSanitizer", "Win32"));