summaryrefslogtreecommitdiffstats
path: root/src/dom/uri.cpp
diff options
context:
space:
mode:
authorBob Jamison <ishmalius@gmail.com>2007-03-18 21:50:00 +0000
committerishmal <ishmal@users.sourceforge.net>2007-03-18 21:50:00 +0000
commit158919e919c07d24f63c193d8dad7b8e2bced9d1 (patch)
treec8b95c982eeb31adfae0e062202c8812e2445258 /src/dom/uri.cpp
parentoptimize cairo paths by not drawing segments that are outside of view (for st... (diff)
downloadinkscape-158919e919c07d24f63c193d8dad7b8e2bced9d1.tar.gz
inkscape-158919e919c07d24f63c193d8dad7b8e2bced9d1.zip
change std::string::size_type to DOMString::size_type
(bzr r2701)
Diffstat (limited to 'src/dom/uri.cpp')
-rw-r--r--src/dom/uri.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/dom/uri.cpp b/src/dom/uri.cpp
index b56b5c217..9b1102b61 100644
--- a/src/dom/uri.cpp
+++ b/src/dom/uri.cpp
@@ -10,7 +10,7 @@
* Authors:
* Bob Jamison
*
- * Copyright (C) 2005 Bob Jamison
+ * Copyright (C) 2005-2007 Bob Jamison
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -53,7 +53,7 @@ typedef struct
int port;
} LookupEntry;
-LookupEntry schemes[] =
+static LookupEntry schemes[] =
{
{ URI::SCHEME_DATA, "data:", 0 },
{ URI::SCHEME_HTTP, "http:", 80 },
@@ -332,7 +332,7 @@ URI URI::resolve(const URI &other) const
}
else
{
- std::string::size_type pos = path.find_last_of('/');
+ DOMString::size_type pos = path.find_last_of('/');
if (pos != path.npos)
{
DOMString tpath = path.substr(0, pos+1);
@@ -378,7 +378,7 @@ void URI::normalize()
}
while (pos < path.size())
{
- std::string::size_type pos2 = path.find('/', pos);
+ DOMString::size_type pos2 = path.find('/', pos);
if (pos2==path.npos)
{
DOMString seg = path.substr(pos);