Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-05 10:46:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

[Analyzers][CPP]Turn on C26495 and fix code (#21163)

Browse Source 
C26495: A member variable isn't initialized by a constructor or by an initializer.
Fixing occurrences with default member initialization.
This commit is contained in:
sosssego
2022-10-18 15:21:18 +01:00
committed by GitHub
parent 17b80aa0f1
commit 16c28c788d
11 changed files with 47 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/modules/fancyzones/FancyZonesLib/EditorParameters.cpp
View File

@@ -25,15 +25,15 @@ namespace JsonUtils
std::wstring monitorName;
std::wstring monitorInstanceId;
std::wstring monitorSerialNumber;
int monitorNumber;
int monitorNumber{};
std::wstring virtualDesktop;
int dpi;
int top;
int left;
int workAreaWidth;
int workAreaHeight;
int monitorWidth;
int monitorHeight;
int dpi{};
int top{};
int left{};
int workAreaWidth{};
int workAreaHeight{};
int monitorWidth{};
int monitorHeight{};
bool isSelected = false;
static json::JsonObject ToJson(const MonitorInfo& monitor)
@@ -60,8 +60,8 @@ namespace JsonUtils
struct EditorArgs
{
DWORD processId;
bool spanZonesAcrossMonitors;
DWORD processId{};
bool spanZonesAcrossMonitors{};
std::vector<MonitorInfo> monitors;
static json::JsonObject ToJson(const EditorArgs& args)

2
src/modules/fancyzones/FancyZonesLib/FancyZonesData/CustomLayouts.cpp
View File

@@ -102,7 +102,7 @@ namespace JsonUtils
struct CustomLayoutJSON
{
GUID layoutId;
GUID layoutId{};
FancyZonesDataTypes::CustomLayoutData data;
static std::optional<CustomLayoutJSON> FromJson(const json::JsonObject& json)

30
src/modules/fancyzones/FancyZonesLib/FancyZonesDataTypes.h
View File

@@ -36,8 +36,8 @@ namespace FancyZonesDataTypes
struct CanvasLayoutInfo
{
int lastWorkAreaWidth;
int lastWorkAreaHeight;
int lastWorkAreaWidth{};
int lastWorkAreaHeight{};
struct Rect
{
@@ -47,7 +47,7 @@ namespace FancyZonesDataTypes
int height;
};
std::vector<CanvasLayoutInfo::Rect> zones;
int sensitivityRadius;
int sensitivityRadius{};
};
struct GridLayoutInfo
@@ -95,29 +95,29 @@ namespace FancyZonesDataTypes
std::vector<int> m_rowsPercents;
std::vector<int> m_columnsPercents;
std::vector<std::vector<int>> m_cellChildMap;
bool m_showSpacing;
int m_spacing;
int m_sensitivityRadius;
bool m_showSpacing{};
int m_spacing{};
int m_sensitivityRadius{};
};
struct CustomLayoutData
{
std::wstring name;
CustomLayoutType type;
CustomLayoutType type{};
std::variant<CanvasLayoutInfo, GridLayoutInfo> info;
};
struct ZoneSetData
{
std::wstring uuid;
ZoneSetLayoutType type;
ZoneSetLayoutType type{};
};
struct DeviceId
{
std::wstring id;
std::wstring instanceId;
int number;
int number{};
bool isDefault() const noexcept;
std::wstring toString() const noexcept;
@@ -125,7 +125,7 @@ namespace FancyZonesDataTypes
struct MonitorId
{
HMONITOR monitor;
HMONITOR monitor{};
DeviceId deviceId;
std::wstring serialNumber;
@@ -135,7 +135,7 @@ namespace FancyZonesDataTypes
struct WorkAreaId
{
MonitorId monitorId;
GUID virtualDesktopId;
GUID virtualDesktopId{};
std::wstring toString() const noexcept;
};
@@ -152,10 +152,10 @@ namespace FancyZonesDataTypes
struct DeviceInfoData
{
ZoneSetData activeZoneSet;
bool showSpacing;
int spacing;
int zoneCount;
int sensitivityRadius;
bool showSpacing{};
int spacing{};
int zoneCount{};
int sensitivityRadius{};
};
inline bool operator==(const ZoneSetData& lhs, const ZoneSetData& rhs)

8
src/modules/fancyzones/FancyZonesLib/JsonHelpers.h
View File

@@ -13,9 +13,9 @@ namespace BackwardsCompatibility
struct DeviceIdData
{
std::wstring deviceName = L"FallbackDevice";
int width;
int height;
GUID virtualDesktopId;
int width{};
int height{};
GUID virtualDesktopId{};
std::wstring monitorId;
static std::optional<DeviceIdData> ParseDeviceId(const std::wstring& str);
@@ -77,7 +77,7 @@ namespace JSONHelpers
struct LayoutQuickKeyJSON
{
std::wstring layoutUuid;
int key;
int key{};
static std::optional<LayoutQuickKeyJSON> FromJson(const json::JsonObject& device);
};