From f8029942d414726643846091177d7ff5b193f507 Mon Sep 17 00:00:00 2001 From: Stephanie Anderl <46726333+sanderl@users.noreply.github.com> Date: Fri, 8 Feb 2019 12:30:16 -0800 Subject: [PATCH 1/9] Updated the AdjustCalendarDate() to account for the transition year quirk in the Japanese calendar. --- src/CalcViewModel/Common/DateCalculator.cpp | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/CalcViewModel/Common/DateCalculator.cpp b/src/CalcViewModel/Common/DateCalculator.cpp index 6b7eba88..22cd4ff5 100644 --- a/src/CalcViewModel/Common/DateCalculator.cpp +++ b/src/CalcViewModel/Common/DateCalculator.cpp @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. +// Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. #include "pch.h" @@ -273,12 +273,24 @@ bool DateCalculationEngine::TryGetCalendarDaysInYear(_In_ DateTime date, _Out_ U // Adds/Subtracts certain value for a particular date unit DateTime DateCalculationEngine::AdjustCalendarDate(Windows::Foundation::DateTime date, DateUnit dateUnit, int difference) { + auto currentCalendarSystem = m_calendar->GetCalendarSystem(); + m_calendar->SetDateTime(date); switch (dateUnit) { case DateUnit::Year: + // In the Japanese calendar, transition years have 2 partial years. + // It is not guaranteed that adding 1 year will always add 365 days in the Japanese Calendar. + // To work around this quirk, we will change the calendar system to Gregorian before adding 1 year in the Japanese Calendar case only. + // We will then return the calendar system back to the Japanese Calendar. + if (currentCalendarSystem == L"JapaneseCalendar") + { + m_calendar->ChangeCalendarSystem(L"GregorianCalendar"); + } + m_calendar->AddYears(difference); + m_calendar->ChangeCalendarSystem(currentCalendarSystem); break; case DateUnit::Month: m_calendar->AddMonths(difference); From 1bd4f1870c120d758662219ee6f170360b2fbcd0 Mon Sep 17 00:00:00 2001 From: Stephanie Anderl <46726333+sanderl@users.noreply.github.com> Date: Fri, 8 Feb 2019 15:33:00 -0800 Subject: [PATCH 2/9] Updated calendar strings to use the CalendarIdentifiers object --- src/CalcViewModel/Common/DateCalculator.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/CalcViewModel/Common/DateCalculator.cpp b/src/CalcViewModel/Common/DateCalculator.cpp index 22cd4ff5..3e1ce9b3 100644 --- a/src/CalcViewModel/Common/DateCalculator.cpp +++ b/src/CalcViewModel/Common/DateCalculator.cpp @@ -284,9 +284,9 @@ DateTime DateCalculationEngine::AdjustCalendarDate(Windows::Foundation::DateTime // It is not guaranteed that adding 1 year will always add 365 days in the Japanese Calendar. // To work around this quirk, we will change the calendar system to Gregorian before adding 1 year in the Japanese Calendar case only. // We will then return the calendar system back to the Japanese Calendar. - if (currentCalendarSystem == L"JapaneseCalendar") + if (currentCalendarSystem == CalendarIdentifiers::Japanese) { - m_calendar->ChangeCalendarSystem(L"GregorianCalendar"); + m_calendar->ChangeCalendarSystem(CalendarIdentifiers::Gregorian); } m_calendar->AddYears(difference); From 2fc8196104ff45dfaf5cd3b04c545a77d69fae5f Mon Sep 17 00:00:00 2001 From: Stephanie Anderl <46726333+sanderl@users.noreply.github.com> Date: Fri, 8 Feb 2019 15:42:28 -0800 Subject: [PATCH 3/9] Moved all the Japanese Era logic inside the Year case of the switch statement --- src/CalcViewModel/Common/DateCalculator.cpp | 38 +++++++++++---------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/src/CalcViewModel/Common/DateCalculator.cpp b/src/CalcViewModel/Common/DateCalculator.cpp index 3e1ce9b3..ac0dbbe9 100644 --- a/src/CalcViewModel/Common/DateCalculator.cpp +++ b/src/CalcViewModel/Common/DateCalculator.cpp @@ -273,31 +273,33 @@ bool DateCalculationEngine::TryGetCalendarDaysInYear(_In_ DateTime date, _Out_ U // Adds/Subtracts certain value for a particular date unit DateTime DateCalculationEngine::AdjustCalendarDate(Windows::Foundation::DateTime date, DateUnit dateUnit, int difference) { - auto currentCalendarSystem = m_calendar->GetCalendarSystem(); m_calendar->SetDateTime(date); switch (dateUnit) { - case DateUnit::Year: - // In the Japanese calendar, transition years have 2 partial years. - // It is not guaranteed that adding 1 year will always add 365 days in the Japanese Calendar. - // To work around this quirk, we will change the calendar system to Gregorian before adding 1 year in the Japanese Calendar case only. - // We will then return the calendar system back to the Japanese Calendar. - if (currentCalendarSystem == CalendarIdentifiers::Japanese) + case DateUnit::Year: { - m_calendar->ChangeCalendarSystem(CalendarIdentifiers::Gregorian); - } + // In the Japanese calendar, transition years have 2 partial years. + // It is not guaranteed that adding 1 year will always add 365 days in the Japanese Calendar. + // To work around this quirk, we will change the calendar system to Gregorian before adding 1 year in the Japanese Calendar case only. + // We will then return the calendar system back to the Japanese Calendar. + auto currentCalendarSystem = m_calendar->GetCalendarSystem(); + if (currentCalendarSystem == CalendarIdentifiers::Japanese) + { + m_calendar->ChangeCalendarSystem(CalendarIdentifiers::Gregorian); + } - m_calendar->AddYears(difference); - m_calendar->ChangeCalendarSystem(currentCalendarSystem); - break; - case DateUnit::Month: - m_calendar->AddMonths(difference); - break; - case DateUnit::Week: - m_calendar->AddWeeks(difference); - break; + m_calendar->AddYears(difference); + m_calendar->ChangeCalendarSystem(currentCalendarSystem); + break; + } + case DateUnit::Month: + m_calendar->AddMonths(difference); + break; + case DateUnit::Week: + m_calendar->AddWeeks(difference); + break; } return m_calendar->GetDateTime(); From f553203e115eb2d252adde1dc769fc6dbc2cbde7 Mon Sep 17 00:00:00 2001 From: Stephanie Anderl <46726333+sanderl@users.noreply.github.com> Date: Mon, 11 Feb 2019 12:00:33 -0800 Subject: [PATCH 4/9] Created pull_request_template.md --- .../PULL_REQUEST_TEMPLATE/pull_request_template.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 .github/PULL_REQUEST_TEMPLATE/pull_request_template.md diff --git a/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md b/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md new file mode 100644 index 00000000..fe3df896 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md @@ -0,0 +1,14 @@ +# Fixes #. + +## Description of the changes in this pull request: +- +- +- + +## How this pull request was validated: +### (i.e. manual/ad-hoc testing, automated testing, new automated tests added) +- +- +- + +@Microsoft/calculator-write From 531a8a1b7bd169bb2fb62a929a4a74b457f49172 Mon Sep 17 00:00:00 2001 From: Pepe Rivera Date: Tue, 12 Feb 2019 13:50:09 -0800 Subject: [PATCH 5/9] Use TryResizeView to resize calc on first launch --- src/Calculator/App.xaml.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Calculator/App.xaml.cpp b/src/Calculator/App.xaml.cpp index 90e504da..74cf2a9d 100644 --- a/src/Calculator/App.xaml.cpp +++ b/src/Calculator/App.xaml.cpp @@ -255,9 +255,9 @@ void App::OnAppLaunch(IActivatedEventArgs^ args, String^ argument) // For very first launch, set the size of the calc as size of the default standard mode if (!localSettings->Values->HasKey(L"VeryFirstLaunch")) { - appView->PreferredLaunchViewSize = minWindowSize; - appView->PreferredLaunchWindowingMode = ApplicationViewWindowingMode::PreferredLaunchViewSize; localSettings->Values->Insert(ref new String(L"VeryFirstLaunch"), false); + appView->SetPreferredMinSize(minWindowSize); + appView->TryResizeView(minWindowSize); } else { From 2ab114a71f90e9415864bf7bf870a352fbd74e6f Mon Sep 17 00:00:00 2001 From: Matt Cooley Date: Wed, 13 Feb 2019 09:44:02 -0800 Subject: [PATCH 6/9] Update WinUI to 2.0.181018004 (#18) Update the Microsoft.UI.Xaml NuGet package to a new version. The ARM64 framework package in 2.0.181018003.1 had entries missing from its manifest, so the classes in the package couldn't be activated. --- src/Calculator/Calculator.vcxproj | 4 ++-- src/Calculator/packages.config | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Calculator/Calculator.vcxproj b/src/Calculator/Calculator.vcxproj index 1086d0c2..7dd449e1 100644 --- a/src/Calculator/Calculator.vcxproj +++ b/src/Calculator/Calculator.vcxproj @@ -840,7 +840,7 @@ - + @@ -848,6 +848,6 @@ - + \ No newline at end of file diff --git a/src/Calculator/packages.config b/src/Calculator/packages.config index 307d0240..3716522e 100644 --- a/src/Calculator/packages.config +++ b/src/Calculator/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file From b0fe92a94e4e26093bf6d89d066961c4886b0d7f Mon Sep 17 00:00:00 2001 From: Stephanie Anderl <46726333+sanderl@users.noreply.github.com> Date: Wed, 13 Feb 2019 10:29:12 -0800 Subject: [PATCH 7/9] updated @mentions to Microsoft/calculator-team and updated the how validated section to include a link to contributing.md --- .github/PULL_REQUEST_TEMPLATE/pull_request_template.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md b/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md index fe3df896..82f1599f 100644 --- a/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md +++ b/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md @@ -6,9 +6,10 @@ - ## How this pull request was validated: -### (i.e. manual/ad-hoc testing, automated testing, new automated tests added) +### Review [Contributing.md](../Contributing.md) and ensure all contributing requirements are met. +### Specify how you tested your changes (i.e. manual/ad-hoc testing, automated testing, new automated tests added) - - - -@Microsoft/calculator-write +@Microsoft/calculator-team From 56fe16349d80d1df5d24765cef761c18585fa9a1 Mon Sep 17 00:00:00 2001 From: Howard Wolosky Date: Thu, 14 Feb 2019 13:57:22 -0800 Subject: [PATCH 8/9] README updates (#17) Adding the following sections: * Telemetry notice * Reporting security issues * License reference * Team contact email address --- README.md | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/README.md b/README.md index 15702437..20f136fa 100644 --- a/README.md +++ b/README.md @@ -41,3 +41,25 @@ Want to contribute? The team encourages community feedback and contributions. Pl If Calculator is not working properly, please file a report in the [Feedback Hub](https://insider.windows.com/en-us/fb/?contextid=130). We also welcome [issues submitted on GitHub](https://github.com/Microsoft/calculator/issues). + +# Data / Telemetry +This project collects usage data and sends it to Microsoft to help improve our products and services. +Read our [privacy statement](http://go.microsoft.com/fwlink/?LinkId=521839) to learn more. +Telemetry is disabled in development builds by default, and can be enabled with the `SEND_TELEMETRY` +build flag. + +# Reporting Security Issues +Security issues and bugs should be reported privately, via email, to the +Microsoft Security Response Center (MSRC) at <[secure@microsoft.com](mailto:secure@microsoft.com)>. +You should receive a response within 24 hours. If for some reason you do not, please follow up via +email to ensure we received your original message. Further information, including the +[MSRC PGP](https://technet.microsoft.com/en-us/security/dn606155) key, can be found in the +[Security TechCenter](https://technet.microsoft.com/en-us/security/default). + +# License +Copyright (c) Microsoft Corporation. All rights reserved. + +Licensed under the [MIT License](.\LICENSE). + +# Contact +Questions that can't be answered on GitHub? Reach out to the team: <[calculator@microsoft.com](mailto:calculator@microsoft.com)> From f210290ddcab10c50fbe98c14350bfa4038376a2 Mon Sep 17 00:00:00 2001 From: Daniel Belcher Date: Wed, 13 Feb 2019 17:30:03 -0800 Subject: [PATCH 9/9] - Avoid referencing project headers from precompiled headers. Before this change, the pchs for CalcViewModel and Calculator project referenced project headers. If those project headers (or any of their dependencies) were to change, then the pch would be recompiled, slowing local build times. By removing references to project headers, the pch will be compiled once and is resilient to changes in the project. Now that project headers are explicit about their dependencies, when there is a change to a project header only the translation units referencing the modified header will need to be rebuilt. - Manually tested by ensuring Calculator project builds locally. @Microsoft/calculator-team --- src/CalcManager/CalculatorManager.h | 5 ++++- src/CalcManager/Header Files/CalcEngine.h | 6 +++--- src/CalcManager/Header Files/ICalcDisplay.h | 5 ++++- src/CalcManager/Header Files/scimath.h | 2 +- src/CalcViewModel/ApplicationViewModel.cpp | 5 +++-- .../Common/CalculatorButtonPressedEventArgs.h | 5 ++++- .../Common/CalculatorButtonUser.h | 4 +++- src/CalcViewModel/Common/CalculatorDisplay.h | 4 +++- src/CalcViewModel/Common/CopyPasteManager.cpp | 3 ++- src/CalcViewModel/Common/CopyPasteManager.h | 4 +++- .../Common/DisplayExpressionToken.h | 4 +++- .../Common/EngineResourceProvider.h | 2 ++ .../Common/ExpressionCommandDeserializer.h | 4 +++- .../Common/ExpressionCommandSerializer.h | 4 +++- .../Common/KeyboardShortcutManager.h | 5 ++++- src/CalcViewModel/Common/LocalizationService.h | 4 +++- src/CalcViewModel/Common/NavCategory.h | 13 ++++++++----- src/CalcViewModel/Common/TraceLogger.cpp | 3 ++- src/CalcViewModel/Common/TraceLogger.h | 4 +++- src/CalcViewModel/Common/Utils.h | 6 +++++- .../DataLoaders/CurrencyDataLoader.cpp | 5 +++-- .../DataLoaders/CurrencyDataLoader.h | 3 ++- .../DataLoaders/UnitConverterDataLoader.h | 5 ++++- src/CalcViewModel/DateCalculatorViewModel.cpp | 1 + src/CalcViewModel/DateCalculatorViewModel.h | 5 +++-- src/CalcViewModel/HistoryItemViewModel.h | 5 ++++- src/CalcViewModel/HistoryViewModel.cpp | 2 +- src/CalcViewModel/HistoryViewModel.h | 9 ++++++--- src/CalcViewModel/MemoryItemViewModel.h | 4 +++- .../StandardCalculatorViewModel.cpp | 1 + .../StandardCalculatorViewModel.h | 5 +++-- src/CalcViewModel/UnitConverterViewModel.cpp | 4 +++- src/CalcViewModel/UnitConverterViewModel.h | 12 ++++++++---- src/CalcViewModel/pch.h | 18 +----------------- src/Calculator/AboutFlyout.xaml.cpp | 9 +++++---- src/Calculator/App.xaml.cpp | 11 ++++++----- src/Calculator/Controls/CalculationResult.h | 4 +++- src/Calculator/Controls/CalculatorButton.h | 5 ++++- src/Calculator/Controls/FlipButtons.h | 5 ++++- src/Calculator/Controls/OverflowTextBlock.h | 4 +++- .../Converters/RadixToStringConverter.cpp | 8 ++++---- src/Calculator/Views/Calculator.xaml.cpp | 9 +++++---- .../CalculatorProgrammerBitFlipPanel.xaml.cpp | 5 +++-- .../CalculatorProgrammerDisplayPanel.xaml.cpp | 3 ++- .../CalculatorProgrammerOperators.xaml.cpp | 7 ++++--- .../CalculatorScientificAngleButtons.xaml.cpp | 5 +++-- src/Calculator/Views/DateCalculator.xaml.cpp | 7 ++++--- src/Calculator/Views/MainPage.xaml.cpp | 15 ++++++++------- .../Views/StateTriggers/AspectRatioTrigger.h | 4 +++- src/Calculator/WindowFrameService.cpp | 3 ++- src/Calculator/pch.h | 18 +----------------- 51 files changed, 173 insertions(+), 120 deletions(-) diff --git a/src/CalcManager/CalculatorManager.h b/src/CalcManager/CalculatorManager.h index a0efffaf..f66664e8 100644 --- a/src/CalcManager/CalculatorManager.h +++ b/src/CalcManager/CalculatorManager.h @@ -2,8 +2,11 @@ // Licensed under the MIT License. #pragma once + #include "CalculatorHistory.h" -#include "Header Files\Rational.h" +#include "Header Files/CalcEngine.h" +#include "Header Files/Rational.h" +#include "Header Files/ICalcDisplay.h" namespace CalculationManager { diff --git a/src/CalcManager/Header Files/CalcEngine.h b/src/CalcManager/Header Files/CalcEngine.h index 7c42b396..72e21ac3 100644 --- a/src/CalcManager/Header Files/CalcEngine.h +++ b/src/CalcManager/Header Files/CalcEngine.h @@ -17,9 +17,9 @@ #include "scimath.h" #include "CCommand.h" #include "EngineStrings.h" -#include "Command.h" -#include "CalculatorVector.h" -#include "ExpressionCommand.h" +#include "../Command.h" +#include "../CalculatorVector.h" +#include "../ExpressionCommand.h" #include "History.h" // for History Collector #include "CalcInput.h" #include "ICalcDisplay.h" diff --git a/src/CalcManager/Header Files/ICalcDisplay.h b/src/CalcManager/Header Files/ICalcDisplay.h index cc420a4f..abafbc3c 100644 --- a/src/CalcManager/Header Files/ICalcDisplay.h +++ b/src/CalcManager/Header Files/ICalcDisplay.h @@ -1,8 +1,11 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. +// Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. #pragma once +#include "../CalculatorVector.h" +#include "../ExpressionCommandInterface.h" + // Callback interface to be implemented by the clients of CCalcEngine class ICalcDisplay { public: diff --git a/src/CalcManager/Header Files/scimath.h b/src/CalcManager/Header Files/scimath.h index 300e36bd..673b0500 100644 --- a/src/CalcManager/Header Files/scimath.h +++ b/src/CalcManager/Header Files/scimath.h @@ -22,7 +22,7 @@ // // RETAIL version of NUMOBJ math that uses Infinite Precision // -#include "Ratpack/ratpak.h" +#include "../Ratpack/ratpak.h" // // Unary functions diff --git a/src/CalcViewModel/ApplicationViewModel.cpp b/src/CalcViewModel/ApplicationViewModel.cpp index 9d11419d..9c1aa386 100644 --- a/src/CalcViewModel/ApplicationViewModel.cpp +++ b/src/CalcViewModel/ApplicationViewModel.cpp @@ -1,11 +1,12 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. +// Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. #include "pch.h" #include "ApplicationViewModel.h" +#include "Common\TraceLogger.h" +#include "Common\AppResourceProvider.h" #include "StandardCalculatorViewModel.h" #include "DateCalculatorViewModel.h" -#include "Common\AppResourceProvider.h" #include "DataLoaders\CurrencyHttpClient.h" #include "DataLoaders\CurrencyDataLoader.h" #include "DataLoaders\UnitConverterDataLoader.h" diff --git a/src/CalcViewModel/Common/CalculatorButtonPressedEventArgs.h b/src/CalcViewModel/Common/CalculatorButtonPressedEventArgs.h index b197479e..69f0fee4 100644 --- a/src/CalcViewModel/Common/CalculatorButtonPressedEventArgs.h +++ b/src/CalcViewModel/Common/CalculatorButtonPressedEventArgs.h @@ -1,8 +1,11 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. +// Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. #pragma once +#include "CalculatorButtonUser.h" +#include "Utils.h" + namespace CalculatorApp { namespace Common diff --git a/src/CalcViewModel/Common/CalculatorButtonUser.h b/src/CalcViewModel/Common/CalculatorButtonUser.h index 75b2c3f6..cd602c69 100644 --- a/src/CalcViewModel/Common/CalculatorButtonUser.h +++ b/src/CalcViewModel/Common/CalculatorButtonUser.h @@ -1,8 +1,10 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. +// Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. #pragma once +#include "CalcManager/Command.h" + namespace CalculatorApp { namespace CM = CalculationManager; diff --git a/src/CalcViewModel/Common/CalculatorDisplay.h b/src/CalcViewModel/Common/CalculatorDisplay.h index 39b5a9c7..692af37e 100644 --- a/src/CalcViewModel/Common/CalculatorDisplay.h +++ b/src/CalcViewModel/Common/CalculatorDisplay.h @@ -1,8 +1,10 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. +// Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. #pragma once +#include "CalcManager/Header Files/ICalcDisplay.h" + namespace CalculatorApp { // Callback interface to be implemented by the CalculatorManager diff --git a/src/CalcViewModel/Common/CopyPasteManager.cpp b/src/CalcViewModel/Common/CopyPasteManager.cpp index 0695ec5d..31e36d4e 100644 --- a/src/CalcViewModel/Common/CopyPasteManager.cpp +++ b/src/CalcViewModel/Common/CopyPasteManager.cpp @@ -1,8 +1,9 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. +// Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. #include "pch.h" #include "CopyPasteManager.h" +#include "Common\TraceLogger.h" #include "Common\LocalizationSettings.h" using namespace std; diff --git a/src/CalcViewModel/Common/CopyPasteManager.h b/src/CalcViewModel/Common/CopyPasteManager.h index 24caa812..1da4af4e 100644 --- a/src/CalcViewModel/Common/CopyPasteManager.h +++ b/src/CalcViewModel/Common/CopyPasteManager.h @@ -1,8 +1,10 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. +// Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. #pragma once + #include "AppResourceProvider.h" +#include "NavCategory.h" namespace CalculatorUnitTests { diff --git a/src/CalcViewModel/Common/DisplayExpressionToken.h b/src/CalcViewModel/Common/DisplayExpressionToken.h index ea107626..7ba811c5 100644 --- a/src/CalcViewModel/Common/DisplayExpressionToken.h +++ b/src/CalcViewModel/Common/DisplayExpressionToken.h @@ -1,8 +1,10 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. +// Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. #pragma once +#include "Utils.h" + namespace CalculatorApp::Common { public enum class TokenType diff --git a/src/CalcViewModel/Common/EngineResourceProvider.h b/src/CalcViewModel/Common/EngineResourceProvider.h index b7d735dd..1bcb93f5 100644 --- a/src/CalcViewModel/Common/EngineResourceProvider.h +++ b/src/CalcViewModel/Common/EngineResourceProvider.h @@ -3,6 +3,8 @@ #pragma once +#include "CalcManager\CalculatorResource.h" + namespace CalculatorApp { class EngineResourceProvider : public CalculationManager::IResourceProvider diff --git a/src/CalcViewModel/Common/ExpressionCommandDeserializer.h b/src/CalcViewModel/Common/ExpressionCommandDeserializer.h index 988017bf..d48f7e29 100644 --- a/src/CalcViewModel/Common/ExpressionCommandDeserializer.h +++ b/src/CalcViewModel/Common/ExpressionCommandDeserializer.h @@ -1,8 +1,10 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. +// Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. #pragma once +#include "CalcManager/ExpressionCommand.h" + namespace CalculatorApp { namespace Common diff --git a/src/CalcViewModel/Common/ExpressionCommandSerializer.h b/src/CalcViewModel/Common/ExpressionCommandSerializer.h index 344a4f65..36203cb7 100644 --- a/src/CalcViewModel/Common/ExpressionCommandSerializer.h +++ b/src/CalcViewModel/Common/ExpressionCommandSerializer.h @@ -1,8 +1,10 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. +// Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. #pragma once +#include "CalcManager/ExpressionCommand.h" + namespace CalculatorApp { namespace Common diff --git a/src/CalcViewModel/Common/KeyboardShortcutManager.h b/src/CalcViewModel/Common/KeyboardShortcutManager.h index 28c3b617..d747655b 100644 --- a/src/CalcViewModel/Common/KeyboardShortcutManager.h +++ b/src/CalcViewModel/Common/KeyboardShortcutManager.h @@ -1,8 +1,11 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. +// Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. #pragma once +#include "Utils.h" +#include "MyVirtualKey.h" + namespace CalculatorApp { namespace Common diff --git a/src/CalcViewModel/Common/LocalizationService.h b/src/CalcViewModel/Common/LocalizationService.h index 1afdbb9b..7560682d 100644 --- a/src/CalcViewModel/Common/LocalizationService.h +++ b/src/CalcViewModel/Common/LocalizationService.h @@ -1,8 +1,10 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. +// Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. #pragma once +#include "Utils.h" + namespace CalculatorApp { namespace Common { namespace LocalizationServiceProperties diff --git a/src/CalcViewModel/Common/NavCategory.h b/src/CalcViewModel/Common/NavCategory.h index b8f544fb..a463833c 100644 --- a/src/CalcViewModel/Common/NavCategory.h +++ b/src/CalcViewModel/Common/NavCategory.h @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. +// Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. /* The NavCategory group of classes and enumerations is intended to serve @@ -14,6 +14,9 @@ #pragma once +#include "Utils.h" +#include "MyVirtualKey.h" + namespace CalculatorApp { namespace Common @@ -59,7 +62,7 @@ namespace CalculatorApp wchar_t const * nameKey, wchar_t const * glyph, CategoryGroupType group, - CalculatorApp::Common::MyVirtualKey vKey, + MyVirtualKey vKey, bool categorySupportsNegative) : viewMode(mode), @@ -78,7 +81,7 @@ namespace CalculatorApp const wchar_t * const nameResourceKey; const wchar_t * const glyph; const CategoryGroupType groupType; - const CalculatorApp::Common::MyVirtualKey virtualKey; + const MyVirtualKey virtualKey; const bool supportsNegative; }; @@ -173,7 +176,7 @@ namespace CalculatorApp static int GetIndexInGroup(ViewMode mode, CategoryGroupType type); static int GetPosition(ViewMode mode); - static ViewMode GetViewModeForVirtualKey(CalculatorApp::Common::MyVirtualKey virtualKey); + static ViewMode GetViewModeForVirtualKey(MyVirtualKey virtualKey); internal: NavCategory(Platform::String^ name, Platform::String^ automationName, Platform::String^ glyph, Platform::String^ accessKey, Platform::String^ mode, ViewMode viewMode, bool supportsNegative) : @@ -188,7 +191,7 @@ namespace CalculatorApp m_position = NavCategory::GetPosition(m_viewMode); } - static std::vector GetCategoryAcceleratorKeys(); + static std::vector GetCategoryAcceleratorKeys(); private: static bool IsModeInCategoryGroup(ViewMode mode, CategoryGroupType groupType); diff --git a/src/CalcViewModel/Common/TraceLogger.cpp b/src/CalcViewModel/Common/TraceLogger.cpp index 7f1e5a2f..4be72abb 100644 --- a/src/CalcViewModel/Common/TraceLogger.cpp +++ b/src/CalcViewModel/Common/TraceLogger.cpp @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. +// Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. #pragma once @@ -6,6 +6,7 @@ #include "pch.h" #include "TraceLogger.h" #include "NetworkManager.h" +#include "CalculatorButtonUser.h" using namespace CalculatorApp; using namespace CalculatorApp::Common; diff --git a/src/CalcViewModel/Common/TraceLogger.h b/src/CalcViewModel/Common/TraceLogger.h index c6bfc3dd..c995b985 100644 --- a/src/CalcViewModel/Common/TraceLogger.h +++ b/src/CalcViewModel/Common/TraceLogger.h @@ -1,9 +1,11 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. +// Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. #pragma once +#include "CalcManager/Command.h" #include "TraceActivity.h" +#include "NavCategory.h" static const int maxFunctionSize = (int)CalculationManager::Command::CommandBINEDITEND; diff --git a/src/CalcViewModel/Common/Utils.h b/src/CalcViewModel/Common/Utils.h index b666b6bb..949ba0f0 100644 --- a/src/CalcViewModel/Common/Utils.h +++ b/src/CalcViewModel/Common/Utils.h @@ -1,8 +1,12 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. +// Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. #pragma once +#include "CalcManager/CalculatorVector.h" +#include "CalcManager/ExpressionCommandInterface.h" +#include "DelegateCommand.h" + // Utility macros to make Models easier to write // generates a member variable called m_ #define PROPERTY_R(t, n)\ diff --git a/src/CalcViewModel/DataLoaders/CurrencyDataLoader.cpp b/src/CalcViewModel/DataLoaders/CurrencyDataLoader.cpp index aea37617..434cc6f4 100644 --- a/src/CalcViewModel/DataLoaders/CurrencyDataLoader.cpp +++ b/src/CalcViewModel/DataLoaders/CurrencyDataLoader.cpp @@ -1,13 +1,14 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. +// Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. #include "pch.h" #include "CurrencyDataLoader.h" -#include "UnitConverterDataConstants.h" #include "Common\AppResourceProvider.h" #include "Common\LocalizationStringUtil.h" #include "Common\LocalizationService.h" #include "Common\LocalizationSettings.h" +#include "Common\TraceLogger.h" +#include "UnitConverterDataConstants.h" using namespace CalculatorApp; using namespace CalculatorApp::Common; diff --git a/src/CalcViewModel/DataLoaders/CurrencyDataLoader.h b/src/CalcViewModel/DataLoaders/CurrencyDataLoader.h index e7e97382..917fa21d 100644 --- a/src/CalcViewModel/DataLoaders/CurrencyDataLoader.h +++ b/src/CalcViewModel/DataLoaders/CurrencyDataLoader.h @@ -1,8 +1,9 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. +// Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. #pragma once +#include "CalcManager\UnitConverter.h" #include "Common\NetworkManager.h" #include "ICurrencyHttpClient.h" diff --git a/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.h b/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.h index 07f2beb8..b48b8e09 100644 --- a/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.h +++ b/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.h @@ -1,8 +1,11 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. +// Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. #pragma once +#include "CalcManager\UnitConverter.h" +#include "Common/NavCategory.h" + namespace CalculatorApp { namespace ViewModel diff --git a/src/CalcViewModel/DateCalculatorViewModel.cpp b/src/CalcViewModel/DateCalculatorViewModel.cpp index 764db235..e905d763 100644 --- a/src/CalcViewModel/DateCalculatorViewModel.cpp +++ b/src/CalcViewModel/DateCalculatorViewModel.cpp @@ -3,6 +3,7 @@ #include "pch.h" #include "DateCalculatorViewModel.h" +#include "Common\TraceLogger.h" #include "Common\LocalizationStringUtil.h" #include "Common\LocalizationService.h" #include "Common\LocalizationSettings.h" diff --git a/src/CalcViewModel/DateCalculatorViewModel.h b/src/CalcViewModel/DateCalculatorViewModel.h index de1dc7e3..1dffe518 100644 --- a/src/CalcViewModel/DateCalculatorViewModel.h +++ b/src/CalcViewModel/DateCalculatorViewModel.h @@ -1,9 +1,10 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. +// Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. #pragma once -#include "Common\DateCalculator.h" +#include "Common/Utils.h" +#include "Common/DateCalculator.h" const int c_maxOffsetValue = 999; diff --git a/src/CalcViewModel/HistoryItemViewModel.h b/src/CalcViewModel/HistoryItemViewModel.h index 25cb4abb..ab22f5da 100644 --- a/src/CalcViewModel/HistoryItemViewModel.h +++ b/src/CalcViewModel/HistoryItemViewModel.h @@ -1,8 +1,11 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. +// Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. #pragma once +#include "CalcManager/CalculatorVector.h" +#include "CalcManager/ExpressionCommandInterface.h" + namespace CalculatorApp { namespace ViewModel diff --git a/src/CalcViewModel/HistoryViewModel.cpp b/src/CalcViewModel/HistoryViewModel.cpp index a0b5d90d..822aab03 100644 --- a/src/CalcViewModel/HistoryViewModel.cpp +++ b/src/CalcViewModel/HistoryViewModel.cpp @@ -3,6 +3,7 @@ #include "pch.h" #include "HistoryViewModel.h" +#include "Common\TraceLogger.h" #include "Common\LocalizationStringUtil.h" #include "Common\LocalizationSettings.h" @@ -17,7 +18,6 @@ using namespace Windows::Storage; using namespace Windows::Storage::Streams; using namespace Windows::Security::Cryptography; using namespace Windows::Foundation::Collections; -using CalculatorApp::TraceLogger; static StringReference HistoryVectorLengthKey{ L"HistoryVectorLength" }; diff --git a/src/CalcViewModel/HistoryViewModel.h b/src/CalcViewModel/HistoryViewModel.h index eb5d6544..6913fa83 100644 --- a/src/CalcViewModel/HistoryViewModel.h +++ b/src/CalcViewModel/HistoryViewModel.h @@ -1,9 +1,12 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. +// Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. #pragma once -#include "Common\Automation\NarratorAnnouncement.h" -#include "Common\CalculatorDisplay.h" + +#include "CalcManager/CalculatorManager.h" +#include "Common/Automation/NarratorAnnouncement.h" +#include "Common/CalculatorDisplay.h" +#include "Common/NavCategory.h" #include "HistoryItemViewModel.h" namespace CalculatorApp diff --git a/src/CalcViewModel/MemoryItemViewModel.h b/src/CalcViewModel/MemoryItemViewModel.h index 1b7b6332..948053e6 100644 --- a/src/CalcViewModel/MemoryItemViewModel.h +++ b/src/CalcViewModel/MemoryItemViewModel.h @@ -1,8 +1,10 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. +// Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. #pragma once +#include "Common/Utils.h" + namespace CalculatorApp { namespace ViewModel diff --git a/src/CalcViewModel/StandardCalculatorViewModel.cpp b/src/CalcViewModel/StandardCalculatorViewModel.cpp index 19409f39..12d74eab 100644 --- a/src/CalcViewModel/StandardCalculatorViewModel.cpp +++ b/src/CalcViewModel/StandardCalculatorViewModel.cpp @@ -7,6 +7,7 @@ #include "Common\LocalizationStringUtil.h" #include "Common\LocalizationSettings.h" #include "Common\CopyPasteManager.h" +#include "Common\TraceLogger.h" using namespace CalculatorApp; using namespace CalculatorApp::Common; diff --git a/src/CalcViewModel/StandardCalculatorViewModel.h b/src/CalcViewModel/StandardCalculatorViewModel.h index df195713..1a95a232 100644 --- a/src/CalcViewModel/StandardCalculatorViewModel.h +++ b/src/CalcViewModel/StandardCalculatorViewModel.h @@ -1,13 +1,14 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. +// Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. #pragma once #include "Common\Automation\NarratorAnnouncement.h" #include "Common\DisplayExpressionToken.h" #include "Common\CalculatorDisplay.h" +#include "Common\EngineResourceProvider.h" +#include "Common\CalculatorButtonUser.h" #include "HistoryViewModel.h" #include "MemoryItemViewModel.h" -#include "Common\EngineResourceProvider.h" namespace CalculatorFunctionalTests { diff --git a/src/CalcViewModel/UnitConverterViewModel.cpp b/src/CalcViewModel/UnitConverterViewModel.cpp index 9fef2303..93605309 100644 --- a/src/CalcViewModel/UnitConverterViewModel.cpp +++ b/src/CalcViewModel/UnitConverterViewModel.cpp @@ -1,13 +1,15 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. +// Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. #include "pch.h" #include "UnitConverterViewModel.h" +#include "CalcManager/Header Files/EngineStrings.h" #include "Common\CalculatorButtonPressedEventArgs.h" #include "Common\CopyPasteManager.h" #include "Common\LocalizationStringUtil.h" #include "Common\LocalizationService.h" #include "Common\LocalizationSettings.h" +#include "Common\TraceLogger.h" #include "DataLoaders\CurrencyHttpClient.h" #include "DataLoaders\CurrencyDataLoader.h" #include "DataLoaders\UnitConverterDataLoader.h" diff --git a/src/CalcViewModel/UnitConverterViewModel.h b/src/CalcViewModel/UnitConverterViewModel.h index 2405c7f1..3b0987de 100644 --- a/src/CalcViewModel/UnitConverterViewModel.h +++ b/src/CalcViewModel/UnitConverterViewModel.h @@ -1,11 +1,15 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. +// Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. #pragma once -#include "Common\NetworkManager.h" -#include "Common\Automation\NarratorAnnouncement.h" -#include "Common\ConversionResultTaskHelper.h" +#include "CalcManager/UnitConverter.h" +#include "Common/Utils.h" +#include "Common/NetworkManager.h" +#include "Common/Automation/NarratorAnnouncement.h" +#include "Common/ConversionResultTaskHelper.h" +#include "Common/CalculatorButtonUser.h" +#include "Common/NavCategory.h" namespace CalculatorApp { diff --git a/src/CalcViewModel/pch.h b/src/CalcViewModel/pch.h index 33dba54a..01a40fad 100644 --- a/src/CalcViewModel/pch.h +++ b/src/CalcViewModel/pch.h @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. +// Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. #pragma once @@ -43,19 +43,3 @@ namespace StandardPeers = Windows::UI::Xaml::Automation::Peers; namespace CalculatorApp::Common::Automation {} namespace CustomPeers = CalculatorApp::Common::Automation; - -// CalcManager Headers -#include "CalcManager\CalculatorVector.h" -#include "CalcManager\ExpressionCommand.h" -#include "CalcManager\CalculatorResource.h" -#include "CalcManager\CalculatorManager.h" -#include "CalcManager\UnitConverter.h" - -// Project Headers -#include "Common\DelegateCommand.h" -#include "Common\Utils.h" -#include "Common\MyVirtualKey.h" -#include "Common\NavCategory.h" -#include "Common\TraceLogger.h" -#include "Common\CalculatorButtonUser.h" - diff --git a/src/Calculator/AboutFlyout.xaml.cpp b/src/Calculator/AboutFlyout.xaml.cpp index 7c5c0066..e645252a 100644 --- a/src/Calculator/AboutFlyout.xaml.cpp +++ b/src/Calculator/AboutFlyout.xaml.cpp @@ -1,11 +1,12 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. +// Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. #include "pch.h" #include "AboutFlyout.xaml.h" -#include "CalcViewModel\Common\AppResourceProvider.h" -#include "CalcViewModel\Common\LocalizationService.h" -#include "CalcViewModel\Common\LocalizationStringUtil.h" +#include "CalcViewModel/Common/AppResourceProvider.h" +#include "CalcViewModel/Common/LocalizationService.h" +#include "CalcViewModel/Common/LocalizationStringUtil.h" +#include "CalcViewModel/Common/TraceLogger.h" using namespace CalculatorApp; using namespace CalculatorApp::Common; diff --git a/src/Calculator/App.xaml.cpp b/src/Calculator/App.xaml.cpp index 74cf2a9d..1a83fdb0 100644 --- a/src/Calculator/App.xaml.cpp +++ b/src/Calculator/App.xaml.cpp @@ -8,11 +8,12 @@ #include "pch.h" #include "App.xaml.h" -#include "CalcViewModel\ViewState.h" -#include "CalcViewModel\Common\Automation\NarratorNotifier.h" -#include "CalcViewModel\Common\AppResourceProvider.h" -#include "CalcViewModel\Common\LocalizationSettings.h" -#include "Views\MainPage.xaml.h" +#include "CalcViewModel/Common/TraceLogger.h" +#include "CalcViewModel/Common/Automation/NarratorNotifier.h" +#include "CalcViewModel/Common/AppResourceProvider.h" +#include "CalcViewModel/Common/LocalizationSettings.h" +#include "CalcViewModel/ViewState.h" +#include "Views/MainPage.xaml.h" using namespace CalculatorApp; using namespace CalculatorApp::Common; diff --git a/src/Calculator/Controls/CalculationResult.h b/src/Calculator/Controls/CalculationResult.h index 1dfd1e32..3e059a2e 100644 --- a/src/Calculator/Controls/CalculationResult.h +++ b/src/Calculator/Controls/CalculationResult.h @@ -1,8 +1,10 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. +// Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. #pragma once +#include "CalcViewModel/Common/Utils.h" + namespace CalculatorApp { namespace Controls diff --git a/src/Calculator/Controls/CalculatorButton.h b/src/Calculator/Controls/CalculatorButton.h index 92549e5c..71c29a9b 100644 --- a/src/Calculator/Controls/CalculatorButton.h +++ b/src/Calculator/Controls/CalculatorButton.h @@ -1,8 +1,11 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. +// Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. #pragma once +#include "CalcViewModel/Common/Utils.h" +#include "CalcViewModel/Common/CalculatorButtonUser.h" + namespace CalculatorApp { namespace Controls diff --git a/src/Calculator/Controls/FlipButtons.h b/src/Calculator/Controls/FlipButtons.h index d5994685..ab3ef8e7 100644 --- a/src/Calculator/Controls/FlipButtons.h +++ b/src/Calculator/Controls/FlipButtons.h @@ -1,8 +1,11 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. +// Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. #pragma once +#include "CalcViewModel/Common/Utils.h" +#include "CalcViewModel/Common/CalculatorButtonUser.h" + namespace CalculatorApp { namespace Controls diff --git a/src/Calculator/Controls/OverflowTextBlock.h b/src/Calculator/Controls/OverflowTextBlock.h index b003a9fe..1fe3dd95 100644 --- a/src/Calculator/Controls/OverflowTextBlock.h +++ b/src/Calculator/Controls/OverflowTextBlock.h @@ -1,8 +1,10 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. +// Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. #pragma once +#include "CalcViewModel/Common/Utils.h" + namespace CalculatorApp { namespace Controls diff --git a/src/Calculator/Converters/RadixToStringConverter.cpp b/src/Calculator/Converters/RadixToStringConverter.cpp index 76e9efe5..053800e8 100644 --- a/src/Calculator/Converters/RadixToStringConverter.cpp +++ b/src/Calculator/Converters/RadixToStringConverter.cpp @@ -1,16 +1,16 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. +// Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. #include "pch.h" -#include "CalcViewModel\Common\AppResourceProvider.h" #include "RadixToStringConverter.h" - -using namespace CalculatorApp::Common; +#include "CalcManager/Header Files/CalcEngine.h" +#include "CalcViewModel/Common/AppResourceProvider.h" using namespace Platform; using namespace Windows::Foundation; using namespace Windows::UI::Xaml::Interop; using namespace Windows::ApplicationModel::Resources; + namespace CalculatorApp { namespace Converters diff --git a/src/Calculator/Views/Calculator.xaml.cpp b/src/Calculator/Views/Calculator.xaml.cpp index 397b3614..d8ae99c9 100644 --- a/src/Calculator/Views/Calculator.xaml.cpp +++ b/src/Calculator/Views/Calculator.xaml.cpp @@ -4,10 +4,11 @@ #include "pch.h" #include "Calculator.xaml.h" #include "CalculatorStandardOperators.xaml.h" -#include "CalcViewModel\Common\CopyPasteManager.h" -#include "CalcViewModel\StandardCalculatorViewModel.h" -#include "CalcViewModel\ViewState.h" -#include "CalcViewModel\Common\LocalizationSettings.h" +#include "CalcViewModel/Common/TraceLogger.h" +#include "CalcViewModel/Common/CopyPasteManager.h" +#include "CalcViewModel/StandardCalculatorViewModel.h" +#include "CalcViewModel/ViewState.h" +#include "CalcViewModel/Common/LocalizationSettings.h" #include "Memory.xaml.h" #include "HistoryList.xaml.h" diff --git a/src/Calculator/Views/CalculatorProgrammerBitFlipPanel.xaml.cpp b/src/Calculator/Views/CalculatorProgrammerBitFlipPanel.xaml.cpp index bfef27e7..4c83ba52 100644 --- a/src/Calculator/Views/CalculatorProgrammerBitFlipPanel.xaml.cpp +++ b/src/Calculator/Views/CalculatorProgrammerBitFlipPanel.xaml.cpp @@ -8,8 +8,9 @@ #include "pch.h" #include "CalculatorProgrammerBitFlipPanel.xaml.h" -#include "CalcViewModel\Common\LocalizationSettings.h" -#include "Converters\BooleanToVisibilityConverter.h" +#include "CalcViewModel/Common/TraceLogger.h" +#include "CalcViewModel/Common/LocalizationSettings.h" +#include "Converters/BooleanToVisibilityConverter.h" using namespace CalculatorApp; using namespace CalculatorApp::Common; diff --git a/src/Calculator/Views/CalculatorProgrammerDisplayPanel.xaml.cpp b/src/Calculator/Views/CalculatorProgrammerDisplayPanel.xaml.cpp index 081b9ca0..935731e8 100644 --- a/src/Calculator/Views/CalculatorProgrammerDisplayPanel.xaml.cpp +++ b/src/Calculator/Views/CalculatorProgrammerDisplayPanel.xaml.cpp @@ -1,8 +1,9 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. +// Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. #include "pch.h" #include "CalculatorProgrammerDisplayPanel.xaml.h" +#include "CalcViewModel/Common/TraceLogger.h" using namespace CalculatorApp; using namespace CalculatorApp::ViewModel; diff --git a/src/Calculator/Views/CalculatorProgrammerOperators.xaml.cpp b/src/Calculator/Views/CalculatorProgrammerOperators.xaml.cpp index 8a07a45c..19b2c085 100644 --- a/src/Calculator/Views/CalculatorProgrammerOperators.xaml.cpp +++ b/src/Calculator/Views/CalculatorProgrammerOperators.xaml.cpp @@ -1,10 +1,11 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. +// Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. #include "pch.h" #include "CalculatorProgrammerOperators.xaml.h" -#include "CalcViewModel\StandardCalculatorViewModel.h" -#include "CalcViewModel\Common\CopyPasteManager.h" +#include "CalcViewModel/Common/TraceLogger.h" +#include "CalcViewModel/Common/CopyPasteManager.h" +#include "CalcViewModel/StandardCalculatorViewModel.h" using namespace CalculatorApp; using namespace CalculatorApp::Common; diff --git a/src/Calculator/Views/CalculatorScientificAngleButtons.xaml.cpp b/src/Calculator/Views/CalculatorScientificAngleButtons.xaml.cpp index a766e33a..981b2168 100644 --- a/src/Calculator/Views/CalculatorScientificAngleButtons.xaml.cpp +++ b/src/Calculator/Views/CalculatorScientificAngleButtons.xaml.cpp @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. +// Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. // @@ -8,7 +8,8 @@ #include "pch.h" #include "CalculatorScientificAngleButtons.xaml.h" -#include "CalcViewModel\StandardCalculatorViewModel.h" +#include "CalcViewModel/Common/TraceLogger.h" +#include "CalcViewModel/StandardCalculatorViewModel.h" using namespace CalculatorApp; using namespace CalculatorApp::ViewModel; diff --git a/src/Calculator/Views/DateCalculator.xaml.cpp b/src/Calculator/Views/DateCalculator.xaml.cpp index 8a0b9772..be7b7378 100644 --- a/src/Calculator/Views/DateCalculator.xaml.cpp +++ b/src/Calculator/Views/DateCalculator.xaml.cpp @@ -8,9 +8,10 @@ #include "pch.h" #include "DateCalculator.xaml.h" -#include "CalcViewModel\Common\CopyPasteManager.h" -#include "CalcViewModel\Common\LocalizationSettings.h" -#include "CalcViewModel\DateCalculatorViewModel.h" +#include "CalcViewModel/Common/TraceLogger.h" +#include "CalcViewModel/Common/CopyPasteManager.h" +#include "CalcViewModel/Common/LocalizationSettings.h" +#include "CalcViewModel/DateCalculatorViewModel.h" using namespace CalculatorApp; using namespace CalculatorApp::Common; diff --git a/src/Calculator/Views/MainPage.xaml.cpp b/src/Calculator/Views/MainPage.xaml.cpp index 4cf229be..a0079dc0 100644 --- a/src/Calculator/Views/MainPage.xaml.cpp +++ b/src/Calculator/Views/MainPage.xaml.cpp @@ -3,13 +3,14 @@ #include "pch.h" #include "MainPage.xaml.h" -#include "Views\Memory.xaml.h" -#include "Converters\BooleanToVisibilityConverter.h" -#include "CalcViewModel\Common\KeyboardShortcutManager.h" -#include "CalcViewModel\Common\LocalizationService.h" -#include "CalcViewModel\Common\Automation\NarratorNotifier.h" -#include "CalcViewModel\Common\AppResourceProvider.h" -#include "Common\AppLifecycleLogger.h" +#include "CalcViewModel/Common/TraceLogger.h" +#include "CalcViewModel/Common/KeyboardShortcutManager.h" +#include "CalcViewModel/Common/LocalizationService.h" +#include "CalcViewModel/Common/Automation/NarratorNotifier.h" +#include "CalcViewModel/Common/AppResourceProvider.h" +#include "Views/Memory.xaml.h" +#include "Converters/BooleanToVisibilityConverter.h" +#include "Common/AppLifecycleLogger.h" using namespace CalculatorApp; using namespace CalculatorApp::Common; diff --git a/src/Calculator/Views/StateTriggers/AspectRatioTrigger.h b/src/Calculator/Views/StateTriggers/AspectRatioTrigger.h index 6ef5ce08..c342dbc1 100644 --- a/src/Calculator/Views/StateTriggers/AspectRatioTrigger.h +++ b/src/Calculator/Views/StateTriggers/AspectRatioTrigger.h @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. +// Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. /* The AspectRatioTrigger class is a custom trigger for use with a VisualState. The trigger is designed to fire when the @@ -9,6 +9,8 @@ #pragma once +#include "CalcViewModel/Common/Utils.h" + namespace CalculatorApp::Views::StateTriggers { public enum class Aspect diff --git a/src/Calculator/WindowFrameService.cpp b/src/Calculator/WindowFrameService.cpp index 387a9580..0d5339ef 100644 --- a/src/Calculator/WindowFrameService.cpp +++ b/src/Calculator/WindowFrameService.cpp @@ -3,7 +3,8 @@ #include "pch.h" #include "WindowFrameService.h" -#include "CalcViewModel\Common\KeyboardShortcutManager.h" +#include "CalcViewModel/Common/KeyboardShortcutManager.h" +#include "CalcViewModel/Common/TraceLogger.h" using namespace concurrency; using namespace Platform; diff --git a/src/Calculator/pch.h b/src/Calculator/pch.h index 06606fa8..c393e82a 100644 --- a/src/Calculator/pch.h +++ b/src/Calculator/pch.h @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. +// Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. // @@ -42,21 +42,5 @@ namespace StandardPeers = Windows::UI::Xaml::Automation::Peers; namespace CalculatorApp::Common::Automation {} namespace CustomPeers = CalculatorApp::Common::Automation; -// CalcManager Headers -#include "CalcManager\CalculatorVector.h" -#include "CalcManager\ExpressionCommand.h" -#include "CalcManager\CalculatorResource.h" -#include "CalcManager\CalculatorManager.h" -#include "CalcManager\UnitConverter.h" - -//CalcViewModel Headers -#include "CalcViewModel\Common\DelegateCommand.h" -#include "CalcViewModel\Common\Utils.h" -#include "CalcViewModel\Common\CalculatorButtonUser.h" -#include "CalcViewModel\Common\MyVirtualKey.h" -#include "CalcViewModel\Common\NavCategory.h" -#include "CalcViewModel\Common\TraceLogger.h" - // Project Headers - #include "App.xaml.h"