diff --git a/.clang-format b/.clang-format index bf821c51..16412e51 100644 --- a/.clang-format +++ b/.clang-format @@ -28,7 +28,7 @@ BreakStringLiterals: true ColumnLimit: 160 CommentPragmas: '^ IWYU pragma:' CompactNamespaces: true -ConstructorInitializerAllOnOneLineOrOnePerLine: true +ConstructorInitializerAllOnOneLineOrOnePerLine: false ConstructorInitializerIndentWidth: 4 ContinuationIndentWidth: 4 Cpp11BracedListStyle: false diff --git a/src/CalcManager/CEngine/History.cpp b/src/CalcManager/CEngine/History.cpp index 699eed40..37add769 100644 --- a/src/CalcManager/CEngine/History.cpp +++ b/src/CalcManager/CEngine/History.cpp @@ -40,7 +40,10 @@ void CHistoryCollector::ReinitHistory() // Constructor // Can throw Out of memory error CHistoryCollector::CHistoryCollector(ICalcDisplay* pCalcDisplay, std::shared_ptr pHistoryDisplay, wchar_t decimalSymbol) - : m_pHistoryDisplay(pHistoryDisplay), m_pCalcDisplay(pCalcDisplay), m_iCurLineHistStart(-1), m_decimalSymbol(decimalSymbol) + : m_pHistoryDisplay(pHistoryDisplay) + , m_pCalcDisplay(pCalcDisplay) + , m_iCurLineHistStart(-1) + , m_decimalSymbol(decimalSymbol) { ReinitHistory(); } diff --git a/src/CalcManager/CEngine/Number.cpp b/src/CalcManager/CEngine/Number.cpp index 685974a7..7b3be21b 100644 --- a/src/CalcManager/CEngine/Number.cpp +++ b/src/CalcManager/CEngine/Number.cpp @@ -7,15 +7,22 @@ using namespace std; namespace CalcEngine { - Number::Number() noexcept : Number(1, 0, { 0 }) + Number::Number() noexcept + : Number(1, 0, { 0 }) { } - Number::Number(int32_t sign, int32_t exp, vector const& mantissa) noexcept : m_sign{ sign }, m_exp{ exp }, m_mantissa{ mantissa } + Number::Number(int32_t sign, int32_t exp, vector const& mantissa) noexcept + : m_sign{ sign } + , m_exp{ exp } + , m_mantissa{ mantissa } { } - Number::Number(PNUMBER p) noexcept : m_sign{ p->sign }, m_exp{ p->exp }, m_mantissa{} + Number::Number(PNUMBER p) noexcept + : m_sign{ p->sign } + , m_exp{ p->exp } + , m_mantissa{} { m_mantissa.reserve(p->cdigit); copy(p->mant, p->mant + p->cdigit, back_inserter(m_mantissa)); diff --git a/src/CalcManager/CEngine/Rational.cpp b/src/CalcManager/CEngine/Rational.cpp index be2fcb7e..a0bcd97d 100644 --- a/src/CalcManager/CEngine/Rational.cpp +++ b/src/CalcManager/CEngine/Rational.cpp @@ -7,7 +7,9 @@ using namespace std; namespace CalcEngine { - Rational::Rational() noexcept : m_p{}, m_q{ 1, 0, { 1 } } + Rational::Rational() noexcept + : m_p{} + , m_q{ 1, 0, { 1 } } { } @@ -23,7 +25,9 @@ namespace CalcEngine m_q = Number(1, qExp, { 1 }); } - Rational::Rational(Number const& p, Number const& q) noexcept : m_p{ p }, m_q{ q } + Rational::Rational(Number const& p, Number const& q) noexcept + : m_p{ p } + , m_q{ q } { } @@ -58,7 +62,9 @@ namespace CalcEngine m_q = Number{ temp.Q() }; } - Rational::Rational(PRAT prat) noexcept : m_p{ Number{ prat->pp } }, m_q{ Number{ prat->pq } } + Rational::Rational(PRAT prat) noexcept + : m_p{ Number{ prat->pp } } + , m_q{ Number{ prat->pq } } { } diff --git a/src/CalcManager/CalculatorHistory.cpp b/src/CalcManager/CalculatorHistory.cpp index dcc2dacd..14a94a8c 100644 --- a/src/CalcManager/CalculatorHistory.cpp +++ b/src/CalcManager/CalculatorHistory.cpp @@ -7,7 +7,8 @@ using namespace std; using namespace CalculationManager; -CalculatorHistory::CalculatorHistory(size_t maxSize) : m_maxHistorySize(maxSize) +CalculatorHistory::CalculatorHistory(size_t maxSize) + : m_maxHistorySize(maxSize) { } diff --git a/src/CalcManager/ExpressionCommand.cpp b/src/CalcManager/ExpressionCommand.cpp index c177de02..079e02aa 100644 --- a/src/CalcManager/ExpressionCommand.cpp +++ b/src/CalcManager/ExpressionCommand.cpp @@ -13,7 +13,8 @@ constexpr wchar_t chNegate = L'-'; constexpr wchar_t chExp = L'e'; constexpr wchar_t chPlus = L'+'; -CParentheses::CParentheses(_In_ int command) : m_command(command) +CParentheses::CParentheses(_In_ int command) + : m_command(command) { } @@ -73,7 +74,8 @@ void CUnaryCommand::Accept(_In_ ISerializeCommandVisitor& commandVisitor) commandVisitor.Visit(*this); } -CBinaryCommand::CBinaryCommand(int command) : m_command(command) +CBinaryCommand::CBinaryCommand(int command) + : m_command(command) { } @@ -98,7 +100,12 @@ void CBinaryCommand::Accept(_In_ ISerializeCommandVisitor& commandVisitor) } COpndCommand::COpndCommand(shared_ptr> const& commands, bool fNegative, bool fDecimal, bool fSciFmt) - : m_commands(commands), m_fNegative(fNegative), m_fSciFmt(fSciFmt), m_fDecimal(fDecimal), m_fInitialized(false), m_value{} + : m_commands(commands) + , m_fNegative(fNegative) + , m_fSciFmt(fSciFmt) + , m_fDecimal(fDecimal) + , m_fInitialized(false) + , m_value{} { } diff --git a/src/CalcManager/Header Files/CalcInput.h b/src/CalcManager/Header Files/CalcInput.h index 3e88f740..045cdb89 100644 --- a/src/CalcManager/Header Files/CalcInput.h +++ b/src/CalcManager/Header Files/CalcInput.h @@ -13,7 +13,9 @@ namespace CalcEngine class CalcNumSec { public: - CalcNumSec() : value(), m_isNegative(false) + CalcNumSec() + : value() + , m_isNegative(false) { } @@ -41,11 +43,18 @@ namespace CalcEngine class CalcInput { public: - CalcInput() : CalcInput(L'.') + CalcInput() + : CalcInput(L'.') { } - CalcInput(wchar_t decSymbol) : m_hasExponent(false), m_hasDecimal(false), m_decPtIndex(0), m_decSymbol(decSymbol), m_base(), m_exponent() + CalcInput(wchar_t decSymbol) + : m_hasExponent(false) + , m_hasDecimal(false) + , m_decPtIndex(0) + , m_decSymbol(decSymbol) + , m_base() + , m_exponent() { } diff --git a/src/CalcManager/UnitConverter.cpp b/src/CalcManager/UnitConverter.cpp index 6c59ae97..3b5490a0 100644 --- a/src/CalcManager/UnitConverter.cpp +++ b/src/CalcManager/UnitConverter.cpp @@ -34,7 +34,8 @@ unordered_map unquoteConversions; /// Constructor, sets up all the variables and requires a configLoader /// /// An instance of the IConverterDataLoader interface which we use to read in category/unit names and conversion data -UnitConverter::UnitConverter(_In_ const shared_ptr& dataLoader) : UnitConverter::UnitConverter(dataLoader, nullptr) +UnitConverter::UnitConverter(_In_ const shared_ptr& dataLoader) + : UnitConverter::UnitConverter(dataLoader, nullptr) { } diff --git a/src/CalcManager/UnitConverter.h b/src/CalcManager/UnitConverter.h index 7d3cf136..b111ee79 100644 --- a/src/CalcManager/UnitConverter.h +++ b/src/CalcManager/UnitConverter.h @@ -37,7 +37,11 @@ namespace UnitConversionManager bool isRtlLanguage, bool isConversionSource, bool isConversionTarget) - : id(id), abbreviation(abbreviation), isConversionSource(isConversionSource), isConversionTarget(isConversionTarget), isWhimsical(false) + : id(id) + , abbreviation(abbreviation) + , isConversionSource(isConversionSource) + , isConversionTarget(isConversionTarget) + , isWhimsical(false) { std::wstring nameValue1 = isRtlLanguage ? currencyName : countryName; std::wstring nameValue2 = isRtlLanguage ? countryName : currencyName; @@ -82,7 +86,10 @@ namespace UnitConversionManager { } - Category(int id, std::wstring name, bool supportsNegative) : id(id), name(name), supportsNegative(supportsNegative) + Category(int id, std::wstring name, bool supportsNegative) + : id(id) + , name(name) + , supportsNegative(supportsNegative) { } @@ -131,7 +138,10 @@ namespace UnitConversionManager ConversionData() { } - ConversionData(double ratio, double offset, bool offsetFirst) : ratio(ratio), offset(offset), offsetFirst(offsetFirst) + ConversionData(double ratio, double offset, bool offsetFirst) + : ratio(ratio) + , offset(offset) + , offsetFirst(offsetFirst) { } diff --git a/src/CalcViewModel/Common/AlwaysSelectedCollectionView.h b/src/CalcViewModel/Common/AlwaysSelectedCollectionView.h index 8d01815f..57e1d74e 100644 --- a/src/CalcViewModel/Common/AlwaysSelectedCollectionView.h +++ b/src/CalcViewModel/Common/AlwaysSelectedCollectionView.h @@ -9,7 +9,8 @@ namespace CalculatorApp { ref class AlwaysSelectedCollectionView sealed : public Windows::UI::Xaml::DependencyObject, public Windows::UI::Xaml::Data::ICollectionView { - internal : AlwaysSelectedCollectionView(Windows::UI::Xaml::Interop::IBindableVector ^ source) : m_currentPosition(-1) + internal : AlwaysSelectedCollectionView(Windows::UI::Xaml::Interop::IBindableVector ^ source) + : m_currentPosition(-1) { m_source = source; diff --git a/src/CalcViewModel/Common/Automation/LiveRegionHost.cpp b/src/CalcViewModel/Common/Automation/LiveRegionHost.cpp index 4fd96591..0df3a96c 100644 --- a/src/CalcViewModel/Common/Automation/LiveRegionHost.cpp +++ b/src/CalcViewModel/Common/Automation/LiveRegionHost.cpp @@ -9,7 +9,8 @@ using namespace Windows::UI::Xaml::Automation; using namespace Windows::UI::Xaml::Automation::Peers; using namespace Windows::UI::Xaml::Controls; -LiveRegionHost::LiveRegionHost() : m_host(nullptr) +LiveRegionHost::LiveRegionHost() + : m_host(nullptr) { } diff --git a/src/CalcViewModel/Common/Automation/NarratorAnnouncement.cpp b/src/CalcViewModel/Common/Automation/NarratorAnnouncement.cpp index 9ca8660d..5b6d99bd 100644 --- a/src/CalcViewModel/Common/Automation/NarratorAnnouncement.cpp +++ b/src/CalcViewModel/Common/Automation/NarratorAnnouncement.cpp @@ -30,7 +30,10 @@ NarratorAnnouncement::NarratorAnnouncement( String ^ activityId, AutomationNotificationKind kind, AutomationNotificationProcessing processing) - : m_announcement(announcement), m_activityId(activityId), m_kind(kind), m_processing(processing) + : m_announcement(announcement) + , m_activityId(activityId) + , m_kind(kind) + , m_processing(processing) { } diff --git a/src/CalcViewModel/Common/Automation/NotificationHost.cpp b/src/CalcViewModel/Common/Automation/NotificationHost.cpp index 8a1fea96..92bf846e 100644 --- a/src/CalcViewModel/Common/Automation/NotificationHost.cpp +++ b/src/CalcViewModel/Common/Automation/NotificationHost.cpp @@ -10,7 +10,8 @@ using namespace Windows::UI::Xaml::Automation; using namespace Windows::UI::Xaml::Automation::Peers; using namespace Windows::UI::Xaml::Controls; -NotificationHost::NotificationHost() : m_host(nullptr) +NotificationHost::NotificationHost() + : m_host(nullptr) { } diff --git a/src/CalcViewModel/Common/CalculatorButtonPressedEventArgs.h b/src/CalcViewModel/Common/CalculatorButtonPressedEventArgs.h index 2f7bc721..27624987 100644 --- a/src/CalcViewModel/Common/CalculatorButtonPressedEventArgs.h +++ b/src/CalcViewModel/Common/CalculatorButtonPressedEventArgs.h @@ -18,7 +18,8 @@ namespace CalculatorApp PROPERTY_R(CalculatorApp::NumbersAndOperatorsEnum, Operation); CalculatorButtonPressedEventArgs(Platform::String ^ feedback, CalculatorApp::NumbersAndOperatorsEnum operation) - : m_AuditoryFeedback(feedback), m_Operation(operation) + : m_AuditoryFeedback(feedback) + , m_Operation(operation) { } diff --git a/src/CalcViewModel/Common/ConversionResultTaskHelper.cpp b/src/CalcViewModel/Common/ConversionResultTaskHelper.cpp index 3f998e6f..ec90228f 100644 --- a/src/CalcViewModel/Common/ConversionResultTaskHelper.cpp +++ b/src/CalcViewModel/Common/ConversionResultTaskHelper.cpp @@ -9,7 +9,8 @@ using namespace concurrency; using namespace std; ConversionResultTaskHelper::ConversionResultTaskHelper(unsigned int delay, const function functionToRun) - : m_delay{ delay }, m_storedFunction{ functionToRun } + : m_delay{ delay } + , m_storedFunction{ functionToRun } { auto token = m_cts.get_token(); auto delayTask = CompleteAfter(delay); diff --git a/src/CalcViewModel/Common/DelegateCommand.h b/src/CalcViewModel/Common/DelegateCommand.h index 325138f6..3a341287 100644 --- a/src/CalcViewModel/Common/DelegateCommand.h +++ b/src/CalcViewModel/Common/DelegateCommand.h @@ -14,7 +14,9 @@ namespace CalculatorApp typedef void (TTarget::*CommandHandlerFunc)(Platform::Object ^); - DelegateCommand(TTarget ^ target, CommandHandlerFunc func) : m_weakTarget(target), m_function(func) + DelegateCommand(TTarget ^ target, CommandHandlerFunc func) + : m_weakTarget(target) + , m_function(func) { } diff --git a/src/CalcViewModel/Common/DisplayExpressionToken.h b/src/CalcViewModel/Common/DisplayExpressionToken.h index c0e7d9e8..aaaaf37c 100644 --- a/src/CalcViewModel/Common/DisplayExpressionToken.h +++ b/src/CalcViewModel/Common/DisplayExpressionToken.h @@ -18,7 +18,12 @@ public [Windows::UI::Xaml::Data::Bindable] public ref class DisplayExpressionToken sealed : public Windows::UI::Xaml::Data::INotifyPropertyChanged { internal : DisplayExpressionToken(Platform::String ^ token, int tokenPosition, bool fEditable, TokenType type) - : m_Token(token), m_TokenPosition(tokenPosition), m_IsTokenEditable(fEditable), m_Type(type), m_OriginalToken(token), m_InEditMode(false) + : m_Token(token) + , m_TokenPosition(tokenPosition) + , m_IsTokenEditable(fEditable) + , m_Type(type) + , m_OriginalToken(token) + , m_InEditMode(false) { } diff --git a/src/CalcViewModel/Common/ExpressionCommandDeserializer.cpp b/src/CalcViewModel/Common/ExpressionCommandDeserializer.cpp index 70a39f9a..e927b262 100644 --- a/src/CalcViewModel/Common/ExpressionCommandDeserializer.cpp +++ b/src/CalcViewModel/Common/ExpressionCommandDeserializer.cpp @@ -7,7 +7,8 @@ using namespace CalculatorApp::Common; using namespace Windows::Storage::Streams; -CommandDeserializer::CommandDeserializer(_In_ DataReader ^ dataReader) : m_dataReader(dataReader) +CommandDeserializer::CommandDeserializer(_In_ DataReader ^ dataReader) + : m_dataReader(dataReader) { } diff --git a/src/CalcViewModel/Common/ExpressionCommandSerializer.cpp b/src/CalcViewModel/Common/ExpressionCommandSerializer.cpp index 4dd97887..bbf9e183 100644 --- a/src/CalcViewModel/Common/ExpressionCommandSerializer.cpp +++ b/src/CalcViewModel/Common/ExpressionCommandSerializer.cpp @@ -7,7 +7,8 @@ using namespace CalculatorApp::Common; using namespace Windows::Storage::Streams; -SerializeCommandVisitor::SerializeCommandVisitor(_In_ DataWriter ^ dataWriter) : m_dataWriter(dataWriter) +SerializeCommandVisitor::SerializeCommandVisitor(_In_ DataWriter ^ dataWriter) + : m_dataWriter(dataWriter) { } diff --git a/src/CalcViewModel/Common/NavCategory.cpp b/src/CalcViewModel/Common/NavCategory.cpp index 19667485..9dfd905c 100644 --- a/src/CalcViewModel/Common/NavCategory.cpp +++ b/src/CalcViewModel/Common/NavCategory.cpp @@ -362,7 +362,8 @@ vector NavCategory::GetCategoryAcceleratorKeys() return accelerators; } -NavCategoryGroup::NavCategoryGroup(const NavCategoryGroupInitializer& groupInitializer) : m_Categories(ref new Vector()) +NavCategoryGroup::NavCategoryGroup(const NavCategoryGroupInitializer& groupInitializer) + : m_Categories(ref new Vector()) { m_GroupType = groupInitializer.type; diff --git a/src/CalcViewModel/Common/NavCategory.h b/src/CalcViewModel/Common/NavCategory.h index 7ce48787..b1cf1d3d 100644 --- a/src/CalcViewModel/Common/NavCategory.h +++ b/src/CalcViewModel/Common/NavCategory.h @@ -92,7 +92,10 @@ namespace CalculatorApp struct NavCategoryGroupInitializer { constexpr NavCategoryGroupInitializer(CategoryGroupType t, wchar_t const* h, wchar_t const* n, wchar_t const* a) - : type(t), headerResourceKey(h), modeResourceKey(n), automationResourceKey(a) + : type(t) + , headerResourceKey(h) + , modeResourceKey(n) + , automationResourceKey(a) { } diff --git a/src/CalcViewModel/Common/TraceActivity.h b/src/CalcViewModel/Common/TraceActivity.h index 4f5967dd..41046a63 100644 --- a/src/CalcViewModel/Common/TraceActivity.h +++ b/src/CalcViewModel/Common/TraceActivity.h @@ -11,7 +11,10 @@ namespace CalculatorApp class TraceActivity { public: - TraceActivity() : m_channel(nullptr), m_activity(nullptr), m_fields(nullptr) + TraceActivity() + : m_channel(nullptr) + , m_activity(nullptr) + , m_fields(nullptr) { } @@ -19,7 +22,10 @@ namespace CalculatorApp winrt::Windows::Foundation::Diagnostics::LoggingChannel channel, std::wstring_view activityName, winrt::Windows::Foundation::Diagnostics::LoggingFields fields) - : m_channel(channel), m_activityName(activityName), m_fields(fields), m_activity(nullptr) + : m_channel(channel) + , m_activityName(activityName) + , m_fields(fields) + , m_activity(nullptr) { // Write the activity's START event. Note that you must not specify keyword // or level for START and STOP events because they always use the activity's diff --git a/src/CalcViewModel/DataLoaders/CurrencyDataLoader.h b/src/CalcViewModel/DataLoaders/CurrencyDataLoader.h index c3daedb8..5221373a 100644 --- a/src/CalcViewModel/DataLoaders/CurrencyDataLoader.h +++ b/src/CalcViewModel/DataLoaders/CurrencyDataLoader.h @@ -43,7 +43,8 @@ namespace CalculatorApp struct CurrencyUnitMetadata { - CurrencyUnitMetadata(const std::wstring& s) : symbol(s) + CurrencyUnitMetadata(const std::wstring& s) + : symbol(s) { } diff --git a/src/CalcViewModel/DataLoaders/CurrencyHttpClient.cpp b/src/CalcViewModel/DataLoaders/CurrencyHttpClient.cpp index 649ba171..04167dab 100644 --- a/src/CalcViewModel/DataLoaders/CurrencyHttpClient.cpp +++ b/src/CalcViewModel/DataLoaders/CurrencyHttpClient.cpp @@ -13,7 +13,9 @@ using namespace Windows::Web::Http; static constexpr auto sc_MetadataUriLocalizeFor = L"https://go.microsoft.com/fwlink/?linkid=2041093&localizeFor="; static constexpr auto sc_RatiosUriRelativeTo = L"https://go.microsoft.com/fwlink/?linkid=2041339&localCurrency="; -CurrencyHttpClient::CurrencyHttpClient() : m_client(ref new HttpClient()), m_responseLanguage(L"en-US") +CurrencyHttpClient::CurrencyHttpClient() + : m_client(ref new HttpClient()) + , m_responseLanguage(L"en-US") { } diff --git a/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.cpp b/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.cpp index 0b222c28..e69b8e2c 100644 --- a/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.cpp +++ b/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.cpp @@ -18,7 +18,8 @@ using namespace Windows::Globalization; static constexpr bool CONVERT_WITH_OFFSET_FIRST = true; -UnitConverterDataLoader::UnitConverterDataLoader(GeographicRegion ^ region) : m_currentRegionCode(region->CodeTwoLetter) +UnitConverterDataLoader::UnitConverterDataLoader(GeographicRegion ^ region) + : m_currentRegionCode(region->CodeTwoLetter) { m_categoryList = make_shared>(); m_categoryToUnits = make_shared(); diff --git a/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.h b/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.h index 2dc14362..58d78e28 100644 --- a/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.h +++ b/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.h @@ -24,7 +24,8 @@ namespace CalculatorApp bool isConversionSource = false, bool isConversionTarget = false, bool isWhimsical = false) - : UnitConversionManager::Unit(id, name, abbreviation, isConversionSource, isConversionTarget, isWhimsical), order(order) + : UnitConversionManager::Unit(id, name, abbreviation, isConversionSource, isConversionTarget, isWhimsical) + , order(order) { } @@ -50,7 +51,10 @@ namespace CalculatorApp double ratio, double offset, bool offsetFirst = false) - : categoryId(categoryId), parentUnitId(parentUnitId), unitId(unitId), UnitConversionManager::ConversionData(ratio, offset, offsetFirst) + : categoryId(categoryId) + , parentUnitId(parentUnitId) + , unitId(unitId) + , UnitConversionManager::ConversionData(ratio, offset, offsetFirst) { } diff --git a/src/CalcViewModel/HistoryItemViewModel.cpp b/src/CalcViewModel/HistoryItemViewModel.cpp index e312c58e..63d5e966 100644 --- a/src/CalcViewModel/HistoryItemViewModel.cpp +++ b/src/CalcViewModel/HistoryItemViewModel.cpp @@ -15,7 +15,10 @@ HistoryItemViewModel::HistoryItemViewModel( String ^ result, _In_ const shared_ptr>>& spTokens, _In_ const shared_ptr>>& spCommands) - : m_expression(expression), m_result(result), m_spTokens(spTokens), m_spCommands(spCommands) + : m_expression(expression) + , m_result(result) + , m_spTokens(spTokens) + , m_spCommands(spCommands) { // updating accessibility names for expression and result m_accExpression = HistoryItemViewModel::GetAccessibleExpressionFromTokens(spTokens, m_expression); diff --git a/src/CalcViewModel/HistoryViewModel.cpp b/src/CalcViewModel/HistoryViewModel.cpp index c477deeb..70374252 100644 --- a/src/CalcViewModel/HistoryViewModel.cpp +++ b/src/CalcViewModel/HistoryViewModel.cpp @@ -27,7 +27,8 @@ namespace CalculatorApp::ViewModel::HistoryResourceKeys } HistoryViewModel::HistoryViewModel(_In_ CalculationManager::CalculatorManager* calculatorManager) - : m_calculatorManager(calculatorManager), m_localizedHistoryCleared(nullptr) + : m_calculatorManager(calculatorManager) + , m_localizedHistoryCleared(nullptr) { AreHistoryShortcutsEnabled = true; diff --git a/src/CalcViewModel/MemoryItemViewModel.h b/src/CalcViewModel/MemoryItemViewModel.h index 1a67f3db..9a85a2bc 100644 --- a/src/CalcViewModel/MemoryItemViewModel.h +++ b/src/CalcViewModel/MemoryItemViewModel.h @@ -18,7 +18,9 @@ namespace CalculatorApp Windows::UI::Xaml::Data::ICustomPropertyProvider { public: - MemoryItemViewModel(StandardCalculatorViewModel ^ calcVM) : m_Position(-1), m_calcVM(calcVM) + MemoryItemViewModel(StandardCalculatorViewModel ^ calcVM) + : m_Position(-1) + , m_calcVM(calcVM) { } OBSERVABLE_OBJECT(); diff --git a/src/CalcViewModel/UnitConverterViewModel.h b/src/CalcViewModel/UnitConverterViewModel.h index 831f30b4..1fb67ee8 100644 --- a/src/CalcViewModel/UnitConverterViewModel.h +++ b/src/CalcViewModel/UnitConverterViewModel.h @@ -17,7 +17,8 @@ namespace CalculatorApp { [Windows::UI::Xaml::Data::Bindable] public ref class Category sealed : public Windows::UI::Xaml::Data::INotifyPropertyChanged { - internal : Category(const UnitConversionManager::Category& category) : m_original(category) + internal : Category(const UnitConversionManager::Category& category) + : m_original(category) { } @@ -46,7 +47,8 @@ namespace CalculatorApp [Windows::UI::Xaml::Data::Bindable] public ref class Unit sealed : public Windows::UI::Xaml::Data::INotifyPropertyChanged { - internal : Unit(const UnitConversionManager::Unit& unit) : m_original(unit) + internal : Unit(const UnitConversionManager::Unit& unit) + : m_original(unit) { } @@ -80,7 +82,9 @@ namespace CalculatorApp [Windows::UI::Xaml::Data::Bindable] public ref class SupplementaryResult sealed : public Windows::UI::Xaml::Data::INotifyPropertyChanged { - internal : SupplementaryResult(Platform::String ^ value, Unit ^ unit) : m_Value(value), m_Unit(unit) + internal : SupplementaryResult(Platform::String ^ value, Unit ^ unit) + : m_Value(value) + , m_Unit(unit) { } @@ -110,7 +114,8 @@ namespace CalculatorApp TActivatable m_activatable; public: - Activatable(TActivatable activatable) : m_activatable(activatable) + Activatable(TActivatable activatable) + : m_activatable(activatable) { } @@ -333,7 +338,8 @@ namespace CalculatorApp class UnitConverterVMCallback : public UnitConversionManager::IUnitConverterVMCallback { public: - UnitConverterVMCallback(UnitConverterViewModel ^ viewModel) : m_viewModel(viewModel) + UnitConverterVMCallback(UnitConverterViewModel ^ viewModel) + : m_viewModel(viewModel) { } @@ -359,7 +365,8 @@ namespace CalculatorApp class ViewModelCurrencyCallback : public UnitConversionManager::IViewModelCurrencyCallback { public: - ViewModelCurrencyCallback(UnitConverterViewModel ^ viewModel) : m_viewModel(viewModel) + ViewModelCurrencyCallback(UnitConverterViewModel ^ viewModel) + : m_viewModel(viewModel) { } diff --git a/src/Calculator/App.xaml.h b/src/Calculator/App.xaml.h index 60e9f71f..1de1aa8c 100644 --- a/src/Calculator/App.xaml.h +++ b/src/Calculator/App.xaml.h @@ -47,7 +47,9 @@ namespace CalculatorApp { public: SafeFrameWindowCreation(_In_ WindowFrameService ^ frameService, App ^ parent) - : m_frameService(frameService), m_frameOpenedInWindow(false), m_parent(parent) + : m_frameService(frameService) + , m_frameOpenedInWindow(false) + , m_parent(parent) { } diff --git a/src/Calculator/Common/AlwaysSelectedCollectionView.h b/src/Calculator/Common/AlwaysSelectedCollectionView.h index 1b48d43a..35d40095 100644 --- a/src/Calculator/Common/AlwaysSelectedCollectionView.h +++ b/src/Calculator/Common/AlwaysSelectedCollectionView.h @@ -9,7 +9,8 @@ namespace CalculatorApp { ref class AlwaysSelectedCollectionView sealed : public Windows::UI::Xaml::DependencyObject, public Windows::UI::Xaml::Data::ICollectionView { - internal : AlwaysSelectedCollectionView(Windows::UI::Xaml::Interop::IBindableVector ^ source) : m_currentPosition(-1) + internal : AlwaysSelectedCollectionView(Windows::UI::Xaml::Interop::IBindableVector ^ source) + : m_currentPosition(-1) { m_source = source; diff --git a/src/Calculator/Controls/CalculationResult.cpp b/src/Calculator/Controls/CalculationResult.cpp index c6486c35..e6024df5 100644 --- a/src/Calculator/Controls/CalculationResult.cpp +++ b/src/Calculator/Controls/CalculationResult.cpp @@ -50,7 +50,9 @@ DEPENDENCY_PROPERTY_INITIALIZATION(CalculationResult, DisplayStringExpression); StringReference CalculationResult::s_FocusedState(L"Focused"); StringReference CalculationResult::s_UnfocusedState(L"Unfocused"); -CalculationResult::CalculationResult() : m_isScalingText(false), m_haveCalculatedMax(false) +CalculationResult::CalculationResult() + : m_isScalingText(false) + , m_haveCalculatedMax(false) { } diff --git a/src/Calculator/Controls/CalculationResultAutomationPeer.cpp b/src/Calculator/Controls/CalculationResultAutomationPeer.cpp index d736b9ee..6f381e28 100644 --- a/src/Calculator/Controls/CalculationResultAutomationPeer.cpp +++ b/src/Calculator/Controls/CalculationResultAutomationPeer.cpp @@ -9,7 +9,8 @@ using namespace Windows::UI::Xaml::Automation::Peers; namespace CalculatorApp::Controls { - CalculationResultAutomationPeer::CalculationResultAutomationPeer(FrameworkElement ^ owner) : FrameworkElementAutomationPeer(owner) + CalculationResultAutomationPeer::CalculationResultAutomationPeer(FrameworkElement ^ owner) + : FrameworkElementAutomationPeer(owner) { } diff --git a/src/Calculator/Controls/OverflowTextBlockAutomationPeer.cpp b/src/Calculator/Controls/OverflowTextBlockAutomationPeer.cpp index f28810d7..d5e7d392 100644 --- a/src/Calculator/Controls/OverflowTextBlockAutomationPeer.cpp +++ b/src/Calculator/Controls/OverflowTextBlockAutomationPeer.cpp @@ -10,7 +10,8 @@ using namespace Windows::Foundation::Collections; namespace CalculatorApp::Controls { - OverflowTextBlockAutomationPeer::OverflowTextBlockAutomationPeer(OverflowTextBlock ^ owner) : FrameworkElementAutomationPeer(owner) + OverflowTextBlockAutomationPeer::OverflowTextBlockAutomationPeer(OverflowTextBlock ^ owner) + : FrameworkElementAutomationPeer(owner) { } diff --git a/src/Calculator/DesignData/DesignStandardCalculatorViewModel.h b/src/Calculator/DesignData/DesignStandardCalculatorViewModel.h index 78c54a39..3d61d9cd 100644 --- a/src/Calculator/DesignData/DesignStandardCalculatorViewModel.h +++ b/src/Calculator/DesignData/DesignStandardCalculatorViewModel.h @@ -13,7 +13,9 @@ namespace Numbers ref class MemorySlot sealed : public Windows::UI::Xaml::Data::INotifyPropertyChanged { public: - MemorySlot(int slotPosition, Platform::String ^ value) : m_SlotPosition(slotPosition), m_SlotValue(value) + MemorySlot(int slotPosition, Platform::String ^ value) + : m_SlotPosition(slotPosition) + , m_SlotValue(value) { } @@ -35,7 +37,10 @@ namespace Numbers { public: StandardCalculatorViewModel() - : m_DisplayValue("1234569"), m_DisplayStringExpression("14560 x 1890"), m_DegreeButtonContent("Deg"), m_IsMemoryEmpty(false) + : m_DisplayValue("1234569") + , m_DisplayStringExpression("14560 x 1890") + , m_DegreeButtonContent("Deg") + , m_IsMemoryEmpty(false) { m_MemorizedNumbers = ref new Platform::Collections::Vector(); for (int i = 1000; i < 1100; i++) diff --git a/src/Calculator/DesignData/DesignUnitConverterViewModel.h b/src/Calculator/DesignData/DesignUnitConverterViewModel.h index 1d646811..1bfd6bbb 100644 --- a/src/Calculator/DesignData/DesignUnitConverterViewModel.h +++ b/src/Calculator/DesignData/DesignUnitConverterViewModel.h @@ -21,11 +21,15 @@ namespace Numbers ref class CategoryViewModel sealed : public Windows::UI::Xaml::Data::INotifyPropertyChanged { public: - CategoryViewModel(Platform::String ^ name) : m_Name(name), m_NegateVisibility(Windows::UI::Xaml::Visibility::Collapsed) + CategoryViewModel(Platform::String ^ name) + : m_Name(name) + , m_NegateVisibility(Windows::UI::Xaml::Visibility::Collapsed) { } - CategoryViewModel(Platform::String ^ name, Windows::UI::Xaml::Visibility negateVisibility) : m_Name(name), m_NegateVisibility(negateVisibility) + CategoryViewModel(Platform::String ^ name, Windows::UI::Xaml::Visibility negateVisibility) + : m_Name(name) + , m_NegateVisibility(negateVisibility) { } @@ -39,7 +43,9 @@ namespace Numbers ref class UnitViewModel sealed : public Windows::UI::Xaml::Data::INotifyPropertyChanged { public: - UnitViewModel(Platform::String ^ unit, Platform::String ^ abbr) : m_Name(unit), m_Abbreviation(abbr) + UnitViewModel(Platform::String ^ unit, Platform::String ^ abbr) + : m_Name(unit) + , m_Abbreviation(abbr) { } @@ -53,7 +59,8 @@ namespace Numbers ref class UnitConverterSupplementaryResultViewModel sealed : public Windows::UI::Xaml::Data::INotifyPropertyChanged { public: - UnitConverterSupplementaryResultViewModel(Platform::String ^ value, Platform::String ^ unit, Platform::String ^ abbr) : m_Value(value) + UnitConverterSupplementaryResultViewModel(Platform::String ^ value, Platform::String ^ unit, Platform::String ^ abbr) + : m_Value(value) { m_Unit = ref new UnitViewModel(unit, abbr); } @@ -68,7 +75,11 @@ namespace Numbers ref class UnitConverterViewModel sealed : public Windows::UI::Xaml::Data::INotifyPropertyChanged { public: - UnitConverterViewModel() : m_Value1("Åy24"), m_Value2("Åy183"), m_Value1Active(true), m_Value2Active(false) + UnitConverterViewModel() + : m_Value1("Åy24") + , m_Value2("Åy183") + , m_Value1Active(true) + , m_Value2Active(false) { m_SupplementaryResults = ref new Platform::Collections::Vector(); m_SupplementaryResults->Append(ref new UnitConverterSupplementaryResultViewModel("128", "Kilograms", "Kgs")); diff --git a/src/Calculator/Views/Calculator.xaml.cpp b/src/Calculator/Views/Calculator.xaml.cpp index 1a26d510..6f64b193 100644 --- a/src/Calculator/Views/Calculator.xaml.cpp +++ b/src/Calculator/Views/Calculator.xaml.cpp @@ -41,7 +41,11 @@ DEPENDENCY_PROPERTY_INITIALIZATION(Calculator, IsStandard); DEPENDENCY_PROPERTY_INITIALIZATION(Calculator, IsScientific); DEPENDENCY_PROPERTY_INITIALIZATION(Calculator, IsProgrammer); -Calculator::Calculator() : m_doAnimate(false), m_isLastAnimatedInScientific(false), m_isLastAnimatedInProgrammer(false), m_resultAnimate(false) +Calculator::Calculator() + : m_doAnimate(false) + , m_isLastAnimatedInScientific(false) + , m_isLastAnimatedInProgrammer(false) + , m_resultAnimate(false) { SetFontSizeResources(); InitializeComponent(); diff --git a/src/Calculator/Views/CalculatorProgrammerBitFlipPanel.xaml.cpp b/src/Calculator/Views/CalculatorProgrammerBitFlipPanel.xaml.cpp index f7c260ec..418ff336 100644 --- a/src/Calculator/Views/CalculatorProgrammerBitFlipPanel.xaml.cpp +++ b/src/Calculator/Views/CalculatorProgrammerBitFlipPanel.xaml.cpp @@ -25,7 +25,8 @@ using namespace Windows::UI::Xaml::Input; // The User Control item template is documented at https://go.microsoft.com/fwlink/?LinkId=234236 -CalculatorProgrammerBitFlipPanel::CalculatorProgrammerBitFlipPanel() : m_updatingCheckedStates(false) +CalculatorProgrammerBitFlipPanel::CalculatorProgrammerBitFlipPanel() + : m_updatingCheckedStates(false) { InitializeComponent(); auto booleanToVisibilityConverter = ref new Converters::BooleanToVisibilityConverter; diff --git a/src/Calculator/Views/CalculatorProgrammerDisplayPanel.xaml.cpp b/src/Calculator/Views/CalculatorProgrammerDisplayPanel.xaml.cpp index 7c49b9ed..e3b600bd 100644 --- a/src/Calculator/Views/CalculatorProgrammerDisplayPanel.xaml.cpp +++ b/src/Calculator/Views/CalculatorProgrammerDisplayPanel.xaml.cpp @@ -20,7 +20,8 @@ using namespace Windows::UI::Xaml::Navigation; using namespace Windows::UI::ViewManagement; using namespace Windows::UI::Core; -CalculatorProgrammerDisplayPanel::CalculatorProgrammerDisplayPanel() : m_isErrorVisualState(false) +CalculatorProgrammerDisplayPanel::CalculatorProgrammerDisplayPanel() + : m_isErrorVisualState(false) { InitializeComponent(); } diff --git a/src/Calculator/Views/CalculatorProgrammerRadixOperators.xaml.cpp b/src/Calculator/Views/CalculatorProgrammerRadixOperators.xaml.cpp index 96e19a51..b869bf68 100644 --- a/src/Calculator/Views/CalculatorProgrammerRadixOperators.xaml.cpp +++ b/src/Calculator/Views/CalculatorProgrammerRadixOperators.xaml.cpp @@ -23,7 +23,8 @@ using namespace Windows::UI::Xaml::Data; using namespace CalculatorApp::Common; using namespace Windows::UI::Xaml::Media; -CalculatorProgrammerRadixOperators::CalculatorProgrammerRadixOperators() : m_isErrorVisualState(false) +CalculatorProgrammerRadixOperators::CalculatorProgrammerRadixOperators() + : m_isErrorVisualState(false) { InitializeComponent(); diff --git a/src/Calculator/Views/CalculatorScientificAngleButtons.xaml.cpp b/src/Calculator/Views/CalculatorScientificAngleButtons.xaml.cpp index 41da10c7..66878e3f 100644 --- a/src/Calculator/Views/CalculatorScientificAngleButtons.xaml.cpp +++ b/src/Calculator/Views/CalculatorScientificAngleButtons.xaml.cpp @@ -29,7 +29,8 @@ using namespace Windows::UI::Core; // The User Control item template is documented at https://go.microsoft.com/fwlink/?LinkId=234236 -CalculatorScientificAngleButtons::CalculatorScientificAngleButtons() : m_isErrorVisualState(false) +CalculatorScientificAngleButtons::CalculatorScientificAngleButtons() + : m_isErrorVisualState(false) { InitializeComponent(); } diff --git a/src/Calculator/Views/CalculatorStandardOperators.xaml.cpp b/src/Calculator/Views/CalculatorStandardOperators.xaml.cpp index 75c91e58..7ebd5928 100644 --- a/src/Calculator/Views/CalculatorStandardOperators.xaml.cpp +++ b/src/Calculator/Views/CalculatorStandardOperators.xaml.cpp @@ -24,7 +24,8 @@ using namespace Windows::UI::Xaml::Navigation; // The User Control item template is documented at https://go.microsoft.com/fwlink/?LinkId=234236 -CalculatorStandardOperators::CalculatorStandardOperators() : m_isErrorVisualState(false) +CalculatorStandardOperators::CalculatorStandardOperators() + : m_isErrorVisualState(false) { InitializeComponent(); } diff --git a/src/Calculator/Views/MainPage.xaml.cpp b/src/Calculator/Views/MainPage.xaml.cpp index fa304434..2119d872 100644 --- a/src/Calculator/Views/MainPage.xaml.cpp +++ b/src/Calculator/Views/MainPage.xaml.cpp @@ -63,7 +63,8 @@ namespace CalculatorApp::VisualStates } } -MainPage::MainPage() : m_model(ref new ApplicationViewModel()) +MainPage::MainPage() + : m_model(ref new ApplicationViewModel()) { InitializeComponent(); diff --git a/src/Calculator/Views/Memory.xaml.cpp b/src/Calculator/Views/Memory.xaml.cpp index 1d41ec7f..a204b157 100644 --- a/src/Calculator/Views/Memory.xaml.cpp +++ b/src/Calculator/Views/Memory.xaml.cpp @@ -35,7 +35,8 @@ using namespace Windows::UI::ViewManagement; DEPENDENCY_PROPERTY_INITIALIZATION(Memory, RowHeight); -Memory::Memory() : m_isErrorVisualState(false) +Memory::Memory() + : m_isErrorVisualState(false) { InitializeComponent(); m_memoryItemFlyout = safe_cast(Resources->Lookup("MemoryContextMenu")); diff --git a/src/Calculator/Views/NumberPad.xaml.cpp b/src/Calculator/Views/NumberPad.xaml.cpp index 6145225c..9a6ca2de 100644 --- a/src/Calculator/Views/NumberPad.xaml.cpp +++ b/src/Calculator/Views/NumberPad.xaml.cpp @@ -31,7 +31,8 @@ using namespace CalculatorApp::Common; DEPENDENCY_PROPERTY_INITIALIZATION(NumberPad, ButtonStyle); -NumberPad::NumberPad() : m_isErrorVisualState(false) +NumberPad::NumberPad() + : m_isErrorVisualState(false) { InitializeComponent(); diff --git a/src/Calculator/Views/TitleBar.xaml.cpp b/src/Calculator/Views/TitleBar.xaml.cpp index 242e9f38..a80868fb 100644 --- a/src/Calculator/Views/TitleBar.xaml.cpp +++ b/src/Calculator/Views/TitleBar.xaml.cpp @@ -20,7 +20,8 @@ using namespace Windows::Foundation::Collections; namespace CalculatorApp { - TitleBar::TitleBar() : m_coreTitleBar(CoreApplication::GetCurrentView()->TitleBar) + TitleBar::TitleBar() + : m_coreTitleBar(CoreApplication::GetCurrentView()->TitleBar) { m_uiSettings = ref new UISettings(); m_accessibilitySettings = ref new AccessibilitySettings(); diff --git a/src/Calculator/Views/UnitConverter.xaml.cpp b/src/Calculator/Views/UnitConverter.xaml.cpp index e2199608..a9d2e571 100644 --- a/src/Calculator/Views/UnitConverter.xaml.cpp +++ b/src/Calculator/Views/UnitConverter.xaml.cpp @@ -45,7 +45,9 @@ using namespace Windows::UI::ViewManagement; // There are 10,000 intervals in 1 ms. static const long long DURATION_500_MS = 10000 * 500; -UnitConverter::UnitConverter() : m_meteredConnectionOverride(false), m_isAnimationEnabled(false) +UnitConverter::UnitConverter() + : m_meteredConnectionOverride(false) + , m_isAnimationEnabled(false) { m_layoutDirection = LocalizationService::GetInstance()->GetFlowDirection(); m_FlowDirectionHorizontalAlignment = m_layoutDirection == ::FlowDirection::RightToLeft ? ::HorizontalAlignment::Right : ::HorizontalAlignment::Left; diff --git a/src/CalculatorUnitTests/CurrencyConverterUnitTests.cpp b/src/CalculatorUnitTests/CurrencyConverterUnitTests.cpp index 7b1688d5..b53e4209 100644 --- a/src/CalculatorUnitTests/CurrencyConverterUnitTests.cpp +++ b/src/CalculatorUnitTests/CurrencyConverterUnitTests.cpp @@ -29,7 +29,8 @@ namespace CalculatorApp { public: MockCurrencyHttpClientWithResult(String ^ staticResponse, String ^ allRatiosResponse) - : m_staticResponse(staticResponse), m_allRatiosResponse(allRatiosResponse) + : m_staticResponse(staticResponse) + , m_allRatiosResponse(allRatiosResponse) { } @@ -71,7 +72,8 @@ namespace CalculatorApp class DataLoadedCallback : public UnitConversionManager::IViewModelCurrencyCallback { public: - DataLoadedCallback(task_completion_event tce) : m_task_completion_event{ tce } + DataLoadedCallback(task_completion_event tce) + : m_task_completion_event{ tce } { } diff --git a/src/CalculatorUnitTests/Mocks/CurrencyHttpClient.cpp b/src/CalculatorUnitTests/Mocks/CurrencyHttpClient.cpp index e4a4b606..7e0b48aa 100644 --- a/src/CalculatorUnitTests/Mocks/CurrencyHttpClient.cpp +++ b/src/CalculatorUnitTests/Mocks/CurrencyHttpClient.cpp @@ -42,7 +42,8 @@ IAsyncOperationWithProgress ^ CurrencyHttpClient::GetCur return ref new MockAsyncOperationWithProgress(StringReference(ALL_RATIOS_RESPONSE)); } -MockAsyncOperationWithProgress::MockAsyncOperationWithProgress(String ^ result) : m_result(result) +MockAsyncOperationWithProgress::MockAsyncOperationWithProgress(String ^ result) + : m_result(result) { } diff --git a/src/CalculatorUnitTests/UnitConverterTest.cpp b/src/CalculatorUnitTests/UnitConverterTest.cpp index 5d77ea89..a9cf3929 100644 --- a/src/CalculatorUnitTests/UnitConverterTest.cpp +++ b/src/CalculatorUnitTests/UnitConverterTest.cpp @@ -38,7 +38,8 @@ namespace UnitConverterUnitTests class TestUnitConverterConfigLoader : public IConverterDataLoader { public: - TestUnitConverterConfigLoader() : m_loadDataCallCount(0) + TestUnitConverterConfigLoader() + : m_loadDataCallCount(0) { Category c1, c2; SetCategoryParams(&c1, 1, L"Length", true); diff --git a/src/CalculatorUnitTests/UnitConverterViewModelUnitTests.cpp b/src/CalculatorUnitTests/UnitConverterViewModelUnitTests.cpp index a7c7ff82..24ac03e0 100644 --- a/src/CalculatorUnitTests/UnitConverterViewModelUnitTests.cpp +++ b/src/CalculatorUnitTests/UnitConverterViewModelUnitTests.cpp @@ -262,7 +262,8 @@ private: bool m_active; public: - MockActivatable(bool active) : m_active(active) + MockActivatable(bool active) + : m_active(active) { }