extract setters from wxHeaderColumnBase into a separate wxSettableHeaderColumn class...

[wxWidgets.git] / src / common / uri.cpp

diff --git a/src/common/uri.cpp b/src/common/uri.cpp
index 807268f80d19741500e9beb61e92b75e64d15e48..fd5b69caaf8afef3038883ba53cb9fb30ed17600 100644 (file)
--- a/src/common/uri.cpp
+++ b/src/common/uri.cpp
@@ -27,7 +27,6 @@
 
 #ifndef WX_PRECOMP
     #include "wx/crt.h"
 
 #ifndef WX_PRECOMP
     #include "wx/crt.h"

-    #include "wx/arrstr.h"

 #endif
 
 #include "wx/uri.h"
 #endif
 
 #include "wx/uri.h"


@@ -133,7 +132,7 @@ wxString wxURI::Unescape(const wxString& uri)
 
             wxASSERT_MSG( n >= 0 && n <= 0xff, "unexpected character value" );
 
 
             wxASSERT_MSG( n >= 0 && n <= 0xff, "unexpected character value" );
 

-            c = wx_static_cast(char, n);
+            c = static_cast<char>(n);

         }
 
         *p = c;
         }
 
         *p = c;


@@ -443,7 +442,7 @@ const char* wxURI::ParseServer(const char* uri)
         {
             m_hostType = wxURI_IPV6ADDRESS;
 
         {
             m_hostType = wxURI_IPV6ADDRESS;
 

-            m_server.assign(start, uri - start - 1);
+            m_server.assign(start + 1, uri - start - 1);

             ++uri;
         }
         else
             ++uri;
         }
         else


@@ -454,7 +453,7 @@ const char* wxURI::ParseServer(const char* uri)
             {
                 m_hostType = wxURI_IPVFUTURE;
 
             {
                 m_hostType = wxURI_IPVFUTURE;
 

-                m_server.assign(start, uri - start - 1);
+                m_server.assign(start + 1, uri - start - 1);

                 ++uri;
             }
             else // unrecognized IP literal
                 ++uri;
             }
             else // unrecognized IP literal


@@ -469,7 +468,7 @@ const char* wxURI::ParseServer(const char* uri)
         {
             m_hostType = wxURI_IPV4ADDRESS;
 
         {
             m_hostType = wxURI_IPV4ADDRESS;
 

-            m_server.assign(start, uri - start - 1);
+            m_server.assign(start, uri - start);

         }
         else
         {
         }
         else
         {