From 0166daf5c7eecac41bb0475e46514b5ff2493cbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Thu, 7 Mar 2019 23:33:49 +0100 Subject: [PATCH] Replace escape sequences with path separators in include paths --- src/CalcManager/CalculatorManager.cpp | 2 +- src/CalcManager/ExpressionCommand.cpp | 2 +- src/CalcViewModel/ApplicationViewModel.cpp | 10 +++--- src/CalcViewModel/Common/CopyPasteManager.cpp | 4 +-- .../Common/EngineResourceProvider.h | 2 +- .../Common/ExpressionCommandSerializer.cpp | 2 +- src/CalcViewModel/Common/NavCategory.cpp | 2 +- src/CalcViewModel/Common/Utils.cpp | 6 ++-- .../DataLoaders/CurrencyDataLoader.cpp | 10 +++--- .../DataLoaders/CurrencyDataLoader.h | 4 +-- .../DataLoaders/UnitConverterDataLoader.cpp | 2 +- .../DataLoaders/UnitConverterDataLoader.h | 2 +- src/CalcViewModel/DateCalculatorViewModel.cpp | 10 +++--- src/CalcViewModel/HistoryItemViewModel.cpp | 2 +- src/CalcViewModel/HistoryViewModel.cpp | 6 ++-- .../StandardCalculatorViewModel.cpp | 10 +++--- .../StandardCalculatorViewModel.h | 10 +++--- src/CalcViewModel/UnitConverterViewModel.cpp | 18 +++++----- src/CalcViewModel/pch.h | 12 +++---- src/Calculator/Common/AppLifecycleLogger.cpp | 2 +- src/Calculator/Common/TitleBarHelper.cpp | 4 +-- src/Calculator/Controls/AppBar.h | 2 +- src/Calculator/Controls/CalculationResult.cpp | 2 +- .../CalculationResultAutomationPeer.h | 2 +- src/Calculator/Controls/CalculatorButton.cpp | 2 +- .../OverflowTextBlockAutomationPeer.cpp | 2 +- .../OverflowTextBlockAutomationPeer.h | 2 +- src/Calculator/Controls/RadixButton.cpp | 2 +- .../Controls/SupplementaryItemsControl.cpp | 2 +- .../BitFlipAutomationNameConverter.cpp | 4 +-- .../ExpressionItemContainerStyle.cpp | 2 +- .../ExpressionItemTemplateSelector.cpp | 2 +- src/Calculator/Views/Calculator.xaml.h | 32 ++++++++--------- .../CalculatorProgrammerBitFlipPanel.xaml.h | 12 +++---- .../CalculatorProgrammerDisplayPanel.xaml.h | 4 +-- .../CalculatorProgrammerOperators.xaml.h | 6 ++-- ...alculatorProgrammerRadixOperators.xaml.cpp | 6 ++-- .../CalculatorProgrammerRadixOperators.xaml.h | 6 ++-- .../CalculatorScientificAngleButtons.xaml.h | 4 +-- .../CalculatorScientificOperators.xaml.cpp | 6 ++-- .../CalculatorScientificOperators.xaml.h | 10 +++--- .../Views/CalculatorStandardOperators.xaml.h | 4 +-- src/Calculator/Views/DateCalculator.xaml.h | 6 ++-- src/Calculator/Views/HistoryList.xaml.cpp | 2 +- src/Calculator/Views/HistoryList.xaml.h | 10 +++--- src/Calculator/Views/MainPage.xaml.h | 12 +++---- src/Calculator/Views/Memory.xaml.cpp | 6 ++-- src/Calculator/Views/Memory.xaml.h | 10 +++--- src/Calculator/Views/MemoryListItem.xaml.cpp | 2 +- src/Calculator/Views/MemoryListItem.xaml.h | 4 +-- src/Calculator/Views/NumberPad.xaml.cpp | 6 ++-- src/Calculator/Views/NumberPad.xaml.h | 4 +-- src/Calculator/Views/OperatorsPanel.xaml.h | 10 +++--- .../Views/SupplementaryResults.xaml.h | 10 +++--- src/Calculator/Views/TitleBar.xaml.cpp | 2 +- src/Calculator/Views/TitleBar.xaml.h | 2 +- src/Calculator/Views/UnitConverter.xaml.cpp | 14 ++++---- src/Calculator/Views/UnitConverter.xaml.h | 14 ++++---- src/Calculator/pch.h | 18 +++++----- src/CalculatorUnitTests/AsyncHelper.h | 2 +- src/CalculatorUnitTests/CalcEngineTests.cpp | 2 +- .../CalculatorManagerTest.cpp | 4 +-- .../CopyPasteManagerTest.cpp | 4 +-- .../CurrencyConverterUnitTests.cpp | 4 +-- .../DateCalculatorUnitTests.cpp | 4 +-- src/CalculatorUnitTests/Helpers.h | 2 +- src/CalculatorUnitTests/HistoryTests.cpp | 4 +-- .../Mocks/CurrencyHttpClient.cpp | 2 +- .../Mocks/CurrencyHttpClient.h | 2 +- .../MultiWindowUnitTests.cpp | 8 ++--- .../UnitConverterViewModelUnitTests.cpp | 4 +-- src/CalculatorUnitTests/UnitTestApp.xaml.h | 8 ++--- src/CalculatorUnitTests/pch.h | 34 +++++++++---------- 73 files changed, 226 insertions(+), 226 deletions(-) diff --git a/src/CalcManager/CalculatorManager.cpp b/src/CalcManager/CalculatorManager.cpp index 3aa185dd..0e03afaf 100644 --- a/src/CalcManager/CalculatorManager.cpp +++ b/src/CalcManager/CalculatorManager.cpp @@ -2,7 +2,7 @@ // Licensed under the MIT License. #include "pch.h" -#include "Header Files\CalcEngine.h" +#include "Header Files/CalcEngine.h" #include "CalculatorManager.h" #include "CalculatorResource.h" diff --git a/src/CalcManager/ExpressionCommand.cpp b/src/CalcManager/ExpressionCommand.cpp index 393a4716..fcede229 100644 --- a/src/CalcManager/ExpressionCommand.cpp +++ b/src/CalcManager/ExpressionCommand.cpp @@ -2,7 +2,7 @@ // Licensed under the MIT License. #include "pch.h" -#include "Header Files\CCommand.h" +#include "Header Files/CCommand.h" #include "CalculatorVector.h" #include "ExpressionCommand.h" diff --git a/src/CalcViewModel/ApplicationViewModel.cpp b/src/CalcViewModel/ApplicationViewModel.cpp index 9c1aa386..4df5bac3 100644 --- a/src/CalcViewModel/ApplicationViewModel.cpp +++ b/src/CalcViewModel/ApplicationViewModel.cpp @@ -3,13 +3,13 @@ #include "pch.h" #include "ApplicationViewModel.h" -#include "Common\TraceLogger.h" -#include "Common\AppResourceProvider.h" +#include "Common/TraceLogger.h" +#include "Common/AppResourceProvider.h" #include "StandardCalculatorViewModel.h" #include "DateCalculatorViewModel.h" -#include "DataLoaders\CurrencyHttpClient.h" -#include "DataLoaders\CurrencyDataLoader.h" -#include "DataLoaders\UnitConverterDataLoader.h" +#include "DataLoaders/CurrencyHttpClient.h" +#include "DataLoaders/CurrencyDataLoader.h" +#include "DataLoaders/UnitConverterDataLoader.h" using namespace CalculatorApp; using namespace CalculatorApp::Common; diff --git a/src/CalcViewModel/Common/CopyPasteManager.cpp b/src/CalcViewModel/Common/CopyPasteManager.cpp index c8f9c5f0..75abbb78 100644 --- a/src/CalcViewModel/Common/CopyPasteManager.cpp +++ b/src/CalcViewModel/Common/CopyPasteManager.cpp @@ -3,8 +3,8 @@ #include "pch.h" #include "CopyPasteManager.h" -#include "Common\TraceLogger.h" -#include "Common\LocalizationSettings.h" +#include "Common/TraceLogger.h" +#include "Common/LocalizationSettings.h" using namespace std; using namespace concurrency; diff --git a/src/CalcViewModel/Common/EngineResourceProvider.h b/src/CalcViewModel/Common/EngineResourceProvider.h index 1bcb93f5..83b3f418 100644 --- a/src/CalcViewModel/Common/EngineResourceProvider.h +++ b/src/CalcViewModel/Common/EngineResourceProvider.h @@ -3,7 +3,7 @@ #pragma once -#include "CalcManager\CalculatorResource.h" +#include "CalcManager/CalculatorResource.h" namespace CalculatorApp { diff --git a/src/CalcViewModel/Common/ExpressionCommandSerializer.cpp b/src/CalcViewModel/Common/ExpressionCommandSerializer.cpp index 51c3eae9..38bae50f 100644 --- a/src/CalcViewModel/Common/ExpressionCommandSerializer.cpp +++ b/src/CalcViewModel/Common/ExpressionCommandSerializer.cpp @@ -2,7 +2,7 @@ // Licensed under the MIT License. #include "pch.h" -#include "Common\ExpressionCommandSerializer.h" +#include "Common/ExpressionCommandSerializer.h" using namespace CalculatorApp::Common; using namespace Windows::Storage::Streams; diff --git a/src/CalcViewModel/Common/NavCategory.cpp b/src/CalcViewModel/Common/NavCategory.cpp index bcfeb64e..e5247cff 100644 --- a/src/CalcViewModel/Common/NavCategory.cpp +++ b/src/CalcViewModel/Common/NavCategory.cpp @@ -4,7 +4,7 @@ #include "pch.h" #include "NavCategory.h" #include "AppResourceProvider.h" -#include "Common\LocalizationStringUtil.h" +#include "Common/LocalizationStringUtil.h" using namespace CalculatorApp; using namespace CalculatorApp::Common; diff --git a/src/CalcViewModel/Common/Utils.cpp b/src/CalcViewModel/Common/Utils.cpp index c0ddf69a..55e78e6c 100644 --- a/src/CalcViewModel/Common/Utils.cpp +++ b/src/CalcViewModel/Common/Utils.cpp @@ -7,9 +7,9 @@ #include "pch.h" #include "Utils.h" -#include "Common\AppResourceProvider.h" -#include "Common\ExpressionCommandSerializer.h" -#include "Common\ExpressionCommandDeserializer.h" +#include "Common/AppResourceProvider.h" +#include "Common/ExpressionCommandSerializer.h" +#include "Common/ExpressionCommandDeserializer.h" #include "ViewState.h" using namespace CalculatorApp; diff --git a/src/CalcViewModel/DataLoaders/CurrencyDataLoader.cpp b/src/CalcViewModel/DataLoaders/CurrencyDataLoader.cpp index 5366f375..49585320 100644 --- a/src/CalcViewModel/DataLoaders/CurrencyDataLoader.cpp +++ b/src/CalcViewModel/DataLoaders/CurrencyDataLoader.cpp @@ -3,11 +3,11 @@ #include "pch.h" #include "CurrencyDataLoader.h" -#include "Common\AppResourceProvider.h" -#include "Common\LocalizationStringUtil.h" -#include "Common\LocalizationService.h" -#include "Common\LocalizationSettings.h" -#include "Common\TraceLogger.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; diff --git a/src/CalcViewModel/DataLoaders/CurrencyDataLoader.h b/src/CalcViewModel/DataLoaders/CurrencyDataLoader.h index 917fa21d..cdb006bb 100644 --- a/src/CalcViewModel/DataLoaders/CurrencyDataLoader.h +++ b/src/CalcViewModel/DataLoaders/CurrencyDataLoader.h @@ -3,8 +3,8 @@ #pragma once -#include "CalcManager\UnitConverter.h" -#include "Common\NetworkManager.h" +#include "CalcManager/UnitConverter.h" +#include "Common/NetworkManager.h" #include "ICurrencyHttpClient.h" namespace CalculatorApp diff --git a/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.cpp b/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.cpp index 19ee3baf..b00cf799 100644 --- a/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.cpp +++ b/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.cpp @@ -2,7 +2,7 @@ // Licensed under the MIT License. #include "pch.h" -#include "Common\AppResourceProvider.h" +#include "Common/AppResourceProvider.h" #include "UnitConverterDataLoader.h" #include "UnitConverterDataConstants.h" #include "CurrencyDataLoader.h" diff --git a/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.h b/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.h index 17565edf..519ffda9 100644 --- a/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.h +++ b/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.h @@ -3,7 +3,7 @@ #pragma once -#include "CalcManager\UnitConverter.h" +#include "CalcManager/UnitConverter.h" #include "Common/NavCategory.h" namespace CalculatorApp diff --git a/src/CalcViewModel/DateCalculatorViewModel.cpp b/src/CalcViewModel/DateCalculatorViewModel.cpp index 89e26881..dde91cc3 100644 --- a/src/CalcViewModel/DateCalculatorViewModel.cpp +++ b/src/CalcViewModel/DateCalculatorViewModel.cpp @@ -3,11 +3,11 @@ #include "pch.h" #include "DateCalculatorViewModel.h" -#include "Common\TraceLogger.h" -#include "Common\LocalizationStringUtil.h" -#include "Common\LocalizationService.h" -#include "Common\LocalizationSettings.h" -#include "Common\CopyPasteManager.h" +#include "Common/TraceLogger.h" +#include "Common/LocalizationStringUtil.h" +#include "Common/LocalizationService.h" +#include "Common/LocalizationSettings.h" +#include "Common/CopyPasteManager.h" using namespace CalculatorApp; using namespace CalculatorApp::Common; diff --git a/src/CalcViewModel/HistoryItemViewModel.cpp b/src/CalcViewModel/HistoryItemViewModel.cpp index f3726fc7..c5cd0784 100644 --- a/src/CalcViewModel/HistoryItemViewModel.cpp +++ b/src/CalcViewModel/HistoryItemViewModel.cpp @@ -3,7 +3,7 @@ #include "pch.h" #include "HistoryItemViewModel.h" -#include "Common\LocalizationService.h" +#include "Common/LocalizationService.h" using namespace CalculatorApp::Common; using namespace CalculatorApp::ViewModel; diff --git a/src/CalcViewModel/HistoryViewModel.cpp b/src/CalcViewModel/HistoryViewModel.cpp index 822aab03..aa491f18 100644 --- a/src/CalcViewModel/HistoryViewModel.cpp +++ b/src/CalcViewModel/HistoryViewModel.cpp @@ -3,9 +3,9 @@ #include "pch.h" #include "HistoryViewModel.h" -#include "Common\TraceLogger.h" -#include "Common\LocalizationStringUtil.h" -#include "Common\LocalizationSettings.h" +#include "Common/TraceLogger.h" +#include "Common/LocalizationStringUtil.h" +#include "Common/LocalizationSettings.h" using namespace CalculatorApp; using namespace CalculatorApp::Common; diff --git a/src/CalcViewModel/StandardCalculatorViewModel.cpp b/src/CalcViewModel/StandardCalculatorViewModel.cpp index c8b87071..4b8f6bcf 100644 --- a/src/CalcViewModel/StandardCalculatorViewModel.cpp +++ b/src/CalcViewModel/StandardCalculatorViewModel.cpp @@ -3,11 +3,11 @@ #include "pch.h" #include "StandardCalculatorViewModel.h" -#include "Common\CalculatorButtonPressedEventArgs.h" -#include "Common\LocalizationStringUtil.h" -#include "Common\LocalizationSettings.h" -#include "Common\CopyPasteManager.h" -#include "Common\TraceLogger.h" +#include "Common/CalculatorButtonPressedEventArgs.h" +#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 7fb311c5..91ff9da0 100644 --- a/src/CalcViewModel/StandardCalculatorViewModel.h +++ b/src/CalcViewModel/StandardCalculatorViewModel.h @@ -2,11 +2,11 @@ // 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 "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" diff --git a/src/CalcViewModel/UnitConverterViewModel.cpp b/src/CalcViewModel/UnitConverterViewModel.cpp index c5df49a0..393165eb 100644 --- a/src/CalcViewModel/UnitConverterViewModel.cpp +++ b/src/CalcViewModel/UnitConverterViewModel.cpp @@ -4,15 +4,15 @@ #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" +#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" using namespace CalculatorApp; using namespace CalculatorApp::Common; diff --git a/src/CalcViewModel/pch.h b/src/CalcViewModel/pch.h index 01a40fad..b2717d17 100644 --- a/src/CalcViewModel/pch.h +++ b/src/CalcViewModel/pch.h @@ -28,12 +28,12 @@ #include // C++\WinRT Headers -#include "winrt\base.h" -#include "winrt\Windows.Foundation.Diagnostics.h" -#include "winrt\Windows.Globalization.h" -#include "winrt\Windows.Globalization.DateTimeFormatting.h" -#include "winrt\Windows.System.UserProfile.h" -#include "winrt\Windows.UI.Xaml.h" +#include "winrt/base.h" +#include "winrt/Windows.Foundation.Diagnostics.h" +#include "winrt/Windows.Globalization.h" +#include "winrt/Windows.Globalization.DateTimeFormatting.h" +#include "winrt/Windows.System.UserProfile.h" +#include "winrt/Windows.UI.Xaml.h" // The following namespaces exist as a convenience to resolve // ambiguity for Windows types in the Windows::UI::Xaml::Automation::Peers diff --git a/src/Calculator/Common/AppLifecycleLogger.cpp b/src/Calculator/Common/AppLifecycleLogger.cpp index 342cc19e..983deac6 100644 --- a/src/Calculator/Common/AppLifecycleLogger.cpp +++ b/src/Calculator/Common/AppLifecycleLogger.cpp @@ -3,7 +3,7 @@ #include "pch.h" #include "AppLifecycleLogger.h" -#include "CalcViewModel\Common\TraceActivity.h" +#include "CalcViewModel/Common/TraceActivity.h" using namespace std; using namespace winrt; diff --git a/src/Calculator/Common/TitleBarHelper.cpp b/src/Calculator/Common/TitleBarHelper.cpp index 82067308..18e8be94 100644 --- a/src/Calculator/Common/TitleBarHelper.cpp +++ b/src/Calculator/Common/TitleBarHelper.cpp @@ -3,8 +3,8 @@ #include "pch.h" #include "TitleBarHelper.h" -#include "Converters\BooleanToVisibilityConverter.h" -#include "CalcViewModel\ViewState.h" +#include "Converters/BooleanToVisibilityConverter.h" +#include "CalcViewModel/ViewState.h" using namespace CalculatorApp::Common; using namespace CalculatorApp::Converters; diff --git a/src/Calculator/Controls/AppBar.h b/src/Calculator/Controls/AppBar.h index 3f8053c6..b6ac3740 100644 --- a/src/Calculator/Controls/AppBar.h +++ b/src/Calculator/Controls/AppBar.h @@ -3,7 +3,7 @@ #pragma once -#include "Common\KeyboardShortcutManager.h" +#include "Common/KeyboardShortcutManager.h" namespace CalculatorApp { diff --git a/src/Calculator/Controls/CalculationResult.cpp b/src/Calculator/Controls/CalculationResult.cpp index 22f938af..8896617f 100644 --- a/src/Calculator/Controls/CalculationResult.cpp +++ b/src/Calculator/Controls/CalculationResult.cpp @@ -4,7 +4,7 @@ #include "pch.h" #include "CalculationResult.h" #include "CalculationResultAutomationPeer.h" -#include "CalcViewModel\Common\LocalizationSettings.h" +#include "CalcViewModel/Common/LocalizationSettings.h" using namespace CalculatorApp; using namespace CalculatorApp::Controls; diff --git a/src/Calculator/Controls/CalculationResultAutomationPeer.h b/src/Calculator/Controls/CalculationResultAutomationPeer.h index 7882d7bc..afdaa8ba 100644 --- a/src/Calculator/Controls/CalculationResultAutomationPeer.h +++ b/src/Calculator/Controls/CalculationResultAutomationPeer.h @@ -3,7 +3,7 @@ #pragma once -#include "Controls\CalculationResult.h" +#include "Controls/CalculationResult.h" namespace CalculatorApp { diff --git a/src/Calculator/Controls/CalculatorButton.cpp b/src/Calculator/Controls/CalculatorButton.cpp index 9d385efe..68efc005 100644 --- a/src/Calculator/Controls/CalculatorButton.cpp +++ b/src/Calculator/Controls/CalculatorButton.cpp @@ -3,7 +3,7 @@ #include "pch.h" #include "CalculatorButton.h" -#include "CalcViewModel\Common\CalculatorButtonPressedEventArgs.h" +#include "CalcViewModel/Common/CalculatorButtonPressedEventArgs.h" using namespace CalculatorApp; using namespace CalculatorApp::Common; diff --git a/src/Calculator/Controls/OverflowTextBlockAutomationPeer.cpp b/src/Calculator/Controls/OverflowTextBlockAutomationPeer.cpp index 2e071020..ed7faaf8 100644 --- a/src/Calculator/Controls/OverflowTextBlockAutomationPeer.cpp +++ b/src/Calculator/Controls/OverflowTextBlockAutomationPeer.cpp @@ -2,7 +2,7 @@ // Licensed under the MIT License. #include "pch.h" -#include "Controls\OverflowTextBlock.h" +#include "Controls/OverflowTextBlock.h" #include "OverflowTextBlockAutomationPeer.h" using namespace Windows::UI::Xaml::Automation::Peers; diff --git a/src/Calculator/Controls/OverflowTextBlockAutomationPeer.h b/src/Calculator/Controls/OverflowTextBlockAutomationPeer.h index 842dcc4a..8cb86d0b 100644 --- a/src/Calculator/Controls/OverflowTextBlockAutomationPeer.h +++ b/src/Calculator/Controls/OverflowTextBlockAutomationPeer.h @@ -3,7 +3,7 @@ #pragma once -#include "Controls\OverflowTextBlock.h" +#include "Controls/OverflowTextBlock.h" namespace CalculatorApp { diff --git a/src/Calculator/Controls/RadixButton.cpp b/src/Calculator/Controls/RadixButton.cpp index e0086486..63fd7a64 100644 --- a/src/Calculator/Controls/RadixButton.cpp +++ b/src/Calculator/Controls/RadixButton.cpp @@ -3,7 +3,7 @@ #include "pch.h" #include "RadixButton.h" -#include "CalcViewModel\Common\LocalizationSettings.h" +#include "CalcViewModel/Common/LocalizationSettings.h" using namespace CalculatorApp; using namespace CalculatorApp::Common; diff --git a/src/Calculator/Controls/SupplementaryItemsControl.cpp b/src/Calculator/Controls/SupplementaryItemsControl.cpp index d0529d51..d5bc00a4 100644 --- a/src/Calculator/Controls/SupplementaryItemsControl.cpp +++ b/src/Calculator/Controls/SupplementaryItemsControl.cpp @@ -3,7 +3,7 @@ #include "pch.h" #include "SupplementaryItemsControl.h" -#include "CalcViewModel\UnitConverterViewModel.h" +#include "CalcViewModel/UnitConverterViewModel.h" using namespace CalculatorApp; using namespace CalculatorApp::Controls; diff --git a/src/Calculator/Converters/BitFlipAutomationNameConverter.cpp b/src/Calculator/Converters/BitFlipAutomationNameConverter.cpp index 713a7480..667e4ae2 100644 --- a/src/Calculator/Converters/BitFlipAutomationNameConverter.cpp +++ b/src/Calculator/Converters/BitFlipAutomationNameConverter.cpp @@ -2,8 +2,8 @@ // Licensed under the MIT License. #include "pch.h" -#include "CalcViewModel\Common\AppResourceProvider.h" -#include "CalcViewModel\Common\LocalizationSettings.h" +#include "CalcViewModel/Common/AppResourceProvider.h" +#include "CalcViewModel/Common/LocalizationSettings.h" #include "BitFlipAutomationNameConverter.h" using namespace CalculatorApp::Common; diff --git a/src/Calculator/Converters/ExpressionItemContainerStyle.cpp b/src/Calculator/Converters/ExpressionItemContainerStyle.cpp index 0c494d36..d99332c1 100644 --- a/src/Calculator/Converters/ExpressionItemContainerStyle.cpp +++ b/src/Calculator/Converters/ExpressionItemContainerStyle.cpp @@ -3,7 +3,7 @@ #include "pch.h" #include "ExpressionItemContainerStyle.h" -#include "CalcViewModel\Common\DisplayExpressionToken.h" +#include "CalcViewModel/Common/DisplayExpressionToken.h" using namespace CalculatorApp::Common; diff --git a/src/Calculator/Converters/ExpressionItemTemplateSelector.cpp b/src/Calculator/Converters/ExpressionItemTemplateSelector.cpp index aa4cb646..9bacec98 100644 --- a/src/Calculator/Converters/ExpressionItemTemplateSelector.cpp +++ b/src/Calculator/Converters/ExpressionItemTemplateSelector.cpp @@ -3,7 +3,7 @@ #include "pch.h" #include "ExpressionItemTemplateSelector.h" -#include "CalcViewModel\Common\DisplayExpressionToken.h" +#include "CalcViewModel/Common/DisplayExpressionToken.h" using namespace CalculatorApp::Common; diff --git a/src/Calculator/Views/Calculator.xaml.h b/src/Calculator/Views/Calculator.xaml.h index ca385e68..3ec3feac 100644 --- a/src/Calculator/Views/Calculator.xaml.h +++ b/src/Calculator/Views/Calculator.xaml.h @@ -3,22 +3,22 @@ #pragma once -#include "Views\Calculator.g.h" -#include "Converters\BooleanNegationConverter.h" -#include "Converters\ExpressionItemContainerStyle.h" -#include "Converters\ExpressionItemTemplateSelector.h" -#include "Converters\VisibilityNegationConverter.h" -#include "CalcViewModel\Common\Automation\NarratorNotifier.h" -#include "Controls\CalculatorButton.h" -#include "Controls\CalculationResult.h" -#include "Controls\OverflowTextBlock.h" -#include "CalcViewModel\HistoryViewModel.h" -#include "Views\CalculatorProgrammerDisplayPanel.xaml.h" -#include "Views\CalculatorProgrammerOperators.xaml.h" -#include "Views\CalculatorScientificAngleButtons.xaml.h" -#include "Views\HistoryList.xaml.h" -#include "Views\Memory.xaml.h" -#include "Views\OperatorsPanel.xaml.h" +#include "Views/Calculator.g.h" +#include "Converters/BooleanNegationConverter.h" +#include "Converters/ExpressionItemContainerStyle.h" +#include "Converters/ExpressionItemTemplateSelector.h" +#include "Converters/VisibilityNegationConverter.h" +#include "CalcViewModel/Common/Automation/NarratorNotifier.h" +#include "Controls/CalculatorButton.h" +#include "Controls/CalculationResult.h" +#include "Controls/OverflowTextBlock.h" +#include "CalcViewModel/HistoryViewModel.h" +#include "Views/CalculatorProgrammerDisplayPanel.xaml.h" +#include "Views/CalculatorProgrammerOperators.xaml.h" +#include "Views/CalculatorScientificAngleButtons.xaml.h" +#include "Views/HistoryList.xaml.h" +#include "Views/Memory.xaml.h" +#include "Views/OperatorsPanel.xaml.h" namespace CalculatorApp { diff --git a/src/Calculator/Views/CalculatorProgrammerBitFlipPanel.xaml.h b/src/Calculator/Views/CalculatorProgrammerBitFlipPanel.xaml.h index 4db8ce00..bc4ac12a 100644 --- a/src/Calculator/Views/CalculatorProgrammerBitFlipPanel.xaml.h +++ b/src/Calculator/Views/CalculatorProgrammerBitFlipPanel.xaml.h @@ -8,12 +8,12 @@ #pragma once -#include "Views\CalculatorProgrammerBitFlipPanel.g.h" -#include "Controls\FlipButtons.h" -#include "Converters\BitFlipAutomationNameConverter.h" -#include "Converters\BooleanNegationConverter.h" -#include "Converters\VisibilityNegationConverter.h" -#include "CalcViewModel\StandardCalculatorViewModel.h" +#include "Views/CalculatorProgrammerBitFlipPanel.g.h" +#include "Controls/FlipButtons.h" +#include "Converters/BitFlipAutomationNameConverter.h" +#include "Converters/BooleanNegationConverter.h" +#include "Converters/VisibilityNegationConverter.h" +#include "CalcViewModel/StandardCalculatorViewModel.h" namespace CalculatorApp { diff --git a/src/Calculator/Views/CalculatorProgrammerDisplayPanel.xaml.h b/src/Calculator/Views/CalculatorProgrammerDisplayPanel.xaml.h index 83df0073..35340636 100644 --- a/src/Calculator/Views/CalculatorProgrammerDisplayPanel.xaml.h +++ b/src/Calculator/Views/CalculatorProgrammerDisplayPanel.xaml.h @@ -3,8 +3,8 @@ #pragma once -#include "Views\CalculatorProgrammerDisplayPanel.g.h" -#include "CalcViewModel\StandardCalculatorViewModel.h" +#include "Views/CalculatorProgrammerDisplayPanel.g.h" +#include "CalcViewModel/StandardCalculatorViewModel.h" namespace CalculatorApp { diff --git a/src/Calculator/Views/CalculatorProgrammerOperators.xaml.h b/src/Calculator/Views/CalculatorProgrammerOperators.xaml.h index 1b006df0..28308282 100644 --- a/src/Calculator/Views/CalculatorProgrammerOperators.xaml.h +++ b/src/Calculator/Views/CalculatorProgrammerOperators.xaml.h @@ -3,9 +3,9 @@ #pragma once -#include "Views\CalculatorProgrammerOperators.g.h" -#include "Controls\RadixButton.h" -#include "CalcViewModel\StandardCalculatorViewModel.h" +#include "Views/CalculatorProgrammerOperators.g.h" +#include "Controls/RadixButton.h" +#include "CalcViewModel/StandardCalculatorViewModel.h" namespace CalculatorApp { diff --git a/src/Calculator/Views/CalculatorProgrammerRadixOperators.xaml.cpp b/src/Calculator/Views/CalculatorProgrammerRadixOperators.xaml.cpp index 4c599aee..60a628bf 100644 --- a/src/Calculator/Views/CalculatorProgrammerRadixOperators.xaml.cpp +++ b/src/Calculator/Views/CalculatorProgrammerRadixOperators.xaml.cpp @@ -8,9 +8,9 @@ #include "pch.h" #include "CalculatorProgrammerRadixOperators.xaml.h" -#include "Controls\CalculatorButton.h" -#include "Converters\BooleanToVisibilityConverter.h" -#include "Views\NumberPad.xaml.h" +#include "Controls/CalculatorButton.h" +#include "Converters/BooleanToVisibilityConverter.h" +#include "Views/NumberPad.xaml.h" using namespace CalculatorApp; diff --git a/src/Calculator/Views/CalculatorProgrammerRadixOperators.xaml.h b/src/Calculator/Views/CalculatorProgrammerRadixOperators.xaml.h index ad13f2b5..7aae73f4 100644 --- a/src/Calculator/Views/CalculatorProgrammerRadixOperators.xaml.h +++ b/src/Calculator/Views/CalculatorProgrammerRadixOperators.xaml.h @@ -3,9 +3,9 @@ #pragma once -#include "Views\CalculatorProgrammerRadixOperators.g.h" -#include "Converters\VisibilityNegationConverter.h" -#include "CalcViewModel\StandardCalculatorViewModel.h" +#include "Views/CalculatorProgrammerRadixOperators.g.h" +#include "Converters/VisibilityNegationConverter.h" +#include "CalcViewModel/StandardCalculatorViewModel.h" namespace CalculatorApp { diff --git a/src/Calculator/Views/CalculatorScientificAngleButtons.xaml.h b/src/Calculator/Views/CalculatorScientificAngleButtons.xaml.h index eeac9d5d..286d04ba 100644 --- a/src/Calculator/Views/CalculatorScientificAngleButtons.xaml.h +++ b/src/Calculator/Views/CalculatorScientificAngleButtons.xaml.h @@ -8,8 +8,8 @@ #pragma once -#include "Views\CalculatorScientificAngleButtons.g.h" -#include "CalcViewModel\StandardCalculatorViewModel.h" +#include "Views/CalculatorScientificAngleButtons.g.h" +#include "CalcViewModel/StandardCalculatorViewModel.h" namespace CalculatorApp { diff --git a/src/Calculator/Views/CalculatorScientificOperators.xaml.cpp b/src/Calculator/Views/CalculatorScientificOperators.xaml.cpp index 013d7dd7..47998496 100644 --- a/src/Calculator/Views/CalculatorScientificOperators.xaml.cpp +++ b/src/Calculator/Views/CalculatorScientificOperators.xaml.cpp @@ -8,9 +8,9 @@ #include "pch.h" #include "CalculatorScientificOperators.xaml.h" -#include "CalcViewModel\Common\KeyboardShortcutManager.h" -#include "Controls\CalculatorButton.h" -#include "CalcViewModel\StandardCalculatorViewModel.h" +#include "CalcViewModel/Common/KeyboardShortcutManager.h" +#include "Controls/CalculatorButton.h" +#include "CalcViewModel/StandardCalculatorViewModel.h" using namespace CalculatorApp; using namespace CalculatorApp::Common; diff --git a/src/Calculator/Views/CalculatorScientificOperators.xaml.h b/src/Calculator/Views/CalculatorScientificOperators.xaml.h index 81172a7a..ae35e492 100644 --- a/src/Calculator/Views/CalculatorScientificOperators.xaml.h +++ b/src/Calculator/Views/CalculatorScientificOperators.xaml.h @@ -8,11 +8,11 @@ #pragma once -#include "Views\CalculatorScientificOperators.g.h" -#include "Views\NumberPad.xaml.h" -#include "Converters\BooleanNegationConverter.h" -#include "Converters\VisibilityNegationConverter.h" -#include "CalcViewModel\StandardCalculatorViewModel.h" +#include "Views/CalculatorScientificOperators.g.h" +#include "Views/NumberPad.xaml.h" +#include "Converters/BooleanNegationConverter.h" +#include "Converters/VisibilityNegationConverter.h" +#include "CalcViewModel/StandardCalculatorViewModel.h" namespace CalculatorApp { diff --git a/src/Calculator/Views/CalculatorStandardOperators.xaml.h b/src/Calculator/Views/CalculatorStandardOperators.xaml.h index fa6ecea1..6d3d2eea 100644 --- a/src/Calculator/Views/CalculatorStandardOperators.xaml.h +++ b/src/Calculator/Views/CalculatorStandardOperators.xaml.h @@ -8,8 +8,8 @@ #pragma once -#include "Views\CalculatorStandardOperators.g.h" -#include "Views\NumberPad.xaml.h" +#include "Views/CalculatorStandardOperators.g.h" +#include "Views/NumberPad.xaml.h" namespace CalculatorApp { diff --git a/src/Calculator/Views/DateCalculator.xaml.h b/src/Calculator/Views/DateCalculator.xaml.h index 414dc6bb..92218090 100644 --- a/src/Calculator/Views/DateCalculator.xaml.h +++ b/src/Calculator/Views/DateCalculator.xaml.h @@ -8,9 +8,9 @@ #pragma once -#include "Converters\BooleanNegationConverter.h" -#include "Converters\VisibilityNegationConverter.h" -#include "Views\DateCalculator.g.h" +#include "Converters/BooleanNegationConverter.h" +#include "Converters/VisibilityNegationConverter.h" +#include "Views/DateCalculator.g.h" // We choose 2550 as the max year because CalendarDatePicker experiences clipping // issues just after 2558. We would like 9999 but will need to wait for a platform diff --git a/src/Calculator/Views/HistoryList.xaml.cpp b/src/Calculator/Views/HistoryList.xaml.cpp index 76786330..de4a96c4 100644 --- a/src/Calculator/Views/HistoryList.xaml.cpp +++ b/src/Calculator/Views/HistoryList.xaml.cpp @@ -8,7 +8,7 @@ #include "pch.h" #include "HistoryList.xaml.h" -#include "CalcViewModel\Common\LocalizationService.h" +#include "CalcViewModel/Common/LocalizationService.h" using namespace CalculatorApp; using namespace CalculatorApp::Common; diff --git a/src/Calculator/Views/HistoryList.xaml.h b/src/Calculator/Views/HistoryList.xaml.h index ed43f3e9..f4e44399 100644 --- a/src/Calculator/Views/HistoryList.xaml.h +++ b/src/Calculator/Views/HistoryList.xaml.h @@ -8,11 +8,11 @@ #pragma once -#include "Views\HistoryList.g.h" -#include "Common\TitleBarHelper.h" -#include "Converters\ItemSizeToVisibilityConverter.h" -#include "Converters\VisibilityNegationConverter.h" -#include "CalcViewModel\HistoryViewModel.h" +#include "Views/HistoryList.g.h" +#include "Common/TitleBarHelper.h" +#include "Converters/ItemSizeToVisibilityConverter.h" +#include "Converters/VisibilityNegationConverter.h" +#include "CalcViewModel/HistoryViewModel.h" namespace CalculatorApp { diff --git a/src/Calculator/Views/MainPage.xaml.h b/src/Calculator/Views/MainPage.xaml.h index 4db633e6..96a5ff76 100644 --- a/src/Calculator/Views/MainPage.xaml.h +++ b/src/Calculator/Views/MainPage.xaml.h @@ -3,12 +3,12 @@ #pragma once -#include "Views\Calculator.xaml.h" -#include "Views\MainPage.g.h" -#include "Views\DateCalculator.xaml.h" -#include "Views\UnitConverter.xaml.h" -#include "CalcViewModel\ApplicationViewModel.h" -#include "Views\TitleBar.xaml.h" +#include "Views/Calculator.xaml.h" +#include "Views/MainPage.g.h" +#include "Views/DateCalculator.xaml.h" +#include "Views/UnitConverter.xaml.h" +#include "CalcViewModel/ApplicationViewModel.h" +#include "Views/TitleBar.xaml.h" namespace CalculatorApp { diff --git a/src/Calculator/Views/Memory.xaml.cpp b/src/Calculator/Views/Memory.xaml.cpp index fc69b10c..7aa60118 100644 --- a/src/Calculator/Views/Memory.xaml.cpp +++ b/src/Calculator/Views/Memory.xaml.cpp @@ -8,9 +8,9 @@ #include "pch.h" #include "Memory.xaml.h" -#include "Controls\CalculatorButton.h" -#include "CalcViewModel\StandardCalculatorViewModel.h" -#include "CalcViewModel\Common\LocalizationService.h" +#include "Controls/CalculatorButton.h" +#include "CalcViewModel/StandardCalculatorViewModel.h" +#include "CalcViewModel/Common/LocalizationService.h" using namespace CalculatorApp; using namespace CalculatorApp::Common; diff --git a/src/Calculator/Views/Memory.xaml.h b/src/Calculator/Views/Memory.xaml.h index 3abee323..7a3e2da5 100644 --- a/src/Calculator/Views/Memory.xaml.h +++ b/src/Calculator/Views/Memory.xaml.h @@ -8,11 +8,11 @@ #pragma once -#include "Views\Memory.g.h" -#include "Common\TitleBarHelper.h" -#include "Converters\BooleanNegationConverter.h" -#include "Converters\VisibilityNegationConverter.h" -#include "CalcViewModel\StandardCalculatorViewModel.h" +#include "Views/Memory.g.h" +#include "Common/TitleBarHelper.h" +#include "Converters/BooleanNegationConverter.h" +#include "Converters/VisibilityNegationConverter.h" +#include "CalcViewModel/StandardCalculatorViewModel.h" namespace CalculatorApp { diff --git a/src/Calculator/Views/MemoryListItem.xaml.cpp b/src/Calculator/Views/MemoryListItem.xaml.cpp index f6a79fed..313607af 100644 --- a/src/Calculator/Views/MemoryListItem.xaml.cpp +++ b/src/Calculator/Views/MemoryListItem.xaml.cpp @@ -3,7 +3,7 @@ #include "pch.h" #include "MemoryListItem.xaml.h" -#include "Controls\CalculatorButton.h" +#include "Controls/CalculatorButton.h" using namespace CalculatorApp; using namespace CalculatorApp::Common; diff --git a/src/Calculator/Views/MemoryListItem.xaml.h b/src/Calculator/Views/MemoryListItem.xaml.h index 9f249446..6bfd5155 100644 --- a/src/Calculator/Views/MemoryListItem.xaml.h +++ b/src/Calculator/Views/MemoryListItem.xaml.h @@ -3,8 +3,8 @@ #pragma once -#include "Views\MemoryListItem.g.h" -#include "CalcViewModel\MemoryItemViewModel.h" +#include "Views/MemoryListItem.g.h" +#include "CalcViewModel/MemoryItemViewModel.h" namespace CalculatorApp { diff --git a/src/Calculator/Views/NumberPad.xaml.cpp b/src/Calculator/Views/NumberPad.xaml.cpp index 714aeabf..1e179d29 100644 --- a/src/Calculator/Views/NumberPad.xaml.cpp +++ b/src/Calculator/Views/NumberPad.xaml.cpp @@ -8,9 +8,9 @@ #include "pch.h" #include "NumberPad.xaml.h" -#include "Controls\CalculatorButton.h" -#include "CalcViewModel\StandardCalculatorViewModel.h" -#include "CalcViewModel\Common\LocalizationSettings.h" +#include "Controls/CalculatorButton.h" +#include "CalcViewModel/StandardCalculatorViewModel.h" +#include "CalcViewModel/Common/LocalizationSettings.h" using namespace CalculatorApp; using namespace CalculatorApp::ViewModel; diff --git a/src/Calculator/Views/NumberPad.xaml.h b/src/Calculator/Views/NumberPad.xaml.h index af4f2196..61b978e6 100644 --- a/src/Calculator/Views/NumberPad.xaml.h +++ b/src/Calculator/Views/NumberPad.xaml.h @@ -8,8 +8,8 @@ #pragma once -#include "Views\NumberPad.g.h" -#include "CalcViewModel\Common\KeyboardShortcutManager.h" +#include "Views/NumberPad.g.h" +#include "CalcViewModel/Common/KeyboardShortcutManager.h" namespace CalculatorApp { diff --git a/src/Calculator/Views/OperatorsPanel.xaml.h b/src/Calculator/Views/OperatorsPanel.xaml.h index 42c53020..dce811d4 100644 --- a/src/Calculator/Views/OperatorsPanel.xaml.h +++ b/src/Calculator/Views/OperatorsPanel.xaml.h @@ -3,11 +3,11 @@ #pragma once -#include "Views\OperatorsPanel.g.h" -#include "Views\CalculatorStandardOperators.xaml.h" -#include "Views\CalculatorScientificOperators.xaml.h" -#include "Views\CalculatorProgrammerBitFlipPanel.xaml.h" -#include "Views\CalculatorProgrammerRadixOperators.xaml.h" +#include "Views/OperatorsPanel.g.h" +#include "Views/CalculatorStandardOperators.xaml.h" +#include "Views/CalculatorScientificOperators.xaml.h" +#include "Views/CalculatorProgrammerBitFlipPanel.xaml.h" +#include "Views/CalculatorProgrammerRadixOperators.xaml.h" namespace CalculatorApp { diff --git a/src/Calculator/Views/SupplementaryResults.xaml.h b/src/Calculator/Views/SupplementaryResults.xaml.h index 6630fc1c..1d94b0ab 100644 --- a/src/Calculator/Views/SupplementaryResults.xaml.h +++ b/src/Calculator/Views/SupplementaryResults.xaml.h @@ -8,11 +8,11 @@ #pragma once -#include "Views\SupplementaryResults.g.h" -#include "Controls\SupplementaryItemsControl.h" -#include "Controls\OperandTextBox.h" -#include "Controls\OperatorTextBox.h" -#include "CalcViewModel\UnitConverterViewModel.h" +#include "Views/SupplementaryResults.g.h" +#include "Controls/SupplementaryItemsControl.h" +#include "Controls/OperandTextBox.h" +#include "Controls/OperatorTextBox.h" +#include "CalcViewModel/UnitConverterViewModel.h" namespace CalculatorApp { diff --git a/src/Calculator/Views/TitleBar.xaml.cpp b/src/Calculator/Views/TitleBar.xaml.cpp index d08739cd..e66413c6 100644 --- a/src/Calculator/Views/TitleBar.xaml.cpp +++ b/src/Calculator/Views/TitleBar.xaml.cpp @@ -3,7 +3,7 @@ #include "pch.h" #include "TitleBar.xaml.h" -#include "CalcViewModel\Common\AppResourceProvider.h" +#include "CalcViewModel/Common/AppResourceProvider.h" using namespace std; using namespace Platform; diff --git a/src/Calculator/Views/TitleBar.xaml.h b/src/Calculator/Views/TitleBar.xaml.h index 8945aa59..85a360b7 100644 --- a/src/Calculator/Views/TitleBar.xaml.h +++ b/src/Calculator/Views/TitleBar.xaml.h @@ -3,7 +3,7 @@ #pragma once -#include "Views\TitleBar.g.h" +#include "Views/TitleBar.g.h" namespace CalculatorApp { diff --git a/src/Calculator/Views/UnitConverter.xaml.cpp b/src/Calculator/Views/UnitConverter.xaml.cpp index 1116c04d..a4889a55 100644 --- a/src/Calculator/Views/UnitConverter.xaml.cpp +++ b/src/Calculator/Views/UnitConverter.xaml.cpp @@ -6,13 +6,13 @@ #include "pch.h" #include "UnitConverter.xaml.h" -#include "CalcViewModel\UnitConverterViewModel.h" -#include "Controls\CalculationResult.h" -#include "Controls\CalculatorButton.h" -#include "CalcViewModel\Common\CopyPasteManager.h" -#include "CalcViewModel\Common\KeyboardShortcutManager.h" -#include "CalcViewModel\Common\LocalizationService.h" -#include "CalcViewModel\Common\LocalizationSettings.h" +#include "CalcViewModel/UnitConverterViewModel.h" +#include "Controls/CalculationResult.h" +#include "Controls/CalculatorButton.h" +#include "CalcViewModel/Common/CopyPasteManager.h" +#include "CalcViewModel/Common/KeyboardShortcutManager.h" +#include "CalcViewModel/Common/LocalizationService.h" +#include "CalcViewModel/Common/LocalizationSettings.h" using namespace CalculatorApp; using namespace CalculatorApp::Common; diff --git a/src/Calculator/Views/UnitConverter.xaml.h b/src/Calculator/Views/UnitConverter.xaml.h index c65c6aa0..b4b84449 100644 --- a/src/Calculator/Views/UnitConverter.xaml.h +++ b/src/Calculator/Views/UnitConverter.xaml.h @@ -6,13 +6,13 @@ #pragma once -#include "Views\UnitConverter.g.h" -#include "Common\AlwaysSelectedCollectionView.h" -#include "CalcViewModel\Common\ValidatingConverters.h" -#include "Converters\BooleanToVisibilityConverter.h" -#include "Converters\VisibilityNegationConverter.h" -#include "CalcViewModel\UnitConverterViewModel.h" -#include "Views\StateTriggers\AspectRatioTrigger.h" +#include "Views/UnitConverter.g.h" +#include "Common/AlwaysSelectedCollectionView.h" +#include "CalcViewModel/Common/ValidatingConverters.h" +#include "Converters/BooleanToVisibilityConverter.h" +#include "Converters/VisibilityNegationConverter.h" +#include "CalcViewModel/UnitConverterViewModel.h" +#include "Views/StateTriggers/AspectRatioTrigger.h" namespace CalculatorApp { diff --git a/src/Calculator/pch.h b/src/Calculator/pch.h index c393e82a..92d16671 100644 --- a/src/Calculator/pch.h +++ b/src/Calculator/pch.h @@ -23,15 +23,15 @@ #include // C++\WinRT Headers -#include "winrt\base.h" -#include "winrt\Windows.ApplicationModel.h" -#include "winrt\Windows.ApplicationModel.Core.h" -#include "winrt\Windows.Foundation.Diagnostics.h" -#include "winrt\Windows.Globalization.h" -#include "winrt\Windows.Globalization.DateTimeFormatting.h" -#include "winrt\Windows.System.UserProfile.h" -#include "winrt\Windows.UI.ViewManagement.h" -#include "winrt\Windows.UI.Xaml.h" +#include "winrt/base.h" +#include "winrt/Windows.ApplicationModel.h" +#include "winrt/Windows.ApplicationModel.Core.h" +#include "winrt/Windows.Foundation.Diagnostics.h" +#include "winrt/Windows.Globalization.h" +#include "winrt/Windows.Globalization.DateTimeFormatting.h" +#include "winrt/Windows.System.UserProfile.h" +#include "winrt/Windows.UI.ViewManagement.h" +#include "winrt/Windows.UI.Xaml.h" // The following namespaces exist as a convenience to resolve // ambiguity for Windows types in the Windows::UI::Xaml::Automation::Peers diff --git a/src/CalculatorUnitTests/AsyncHelper.h b/src/CalculatorUnitTests/AsyncHelper.h index de3a88ea..3ad6c1d1 100644 --- a/src/CalculatorUnitTests/AsyncHelper.h +++ b/src/CalculatorUnitTests/AsyncHelper.h @@ -2,7 +2,7 @@ // Licensed under the MIT License. #pragma once -#include +#include namespace CalculatorApp { diff --git a/src/CalculatorUnitTests/CalcEngineTests.cpp b/src/CalculatorUnitTests/CalcEngineTests.cpp index 402f5314..1b9bc576 100644 --- a/src/CalculatorUnitTests/CalcEngineTests.cpp +++ b/src/CalculatorUnitTests/CalcEngineTests.cpp @@ -4,7 +4,7 @@ #include "pch.h" #include -#include "CalcViewModel\Common\EngineResourceProvider.h" +#include "CalcViewModel/Common/EngineResourceProvider.h" using namespace std; using namespace CalculatorApp; diff --git a/src/CalculatorUnitTests/CalculatorManagerTest.cpp b/src/CalculatorUnitTests/CalculatorManagerTest.cpp index 78b62238..37ceb429 100644 --- a/src/CalculatorUnitTests/CalculatorManagerTest.cpp +++ b/src/CalculatorUnitTests/CalculatorManagerTest.cpp @@ -5,8 +5,8 @@ #include -#include "CalcManager\CalculatorHistory.h" -#include "CalcViewModel\Common\EngineResourceProvider.h" +#include "CalcManager/CalculatorHistory.h" +#include "CalcViewModel/Common/EngineResourceProvider.h" using namespace CalculatorApp; using namespace CalculationManager; diff --git a/src/CalculatorUnitTests/CopyPasteManagerTest.cpp b/src/CalculatorUnitTests/CopyPasteManagerTest.cpp index ec681586..2e90d845 100644 --- a/src/CalculatorUnitTests/CopyPasteManagerTest.cpp +++ b/src/CalculatorUnitTests/CopyPasteManagerTest.cpp @@ -4,8 +4,8 @@ #include "pch.h" #include -#include "CalcViewModel\StandardCalculatorViewModel.h" -#include "CalcViewModel\Common\CopyPasteManager.h" +#include "CalcViewModel/StandardCalculatorViewModel.h" +#include "CalcViewModel/Common/CopyPasteManager.h" using namespace CalculationManager; using namespace CalculatorApp; diff --git a/src/CalculatorUnitTests/CurrencyConverterUnitTests.cpp b/src/CalculatorUnitTests/CurrencyConverterUnitTests.cpp index abb36123..ab7fa7e6 100644 --- a/src/CalculatorUnitTests/CurrencyConverterUnitTests.cpp +++ b/src/CalculatorUnitTests/CurrencyConverterUnitTests.cpp @@ -4,8 +4,8 @@ #include "pch.h" #include -#include "CalcViewModel\DataLoaders\CurrencyDataLoader.h" -#include "CalcViewModel\Common\LocalizationService.h" +#include "CalcViewModel/DataLoaders/CurrencyDataLoader.h" +#include "CalcViewModel/Common/LocalizationService.h" using namespace CalculatorApp::Common; using namespace CalculatorApp::Common::LocalizationServiceProperties; diff --git a/src/CalculatorUnitTests/DateCalculatorUnitTests.cpp b/src/CalculatorUnitTests/DateCalculatorUnitTests.cpp index 4d909455..7371a26d 100644 --- a/src/CalculatorUnitTests/DateCalculatorUnitTests.cpp +++ b/src/CalculatorUnitTests/DateCalculatorUnitTests.cpp @@ -5,8 +5,8 @@ #include #include "DateUtils.h" -#include "CalcViewModel\Common\DateCalculator.h" -#include "CalcViewModel\DateCalculatorViewModel.h" +#include "CalcViewModel/Common/DateCalculator.h" +#include "CalcViewModel/DateCalculatorViewModel.h" using namespace Platform; using namespace std; diff --git a/src/CalculatorUnitTests/Helpers.h b/src/CalculatorUnitTests/Helpers.h index 649e1564..7fd32d40 100644 --- a/src/CalculatorUnitTests/Helpers.h +++ b/src/CalculatorUnitTests/Helpers.h @@ -4,7 +4,7 @@ #include "pch.h" #pragma once -#include "CalcViewModel\Common\CalculatorButtonUser.h" +#include "CalcViewModel/Common/CalculatorButtonUser.h" namespace CalculatorUnitTests { diff --git a/src/CalculatorUnitTests/HistoryTests.cpp b/src/CalculatorUnitTests/HistoryTests.cpp index c85ad82c..8036ec15 100644 --- a/src/CalculatorUnitTests/HistoryTests.cpp +++ b/src/CalculatorUnitTests/HistoryTests.cpp @@ -4,8 +4,8 @@ #include "pch.h" #include -#include "CalcViewModel\HistoryViewModel.h" -#include "CalcViewModel\StandardCalculatorViewModel.h" +#include "CalcViewModel/HistoryViewModel.h" +#include "CalcViewModel/StandardCalculatorViewModel.h" using namespace CalculationManager; using namespace CalculatorApp; diff --git a/src/CalculatorUnitTests/Mocks/CurrencyHttpClient.cpp b/src/CalculatorUnitTests/Mocks/CurrencyHttpClient.cpp index 083342c3..56b6fd27 100644 --- a/src/CalculatorUnitTests/Mocks/CurrencyHttpClient.cpp +++ b/src/CalculatorUnitTests/Mocks/CurrencyHttpClient.cpp @@ -6,7 +6,7 @@ #include "pch.h" #include "CurrencyHttpClient.h" -#include "CalcViewModel\Common\NetworkManager.h" +#include "CalcViewModel/Common/NetworkManager.h" using namespace CalculatorApp::DataLoaders; using namespace Platform; diff --git a/src/CalculatorUnitTests/Mocks/CurrencyHttpClient.h b/src/CalculatorUnitTests/Mocks/CurrencyHttpClient.h index e9bff412..62b9e959 100644 --- a/src/CalculatorUnitTests/Mocks/CurrencyHttpClient.h +++ b/src/CalculatorUnitTests/Mocks/CurrencyHttpClient.h @@ -3,7 +3,7 @@ #pragma once -#include "CalcViewModel\DataLoaders\ICurrencyHttpClient.h" +#include "CalcViewModel/DataLoaders/ICurrencyHttpClient.h" namespace CalculatorApp { diff --git a/src/CalculatorUnitTests/MultiWindowUnitTests.cpp b/src/CalculatorUnitTests/MultiWindowUnitTests.cpp index 03faf1bd..fcb82171 100644 --- a/src/CalculatorUnitTests/MultiWindowUnitTests.cpp +++ b/src/CalculatorUnitTests/MultiWindowUnitTests.cpp @@ -6,10 +6,10 @@ #include "UnitConverterViewModelUnitTests.h" #include "DateUtils.h" -#include "CalcViewModel\StandardCalculatorViewModel.h" -#include "CalcViewModel\UnitConverterViewModel.h" -#include "CalcViewModel\DateCalculatorViewModel.h" -#include "CalcViewModel\DataLoaders\UnitConverterDataLoader.h" +#include "CalcViewModel/StandardCalculatorViewModel.h" +#include "CalcViewModel/UnitConverterViewModel.h" +#include "CalcViewModel/DateCalculatorViewModel.h" +#include "CalcViewModel/DataLoaders/UnitConverterDataLoader.h" using namespace Platform; using namespace Platform::Collections; diff --git a/src/CalculatorUnitTests/UnitConverterViewModelUnitTests.cpp b/src/CalculatorUnitTests/UnitConverterViewModelUnitTests.cpp index 4670ec48..e9e7817e 100644 --- a/src/CalculatorUnitTests/UnitConverterViewModelUnitTests.cpp +++ b/src/CalculatorUnitTests/UnitConverterViewModelUnitTests.cpp @@ -5,8 +5,8 @@ #include #include "UnitConverterViewModelUnitTests.h" -#include "CalcViewModel\UnitConverterViewModel.h" -#include "CalcViewModel\DataLoaders\UnitConverterDataLoader.h" +#include "CalcViewModel/UnitConverterViewModel.h" +#include "CalcViewModel/DataLoaders/UnitConverterDataLoader.h" using namespace CalculatorApp; using namespace CalculatorApp::Common; diff --git a/src/CalculatorUnitTests/UnitTestApp.xaml.h b/src/CalculatorUnitTests/UnitTestApp.xaml.h index f7918dbb..9877eea4 100644 --- a/src/CalculatorUnitTests/UnitTestApp.xaml.h +++ b/src/CalculatorUnitTests/UnitTestApp.xaml.h @@ -9,10 +9,10 @@ #pragma once #include "UnitTestApp.g.h" -#include "CalcViewModel\DateCalculatorViewModel.h" -#include "CalcViewModel\StandardCalculatorViewModel.h" -#include "CalcViewModel\UnitConverterViewModel.h" -#include "CalcViewModel\MemoryItemViewModel.h" +#include "CalcViewModel/DateCalculatorViewModel.h" +#include "CalcViewModel/StandardCalculatorViewModel.h" +#include "CalcViewModel/UnitConverterViewModel.h" +#include "CalcViewModel/MemoryItemViewModel.h" namespace CalculatorUnitTests { diff --git a/src/CalculatorUnitTests/pch.h b/src/CalculatorUnitTests/pch.h index ecfd700f..7f46aeac 100644 --- a/src/CalculatorUnitTests/pch.h +++ b/src/CalculatorUnitTests/pch.h @@ -38,11 +38,11 @@ #include // C++\WinRT Headers -#include "winrt\base.h" -#include "winrt\Windows.Foundation.Diagnostics.h" -#include "winrt\Windows.Globalization.h" -#include "winrt\Windows.Globalization.DateTimeFormatting.h" -#include "winrt\Windows.System.UserProfile.h" +#include "winrt/base.h" +#include "winrt/Windows.Foundation.Diagnostics.h" +#include "winrt/Windows.Globalization.h" +#include "winrt/Windows.Globalization.DateTimeFormatting.h" +#include "winrt/Windows.System.UserProfile.h" namespace CalculatorApp { @@ -74,21 +74,21 @@ 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" +#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\MyVirtualKey.h" -#include "CalcViewModel\Common\NavCategory.h" -#include "CalcViewModel\Common\CalculatorButtonUser.h" -#include "CalcViewModel\Common\NetworkManager.h" +#include "CalcViewModel/Common/DelegateCommand.h" +#include "CalcViewModel/Common/Utils.h" +#include "CalcViewModel/Common/MyVirtualKey.h" +#include "CalcViewModel/Common/NavCategory.h" +#include "CalcViewModel/Common/CalculatorButtonUser.h" +#include "CalcViewModel/Common/NetworkManager.h" -#include "Mocks\CurrencyHttpClient.h" +#include "Mocks/CurrencyHttpClient.h" #include "Helpers.h" #include "UnitTestApp.xaml.h"