[OMPT-svn-commit] SF.net SVN: modplug:[2303] trunk/OpenMPT/mptrack

[<man...@us...>]

Revision: 2303
          http://sourceforge.net/p/modplug/code/2303
Author:   manxorist
Date:     2013-06-03 22:02:59 +0000 (Mon, 03 Jun 2013)
Log Message:
-----------
[Ref] Fix some more warnings.

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/Moddoc.cpp
    trunk/OpenMPT/mptrack/Moddoc.h
    trunk/OpenMPT/mptrack/PatternGotoDialog.cpp
    trunk/OpenMPT/mptrack/View_pat.cpp

Modified: trunk/OpenMPT/mptrack/Moddoc.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Moddoc.cpp	2013-06-03 21:32:46 UTC (rev 2302)
+++ trunk/OpenMPT/mptrack/Moddoc.cpp	2013-06-03 22:02:59 UTC (rev 2303)
@@ -2803,7 +2803,7 @@
 }
 
 
-CString CModDoc::GetPatternViewInstrumentName(UINT nInstr,
+CString CModDoc::GetPatternViewInstrumentName(INSTRUMENTINDEX nInstr,
 											  bool bEmptyInsteadOfNoName /* = false*/,
 											  bool bIncludeIndex /* = true*/) const
 //-----------------------------------------------------------------------------------

Modified: trunk/OpenMPT/mptrack/Moddoc.h
===================================================================
--- trunk/OpenMPT/mptrack/Moddoc.h	2013-06-03 21:32:46 UTC (rev 2302)
+++ trunk/OpenMPT/mptrack/Moddoc.h	2013-06-03 22:02:59 UTC (rev 2303)
@@ -361,7 +361,7 @@
 	// [in] bEmptyInsteadOfNoName: In case of unnamed instrument string, "(no name)" is returned unless this 
 	//                             parameter is true is case which an empty name is returned.
 	// [in] bIncludeIndex: True to include instrument index in front of the instrument name, false otherwise.
-	CString GetPatternViewInstrumentName(UINT nInstr, bool bEmptyInsteadOfNoName = false, bool bIncludeIndex = true) const;
+	CString GetPatternViewInstrumentName(INSTRUMENTINDEX nInstr, bool bEmptyInsteadOfNoName = false, bool bIncludeIndex = true) const;
 
 	// Check if a given channel contains data.
 	bool IsChannelUnused(CHANNELINDEX nChn) const;

Modified: trunk/OpenMPT/mptrack/PatternGotoDialog.cpp
===================================================================
--- trunk/OpenMPT/mptrack/PatternGotoDialog.cpp	2013-06-03 21:32:46 UTC (rev 2302)
+++ trunk/OpenMPT/mptrack/PatternGotoDialog.cpp	2013-06-03 22:02:59 UTC (rev 2303)
@@ -68,7 +68,7 @@
 	bool validated = true;
 	
 	// Does pattern exist?
-	if(validated && !m_pSndFile->Patterns.IsValidPat(m_nPattern))
+	if(validated && !m_pSndFile->Patterns.IsValidPat(static_cast<PATTERNINDEX>(m_nPattern)))
 	{
 		validated = false;
 	}
@@ -112,7 +112,7 @@
 	}
 		
 	UpdateData();
-	m_nOrder = m_pSndFile->Order.FindOrder(static_cast<PATTERNINDEX>(m_nPattern), m_nActiveOrder);
+	m_nOrder = m_pSndFile->Order.FindOrder(static_cast<PATTERNINDEX>(m_nPattern), static_cast<ORDERINDEX>(m_nActiveOrder));
 
 	if(m_nOrder == ORDERINDEX_INVALID)
 	{

Modified: trunk/OpenMPT/mptrack/View_pat.cpp
===================================================================
--- trunk/OpenMPT/mptrack/View_pat.cpp	2013-06-03 21:32:46 UTC (rev 2302)
+++ trunk/OpenMPT/mptrack/View_pat.cpp	2013-06-03 22:02:59 UTC (rev 2303)
@@ -6174,7 +6174,7 @@
 			bool addSeparator = false;
 			if (sndFile->GetNumInstruments())
 			{
-				for (UINT i = 1; i <= sndFile->GetNumInstruments() ; i++)
+				for(INSTRUMENTINDEX i = 1; i <= sndFile->GetNumInstruments() ; i++)
 				{
 					if (sndFile->Instruments[i] == NULL)
 						continue;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.