From 07ff1c372fba4176382ab446b5621900e9331a38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Wed, 6 Mar 2019 23:51:21 +0100 Subject: [PATCH 01/17] Fix initialization order in CEngine (#118) The order of initialization of fields is required to match the one in class member fields declaration. --- src/CalcManager/CEngine/History.cpp | 4 +-- src/CalcManager/CEngine/calc.cpp | 36 ++++++++++++------------ src/CalcManager/Header Files/CalcInput.h | 10 +++---- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/CalcManager/CEngine/History.cpp b/src/CalcManager/CEngine/History.cpp index 5724af2b..631c254b 100644 --- a/src/CalcManager/CEngine/History.cpp +++ b/src/CalcManager/CEngine/History.cpp @@ -35,8 +35,8 @@ void CHistoryCollector::ReinitHistory() CHistoryCollector::CHistoryCollector(ICalcDisplay *pCalcDisplay, std::shared_ptr pHistoryDisplay, wchar_t decimalSymbol) : m_pHistoryDisplay(pHistoryDisplay), m_pCalcDisplay(pCalcDisplay), - m_decimalSymbol(decimalSymbol), - m_iCurLineHistStart(-1) + m_iCurLineHistStart(-1), + m_decimalSymbol(decimalSymbol) { ReinitHistory(); } diff --git a/src/CalcManager/CEngine/calc.cpp b/src/CalcManager/CEngine/calc.cpp index 7be2ff13..6f93a600 100644 --- a/src/CalcManager/CEngine/calc.cpp +++ b/src/CalcManager/CEngine/calc.cpp @@ -55,41 +55,41 @@ void CCalcEngine::InitialOneTimeOnlySetup(CalculationManager::IResourceProvider& // ////////////////////////////////////////////////// CCalcEngine::CCalcEngine(bool fPrecedence, bool fIntegerMode, CalculationManager::IResourceProvider* const pResourceProvider, __in_opt ICalcDisplay *pCalcDisplay, __in_opt shared_ptr pHistoryDisplay) : - m_HistoryCollector(pCalcDisplay, pHistoryDisplay, DEFAULT_DEC_SEPARATOR), - m_resourceProvider(pResourceProvider), - m_bSetCalcState(false), m_fPrecedence(fPrecedence), m_fIntegerMode(fIntegerMode), m_pCalcDisplay(pCalcDisplay), - m_input(DEFAULT_DEC_SEPARATOR), + m_resourceProvider(pResourceProvider), m_nOpCode(0), m_nPrevOpCode(0), - m_openParenCount(0), - m_precedenceOpCount(0), - m_nTempCom(0), - m_nLastCom(0), - m_parenVals{}, - m_precedenceVals{}, m_bChangeOp(false), m_bRecord(false), + m_bSetCalcState(false), + m_input(DEFAULT_DEC_SEPARATOR), + m_nFE(FMT_FLOAT), + m_memoryValue{ make_unique() }, + m_holdVal{}, + m_currentVal{}, + m_lastVal{}, + m_parenVals{}, + m_precedenceVals{}, m_bError(false), m_bInv(false), - m_nFE(FMT_FLOAT), m_bNoPrevEqu(true), - m_numwidth(QWORD_WIDTH), - m_angletype(ANGLE_DEG), m_radix(DEFAULT_RADIX), m_precision(DEFAULT_PRECISION), m_cIntDigitsSav(DEFAULT_MAX_DIGITS), m_decGrouping(), - m_groupSeparator(DEFAULT_GRP_SEPARATOR), m_numberString(DEFAULT_NUMBER_STR), + m_nTempCom(0), + m_openParenCount(0), m_nOp(), m_nPrecOp(), - m_memoryValue{ make_unique() }, - m_holdVal{}, - m_currentVal{}, - m_lastVal{} + m_precedenceOpCount(0), + m_nLastCom(0), + m_angletype(ANGLE_DEG), + m_numwidth(QWORD_WIDTH), + m_HistoryCollector(pCalcDisplay, pHistoryDisplay, DEFAULT_DEC_SEPARATOR), + m_groupSeparator(DEFAULT_GRP_SEPARATOR) { InitChopNumbers(); diff --git a/src/CalcManager/Header Files/CalcInput.h b/src/CalcManager/Header Files/CalcInput.h index 22b2b563..0f86f4f5 100644 --- a/src/CalcManager/Header Files/CalcInput.h +++ b/src/CalcManager/Header Files/CalcInput.h @@ -14,8 +14,8 @@ namespace CalcEngine { public: CalcNumSec() : - m_isNegative(false), - value() + value(), + m_isNegative(false) {} void Clear(); @@ -37,12 +37,12 @@ namespace CalcEngine {} CalcInput(wchar_t decSymbol) : - m_base(), - m_exponent(), m_hasExponent(false), m_hasDecimal(false), m_decPtIndex(0), - m_decSymbol(decSymbol) + m_decSymbol(decSymbol), + m_base(), + m_exponent() {} void Clear(); From 0197fa41dafb41b76e52416eda105399aac8bafd Mon Sep 17 00:00:00 2001 From: Edward Betts Date: Wed, 6 Mar 2019 20:31:22 +0000 Subject: [PATCH 02/17] Correct spelling mistakes --- docs/ApplicationArchitecture.md | 4 ++-- src/CalcManager/UnitConverter.cpp | 2 +- src/CalcViewModel/Common/KeyboardShortcutManager.cpp | 4 ++-- src/CalcViewModel/Common/Utils.h | 2 +- src/Calculator/Views/SupplementaryResults.xaml.cpp | 4 ++-- src/CalculatorUnitTests/MultiWindowUnitTests.cpp | 2 +- src/CalculatorUnitTests/StandardViewModelUnitTests.cpp | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/docs/ApplicationArchitecture.md b/docs/ApplicationArchitecture.md index 4f71b10e..0d7c2ff3 100644 --- a/docs/ApplicationArchitecture.md +++ b/docs/ApplicationArchitecture.md @@ -87,7 +87,7 @@ The ViewModel layer is contained in the [CalcViewModel][CalcViewModel folder] pr data for the UI to bind against and act as the intermediary separating pure business logic from UI components that should not care about the model's implementation. Just as the View layer consists of a hierarchy of XAML files, the ViewModel consists of a hierarchy of ViewModel files. The relationship between XAML and ViewModel files is often 1:1. -Here are the noteable ViewModel files to start exploring with: +Here are the notable ViewModel files to start exploring with: * [ApplicationViewModel.h][ApplicationViewModel.h]: The ViewModel for [MainPage.xaml][MainPage.xaml]. This ViewModel is the root of the other mode-specific ViewModels. The application changes between modes by updating the `Mode` property @@ -199,4 +199,4 @@ The RatPack (short for Rational Pack) is the core of the Calculator model and co [CalcManager folder]: ../src/CalcManager [CalculatorManager.h]: ../src/CalcManager/CalculatorManager.h [CalcEngine.h]: ../src/CalcManager/Header Files/CalcEngine.h -[ratpak.h]: ../src/CalcManager/Ratpack/ratpak.h \ No newline at end of file +[ratpak.h]: ../src/CalcManager/Ratpack/ratpak.h diff --git a/src/CalcManager/UnitConverter.cpp b/src/CalcManager/UnitConverter.cpp index 587a311c..07f75d33 100644 --- a/src/CalcManager/UnitConverter.cpp +++ b/src/CalcManager/UnitConverter.cpp @@ -903,7 +903,7 @@ shared_ptr UnitConverter::GetDataLoaderForCategory(const C } /// -/// Sets the intial values for m_fromType and m_toType. +/// Sets the initial values for m_fromType and m_toType. /// This is an internal helper method as opposed to SetCurrentUnits /// which is for external use by clients. /// If we fail to set units, we will fallback to the EMPTY_UNIT. diff --git a/src/CalcViewModel/Common/KeyboardShortcutManager.cpp b/src/CalcViewModel/Common/KeyboardShortcutManager.cpp index d8c40f49..248f65cc 100644 --- a/src/CalcViewModel/Common/KeyboardShortcutManager.cpp +++ b/src/CalcViewModel/Common/KeyboardShortcutManager.cpp @@ -441,8 +441,8 @@ void KeyboardShortcutManager::OnVirtualKeyControlInverseChordPropertyChanged( } } -// In the three event handlers bellow we will not mark the event as handled -// because this is a sumplemental operation and we don't want to interfere with +// In the three event handlers below we will not mark the event as handled +// because this is a supplemental operation and we don't want to interfere with // the normal keyboard handling. void KeyboardShortcutManager::OnCharacterReceivedHandler(CoreWindow^ sender, CharacterReceivedEventArgs^ args) { diff --git a/src/CalcViewModel/Common/Utils.h b/src/CalcViewModel/Common/Utils.h index 949ba0f0..d682a76a 100644 --- a/src/CalcViewModel/Common/Utils.h +++ b/src/CalcViewModel/Common/Utils.h @@ -398,7 +398,7 @@ namespace Utils static void On##name##PropertyChangedImpl(Windows::UI::Xaml::DependencyObject^ sender, Windows::UI::Xaml::DependencyPropertyChangedEventArgs^ args) {\ On##name##PropertyChanged(sender, safe_cast(args->OldValue), safe_cast(args->NewValue)); } public: -// This goes into the cpp to initalize the static variable +// This goes into the cpp to initialize the static variable #define DEPENDENCY_PROPERTY_INITIALIZATION(owner, name)\ Windows::UI::Xaml::DependencyProperty^ owner::s_##name##Property =\ owner::Initialize##name##Property(); diff --git a/src/Calculator/Views/SupplementaryResults.xaml.cpp b/src/Calculator/Views/SupplementaryResults.xaml.cpp index e8149936..e5d10494 100644 --- a/src/Calculator/Views/SupplementaryResults.xaml.cpp +++ b/src/Calculator/Views/SupplementaryResults.xaml.cpp @@ -103,13 +103,13 @@ void SupplementaryResults::OnConverterPropertyChanged(Object^ /*sender*/, Proper void SupplementaryResults::OnWindowSizeChanged(Platform::Object^ sender, Windows::UI::Core::WindowSizeChangedEventArgs^ e) { - // to reload supplementary results everytime the window is resized + // to reload supplementary results every time the window is resized RefreshData(); } void SupplementaryResults::OnSupplementaryValuesLayoutUpdated(Platform::Object^ sender, Platform::Object^ e) { - // This means we overflowed and are cutting off, or in a very rare case we fit exactly. Unforunately + // This means we overflowed and are cutting off, or in a very rare case we fit exactly. Unfortunately // the fitting exactly case will still have an item removed, as there is no other way for us to // detect that we need to trim. Grid^ parentGrid = dynamic_cast(VisualTreeHelper::GetParent(this)); diff --git a/src/CalculatorUnitTests/MultiWindowUnitTests.cpp b/src/CalculatorUnitTests/MultiWindowUnitTests.cpp index 7e14a11d..15817303 100644 --- a/src/CalculatorUnitTests/MultiWindowUnitTests.cpp +++ b/src/CalculatorUnitTests/MultiWindowUnitTests.cpp @@ -101,7 +101,7 @@ namespace CalculatorUnitTests } } - // Perform calculations on diferent calculator modes and verify that they work independently + // Perform calculations on different calculator modes and verify that they work independently TEST_METHOD(MultipleModesCalculationTest) { std::vector viewModels(3); diff --git a/src/CalculatorUnitTests/StandardViewModelUnitTests.cpp b/src/CalculatorUnitTests/StandardViewModelUnitTests.cpp index 640f163c..214c612f 100644 --- a/src/CalculatorUnitTests/StandardViewModelUnitTests.cpp +++ b/src/CalculatorUnitTests/StandardViewModelUnitTests.cpp @@ -509,7 +509,7 @@ namespace CalculatorUnitTests } // Switch Calculator Mode and verify if mode switch is happening as expected. - // Test precendence to check if mode switch is happening + // Test precedence to check if mode switch is happening // Standard mode 1+2*3 = 9; Scientific mode 1+2*3 = 7 // Intermediate value is also different. after 1 + 2 * , standard shows 3, scientific shows 2 TEST_METHOD(ButtonPressedCalculatorModeSwitch) From ca01a7e44424a44543ac1f83939cf50bbcbaba72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Wed, 6 Mar 2019 23:21:58 +0100 Subject: [PATCH 03/17] Add explicit [[fallthrough]] attribute --- src/CalcManager/CEngine/scifunc.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/CalcManager/CEngine/scifunc.cpp b/src/CalcManager/CEngine/scifunc.cpp index eb513ea8..75fbbfcf 100644 --- a/src/CalcManager/CEngine/scifunc.cpp +++ b/src/CalcManager/CEngine/scifunc.cpp @@ -173,6 +173,7 @@ CalcEngine::Rational CCalcEngine::SciCalcFunctions(CalcEngine::Rational const& r // the degrees functionality was achieved as 'Inv' of 'dms' operation, // so setting the IDC_INV command first and then performing 'dms' operation as global variables m_bInv, m_bRecord // are set properly through ProcessCommand(IDC_INV) + [[fallthrough]]; case IDC_DMS: { if (!m_fIntegerMode) From 6c0e4e81e744186107a5ca60b398b7efa357e232 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Wed, 6 Mar 2019 23:44:07 +0100 Subject: [PATCH 04/17] Remove unused values --- src/CalcManager/CEngine/History.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/CalcManager/CEngine/History.cpp b/src/CalcManager/CEngine/History.cpp index 631c254b..3520b974 100644 --- a/src/CalcManager/CEngine/History.cpp +++ b/src/CalcManager/CEngine/History.cpp @@ -161,7 +161,7 @@ void CHistoryCollector::PopLastOpndStart() void CHistoryCollector::AddOpenBraceToHistory() { - int iCommandEnd = AddCommand(std::make_shared(IDC_OPENP)); + AddCommand(std::make_shared(IDC_OPENP)); int ichOpndStart = IchAddSzToEquationSz(CCalcEngine::OpCodeToString(IDC_OPENP), -1); PushLastOpndStart(ichOpndStart); @@ -171,7 +171,7 @@ void CHistoryCollector::AddOpenBraceToHistory() void CHistoryCollector::AddCloseBraceToHistory() { - int iCommandEnd = AddCommand(std::make_shared(IDC_CLOSEP)); + AddCommand(std::make_shared(IDC_CLOSEP)); IchAddSzToEquationSz(CCalcEngine::OpCodeToString(IDC_CLOSEP), -1); SetExpressionDisplay(); PopLastOpndStart(); @@ -450,20 +450,16 @@ std::shared_ptr> CHistoryCollector::GetOperandCommandsFrom std::shared_ptr> commands = std::make_shared>(); // Check for negate bool fNegative = (numStr[0] == L'-'); - bool fSciFmt = false; - bool fDecimal = false; for (size_t i = (fNegative ? 1 : 0); i < numStr.length(); i++) { if (numStr[i] == m_decimalSymbol) { IFT(commands->Append(IDC_PNT)); - fDecimal = true; } else if (numStr[i] == L'e') { IFT(commands->Append(IDC_EXP)); - fSciFmt = true; } else if (numStr[i] == L'-') { From 8fa9a691cc2490299753e753eff65c060d737559 Mon Sep 17 00:00:00 2001 From: Jared Fuchs Date: Wed, 6 Mar 2019 15:24:21 -0500 Subject: [PATCH 05/17] Fix comment on IsEven Looks like the comment on IsEven should read this way instead of "The assumption here is its numerator is 1 and we are testing the numerator is even or not" --- src/CalcManager/Ratpack/exp.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CalcManager/Ratpack/exp.cpp b/src/CalcManager/Ratpack/exp.cpp index ec87204a..97d02c6b 100644 --- a/src/CalcManager/Ratpack/exp.cpp +++ b/src/CalcManager/Ratpack/exp.cpp @@ -235,7 +235,7 @@ void log10rat( PRAT *px, int32_t precision) } // -// return if the given x is even number. The assumption here is its numerator is 1 and we are testing the numerator is +// return if the given x is even number. The assumption here is its denominator is 1 and we are testing the numerator is // even or not bool IsEven(PRAT x, uint32_t radix, int32_t precision) { From 6a1c2e4bbfd81a9018c8b3e39d2d4afef5caf9f2 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 6 Mar 2019 21:47:27 -0500 Subject: [PATCH 06/17] Fix smart quotes (#131) --- docs/ManualTests.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/ManualTests.md b/docs/ManualTests.md index deb8111a..6fbc6716 100644 --- a/docs/ManualTests.md +++ b/docs/ManualTests.md @@ -11,7 +11,7 @@ These manual tests are run before every release of the Calculator app. Steps: 1. From the Standard Calculator page, input “3”, “+”, “3”, “Enter” on the keyboard Expected: “6” shows up in the display -2. Input “4”, “-“, “2”, “=” using the in-app buttons +2. Input “4”, “-”, “2”, “=” using the in-app buttons *Expected: “2” shows up in the display* **Test 2** @@ -31,7 +31,7 @@ Steps: **Test 2** Steps: -1. Input “5”, “n!“, “=” using the in-app buttons +1. Input “5”, “n!”, “=” using the in-app buttons *Expected: “120” shows up in the display* ### Math in Programmer Calculator From dc00380d0f1a8e395bba20efaddf894d5d76ce5e Mon Sep 17 00:00:00 2001 From: Karan Nandwani Date: Thu, 7 Mar 2019 07:33:22 -0800 Subject: [PATCH 07/17] updating nuget.org source to point to V3 (#129) --- internal/nuget.config | 2 +- src/nuget.config | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/nuget.config b/internal/nuget.config index bd1364ee..606b6309 100644 --- a/internal/nuget.config +++ b/internal/nuget.config @@ -4,7 +4,7 @@ - + diff --git a/src/nuget.config b/src/nuget.config index 2d76b6fe..63a9d4e6 100644 --- a/src/nuget.config +++ b/src/nuget.config @@ -4,7 +4,7 @@ - + From 8a75dcd09d6630ac24e049af9ebb1164fdfac9bf Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Thu, 7 Mar 2019 11:56:25 -0500 Subject: [PATCH 08/17] Switch urls from http: to https: (#137) --- CONTRIBUTING.md | 4 ++-- NOTICE.txt | 2 +- README.md | 2 +- docs/NewFeatureProcess.md | 4 ++-- src/CalcManager/CalculatorResource.h | 2 +- src/CalcViewModel/CalcViewModel.vcxproj | 2 +- src/Calculator/Calculator.vcxproj | 2 +- .../Views/CalculatorProgrammerBitFlipPanel.xaml.cpp | 2 +- .../Views/CalculatorScientificAngleButtons.xaml.cpp | 2 +- src/Calculator/Views/CalculatorStandardOperators.xaml.cpp | 2 +- src/Calculator/Views/DateCalculator.xaml.cpp | 2 +- src/Calculator/Views/HistoryList.xaml.cpp | 2 +- src/Calculator/Views/Memory.xaml.cpp | 2 +- src/Calculator/Views/NumberPad.xaml.cpp | 2 +- src/Calculator/Views/SupplementaryResults.xaml.cpp | 2 +- src/Calculator/Views/UnitConverter.xaml.cpp | 2 +- src/CalculatorUnitTests/UnitTestApp.rd.xml | 2 +- src/CalculatorUnitTests/UnitTestApp.xaml.cpp | 2 +- 18 files changed, 20 insertions(+), 20 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e0217867..9bab5f16 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -41,7 +41,7 @@ To learn how to build the code and run tests, follow the instructions in the [RE ### Style guidelines The code in this project uses several different coding styles, depending on the age and history of the code. Please attempt to match the style of surrounding code as much as possible. In new -components, prefer the patterns described in the [C++ core guidelines](http://isocpp.github.io/CppCoreGuidelines/CppCoreGuidelines) +components, prefer the patterns described in the [C++ core guidelines](https://isocpp.github.io/CppCoreGuidelines/CppCoreGuidelines) and the [modern C++/WinRT language projections](https://docs.microsoft.com/en-us/windows/uwp/cpp-and-winrt-apis/). ### Testing @@ -91,4 +91,4 @@ You don't need to sign a CLA until you're ready to create a pull request. When y created, it is classified by a bot. If the change is trivial (i.e. you just fixed a typo) then the bot will label the PR `cla-not-required`. Otherwise, it's classified as `cla-required`. In that case, the system will also tell you how you can sign the CLA. Once you have signed a CLA, the -current and all future pull requests will be labeled as `cla-signed`. \ No newline at end of file +current and all future pull requests will be labeled as `cla-signed`. diff --git a/NOTICE.txt b/NOTICE.txt index 60d809cb..d115a691 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -2,7 +2,7 @@ THIRD PARTY SOFTWARE NOTICES AND INFORMATION Do Not Translate or Localize This software incorporates material from third parties. Microsoft makes certain -open source code available at http://3rdpartysource.microsoft.com, or you may +open source code available at https://3rdpartysource.microsoft.com, or you may send a check or money order for US $5.00, including the product name, the open source component name, and version number, to: diff --git a/README.md b/README.md index ba76c48b..23afe0de 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ For information regarding Windows Calculator plans and release schedule, please ## 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. +Read our [privacy statement](https://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. diff --git a/docs/NewFeatureProcess.md b/docs/NewFeatureProcess.md index 6aa2e22a..66c9a635 100644 --- a/docs/NewFeatureProcess.md +++ b/docs/NewFeatureProcess.md @@ -131,9 +131,9 @@ new features, the Microsoft team considers at least these items: - [ ] Microsoft must plan to keep these dependencies secure and functional for the lifetime of the app (which might be several years). - [ ] The app should be fully functional if some network requests are slow or fail. Tools like - [Fiddler](http://docs.telerik.com/fiddler/knowledgebase/fiddlerscript/perftesting) + [Fiddler](https://docs.telerik.com/fiddler/knowledgebase/fiddlerscript/perftesting) can be used to simulate slow or failed requests. ## Step 4: Final product review and merge to master After the technical review is complete, the product team will review the finished product to make -sure the final implementation is ready to [release to Windows customers](Roadmap.md#Releases). \ No newline at end of file +sure the final implementation is ready to [release to Windows customers](Roadmap.md#Releases). diff --git a/src/CalcManager/CalculatorResource.h b/src/CalcManager/CalculatorResource.h index 51db56da..51bdd8b6 100644 --- a/src/CalcManager/CalculatorResource.h +++ b/src/CalcManager/CalculatorResource.h @@ -15,7 +15,7 @@ namespace CalculationManager // and the ids to define them with can be seen in EngineStrings.h // with SIDS prefix. Additionally it must provide values for string // ids "sDecimal", "sThousand" and "sGrouping". See - // http://technet.microsoft.com/en-us/library/cc782655(v=ws.10).aspx + // https://technet.microsoft.com/en-us/library/cc782655(v=ws.10).aspx // for what these values refer to. virtual std::wstring GetCEngineString(const std::wstring& id) = 0; }; diff --git a/src/CalcViewModel/CalcViewModel.vcxproj b/src/CalcViewModel/CalcViewModel.vcxproj index 8ace7400..33715487 100644 --- a/src/CalcViewModel/CalcViewModel.vcxproj +++ b/src/CalcViewModel/CalcViewModel.vcxproj @@ -402,7 +402,7 @@ - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see https://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. diff --git a/src/Calculator/Calculator.vcxproj b/src/Calculator/Calculator.vcxproj index 7dd449e1..60aef8f3 100644 --- a/src/Calculator/Calculator.vcxproj +++ b/src/Calculator/Calculator.vcxproj @@ -844,7 +844,7 @@ - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see https://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. diff --git a/src/Calculator/Views/CalculatorProgrammerBitFlipPanel.xaml.cpp b/src/Calculator/Views/CalculatorProgrammerBitFlipPanel.xaml.cpp index a6b8bfeb..579c627e 100644 --- a/src/Calculator/Views/CalculatorProgrammerBitFlipPanel.xaml.cpp +++ b/src/Calculator/Views/CalculatorProgrammerBitFlipPanel.xaml.cpp @@ -23,7 +23,7 @@ using namespace Windows::UI::Xaml::Controls; using namespace Windows::UI::Xaml::Data; using namespace Windows::UI::Xaml::Input; -// The User Control item template is documented at http://go.microsoft.com/fwlink/?LinkId=234236 +// The User Control item template is documented at https://go.microsoft.com/fwlink/?LinkId=234236 CalculatorProgrammerBitFlipPanel::CalculatorProgrammerBitFlipPanel() : m_updatingCheckedStates(false) diff --git a/src/Calculator/Views/CalculatorScientificAngleButtons.xaml.cpp b/src/Calculator/Views/CalculatorScientificAngleButtons.xaml.cpp index 981b2168..16f0cc5d 100644 --- a/src/Calculator/Views/CalculatorScientificAngleButtons.xaml.cpp +++ b/src/Calculator/Views/CalculatorScientificAngleButtons.xaml.cpp @@ -27,7 +27,7 @@ using namespace Windows::UI::Xaml::Navigation; using namespace Windows::UI::ViewManagement; using namespace Windows::UI::Core; -// The User Control item template is documented at http://go.microsoft.com/fwlink/?LinkId=234236 +// The User Control item template is documented at https://go.microsoft.com/fwlink/?LinkId=234236 CalculatorScientificAngleButtons::CalculatorScientificAngleButtons() : m_isErrorVisualState(false) diff --git a/src/Calculator/Views/CalculatorStandardOperators.xaml.cpp b/src/Calculator/Views/CalculatorStandardOperators.xaml.cpp index 672d1a6e..a74a91f8 100644 --- a/src/Calculator/Views/CalculatorStandardOperators.xaml.cpp +++ b/src/Calculator/Views/CalculatorStandardOperators.xaml.cpp @@ -22,7 +22,7 @@ using namespace Windows::UI::Xaml::Input; using namespace Windows::UI::Xaml::Media; using namespace Windows::UI::Xaml::Navigation; -// The User Control item template is documented at http://go.microsoft.com/fwlink/?LinkId=234236 +// The User Control item template is documented at https://go.microsoft.com/fwlink/?LinkId=234236 CalculatorStandardOperators::CalculatorStandardOperators() : m_isErrorVisualState(false) diff --git a/src/Calculator/Views/DateCalculator.xaml.cpp b/src/Calculator/Views/DateCalculator.xaml.cpp index 386e5243..0df8cd3e 100644 --- a/src/Calculator/Views/DateCalculator.xaml.cpp +++ b/src/Calculator/Views/DateCalculator.xaml.cpp @@ -36,7 +36,7 @@ using namespace Windows::UI::Xaml::Input; using namespace Windows::UI::Xaml::Media; using namespace Windows::UI::Xaml::Navigation; -// The User Control item template is documented at http://go.microsoft.com/fwlink/?LinkId=234236 +// The User Control item template is documented at https://go.microsoft.com/fwlink/?LinkId=234236 DateCalculator::DateCalculator() { diff --git a/src/Calculator/Views/HistoryList.xaml.cpp b/src/Calculator/Views/HistoryList.xaml.cpp index 0705884e..76786330 100644 --- a/src/Calculator/Views/HistoryList.xaml.cpp +++ b/src/Calculator/Views/HistoryList.xaml.cpp @@ -29,7 +29,7 @@ using namespace Windows::UI::ViewManagement; namespace MUXC = Microsoft::UI::Xaml::Controls; -// The Blank Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=390556 +// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=390556 DEPENDENCY_PROPERTY_INITIALIZATION(HistoryList, RowHeight); diff --git a/src/Calculator/Views/Memory.xaml.cpp b/src/Calculator/Views/Memory.xaml.cpp index ab69417b..fc69b10c 100644 --- a/src/Calculator/Views/Memory.xaml.cpp +++ b/src/Calculator/Views/Memory.xaml.cpp @@ -31,7 +31,7 @@ using namespace Windows::UI::Xaml::Media; using namespace Windows::UI::Xaml::Navigation; using namespace Windows::UI::ViewManagement; -// The User Control item template is documented at http://go.microsoft.com/fwlink/?LinkId=234236 +// The User Control item template is documented at https://go.microsoft.com/fwlink/?LinkId=234236 DEPENDENCY_PROPERTY_INITIALIZATION(Memory, RowHeight); diff --git a/src/Calculator/Views/NumberPad.xaml.cpp b/src/Calculator/Views/NumberPad.xaml.cpp index 7c51f040..714aeabf 100644 --- a/src/Calculator/Views/NumberPad.xaml.cpp +++ b/src/Calculator/Views/NumberPad.xaml.cpp @@ -27,7 +27,7 @@ using namespace Windows::UI::Xaml::Media; using namespace Windows::UI::Xaml::Navigation; using namespace CalculatorApp::Common; -// The User Control item template is documented at http://go.microsoft.com/fwlink/?LinkId=234236 +// The User Control item template is documented at https://go.microsoft.com/fwlink/?LinkId=234236 DEPENDENCY_PROPERTY_INITIALIZATION(NumberPad, ButtonStyle); diff --git a/src/Calculator/Views/SupplementaryResults.xaml.cpp b/src/Calculator/Views/SupplementaryResults.xaml.cpp index e5d10494..d598ae93 100644 --- a/src/Calculator/Views/SupplementaryResults.xaml.cpp +++ b/src/Calculator/Views/SupplementaryResults.xaml.cpp @@ -25,7 +25,7 @@ using namespace Windows::UI::Xaml::Interop; using namespace Windows::UI::Xaml::Media; using namespace Windows::UI::Xaml::Navigation; -// The User Control item template is documented at http://go.microsoft.com/fwlink/?LinkId=234236 +// The User Control item template is documented at https://go.microsoft.com/fwlink/?LinkId=234236 Object^ DelighterUnitToStyleConverter::Convert(Object^ value, TypeName /*targetType*/, Object^ /*parameter*/, String^ /*language*/) { diff --git a/src/Calculator/Views/UnitConverter.xaml.cpp b/src/Calculator/Views/UnitConverter.xaml.cpp index add80774..1116c04d 100644 --- a/src/Calculator/Views/UnitConverter.xaml.cpp +++ b/src/Calculator/Views/UnitConverter.xaml.cpp @@ -38,7 +38,7 @@ using namespace Windows::UI::Xaml::Media; using namespace Windows::UI::Xaml::Navigation; using namespace Windows::UI::ViewManagement; -// The User Control item template is documented at http://go.microsoft.com/fwlink/?LinkId=234236 +// The User Control item template is documented at https://go.microsoft.com/fwlink/?LinkId=234236 // Calculate number of 100-nanosecond intervals in 500 milliseconds. // There are 10,000 intervals in 1 ms. diff --git a/src/CalculatorUnitTests/UnitTestApp.rd.xml b/src/CalculatorUnitTests/UnitTestApp.rd.xml index 4a861a6f..b84bd4ba 100644 --- a/src/CalculatorUnitTests/UnitTestApp.rd.xml +++ b/src/CalculatorUnitTests/UnitTestApp.rd.xml @@ -3,7 +3,7 @@ developers. However, you can modify these parameters to modify the behavior of the .NET Native optimizer. - Runtime Directives are documented at http://go.microsoft.com/fwlink/?LinkID=391919 + Runtime Directives are documented at https://go.microsoft.com/fwlink/?LinkID=391919 To fully enable reflection for App1.MyClass and all of its public/private members diff --git a/src/CalculatorUnitTests/UnitTestApp.xaml.cpp b/src/CalculatorUnitTests/UnitTestApp.xaml.cpp index c9d685ad..de9d5bb1 100644 --- a/src/CalculatorUnitTests/UnitTestApp.xaml.cpp +++ b/src/CalculatorUnitTests/UnitTestApp.xaml.cpp @@ -25,7 +25,7 @@ using namespace Windows::UI::Xaml::Interop; using namespace Windows::UI::Xaml::Media; using namespace Windows::UI::Xaml::Navigation; -// The Blank Application template is documented at http://go.microsoft.com/fwlink/?LinkId=402347&clcid=0x409 +// The Blank Application template is documented at https://go.microsoft.com/fwlink/?LinkId=402347&clcid=0x409 /// /// Initializes the singleton application object. This is the first line of authored code From 20afac5572d5a25a5cd5fed70dabc64f239f5661 Mon Sep 17 00:00:00 2001 From: Rudy Huyn Date: Thu, 7 Mar 2019 09:24:34 -0800 Subject: [PATCH 09/17] Modify how default units are selected for conversions (#126) --- .../DataLoaders/UnitConverterDataLoader.cpp | 79 ++++++++----------- .../DataLoaders/UnitConverterDataLoader.h | 1 - 2 files changed, 34 insertions(+), 46 deletions(-) diff --git a/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.cpp b/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.cpp index 754b3ee8..19ee3baf 100644 --- a/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.cpp +++ b/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.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" @@ -156,27 +156,34 @@ void UnitConverterDataLoader::GetCategories(_In_ shared_ptr>& unitMap) { - bool USSource, USTarget; - bool UKSource, UKTarget; - bool Source, Target; + // US + Federated States of Micronesia, Marshall Islands, Palau + bool useUSCustomaryAndFahrenheit = m_currentRegionCode == L"US" || + m_currentRegionCode == L"PW" || + m_currentRegionCode == L"FM" || + m_currentRegionCode == L"MH" || + m_currentRegionCode == L"PW"; - USSource = (GetRegion() == L"US") ? true : false; - USTarget = USSource; + // useUSCustomaryAndFahrenheit + Liberia + // Source: https://en.wikipedia.org/wiki/Metrication + bool useUSCustomary = useUSCustomaryAndFahrenheit || m_currentRegionCode == L"LR"; - UKSource = (GetRegion() == L"UK") ? true : false; - UKTarget = UKSource; + // Use 'Système International' (International System of Units - Metrics) + bool useSI = !useUSCustomary; - Source = (GetRegion() == L"Others") ? true : false; - Target = Source; + // useUSCustomaryAndFahrenheit + the Bahamas, the Cayman Islands and Liberia + // Source: http://en.wikipedia.org/wiki/Fahrenheit + bool useFahrenheit = useUSCustomaryAndFahrenheit || m_currentRegionCode == "BS" || m_currentRegionCode == "KY" || m_currentRegionCode == "LR"; + + bool useWattInsteadOfKilowatt = m_currentRegionCode == "GB"; vector areaUnits; areaUnits.push_back(OrderedUnit{ UnitConverterUnits::Area_Acre, GetLocalizedStringName(L"UnitName_Acre"), GetLocalizedStringName(L"UnitAbbreviation_Acre"), 9 }); areaUnits.push_back(OrderedUnit{ UnitConverterUnits::Area_Hectare, GetLocalizedStringName(L"UnitName_Hectare"), GetLocalizedStringName(L"UnitAbbreviation_Hectare"), 4 }); areaUnits.push_back(OrderedUnit{ UnitConverterUnits::Area_SquareCentimeter, GetLocalizedStringName(L"UnitName_SquareCentimeter"), GetLocalizedStringName(L"UnitAbbreviation_SquareCentimeter"), 2 }); - areaUnits.push_back(OrderedUnit{ UnitConverterUnits::Area_SquareFoot, GetLocalizedStringName(L"UnitName_SquareFoot"), GetLocalizedStringName(L"UnitAbbreviation_SquareFoot"), 7, (UKSource || Source), USTarget, false }); + areaUnits.push_back(OrderedUnit{ UnitConverterUnits::Area_SquareFoot, GetLocalizedStringName(L"UnitName_SquareFoot"), GetLocalizedStringName(L"UnitAbbreviation_SquareFoot"), 7, useSI, useUSCustomary, false }); areaUnits.push_back(OrderedUnit{ UnitConverterUnits::Area_SquareInch, GetLocalizedStringName(L"UnitName_SquareInch"), GetLocalizedStringName(L"UnitAbbreviation_SquareInch"), 6 }); areaUnits.push_back(OrderedUnit{ UnitConverterUnits::Area_SquareKilometer, GetLocalizedStringName(L"UnitName_SquareKilometer"), GetLocalizedStringName(L"UnitAbbreviation_SquareKilometer"), 5 }); - areaUnits.push_back(OrderedUnit{ UnitConverterUnits::Area_SquareMeter, GetLocalizedStringName(L"UnitName_SquareMeter"), GetLocalizedStringName(L"UnitAbbreviation_SquareMeter"), 3, USSource, (UKTarget || Target), false}); + areaUnits.push_back(OrderedUnit{ UnitConverterUnits::Area_SquareMeter, GetLocalizedStringName(L"UnitName_SquareMeter"), GetLocalizedStringName(L"UnitAbbreviation_SquareMeter"), 3, useUSCustomary, useSI, false}); areaUnits.push_back(OrderedUnit{ UnitConverterUnits::Area_SquareMile, GetLocalizedStringName(L"UnitName_SquareMile"), GetLocalizedStringName(L"UnitAbbreviation_SquareMile"), 10 }); areaUnits.push_back(OrderedUnit{ UnitConverterUnits::Area_SquareMillimeter, GetLocalizedStringName(L"UnitName_SquareMillimeter"), GetLocalizedStringName(L"UnitAbbreviation_SquareMillimeter"), 1 }); areaUnits.push_back(OrderedUnit{ UnitConverterUnits::Area_SquareYard, GetLocalizedStringName(L"UnitName_SquareYard"), GetLocalizedStringName(L"UnitAbbreviation_SquareYard"), 8 }); @@ -240,9 +247,9 @@ void UnitConverterDataLoader::GetUnits(_In_ unordered_map lengthUnits; - lengthUnits.push_back(OrderedUnit{ UnitConverterUnits::Length_Centimeter, GetLocalizedStringName(L"UnitName_Centimeter"), GetLocalizedStringName(L"UnitAbbreviation_Centimeter"), 4 , USSource, (Target || UKTarget), false}); + lengthUnits.push_back(OrderedUnit{ UnitConverterUnits::Length_Centimeter, GetLocalizedStringName(L"UnitName_Centimeter"), GetLocalizedStringName(L"UnitAbbreviation_Centimeter"), 4, useUSCustomary, useSI, false}); lengthUnits.push_back(OrderedUnit{ UnitConverterUnits::Length_Foot, GetLocalizedStringName(L"UnitName_Foot"), GetLocalizedStringName(L"UnitAbbreviation_Foot"), 8 }); - lengthUnits.push_back(OrderedUnit{ UnitConverterUnits::Length_Inch, GetLocalizedStringName(L"UnitName_Inch"), GetLocalizedStringName(L"UnitAbbreviation_Inch"), 7 , (Source|| UKSource), USTarget, false }); + lengthUnits.push_back(OrderedUnit{ UnitConverterUnits::Length_Inch, GetLocalizedStringName(L"UnitName_Inch"), GetLocalizedStringName(L"UnitAbbreviation_Inch"), 7 , useSI, useUSCustomary, false }); lengthUnits.push_back(OrderedUnit{ UnitConverterUnits::Length_Kilometer, GetLocalizedStringName(L"UnitName_Kilometer"), GetLocalizedStringName(L"UnitAbbreviation_Kilometer"), 6 }); lengthUnits.push_back(OrderedUnit{ UnitConverterUnits::Length_Meter, GetLocalizedStringName(L"UnitName_Meter"), GetLocalizedStringName(L"UnitAbbreviation_Meter"), 5 }); lengthUnits.push_back(OrderedUnit{ UnitConverterUnits::Length_Micron, GetLocalizedStringName(L"UnitName_Micron"), GetLocalizedStringName(L"UnitAbbreviation_Micron"), 2 }); @@ -260,16 +267,16 @@ void UnitConverterDataLoader::GetUnits(_In_ unordered_map tempUnits; - tempUnits.push_back(OrderedUnit{ UnitConverterUnits::Temperature_DegreesCelsius, GetLocalizedStringName(L"UnitName_DegreesCelsius"), GetLocalizedStringName(L"UnitAbbreviation_DegreesCelsius"), 1, USSource, (Target || UKTarget), false }); - tempUnits.push_back(OrderedUnit{ UnitConverterUnits::Temperature_DegreesFahrenheit, GetLocalizedStringName(L"UnitName_DegreesFahrenheit"), GetLocalizedStringName(L"UnitAbbreviation_DegreesFahrenheit"), 2 , (Source || UKSource), USTarget, false }); + tempUnits.push_back(OrderedUnit{ UnitConverterUnits::Temperature_DegreesCelsius, GetLocalizedStringName(L"UnitName_DegreesCelsius"), GetLocalizedStringName(L"UnitAbbreviation_DegreesCelsius"), 1, useFahrenheit, !useFahrenheit, false }); + tempUnits.push_back(OrderedUnit{ UnitConverterUnits::Temperature_DegreesFahrenheit, GetLocalizedStringName(L"UnitName_DegreesFahrenheit"), GetLocalizedStringName(L"UnitAbbreviation_DegreesFahrenheit"), 2 , !useFahrenheit, useFahrenheit, false }); tempUnits.push_back(OrderedUnit{ UnitConverterUnits::Temperature_Kelvin, GetLocalizedStringName(L"UnitName_Kelvin"), GetLocalizedStringName(L"UnitAbbreviation_Kelvin"), 3 }); unitMap.emplace(ViewMode::Temperature, tempUnits); @@ -287,11 +294,11 @@ void UnitConverterDataLoader::GetUnits(_In_ unordered_map speedUnits; speedUnits.push_back(OrderedUnit{ UnitConverterUnits::Speed_CentimetersPerSecond, GetLocalizedStringName(L"UnitName_CentimetersPerSecond"), GetLocalizedStringName(L"UnitAbbreviation_CentimetersPerSecond"), 1 }); speedUnits.push_back(OrderedUnit{ UnitConverterUnits::Speed_FeetPerSecond, GetLocalizedStringName(L"UnitName_FeetPerSecond"), GetLocalizedStringName(L"UnitAbbreviation_FeetPerSecond"), 4 }); - speedUnits.push_back(OrderedUnit{ UnitConverterUnits::Speed_KilometersPerHour, GetLocalizedStringName(L"UnitName_KilometersPerHour"), GetLocalizedStringName(L"UnitAbbreviation_KilometersPerHour"), 3 ,(USSource || UKSource), Target, false }); + speedUnits.push_back(OrderedUnit{ UnitConverterUnits::Speed_KilometersPerHour, GetLocalizedStringName(L"UnitName_KilometersPerHour"), GetLocalizedStringName(L"UnitAbbreviation_KilometersPerHour"), 3 , useUSCustomary, useSI, false }); speedUnits.push_back(OrderedUnit{ UnitConverterUnits::Speed_Knot, GetLocalizedStringName(L"UnitName_Knot"), GetLocalizedStringName(L"UnitAbbreviation_Knot"), 6 }); speedUnits.push_back(OrderedUnit{ UnitConverterUnits::Speed_Mach, GetLocalizedStringName(L"UnitName_Mach"), GetLocalizedStringName(L"UnitAbbreviation_Mach"), 7 }); speedUnits.push_back(OrderedUnit{ UnitConverterUnits::Speed_MetersPerSecond, GetLocalizedStringName(L"UnitName_MetersPerSecond"), GetLocalizedStringName(L"UnitAbbreviation_MetersPerSecond"), 2 }); - speedUnits.push_back(OrderedUnit{ UnitConverterUnits::Speed_MilesPerHour, GetLocalizedStringName(L"UnitName_MilesPerHour"), GetLocalizedStringName(L"UnitAbbreviation_MilesPerHour"), 5, Source, (UKTarget || USTarget), false }); + speedUnits.push_back(OrderedUnit{ UnitConverterUnits::Speed_MilesPerHour, GetLocalizedStringName(L"UnitName_MilesPerHour"), GetLocalizedStringName(L"UnitAbbreviation_MilesPerHour"), 5, useSI, useUSCustomary, false }); speedUnits.push_back(OrderedUnit{ UnitConverterUnits::Speed_Turtle, GetLocalizedStringName(L"UnitName_Turtle"), GetLocalizedStringName(L"UnitAbbreviation_Turtle"), 8 ,false, false, true }); speedUnits.push_back(OrderedUnit{ UnitConverterUnits::Speed_Horse, GetLocalizedStringName(L"UnitName_Horse"), GetLocalizedStringName(L"UnitAbbreviation_Horse"),9 , false, false, true }); speedUnits.push_back(OrderedUnit{ UnitConverterUnits::Speed_Jet, GetLocalizedStringName(L"UnitName_Jet"), GetLocalizedStringName(L"UnitAbbreviation_Jet"), 10, false, false, true }); @@ -309,14 +316,14 @@ void UnitConverterDataLoader::GetUnits(_In_ unordered_mapData(); } - wstring UnitConverterDataLoader::GetRegion() - { - if ((m_currentRegionCode == L"US") || - (m_currentRegionCode == L"LR") || - (m_currentRegionCode == L"MM")) - { - return L"US"; - } - else if (m_currentRegionCode == L"GB") - { - return L"UK"; - } - else - { - return L"Others"; - } - } - void UnitConverterDataLoader::GetExplicitConversionData(_In_ unordered_map>& unitToUnitConversionList) { /* categoryId, ParentUnitId, UnitId, ratio, offset, offsetfirst*/ diff --git a/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.h b/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.h index b48b8e09..17565edf 100644 --- a/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.h +++ b/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.h @@ -64,7 +64,6 @@ namespace CalculatorApp void GetExplicitConversionData(_In_ std::unordered_map>& unitToUnitConversionList); std::wstring GetLocalizedStringName(_In_ Platform::String^ stringId); - std::wstring GetRegion(); std::shared_ptr> m_categoryList; std::shared_ptr m_categoryToUnits; From 2320697562b44a675f3d9192c9dcd59231534ecf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Thu, 7 Mar 2019 18:45:51 +0100 Subject: [PATCH 10/17] Catch polymorphic types by const-ref (#125) --- src/CalcManager/CalculatorVector.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/CalcManager/CalculatorVector.h b/src/CalcManager/CalculatorVector.h index 5ddf5300..9e8c1a72 100644 --- a/src/CalcManager/CalculatorVector.h +++ b/src/CalcManager/CalculatorVector.h @@ -14,7 +14,7 @@ public: { *item = m_vector.at(index); } - catch (std::out_of_range /*ex*/) + catch (const std::out_of_range& /*ex*/) { hr = E_BOUNDS; } @@ -34,7 +34,7 @@ public: { m_vector[index] = item; } - catch (std::out_of_range /*ex*/) + catch (const std::out_of_range& /*ex*/) { hr = E_BOUNDS; } @@ -63,7 +63,7 @@ public: auto iter = m_vector.begin() + index; m_vector.insert(iter, item); } - catch (std::bad_alloc /*ex*/) + catch (const std::bad_alloc& /*ex*/) { hr = E_OUTOFMEMORY; } @@ -92,7 +92,7 @@ public: { m_vector.push_back(item); } - catch (std::bad_alloc /*ex*/) + catch (const std::bad_alloc& /*ex*/) { hr = E_OUTOFMEMORY; } From 07f4cc1926e3d5a5c64ed7fab4faa4ae864ab112 Mon Sep 17 00:00:00 2001 From: Christian Oliff Date: Fri, 8 Mar 2019 03:02:44 +0900 Subject: [PATCH 11/17] HTTPS link to editorconfig.org (#134) --- .editorconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.editorconfig b/.editorconfig index e844ca00..f3416ab7 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,4 +1,4 @@ -## IDE-independent coding style via EditorConfig: http://editorconfig.org/ +## IDE-independent coding style via EditorConfig: https://editorconfig.org/ root = true @@ -8,4 +8,4 @@ indent_size = 4 end_of_line = crlf charset = utf-8 trim_trailing_whitespace = true -insert_final_newline = true \ No newline at end of file +insert_final_newline = true From 84941c698e33a9dada6c51cb37f411ebf54798cc Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Thu, 7 Mar 2019 13:27:13 -0500 Subject: [PATCH 12/17] Spelling (#135) --- docs/ManualTests.md | 2 +- .../CalculatorAppLauncher.cs | 2 +- .../Utilities/PerfTestConstants.cs | 2 +- .../Config/AppLifecycle.Iterations.xml | 2 +- .../Config/AppLifecycle.Profile.wprp | 2 +- .../Calculator.UITests/Tests/AppLifecycleTests.cs | 4 ++-- src/CalcManager/CEngine/History.cpp | 10 +++++----- src/CalcManager/CEngine/scicomm.cpp | 6 +++--- src/CalcManager/CalculatorManager.cpp | 14 +++++++------- src/CalcManager/Header Files/History.h | 2 +- src/CalcManager/Ratpack/rat.cpp | 4 ++-- .../Common/AlwaysSelectedCollectionView.h | 2 +- .../Common/Automation/LiveRegionHost.h | 2 +- src/CalcViewModel/Common/NavCategory.cpp | 6 +++--- src/CalcViewModel/Common/NavCategory.h | 2 +- src/CalcViewModel/Common/ValidatingConverters.h | 4 ++-- .../DataLoaders/CurrencyDataLoader.cpp | 2 +- src/CalcViewModel/DateCalculatorViewModel.cpp | 2 +- src/CalcViewModel/DateCalculatorViewModel.h | 2 +- src/CalcViewModel/UnitConverterViewModel.cpp | 4 ++-- src/CalcViewModel/UnitConverterViewModel.h | 6 +++--- .../Common/AlwaysSelectedCollectionView.h | 2 +- .../DesignData/DesignStandardCalculatorViewModel.h | 2 +- src/Calculator/Resources/en-GB/Resources.resw | 2 +- src/Calculator/Resources/en-US/Resources.resw | 2 +- src/CalculatorUnitTests/CalculatorManagerTest.cpp | 14 +++++++------- src/CalculatorUnitTests/CopyPasteManagerTest.cpp | 10 +++++----- src/CalculatorUnitTests/MultiWindowUnitTests.cpp | 4 ++-- src/CalculatorUnitTests/UnitTestApp.rd.xml | 2 +- 29 files changed, 60 insertions(+), 60 deletions(-) diff --git a/docs/ManualTests.md b/docs/ManualTests.md index 6fbc6716..a1d9de58 100644 --- a/docs/ManualTests.md +++ b/docs/ManualTests.md @@ -124,7 +124,7 @@ Steps: m. “( )" Parenthesis -**All Calulators Test: Verify memory functions** +**All Calculators Test: Verify memory functions** Steps: 1. Launch the "Calculator" app. 2. Navigate to "Standard" Calculator. diff --git a/internal/Calculator.UIAutomationLibrary/CalculatorAppLauncher.cs b/internal/Calculator.UIAutomationLibrary/CalculatorAppLauncher.cs index b90c984e..df2ad9c3 100644 --- a/internal/Calculator.UIAutomationLibrary/CalculatorAppLauncher.cs +++ b/internal/Calculator.UIAutomationLibrary/CalculatorAppLauncher.cs @@ -20,7 +20,7 @@ namespace Calculator.UIAutomationLibrary { public const string CoreWindowClassName = "Windows.UI.Core.CoreWindow"; - // This doesn't actually work right now becaue popup will disappear + // This doesn't actually work right now because popup will disappear // Bug 13713223: ContentDialog/Popup does not show up in the UIA tree when Windows.Current.Content has an AutomationName set. // public static readonly UICondition TopLevelWindowUICondition = UICondition.CreateFromId(Constants.TopLevelWindowAutomationId); public static readonly UICondition CoreWindowUICondition = UICondition.CreateFromClassName(CoreWindowClassName) diff --git a/internal/Calculator.UIAutomationLibrary/Utilities/PerfTestConstants.cs b/internal/Calculator.UIAutomationLibrary/Utilities/PerfTestConstants.cs index ae329b7c..02c0206d 100644 --- a/internal/Calculator.UIAutomationLibrary/Utilities/PerfTestConstants.cs +++ b/internal/Calculator.UIAutomationLibrary/Utilities/PerfTestConstants.cs @@ -36,6 +36,6 @@ namespace Calculator.UIAutomationLibrary /// /// These are uses with the DataSource test property to specify iteration info. /// - public const string AppLifecycleInterationsSource = "Table:" + ConfigDirectory + "AppLifecycle.Iterations.xml#PerformanceConfigurations"; + public const string AppLifecycleIterationsSource = "Table:" + ConfigDirectory + "AppLifecycle.Iterations.xml#PerformanceConfigurations"; } } diff --git a/internal/Calculator.UITests/Config/AppLifecycle.Iterations.xml b/internal/Calculator.UITests/Config/AppLifecycle.Iterations.xml index 91a96bc8..65cec859 100644 --- a/internal/Calculator.UITests/Config/AppLifecycle.Iterations.xml +++ b/internal/Calculator.UITests/Config/AppLifecycle.Iterations.xml @@ -1,7 +1,7 @@  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 13/17] 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" From e2c7db644df5070d273170512bc69c581621d2be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Fri, 8 Mar 2019 04:46:53 +0100 Subject: [PATCH 14/17] Mark classes as `final` where applicable (#189) --- src/CalcManager/ExpressionCommand.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/CalcManager/ExpressionCommand.h b/src/CalcManager/ExpressionCommand.h index 0953ab26..275c8da3 100644 --- a/src/CalcManager/ExpressionCommand.h +++ b/src/CalcManager/ExpressionCommand.h @@ -6,7 +6,7 @@ #include "Header Files/CalcEngine.h" #include "Header Files/Rational.h" -class CParentheses : public IParenthesisCommand +class CParentheses final : public IParenthesisCommand { public: CParentheses(_In_ int command); @@ -18,7 +18,7 @@ private: int m_command; }; -class CUnaryCommand : public IUnaryCommand +class CUnaryCommand final : public IUnaryCommand { public: CUnaryCommand(int command); @@ -33,7 +33,7 @@ private: std::shared_ptr> m_command; }; -class CBinaryCommand : public IBinaryCommand +class CBinaryCommand final : public IBinaryCommand { public: CBinaryCommand(int command); @@ -46,7 +46,7 @@ private: int m_command; }; -class COpndCommand : public IOpndCommand +class COpndCommand final : public IOpndCommand { public: COpndCommand( From 13ba479a0c15dfec9dfa8cf04ad59eb53f8c9baf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Fri, 8 Mar 2019 06:38:40 +0100 Subject: [PATCH 15/17] Remove unused variable (#184) --- src/Calculator/Views/CalculatorProgrammerBitFlipPanel.xaml.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Calculator/Views/CalculatorProgrammerBitFlipPanel.xaml.cpp b/src/Calculator/Views/CalculatorProgrammerBitFlipPanel.xaml.cpp index 579c627e..3225e01e 100644 --- a/src/Calculator/Views/CalculatorProgrammerBitFlipPanel.xaml.cpp +++ b/src/Calculator/Views/CalculatorProgrammerBitFlipPanel.xaml.cpp @@ -30,7 +30,6 @@ CalculatorProgrammerBitFlipPanel::CalculatorProgrammerBitFlipPanel() : { InitializeComponent(); auto booleanToVisibilityConverter = ref new Converters::BooleanToVisibilityConverter; - auto booleanToVisibilityNegationConverter = ref new Converters::BooleanToVisibilityNegationConverter; SetVisibilityBinding(BitFlipPanel, L"IsBinaryBitFlippingEnabled", booleanToVisibilityConverter); AssignFlipButtons(); From c325cb1b3a752dc4454b3168c9591a319b62cf4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Fri, 8 Mar 2019 07:09:37 +0100 Subject: [PATCH 16/17] Remove duplicated condition checks (#187) --- src/CalcViewModel/DataLoaders/UnitConverterDataLoader.cpp | 1 - src/CalcViewModel/StandardCalculatorViewModel.cpp | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.cpp b/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.cpp index b00cf799..dea93bbb 100644 --- a/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.cpp +++ b/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.cpp @@ -158,7 +158,6 @@ void UnitConverterDataLoader::GetUnits(_In_ unordered_map= Command::CommandBINEDITSTART) && (cmdenum <= Command::CommandBINEDITEND))) { From c6b770eec8ed3638d66e8cc58ab071e86e11f371 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Fri, 8 Mar 2019 07:10:20 +0100 Subject: [PATCH 17/17] Fix usage of temporary string (#185) --- src/CalcViewModel/StandardCalculatorViewModel.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/CalcViewModel/StandardCalculatorViewModel.cpp b/src/CalcViewModel/StandardCalculatorViewModel.cpp index d98a91f0..6782acf0 100644 --- a/src/CalcViewModel/StandardCalculatorViewModel.cpp +++ b/src/CalcViewModel/StandardCalculatorViewModel.cpp @@ -488,7 +488,7 @@ void StandardCalculatorViewModel::HandleUpdatedOperandData(Command cmdenum) m_selectedExpressionLastData = L""; if (ch == 'x') { - temp = L'\0'; + temp[0] = L'\0'; commandIndex = 0; } else @@ -505,7 +505,7 @@ void StandardCalculatorViewModel::HandleUpdatedOperandData(Command cmdenum) { if (commandIndex == 0) { - delete temp; + delete [] temp; return; }