summaryrefslogtreecommitdiff
path: root/basegfx/source/inc
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2015-05-05 10:27:00 +0300
committerTor Lillqvist <tml@collabora.com>2015-05-05 10:59:11 +0300
commit3363f828d63775a11073276dce927b9538b57be6 (patch)
tree66bfbffde18147a5d7188e4cf4dce0cd47112395 /basegfx/source/inc
parent259820af718fe15ea5080711f77918dad8f14fbb (diff)
Drop misused lcl_ prefix
If used at all, lcl_ is supposed to be used for static functions truly local to one source files. The functions here occur in several source files (well, two, the one where they are defined and one other) so they are not "local" in that sense. (But they could be local in the one file that uses them...) Also, they are already in a basegfx::internal namespace. While at it, drop the :: prefix eyesore from basegfx::internal, and align parameter lists consistently. Change-Id: I68b91075e0b1779ac0fa884d8f9e956f1ab7b308
Diffstat (limited to 'basegfx/source/inc')
-rw-r--r--basegfx/source/inc/stringconversiontools.hxx69
1 files changed, 37 insertions, 32 deletions
diff --git a/basegfx/source/inc/stringconversiontools.hxx b/basegfx/source/inc/stringconversiontools.hxx
index 04b9f8344819..92713bf598c0 100644
--- a/basegfx/source/inc/stringconversiontools.hxx
+++ b/basegfx/source/inc/stringconversiontools.hxx
@@ -27,15 +27,17 @@ namespace basegfx
{
namespace internal
{
- void lcl_skipSpaces(sal_Int32& io_rPos,
- const OUString& rStr,
- const sal_Int32 nLen);
+ void skipSpaces(sal_Int32& io_rPos,
+ const OUString& rStr,
+ const sal_Int32 nLen);
- void lcl_skipSpacesAndCommas(sal_Int32& io_rPos,
- const OUString& rStr,
- const sal_Int32 nLen);
+ void skipSpacesAndCommas(sal_Int32& io_rPos,
+ const OUString& rStr,
+ const sal_Int32 nLen);
- inline bool lcl_isOnNumberChar(const sal_Unicode aChar, bool bSignAllowed = true, bool bDotAllowed = true)
+ inline bool isOnNumberChar(const sal_Unicode aChar,
+ bool bSignAllowed = true,
+ bool bDotAllowed = true)
{
const bool bPredicate( (sal_Unicode('0') <= aChar && sal_Unicode('9') >= aChar)
|| (bSignAllowed && sal_Unicode('+') == aChar)
@@ -45,40 +47,43 @@ namespace basegfx
return bPredicate;
}
- inline bool lcl_isOnNumberChar(const OUString& rStr, const sal_Int32 nPos, bool bSignAllowed = true, bool bDotAllowed = true)
+ inline bool isOnNumberChar(const OUString& rStr,
+ const sal_Int32 nPos,
+ bool bSignAllowed = true,
+ bool bDotAllowed = true)
{
- return lcl_isOnNumberChar(rStr[nPos], bSignAllowed, bDotAllowed);
+ return isOnNumberChar(rStr[nPos], bSignAllowed, bDotAllowed);
}
- bool lcl_getDoubleChar(double& o_fRetval,
- sal_Int32& io_rPos,
- const OUString& rStr);
+ bool getDoubleChar(double& o_fRetval,
+ sal_Int32& io_rPos,
+ const OUString& rStr);
- bool lcl_importDoubleAndSpaces( double& o_fRetval,
- sal_Int32& io_rPos,
- const OUString& rStr,
- const sal_Int32 nLen );
+ bool importDoubleAndSpaces(double& o_fRetval,
+ sal_Int32& io_rPos,
+ const OUString& rStr,
+ const sal_Int32 nLen );
- bool lcl_importFlagAndSpaces(sal_Int32& o_nRetval,
- sal_Int32& io_rPos,
- const OUString& rStr,
- const sal_Int32 nLen);
+ bool importFlagAndSpaces(sal_Int32& o_nRetval,
+ sal_Int32& io_rPos,
+ const OUString& rStr,
+ const sal_Int32 nLen);
- void lcl_skipNumber(sal_Int32& io_rPos,
- const OUString& rStr,
- const sal_Int32 nLen);
+ void skipNumber(sal_Int32& io_rPos,
+ const OUString& rStr,
+ const sal_Int32 nLen);
- void lcl_skipDouble(sal_Int32& io_rPos,
- const OUString& rStr);
+ void skipDouble(sal_Int32& io_rPos,
+ const OUString& rStr);
- void lcl_putNumberCharWithSpace( OUStringBuffer& rStr,
- double fValue,
- double fOldValue,
- bool bUseRelativeCoordinates );
+ void putNumberCharWithSpace(OUStringBuffer& rStr,
+ double fValue,
+ double fOldValue,
+ bool bUseRelativeCoordinates);
- inline sal_Unicode lcl_getCommand( sal_Char cUpperCaseCommand,
- sal_Char cLowerCaseCommand,
- bool bUseRelativeCoordinates )
+ inline sal_Unicode getCommand(sal_Char cUpperCaseCommand,
+ sal_Char cLowerCaseCommand,
+ bool bUseRelativeCoordinates)
{
return bUseRelativeCoordinates ? cLowerCaseCommand : cUpperCaseCommand;
}