Small cleanup (join declarations)

This commit is contained in:
Flamefire committed 2013-04-23 22:14:53 +02:00
1 parent b8fe334153
commit f53e08607b
18 files changed
+33 -40

No files matched your search

+1 -1
View File
@@ -26,7 +26,7 @@ namespace VocaluxeLib.Menu
{
protected IPartyMode _PartyMode;
public CMenuParty()
protected CMenuParty()
{
_PartyMode = new CPartyModeNone();
}
+1 -1
View File
@@ -556,7 +556,7 @@ namespace VocaluxeLib.Menu
_ValueBounds.Clear();
}
public void AddValues(string[] values)
public void AddValues(IEnumerable<string> values)
{
foreach (string value in values)
_AddValue(value, new STexture(-1), _PartyModeID);
+2 -3
View File
@@ -141,7 +141,7 @@ namespace VocaluxeLib.Menu
return values;
}
public List<string> GetAttributes(string cast, string attribute)
public IEnumerable<string> GetAttributes(string cast, string attribute)
{
List<string> values = new List<string>();
@@ -180,11 +180,10 @@ namespace VocaluxeLib.Menu
public bool ItemExists(string cast)
{
XPathNodeIterator iterator;
int results = 0;
_Navigator.MoveToFirstChild();
iterator = _Navigator.Select(cast);
XPathNodeIterator iterator = _Navigator.Select(cast);
while (iterator.MoveNext())
results++;
+1 -1
View File
@@ -86,7 +86,7 @@ namespace VocaluxeLib.Menu
int GetCoverSize();
List<string> GetSongFolder();
IEnumerable<string> GetSongFolder();
ESongSorting GetSongSorting();
EOffOn GetTabs();
EOffOn GetIgnoreArticles();
+3 -3
View File
@@ -707,7 +707,6 @@ namespace VocaluxeLib.Menu.SingNotes
public void UpdateTimings()
{
CNote lastNote;
int min, max, s;
if (_Lines.Count > 0)
_Lines[0].StartBeat = -10000;
@@ -719,9 +718,10 @@ namespace VocaluxeLib.Menu.SingNotes
if ((lastNote != null) && (firstNote != null))
{
min = lastNote.EndBeat;
max = firstNote.StartBeat;
int min = lastNote.EndBeat;
int max = firstNote.StartBeat;
int s;
switch (max - min)
{
case 0:
+1 -1
View File
@@ -74,7 +74,7 @@ namespace VocaluxeLib.Menu.SingNotes
/// </remarks>
public SRectF[,] BarPos { get; set; }
public CSingNotes(int partyModeID)
protected CSingNotes(int partyModeID)
{
_PartyModeID = partyModeID;
_Theme = new SThemeSingBar();
@@ -234,7 +234,7 @@ namespace VocaluxeLib.Menu.SongMenu
_Visible = visible;
}
public CSongMenuFramework(int partyModeID)
protected CSongMenuFramework(int partyModeID)
{
_PartyModeID = partyModeID;
_Theme = new SThemeSongMenu