github/msft-calculator
1
0
Fork 0
mirror of https://github.com/Microsoft/calculator.git synced 2025-08-22 06:13:14 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Conflicts

Browse source
This commit is contained in:
Cyril Garsaud 2019-03-09 19:58:24 +01:00
commit ec9a30358c
No known key found for this signature in database
GPG key ID: 4127AD82BCCF9CC3
5 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/.editorconfig Normal file
View file

@ -0,0 +1,11 @@
root = true
[*.{xaml,cpp,h}]
charset = utf-8-bom
indent_style = space
indent_size = 4
end_of_line = crlf
[*.{cpp,h}]
insert_final_newline = true
trim_trailing_whitespace = true

4
src/CalcManager/UnitConverter.cpp
View file

@ -295,8 +295,8 @@ wstring UnitConverter::Serialize()
out << std::to_wstring(m_currentHasDecimal) << delimiter << std::to_wstring(m_returnHasDecimal) << delimiter << std::to_wstring(m_switchedActive) << delimiter; out << std::to_wstring(m_currentHasDecimal) << delimiter << std::to_wstring(m_returnHasDecimal) << delimiter << std::to_wstring(m_switchedActive) << delimiter;
out << m_currentDisplay << delimiter << m_returnDisplay << delimiter << "|"; out << m_currentDisplay << delimiter << m_returnDisplay << delimiter << "|";
wstringstream categoryString(wstringstream::out); wstringstream categoryString(wstringstream::out);
wstringstream categoryToUnitString(wstringstream::out);; wstringstream categoryToUnitString(wstringstream::out);
wstringstream unitToUnitToDoubleString(wstringstream::out);; wstringstream unitToUnitToDoubleString(wstringstream::out);
for (const Category& c : m_categories) for (const Category& c : m_categories)
{ {
categoryString << CategoryToString(c, delimiter) << ","; categoryString << CategoryToString(c, delimiter) << ",";

1
src/Calculator.sln
View file

@ -9,6 +9,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CalcManager", "CalcManager\
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{3A5DF651-B8A1-45CA-9135-964A6FC7F5D1}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{3A5DF651-B8A1-45CA-9135-964A6FC7F5D1}"
ProjectSection(SolutionItems) = preProject ProjectSection(SolutionItems) = preProject
.editorconfig = .editorconfig
nuget.config = nuget.config nuget.config = nuget.config
EndProjectSection EndProjectSection
EndProject EndProject

2
src/Calculator/Views/DateCalculator.xaml.cpp
View file

@ -46,7 +46,7 @@ DateCalculator::DateCalculator()
// Set Calendar Identifier // Set Calendar Identifier
DateDiff_FromDate->CalendarIdentifier = localizationSettings.GetCalendarIdentifier(); DateDiff_FromDate->CalendarIdentifier = localizationSettings.GetCalendarIdentifier();
DateDiff_ToDate->CalendarIdentifier = localizationSettings.GetCalendarIdentifier();; DateDiff_ToDate->CalendarIdentifier = localizationSettings.GetCalendarIdentifier();
// Setting the FirstDayofWeek // Setting the FirstDayofWeek
DateDiff_FromDate->FirstDayOfWeek = localizationSettings.GetFirstDayOfWeek(); DateDiff_FromDate->FirstDayOfWeek = localizationSettings.GetFirstDayOfWeek();

4
src/CalculatorUnitTests/CopyPasteManagerTest.cpp
View file

@ -1,4 +1,4 @@
// Copyright (c) Microsoft Corporation. All rights reserved. // Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License. // Licensed under the MIT License.
#include "pch.h" #include "pch.h"
@ -34,7 +34,7 @@ namespace CalculatorUnitTests
#define ASSERT_NEGATIVE_TESTCASES(func, dataSet) \ #define ASSERT_NEGATIVE_TESTCASES(func, dataSet) \
{\ {\
int size = sizeof(dataSet)/sizeof(*dataSet);;\ int size = sizeof(dataSet)/sizeof(*dataSet);\
while(--size)\ while(--size)\
{\ {\
VERIFY_ARE_EQUAL(func(dataSet[size]), StringReference(L"NoOp"));\ VERIFY_ARE_EQUAL(func(dataSet[size]), StringReference(L"NoOp"));\