summaryrefslogtreecommitdiff
path: root/extensions
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-02-16 10:32:45 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-02-16 12:42:04 +0200
commitee36298909783fa3e722349d6efee061749041c0 (patch)
tree3b3a1d2041c95e4190431d130ec846279d4338c5 /extensions
parent8c5860aeb47c5ba49e06a2af961a2448debe2b50 (diff)
convert resetType to scoped enum
Change-Id: Ie127b99949546b5303fd105c662b25c62d409941
Diffstat (limited to 'extensions')
-rw-r--r--extensions/source/scanner/grid.cxx14
-rw-r--r--extensions/source/scanner/grid.hxx2
2 files changed, 8 insertions, 8 deletions
diff --git a/extensions/source/scanner/grid.cxx b/extensions/source/scanner/grid.cxx
index 90faba32e8fc..4f8c285bcb90 100644
--- a/extensions/source/scanner/grid.cxx
+++ b/extensions/source/scanner/grid.cxx
@@ -127,7 +127,7 @@ public:
double* getNewYValues() { return m_pNewYValues; }
- void ChangeMode(int nType);
+ void ChangeMode(ResetType nType);
virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) override;
};
@@ -631,11 +631,11 @@ void GridWindow::MouseButtonDown( const MouseEvent& rEvt )
Window::MouseButtonDown( rEvt );
}
-void GridWindow::ChangeMode(int nType)
+void GridWindow::ChangeMode(ResetType nType)
{
switch( nType )
{
- case LINEAR_ASCENDING:
+ case ResetType::LINEAR_ASCENDING:
{
for( int i = 0; i < m_nValues; i++ )
{
@@ -643,7 +643,7 @@ void GridWindow::ChangeMode(int nType)
}
}
break;
- case LINEAR_DESCENDING:
+ case ResetType::LINEAR_DESCENDING:
{
for( int i = 0; i < m_nValues; i++ )
{
@@ -651,13 +651,13 @@ void GridWindow::ChangeMode(int nType)
}
}
break;
- case RESET:
+ case ResetType::RESET:
{
if( m_pOrigYValues && m_pNewYValues && m_nValues )
memcpy( m_pNewYValues, m_pOrigYValues, m_nValues*sizeof(double) );
}
break;
- case EXPONENTIAL:
+ case ResetType::EXPONENTIAL:
{
for( int i = 0; i < m_nValues; i++ )
{
@@ -704,7 +704,7 @@ IMPL_LINK( GridDialog, ClickButtonHdl, Button*, pButton, void )
if (pButton == m_pResetButton)
{
int nType = m_pResetTypeBox->GetSelectEntryPos();
- m_pGridWindow->ChangeMode(nType);
+ m_pGridWindow->ChangeMode((ResetType)nType);
}
}
diff --git a/extensions/source/scanner/grid.hxx b/extensions/source/scanner/grid.hxx
index 73effc64143b..57e1106c7d16 100644
--- a/extensions/source/scanner/grid.hxx
+++ b/extensions/source/scanner/grid.hxx
@@ -27,7 +27,7 @@
class GridWindow;
-enum resetType
+enum class ResetType
{
LINEAR_ASCENDING = 0,
LINEAR_DESCENDING = 1,