Skip to content

Commit

Permalink
Merge pull request #2 from sanderl/issuetemplates
Browse files Browse the repository at this point in the history
Issuetemplates
  • Loading branch information
sanderl authored Feb 20, 2019
2 parents e2409a0 + 23a3507 commit 65c9528
Show file tree
Hide file tree
Showing 9 changed files with 45 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ assignees: ''
---

**Please describe your feature request.**
<!--For more information see https://github.com/Microsoft/calculator/blob/master/docs/NewFeatureProcess.md-->
<!--For more information see https://github.com/Microsoft/calculator/blob/master/docs/NewFeatureProcess.md -->

**Is your feature request related to a problem? Please describe.**
<!--A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]-->
Expand Down
15 changes: 8 additions & 7 deletions .github/PULL_REQUEST_TEMPLATE/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
# Fixes #.
## Fixes #.

## Description of the changes in this pull request:

### Description of the changes:
-
-
-

## How this pull request was validated:
### Review [Contributing.md](../Contributing.md) and ensure all contributing requirements are met.
### Specify how you tested your changes (i.e. manual/ad-hoc testing, automated testing, new automated tests added)
-
### How changes were validated:
<!--Review https://github.com/Microsoft/calculator/blob/master/CONTRIBUTING.md and ensure all contributing requirements are met.
Specify how you tested your changes (i.e. manual/ad-hoc testing, automated testing, new automated tests added)-->
-
-
-

@Microsoft/calculator-team
16 changes: 16 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
## Fixes #.


### Description of the changes:
-
-
-

### How changes were validated:
<!--Review https://github.com/Microsoft/calculator/blob/master/CONTRIBUTING.md and ensure all contributing requirements are met.
Specify how you tested your changes (i.e. manual/ad-hoc testing, automated testing, new automated tests added)-->
-
-
-

1 change: 1 addition & 0 deletions src/CalcManager/CalcManager.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,7 @@
<ClInclude Include="Header Files\CalcInput.h" />
<ClInclude Include="Header Files\IHistoryDisplay.h" />
<ClInclude Include="Header Files\Number.h" />
<ClInclude Include="Header Files\RadixType.h" />
<ClInclude Include="Header Files\Rational.h" />
<ClInclude Include="Header Files\scimath.h" />
<ClInclude Include="pch.h" />
Expand Down
3 changes: 3 additions & 0 deletions src/CalcManager/CalcManager.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -161,5 +161,8 @@
<ClInclude Include="Header Files\Rational.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Header Files\RadixType.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
</Project>
10 changes: 1 addition & 9 deletions src/CalcManager/Header Files/CalcEngine.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#include "../Command.h"
#include "../CalculatorVector.h"
#include "../ExpressionCommand.h"
#include "RadixType.h"
#include "History.h" // for History Collector
#include "CalcInput.h"
#include "ICalcDisplay.h"
Expand All @@ -38,15 +39,6 @@ enum eNUM_WIDTH {
typedef enum eNUM_WIDTH NUM_WIDTH;
static constexpr size_t NUM_WIDTH_LENGTH = 4;

// This is expected to be in same order as IDM_HEX, IDM_DEC, IDM_OCT, IDM_BIN
enum eRADIX_TYPE {
HEX_RADIX,
DEC_RADIX,
OCT_RADIX,
BIN_RADIX
};
typedef enum eRADIX_TYPE RADIX_TYPE;

namespace CalculationManager
{
class IResourceProvider;
Expand Down
2 changes: 1 addition & 1 deletion src/CalcManager/Header Files/Number.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#pragma once

#include "RatPack/ratpak.h"
#include "Ratpack/ratpak.h"

namespace CalcEngine
{
Expand Down
13 changes: 13 additions & 0 deletions src/CalcManager/Header Files/RadixType.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

#pragma once

// This is expected to be in same order as IDM_HEX, IDM_DEC, IDM_OCT, IDM_BIN
enum eRADIX_TYPE {
HEX_RADIX,
DEC_RADIX,
OCT_RADIX,
BIN_RADIX
};
typedef enum eRADIX_TYPE RADIX_TYPE;
2 changes: 1 addition & 1 deletion src/Calculator/Converters/RadixToStringConverter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#include "pch.h"
#include "RadixToStringConverter.h"
#include "CalcManager/Header Files/CalcEngine.h"
#include "CalcManager/Header Files/RadixType.h"
#include "CalcViewModel/Common/AppResourceProvider.h"

using namespace Platform;
Expand Down

0 comments on commit 65c9528

Please sign in to comment.