From: ishmal <ishmal@users.sourceforge.net>
Date: Sun, 18 Mar 2007 21:50:00 +0000 (+0000)
Subject: change std::string::size_type to DOMString::size_type
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=3cb96c7a9a488bc6db6cc279c4110a6e4aa67c47;p=inkscape.git

change std::string::size_type to DOMString::size_type
---

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);