SOURCES: kde4-kdelibs-branch.diff - updated

shadzik shadzik at pld-linux.org
Tue Feb 24 02:39:32 CET 2009 

Author: shadzik                      Date: Tue Feb 24 01:39:32 2009 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated

---- Files affected:
SOURCES:
   kde4-kdelibs-branch.diff (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SOURCES/kde4-kdelibs-branch.diff
diff -u SOURCES/kde4-kdelibs-branch.diff:1.4 SOURCES/kde4-kdelibs-branch.diff:1.5
--- SOURCES/kde4-kdelibs-branch.diff:1.4	Fri Feb 20 23:20:15 2009
+++ SOURCES/kde4-kdelibs-branch.diff	Tue Feb 24 02:39:26 2009
@@ -1,7 +1,7 @@
 Index: khtml/khtmladaptorpart.desktop
 ===================================================================
---- khtml/khtmladaptorpart.desktop	(.../tags/KDE/4.2.0/kdelibs)	(wersja 929211)
-+++ khtml/khtmladaptorpart.desktop	(.../branches/KDE/4.2/kdelibs)	(wersja 929211)
+--- khtml/khtmladaptorpart.desktop	(.../tags/KDE/4.2.0/kdelibs)	(wersja 930690)
++++ khtml/khtmladaptorpart.desktop	(.../branches/KDE/4.2/kdelibs)	(wersja 930690)
 @@ -22,6 +22,7 @@
  Name[gl]=Adaptador de extensión de KHTML
  Name[gu]=KHTML એક્સટેન્સન સ્વિકારનાર
@@ -12,8 +12,8 @@
  Name[it]=Adattatore estensione KHTML
 Index: khtml/kmultipart/kmultipart.desktop
 ===================================================================
---- khtml/kmultipart/kmultipart.desktop	(.../tags/KDE/4.2.0/kdelibs)	(wersja 929211)
-+++ khtml/kmultipart/kmultipart.desktop	(.../branches/KDE/4.2/kdelibs)	(wersja 929211)
+--- khtml/kmultipart/kmultipart.desktop	(.../tags/KDE/4.2.0/kdelibs)	(wersja 930690)
++++ khtml/kmultipart/kmultipart.desktop	(.../branches/KDE/4.2/kdelibs)	(wersja 930690)
 @@ -29,6 +29,7 @@
  Name[gu]=multipart/mixed માટે જડિત ભાગ
  Name[he]=רכיב בר־שיבוץ עבור multipart/mixed
@@ -24,8 +24,8 @@
  Name[hu]=Beágyazható komponens a multipart/mixed adattípushoz
 Index: khtml/misc/borderarcstroker.cpp
 ===================================================================
---- khtml/misc/borderarcstroker.cpp	(.../tags/KDE/4.2.0/kdelibs)	(wersja 929211)
-+++ khtml/misc/borderarcstroker.cpp	(.../branches/KDE/4.2/kdelibs)	(wersja 929211)
+--- khtml/misc/borderarcstroker.cpp	(.../tags/KDE/4.2.0/kdelibs)	(wersja 930690)
++++ khtml/misc/borderarcstroker.cpp	(.../branches/KDE/4.2/kdelibs)	(wersja 930690)
 @@ -347,7 +347,7 @@
      const KCubicBezier inner(innerPath.elementAt(0), innerPath.elementAt(1), innerPath.elementAt(2), innerPath.elementAt(3));
      const KCubicBezier outer(outerPath.elementAt(0), outerPath.elementAt(1), outerPath.elementAt(2), outerPath.elementAt(3));
@@ -37,8 +37,8 @@
  
 Index: khtml/misc/loader.cpp
 ===================================================================
---- khtml/misc/loader.cpp	(.../tags/KDE/4.2.0/kdelibs)	(wersja 929211)
-+++ khtml/misc/loader.cpp	(.../branches/KDE/4.2/kdelibs)	(wersja 929211)
+--- khtml/misc/loader.cpp	(.../tags/KDE/4.2.0/kdelibs)	(wersja 930690)
++++ khtml/misc/loader.cpp	(.../branches/KDE/4.2/kdelibs)	(wersja 930690)
 @@ -85,6 +85,8 @@
  
  #include "blocked_icon.cpp"
@@ -74,8 +74,8 @@
          paint.end();
 Index: khtml/khtml_part.cpp
 ===================================================================
---- khtml/khtml_part.cpp	(.../tags/KDE/4.2.0/kdelibs)	(wersja 929211)
-+++ khtml/khtml_part.cpp	(.../branches/KDE/4.2/kdelibs)	(wersja 929211)
+--- khtml/khtml_part.cpp	(.../tags/KDE/4.2.0/kdelibs)	(wersja 930690)
++++ khtml/khtml_part.cpp	(.../branches/KDE/4.2/kdelibs)	(wersja 930690)
 @@ -291,16 +291,26 @@
    if ( prof == BrowserViewGUI ) {
      d->m_paViewDocument = new KAction( i18n( "View Do&cument Source" ), this );
@@ -116,8 +116,8 @@
    d->m_paToggleCaretMode = new KToggleAction(i18n("Toggle Caret Mode"), this );
 Index: khtml/khtml.desktop
 ===================================================================
---- khtml/khtml.desktop	(.../tags/KDE/4.2.0/kdelibs)	(wersja 929211)
-+++ khtml/khtml.desktop	(.../branches/KDE/4.2/kdelibs)	(wersja 929211)
+--- khtml/khtml.desktop	(.../tags/KDE/4.2.0/kdelibs)	(wersja 930690)
++++ khtml/khtml.desktop	(.../branches/KDE/4.2/kdelibs)	(wersja 930690)
 @@ -30,6 +30,7 @@
  Comment[gu]=જડિત HTML દર્શક ભાગ
  Comment[he]=רכיב בר־שיבוץ לתצוגת HTML
@@ -136,8 +136,8 @@
  Name[ml]=കെഎച്ച്ടിഎംഎല്‍
 Index: khtml/khtmlimage.desktop
 ===================================================================
---- khtml/khtmlimage.desktop	(.../tags/KDE/4.2.0/kdelibs)	(wersja 929211)
-+++ khtml/khtmlimage.desktop	(.../branches/KDE/4.2/kdelibs)	(wersja 929211)
+--- khtml/khtmlimage.desktop	(.../tags/KDE/4.2.0/kdelibs)	(wersja 930690)
++++ khtml/khtmlimage.desktop	(.../branches/KDE/4.2/kdelibs)	(wersja 930690)
 @@ -30,6 +30,7 @@
  Comment[gu]=જડિત ચિત્ર દર્શક ભાગ
  Comment[he]=רכיב בר־שיבוץ לתצוגת תמונות
@@ -156,8 +156,8 @@
  Name[hu]=Beágyazható képnézegető
 Index: khtml/html/html_headimpl.cpp
 ===================================================================
---- khtml/html/html_headimpl.cpp	(.../tags/KDE/4.2.0/kdelibs)	(wersja 929211)
-+++ khtml/html/html_headimpl.cpp	(.../branches/KDE/4.2/kdelibs)	(wersja 929211)
+--- khtml/html/html_headimpl.cpp	(.../tags/KDE/4.2.0/kdelibs)	(wersja 930690)
++++ khtml/html/html_headimpl.cpp	(.../branches/KDE/4.2/kdelibs)	(wersja 930690)
 @@ -604,6 +604,12 @@
  void HTMLStyleElementImpl::insertedIntoDocument()
  {
@@ -183,10 +183,103 @@
      DOMString text = "";
  
      for (NodeImpl *c = firstChild(); c != 0; c = c->nextSibling()) {
+Index: khtml/html/html_formimpl.cpp
+===================================================================
+--- khtml/html/html_formimpl.cpp	(.../tags/KDE/4.2.0/kdelibs)	(wersja 930690)
++++ khtml/html/html_formimpl.cpp	(.../branches/KDE/4.2/kdelibs)	(wersja 930690)
+@@ -196,22 +196,46 @@
+     return encoded;
+ }
+ 
+-// ### This function only encodes to numeric ampersand escapes,
+-// ### we could use standard ampersand values as well.
++inline static QString ampersandEscape(unsigned val)
++{
++    QString out;
++    out.sprintf("&#%u;", val);
++    return out;
++}
++
+ inline static QString escapeUnencodeable(const QTextCodec* codec, const QString& s) {
+-    QString enc_string;
++    QString encString;
+     const int len = s.length();
+-    for(int i=0; i <len; ++i) {
+-        const QChar c = s[i];
++
++    for (int i = 0; i < len; ++i) {
++        QChar c = s[i];
++
++        // We need to hand surrogate pairs to the codec at once;
++        // also do validity checking on those
++        if (c.isLowSurrogate()) {
++            c = QChar::ReplacementCharacter;
++        } else if (c.isHighSurrogate()) {
++            if ((i + 1) < len && s[i + 1].isLowSurrogate()) {
++                // A valid SP..
++                ++i;
++                QString pair = QString(c) + s[i];
++                if (codec->canEncode(pair))
++                    encString += pair;
++                else
++                    encString += ampersandEscape(QChar::surrogateToUcs4(c, s[i]));
++                continue;
++            } else {
++                c  = QChar::ReplacementCharacter;
++            }
++        }
++
++        // Normal characters.
+         if (codec->canEncode(c))
+-            enc_string.append(c);
+-        else {
+-            QString ampersandEscape;
+-            ampersandEscape.sprintf("&#%u;", c.unicode());
+-            enc_string.append(ampersandEscape);
+-        }
++            encString.append(c);
++        else
++            encString.append(ampersandEscape(c.unicode()));
+     }
+-    return enc_string;
++    return encString;
+ }
+ 
+ inline static QByteArray fixUpfromUnicode(const QTextCodec* codec, const QString& s)
+@@ -314,8 +338,7 @@
+                     // if the current type is FILE, then we also need to
+                     // include the filename
+                     if (current->id() == ID_INPUT &&
+-                        static_cast<HTMLInputElementImpl*>(current)->inputType() == HTMLInputElementImpl::FILE &&
+-                        current->renderer())
++                        static_cast<HTMLInputElementImpl*>(current)->inputType() == HTMLInputElementImpl::FILE)
+                     {
+                         KUrl path;
+                         QString val = static_cast<HTMLInputElementImpl*>(current)->value().string().trimmed();
+@@ -1654,10 +1677,6 @@
+ 
+ 	case FILE: // hmm, we have the type FILE also.  bad choice here...
+         {
+-            // don't submit if display: none or display: hidden
+-            if(!renderer() || renderer()->style()->visibility() != khtml::VISIBLE)
+-                return false;
+-
+             QString local;
+             KUrl fileurl;
+             QString val = value().string();
+@@ -1672,7 +1691,7 @@
+             KIO::UDSEntry filestat;
+ 
+             // can't submit file in www-url-form encoded
+-            QWidget* const toplevel = static_cast<RenderSubmitButton*>(m_render)->widget()->topLevelWidget();
++            QWidget* const toplevel = document()->view() ? document()->view()->topLevelWidget() : 0;
+             if (multipart) {
+                 QByteArray filearray;
+                 if ( KIO::NetAccess::stat(fileurl, filestat, toplevel)) {
 Index: khtml/html/html_objectimpl.cpp
 ===================================================================
---- khtml/html/html_objectimpl.cpp	(.../tags/KDE/4.2.0/kdelibs)	(wersja 929211)
-+++ khtml/html/html_objectimpl.cpp	(.../branches/KDE/4.2/kdelibs)	(wersja 929211)
+--- khtml/html/html_objectimpl.cpp	(.../tags/KDE/4.2.0/kdelibs)	(wersja 930690)
++++ khtml/html/html_objectimpl.cpp	(.../branches/KDE/4.2/kdelibs)	(wersja 930690)
 @@ -789,9 +789,7 @@
  
  DocumentImpl* HTMLObjectElementImpl::contentDocument() const
@@ -200,8 +293,8 @@
      return 0;
 Index: khtml/html/html_baseimpl.cpp
 ===================================================================
---- khtml/html/html_baseimpl.cpp	(.../tags/KDE/4.2.0/kdelibs)	(wersja 929211)
-+++ khtml/html/html_baseimpl.cpp	(.../branches/KDE/4.2/kdelibs)	(wersja 929211)
+--- khtml/html/html_baseimpl.cpp	(.../tags/KDE/4.2.0/kdelibs)	(wersja 930690)
++++ khtml/html/html_baseimpl.cpp	(.../branches/KDE/4.2/kdelibs)	(wersja 930690)
 @@ -542,22 +542,10 @@
      noresize = false;
  
@@ -244,8 +337,8 @@
          HTMLElementImpl::parseAttribute(attr);
 Index: khtml/html/html_headimpl.h
 ===================================================================
---- khtml/html/html_headimpl.h	(.../tags/KDE/4.2.0/kdelibs)	(wersja 929211)
-+++ khtml/html/html_headimpl.h	(.../branches/KDE/4.2/kdelibs)	(wersja 929211)
+--- khtml/html/html_headimpl.h	(.../tags/KDE/4.2.0/kdelibs)	(wersja 930690)
++++ khtml/html/html_headimpl.h	(.../branches/KDE/4.2/kdelibs)	(wersja 930690)
 @@ -205,6 +205,8 @@
      virtual bool checkRemovePendingSheet();
  
@@ -257,8 +350,8 @@
      QString m_media;
 Index: khtml/html/html_baseimpl.h
 ===================================================================
---- khtml/html/html_baseimpl.h	(.../tags/KDE/4.2.0/kdelibs)	(wersja 929211)
-+++ khtml/html/html_baseimpl.h	(.../branches/KDE/4.2/kdelibs)	(wersja 929211)
+--- khtml/html/html_baseimpl.h	(.../tags/KDE/4.2.0/kdelibs)	(wersja 930690)
++++ khtml/html/html_baseimpl.h	(.../branches/KDE/4.2/kdelibs)	(wersja 930690)
 @@ -163,9 +163,6 @@
      bool frameBorderSet : 1;
      bool noresize : 1;
@@ -271,8 +364,8 @@
  // -------------------------------------------------------------------------
 Index: khtml/ecma/debugger/debugwindow.cpp
 ===================================================================
---- khtml/ecma/debugger/debugwindow.cpp	(.../tags/KDE/4.2.0/kdelibs)	(wersja 929211)
-+++ khtml/ecma/debugger/debugwindow.cpp	(.../branches/KDE/4.2/kdelibs)	(wersja 929211)
+--- khtml/ecma/debugger/debugwindow.cpp	(.../tags/KDE/4.2.0/kdelibs)	(wersja 930690)
++++ khtml/ecma/debugger/debugwindow.cpp	(.../branches/KDE/4.2/kdelibs)	(wersja 930690)
 @@ -350,6 +350,12 @@
      }
  }
@@ -335,8 +428,8 @@
  
 Index: khtml/ecma/debugger/interpreter_ctx.cpp
 ===================================================================
---- khtml/ecma/debugger/interpreter_ctx.cpp	(.../tags/KDE/4.2.0/kdelibs)	(wersja 929211)
-+++ khtml/ecma/debugger/interpreter_ctx.cpp	(.../branches/KDE/4.2/kdelibs)	(wersja 929211)
+--- khtml/ecma/debugger/interpreter_ctx.cpp	(.../tags/KDE/4.2.0/kdelibs)	(wersja 930690)
++++ khtml/ecma/debugger/interpreter_ctx.cpp	(.../branches/KDE/4.2/kdelibs)	(wersja 930690)
 @@ -54,6 +54,11 @@
      return callStack.top().doc;
  }
@@ -351,8 +444,8 @@
  // kate: indent-width 4; replace-tabs on; tab-width 4; space-indent on;
 Index: khtml/ecma/debugger/debugwindow.h
 ===================================================================
---- khtml/ecma/debugger/debugwindow.h	(.../tags/KDE/4.2.0/kdelibs)	(wersja 929211)
-+++ khtml/ecma/debugger/debugwindow.h	(.../branches/KDE/4.2/kdelibs)	(wersja 929211)
+--- khtml/ecma/debugger/debugwindow.h	(.../tags/KDE/4.2.0/kdelibs)	(wersja 930690)
++++ khtml/ecma/debugger/debugwindow.h	(.../branches/KDE/4.2/kdelibs)	(wersja 930690)
 @@ -113,6 +113,9 @@
      // Called by KJSProxy when we navigate away from a page
      void clearInterpreter(KJS::Interpreter* interp);
@@ -365,8 +458,8 @@
      void continueExecution();
 Index: khtml/ecma/debugger/interpreter_ctx.h
 ===================================================================
---- khtml/ecma/debugger/interpreter_ctx.h	(.../tags/KDE/4.2.0/kdelibs)	(wersja 929211)
-+++ khtml/ecma/debugger/interpreter_ctx.h	(.../branches/KDE/4.2/kdelibs)	(wersja 929211)
+--- khtml/ecma/debugger/interpreter_ctx.h	(.../tags/KDE/4.2.0/kdelibs)	(wersja 930690)
++++ khtml/ecma/debugger/interpreter_ctx.h	(.../branches/KDE/4.2/kdelibs)	(wersja 930690)
 @@ -72,6 +72,8 @@
      DebugDocument::Ptr activeDocument();
      int                activeLine();
@@ -378,8 +471,8 @@
  
 Index: khtml/ecma/kjs_range.cpp
 ===================================================================
---- khtml/ecma/kjs_range.cpp	(.../tags/KDE/4.2.0/kdelibs)	(wersja 929211)
-+++ khtml/ecma/kjs_range.cpp	(.../branches/KDE/4.2/kdelibs)	(wersja 929211)
+--- khtml/ecma/kjs_range.cpp	(.../tags/KDE/4.2.0/kdelibs)	(wersja 930690)
++++ khtml/ecma/kjs_range.cpp	(.../branches/KDE/4.2/kdelibs)	(wersja 930690)
 @@ -61,7 +61,7 @@
  */
  KJS_DEFINE_PROTOTYPE(DOMRangeProto)
@@ -391,8 +484,8 @@
   : m_impl(r)
 Index: khtml/ecma/kjs_audio.cpp
 ===================================================================
---- khtml/ecma/kjs_audio.cpp	(.../tags/KDE/4.2.0/kdelibs)	(wersja 929211)
-+++ khtml/ecma/kjs_audio.cpp	(.../branches/KDE/4.2/kdelibs)	(wersja 929211)
+--- khtml/ecma/kjs_audio.cpp	(.../tags/KDE/4.2.0/kdelibs)	(wersja 930690)
++++ khtml/ecma/kjs_audio.cpp	(.../branches/KDE/4.2/kdelibs)	(wersja 930690)
 @@ -64,7 +64,7 @@
  
  KJS_DEFINE_PROTOTYPE(AudioProto)
@@ -404,8 +497,8 @@
  
 Index: khtml/ecma/kjs_binding.h
 ===================================================================
---- khtml/ecma/kjs_binding.h	(.../tags/KDE/4.2.0/kdelibs)	(wersja 929211)
-+++ khtml/ecma/kjs_binding.h	(.../branches/KDE/4.2/kdelibs)	(wersja 929211)
+--- khtml/ecma/kjs_binding.h	(.../tags/KDE/4.2.0/kdelibs)	(wersja 930690)
++++ khtml/ecma/kjs_binding.h	(.../branches/KDE/4.2/kdelibs)	(wersja 930690)
 @@ -35,6 +35,7 @@
  #include <kjs/lookup.h>
  #include <kjs/function.h>
@@ -425,8 +518,8 @@
      }\
 Index: khtml/ecma/kjs_dom.cpp
 ===================================================================
---- khtml/ecma/kjs_dom.cpp	(.../tags/KDE/4.2.0/kdelibs)	(wersja 929211)
-+++ khtml/ecma/kjs_dom.cpp	(.../branches/KDE/4.2/kdelibs)	(wersja 929211)
+--- khtml/ecma/kjs_dom.cpp	(.../tags/KDE/4.2.0/kdelibs)	(wersja 930690)
++++ khtml/ecma/kjs_dom.cpp	(.../branches/KDE/4.2/kdelibs)	(wersja 930690)
 @@ -101,7 +101,16 @@
  @end
  */
@@ -537,8 +630,8 @@
    : DOMCharacterData(exec, t)
 Index: khtml/ecma/xmlserializer.cpp
 ===================================================================
---- khtml/ecma/xmlserializer.cpp	(.../tags/KDE/4.2.0/kdelibs)	(wersja 929211)
-+++ khtml/ecma/xmlserializer.cpp	(.../branches/KDE/4.2/kdelibs)	(wersja 929211)
+--- khtml/ecma/xmlserializer.cpp	(.../tags/KDE/4.2.0/kdelibs)	(wersja 930690)
++++ khtml/ecma/xmlserializer.cpp	(.../branches/KDE/4.2/kdelibs)	(wersja 930690)
 @@ -39,7 +39,7 @@
  namespace KJS {
  KJS_DEFINE_PROTOTYPE(XMLSerializerProto)
@@ -550,8 +643,8 @@
      : JSObject(exec->lexicalInterpreter()->builtinObjectPrototype())
 Index: khtml/ecma/kjs_css.cpp
 ===================================================================
---- khtml/ecma/kjs_css.cpp	(.../tags/KDE/4.2.0/kdelibs)	(wersja 929211)
-+++ khtml/ecma/kjs_css.cpp	(.../branches/KDE/4.2/kdelibs)	(wersja 929211)
+--- khtml/ecma/kjs_css.cpp	(.../tags/KDE/4.2.0/kdelibs)	(wersja 930690)
++++ khtml/ecma/kjs_css.cpp	(.../branches/KDE/4.2/kdelibs)	(wersja 930690)
 @@ -135,7 +135,7 @@
  */
  KJS_DEFINE_PROTOTYPE(DOMCSSStyleDeclarationProto)
@@ -590,8 +683,8 @@
    : DOMCSSValue(exec, v) {
 Index: khtml/ecma/kjs_views.cpp
 ===================================================================
---- khtml/ecma/kjs_views.cpp	(.../tags/KDE/4.2.0/kdelibs)	(wersja 929211)
-+++ khtml/ecma/kjs_views.cpp	(.../branches/KDE/4.2/kdelibs)	(wersja 929211)
+--- khtml/ecma/kjs_views.cpp	(.../tags/KDE/4.2.0/kdelibs)	(wersja 930690)
++++ khtml/ecma/kjs_views.cpp	(.../branches/KDE/4.2/kdelibs)	(wersja 930690)
 @@ -40,7 +40,7 @@
  
  KJS_DEFINE_PROTOTYPE(DOMAbstractViewProto)
@@ -603,8 +696,8 @@
    : m_impl(av)
 Index: khtml/ecma/xmlhttprequest.cpp
 ===================================================================
---- khtml/ecma/xmlhttprequest.cpp	(.../tags/KDE/4.2.0/kdelibs)	(wersja 929211)
-+++ khtml/ecma/xmlhttprequest.cpp	(.../branches/KDE/4.2/kdelibs)	(wersja 929211)
+--- khtml/ecma/xmlhttprequest.cpp	(.../tags/KDE/4.2.0/kdelibs)	(wersja 930690)
++++ khtml/ecma/xmlhttprequest.cpp	(.../branches/KDE/4.2/kdelibs)	(wersja 930690)
 @@ -68,7 +68,7 @@
  
  KJS_DEFINE_PROTOTYPE(XMLHttpRequestProto)
@@ -616,8 +709,8 @@
  XMLHttpRequestQObject::XMLHttpRequestQObject(XMLHttpRequest *_jsObject)
 Index: khtml/ecma/kjs_traversal.cpp
 ===================================================================
---- khtml/ecma/kjs_traversal.cpp	(.../tags/KDE/4.2.0/kdelibs)	(wersja 929211)
-+++ khtml/ecma/kjs_traversal.cpp	(.../branches/KDE/4.2/kdelibs)	(wersja 929211)
+--- khtml/ecma/kjs_traversal.cpp	(.../tags/KDE/4.2.0/kdelibs)	(wersja 930690)
++++ khtml/ecma/kjs_traversal.cpp	(.../branches/KDE/4.2/kdelibs)	(wersja 930690)
 @@ -61,7 +61,7 @@
  */
  KJS_DEFINE_PROTOTYPE(DOMNodeIteratorProto)
@@ -646,8 +739,8 @@
      filt->mark();
 Index: khtml/ecma/kjs_html.cpp
 ===================================================================
---- khtml/ecma/kjs_html.cpp	(.../tags/KDE/4.2.0/kdelibs)	(wersja 929211)
-+++ khtml/ecma/kjs_html.cpp	(.../branches/KDE/4.2/kdelibs)	(wersja 929211)
+--- khtml/ecma/kjs_html.cpp	(.../tags/KDE/4.2.0/kdelibs)	(wersja 930690)
++++ khtml/ecma/kjs_html.cpp	(.../branches/KDE/4.2/kdelibs)	(wersja 930690)
 @@ -73,9 +73,9 @@
  
  namespace KJS {
@@ -805,8 +898,8 @@
  
 Index: khtml/ecma/kjs_events.cpp
 ===================================================================
---- khtml/ecma/kjs_events.cpp	(.../tags/KDE/4.2.0/kdelibs)	(wersja 929211)
-+++ khtml/ecma/kjs_events.cpp	(.../branches/KDE/4.2/kdelibs)	(wersja 929211)
+--- khtml/ecma/kjs_events.cpp	(.../tags/KDE/4.2.0/kdelibs)	(wersja 930690)
++++ khtml/ecma/kjs_events.cpp	(.../branches/KDE/4.2/kdelibs)	(wersja 930690)
 @@ -255,7 +255,7 @@
  */
  KJS_DEFINE_PROTOTYPE(DOMEventProto)
@@ -878,8 +971,8 @@
    DOMEvent(DOMMutationEventProto::self(exec), me) {}
 Index: khtml/ecma/kjs_window.cpp
 ===================================================================
---- khtml/ecma/kjs_window.cpp	(.../tags/KDE/4.2.0/kdelibs)	(wersja 929211)
-+++ khtml/ecma/kjs_window.cpp	(.../branches/KDE/4.2/kdelibs)	(wersja 929211)
+--- khtml/ecma/kjs_window.cpp	(.../tags/KDE/4.2.0/kdelibs)	(wersja 930690)
++++ khtml/ecma/kjs_window.cpp	(.../branches/KDE/4.2/kdelibs)	(wersja 930690)
 @@ -266,7 +266,7 @@
  # IE extension
    navigate	Window::Navigate	DontDelete|Function 1
@@ -904,8 +997,8 @@
        if (m_frame->m_partContainerElement)
 Index: khtml/ecma/kjs_context2d.cpp
 ===================================================================
---- khtml/ecma/kjs_context2d.cpp	(.../tags/KDE/4.2.0/kdelibs)	(wersja 929211)
-+++ khtml/ecma/kjs_context2d.cpp	(.../branches/KDE/4.2/kdelibs)	(wersja 929211)
+--- khtml/ecma/kjs_context2d.cpp	(.../tags/KDE/4.2.0/kdelibs)	(wersja 930690)
++++ khtml/ecma/kjs_context2d.cpp	(.../branches/KDE/4.2/kdelibs)	(wersja 930690)
 @@ -74,7 +74,7 @@
  
  KJS_DEFINE_PROTOTYPE(Context2DProto)
@@ -935,8 +1028,8 @@
     @begin CanvasPatternProtoTable 0
 Index: khtml/ecma/kjs_dom.h
 ===================================================================
---- khtml/ecma/kjs_dom.h	(.../tags/KDE/4.2.0/kdelibs)	(wersja 929211)
-+++ khtml/ecma/kjs_dom.h	(.../branches/KDE/4.2/kdelibs)	(wersja 929211)
+--- khtml/ecma/kjs_dom.h	(.../tags/KDE/4.2.0/kdelibs)	(wersja 930690)
++++ khtml/ecma/kjs_dom.h	(.../branches/KDE/4.2/kdelibs)	(wersja 930690)
 @@ -65,7 +65,7 @@
             OnResize, OnScroll, OnSelect, OnSubmit, OnUnload,
             OffsetLeft, OffsetTop, OffsetWidth, OffsetHeight, OffsetParent,
@@ -975,8 +1068,8 @@
    class DOMDOMImplementation : public DOMObject {
 Index: khtml/ecma/domparser.cpp
 ===================================================================
---- khtml/ecma/domparser.cpp	(.../tags/KDE/4.2.0/kdelibs)	(wersja 929211)
-+++ khtml/ecma/domparser.cpp	(.../branches/KDE/4.2/kdelibs)	(wersja 929211)
+--- khtml/ecma/domparser.cpp	(.../tags/KDE/4.2.0/kdelibs)	(wersja 930690)
++++ khtml/ecma/domparser.cpp	(.../branches/KDE/4.2/kdelibs)	(wersja 930690)
 @@ -44,7 +44,7 @@
  
  KJS_DEFINE_PROTOTYPE(DOMParserProto)
@@ -988,8 +1081,8 @@
  DOMParserConstructorImp::DOMParserConstructorImp(ExecState* exec, DOM::DocumentImpl *d)
 Index: khtml/java/kjavaappletviewer.desktop
 ===================================================================
---- khtml/java/kjavaappletviewer.desktop	(.../tags/KDE/4.2.0/kdelibs)	(wersja 929211)
-+++ khtml/java/kjavaappletviewer.desktop	(.../branches/KDE/4.2/kdelibs)	(wersja 929211)
+--- khtml/java/kjavaappletviewer.desktop	(.../tags/KDE/4.2.0/kdelibs)	(wersja 930690)
++++ khtml/java/kjavaappletviewer.desktop	(.../branches/KDE/4.2/kdelibs)	(wersja 930690)
 @@ -29,6 +29,7 @@
  Name[gu]=જડિત જાવા એપ્લેટ દર્શક
  Name[he]=מציג יישומוני Java משובץ
@@ -1000,8 +1093,8 @@
  Name[hu]=Beágyazott megjelenítőprogram Java kisalkalmazásokhoz
 Index: khtml/css/css_stylesheetimpl.h
 ===================================================================
---- khtml/css/css_stylesheetimpl.h	(.../tags/KDE/4.2.0/kdelibs)	(wersja 929211)
-+++ khtml/css/css_stylesheetimpl.h	(.../branches/KDE/4.2/kdelibs)	(wersja 929211)
+--- khtml/css/css_stylesheetimpl.h	(.../tags/KDE/4.2.0/kdelibs)	(wersja 930690)
++++ khtml/css/css_stylesheetimpl.h	(.../branches/KDE/4.2/kdelibs)	(wersja 930690)
 @@ -27,6 +27,7 @@
  #include "css/css_base.h"
  #include "misc/loader_client.h"
@@ -1035,8 +1128,8 @@
  // ----------------------------------------------------------------------------
 Index: khtml/css/css_stylesheetimpl.cpp
 ===================================================================
---- khtml/css/css_stylesheetimpl.cpp	(.../tags/KDE/4.2.0/kdelibs)	(wersja 929211)
-+++ khtml/css/css_stylesheetimpl.cpp	(.../branches/KDE/4.2/kdelibs)	(wersja 929211)
+--- khtml/css/css_stylesheetimpl.cpp	(.../tags/KDE/4.2.0/kdelibs)	(wersja 930690)
++++ khtml/css/css_stylesheetimpl.cpp	(.../branches/KDE/4.2/kdelibs)	(wersja 930690)
 @@ -349,6 +349,12 @@
  
  void StyleSheetListImpl::add( StyleSheetImpl* s )
@@ -1081,8 +1174,8 @@
          if (!sh->isCSSStyleSheet() || !static_cast<CSSStyleSheetImpl*>(sh)->implicit()) {
 Index: khtml/xml/dom_docimpl.h
 ===================================================================
---- khtml/xml/dom_docimpl.h	(.../tags/KDE/4.2.0/kdelibs)	(wersja 929211)
-+++ khtml/xml/dom_docimpl.h	(.../branches/KDE/4.2/kdelibs)	(wersja 929211)
+--- khtml/xml/dom_docimpl.h	(.../tags/KDE/4.2.0/kdelibs)	(wersja 930690)
++++ khtml/xml/dom_docimpl.h	(.../branches/KDE/4.2/kdelibs)	(wersja 930690)
 @@ -282,10 +282,16 @@
       * in existing sheets, then set this argument to true for efficiency.
       */
@@ -1104,8 +1197,8 @@
      // if it seems like the same thing
 Index: khtml/xml/dom2_rangeimpl.cpp
 ===================================================================
---- khtml/xml/dom2_rangeimpl.cpp	(.../tags/KDE/4.2.0/kdelibs)	(wersja 929211)
-+++ khtml/xml/dom2_rangeimpl.cpp	(.../branches/KDE/4.2/kdelibs)	(wersja 929211)
+--- khtml/xml/dom2_rangeimpl.cpp	(.../tags/KDE/4.2.0/kdelibs)	(wersja 930690)
++++ khtml/xml/dom2_rangeimpl.cpp	(.../branches/KDE/4.2/kdelibs)	(wersja 930690)
 @@ -1181,16 +1181,21 @@
  DocumentFragment RangeImpl::createContextualFragment ( const DOMString &html, int &exceptioncode )
  {
@@ -1146,8 +1239,8 @@
 +// kate: indent-width 4; replace-tabs off; tab-width 8; space-indent off;
 Index: khtml/xml/dom_docimpl.cpp
 ===================================================================
---- khtml/xml/dom_docimpl.cpp	(.../tags/KDE/4.2.0/kdelibs)	(wersja 929211)
-+++ khtml/xml/dom_docimpl.cpp	(.../branches/KDE/4.2/kdelibs)	(wersja 929211)
+--- khtml/xml/dom_docimpl.cpp	(.../tags/KDE/4.2.0/kdelibs)	(wersja 930690)
++++ khtml/xml/dom_docimpl.cpp	(.../branches/KDE/4.2/kdelibs)	(wersja 930690)
 @@ -422,12 +422,13 @@
      m_defaultView = new AbstractViewImpl(this);
      m_defaultView->ref();
@@ -1229,8 +1322,8 @@
      QString usersheet = m_usersheet;
 Index: cmake/modules/FindGMP.cmake
 ===================================================================
---- cmake/modules/FindGMP.cmake	(.../tags/KDE/4.2.0/kdelibs)	(wersja 929211)
-+++ cmake/modules/FindGMP.cmake	(.../branches/KDE/4.2/kdelibs)	(wersja 929211)
+--- cmake/modules/FindGMP.cmake	(.../tags/KDE/4.2.0/kdelibs)	(wersja 930690)
++++ cmake/modules/FindGMP.cmake	(.../branches/KDE/4.2/kdelibs)	(wersja 930690)
 @@ -15,7 +15,7 @@
  endif (GMP_INCLUDE_DIR AND GMP_LIBRARIES)
  
@@ -1242,8 +1335,8 @@
  FIND_PACKAGE_HANDLE_STANDARD_ARGS(GMP DEFAULT_MSG GMP_INCLUDE_DIR GMP_LIBRARIES)
 Index: cmake/modules/FindKDE4Internal.cmake
 ===================================================================
---- cmake/modules/FindKDE4Internal.cmake	(.../tags/KDE/4.2.0/kdelibs)	(wersja 929211)
-+++ cmake/modules/FindKDE4Internal.cmake	(.../branches/KDE/4.2/kdelibs)	(wersja 929211)
+--- cmake/modules/FindKDE4Internal.cmake	(.../tags/KDE/4.2.0/kdelibs)	(wersja 930690)
++++ cmake/modules/FindKDE4Internal.cmake	(.../branches/KDE/4.2/kdelibs)	(wersja 930690)
 @@ -260,6 +260,13 @@
  cmake_policy(SET CMP0003 OLD)
  # CMP0005: keep escaping behaviour for definitions added via add_definitions()
@@ -1260,8 +1353,8 @@
  # Only do something if it hasn't been found yet
 Index: interfaces/kimproxy/interface/dbusinstantmessenger.desktop
 ===================================================================
---- interfaces/kimproxy/interface/dbusinstantmessenger.desktop	(.../tags/KDE/4.2.0/kdelibs)	(wersja 929211)
-+++ interfaces/kimproxy/interface/dbusinstantmessenger.desktop	(.../branches/KDE/4.2/kdelibs)	(wersja 929211)
+--- interfaces/kimproxy/interface/dbusinstantmessenger.desktop	(.../tags/KDE/4.2.0/kdelibs)	(wersja 930690)
++++ interfaces/kimproxy/interface/dbusinstantmessenger.desktop	(.../branches/KDE/4.2/kdelibs)	(wersja 930690)
 @@ -28,6 +28,7 @@
  Comment[gu]=D-Bus ઇન્ટરફેસ સાથે ઇન્સ્ટન્ટ મેસેન્જર
  Comment[he]=תוכנת מסרים מידיים עם ממשק D-Bus
@@ -1280,8 +1373,8 @@
  Comment[ne]=D-Bus इन्टरफेससँग इन्सट्यान्ट मेसेन्जर
 Index: interfaces/kimproxy/interface/kcm_instantmessenger.desktop
 ===================================================================
---- interfaces/kimproxy/interface/kcm_instantmessenger.desktop	(.../tags/KDE/4.2.0/kdelibs)	(wersja 929211)
-+++ interfaces/kimproxy/interface/kcm_instantmessenger.desktop	(.../branches/KDE/4.2/kdelibs)	(wersja 929211)
+--- interfaces/kimproxy/interface/kcm_instantmessenger.desktop	(.../tags/KDE/4.2.0/kdelibs)	(wersja 930690)
++++ interfaces/kimproxy/interface/kcm_instantmessenger.desktop	(.../branches/KDE/4.2/kdelibs)	(wersja 930690)
 @@ -24,6 +24,7 @@
  Name[gu]=ઇન્સ્ટન્ટ મેસેન્જર
  Name[he]=מסרים מידיים
@@ -1309,8 +1402,8 @@
  Comment[sr]=Брзим гласником можете ћаскати са другим појединцима и у групама.
 Index: interfaces/kspeech/dbustexttospeech.desktop
 ===================================================================
---- interfaces/kspeech/dbustexttospeech.desktop	(.../tags/KDE/4.2.0/kdelibs)	(wersja 929211)
-+++ interfaces/kspeech/dbustexttospeech.desktop	(.../branches/KDE/4.2/kdelibs)	(wersja 929211)
+--- interfaces/kspeech/dbustexttospeech.desktop	(.../tags/KDE/4.2.0/kdelibs)	(wersja 930690)
++++ interfaces/kspeech/dbustexttospeech.desktop	(.../branches/KDE/4.2/kdelibs)	(wersja 930690)
 @@ -28,6 +28,7 @@
  Comment[gu]=D-Bus ઇન્ટરફેસ સાથે લખાણ-થી-ધ્વનિ સેવા
  Comment[he]=שירות טקסט לדיבור עם ממשק D-Bus
@@ -1338,8 +1431,8 @@
  Comment[sr]=Текст‑у‑говор сервис са д‑бус сучељем
 Index: interfaces/ktexteditor/ktexteditor.desktop
 ===================================================================
---- interfaces/ktexteditor/ktexteditor.desktop	(.../tags/KDE/4.2.0/kdelibs)	(wersja 929211)
-+++ interfaces/ktexteditor/ktexteditor.desktop	(.../branches/KDE/4.2/kdelibs)	(wersja 929211)
+--- interfaces/ktexteditor/ktexteditor.desktop	(.../tags/KDE/4.2.0/kdelibs)	(wersja 930690)
++++ interfaces/ktexteditor/ktexteditor.desktop	(.../branches/KDE/4.2/kdelibs)	(wersja 930690)
 @@ -31,6 +31,7 @@
  Comment[gu]=જડિત લખાણ સંપાદક ભાગ (Doc/View અલગ પાડેલ સાથે)
  Comment[he]=רכיב עורך טקסט הניתן לשיבוץ (עם הפרדה בין מסמך לתצוגה)
@@ -1350,8 +1443,8 @@
  Comment[hu]=Beágyazható szövegszerkesztő (dokumentum/nézet modellel)
 Index: interfaces/ktexteditor/ktexteditor_loadsavefiltercheckplugin.desktop
 ===================================================================
---- interfaces/ktexteditor/ktexteditor_loadsavefiltercheckplugin.desktop	(.../tags/KDE/4.2.0/kdelibs)	(wersja 929211)
-+++ interfaces/ktexteditor/ktexteditor_loadsavefiltercheckplugin.desktop	(.../branches/KDE/4.2/kdelibs)	(wersja 929211)
+--- interfaces/ktexteditor/ktexteditor_loadsavefiltercheckplugin.desktop	(.../tags/KDE/4.2.0/kdelibs)	(wersja 930690)
++++ interfaces/ktexteditor/ktexteditor_loadsavefiltercheckplugin.desktop	(.../branches/KDE/4.2/kdelibs)	(wersja 930690)
 @@ -21,6 +21,7 @@
  Comment[gl]=Extensión de cargar/gardar o filtro/comprobación para KTextEditor
  Comment[gu]=KTextEditor લાવવા/સંગ્રહ ગાળક/ચકાસણી પ્લગઇન
@@ -1384,8 +1477,8 @@
  Comment[sr at latin]=Priključak uređivača teksta za filtriranje i proveru na učitavanju i upisivanju
 Index: interfaces/ktexteditor/codecompletionmodelcontrollerinterface.cpp
 ===================================================================
---- interfaces/ktexteditor/codecompletionmodelcontrollerinterface.cpp	(.../tags/KDE/4.2.0/kdelibs)	(wersja 929211)
-+++ interfaces/ktexteditor/codecompletionmodelcontrollerinterface.cpp	(.../branches/KDE/4.2/kdelibs)	(wersja 929211)
+--- interfaces/ktexteditor/codecompletionmodelcontrollerinterface.cpp	(.../tags/KDE/4.2.0/kdelibs)	(wersja 930690)
++++ interfaces/ktexteditor/codecompletionmodelcontrollerinterface.cpp	(.../branches/KDE/4.2/kdelibs)	(wersja 930690)
 @@ -19,6 +19,8 @@
  
  #include "codecompletionmodelcontrollerinterface.h"
@@ -1397,8 +1490,8 @@
  
 Index: interfaces/ktexteditor/ktexteditorplugin.desktop
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kde4-kdelibs-branch.diff?r1=1.4&r2=1.5&f=u

More information about the pld-cvs-commit mailing list