SOURCES: kdelibs-branch.diff, kdebase-branch.diff - updated

arekm arekm at pld-linux.org
Sat Sep 9 20:43:01 CEST 2006 

Author: arekm                        Date: Sat Sep  9 18:43:01 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated

---- Files affected:
SOURCES:
   kdelibs-branch.diff (1.29 -> 1.30) , kdebase-branch.diff (1.33 -> 1.34) 

---- Diffs:

================================================================
Index: SOURCES/kdelibs-branch.diff
diff -u SOURCES/kdelibs-branch.diff:1.29 SOURCES/kdelibs-branch.diff:1.30
--- SOURCES/kdelibs-branch.diff:1.29	Thu Sep  7 16:52:43 2006
+++ SOURCES/kdelibs-branch.diff	Sat Sep  9 20:42:56 2006
@@ -1,7 +1,7 @@
 Index: interfaces/kscript/sample/shellscript.desktop
 ===================================================================
---- interfaces/kscript/sample/shellscript.desktop	(.../tags/KDE/3.5.4/kdelibs)	(revision 581793)
-+++ interfaces/kscript/sample/shellscript.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 581793)
+--- interfaces/kscript/sample/shellscript.desktop	(.../tags/KDE/3.5.4/kdelibs)	(revision 582545)
++++ interfaces/kscript/sample/shellscript.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 582545)
 @@ -15,7 +15,7 @@
  Name[es]=Ejecutor de script para intĂŠrprete de comandos de bash
  Name[et]=Bash shelli skripti käivitaja
@@ -40,8 +40,8 @@
  Comment[pa]=ŕ¨‡ŕŠąŕ¨• ŕ¨•ŕ¨žŕ¨°ŕ¨œ ਵਿੱਹ ŕ¨ŹŕŠˆŕ¨ś ŕ¨śŕŠˆŕ¨˛ ŕ¨¸ŕ¨•ŕŠŕ¨°ŕ¨żŕ¨Şŕ¨Ÿŕ¨žŕ¨‚ ਚਲਞਉਣ ŕ¨˛ŕ¨ˆ ਸਚਞਇਕ ŕ¨šŕŠˆ
 Index: interfaces/kscript/scriptinterface.desktop
 ===================================================================
---- interfaces/kscript/scriptinterface.desktop	(.../tags/KDE/3.5.4/kdelibs)	(revision 581793)
-+++ interfaces/kscript/scriptinterface.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 581793)
+--- interfaces/kscript/scriptinterface.desktop	(.../tags/KDE/3.5.4/kdelibs)	(revision 582545)
++++ interfaces/kscript/scriptinterface.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 582545)
 @@ -18,7 +18,7 @@
  Comment[es]=Este es un motor de script genĂŠrico para probar el interfaz de script.
  Comment[et]=Ăœldise skriptimootori testskript liidese testimiseks.
@@ -53,8 +53,8 @@
  Comment[fr]=Ceci est un moteur de script de test gĂŠnĂŠrique pour expĂŠrimenter l'interface de script.
 Index: interfaces/kimproxy/interface/dcopinstantmessenger.desktop
 ===================================================================
---- interfaces/kimproxy/interface/dcopinstantmessenger.desktop	(.../tags/KDE/3.5.4/kdelibs)	(revision 581793)
-+++ interfaces/kimproxy/interface/dcopinstantmessenger.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 581793)
+--- interfaces/kimproxy/interface/dcopinstantmessenger.desktop	(.../tags/KDE/3.5.4/kdelibs)	(revision 582545)
++++ interfaces/kimproxy/interface/dcopinstantmessenger.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 582545)
 @@ -17,6 +17,7 @@
  Comment[es]=Instant Messenger con un interfaz DCOP
  Comment[et]=Kiirsuhtlemisrakendus DCOP-liidesega
@@ -65,8 +65,8 @@
  Comment[fy]=Instant Messenger mei in DCOP-interface 
 Index: interfaces/kimproxy/interface/kcm_instantmessenger.desktop
 ===================================================================
---- interfaces/kimproxy/interface/kcm_instantmessenger.desktop	(.../tags/KDE/3.5.4/kdelibs)	(revision 581793)
-+++ interfaces/kimproxy/interface/kcm_instantmessenger.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 581793)
+--- interfaces/kimproxy/interface/kcm_instantmessenger.desktop	(.../tags/KDE/3.5.4/kdelibs)	(revision 582545)
++++ interfaces/kimproxy/interface/kcm_instantmessenger.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 582545)
 @@ -10,6 +10,7 @@
  Name[eo]=Tujmesaĝilo
  Name[et]=Kiirsuhtlus
@@ -85,8 +85,8 @@
  Comment[fy]=Mei de instant messenger kinne jo twaspraak hâlde mei in yndividu en groepen.
 Index: interfaces/kspeech/dcoptexttospeech.desktop
 ===================================================================
---- interfaces/kspeech/dcoptexttospeech.desktop	(.../tags/KDE/3.5.4/kdelibs)	(revision 581793)
-+++ interfaces/kspeech/dcoptexttospeech.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 581793)
+--- interfaces/kspeech/dcoptexttospeech.desktop	(.../tags/KDE/3.5.4/kdelibs)	(revision 582545)
++++ interfaces/kspeech/dcoptexttospeech.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 582545)
 @@ -16,6 +16,7 @@
  Comment[es]=Texto a servicio de voz con un interfaz DCOP
  Comment[et]=Teksti kĂľneks muutmise teenus DCOP-liidesega
@@ -97,8 +97,8 @@
  Comment[fy]=tekst-ta-prate mei in DCOP-ynterface
 Index: interfaces/ktexteditor/ktexteditoreditor.desktop
 ===================================================================
---- interfaces/ktexteditor/ktexteditoreditor.desktop	(.../tags/KDE/3.5.4/kdelibs)	(revision 581793)
-+++ interfaces/ktexteditor/ktexteditoreditor.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 581793)
+--- interfaces/ktexteditor/ktexteditoreditor.desktop	(.../tags/KDE/3.5.4/kdelibs)	(revision 582545)
++++ interfaces/ktexteditor/ktexteditoreditor.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 582545)
 @@ -20,7 +20,7 @@
  Comment[es]=Componente incrustable de editor de textos (sin separaciĂłn Doc/Vista)
  Comment[et]=PĂľimitav tekstiredaktori komponent
@@ -110,8 +110,8 @@
  Comment[fy]=Yn te sluten tekstbewurkerkomponint (sĂťnder skieding fan tekst/werjefte)
 Index: interfaces/ktexteditor/kcm_ktexteditor.desktop
 ===================================================================
---- interfaces/ktexteditor/kcm_ktexteditor.desktop	(.../tags/KDE/3.5.4/kdelibs)	(revision 581793)
-+++ interfaces/ktexteditor/kcm_ktexteditor.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 581793)
+--- interfaces/ktexteditor/kcm_ktexteditor.desktop	(.../tags/KDE/3.5.4/kdelibs)	(revision 582545)
++++ interfaces/ktexteditor/kcm_ktexteditor.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 582545)
 @@ -90,7 +90,7 @@
  Comment[es]=El servicio del editor de texto proporciona aplicaciones con un visor de textos y un editor de textos. Las aplicaciones KDE que suministran propiedades de ediciĂłn deberĂ­an utilizar este servicio.
  Comment[et]=Tekstiredaktori teenus annab rakendustele komponendi teksti vaatamiseks ja redigeerimiseks. Seda kasutavad kĂľik KDE rakendused, mis tegelevad teksti redigeerimisega.
@@ -123,8 +123,8 @@
  Comment[fr]=Le service d'ĂŠdition de texte fournit des applications comportant un afficheur de texte et un ĂŠditeur. Les applications KDE qui fournissent des fonctions d'ĂŠdition de texte devraient utiliser ce service.
 Index: interfaces/ktexteditor/ktexteditor.desktop
 ===================================================================
---- interfaces/ktexteditor/ktexteditor.desktop	(.../tags/KDE/3.5.4/kdelibs)	(revision 581793)
-+++ interfaces/ktexteditor/ktexteditor.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 581793)
+--- interfaces/ktexteditor/ktexteditor.desktop	(.../tags/KDE/3.5.4/kdelibs)	(revision 582545)
++++ interfaces/ktexteditor/ktexteditor.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 582545)
 @@ -20,7 +20,7 @@
  Comment[es]=Componente incrustable de editor de textos (con separaciĂłn Doc/Vista)
  Comment[et]=PĂľimitav tekstiredaktori komponent (dokument/vaade eraldamisega)
@@ -136,8 +136,8 @@
  Comment[fy]=Yn te sluten tekstbewurkerkomponint (mei skieding fan tekst/werjefte)
 Index: interfaces/ktexteditor/ktexteditorplugin.desktop
 ===================================================================
---- interfaces/ktexteditor/ktexteditorplugin.desktop	(.../tags/KDE/3.5.4/kdelibs)	(revision 581793)
-+++ interfaces/ktexteditor/ktexteditorplugin.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 581793)
+--- interfaces/ktexteditor/ktexteditorplugin.desktop	(.../tags/KDE/3.5.4/kdelibs)	(revision 582545)
++++ interfaces/ktexteditor/ktexteditorplugin.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 582545)
 @@ -22,7 +22,7 @@
  Comment[es]=Plugin de KTextEditor
  Comment[et]=KTextEditori plugin
@@ -149,8 +149,8 @@
  Comment[fy]=KTextFerwurker-plugin
 Index: kate/plugins/kdatatool/ktexteditor_kdatatool.desktop
 ===================================================================
---- kate/plugins/kdatatool/ktexteditor_kdatatool.desktop	(.../tags/KDE/3.5.4/kdelibs)	(revision 581793)
-+++ kate/plugins/kdatatool/ktexteditor_kdatatool.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 581793)
+--- kate/plugins/kdatatool/ktexteditor_kdatatool.desktop	(.../tags/KDE/3.5.4/kdelibs)	(revision 582545)
++++ kate/plugins/kdatatool/ktexteditor_kdatatool.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 582545)
 @@ -17,7 +17,7 @@
  Name[es]=Plugin KDataTool de KTextEditor
  Name[et]=KTextEditori KDataTool plugin
@@ -171,8 +171,8 @@
  Comment[fy]=Aktivearjen fan dataprogramma's, lykas de tesaurus en stavering (wannear't dy ynstallearre binne)
 Index: kate/plugins/insertfile/ktexteditor_insertfile.desktop
 ===================================================================
---- kate/plugins/insertfile/ktexteditor_insertfile.desktop	(.../tags/KDE/3.5.4/kdelibs)	(revision 581793)
-+++ kate/plugins/insertfile/ktexteditor_insertfile.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 581793)
+--- kate/plugins/insertfile/ktexteditor_insertfile.desktop	(.../tags/KDE/3.5.4/kdelibs)	(revision 582545)
++++ kate/plugins/insertfile/ktexteditor_insertfile.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 582545)
 @@ -17,7 +17,7 @@
  Name[es]=Plugin de inserciĂłn de archivos de KTextEditor
  Name[et]=KTextEditori faili lisamise plugin
@@ -192,8 +192,8 @@
  Comment[fy]=Els lĂŞsber Triem by it rinnerke ynfoegje
 Index: kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop
 ===================================================================
---- kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop	(.../tags/KDE/3.5.4/kdelibs)	(revision 581793)
-+++ kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 581793)
+--- kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop	(.../tags/KDE/3.5.4/kdelibs)	(revision 582545)
++++ kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 582545)
 @@ -14,6 +14,7 @@
  Name[es]=Automarcadores de KTextEditor
  Name[et]=KTextEditori järjehoidjate märkija
@@ -212,8 +212,8 @@
  Comment[fy]=BlĂŞdwizer ynstelle om by it laden fan dokuminten oerienkomstige patroanen 
 Index: kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop
 ===================================================================
---- kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop	(.../tags/KDE/3.5.4/kdelibs)	(revision 581793)
-+++ kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 581793)
+--- kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop	(.../tags/KDE/3.5.4/kdelibs)	(revision 582545)
++++ kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 582545)
 @@ -13,6 +13,7 @@
  Name[es]=Plugin de completado de palabras de KTextEditor
  Name[et]=KTextEditori sĂľna lĂľpetamise plugin
@@ -241,8 +241,8 @@
  Comment[fy]=kompleet meitsje fan wurden yn it dokumint op Direktsjeneel of popup-basearje 
 Index: kate/plugins/isearch/ktexteditor_isearch.desktop
 ===================================================================
---- kate/plugins/isearch/ktexteditor_isearch.desktop	(.../tags/KDE/3.5.4/kdelibs)	(revision 581793)
-+++ kate/plugins/isearch/ktexteditor_isearch.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 581793)
+--- kate/plugins/isearch/ktexteditor_isearch.desktop	(.../tags/KDE/3.5.4/kdelibs)	(revision 582545)
++++ kate/plugins/isearch/ktexteditor_isearch.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 582545)
 @@ -16,7 +16,7 @@
  Name[es]=Plugin de bĂşsqueda incremental de KTextEditor
  Name[et]=KTextEditori täpsustava otsingu plugin
@@ -262,8 +262,8 @@
  Comment[fy]=Ek bekend as"Ăťnder it typen sykje"
 Index: kate/part/kateconfig.h
 ===================================================================
---- kate/part/kateconfig.h	(.../tags/KDE/3.5.4/kdelibs)	(revision 581793)
-+++ kate/part/kateconfig.h	(.../branches/KDE/3.5/kdelibs)	(revision 581793)
+--- kate/part/kateconfig.h	(.../tags/KDE/3.5.4/kdelibs)	(revision 582545)
++++ kate/part/kateconfig.h	(.../branches/KDE/3.5/kdelibs)	(revision 582545)
 @@ -178,7 +178,8 @@
        cfReplaceTabsDyn=   0x2000000,
        cfRemoveTrailingDyn=0x4000000,
@@ -276,8 +276,8 @@
      uint configFlags () const;
 Index: kate/part/katedocument.h
 ===================================================================
---- kate/part/katedocument.h	(.../tags/KDE/3.5.4/kdelibs)	(revision 581793)
-+++ kate/part/katedocument.h	(.../branches/KDE/3.5/kdelibs)	(revision 581793)
+--- kate/part/katedocument.h	(.../tags/KDE/3.5.4/kdelibs)	(revision 582545)
++++ kate/part/katedocument.h	(.../branches/KDE/3.5/kdelibs)	(revision 582545)
 @@ -993,7 +993,12 @@
      */
      static bool checkColorValue( QString value, QColor &col );
@@ -293,8 +293,8 @@
      KIO::TransferJob *m_job;
 Index: kate/part/katedocument.cpp
 ===================================================================
---- kate/part/katedocument.cpp	(.../tags/KDE/3.5.4/kdelibs)	(revision 581793)
-+++ kate/part/katedocument.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 581793)
+--- kate/part/katedocument.cpp	(.../tags/KDE/3.5.4/kdelibs)	(revision 582545)
++++ kate/part/katedocument.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 582545)
 @@ -2895,8 +2895,8 @@
        {
          QChar end_ch;
@@ -603,8 +603,8 @@
    }
 Index: kate/part/kateautoindent.h
 ===================================================================
---- kate/part/kateautoindent.h	(.../tags/KDE/3.5.4/kdelibs)	(revision 581793)
-+++ kate/part/kateautoindent.h	(.../branches/KDE/3.5/kdelibs)	(revision 581793)
+--- kate/part/kateautoindent.h	(.../tags/KDE/3.5.4/kdelibs)	(revision 582545)
++++ kate/part/kateautoindent.h	(.../branches/KDE/3.5/kdelibs)	(revision 582545)
 @@ -67,8 +67,10 @@
   * This baseclass is a real dummy, does nothing beside remembering the document it belongs too,
   * only to have the object around
@@ -719,10 +719,187 @@
    public:
      KateScriptIndent( KateDocument *doc );
      ~KateScriptIndent();
+Index: kate/part/test_regression.h
+===================================================================
+--- kate/part/test_regression.h	(.../tags/KDE/3.5.4/kdelibs)	(revision 0)
++++ kate/part/test_regression.h	(.../branches/KDE/3.5/kdelibs)	(revision 582545)
+@@ -0,0 +1,172 @@
++/**
++ * This file is part of the KDE project
++ *
++ * Copyright (C) 2001,2003 Peter Kelly (pmk at post.com)
++ * Copyright 2006 Leo Savernik (l.savernik at aon.at)
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Library General Public
++ * License as published by the Free Software Foundation; either
++ * version 2 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Library General Public License for more details.
++ *
++ * You should have received a copy of the GNU Library General Public License
++ * along with this library; see the file COPYING.LIB.  If not, write to
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
++ *
++ */
++
++#ifndef TEST_REGRESSION_H
++#define TEST_REGRESSION_H
++
++#include <katejscript.h>
++#include <kateview.h>
++#include <kurl.h>
++#include <qobject.h>
++#include <qstringlist.h>
++#include <kjs/ustring.h>
++#include <kjs/object.h>
++#include <kjs/interpreter.h>
++
++class KateDocument;
++class KateView;
++class RegressionTest;
++class QTimer;
++
++namespace KParts {
++  class URLArgs;
++}
++
++/**
++ * @internal
++ * The backbone of Kate's automatic regression tests.
++ */
++class TestJScriptEnv : public KateJScript
++{
++  public:
++    TestJScriptEnv(KateDocument *part);
++    virtual ~TestJScriptEnv();
++
++    /** returns the global scope */
++    KJS::Object global() const { return *m_global; }
++    /** returns the script interpreter */
++    KJS::Interpreter &interpreter() { return *m_interpreter; }
++    /** returns the document scope */
++    KJS::Object document() const { return *m_document; }
++    /** returns the view scope */
++    KJS::Object view() const { return *m_view; }
++};
++
++/**
++ * @internal
++ */
++class KateViewObject : public KJS::ObjectImp
++{
++  public:
++    KateViewObject(KJS::ExecState *exec, KateView *v, KJS::ObjectImp *fallback);
++    virtual ~KateViewObject();
++
++    virtual const KJS::ClassInfo *classInfo() const;
++    virtual KJS::Value get(KJS::ExecState *exec, const KJS::Identifier &propertyName) const;
++
++  private:
++    // evil hack I: class layout of katejscript/KateJSView must be duplicated
++    // here, structurally as well as functionally
++    KateView *view;
++    // end evil hack
++    KJS::ObjectImp *fallback;
++};
++
++/**
++ * @internal
++ */
++class KateViewFunction : public KJS::ObjectImp
++{
++  public:
++    KateViewFunction(KJS::ExecState *exec, KateView *v, int _id, int length);
++
++    bool implementsCall() const;
++    KJS::Value call(KJS::ExecState *exec, KJS::Object &thisObj, const KJS::List &args);
++
++    enum { KeyReturn, Type };
++  private:
++    KateView *m_view;
++    int id;
++};
++
++/**
++ * @internal
++ */
++class RegressionTest : public QObject
++{
++  Q_OBJECT
++public:
++
++    RegressionTest(KateDocument *part, const QString &baseDir,
++                   const QString &outputDir, bool _genOutput);
++    ~RegressionTest();
++
++    enum OutputType { ResultDocument };
++    void testStaticFile(const QString& filename, const QStringList &commands);
++    enum CheckResult { Failure = 0, Success = 1, Ignored = 2 };
++    CheckResult checkOutput(const QString& againstFilename);
++    enum FailureType { NoFailure = 0, AllFailure = 1, ResultFailure = 4 };
++    bool runTests(QString relPath = QString::null, bool mustExist = false, int known_failure = NoFailure, QStringList commands = QStringList());
++    bool reportResult( bool passed, const QString & description = QString::null );
++    bool reportResult(CheckResult result, const QString & description = QString::null );
++    void createMissingDirs(const QString &path);
++
++    void createLink( const QString& test, int failures );
++    void doFailureReport( const QString& test, int failures );
++
++    KateDocument *m_part;
++    KateView *m_view;
++    QString m_baseDir;
++    QString m_outputDir;
++    bool m_genOutput;
++    QString m_currentBase;
++
++    QString m_currentOutput;
++    QString m_currentCategory;
++    QString m_currentTest;
++
++    bool m_keepOutput;
++    bool m_getOutput;
++    bool m_showGui;
++    int m_passes_work;
++    int m_passes_fail;
++    int m_failures_work;
++    int m_failures_fail;
++    int m_errors;
++    bool saw_failure;
++    bool ignore_errors;
++    int m_known_failures;
++
++    static RegressionTest *curr;
++
++private:
++    void printDescription(const QString& description);
++
++    static bool svnIgnored( const QString &filename );
++
++private:
++    /**
++     * evaluate script given by \c filename within the context of \c interp.
++     * @param ignore if \c true don't evaluate if script does not exist but
++     * return true nonetheless.
++     * @return true if script was valid, false otherwise
++     */
++    bool evalJS( KJS::Interpreter &interp, const QString &filename, bool ignore = false);
++
++private slots:
++    void slotOpenURL(const KURL &url, const KParts::URLArgs &args);
++    void resizeTopLevelWidget( int, int );
++
++};
++
++#endif
 Index: kate/part/katedialogs.h
 ===================================================================
---- kate/part/katedialogs.h	(.../tags/KDE/3.5.4/kdelibs)	(revision 581793)
-+++ kate/part/katedialogs.h	(.../branches/KDE/3.5/kdelibs)	(revision 581793)
+--- kate/part/katedialogs.h	(.../tags/KDE/3.5.4/kdelibs)	(revision 582545)
++++ kate/part/katedialogs.h	(.../branches/KDE/3.5/kdelibs)	(revision 582545)
 @@ -122,7 +122,7 @@
      void indenterSelected (int);
  
@@ -734,8 +911,8 @@
      KIntNumInput *indentationWidth;
 Index: kate/part/kateviewhelpers.cpp
 ===================================================================
---- kate/part/kateviewhelpers.cpp	(.../tags/KDE/3.5.4/kdelibs)	(revision 581793)
-+++ kate/part/kateviewhelpers.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 581793)
+--- kate/part/kateviewhelpers.cpp	(.../tags/KDE/3.5.4/kdelibs)	(revision 582545)
++++ kate/part/kateviewhelpers.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 582545)
 @@ -583,7 +583,7 @@
  ".+++++++++.",
  "..........."};
@@ -767,8 +944,8 @@
    uint endz = startz + 1 + (height / h);
 Index: kate/part/kateconfig.cpp
 ===================================================================
---- kate/part/kateconfig.cpp	(.../tags/KDE/3.5.4/kdelibs)	(revision 581793)
-+++ kate/part/kateconfig.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 581793)
+--- kate/part/kateconfig.cpp	(.../tags/KDE/3.5.4/kdelibs)	(revision 582545)
++++ kate/part/kateconfig.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 582545)
 @@ -168,7 +168,8 @@
      | KateDocumentConfig::cfKeepIndentProfile
      | KateDocumentConfig::cfWrapCursor
@@ -781,8 +958,8 @@
  
 Index: kate/part/kateviewinternal.cpp
 ===================================================================
---- kate/part/kateviewinternal.cpp	(.../tags/KDE/3.5.4/kdelibs)	(revision 581793)
-+++ kate/part/kateviewinternal.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 581793)
+--- kate/part/kateviewinternal.cpp	(.../tags/KDE/3.5.4/kdelibs)	(revision 582545)
++++ kate/part/kateviewinternal.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 582545)
 @@ -2682,8 +2682,6 @@
            selStartCached = m_view->selectStart;
            selEndCached = m_view->selectEnd;
@@ -816,8 +993,8 @@
        }
 Index: kate/part/kateautoindent.cpp
 ===================================================================
---- kate/part/kateautoindent.cpp	(.../tags/KDE/3.5.4/kdelibs)	(revision 581793)
-+++ kate/part/kateautoindent.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 581793)
+--- kate/part/kateautoindent.cpp	(.../tags/KDE/3.5.4/kdelibs)	(revision 582545)
++++ kate/part/kateautoindent.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 582545)
 @@ -31,6 +31,8 @@
  #include <kdebug.h>
  #include <kpopupmenu.h>
@@ -1129,10 +1306,1037 @@
    QString indent; // store the indent string here
  
    // find the first line with content that is not starting with comment text,
+Index: kate/part/test_regression.cpp
+===================================================================
+--- kate/part/test_regression.cpp	(.../tags/KDE/3.5.4/kdelibs)	(revision 0)
++++ kate/part/test_regression.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 582545)
+@@ -0,0 +1,1022 @@
++/**
++ * This file is part of the KDE project
++ *
++ * Copyright (C) 2001,2003 Peter Kelly (pmk at post.com)
++ * Copyright (C) 2003,2004 Stephan Kulow (coolo at kde.org)
++ * Copyright (C) 2004 Dirk Mueller ( mueller at kde.org )
++ * Copyright 2006 Leo Savernik (l.savernik at aon.at)
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Library General Public
++ * License as published by the Free Software Foundation; either
++ * version 2 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Library General Public License for more details.
++ *
++ * You should have received a copy of the GNU Library General Public License
++ * along with this library; see the file COPYING.LIB.  If not, write to
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
++ *
++ */
++
++#include <stdlib.h>
++#include <sys/time.h>
++#include <sys/resource.h>
++#include <sys/types.h>
++#include <unistd.h>
++#include <pwd.h>
++#include <signal.h>
++
++#include <kapplication.h>
++#include <kstandarddirs.h>
++#include <qimage.h>
++#include <qfile.h>
++#include "test_regression.h"
++#include <unistd.h>
++#include <stdio.h>
++
++#include <kaction.h>
++#include <kcmdlineargs.h>
++#include "katefactory.h"
++#include <kio/job.h>
++#include <kmainwindow.h>
++#include <ksimpleconfig.h>
++#include <kglobalsettings.h>
++
++#include <qcolor.h>
++#include <qcursor.h>
++#include <qdir.h>
++#include <qevent.h>
++#include <qobject.h>
++#include <qpushbutton.h>
++#include <qscrollview.h>
++#include <qstring.h>
++#include <qregexp.h>
++#include <qtextstream.h>
++#include <qvaluelist.h>
++#include <qwidget.h>
++#include <qfileinfo.h>
++#include <qtimer.h>
++#include <kstatusbar.h>
++#include <qfileinfo.h>
++
++#include "katedocument.h"
++#include "kateview.h"
++#include <kparts/browserextension.h>
++#include "katejscript.h"
++#include "katedocumenthelpers.h"
++#include "../interfaces/katecmd.h"
++
++using namespace KJS;
++
++#define BASE_DIR_CONFIG "/.testkateregression-3.5"
++
++//BEGIN TestJScriptEnv
++
++TestJScriptEnv::TestJScriptEnv(KateDocument *part) {
++  ExecState *exec = m_interpreter->globalExec();
++
++  KJS::ObjectImp *wd = wrapDocument(m_interpreter->globalExec(), part);
++  KateView *v = static_cast<KateView *>(part->widget());
++  KJS::ObjectImp *wv = new KateViewObject(exec, v, wrapView(m_interpreter->globalExec(), v));
++
++  *m_view = KJS::Object(wv);
++  *m_document = KJS::Object(wd);
++
++  // add convenience shortcuts
++  m_interpreter->globalObject().put(exec, "d", *m_document);
++  m_interpreter->globalObject().put(exec, "v", *m_view);
++
++}
++
++TestJScriptEnv::~TestJScriptEnv() {
++}
++
++//END TestJScriptEnv
++
++//BEGIN KateViewObject
++
++KateViewObject::KateViewObject(ExecState *exec, KateView *v, ObjectImp *fallback)
++  : view(v), fallback(fallback)
++{
++    fallback->ref();
++
++    putDirect("keyReturn", new KateViewFunction(exec,v,KateViewFunction::KeyReturn,0), DontEnum);
++    putDirect("enter", new KateViewFunction(exec,v,KateViewFunction::KeyReturn,0), DontEnum);
++    putDirect("type", new KateViewFunction(exec,v,KateViewFunction::Type,1), DontEnum);
++}
++
++KateViewObject::~KateViewObject()
++{
++    fallback->deref();
++}
++
++const ClassInfo *KateViewObject::classInfo() const {
++    // evil hack II: disguise as fallback, otherwise we can't fall back
++    return fallback->classInfo();
++}
++
++Value KateViewObject::get(ExecState *exec, const Identifier &propertyName) const
++{
++    ValueImp *val = getDirect(propertyName);
++    if (val)
++        return Value(val);
++
++    return fallback->get(exec, propertyName);
++}
++
++//END KateViewObject
++
++//BEGIN KateViewFunction
++
++KateViewFunction::KateViewFunction(ExecState */*exec*/, KateView *v, int _id, int length)
++{
++    m_view = v;
++    id = _id;
++    putDirect("length",length);
++}
++
++bool KateViewFunction::implementsCall() const
++{
++    return true;
++}
++
++Value KateViewFunction::call(ExecState *exec, Object &/*thisObj*/, const List &args)
++{
++    Value result = Undefined();
++
++    switch (id) {
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/kdelibs-branch.diff?r1=1.29&r2=1.30&f=u
    http://cvs.pld-linux.org/SOURCES/kdebase-branch.diff?r1=1.33&r2=1.34&f=u

More information about the pld-cvs-commit mailing list