summaryrefslogtreecommitdiff
path: root/extensions/source/scanner/sane.hxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-03-26 15:28:40 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-03-26 15:33:30 +0100
commitac3ebf3bde458a31e4cde5da554189c51cba6bcf (patch)
tree3954e06c36353cbea4df10447863341d331d4d26 /extensions/source/scanner/sane.hxx
parent812e5e8ed7c408cb7f2388ab718365354bfc9a41 (diff)
const_cast: convert some C-style casts and remove some redundant ones
Change-Id: Id0a3194e20128ad6defb95b51757dd01fcab9eb1
Diffstat (limited to 'extensions/source/scanner/sane.hxx')
-rw-r--r--extensions/source/scanner/sane.hxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/extensions/source/scanner/sane.hxx b/extensions/source/scanner/sane.hxx
index ba7cf2c47bef..d0ae220ce38a 100644
--- a/extensions/source/scanner/sane.hxx
+++ b/extensions/source/scanner/sane.hxx
@@ -127,9 +127,9 @@ public:
{ return ppDevices[n]->type ? OUString( ppDevices[n]->type, strlen(ppDevices[n]->type), osl_getThreadTextEncoding() ) : OUString(); }
OUString GetOptionName( int n )
- { return mppOptions[n]->name ? OUString( (char*)mppOptions[n]->name, strlen((char*)mppOptions[n]->name), osl_getThreadTextEncoding() ) : OUString(); }
+ { return mppOptions[n]->name ? OUString( mppOptions[n]->name, strlen(mppOptions[n]->name), osl_getThreadTextEncoding() ) : OUString(); }
OUString GetOptionTitle( int n )
- { return mppOptions[n]->title ? OUString( (char*)mppOptions[n]->title, strlen((char*)mppOptions[n]->title), osl_getThreadTextEncoding() ) : OUString(); }
+ { return mppOptions[n]->title ? OUString( mppOptions[n]->title, strlen(mppOptions[n]->title), osl_getThreadTextEncoding() ) : OUString(); }
SANE_Value_Type GetOptionType( int n )
{ return mppOptions[n]->type; }
SANE_Unit GetOptionUnit( int n )
@@ -140,7 +140,7 @@ public:
SANE_Constraint_Type GetOptionConstraintType( int n )
{ return mppOptions[n]->constraint_type; }
const char** GetStringConstraint( int n )
- { return (const char**)mppOptions[n]->constraint.string_list; }
+ { return const_cast<const char**>(mppOptions[n]->constraint.string_list); }
int GetRange( int, double*& );
inline int GetOptionElements( int n );