summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-02-14 18:57:18 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-02-14 21:36:32 (GMT)
commitcb05f5a908e20006c954ce38755c2e422ecc2388 (patch)
treea793551a5fe279a57d4330119560e8542f745484 /SwifTools/Linkify.cpp
parentcad974b45c0fb9355e68d9728e42c9ae3dbcebc7 (diff)
downloadswift-cb05f5a908e20006c954ce38755c2e422ecc2388.zip
swift-cb05f5a908e20006c954ce38755c2e422ecc2388.tar.bz2
Removed Swift::String.
Diffstat (limited to 'SwifTools/Linkify.cpp')
-rw-r--r--SwifTools/Linkify.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/SwifTools/Linkify.cpp b/SwifTools/Linkify.cpp
index 822536e..91c713f 100644
--- a/SwifTools/Linkify.cpp
+++ b/SwifTools/Linkify.cpp
@@ -14,18 +14,18 @@ namespace Swift {
static boost::regex linkifyRegexp("^https?://.*");
-String Linkify::linkify(const String& input) {
+std::string Linkify::linkify(const std::string& input) {
std::ostringstream result;
std::vector<char> currentURL;
bool inURL = false;
- for (size_t i = 0; i < input.getUTF8Size(); ++i) {
+ for (size_t i = 0; i < input.size(); ++i) {
char c = input[i];
if (inURL) {
if (c != ' ' && c != '\t' && c != '\n') {
currentURL.push_back(c);
}
else {
- String url(&currentURL[0], currentURL.size());
+ std::string url(&currentURL[0], currentURL.size());
result << "<a href=\"" << url << "\">" << url << "</a>";
currentURL.clear();
inURL = false;
@@ -33,7 +33,7 @@ String Linkify::linkify(const String& input) {
}
}
else {
- if (boost::regex_match(input.getSubstring(i, 8).getUTF8String(), linkifyRegexp)) {
+ if (boost::regex_match(input.substr(i, 8), linkifyRegexp)) {
currentURL.push_back(c);
inURL = true;
}
@@ -43,10 +43,10 @@ String Linkify::linkify(const String& input) {
}
}
if (currentURL.size() > 0) {
- String url(&currentURL[0], currentURL.size());
+ std::string url(&currentURL[0], currentURL.size());
result << "<a href=\"" << url << "\">" << url << "</a>";
}
- return String(result.str());
+ return std::string(result.str());
}
}