Updating comments per the C++ core guidelines and removing trailing whitespace (#194)

Fixed comments that were inconsistent with the style guidelines described in C++ core guidelines and the modern C++/WinRT language projections and removed trailing whitespace.

Inserted a space after the beginning of the comment so the text wasn't touching the // on all occurrences.

Removed all occurrences of trailing whitespace

src/CalcManager/CEngine/History.cpp

@@ -413,7 +413,7 @@ int CHistoryCollector::AddCommand(_In_ const std::shared_ptr<IExpressionCommand>
     return nCommands - 1;
 }
 
-//To Update the operands in the Expression according to the current Radix 
+// To Update the operands in the Expression according to the current Radix 
 void CHistoryCollector::UpdateHistoryExpression(uint32_t radix, int32_t precision)
 {
     if (m_spTokens != nullptr)
@@ -451,7 +451,7 @@ void CHistoryCollector::SetDecimalSymbol(wchar_t decimalSymbol)
     m_decimalSymbol = decimalSymbol;
 }
 
-//Update the commands corresponding to the passed string Number
+// Update the commands corresponding to the passed string Number
 std::shared_ptr<CalculatorVector<int>> CHistoryCollector::GetOperandCommandsFromString(wstring_view numStr)
 {
     std::shared_ptr<CalculatorVector<int>> commands = std::make_shared<CalculatorVector<int>>();

src/CalcManager/CEngine/scicomm.cpp

@@ -60,7 +60,7 @@ void CCalcEngine::HandleErrorCommand(WPARAM idc)
 {
     if (!IsGuiSettingOpCode(idc))
     {
-        // we would have saved the prev command. Need to forget this state
+        // We would have saved the prev command. Need to forget this state
         m_nTempCom = m_nLastCom;
     }
 }
@@ -182,7 +182,7 @@ void CCalcEngine::ProcessCommandWorker(WPARAM wParam)
     // BINARY OPERATORS:
     if (IsBinOpCode(wParam))
     {
-        /* Change the operation if last input was operation.          */
+        // Change the operation if last input was operation.
         if (IsBinOpCode(m_nLastCom))
         {
             INT nPrev;
@@ -1027,7 +1027,7 @@ wstring CCalcEngine::GetCurrentResultForRadix(uint32_t radix, int32_t precision)
     wstring numberString = GetStringForDisplay(rat, radix);
     if (!numberString.empty())
     {
-        //revert the precision to previously stored precision
+        // Revert the precision to previously stored precision
         ChangeConstants(m_radix, m_precision);
     }
 

src/CalcManager/CEngine/scifunc.cpp

@@ -70,7 +70,7 @@ CalcEngine::Rational CCalcEngine::SciCalcFunctions(CalcEngine::Rational const& r
 
                 uint64_t w64Bits = result.ToUInt64_t();
                 uint64_t lsb = ((w64Bits & 0x01) == 1) ? 1 : 0;
-                w64Bits >>= 1; //RShift by 1
+                w64Bits >>= 1; // RShift by 1
                 w64Bits |= (lsb << (m_dwWordBitWidth - 1));
 
                 result = w64Bits;

src/CalcManager/CalculatorManager.cpp

@@ -435,9 +435,9 @@ namespace CalculationManager
             if (*commandItr >= MEMORY_COMMAND_TO_UNSIGNED_CHAR(MemoryCommand::MemorizeNumber) &&
                 *commandItr <= MEMORY_COMMAND_TO_UNSIGNED_CHAR(MemoryCommand::MemorizedNumberClearAll))
             {
-                //MemoryCommands(which have values above 255) are pushed on m_savedCommands upon casting to unsigned char.
+                // MemoryCommands(which have values above 255) are pushed on m_savedCommands upon casting to unsigned char.
-                //SerializeCommands uses m_savedCommands, which is then used in DeSerializeCommands.
+                // SerializeCommands uses m_savedCommands, which is then used in DeSerializeCommands.
-                //Hence, a simple cast to MemoryCommand is not sufficient.
+                // Hence, a simple cast to MemoryCommand is not sufficient.
                 MemoryCommand memoryCommand = static_cast<MemoryCommand>(*commandItr + UCHAR_MAX + 1);
                 unsigned int indexOfMemory = 0;
                 switch (memoryCommand)

src/CalcManager/Command.h

@@ -94,7 +94,7 @@ namespace CalculationManager
         CommandFAC = 113,
         CommandREC = 114,
         CommandDMS = 115,
-        CommandCUBEROOT = 116,  //x ^ 1/3
+        CommandCUBEROOT = 116,  // x ^ 1/3
         CommandPOW10 = 117,  // 10 ^ x
         CommandPERCENT = 118,
 

src/CalcManager/Header Files/CCommand.h

@@ -97,7 +97,7 @@
 #define IDC_FAC         113
 #define IDC_REC         114
 #define IDC_DMS         115
-#define IDC_CUBEROOT 116  //x ^ 1/3
+#define IDC_CUBEROOT 116  // x ^ 1/3
 #define IDC_POW10 117  // 10 ^ x
 #define IDC_PERCENT     118
 #define IDC_UNARYLAST IDC_PERCENT

src/CalcManager/Header Files/CalcEngine.h

@@ -85,7 +85,7 @@ private:
     // if it hasn't yet been computed
     bool m_bChangeOp; /* Flag for changing operation.       */
     bool m_bRecord;   // Global mode: recording or displaying
-    bool m_bSetCalcState;  //Flag for setting the engine result state
+    bool m_bSetCalcState;  // Flag for setting the engine result state
     CalcEngine::CalcInput m_input; // Global calc input object for decimal strings
     eNUMOBJ_FMT m_nFE;    /* Scientific notation conversion flag.       */
     CalcEngine::Rational m_maxTrigonometricNum;

src/CalcManager/Ratpack/logic.cpp

@@ -211,9 +211,8 @@ void modrat( PRAT *pa, PRAT b )
     remnum( &((*pa)->pp), tmp->pp, BASEX );
     mulnumx( &((*pa)->pq), tmp->pq );
 
-    //Get *pa back in the integer over integer form.
+    // Get *pa back in the integer over integer form.
     RENORMALIZE(*pa);
 
     destroyrat( tmp );
 }
-

src/CalcManager/Ratpack/rat.cpp

@@ -82,7 +82,7 @@ void fracrat( PRAT *pa , uint32_t radix, int32_t precision)
 
     remnum( &((*pa)->pp), (*pa)->pq, BASEX );
 
-    //Get *pa back in the integer over integer form.
+    // Get *pa back in the integer over integer form.
     RENORMALIZE(*pa);
 }
 

src/CalcManager/UnitConverter.cpp

@@ -46,7 +46,7 @@ UnitConverter::UnitConverter(_In_ const shared_ptr<IConverterDataLoader>& dataLo
 {
     m_dataLoader = dataLoader;
     m_currencyDataLoader = currencyDataLoader;
-    //declaring the delimiter character conversion map
+    // declaring the delimiter character conversion map
     quoteConversions[L'|'] = L"{p}";
     quoteConversions[L'['] = L"{lc}";
     quoteConversions[L']'] = L"{rc}";
@@ -441,7 +441,7 @@ wstring UnitConverter::Quote(const wstring& s)
 {
     wstringstream quotedString(wstringstream::out);
 
-    //Iterate over the delimiter characters we need to quote
+    // Iterate over the delimiter characters we need to quote
     wstring::const_iterator cursor = s.begin();
     while(cursor != s.end())
     {
@@ -479,7 +479,7 @@ wstring UnitConverter::Unquote(const wstring& s)
             }
             if (cursor == s.end())
             {
-                //badly formatted
+                // Badly formatted
                 break;
             }
             else
@@ -505,7 +505,7 @@ void UnitConverter::SendCommand(Command command)
 {
     if (CheckLoad())
     {
-        //TODO: Localization of characters
+        // TODO: Localization of characters
         bool clearFront = false;
         if (m_currentDisplay == L"0")
         {
@@ -728,7 +728,7 @@ vector<tuple<wstring, Unit>> UnitConverter::CalculateSuggested()
     vector<SuggestedValueIntermediate> intermediateVector;
     vector<SuggestedValueIntermediate> intermediateWhimsicalVector;
     unordered_map<Unit, ConversionData, UnitHash> ratios = m_ratioMap[m_fromType];
-    //Calculate converted values for every other unit type in this category, along with their magnitude
+    // Calculate converted values for every other unit type in this category, along with their magnitude
     for (const auto& cur : ratios)
     {
         if (cur.first != m_fromType && cur.first != m_toType)
@@ -745,7 +745,7 @@ vector<tuple<wstring, Unit>> UnitConverter::CalculateSuggested()
         }
     }
 
-    //Sort the resulting list by absolute magnitude, breaking ties by choosing the positive value
+    // Sort the resulting list by absolute magnitude, breaking ties by choosing the positive value
     sort(intermediateVector.begin(), intermediateVector.end(), []
     (SuggestedValueIntermediate first, SuggestedValueIntermediate second)
     {
@@ -759,7 +759,7 @@ vector<tuple<wstring, Unit>> UnitConverter::CalculateSuggested()
         }
     });
 
-    //Now that the list is sorted, iterate over it and populate the return vector with properly rounded and formatted return strings
+    // Now that the list is sorted, iterate over it and populate the return vector with properly rounded and formatted return strings
     for (const auto& entry : intermediateVector)
     {
         wstring roundedString;
@@ -783,7 +783,7 @@ vector<tuple<wstring, Unit>> UnitConverter::CalculateSuggested()
     }
 
     // The Whimsicals are determined differently
-    //Sort the resulting list by absolute magnitude, breaking ties by choosing the positive value
+    // Sort the resulting list by absolute magnitude, breaking ties by choosing the positive value
     sort(intermediateWhimsicalVector.begin(), intermediateWhimsicalVector.end(), []
     (SuggestedValueIntermediate first, SuggestedValueIntermediate second)
     {
@@ -797,7 +797,7 @@ vector<tuple<wstring, Unit>> UnitConverter::CalculateSuggested()
         }
     });
 
-    //Now that the list is sorted, iterate over it and populate the return vector with properly rounded and formatted return strings
+    // Now that the list is sorted, iterate over it and populate the return vector with properly rounded and formatted return strings
     vector<tuple<wstring, Unit>> whimsicalReturnVector;
 
     for (const auto& entry : intermediateWhimsicalVector)

src/CalcViewModel/Common/TraceLogger.cpp

@@ -103,7 +103,7 @@ namespace CalculatorApp
         g_calculatorProvider(
             L"MicrosoftCalculator",
             LoggingChannelOptions(GUID{ 0x4f50731a, 0x89cf, 0x4782, 0xb3, 0xe0, 0xdc, 0xe8, 0xc9, 0x4, 0x76, 0xba }), // Microsoft Telemetry group
-            GUID{ 0x905ca09, 0x610e, 0x401e, 0xb6, 0x50, 0x2f, 0x21, 0x29, 0x80, 0xb9, 0xe0 }), //Unique providerID {0905CA09-610E-401E-B650-2F212980B9E0}
+            GUID{ 0x905ca09, 0x610e, 0x401e, 0xb6, 0x50, 0x2f, 0x21, 0x29, 0x80, 0xb9, 0xe0 }), // Unique providerID {0905CA09-610E-401E-B650-2F212980B9E0}
         m_appLaunchActivity{ nullptr }
     {
         // initialize the function array
@@ -482,9 +482,9 @@ namespace CalculatorApp
         LogTelemetryEvent(EVENT_NAME_MEMORY_BODY_OPENED, fields);
     }
 
-    //If calculator is launched in any mode other than standard then this call will come which is not intended. But there is no way to avoid it.
+    // If calculator is launched in any mode other than standard then this call will come which is not intended. But there is no way to avoid it.
-    //So don't use this function to analyze the count of mode change in session instead use CalculatorViewedInSession and ConverterViewedInSession to do that.
+    // So don't use this function to analyze the count of mode change in session instead use CalculatorViewedInSession and ConverterViewedInSession to do that.
-    //Use of this function is to analyze perf of mode change.
+    // Use of this function is to analyze perf of mode change.
     void TraceLogger::LogModeChangeBegin(ViewMode fromMode, ViewMode toMode, int windowId)
     {
         if (!GetTraceLoggingProviderEnabled()) return;
@@ -499,7 +499,7 @@ namespace CalculatorApp
         }
     }
 
-    //comment: same as LogModeChangeBegin
+    // comment: same as LogModeChangeBegin
     void TraceLogger::LogModeChangeEnd(ViewMode toMode, int windowId) const
     {
         if (!GetTraceLoggingProviderEnabled()) return;

src/CalcViewModel/Common/Utils.cpp

@@ -54,7 +54,7 @@ double Utils::GetDoubleFromWstring(wstring input)
     return ::atof(inputString.c_str());
 }
 
-//returns windowId for the current view
+// Returns windowId for the current view
 int Utils::GetWindowId()
 {
     int windowId = -1;
@@ -80,20 +80,20 @@ void Utils::RunOnUIThreadNonblocking(std::function<void()>&& function, _In_ Core
     }
 }
 
-// returns if the last character of a wstring is the target wchar_t
+// Returns if the last character of a wstring is the target wchar_t
 bool Utils::IsLastCharacterTarget(_In_ wstring const &input, _In_ wchar_t target)
 {
     return !input.empty() && input.back() == target;
 }
 
-//return wstring after removing characters like space, comma, and double quotes
+// Returns wstring after removing characters like space, comma, and double quotes
 wstring Utils::RemoveUnwantedCharsFromWstring(wstring input)
 {
     wchar_t unWantedChars[] = { L' ', L',', L'"', 8234, 8235, 8236, 8237 };
     return RemoveUnwantedCharsFromWstring(input, unWantedChars, 6);
 }
 
-//return wstring after removing characters specified by unwantedChars array
+// Returns wstring after removing characters specified by unwantedChars array
 wstring Utils::RemoveUnwantedCharsFromWstring(wstring input, wchar_t* unwantedChars, unsigned int size)
 {
     for (unsigned int i = 0; i < size; ++i)
@@ -110,7 +110,7 @@ void Utils::SerializeCommandsAndTokens(_In_ shared_ptr<CalculatorVector <pair<ws
     unsigned int commandsSize;
     IFTPlatformException(commands->GetSize(&commandsSize));
 
-    // save the size of the commands vector
+    // Save the size of the commands vector
     writer->WriteUInt32(commandsSize);
 
     SerializeCommandVisitor cmdVisitor(writer);

src/CalcViewModel/StandardCalculatorViewModel.cpp

@@ -516,7 +516,7 @@ void StandardCalculatorViewModel::HandleUpdatedOperandData(Command cmdenum)
 
     if (IsOperandTextCompletelySelected)
     {
-        //Clear older text;
+        // Clear older text;
         m_selectedExpressionLastData = L"";
         if (ch == L'x')
         {
@@ -1196,10 +1196,10 @@ Array<unsigned char>^ StandardCalculatorViewModel::Serialize()
         writer->WriteInt32(data);
     }
 
-    //For ProgrammerMode
+    // For ProgrammerMode
     writer->WriteUInt32(static_cast<UINT32>(CurrentRadixType));
 
-    //Serialize commands of calculator manager
+    // Serialize commands of calculator manager
     vector<unsigned char> serializedCommand = m_standardCalculatorManager.SerializeCommands();
     writer->WriteUInt32(static_cast<UINT32>(serializedCommand.size()));
     writer->WriteBytes(ref new Array<unsigned char>(serializedCommand.data(), static_cast<unsigned int>(serializedCommand.size())));
@@ -1209,7 +1209,7 @@ Array<unsigned char>^ StandardCalculatorViewModel::Serialize()
         Utils::SerializeCommandsAndTokens(m_tokens, m_commands, writer);
     }
 
-    //Convert viewmodel data in writer to bytes
+    // Convert viewmodel data in writer to bytes
     IBuffer^ buffer = writer->DetachBuffer();
     DataReader^ reader = DataReader::FromBuffer(buffer);
     Platform::Array<unsigned char>^ viewModelDataAsBytes = ref new Array<unsigned char>(buffer->Length);
@@ -1257,7 +1257,7 @@ void StandardCalculatorViewModel::Deserialize(Array<unsigned char>^ state)
         m_standardCalculatorManager.DeSerializePrimaryDisplay(serializedPrimaryDisplay);
 
         CurrentRadixType = reader->ReadUInt32();
-        //Read command data and Deserialize
+        // Read command data and Deserialize
         UINT32 modeldatalength = reader->ReadUInt32();
         Array<unsigned char>^ modelDataAsBytes = ref new Array<unsigned char>(modeldatalength);
         reader->ReadBytes(modelDataAsBytes);
@@ -1981,7 +1981,7 @@ void  StandardCalculatorViewModel::UpdatecommandsInRecordingMode()
         }
         else
         {
-            //reset all vars
+            // Reset all vars
             isDecimal = false;
             isNegative = false;
             isExpMode = false;

src/CalcViewModel/StandardCalculatorViewModel.h

@@ -277,7 +277,7 @@ namespace CalculatorApp
 
             NumbersAndOperatorsEnum MapCharacterToButtonId(const wchar_t ch, bool& canSendNegate);
 
-            //Memory feature related methods. They are internal because they need to called from the MainPage code-behind
+            // Memory feature related methods. They are internal because they need to called from the MainPage code-behind
             void OnMemoryButtonPressed();
             void OnMemoryItemPressed(Platform::Object^ memoryItemPosition);
             void OnMemoryAdd(Platform::Object^ memoryItemPosition);

src/CalcViewModel/UnitConverterViewModel.cpp

@@ -479,7 +479,7 @@ void UnitConverterViewModel::OnButtonPressed(Platform::Object^ parameter)
     NumbersAndOperatorsEnum numOpEnum = CalculatorButtonPressedEventArgs::GetOperationFromCommandParameter(parameter);
     UCM::Command command = CommandFromButtonId(numOpEnum);
 
-    //Don't clear the display if combo box is open and escape is pressed
+    // Don't clear the display if combo box is open and escape is pressed
     if (command == UCM::Command::Clear && IsDropDownOpen)
     {
         return;
@@ -674,7 +674,7 @@ void UnitConverterViewModel::Deserialize(Platform::String^ state)
     RaisePropertyChanged(nullptr);  // Update since all props have been updated.
 }
 
-//Saving User Preferences of Category and Associated-Units across Sessions. 
+// Saving User Preferences of Category and Associated-Units across Sessions.
 void UnitConverterViewModel::SaveUserPreferences()
 {
     if (UnitsAreValid())
@@ -695,7 +695,7 @@ void UnitConverterViewModel::SaveUserPreferences()
     }
 }
 
-//Restoring User Preferences of Category and Associated-Units.
+// Restoring User Preferences of Category and Associated-Units.
 void UnitConverterViewModel::RestoreUserPreferences()
 {
     if (!IsCurrencyCurrentCategory)

src/CalcViewModel/UnitConverterViewModel.h

@@ -243,7 +243,7 @@ namespace CalculatorApp
             Platform::String^ Serialize();
             void Deserialize(Platform::String^ state);
 
-            //Saving And Restoring User Preferences of Category and Associated-Units across Sessions.
+            // Saving And Restoring User Preferences of Category and Associated-Units across Sessions.
             void SaveUserPreferences();
             void RestoreUserPreferences();
 

src/Calculator/Common/AppLifecycleLogger.cpp

@@ -37,7 +37,7 @@ namespace CalculatorApp
         m_appLifecycleProvider(
             L"Microsoft.Windows.AppLifeCycle",
             LoggingChannelOptions(GUID{ 0x4f50731a, 0x89cf, 0x4782, 0xb3, 0xe0, 0xdc, 0xe8, 0xc9, 0x4, 0x76, 0xba }), // Microsoft Telemetry group
-            GUID{ 0xef00584a, 0x2655, 0x462c, 0xbc, 0x24, 0xe7, 0xde, 0x63, 0xe, 0x7f, 0xbf }) //Unique provider ID {EF00584A-2655-462C-BC24-E7DE630E7FBF}
+            GUID{ 0xef00584a, 0x2655, 0x462c, 0xbc, 0x24, 0xe7, 0xde, 0x63, 0xe, 0x7f, 0xbf }) // Unique provider ID {EF00584A-2655-462C-BC24-E7DE630E7FBF}
     {
     }
 

src/Calculator/Common/AppLifecycleLogger.h

@@ -29,9 +29,9 @@ namespace CalculatorApp
         AppLifecycleLogger();
 
         // Any new Log method should
-        // a) decide the level of logging. This will help us in limiting recording of events only up to a certain level. See this link for guidance https://msdn.microsoft.com/en-us/library/windows/desktop/aa363742(v=vs.85).aspx
+        // a) Decide the level of logging. This will help us in limiting recording of events only up to a certain level. See this link for guidance https://msdn.microsoft.com/en-us/library/windows/desktop/aa363742(v=vs.85).aspx
         // We're using Verbose level for events that are called frequently and needed only for debugging or capturing perf for specific scenarios
-        // b) should decide whether or not to log to  telemetry and pass TraceLoggingKeyword(MICROSOFT_KEYWORD_TELEMETRY) accordingly
+        // b) Should decide whether or not to log to  telemetry and pass TraceLoggingKeyword(MICROSOFT_KEYWORD_TELEMETRY) accordingly
         // c) Should accept a variable number of additional data arguments if needed
         void LogAppLifecycleEvent(winrt::hstring const& eventName, winrt::Windows::Foundation::Diagnostics::LoggingFields const& fields) const;
         void PopulateAppInfo(winrt::Windows::Foundation::Diagnostics::LoggingFields& fields) const;

src/Calculator/Controls/CalculationResult.cpp

@@ -192,8 +192,8 @@ void CalculationResult::UpdateTextState()
     String^ oldText = m_textBlock->Text;
     String^ newText =  Utils::LRO + DisplayValue + Utils::PDF;
 
-    //Initiate the scaling operation
+    // Initiate the scaling operation
-    //UpdateLayout will keep calling us until we make it through the below 2 if-statements
+    // UpdateLayout will keep calling us until we make it through the below 2 if-statements
     if (!m_isScalingText || oldText != newText)
     {
         m_textBlock->Text = newText;

src/Calculator/Views/UnitConverter.xaml.cpp

@@ -51,7 +51,7 @@ UnitConverter::UnitConverter() :
 {
     InitializeComponent();
 
-    //adding ESC key shortcut binding to clear button
+    // adding ESC key shortcut binding to clear button
     clearEntryButtonPos0->SetValue(Common::KeyboardShortcutManager::VirtualKeyProperty, Common::MyVirtualKey::Escape);
 
     m_layoutDirection = LocalizationService::GetInstance()->GetFlowDirection();
@@ -278,7 +278,7 @@ void UnitConverter::AnimateConverter()
 void UnitConverter::OnValueSelected(_In_ Platform::Object^ sender)
 {
     auto value = safe_cast<CalculationResult^>(sender);
-    //update the font size since the font is changed to bold
+    // update the font size since the font is changed to bold
     value->UpdateTextState();
     safe_cast<UnitConverterViewModel^>(this->DataContext)->OnValueActivated(AsActivatable(value));
 }

src/CalculatorUnitTests/MultiWindowUnitTests.cpp

@@ -663,7 +663,7 @@ namespace CalculatorUnitTests
             // needs to be updated with correct expected value and viewmodel needs
             // to be updated to calculate correct value.
 
-            //DateCalculatorViewModel^ viewModels[4];
+            // DateCalculatorViewModel^ viewModels[4];
 
             //// Initialize the view models
             //for (int i = 0; i < 4; i++)
@@ -978,7 +978,7 @@ namespace CalculatorUnitTests
             };
             ValidateViewModelByCommands(viewModels[0], standardModeTestItems, false /*doReset*/);
 
-            //Launch a new instance in standard mode
+            // Launch a new instance in standard mode
             viewModels[2] = ref new StandardCalculatorViewModel();
             ChangeMode(viewModels[2], 0);
 
@@ -994,7 +994,7 @@ namespace CalculatorUnitTests
             };
             ValidateViewModelByCommands(viewModels[2], standardModeTestItemsNew, false /*doReset*/);
 
-            //Radix in the programmer mode launched should still be hex.
+            // Radix in the programmer mode launched should still be hex.
             // A + 1 = B
             TESTITEM programmerModeTestItemsNew[] = {
                 { NumbersAndOperatorsEnum::A, L"A", L"" },

src/CalculatorUnitTests/StandardViewModelUnitTests.cpp

@@ -779,7 +779,7 @@ namespace CalculatorUnitTests
             VERIFY_ARE_EQUAL(viewModel->IsOperatorCommand, false);
         }
 
-        //When memory button is pressed - verify if display value is being stored in vector
+        // When memory button is pressed - verify if display value is being stored in vector
         TEST_METHOD(OnMemoryButtonPressed)
         {
             StandardCalculatorViewModel^ viewModel = ref new StandardCalculatorViewModel();
@@ -790,7 +790,7 @@ namespace CalculatorUnitTests
             VERIFY_ARE_EQUAL((int)viewModel->MemorizedNumbers->Size, 2);
         }
 
-        //when memory list is empty and M+ is pressed
+        // When memory list is empty and M+ is pressed
         TEST_METHOD(OnMemoryAddWhenMemoryEmpty)
         {
             m_viewModel->IsStandard = true;
@@ -808,7 +808,7 @@ namespace CalculatorUnitTests
         }
 
 
-        //when memory list is empty and M- is pressed
+        // When memory list is empty and M- is pressed
         TEST_METHOD(OnMemorySubtractWhenMemoryEmpty)
         {
             m_viewModel->IsStandard = true;
@@ -825,7 +825,7 @@ namespace CalculatorUnitTests
             VERIFY_ARE_EQUAL(Platform::StringReference(L"-1,001"), m_viewModel->DisplayValue);
         }
 
-        //when negative number is saved in memory
+        // When negative number is saved in memory
         TEST_METHOD(OnNegativeEntryInMemory)
         {
             ChangeMode(m_viewModel, 0/*Standard*/);
@@ -851,7 +851,7 @@ namespace CalculatorUnitTests
             VERIFY_ARE_EQUAL(Platform::StringReference(L"-1,001"), Utils::GetStringValue(memorySlotProgrammer->Value));
         }
 
-        //when decimal number is saved in memory
+        // When decimal number is saved in memory
         TEST_METHOD(OnDecimalEntryInMemory)
         {
             ChangeMode(m_viewModel, 0/*Standard*/);
@@ -878,7 +878,7 @@ namespace CalculatorUnitTests
             VERIFY_ARE_EQUAL(Platform::StringReference(L"1,001"), Utils::GetStringValue(memorySlotProgrammer->Value));
         }
 
-        //when negative decimal number is saved in memory
+        // When negative decimal number is saved in memory
         TEST_METHOD(OnNegativeDecimalInMemory)
         {
             m_viewModel->IsStandard = true;
@@ -898,7 +898,7 @@ namespace CalculatorUnitTests
             VERIFY_ARE_EQUAL(Platform::StringReference(L"-1,001.1"), m_viewModel->DisplayValue);
         }
 
-        //when decimal number is added to the memory
+        // When decimal number is added to the memory
         TEST_METHOD(OnDecimalAddedToMemory)
         {
             m_viewModel->IsStandard = true;
@@ -928,7 +928,7 @@ namespace CalculatorUnitTests
             VERIFY_ARE_EQUAL(Platform::StringReference(L"2,002.1"), m_viewModel->DisplayValue);
         }
 
-        //when memory is saved in programmer as Hex value and then we switch to standard mode, test to see that memory gets converted to decimal
+        // When memory is saved in programmer as Hex value and then we switch to standard mode, test to see that memory gets converted to decimal
         TEST_METHOD(OnMemorySavedInHexRadixAndSwitchedToStandardMode)
         {
             ChangeMode(m_viewModel, 2/*programmer*/);
@@ -971,8 +971,8 @@ namespace CalculatorUnitTests
 
         }
 
-        //When memory button is pressed more than max number of slots allowed, 
+        // When memory button is pressed more than max number of slots allowed,
-        //the MemorizedNumbers vector size should not increase.
+        // the MemorizedNumbers vector size should not increase.
         TEST_METHOD(OnMemoryButtonPressedMaxTimes)
         {
             StandardCalculatorViewModel^ viewModel = ref new StandardCalculatorViewModel();
@@ -1014,7 +1014,7 @@ namespace CalculatorUnitTests
             VERIFY_ARE_EQUAL(Platform::StringReference(L"1,001"), m_viewModel->DisplayValue);
         }
 
-        // verify nothing happens if there is no memory and the memory slot pressed action is taken
+        // Verify nothing happens if there is no memory and the memory slot pressed action is taken
         TEST_METHOD(OnMemoryItemPressedNoMemory)
         {
             TESTITEM items[] = {

src/CalculatorUnitTests/UnitConverterTest.cpp

@@ -76,7 +76,7 @@ namespace UnitConverterUnitTests
             SetConversionDataParams(&conversion4, 0.453592, 0, false);
             SetConversionDataParams(&conversion5, 2.20462, 0, false);
 
-            //Setting the conversion ratios for testing
+            // Setting the conversion ratios for testing
             unit1Map[u1] = conversion1;
             unit1Map[u2] = conversion2;
 

src/CalculatorUnitTests/UnitConverterViewModelUnitTests.cpp

@@ -286,7 +286,7 @@ namespace CalculatorUnitTests
             VM::UnitConverterViewModel^ vm = ref new UnitConverterViewModel(make_shared<UnitConversionManager::UnitConverter>(make_shared<UnitConverterDataLoader>(ref new GeographicRegion()), nullptr));
             IObservableVector<Category^>^ categoryList = vm->Categories;
             ResourceLoader^ m_resLoader = ResourceLoader::GetForViewIndependentUse("Test");
-            double epsilon = 0.1; //Could be more precise like 0.001 except atm to pascal conversion
+            double epsilon = 0.1; // Could be more precise like 0.001 except atm to pascal conversion
 
             for (unsigned int k = 0; k < categoryList->Size; k++)
             {
@@ -302,7 +302,7 @@ namespace CalculatorUnitTests
                         vm->Value1Active = false;
                         vm->Unit2 = unitList->GetAt(j);
                         wstring unit2Name = vm->Unit2->Name->Data();
-                        //change value2 as 1.
+                        // Change value2 as 1.
                         vm->ButtonPressed->Execute(NumbersAndOperatorsEnum::One);
                         String^ expectedResult = m_resLoader->GetString(ref new String((unit1Name + L"-" + unit2Name).c_str()));
 
@@ -315,10 +315,10 @@ namespace CalculatorUnitTests
                             double actualConversion = GetDoubleFromWstring(GetStringValue(vm->Value1)->Data());
                             double diff = abs(expectedConversion - actualConversion);
 
-                            // assert for diff less than epsilonth fraction of expected conversion result
+                            // Assert for diff less than epsilonth fraction of expected conversion result
                             VERIFY_IS_LESS_THAN_OR_EQUAL(diff, epsilon*expectedConversion);
                         }
-                        //clearing the value1
+                        // Clearing the value1
                         vm->ButtonPressed->Execute(NumbersAndOperatorsEnum::Clear);
                     }
                 }
@@ -393,7 +393,7 @@ namespace CalculatorUnitTests
             shared_ptr<UnitConverterMock> mock = make_shared<UnitConverterMock>();
             VM::UnitConverterViewModel vm(mock);
             vm.Unit1 = vm.Units->GetAt(1);  // Change from u4 to u5
-                                            // count will be 2 here since it was already called once at init
+                                            // Count will be 2 here since it was already called once at init
             VERIFY_ARE_EQUAL((UINT)2, mock->m_setCurUnitTypesCallCount);
             VERIFY_IS_TRUE(UNIT5 == mock->m_curFrom);
             VERIFY_IS_TRUE(UNIT6 == mock->m_curTo);
@@ -409,7 +409,7 @@ namespace CalculatorUnitTests
             shared_ptr<UnitConverterMock> mock = make_shared<UnitConverterMock>();
             VM::UnitConverterViewModel vm(mock);
             vm.CurrentCategory = vm.Categories->GetAt(2);   // Change from cat1 to cat3
-                                                            // counts will be 2 here since the first call should have happened during init
+                                                            // Counts will be 2 here since the first call should have happened during init
             VERIFY_IS_GREATER_THAN_OR_EQUAL(2u, mock->m_setCurrentCategoryCallCount);
             VERIFY_ARE_EQUAL((UINT)3, vm.Units->Size);
             VERIFY_IS_TRUE(UNIT7 == vm.Units->GetAt(0)->GetModelUnit());
@@ -424,7 +424,7 @@ namespace CalculatorUnitTests
             shared_ptr<UnitConverterMock> mock = make_shared<UnitConverterMock>();
             VM::UnitConverterViewModel vm(mock);
             vm.CurrentCategory = vm.Categories->GetAt(2);   // Change from cat1 to cat3
-                                                            // counts will be 2 here since the first call should have happened during init
+                                                            // Counts will be 2 here since the first call should have happened during init
             VERIFY_IS_GREATER_THAN_OR_EQUAL(2u, mock->m_setCurrentCategoryCallCount);
             VERIFY_IS_TRUE(UNIT9 == vm.Unit1->GetModelUnit());
             VERIFY_IS_TRUE(UNIT7 == vm.Unit2->GetModelUnit());

src/CalculatorUnitTests/UnitTestApp.xaml.cpp

@@ -96,7 +96,7 @@ void App::OnSuspending(Object^ sender, SuspendingEventArgs^ e)
     (void) sender; // Unused parameter
     (void) e; // Unused parameter
 
-    //TODO: Save application state and stop any background activity
+    // TODO: Save application state and stop any background activity
 }
 
 /// <summary>

src/CalculatorUnitTests/pch.h

@@ -73,7 +73,7 @@ namespace StandardPeers = Windows::UI::Xaml::Automation::Peers;
 namespace CalculatorApp::Common::Automation {}
 namespace CustomPeers = CalculatorApp::Common::Automation;
 
-//CalcManager Headers
+// CalcManager Headers
 #include "CalcManager/CalculatorVector.h"
 #include "CalcManager/ExpressionCommand.h"
 #include "CalcManager/CalculatorResource.h"