[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdenox/konq-embed/kdesrc/khtml/patches
From:       Eva Brucherseifer <eva () kde ! org>
Date:       2006-03-17 17:02:57
Message-ID: 1142614977.375007.25254.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 519610 by eva:


update patch locations


 M  +5 -5      css_qt2.3.patch  
 M  +7 -7      xml_qt2.3.patch  


--- trunk/kdenox/konq-embed/kdesrc/khtml/patches/css_qt2.3.patch #519609:519610
@@ -224,7 +224,7 @@
      QString u = cu.string();
      if ( !u.contains("://") ) {
          if ( u[0] == '/' )
-@@ -1070,7 +1075,7 @@ bool CSSStyleSelector::checkOneSelector(
+@@ -1070,7 +1073,7 @@ bool CSSStyleSelector::checkOneSelector(
              break;
          case CSSSelector::List:
          {
@@ -233,7 +233,7 @@
              int l = value.length();
              while( l && !s->isSpace() )
                l--,s++;
-@@ -1128,7 +1133,7 @@ bool CSSStyleSelector::checkOneSelector(
+@@ -1128,7 +1131,7 @@ bool CSSStyleSelector::checkOneSelector(
              //kdDebug( 6080 ) << "checking for endswith match" << endl;
              QString str = value.string();
              QString selStr = sel->value.string();
@@ -242,7 +242,7 @@
  	    if (!strictParsing) {
  	        int pos = str.length() - selStr.length();
  		if (pos < 0 || pos != str.find(selStr, pos, false) )
-@@ -3169,21 +3174,18 @@ void CSSStyleSelector::applyRule( int id
+@@ -3169,21 +3172,18 @@ void CSSStyleSelector::applyRule( int id
              break;
  
          if (isInitial) {
@@ -269,7 +269,7 @@
  
          if(!value->isValueList()) return;
          CSSValueListImpl *list = static_cast<CSSValueListImpl *>(value);
-@@ -3218,6 +3220,10 @@ void CSSStyleSelector::applyRule( int id
+@@ -3218,6 +3218,10 @@ void CSSStyleSelector::applyRule( int id
              }
              else if (val->primitiveType()==CSSPrimitiveValue::CSS_IDENT)
              {
@@ -330,7 +330,7 @@
  // Hack for debugging purposes
  extern DOM::DOMString getPropertyName(unsigned short id);
  
-@@ -837,7 +840,7 @@ FontFamilyValueImpl::FontFamilyValueImpl
+@@ -843,7 +846,7 @@ FontFamilyValueImpl::FontFamilyValueImpl
          // many pages add extra MSs to make sure it's windows only ;(
          if ( parsedFontName.startsWith( "ms " ) )
              parsedFontName = parsedFontName.mid( 3 );
--- trunk/kdenox/konq-embed/kdesrc/khtml/patches/xml_qt2.3.patch #519609:519610
@@ -13,7 +13,7 @@
  
 --- ./dom_docimpl.cpp	
 +++ khtml/xml/dom_docimpl.cpp	
-@@ -1619,7 +1619,7 @@ void DocumentImpl::processHttpEquiv(cons
+@@ -1620,7 +1620,7 @@ void DocumentImpl::processHttpEquiv(cons
              if ( str.length() && str[0] == '=' ) str = str.mid( 1 ).stripWhiteSpace();
              while(str.length() &&
                    (str[str.length()-1] == ';' || str[str.length()-1] == ','))
@@ -22,7 +22,7 @@
              str = parseURL( DOMString(str) ).string();
              QString newURL = getDocument()->completeURL( str );
              if ( ok )
-@@ -1784,7 +1784,7 @@ NodeImpl::Id DocumentImpl::getId( NodeIm
+@@ -1785,7 +1785,7 @@ NodeImpl::Id DocumentImpl::getId( NodeIm
      }
  
      NodeImpl::Id id, nsid = 0;
@@ -31,7 +31,7 @@
      bool cs = true; // case sensitive
      if (_type != NodeImpl::NamespaceId) {
          if (_nsURI)
-@@ -1817,7 +1817,7 @@ NodeImpl::Id DocumentImpl::getId( NodeIm
+@@ -1818,7 +1818,7 @@ NodeImpl::Id DocumentImpl::getId( NodeIm
          id = (NodeImpl::Id)(long) map->ids.find( name );
          if (!readonly && id && _prefix && _prefix->l) {
              // we were called in registration mode... check if the alias exists
@@ -40,7 +40,7 @@
              QString qn("aliases: " + (cs ? px.string() : px.string().upper()) + ":" + name);
              if (!map->ids.find( qn )) {
                  map->ids.insert( qn, (void*)id );
-@@ -1844,7 +1844,7 @@ NodeImpl::Id DocumentImpl::getId( NodeIm
+@@ -1845,7 +1845,7 @@ NodeImpl::Id DocumentImpl::getId( NodeIm
  
      // and register an alias if needed for DOM1 methods compatibility
      if(_prefix && _prefix->l) {
@@ -49,7 +49,7 @@
          QString qn("aliases: " + (cs ? px.string() : px.string().upper()) + ":" + name);
          if (!map->ids.find( qn )) {
              map->ids.insert( qn, (void*)cid );
-@@ -1997,7 +1997,7 @@ void DocumentImpl::recalcStyleSelector()
+@@ -1998,7 +1998,7 @@ void DocumentImpl::recalcStyleSelector()
  
      QPtrList<StyleSheetImpl> oldStyleSheets = m_styleSheets->styleSheets;
      m_styleSheets->styleSheets.clear();
@@ -58,7 +58,7 @@
      bool autoselect = sheetUsed.isEmpty();
      if (autoselect && !m_preferredStylesheetSet.isEmpty())
          sheetUsed = m_preferredStylesheetSet.string();
-@@ -2071,7 +2071,7 @@ void DocumentImpl::recalcStyleSelector()
+@@ -2072,7 +2072,7 @@ void DocumentImpl::recalcStyleSelector()
                      if ( title != sheetUsed )
                          sheet = 0; // don't use it
  
@@ -67,7 +67,7 @@
  
                      if ( !m_availableSheets.contains( title ) )
                          m_availableSheets.append( title );
-@@ -2401,7 +2401,7 @@ void DocumentImpl::defaultEventHandler(E
+@@ -2402,7 +2402,7 @@ void DocumentImpl::defaultEventHandler(E
      if (!m_windowEventListeners.listeners)
          return;
  
[prev in list] [next in list] [prev in thread] [next in thread]