Merge branch 'develop' into Better_Rounds_Handling

Conflicts:
	Vocaluxe/Base/CGame.cs
	Vocaluxe/Screens/CScreenNames.cs
This commit is contained in:
Flamefire committed 2013-10-21 15:55:46 +02:00
commit f8b80a5911
53 files changed
+2014 -1281

No files matched your search

+6 -11
View File
@@ -62,7 +62,6 @@ namespace VocaluxeLib
public static string ListStrings(string[] str)
{
string result = string.Empty;
for (int i = 0; i < str.Length; i++)
{
result += str[i];
@@ -150,6 +149,8 @@ namespace VocaluxeLib
{
var files = new List<string>();
var dir = new DirectoryInfo(path);
if (!dir.Exists)
return files;
try
{
@@ -169,13 +170,7 @@ namespace VocaluxeLib
return files;
}
public static bool TryParse<T>(string value, out T result)
where T : struct
{
return TryParse(value, out result, false);
}
public static bool TryParse<T>(string value, out T result, bool ignoreCase)
public static bool TryParse<T>(string value, out T result, bool ignoreCase=false)
where T : struct
{
result = default(T);
@@ -208,7 +203,7 @@ namespace VocaluxeLib
static class CEncoding
{
public static Encoding GetEncoding(string encodingName)
public static Encoding GetEncoding(this string encodingName)
{
switch (encodingName)
{
@@ -223,11 +218,11 @@ namespace VocaluxeLib
case "UTF8":
return Encoding.UTF8;
default:
return Encoding.UTF8;
return Encoding.Default;
}
}
public static string GetEncodingName(Encoding enc)
public static string GetEncodingName(this Encoding enc)
{
string result = "UTF8";