From 2417ca68a8d4412aec66d1b4b6e58858075f828a Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@gmail.com>
Date: Fri, 14 Aug 2015 12:46:51 +0200
Subject: [PATCH] Prefer Contains() over find() != npos

---
 src/Modules.cpp    |  4 ++--
 src/Server.cpp     |  2 +-
 src/Template.cpp   | 14 +++++++-------
 src/User.cpp       |  2 +-
 src/WebModules.cpp |  2 +-
 src/znc.cpp        |  2 +-
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/Modules.cpp b/src/Modules.cpp
index 930b3f4a72..2ce73a163b 100644
--- a/src/Modules.cpp
+++ b/src/Modules.cpp
@@ -495,7 +495,7 @@ bool CModule::AddCommand(const CModCommand& Command)
 {
 	if (Command.GetFunction() == nullptr)
 		return false;
-	if (Command.GetCommand().find(' ') != CString::npos)
+	if (Command.GetCommand().Contains(" "))
 		return false;
 	if (FindCommand(Command.GetCommand()) != nullptr)
 		return false;
@@ -1226,7 +1226,7 @@ bool CModules::FindModPath(const CString& sModule, CString& sModPath,
 		CString& sDataPath) {
 	CString sMod = sModule;
 	CString sDir = sMod;
-	if (sModule.find(".") == CString::npos)
+	if (!sModule.Contains("."))
 		sMod += ".so";
 
 	ModDirList dirs = GetModDirs();
diff --git a/src/Server.cpp b/src/Server.cpp
index 2f68fa3a85..82e49a922a 100644
--- a/src/Server.cpp
+++ b/src/Server.cpp
@@ -27,7 +27,7 @@ CServer::CServer(const CString& sName, unsigned short uPort, const CString& sPas
 CServer::~CServer() {}
 
 bool CServer::IsValidHostName(const CString& sHostName) {
-	return (!sHostName.empty() && (sHostName.find(' ') == CString::npos));
+	return (!sHostName.empty() && !sHostName.Contains(" "));
 }
 
 const CString& CServer::GetName() const { return m_sName; }
diff --git a/src/Template.cpp b/src/Template.cpp
index 8db7582498..a8f3913839 100644
--- a/src/Template.cpp
+++ b/src/Template.cpp
@@ -343,7 +343,7 @@ bool CTemplate::Print(const CString& sFileName, ostream& oOut) {
 			CString sMid = CString(sLine.substr(0, iPos2)).Trim_n();
 
 			// Make sure we don't have a nested tag
-			if (sMid.find("<?") == CString::npos) {
+			if (!sMid.Contains("<?")) {
 				sLine = sLine.substr(iPos2 +2);
 				CString sAction = sMid.Token(0);
 				CString sArgs = sMid.Token(1, true);
@@ -699,26 +699,26 @@ bool CTemplate::ValidExpr(const CString& sExpression) {
 		bNegate = true;
 	}
 
-	if (sExpr.find("!=") != CString::npos) {
+	if (sExpr.Contains("!=")) {
 		sName = sExpr.Token(0, false, "!=").Trim_n();
 		sValue = sExpr.Token(1, true, "!=", false, "\"", "\"", true).Trim_n();
 		bNegate = !bNegate;
-	} else if (sExpr.find("==") != CString::npos) {
+	} else if (sExpr.Contains("==")) {
 		sName = sExpr.Token(0, false, "==").Trim_n();
 		sValue = sExpr.Token(1, true, "==", false, "\"", "\"", true).Trim_n();
-	} else if (sExpr.find(">=") != CString::npos) {
+	} else if (sExpr.Contains(">=")) {
 		sName = sExpr.Token(0, false, ">=").Trim_n();
 		sValue = sExpr.Token(1, true, ">=", false, "\"", "\"", true).Trim_n();
 		return (GetValue(sName, true).ToLong() >= sValue.ToLong());
-	} else if (sExpr.find("<=") != CString::npos) {
+	} else if (sExpr.Contains("<=")) {
 		sName = sExpr.Token(0, false, "<=").Trim_n();
 		sValue = sExpr.Token(1, true, "<=", false, "\"", "\"", true).Trim_n();
 		return (GetValue(sName, true).ToLong() <= sValue.ToLong());
-	} else if (sExpr.find(">") != CString::npos) {
+	} else if (sExpr.Contains(">")) {
 		sName = sExpr.Token(0, false, ">").Trim_n();
 		sValue = sExpr.Token(1, true, ">", false, "\"", "\"", true).Trim_n();
 		return (GetValue(sName, true).ToLong() > sValue.ToLong());
-	} else if (sExpr.find("<") != CString::npos) {
+	} else if (sExpr.Contains("<")) {
 		sName = sExpr.Token(0, false, "<").Trim_n();
 		sValue = sExpr.Token(1, true, "<", false, "\"", "\"", true).Trim_n();
 		return (GetValue(sName, true).ToLong() < sValue.ToLong());
diff --git a/src/User.cpp b/src/User.cpp
index f179ac70b3..3991b3b0ae 100644
--- a/src/User.cpp
+++ b/src/User.cpp
@@ -1220,7 +1220,7 @@ bool CUser::DelCTCPReply(const CString& sCTCP) {
 }
 
 bool CUser::SetStatusPrefix(const CString& s) {
-	if ((!s.empty()) && (s.length() < 6) && (s.find(' ') == CString::npos)) {
+	if ((!s.empty()) && (s.length() < 6) && (!s.Contains(" "))) {
 		m_sStatusPrefix = (s.empty()) ? "*" : s;
 		return true;
 	}
diff --git a/src/WebModules.cpp b/src/WebModules.cpp
index a85d7b9ed9..211be4b845 100644
--- a/src/WebModules.cpp
+++ b/src/WebModules.cpp
@@ -670,7 +670,7 @@ CWebSock::EPageReqResult CWebSock::OnPageRequestInternal(const CString& sURI, CS
 		return PAGE_NOTFOUND;
 	} else if (sURI.StartsWith("/mods/") || sURI.StartsWith("/modfiles/")) {
 		// Make sure modules are treated as directories
-		if (!sURI.EndsWith("/") && sURI.find(".") == CString::npos && sURI.TrimLeft_n("/mods/").TrimLeft_n("/").find("/") == CString::npos) {
+		if (!sURI.EndsWith("/") && !sURI.Contains(".") && !sURI.TrimLeft_n("/mods/").TrimLeft_n("/").Contains("/")) {
 			Redirect(sURI + "/");
 			return PAGE_DONE;
 		}
diff --git a/src/znc.cpp b/src/znc.cpp
index 62376ad79b..3d2840b3d9 100644
--- a/src/znc.cpp
+++ b/src/znc.cpp
@@ -1540,7 +1540,7 @@ bool CZNC::AddListener(const CString& sLine, CString& sError) {
 		sValue.Replace(":", " ");
 	}
 
-	if (sValue.find(" ") != CString::npos) {
+	if (sValue.Contains(" ")) {
 		sBindHost = sValue.Token(0, false, " ");
 		sPort = sValue.Token(1, true, " ");
 	} else {