chibicitiberiu/rainmeter-studio
1
0
Fork 0
mirror of https://github.com/chibicitiberiu/rainmeter-studio.git synced 2024-02-24 04:33:31 +00:00
Code Issues Releases Wiki Activity

Code cleanup

Browse Source
This commit is contained in:
spx 2013-01-27 18:39:13 +09:00
parent 874a0e00ce
commit 654599d192
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Library/Rainmeter.cpp
View File

@ -1605,11 +1605,11 @@ std::pair<int, int> CRainmeter::GetMeterWindowIndex(const std::wstring& folderPa
const SkinFolder& skinFolder = m_SkinFolders[index]; const SkinFolder& skinFolder = m_SkinFolders[index];
const WCHAR* fileSz = file.c_str(); const WCHAR* fileSz = file.c_str();
for (int i = 0, isize = (int)skinFolder.files.size(); i < isize; ++i) for (size_t i = 0, isize = skinFolder.files.size(); i < isize; ++i)
{ {
if (_wcsicmp(skinFolder.files[i].c_str(), fileSz) == 0) if (_wcsicmp(skinFolder.files[i].c_str(), fileSz) == 0)
{ {
return std::make_pair(index, i); return std::make_pair(index, (int)i);
} }
} }
} }
@ -1619,8 +1619,6 @@ std::pair<int, int> CRainmeter::GetMeterWindowIndex(const std::wstring& folderPa
std::pair<int, int> CRainmeter::GetMeterWindowIndex(UINT menuCommand) std::pair<int, int> CRainmeter::GetMeterWindowIndex(UINT menuCommand)
{ {
std::pair<int, int> indexes;
if (menuCommand >= ID_CONFIG_FIRST && menuCommand <= ID_CONFIG_LAST) if (menuCommand >= ID_CONFIG_FIRST && menuCommand <= ID_CONFIG_LAST)
{ {
// Check which skin was selected // Check which skin was selected
@ -1630,14 +1628,12 @@ std::pair<int, int> CRainmeter::GetMeterWindowIndex(UINT menuCommand)
if (menuCommand >= skinFolder.commandBase && if (menuCommand >= skinFolder.commandBase &&
menuCommand < (skinFolder.commandBase + skinFolder.files.size())) menuCommand < (skinFolder.commandBase + skinFolder.files.size()))
{ {
indexes = std::make_pair(i, menuCommand - skinFolder.commandBase); return std::make_pair((int)i, (int)(menuCommand - skinFolder.commandBase));
return indexes;
} }
} }
} }
indexes = std::make_pair(-1, -1); // error return std::make_pair(-1, -1); // error;
return indexes;
} }
CMeterWindow* CRainmeter::GetMeterWindow(HWND hwnd) CMeterWindow* CRainmeter::GetMeterWindow(HWND hwnd)