SOURCES: kdelibs-branch.diff - nasty khtml rendering bug fixed (ca...

arekm arekm at pld-linux.org
Mon Oct 16 13:27:22 CEST 2006 

Author: arekm                        Date: Mon Oct 16 11:27:21 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- nasty khtml rendering bug fixed (can hide significant content)

---- Files affected:
SOURCES:
   kdelibs-branch.diff (1.38 -> 1.39) 

---- Diffs:

================================================================
Index: SOURCES/kdelibs-branch.diff
diff -u SOURCES/kdelibs-branch.diff:1.38 SOURCES/kdelibs-branch.diff:1.39
--- SOURCES/kdelibs-branch.diff:1.38	Thu Oct 12 22:18:30 2006
+++ SOURCES/kdelibs-branch.diff	Mon Oct 16 13:27:15 2006
@@ -1,7 +1,7 @@
 Index: interfaces/kspeech/kspeech.h
 ===================================================================
---- interfaces/kspeech/kspeech.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 594925)
-+++ interfaces/kspeech/kspeech.h	(.../branches/KDE/3.5/kdelibs)	(revision 594925)
+--- interfaces/kspeech/kspeech.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 595981)
++++ interfaces/kspeech/kspeech.h	(.../branches/KDE/3.5/kdelibs)	(revision 595981)
 @@ -371,10 +371,11 @@
   *
   * A Talker Code consists of a series of XML tags and attributes.
@@ -17,8 +17,8 @@
   * Markup Language (SSML) and Java Speech Markup Language (JSML).
 Index: interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp
 ===================================================================
---- interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 594925)
-+++ interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 594925)
+--- interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 595981)
++++ interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 595981)
 @@ -21,8 +21,10 @@
  {
  protected:
@@ -33,8 +33,8 @@
  };
 Index: kmdi/kmdi/mainwindow.h
 ===================================================================
---- kmdi/kmdi/mainwindow.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 594925)
-+++ kmdi/kmdi/mainwindow.h	(.../branches/KDE/3.5/kdelibs)	(revision 594925)
+--- kmdi/kmdi/mainwindow.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 595981)
++++ kmdi/kmdi/mainwindow.h	(.../branches/KDE/3.5/kdelibs)	(revision 595981)
 @@ -107,6 +107,10 @@
       * as toplevel and stay-on-top on the application's main widget.
       * @param pWnd widget for the toolview
@@ -48,8 +48,8 @@
      KMDI::ToolViewAccessor *addToolWindow( QWidget* pWnd, KDockWidget::DockPosition pos = KDockWidget::DockNone, QWidget* pTargetWnd = 0L, int percent = 50, const QString& tabToolTip = 0, const QString& tabCaption = 0);
 Index: kmdi/kmdi/dockcontainer.h
 ===================================================================
---- kmdi/kmdi/dockcontainer.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 594925)
-+++ kmdi/kmdi/dockcontainer.h	(.../branches/KDE/3.5/kdelibs)	(revision 594925)
+--- kmdi/kmdi/dockcontainer.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 595981)
++++ kmdi/kmdi/dockcontainer.h	(.../branches/KDE/3.5/kdelibs)	(revision 595981)
 @@ -50,7 +50,7 @@
      /**
       * Add a widget to this container.
@@ -68,10 +68,31 @@
       * does exactly nothing
       */
      virtual void setToolTip (KDockWidget *, QString &);
+Index: kate/plugins/autobookmarker/autobookmarker.cpp
+===================================================================
+--- kate/plugins/autobookmarker/autobookmarker.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 595981)
++++ kate/plugins/autobookmarker/autobookmarker.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 595981)
+@@ -364,12 +364,12 @@
+ {
+   QString text = i18n("Select the MimeTypes for this pattern.\nPlease note that this will automatically edit the associated file extensions as well.");
+   QStringList list = QStringList::split( QRegExp("\\s*;\\s*"), leMimeTypes->text() );
+-  KMimeTypeChooserDialog *d = new KMimeTypeChooserDialog( i18n("Select Mime Types"), text, list, "text", this );
+-  if ( d->exec() == KDialogBase::Accepted ) {
++  KMimeTypeChooserDialog d( i18n("Select Mime Types"), text, list, "text", this );
++  if ( d.exec() == KDialogBase::Accepted ) {
+     // do some checking, warn user if mime types or patterns are removed.
+     // if the lists are empty, and the fields not, warn.
+-    leFileMask->setText(d->chooser()->patterns().join("; "));
+-    leMimeTypes->setText(d->chooser()->mimeTypes().join("; "));
++    leFileMask->setText(d.chooser()->patterns().join("; "));
++    leMimeTypes->setText(d.chooser()->mimeTypes().join("; "));
+   }
+ }
+ //END
 Index: kate/part/katecodecompletion.cpp
 ===================================================================
---- kate/part/katecodecompletion.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 594925)
-+++ kate/part/katecodecompletion.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 594925)
+--- kate/part/katecodecompletion.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 595981)
++++ kate/part/katecodecompletion.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 595981)
 @@ -56,7 +56,6 @@
    public:
      /**
@@ -82,8 +103,8 @@
      {
 Index: kate/part/katefactory.h
 ===================================================================
---- kate/part/katefactory.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 594925)
-+++ kate/part/katefactory.h	(.../branches/KDE/3.5/kdelibs)	(revision 594925)
+--- kate/part/katefactory.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 595981)
++++ kate/part/katefactory.h	(.../branches/KDE/3.5/kdelibs)	(revision 595981)
 @@ -75,6 +75,7 @@
       * @param widgetName widget name
       * @param parent QObject parent
@@ -92,10 +113,31 @@
       * @param args additional arguments
       * @return constructed part object
       */
+Index: kate/part/katefiletype.cpp
+===================================================================
+--- kate/part/katefiletype.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 595981)
++++ kate/part/katefiletype.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 595981)
+@@ -503,12 +503,12 @@
+ 
+   QString text = i18n("Select the MimeTypes you want for this file type.\nPlease note that this will automatically edit the associated file extensions as well.");
+   QStringList list = QStringList::split( QRegExp("\\s*;\\s*"), mimetypes->text() );
+-  KMimeTypeChooserDialog *d = new KMimeTypeChooserDialog( i18n("Select Mime Types"), text, list, "text", this );
+-  if ( d->exec() == KDialogBase::Accepted ) {
++  KMimeTypeChooserDialog d( i18n("Select Mime Types"), text, list, "text", this );
++  if ( d.exec() == KDialogBase::Accepted ) {
+     // do some checking, warn user if mime types or patterns are removed.
+     // if the lists are empty, and the fields not, warn.
+-    wildcards->setText( d->chooser()->patterns().join(";") );
+-    mimetypes->setText( d->chooser()->mimeTypes().join(";") );
++    wildcards->setText( d.chooser()->patterns().join(";") );
++    mimetypes->setText( d.chooser()->mimeTypes().join(";") );
+   }
+ }
+ //END KateFileTypeConfigTab
 Index: kate/part/katejscript.cpp
 ===================================================================
---- kate/part/katejscript.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 594925)
-+++ kate/part/katejscript.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 594925)
+--- kate/part/katejscript.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 595981)
++++ kate/part/katejscript.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 595981)
 @@ -360,7 +360,7 @@
  
  const KJS::ClassInfo KateJSDocument::info = { "KateJSDocument", 0, 0, 0 };
@@ -125,8 +167,8 @@
  
 Index: kate/part/kateview.h
 ===================================================================
---- kate/part/kateview.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 594925)
-+++ kate/part/kateview.h	(.../branches/KDE/3.5/kdelibs)	(revision 594925)
+--- kate/part/kateview.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 595981)
++++ kate/part/kateview.h	(.../branches/KDE/3.5/kdelibs)	(revision 595981)
 @@ -286,8 +286,8 @@
          { return getDoc()->textLine( cursorLine() ); }
      QString currentWord()
@@ -148,8 +190,8 @@
      void findPrev()               { findAgain( true );           }
 Index: kate/part/katedocument.h
 ===================================================================
---- kate/part/katedocument.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 594925)
-+++ kate/part/katedocument.h	(.../branches/KDE/3.5/kdelibs)	(revision 594925)
+--- kate/part/katedocument.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 595981)
++++ kate/part/katedocument.h	(.../branches/KDE/3.5/kdelibs)	(revision 595981)
 @@ -264,6 +264,7 @@
       * @p removeLine is true, @p length is ignored (eg not needed).
       * @param line line number
@@ -167,10 +209,26 @@
  
      void setModified( bool m );
  
+Index: kate/part/katedocument.cpp
+===================================================================
+--- kate/part/katedocument.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 595981)
++++ kate/part/katedocument.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 595981)
+@@ -4688,9 +4688,9 @@
+         else
+           m_config->setIndentationMode( KateAutoIndent::modeNumber( val) );
+       }
+-      else if ( var == "word-wrap-column" && n > 0  && checkIntValue( val, &n ) ) // uint, but hard word wrap at 0 will be no fun ;)
++      else if ( var == "word-wrap-column" && checkIntValue( val, &n ) && n > 0 ) // uint, but hard word wrap at 0 will be no fun ;)
+         m_config->setWordWrapAt( n );
+-      else if ( var == "undo-steps"  && n >= 0  && checkIntValue( val, &n ) )
++      else if ( var == "undo-steps" && checkIntValue( val, &n ) && n >= 0 )
+         setUndoSteps( n );
+ 
+       // STRING SETTINGS
 Index: kate/part/kateautoindent.h
 ===================================================================
---- kate/part/kateautoindent.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 594925)
-+++ kate/part/kateautoindent.h	(.../branches/KDE/3.5/kdelibs)	(revision 594925)
+--- kate/part/kateautoindent.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 595981)
++++ kate/part/kateautoindent.h	(.../branches/KDE/3.5/kdelibs)	(revision 595981)
 @@ -349,7 +349,7 @@
      KateCSmartIndent (KateDocument *doc);
      ~KateCSmartIndent ();
@@ -209,8 +267,8 @@
      virtual void processLine (KateDocCursor &line);
 Index: kate/part/kateviewhelpers.cpp
 ===================================================================
---- kate/part/kateviewhelpers.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 594925)
-+++ kate/part/kateviewhelpers.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 594925)
+--- kate/part/kateviewhelpers.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 595981)
++++ kate/part/kateviewhelpers.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 595981)
 @@ -277,7 +277,7 @@
    public:
      KateCmdLineFlagCompletion() {;}
@@ -222,8 +280,8 @@
      }
 Index: kate/part/katefactory.cpp
 ===================================================================
---- kate/part/katefactory.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 594925)
-+++ kate/part/katefactory.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 594925)
+--- kate/part/katefactory.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 595981)
++++ kate/part/katefactory.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 595981)
 @@ -52,6 +52,7 @@
       * @param widgetName widget name
       * @param parent QObject parent
@@ -234,8 +292,8 @@
       */
 Index: kate/part/katesearch.h
 ===================================================================
---- kate/part/katesearch.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 594925)
-+++ kate/part/katesearch.h	(.../branches/KDE/3.5/kdelibs)	(revision 594925)
+--- kate/part/katesearch.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 595981)
++++ kate/part/katesearch.h	(.../branches/KDE/3.5/kdelibs)	(revision 595981)
 @@ -223,7 +223,7 @@
      bool help(class Kate::View *, const QString &, QString &);
      QStringList cmds();
@@ -247,8 +305,8 @@
      /**
 Index: kate/part/kateautoindent.cpp
 ===================================================================
---- kate/part/kateautoindent.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 594925)
-+++ kate/part/kateautoindent.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 594925)
+--- kate/part/kateautoindent.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 595981)
++++ kate/part/kateautoindent.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 595981)
 @@ -714,6 +714,7 @@
    int parenCount = 0;  // Possibly in a multiline for stmt.  Used to skip ';' ...
    bool found = false;
@@ -284,10 +342,32 @@
      found = true;
  
    if (!found)
+Index: kate/part/katedialogs.cpp
+===================================================================
+--- kate/part/katedialogs.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 595981)
++++ kate/part/katedialogs.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 595981)
+@@ -1423,13 +1423,13 @@
+ {
+   QString text = i18n("Select the MimeTypes you want highlighted using the '%1' syntax highlight rules.\nPlease note that this will automatically edit the associated file extensions as well.").arg( hlCombo->currentText() );
+   QStringList list = QStringList::split( QRegExp("\\s*;\\s*"), mimetypes->text() );
+-  KMimeTypeChooserDialog *d = new KMimeTypeChooserDialog( i18n("Select Mime Types"), text, list, "text", this );
++  KMimeTypeChooserDialog d( i18n("Select Mime Types"), text, list, "text", this );
+ 
+-  if ( d->exec() == KDialogBase::Accepted ) {
++  if ( d.exec() == KDialogBase::Accepted ) {
+     // do some checking, warn user if mime types or patterns are removed.
+     // if the lists are empty, and the fields not, warn.
+-    wildcards->setText(d->chooser()->patterns().join(";"));
+-    mimetypes->setText(d->chooser()->mimeTypes().join(";"));
++    wildcards->setText(d.chooser()->patterns().join(";"));
++    mimetypes->setText(d.chooser()->mimeTypes().join(";"));
+   }
+ }
+ //END KateHlConfigPage
 Index: kab/qconfigDB.h
 ===================================================================
---- kab/qconfigDB.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 594925)
-+++ kab/qconfigDB.h	(.../branches/KDE/3.5/kdelibs)	(revision 594925)
+--- kab/qconfigDB.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 595981)
++++ kab/qconfigDB.h	(.../branches/KDE/3.5/kdelibs)	(revision 595981)
 @@ -199,7 +199,7 @@
    bool save(QTextStream& file, int count); 
    /**
@@ -407,8 +487,8 @@
     */
 Index: kab/addressbook.h
 ===================================================================
---- kab/addressbook.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 594925)
-+++ kab/addressbook.h	(.../branches/KDE/3.5/kdelibs)	(revision 594925)
+--- kab/addressbook.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 595981)
++++ kab/addressbook.h	(.../branches/KDE/3.5/kdelibs)	(revision 595981)
 @@ -178,7 +178,7 @@
   *  your mainwindow (or whereever). (The toolbar is not implemented by now). <BR>
   *  Some parts of the AddressBook widget are \e interactive, that means they are
@@ -511,8 +591,8 @@
     **/
 Index: kab/kabapi.h
 ===================================================================
---- kab/kabapi.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 594925)
-+++ kab/kabapi.h	(.../branches/KDE/3.5/kdelibs)	(revision 594925)
+--- kab/kabapi.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 595981)
++++ kab/kabapi.h	(.../branches/KDE/3.5/kdelibs)	(revision 595981)
 @@ -77,6 +77,7 @@
     * without failures. Thus you have to call init before you can
     * use the database.
@@ -532,8 +612,8 @@
     * @return NoError if an entry is found or NoEntry.
 Index: arts/kde/kplayobject.h
 ===================================================================
---- arts/kde/kplayobject.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 594925)
-+++ arts/kde/kplayobject.h	(.../branches/KDE/3.5/kdelibs)	(revision 594925)
+--- arts/kde/kplayobject.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 595981)
++++ arts/kde/kplayobject.h	(.../branches/KDE/3.5/kdelibs)	(revision 595981)
 @@ -37,7 +37,7 @@
  
  	/**
@@ -543,10 +623,23 @@
  	  */
  	void setObject(Arts::PlayObject playObject);
  	
+Index: arts/knotify/knotify.desktop
+===================================================================
+--- arts/knotify/knotify.desktop	(.../tags/KDE/3.5.5/kdelibs)	(revision 595981)
++++ arts/knotify/knotify.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 595981)
+@@ -68,7 +68,7 @@
+ Comment[ms]=Daemon Pemberitahuan KDE
+ Comment[mt]=Daemon tan-notifika KDE
+ Comment[nb]=KDE Varslings-nisse
+-Comment[nds]=KDE-Dämoon fÜr't Bescheed geven
++Comment[nds]=KDE-Dämoon fÜr Bescheden
+ Comment[nl]=KDE's systeemnotificatieprogramma
+ Comment[nn]=KDE-varselnisse
+ Comment[nso]=Daemon ya Tsebiso ya KDE
 Index: mimetypes/application/x-mplayer2.desktop
 ===================================================================
---- mimetypes/application/x-mplayer2.desktop	(.../tags/KDE/3.5.5/kdelibs)	(revision 594925)
-+++ mimetypes/application/x-mplayer2.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 594925)
+--- mimetypes/application/x-mplayer2.desktop	(.../tags/KDE/3.5.5/kdelibs)	(revision 595981)
++++ mimetypes/application/x-mplayer2.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 595981)
 @@ -15,6 +15,7 @@
  Comment[es]=Formator de medios de Microsoft
  Comment[et]=Microsoft Media
@@ -557,8 +650,8 @@
  Comment[hu]=Microsoft Media-fĂĄjl
 Index: kioslave/file/file.h
 ===================================================================
---- kioslave/file/file.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 594925)
-+++ kioslave/file/file.h	(.../branches/KDE/3.5/kdelibs)	(revision 594925)
+--- kioslave/file/file.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 595981)
++++ kioslave/file/file.h	(.../branches/KDE/3.5/kdelibs)	(revision 595981)
 @@ -48,10 +48,10 @@
    virtual ~FileProtocol() { }
  
@@ -575,8 +668,8 @@
    virtual void symlink( const QString &target, const KURL &dest,
 Index: kioslave/http/http.h
 ===================================================================
---- kioslave/http/http.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 594925)
-+++ kioslave/http/http.h	(.../branches/KDE/3.5/kdelibs)	(revision 594925)
+--- kioslave/http/http.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 595981)
++++ kioslave/http/http.h	(.../branches/KDE/3.5/kdelibs)	(revision 595981)
 @@ -190,16 +190,16 @@
    virtual void slave_status();
  
@@ -601,8 +694,8 @@
    bool davHostOk();
 Index: kioslave/ftp/ftp.h
 ===================================================================
---- kioslave/ftp/ftp.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 594925)
-+++ kioslave/ftp/ftp.h	(.../branches/KDE/3.5/kdelibs)	(revision 594925)
+--- kioslave/ftp/ftp.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 595981)
++++ kioslave/ftp/ftp.h	(.../branches/KDE/3.5/kdelibs)	(revision 595981)
 @@ -260,7 +260,7 @@
  
    virtual void listDir( const KURL & url );
@@ -614,8 +707,8 @@
  
 Index: kioslave/gzip/kgzipfilter.cpp
 ===================================================================
---- kioslave/gzip/kgzipfilter.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 594925)
-+++ kioslave/gzip/kgzipfilter.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 594925)
+--- kioslave/gzip/kgzipfilter.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 595981)
++++ kioslave/gzip/kgzipfilter.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 595981)
 @@ -38,8 +38,12 @@
  public:
      KGzipFilterFactory() : KLibFactory() {}
@@ -632,8 +725,8 @@
  };
 Index: kio/kio/slavebase.cpp
 ===================================================================
---- kio/kio/slavebase.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 594925)
-+++ kio/kio/slavebase.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 594925)
+--- kio/kio/slavebase.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 595981)
++++ kio/kio/slavebase.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 595981)
 @@ -85,21 +85,22 @@
  
     QStringList groupList() const { return QStringList(); }
@@ -665,8 +758,8 @@
       return entry;
 Index: kio/kio/defaultprogress.h
 ===================================================================
---- kio/kio/defaultprogress.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 594925)
-+++ kio/kio/defaultprogress.h	(.../branches/KDE/3.5/kdelibs)	(revision 594925)
+--- kio/kio/defaultprogress.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 595981)
++++ kio/kio/defaultprogress.h	(.../branches/KDE/3.5/kdelibs)	(revision 595981)
 @@ -48,7 +48,7 @@
    /**
     * Creates a new default progress dialog.
@@ -751,8 +844,8 @@
     * Called when the job is cleaned.
 Index: kio/kio/slavebase.h
 ===================================================================
---- kio/kio/slavebase.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 594925)
-+++ kio/kio/slavebase.h	(.../branches/KDE/3.5/kdelibs)	(revision 594925)
+--- kio/kio/slavebase.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 595981)
++++ kio/kio/slavebase.h	(.../branches/KDE/3.5/kdelibs)	(revision 595981)
 @@ -395,7 +395,7 @@
       *
       * @see canResume()
@@ -764,8 +857,8 @@
       * Finds all details for one file or directory.
 Index: kio/kio/job.cpp
 ===================================================================
---- kio/kio/job.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 594925)
-+++ kio/kio/job.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 594925)
+--- kio/kio/job.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 595981)
++++ kio/kio/job.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 595981)
 @@ -410,15 +410,6 @@
    : Job(showProgressInfo), m_slave(0), m_packedArgs(packedArgs),
      m_url(url), m_command(command), m_totalSize(0)
@@ -800,8 +893,8 @@
  void SimpleJob::kill( bool quietly )
 Index: kio/kio/kservice.cpp
 ===================================================================
---- kio/kio/kservice.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 594925)
-+++ kio/kio/kservice.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 594925)
+--- kio/kio/kservice.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 595981)
++++ kio/kio/kservice.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 595981)
 @@ -447,19 +447,21 @@
  
     QStringList groupList() const { return QStringList(); }
@@ -832,8 +925,8 @@
     QCString value;
 Index: kio/kio/kscan.h
 ===================================================================
---- kio/kio/kscan.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 594925)
-+++ kio/kio/kscan.h	(.../branches/KDE/3.5/kdelibs)	(revision 594925)
+--- kio/kio/kscan.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 595981)
++++ kio/kio/kscan.h	(.../branches/KDE/3.5/kdelibs)	(revision 595981)
 @@ -339,7 +339,7 @@
      KOCRDialogFactory( QObject *parent=0, const char *name=0 );
  
@@ -845,8 +938,8 @@
  
 Index: kio/kfile/kfiletreeview.h
 ===================================================================
---- kio/kfile/kfiletreeview.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 594925)
-+++ kio/kfile/kfiletreeview.h	(.../branches/KDE/3.5/kdelibs)	(revision 594925)
+--- kio/kfile/kfiletreeview.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 595981)
++++ kio/kfile/kfiletreeview.h	(.../branches/KDE/3.5/kdelibs)	(revision 595981)
 @@ -214,9 +214,9 @@
     // The drop event allows to differentiate between move and copy
     void dropped( QWidget*, QDropEvent*, KURL::List&, KURL& );
@@ -861,8 +954,8 @@
  protected:
 Index: kio/kfile/kurlrequester.cpp
 ===================================================================
---- kio/kfile/kurlrequester.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 594925)
-+++ kio/kfile/kurlrequester.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 594925)
+--- kio/kfile/kurlrequester.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 595981)
++++ kio/kfile/kurlrequester.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 595981)
 @@ -306,7 +306,7 @@
      emit urlSelected( d->url() );
  }
@@ -874,8 +967,8 @@
      d->fileDialogMode = mode;
 Index: kio/misc/uiserver.h
 ===================================================================
---- kio/misc/uiserver.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 594925)
-+++ kio/misc/uiserver.h	(.../branches/KDE/3.5/kdelibs)	(revision 594925)
+--- kio/misc/uiserver.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 595981)
++++ kio/misc/uiserver.h	(.../branches/KDE/3.5/kdelibs)	(revision 595981)
 @@ -276,6 +276,7 @@
  
    /**
@@ -886,8 +979,8 @@
     *   QuestionYesNo = 1, WarningYesNo = 2, WarningContinueCancel = 3,
 Index: kio/kssl/ksslcsessioncache.h
 ===================================================================
---- kio/kssl/ksslcsessioncache.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 594925)
-+++ kio/kssl/ksslcsessioncache.h	(.../branches/KDE/3.5/kdelibs)	(revision 594925)
+--- kio/kssl/ksslcsessioncache.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 595981)
++++ kio/kssl/ksslcsessioncache.h	(.../branches/KDE/3.5/kdelibs)	(revision 595981)
 @@ -31,14 +31,14 @@
  
      /**
@@ -907,8 +1000,8 @@
      static QString getSessionForURL(const KURL &kurl);
 Index: kio/kssl/ksmimecrypto.h
 ===================================================================
---- kio/kssl/ksmimecrypto.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 594925)
-+++ kio/kssl/ksmimecrypto.h	(.../branches/KDE/3.5/kdelibs)	(revision 594925)
+--- kio/kssl/ksmimecrypto.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 595981)
++++ kio/kssl/ksmimecrypto.h	(.../branches/KDE/3.5/kdelibs)	(revision 595981)
 @@ -85,7 +85,7 @@
       * Does not check certificates for validity!
       * @param signedText signed message block
@@ -929,8 +1022,8 @@
      rc encryptMessage(const QCString &clearText,
 Index: kabc/vcard21parser.h
 ===================================================================
---- kabc/vcard21parser.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 594925)
-+++ kabc/vcard21parser.h	(.../branches/KDE/3.5/kdelibs)	(revision 594925)
+--- kabc/vcard21parser.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 595981)
++++ kabc/vcard21parser.h	(.../branches/KDE/3.5/kdelibs)	(revision 595981)
 @@ -204,8 +204,8 @@
    friend class VCardLineX;
  
@@ -944,8 +1037,8 @@
    QString getValue(const QString& name);
 Index: kabc/plugins/sql/resourcesql.h
 ===================================================================
---- kabc/plugins/sql/resourcesql.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 594925)
-+++ kabc/plugins/sql/resourcesql.h	(.../branches/KDE/3.5/kdelibs)	(revision 594925)
+--- kabc/plugins/sql/resourcesql.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 595981)
++++ kabc/plugins/sql/resourcesql.h	(.../branches/KDE/3.5/kdelibs)	(revision 595981)
 @@ -43,7 +43,7 @@
    Ticket *requestSaveTicket();
  
@@ -957,8 +1050,8 @@
  
 Index: kabc/plugins/ldapkio/resourceldapkio.h
 ===================================================================
---- kabc/plugins/ldapkio/resourceldapkio.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 594925)
-+++ kabc/plugins/ldapkio/resourceldapkio.h	(.../branches/KDE/3.5/kdelibs)	(revision 594925)
+--- kabc/plugins/ldapkio/resourceldapkio.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 595981)
++++ kabc/plugins/ldapkio/resourceldapkio.h	(.../branches/KDE/3.5/kdelibs)	(revision 595981)
 @@ -57,8 +57,8 @@
  
      virtual bool load();
@@ -972,8 +1065,8 @@
  
 Index: kabc/vcard21parser.cpp
 ===================================================================
---- kabc/vcard21parser.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 594925)
-+++ kabc/vcard21parser.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 594925)
+--- kabc/vcard21parser.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 595981)
++++ kabc/vcard21parser.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 595981)
 @@ -208,17 +208,17 @@
  KABC::Addressee VCard21Parser::readFromString( const QString &data)
  {
@@ -1159,8 +1252,8 @@
    QString failed;
 Index: kabc/sortmode.h
 ===================================================================
---- kabc/sortmode.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 594925)
-+++ kabc/sortmode.h	(.../branches/KDE/3.5/kdelibs)	(revision 594925)
+--- kabc/sortmode.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 595981)
++++ kabc/sortmode.h	(.../branches/KDE/3.5/kdelibs)	(revision 595981)
 @@ -66,6 +66,7 @@
        Creates a NameSortMethod with the specified name type.
  
@@ -1179,8 +1272,8 @@
  
 Index: kabc/sound.h
 ===================================================================
---- kabc/sound.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 594925)
-+++ kabc/sound.h	(.../branches/KDE/3.5/kdelibs)	(revision 594925)
+--- kabc/sound.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 595981)
++++ kabc/sound.h	(.../branches/KDE/3.5/kdelibs)	(revision 595981)
 @@ -51,7 +51,7 @@
   *      }
   *      KAudioPlayer::play( tmpFile ); 
@@ -1192,8 +1285,8 @@
   *
 Index: kabc/field.h
 ===================================================================
---- kabc/field.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 594925)
-+++ kabc/field.h	(.../branches/KDE/3.5/kdelibs)	(revision 594925)
+--- kabc/field.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 595981)
++++ kabc/field.h	(.../branches/KDE/3.5/kdelibs)	(revision 595981)
 @@ -97,7 +97,7 @@
    virtual bool isCustom();
  
@@ -1205,8 +1298,8 @@
  
 Index: kcert/kcertpart.h
 ===================================================================
---- kcert/kcertpart.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 594925)
-+++ kcert/kcertpart.h	(.../branches/KDE/3.5/kdelibs)	(revision 594925)
+--- kcert/kcertpart.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 595981)
++++ kcert/kcertpart.h	(.../branches/KDE/3.5/kdelibs)	(revision 595981)
 @@ -73,7 +73,7 @@
  	    const QStringList &args = QStringList() );
    virtual ~KCertPart();
@@ -1218,8 +1311,8 @@
  
 Index: kdesu/process.h
 ===================================================================
---- kdesu/process.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 594925)
-+++ kdesu/process.h	(.../branches/KDE/3.5/kdelibs)	(revision 594925)
+--- kdesu/process.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 595981)
++++ kdesu/process.h	(.../branches/KDE/3.5/kdelibs)	(revision 595981)
 @@ -119,7 +119,7 @@
       */
      int pid() {return m_Pid;};
@@ -1257,8 +1350,8 @@
      ** If child @p pid has exited, return its exit status,
 Index: kspell2/plugins/aspell/kspell_aspellclient.h
 ===================================================================
---- kspell2/plugins/aspell/kspell_aspellclient.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 594925)
-+++ kspell2/plugins/aspell/kspell_aspellclient.h	(.../branches/KDE/3.5/kdelibs)	(revision 594925)
+--- kspell2/plugins/aspell/kspell_aspellclient.h	(.../tags/KDE/3.5.5/kdelibs)	(revision 595981)
++++ kspell2/plugins/aspell/kspell_aspellclient.h	(.../branches/KDE/3.5/kdelibs)	(revision 595981)
 @@ -1,4 +1,4 @@
 -/**
 +/*
@@ -1267,8 +1360,8 @@
   * Copyright (C)  2003  Zack Rusin <zack at kde.org>
 Index: kspell2/plugins/aspell/kspell_aspellclient.cpp
 ===================================================================
---- kspell2/plugins/aspell/kspell_aspellclient.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 594925)
-+++ kspell2/plugins/aspell/kspell_aspellclient.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 594925)
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/kdelibs-branch.diff?r1=1.38&r2=1.39&f=u

More information about the pld-cvs-commit mailing list