Fix warnings.

egorpugin · egorpugin · commit 63408669857f · 2018-07-12T18:02:55.000+03:00
diff --git a/src/common/project.cpp b/src/common/project.cpp
@@ -1516,7 +1516,7 @@ String Project::print_cpp()
         for (auto &t : sources)
         {
             s += "\"" + t + "\"";
-            if (t.find("\\") != -1 || t.find("*") != -1)
+            if (t.find("\\") != String::npos || t.find("*") != String::npos)
                 s += "_rr";
             s += ",\n";
         }
@@ -1533,7 +1533,7 @@ String Project::print_cpp()
         for (auto &t : exclude_from_build)
         {
             s += "\"" + t + "\"";
-            if (t.find("\\") != -1 || t.find("*") != -1)
+            if (t.find("\\") != String::npos || t.find("*") != String::npos)
                 s += "_rr";
             s += ",\n";
         }
@@ -1550,7 +1550,7 @@ String Project::print_cpp()
         for (auto &t : exclude_from_package)
         {
             s += "\"" + t + "\"";
-            if (t.find("\\") != -1 || t.find("*") != -1)
+            if (t.find("\\") != String::npos || t.find("*") != String::npos)
                 s += "_rr";
             s += ",\n";
         }
@@ -1566,7 +1566,7 @@ String Project::print_cpp()
         String s;
         for (auto &t : include_directories.private_)
         {
-            if (t.string().find("BDIR") == -1)
+            if (t.string().find("BDIR") == String::npos)
                 s += "\"" + t.string() + "\"_id,\n";
         }
         s.resize(s.size() - 2);
@@ -1580,7 +1580,7 @@ String Project::print_cpp()
         String s;
         for (auto &t : include_directories.public_)
         {
-            if (t.string().find("BDIR") == -1)
+            if (t.string().find("BDIR") == String::npos)
                 s += "\"" + t.string() + "\"_id,\n";
         }
         s.resize(s.size() - 2);
@@ -1824,7 +1824,7 @@ String Project::print_cpp2()
         for (auto &t : sources)
         {
             s += "\"" + t + "\"";
-            if (t.find("\\") != -1 || t.find("*") != -1)
+            if (t.find("\\") != String::npos || t.find("*") != String::npos)
                 s += "_rr";
             s += ",\n";
         }
@@ -1843,7 +1843,7 @@ String Project::print_cpp2()
         for (auto &t : exclude_from_build)
         {
             s += "\"" + t + "\"";
-            if (t.find("\\") != -1 || t.find("*") != -1)
+            if (t.find("\\") != String::npos || t.find("*") != String::npos)
                 s += "_rr";
             s += ",\n";
         }
@@ -1862,7 +1862,7 @@ String Project::print_cpp2()
         for (auto &t : exclude_from_package)
         {
             s += "\"" + t + "\"";
-            if (t.find("\\") != -1 || t.find("*") != -1)
+            if (t.find("\\") != String::npos || t.find("*") != String::npos)
                 s += "_rr";
             s += ",\n";
         }
@@ -1880,7 +1880,7 @@ String Project::print_cpp2()
         String s;
         for (auto &t : include_directories.private_)
         {
-            if (t.string().find("BDIR") == -1)
+            if (t.string().find("BDIR") == String::npos)
                 s += "\"" + t.string() + "\"_id,\n";
         }
         s.resize(s.size() - 2);
@@ -1896,7 +1896,7 @@ String Project::print_cpp2()
         for (auto &t : include_directories.public_)
         {
             auto str = t.string();
-            if (str.find("BDIR") != -1)
+            if (str.find("BDIR") != String::npos)
                 continue;
             if (str == ".")
                 continue;

Original file line number	Diff line number	Diff line change
`@@ -1516,7 +1516,7 @@ String Project::print_cpp()`
`1516`	`1516`	`for (auto &t : sources)`
`1517`	`1517`	`{`
`1518`	`1518`	`s += "\"" + t + "\"";`
`1519`		`- if (t.find("\\") != -1 \|\| t.find("*") != -1)`
	`1519`	`+ if (t.find("\\") != String::npos \|\| t.find("*") != String::npos)`
`1520`	`1520`	`s += "_rr";`
`1521`	`1521`	`s += ",\n";`
`1522`	`1522`	`}`
`@@ -1533,7 +1533,7 @@ String Project::print_cpp()`
`1533`	`1533`	`for (auto &t : exclude_from_build)`
`1534`	`1534`	`{`
`1535`	`1535`	`s += "\"" + t + "\"";`
`1536`		`- if (t.find("\\") != -1 \|\| t.find("*") != -1)`
	`1536`	`+ if (t.find("\\") != String::npos \|\| t.find("*") != String::npos)`
`1537`	`1537`	`s += "_rr";`
`1538`	`1538`	`s += ",\n";`
`1539`	`1539`	`}`
`@@ -1550,7 +1550,7 @@ String Project::print_cpp()`
`1550`	`1550`	`for (auto &t : exclude_from_package)`
`1551`	`1551`	`{`
`1552`	`1552`	`s += "\"" + t + "\"";`
`1553`		`- if (t.find("\\") != -1 \|\| t.find("*") != -1)`
	`1553`	`+ if (t.find("\\") != String::npos \|\| t.find("*") != String::npos)`
`1554`	`1554`	`s += "_rr";`
`1555`	`1555`	`s += ",\n";`
`1556`	`1556`	`}`
`@@ -1566,7 +1566,7 @@ String Project::print_cpp()`
`1566`	`1566`	`String s;`
`1567`	`1567`	`for (auto &t : include_directories.private_)`
`1568`	`1568`	`{`
`1569`		`- if (t.string().find("BDIR") == -1)`
	`1569`	`+ if (t.string().find("BDIR") == String::npos)`
`1570`	`1570`	`s += "\"" + t.string() + "\"_id,\n";`
`1571`	`1571`	`}`
`1572`	`1572`	`s.resize(s.size() - 2);`
`@@ -1580,7 +1580,7 @@ String Project::print_cpp()`
`1580`	`1580`	`String s;`
`1581`	`1581`	`for (auto &t : include_directories.public_)`
`1582`	`1582`	`{`
`1583`		`- if (t.string().find("BDIR") == -1)`
	`1583`	`+ if (t.string().find("BDIR") == String::npos)`
`1584`	`1584`	`s += "\"" + t.string() + "\"_id,\n";`
`1585`	`1585`	`}`
`1586`	`1586`	`s.resize(s.size() - 2);`
`@@ -1824,7 +1824,7 @@ String Project::print_cpp2()`
`1824`	`1824`	`for (auto &t : sources)`
`1825`	`1825`	`{`
`1826`	`1826`	`s += "\"" + t + "\"";`
`1827`		`- if (t.find("\\") != -1 \|\| t.find("*") != -1)`
	`1827`	`+ if (t.find("\\") != String::npos \|\| t.find("*") != String::npos)`
`1828`	`1828`	`s += "_rr";`
`1829`	`1829`	`s += ",\n";`
`1830`	`1830`	`}`
`@@ -1843,7 +1843,7 @@ String Project::print_cpp2()`
`1843`	`1843`	`for (auto &t : exclude_from_build)`
`1844`	`1844`	`{`
`1845`	`1845`	`s += "\"" + t + "\"";`
`1846`		`- if (t.find("\\") != -1 \|\| t.find("*") != -1)`
	`1846`	`+ if (t.find("\\") != String::npos \|\| t.find("*") != String::npos)`
`1847`	`1847`	`s += "_rr";`
`1848`	`1848`	`s += ",\n";`
`1849`	`1849`	`}`
`@@ -1862,7 +1862,7 @@ String Project::print_cpp2()`
`1862`	`1862`	`for (auto &t : exclude_from_package)`
`1863`	`1863`	`{`
`1864`	`1864`	`s += "\"" + t + "\"";`
`1865`		`- if (t.find("\\") != -1 \|\| t.find("*") != -1)`
	`1865`	`+ if (t.find("\\") != String::npos \|\| t.find("*") != String::npos)`
`1866`	`1866`	`s += "_rr";`
`1867`	`1867`	`s += ",\n";`
`1868`	`1868`	`}`
`@@ -1880,7 +1880,7 @@ String Project::print_cpp2()`
`1880`	`1880`	`String s;`
`1881`	`1881`	`for (auto &t : include_directories.private_)`
`1882`	`1882`	`{`
`1883`		`- if (t.string().find("BDIR") == -1)`
	`1883`	`+ if (t.string().find("BDIR") == String::npos)`
`1884`	`1884`	`s += "\"" + t.string() + "\"_id,\n";`
`1885`	`1885`	`}`
`1886`	`1886`	`s.resize(s.size() - 2);`
`@@ -1896,7 +1896,7 @@ String Project::print_cpp2()`
`1896`	`1896`	`for (auto &t : include_directories.public_)`
`1897`	`1897`	`{`
`1898`	`1898`	`auto str = t.string();`
`1899`		`- if (str.find("BDIR") != -1)`
	`1899`	`+ if (str.find("BDIR") != String::npos)`
`1900`	`1900`	`continue;`
`1901`	`1901`	`if (str == ".")`
`1902`	`1902`	`continue;`