generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-01-18 00:15:27 +01:00
Code Issues Projects Releases Wiki Activity

trunk/branch integration: refactoring

Browse Source
This commit is contained in:
Marian Krivos 2011-08-23 07:13:42 +00:00
parent 8bc1691e16
commit 35f44e5a2d
1 changed files with 26 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Foundation/src/UTF8String.cpp
View File

@ -1,7 +1,7 @@
//
// UTF8String.cpp
//
// $Id: //poco/svn/Foundation/src/UTF8String.cpp#2 $
// $Id: //poco/1.4/Foundation/src/UTF8String.cpp#1 $
//
// Library: Foundation
// Package: Text
@ -45,10 +45,14 @@
namespace Poco {
int UTF8::icompare(const std::string& str, std::string::size_type pos, std::string::size_type n, std::string::const_iterator it2, std::string::const_iterator end2)
namespace
{
static UTF8Encoding utf8;
}
int UTF8::icompare(const std::string& str, std::string::size_type pos, std::string::size_type n, std::string::const_iterator it2, std::string::const_iterator end2)
{
std::string::size_type sz = str.size();
if (pos > sz) pos = sz;
if (pos + n > sz) n = sz - pos;
@ -120,8 +124,6 @@ int UTF8::icompare(const std::string& str1, std::string::size_type pos1, std::st
int UTF8::icompare(const std::string& str, std::string::size_type pos, std::string::size_type n, const std::string::value_type* ptr)
{
static UTF8Encoding utf8;
poco_check_ptr (ptr);
std::string::size_type sz = str.size();
if (pos > sz) pos = sz;
@ -160,7 +162,6 @@ int UTF8::icompare(const std::string& str, const std::string::value_type* ptr)
std::string UTF8::toUpper(const std::string& str)
{
static UTF8Encoding utf8;
std::string result;
TextConverter converter(utf8, utf8);
converter.convert(str, result, Unicode::toUpper);
@ -170,7 +171,6 @@ std::string UTF8::toUpper(const std::string& str)
std::string& UTF8::toUpperInPlace(std::string& str)
{
static UTF8Encoding utf8;
std::string result;
TextConverter converter(utf8, utf8);
converter.convert(str, result, Unicode::toUpper);
@ -181,7 +181,6 @@ std::string& UTF8::toUpperInPlace(std::string& str)
std::string UTF8::toLower(const std::string& str)
{
static UTF8Encoding utf8;
std::string result;
TextConverter converter(utf8, utf8);
converter.convert(str, result, Unicode::toLower);
@ -191,7 +190,6 @@ std::string UTF8::toLower(const std::string& str)
std::string& UTF8::toLowerInPlace(std::string& str)
{
static UTF8Encoding utf8;
std::string result;
TextConverter converter(utf8, utf8);
converter.convert(str, result, Unicode::toLower);