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

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

Revision: 4828
          http://sourceforge.net/p/modplug/code/4828
Author:   manxorist
Date:     2015-03-04 18:04:26 +0000 (Wed, 04 Mar 2015)
Log Message:
-----------
[Ref] Assorted 64bit warnings fixes.

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/Moptions.cpp
    trunk/OpenMPT/mptrack/Mptrack.cpp
    trunk/OpenMPT/mptrack/TrackerSettings.cpp

Modified: trunk/OpenMPT/mptrack/Moptions.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Moptions.cpp	2015-03-04 18:02:04 UTC (rev 4827)
+++ trunk/OpenMPT/mptrack/Moptions.cpp	2015-03-04 18:04:26 UTC (rev 4828)
@@ -463,7 +463,7 @@
 	int sel = m_ComboItem.GetCurSel();
 	if (sel >= 0)
 	{
-		m_nColorItem = m_ComboItem.GetItemData(sel);
+		m_nColorItem = static_cast<uint32>(m_ComboItem.GetItemData(sel));
 		OnUpdateDialog();
 	}
 }
@@ -743,7 +743,7 @@
 {
 
 	CPropertyPage::OnInitDialog();
-	for(size_t i = 0; i < CountOf(generalOptionsList); i++)
+	for(int i = 0; i < CountOf(generalOptionsList); i++)
 	{
 		m_CheckList.AddString(generalOptionsList[i].name);
 		const int check = (TrackerSettings::Instance().m_dwPatternSetup & generalOptionsList[i].flag) != 0 ? BST_CHECKED : BST_UNCHECKED;
@@ -774,7 +774,7 @@
 	::GetDlgItemTextW(m_hWnd, IDC_OPTIONS_DIR_VSTS, szVstDir, MAX_PATH);
 	::GetDlgItemTextW(m_hWnd, IDC_OPTIONS_DIR_VSTPRESETS, szPresetDir, MAX_PATH);
 
-	for(size_t i = 0; i < CountOf(generalOptionsList); i++)
+	for(int i = 0; i < CountOf(generalOptionsList); i++)
 	{
 		const bool check = (m_CheckList.GetCheck(i) != BST_UNCHECKED);
 

Modified: trunk/OpenMPT/mptrack/Mptrack.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Mptrack.cpp	2015-03-04 18:02:04 UTC (rev 4827)
+++ trunk/OpenMPT/mptrack/Mptrack.cpp	2015-03-04 18:04:26 UTC (rev 4828)
@@ -214,7 +214,7 @@
 	if ((lpszCommand) && (*lpszCommand) && (theApp.m_pMainWnd))
 	{
 		CHAR s[_MAX_PATH], *pszCmd, *pszData;
-		int len;
+		std::size_t len;
 
 		mpt::String::CopyN(s, lpszCommand);
 		len = strlen(s) - 1;

Modified: trunk/OpenMPT/mptrack/TrackerSettings.cpp
===================================================================
--- trunk/OpenMPT/mptrack/TrackerSettings.cpp	2015-03-04 18:02:04 UTC (rev 4827)
+++ trunk/OpenMPT/mptrack/TrackerSettings.cpp	2015-03-04 18:04:26 UTC (rev 4828)
@@ -329,7 +329,7 @@
 
 	// load old and messy stuff:
 
-	PatternClipboard::SetClipboardSize(conf.Read<int32>("Pattern Editor", "NumClipboards", PatternClipboard::GetClipboardSize()));
+	PatternClipboard::SetClipboardSize(conf.Read<int32>("Pattern Editor", "NumClipboards", mpt::saturate_cast<int32>(PatternClipboard::GetClipboardSize())));
 
 	// Update
 	{
@@ -845,7 +845,7 @@
 	CMainFrame::GetMainFrame()->GetWindowPlacement(&wpl);
 	conf.Write<WINDOWPLACEMENT>("Display", "WindowPlacement", wpl);
 
-	conf.Write<uint32>("Pattern Editor", "NumClipboards", PatternClipboard::GetClipboardSize());
+	conf.Write<int32>("Pattern Editor", "NumClipboards", mpt::saturate_cast<int32>(PatternClipboard::GetClipboardSize()));
 
 	// Internet Update
 	{

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