Skip to content

Commit

Permalink
Obey our new VS 2015 overlord
Browse files Browse the repository at this point in the history
  • Loading branch information
sarbian committed Aug 4, 2015
1 parent 7fb3ca2 commit ca82b51
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions moduleManager.cs
Expand Up @@ -546,12 +546,12 @@ public static void addPostPatchCallback(ModuleManagerPostPatchCallback callback)
if (!postPatchCallbacks.Contains(callback))
postPatchCallbacks.Add(callback);
}
private List<String> PrePatchInit()
private List<string> PrePatchInit()
{
#region Excluding directories

// Build a list of subdirectory that won't be processed
List<String> excludePaths = new List<string>();
List<string> excludePaths = new List<string>();

if (ModuleManager.IsABadIdea())
{
Expand Down Expand Up @@ -689,7 +689,7 @@ private IEnumerator ProcessPatch(bool blocking)
useCache = false;
#endif

List<String> excludePaths = PrePatchInit();
List<string> excludePaths = PrePatchInit();

yield return null;

Expand Down Expand Up @@ -742,7 +742,7 @@ private IEnumerator ProcessPatch(bool blocking)

if (errorCount > 0)
{
foreach (String file in errorFiles.Keys)
foreach (string file in errorFiles.Keys)
{
errors += errorFiles[file] + " error" + (errorFiles[file] > 1 ? "s" : "") + " related to GameData/" + file
+ "\n";
Expand Down Expand Up @@ -1027,7 +1027,7 @@ private void StatusUpdate()

#region Needs checking

private void CheckNeeds(List<String> excludePaths)
private void CheckNeeds(List<string> excludePaths)
{
UrlDir.UrlConfig[] allConfigs = GameDatabase.Instance.root.AllConfigs.ToArray();

Expand Down Expand Up @@ -1214,7 +1214,7 @@ private void PurgeUnused(List<string> excludePaths)
#region Applying Patches

// Apply patch to all relevent nodes
public IEnumerator ApplyPatch(List<String> excludePaths, string Stage)
public IEnumerator ApplyPatch(List<string> excludePaths, string Stage)
{
log(Stage + (Stage == ":LEGACY" ? " (default) pass" : " pass"));

Expand Down Expand Up @@ -2229,7 +2229,7 @@ private static Command ParseCommand(string name, out string valueName)

#region Sanity checking & Utility functions

public static bool IsBracketBalanced(String str)
public static bool IsBracketBalanced(string str)
{
Stack<char> stack = new Stack<char>();

Expand Down Expand Up @@ -2258,7 +2258,7 @@ public static string RemoveWS(string withWhite)
return new string(withWhite.ToCharArray().Where(c => !Char.IsWhiteSpace(c)).ToArray());
}

public bool IsPathInList(string modPath, List<String> pathList)
public bool IsPathInList(string modPath, List<string> pathList)
{
return pathList.Any(modPath.StartsWith);
}
Expand Down Expand Up @@ -2372,11 +2372,11 @@ public static bool WildcardMatchValues(ConfigNode node, string type, string valu
return false;
}

public static bool WildcardMatch(String s, String wildcard)
public static bool WildcardMatch(string s, string wildcard)
{
if (wildcard == null)
return true;
String pattern = "^" + Regex.Escape(wildcard).Replace(@"\*", ".*").Replace(@"\?", ".") + "$";
string pattern = "^" + Regex.Escape(wildcard).Replace(@"\*", ".*").Replace(@"\?", ".") + "$";

Regex regex;
if (!regexCache.TryGetValue(pattern, out regex))
Expand Down

0 comments on commit ca82b51

Please sign in to comment.