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

Cosmetics

Browse Source
This commit is contained in:
Birunthan Mohanathas 2012-09-21 13:17:18 +03:00
parent 48f06677c4
commit b6011b40ad
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Library/MeasureDiskSpace.cpp
View File

@ -74,31 +74,31 @@ void CMeasureDiskSpace::UpdateValue()
case DRIVE_UNKNOWN: case DRIVE_UNKNOWN:
case DRIVE_NO_ROOT_DIR: case DRIVE_NO_ROOT_DIR:
m_Value = DRIVETYPE_REMOVED; m_Value = DRIVETYPE_REMOVED;
m_DriveInfo = L"Removed"; m_StringValue = L"Removed";
break; break;
case DRIVE_REMOVABLE: case DRIVE_REMOVABLE:
m_Value = DRIVETYPE_REMOVABLE; m_Value = DRIVETYPE_REMOVABLE;
m_DriveInfo = L"Removable"; m_StringValue = L"Removable";
break; break;
case DRIVE_FIXED: case DRIVE_FIXED:
m_Value = DRIVETYPE_FIXED; m_Value = DRIVETYPE_FIXED;
m_DriveInfo = L"Fixed"; m_StringValue = L"Fixed";
break; break;
case DRIVE_REMOTE: case DRIVE_REMOTE:
m_Value = DRIVETYPE_NETWORK; m_Value = DRIVETYPE_NETWORK;
m_DriveInfo = L"Network"; m_StringValue = L"Network";
break; break;
case DRIVE_CDROM: case DRIVE_CDROM:
m_Value = DRIVETYPE_CDROM; m_Value = DRIVETYPE_CDROM;
m_DriveInfo = L"CDRom"; m_StringValue = L"CDRom";
break; break;
case DRIVE_RAMDISK: case DRIVE_RAMDISK:
m_Value = DRIVETYPE_RAM; m_Value = DRIVETYPE_RAM;
m_DriveInfo = L"Ram"; m_StringValue = L"Ram";
break; break;
default: default:
m_Value = DRIVETYPE_ERROR; m_Value = DRIVETYPE_ERROR;
m_DriveInfo = L"Error"; m_StringValue = L"Error";
break; break;
} }
} }
@ -150,11 +150,11 @@ void CMeasureDiskSpace::UpdateValue()
labelResult = GetVolumeInformation(drive, volumeName, MAX_PATH + 1, NULL, NULL, NULL, NULL, 0); labelResult = GetVolumeInformation(drive, volumeName, MAX_PATH + 1, NULL, NULL, NULL, NULL, 0);
} }
m_DriveInfo = (labelResult) ? volumeName : L""; m_StringValue = (labelResult) ? volumeName : L"";
} }
else if (!m_DriveInfo.empty()) else if (!m_StringValue.empty())
{ {
m_DriveInfo.clear(); m_StringValue.clear();
} }
} }
} }
@ -168,7 +168,7 @@ const WCHAR* CMeasureDiskSpace::GetStringValue(AUTOSCALE autoScale, double scale
{ {
if (m_Type || m_Label) if (m_Type || m_Label)
{ {
return CheckSubstitute(m_DriveInfo.c_str()); return CheckSubstitute(m_StringValue.c_str());
} }
return CMeasure::GetStringValue(autoScale, scale, decimals, percentual); return CMeasure::GetStringValue(autoScale, scale, decimals, percentual);
@ -191,7 +191,7 @@ void CMeasureDiskSpace::ReadOptions(CConfigParser& parser, const WCHAR* section)
m_Value = 0.0; m_Value = 0.0;
m_MaxValue = 0.0; m_MaxValue = 0.0;
m_OldTotalBytes = 0; m_OldTotalBytes = 0;
m_DriveInfo.clear(); m_StringValue.clear();
} }
else if (!CSystem::IsPathSeparator(m_Drive[m_Drive.length() - 1])) // E.g. "C:" else if (!CSystem::IsPathSeparator(m_Drive[m_Drive.length() - 1])) // E.g. "C:"
{ {

2
Library/MeasureDiskSpace.h
View File

@ -37,7 +37,7 @@ protected:
private: private:
std::wstring m_Drive; std::wstring m_Drive;
std::wstring m_DriveInfo; std::wstring m_StringValue;
bool m_Type; bool m_Type;
bool m_Total; bool m_Total;
bool m_Label; bool m_Label;