Changed a few methods to static

This commit is contained in:
niksedk 2014-08-30 19:14:21 +02:00
parent 321a8c2cba
commit 01d2ba7d25
10 changed files with 20 additions and 20 deletions

View File

@ -1041,7 +1041,7 @@ namespace Nikse.SubtitleEdit.Forms
targetFormatFound = true;
outputFileName = FormatOutputFileNameForBatchConvert(fileName, ebu.Extension, outputFolder, overwrite);
Console.Write(string.Format("{0}: {1} -> {2}...", count, Path.GetFileName(fileName), outputFileName));
ebu.Save(outputFileName, sub, true);
Ebu.Save(outputFileName, sub, true);
Console.WriteLine(" done.");
}
}
@ -1080,7 +1080,7 @@ namespace Nikse.SubtitleEdit.Forms
targetFormatFound = true;
outputFileName = FormatOutputFileNameForBatchConvert(fileName, cheetahCaption.Extension, outputFolder, overwrite);
Console.Write(string.Format("{0}: {1} -> {2}...", count, Path.GetFileName(fileName), outputFileName));
cheetahCaption.Save(outputFileName, sub);
CheetahCaption.Save(outputFileName, sub);
Console.WriteLine(" done.");
}
}
@ -1092,7 +1092,7 @@ namespace Nikse.SubtitleEdit.Forms
targetFormatFound = true;
outputFileName = FormatOutputFileNameForBatchConvert(fileName, capMakerPlus.Extension, outputFolder, overwrite);
Console.Write(string.Format("{0}: {1} -> {2}...", count, Path.GetFileName(fileName), outputFileName));
capMakerPlus.Save(outputFileName, sub);
CapMakerPlus.Save(outputFileName, sub);
Console.WriteLine(" done.");
}
}
@ -18374,7 +18374,7 @@ namespace Nikse.SubtitleEdit.Forms
fileName = fileName.Substring(0, fileName.Length - 1);
fileName += capMakerPlus.Extension;
}
capMakerPlus.Save(fileName, _subtitle);
CapMakerPlus.Save(fileName, _subtitle);
}
}
@ -18407,7 +18407,7 @@ namespace Nikse.SubtitleEdit.Forms
fileName = fileName.Substring(0, fileName.Length - 1);
fileName += cheetahCaption.Extension;
}
cheetahCaption.Save(fileName, _subtitle);
CheetahCaption.Save(fileName, _subtitle);
}
}
@ -18440,7 +18440,7 @@ namespace Nikse.SubtitleEdit.Forms
fileName = fileName.Substring(0, fileName.Length - 1);
fileName += captionInc.Extension;
}
captionInc.Save(fileName, _subtitle);
CaptionsInc.Save(fileName, _subtitle);
}
}
@ -19227,7 +19227,7 @@ namespace Nikse.SubtitleEdit.Forms
fileName = fileName.Substring(0, fileName.Length - 1);
fileName += avidStl.Extension;
}
avidStl.Save(fileName, _subtitle);
AvidStl.Save(fileName, _subtitle);
}
}

View File

@ -213,7 +213,7 @@ namespace NHunspell
}
int currentPos = 0;
int currentLength = this.GetLineLength(dictionaryBytes, currentPos);
int currentLength = GetLineLength(dictionaryBytes, currentPos);
string fileEncoding = Encoding.ASCII.GetString(dictionaryBytes, currentPos, currentLength);
Encoding enc = GetEncoding(fileEncoding);
@ -224,8 +224,8 @@ namespace NHunspell
while (currentPos < dictionaryBytes.Length)
{
currentPos += this.GetCrLfLength(dictionaryBytes, currentPos);
currentLength = this.GetLineLength(dictionaryBytes, currentPos);
currentPos += GetCrLfLength(dictionaryBytes, currentPos);
currentLength = GetLineLength(dictionaryBytes, currentPos);
string lineText = enc.GetString(dictionaryBytes, currentPos, currentLength).Trim();
if (lineText != null && lineText.Length > 0)
@ -425,7 +425,7 @@ namespace NHunspell
/// </returns>
/// <exception cref="ArgumentException">
/// </exception>
private int GetCrLfLength(byte[] buffer, int pos)
private static int GetCrLfLength(byte[] buffer, int pos)
{
if (buffer[pos] == 10)
{
@ -462,7 +462,7 @@ namespace NHunspell
/// <returns>
/// The get line length.
/// </returns>
private int GetLineLength(byte[] buffer, int start)
private static int GetLineLength(byte[] buffer, int start)
{
for (int i = start; i < buffer.Length; ++i)
{

View File

@ -91,7 +91,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
get { return true; }
}
public void Save(string fileName, Subtitle subtitle)
public static void Save(string fileName, Subtitle subtitle)
{
var fs = new FileStream(fileName, FileMode.Create, FileAccess.Write);
byte[] buffer = new byte[] { 0x38, 0x35, 0x30, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x30, 0x30, 0x30, 0x39 };

View File

@ -26,7 +26,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
get { return true; }
}
public void Save(string fileName, Subtitle subtitle)
public static void Save(string fileName, Subtitle subtitle)
{
Paragraph p;
int gridDataCount = subtitle.Paragraphs.Count;

View File

@ -23,7 +23,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
get { return true; }
}
public void Save(string fileName, Subtitle subtitle)
public static void Save(string fileName, Subtitle subtitle)
{
var fs = new FileStream(fileName, FileMode.Create, FileAccess.Write);

View File

@ -71,7 +71,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
get { return true; }
}
public void Save(string fileName, Subtitle subtitle)
public static void Save(string fileName, Subtitle subtitle)
{
var fs = new FileStream(fileName, FileMode.Create, FileAccess.Write);

View File

@ -461,7 +461,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
Save(fileName, subtitle, false);
}
public void Save(string fileName, Subtitle subtitle, bool batchMode)
public static void Save(string fileName, Subtitle subtitle, bool batchMode)
{
var header = new EbuGeneralSubtitleInformation();
var saveOptions = new EbuSaveOptions();

View File

@ -21,7 +21,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
get { return true; }
}
public void Save(string fileName)
public static void Save(string fileName)
{
var fs = new FileStream(fileName, FileMode.Create, FileAccess.Write);
fs.Close();

View File

@ -565,7 +565,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
return subtitle.Paragraphs.Count > _errorCount;
}
private string FixMax4LinesAndMax32CharsPerLine(string text, string language)
private static string FixMax4LinesAndMax32CharsPerLine(string text, string language)
{
var lines = text.Trim().Split(Environment.NewLine.ToCharArray(), StringSplitOptions.RemoveEmptyEntries);
bool allOk = true;

View File

@ -22,7 +22,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
get { return true; }
}
public void Save(string fileName, Subtitle subtitle)
public static void Save(string fileName, Subtitle subtitle)
{
FileStream fs = new FileStream(fileName, FileMode.Create, FileAccess.Write);