X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5e8e25e72968ad2d10bbf290291b84de35c7e18b..70050c82fe8114fc5d86591035e71751bac21cc6:/src/html/htmltag.cpp

diff --git a/src/html/htmltag.cpp b/src/html/htmltag.cpp
index 1cfeb5a5b6..02f045ce3c 100644
--- a/src/html/htmltag.cpp
+++ b/src/html/htmltag.cpp
@@ -71,7 +71,7 @@ wxHtmlTagsCache::wxHtmlTagsCache(const wxString& source)
     while (pos < lng) 
     {
         if (src[pos] == wxT('<'))   // tag found:
-	    {
+        {
             if (m_CacheSize % CACHE_INCREMENT == 0)
                 m_Cache = (wxHtmlCacheItem*) realloc(m_Cache, (m_CacheSize + CACHE_INCREMENT) * sizeof(wxHtmlCacheItem));
             tg = m_CacheSize++;
@@ -81,7 +81,7 @@ wxHtmlTagsCache::wxHtmlTagsCache(const wxString& source)
                    src[pos] != wxT('>') &&
                    src[pos] != wxT(' ') && src[pos] != wxT('\r') && 
                    src[pos] != wxT('\n') && src[pos] != wxT('\t')) 
-		    {
+            {
                 dummy[i] = src[pos++];
                 if ((dummy[i] >= wxT('a')) && (dummy[i] <= wxT('z'))) dummy[i] -= (wxT('a') - wxT('A'));
                 i++;
@@ -93,19 +93,19 @@ wxHtmlTagsCache::wxHtmlTagsCache(const wxString& source)
             while (pos < lng && src[pos] != wxT('>')) pos++;
 
             if (src[stpos+1] == wxT('/')) // ending tag:
-    	    {
+            {
                 m_Cache[tg].End1 = m_Cache[tg].End2 = -2;
                 // find matching begin tag:
                 for (i = tg; i >= 0; i--)
                     if ((m_Cache[i].End1 == -1) && (wxStrcmp(m_Cache[i].Name, dummy+1) == 0)) 
-		            {
+                    {
                         m_Cache[i].End1 = stpos;
                         m_Cache[i].End2 = pos + 1;
                         break;
                     }
             }
             else 
-	        {
+            {
                 m_Cache[tg].End1 = m_Cache[tg].End2 = -1;
             }
         }
@@ -152,48 +152,53 @@ wxHtmlTag::wxHtmlTag(const wxString& source, int pos, int end_pos, wxHtmlTagsCac
     // fill-in name, params and begin pos:
     m_Name = m_Params = wxEmptyString;
     i = pos+1;
-    if (source[i] == '/') { m_Ending = TRUE; i++; }
+    if (source[i] == wxT('/')) { m_Ending = TRUE; i++; }
     else m_Ending = FALSE;
 
     // find tag's name and convert it to uppercase:
     while ((i < end_pos) && 
-               ((c = source[i++]) != ' ' && c != '\r' && c != '\n' && c != '\t' &&
-                c != '>')) 
-	{
-        if ((c >= 'a') && (c <= 'z')) c -= ('a' - 'A');
+               ((c = source[i++]) != wxT(' ') && c != wxT('\r') && 
+                 c != wxT('\n') && c != wxT('\t') &&
+                 c != wxT('>'))) 
+    {
+        if ((c >= wxT('a')) && (c <= wxT('z'))) c -= (wxT('a') - wxT('A'));
         m_Name += c;
     }
 
     // if the tag has parameters, read them and "normalize" them,
     // i.e. convert to uppercase, replace whitespaces by spaces and 
     // remove whitespaces around '=':
-    if (source[i-1] != '>')
-        while ((i < end_pos) && ((c = source[i++]) != '>')) 
-	    {
-            if ((c >= 'a') && (c <= 'z')) c -= ('a' - 'A');
-            if (c == '\r' || c == '\n' || c == '\t') c = ' '; // make future parsing a bit simpler
+    if (source[i-1] != wxT('>'))
+        while ((i < end_pos) && ((c = source[i++]) != wxT('>'))) 
+        {
+            if ((c >= wxT('a')) && (c <= wxT('z'))) 
+                c -= (wxT('a') - wxT('A'));
+            if (c == wxT('\r') || c == wxT('\n') || c == wxT('\t')) 
+                c = wxT(' '); // make future parsing a bit simpler
             m_Params += c;
-            if (c == '"') 
-	        {
+            if (c == wxT('"')) 
+            {
                 // remove spaces around the '=' character:
                 if (m_Params.Length() > 1 && 
-                    m_Params[m_Params.Length()-2] == ' ')
+                    m_Params[m_Params.Length()-2] == wxT(' '))
                 {
                     m_Params.RemoveLast();
-                    while (m_Params.Length() > 0 && m_Params.Last() == ' ') 
+                    while (m_Params.Length() > 0 && m_Params.Last() == wxT(' ')) 
                         m_Params.RemoveLast();
-                    m_Params += '"';
+                    m_Params += wxT('"');
                 }
-                while ((i < end_pos) && (source[i++] == ' ')) {}
+                while ((i < end_pos) && (source[i++] == wxT(' '))) {}
                 if (i < end_pos) i--;
             
                 // ...and copy the value to m_Params:
-                while ((i < end_pos) && ((c = source[i++]) != '"')) m_Params += c;
+                while ((i < end_pos) && ((c = source[i++]) != wxT('"'))) 
+                    m_Params += c;
                 m_Params += c;
             }
-            else if (c == '\'') 
-	        {
-                while ((i < end_pos) && ((c = source[i++]) != '\'')) m_Params += c;
+            else if (c == wxT('\'')) 
+            {
+                while ((i < end_pos) && ((c = source[i++]) != wxT('\''))) 
+                    m_Params += c;
                 m_Params += c;
             }
         }
@@ -210,25 +215,26 @@ bool wxHtmlTag::HasParam(const wxString& par) const
 {
     const wxChar *st = m_Params, *p = par;
     const wxChar *st2, *p2;
+    const wxChar invalid = wxT('\1');
 
     if (*st == 0) return FALSE;
     if (*p == 0) return FALSE;
     for (st2 = st, p2 = p; ; st2++) 
     {
-        if (*p2 == 0) return TRUE;
+        if (*p2 == 0 && *st2 == wxT('=')) return TRUE;
         if (*st2 == 0) return FALSE;
-        if (*p2 != *st2) p2 = p;
+        if (*p2 != *st2) p2 = &invalid;
         if (*p2 == *st2) p2++;
-        if (*st2 == ' ') p2 = p;
-        else if (*st2 == '=') 
-	    {
+        if (*st2 == wxT(' ')) p2 = p;
+        else if (*st2 == wxT('=')) 
+        {
             p2 = p;
-            while (*st2 != ' ') 
-	        {
-                if (*st2 == '"') 
-		        {
+            while (*st2 != wxT(' ')) 
+            {
+                if (*st2 == wxT('"')) 
+                {
                     st2++;
-                    while (*st2 != '"') st2++;
+                    while (*st2 != wxT('"')) st2++;
                 }
                 st2++;
                 if (*st2 == 0) return FALSE;
@@ -243,59 +249,60 @@ wxString wxHtmlTag::GetParam(const wxString& par, bool with_commas) const
 {
     const wxChar *st = m_Params, *p = par;
     const wxChar *st2, *p2;
+    const wxChar invalid = wxT('\1');
     bool comma;
-    char comma_char;
+    wxChar comma_char;
 
-    if (*st == 0) return "";
-    if (*p == 0) return "";
+    if (*st == 0) return wxEmptyString;
+    if (*p == 0) return wxEmptyString;
     for (st2 = st, p2 = p; ; st2++) 
     {
-        if (*p2 == 0)  // found
-	    {
-            wxString fnd = "";
+        if (*p2 == 0 && *st2 == wxT('='))  // found
+        {
+            wxString fnd = wxEmptyString;
             st2++; // '=' character
             comma = FALSE;
-    	    comma_char = '\0';
-            if (!with_commas && (*(st2) == '"')) 
-	        {
-    	        st2++;
-        		comma = TRUE; 
-        		comma_char = '"';
-	        }
-    	    else if (!with_commas && (*(st2) == '\'')) 
-	        {
-    	        st2++; 
-    	    	comma = TRUE;
-        		comma_char = '\'';
-    	    }
-	    
+            comma_char = wxT('\0');
+            if (!with_commas && (*(st2) == wxT('"'))) 
+            {
+                st2++;
+                comma = TRUE; 
+                comma_char = wxT('"');
+            }
+            else if (!with_commas && (*(st2) == wxT('\''))) 
+            {
+                st2++; 
+                comma = TRUE;
+                comma_char = wxT('\'');
+            }
+        
             while (*st2 != 0) 
-	        {
+            {
                 if (comma && *st2 == comma_char) comma = FALSE;
-                else if ((*st2 == ' ') && (!comma)) break;
+                else if ((*st2 == wxT(' ')) && (!comma)) break;
                 fnd += (*(st2++));
             }
             if (!with_commas && (*(st2-1) == comma_char)) fnd.RemoveLast();
             return fnd;
         }
-        if (*st2 == 0) return "";
-        if (*p2 != *st2) p2 = p;
+        if (*st2 == 0) return wxEmptyString;
+        if (*p2 != *st2) p2 = &invalid;
         if (*p2 == *st2) p2++;
-        if (*st2 == ' ') p2 = p;
-        else if (*st2 == '=') 
-	    {
+        if (*st2 == wxT(' ')) p2 = p;
+        else if (*st2 == wxT('=')) 
+        {
             p2 = p;
-            while (*st2 != ' ') 
-	        {
-                if (*st2 == '"') 
-		        {
+            while (*st2 != wxT(' ')) 
+            {
+                if (*st2 == wxT('"')) 
+                {
                     st2++;
-                    while (*st2 != '"') st2++;
+                    while (*st2 != wxT('"')) st2++;
                 }
-                else if (*st2 == '\'') 
-		        {
+                else if (*st2 == wxT('\''))
+                {
                     st2++;
-                    while (*st2 != '\'') st2++;
+                    while (*st2 != wxT('\'')) st2++;
                 }
                 st2++;
             }
@@ -308,7 +315,7 @@ wxString wxHtmlTag::GetParam(const wxString& par, bool with_commas) const
 int wxHtmlTag::ScanParam(const wxString& par, wxChar *format, void *param) const
 {
     wxString parval = GetParam(par);
-    return wxSscanf((const wxChar*)parval, format, param);
+    return wxSscanf(parval, format, param);
 }
 
 #endif