SOURCES: kdelibs-branch.diff - Updated again (a few khtml fixes)
adgor
adgor at pld-linux.org
Sat Sep 30 14:48:30 CEST 2006
Author: adgor Date: Sat Sep 30 12:48:30 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- Updated again (a few khtml fixes)
---- Files affected:
SOURCES:
kdelibs-branch.diff (1.34 -> 1.35)
---- Diffs:
================================================================
Index: SOURCES/kdelibs-branch.diff
diff -u SOURCES/kdelibs-branch.diff:1.34 SOURCES/kdelibs-branch.diff:1.35
--- SOURCES/kdelibs-branch.diff:1.34 Fri Sep 29 14:31:44 2006
+++ SOURCES/kdelibs-branch.diff Sat Sep 30 14:48:25 2006
@@ -1,7 +1,7 @@
Index: interfaces/kscript/sample/shellscript.desktop
===================================================================
---- interfaces/kscript/sample/shellscript.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 589209)
-+++ interfaces/kscript/sample/shellscript.desktop (.../branches/KDE/3.5/kdelibs) (revision 589209)
+--- interfaces/kscript/sample/shellscript.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 590241)
++++ interfaces/kscript/sample/shellscript.desktop (.../branches/KDE/3.5/kdelibs) (revision 590241)
@@ -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 589209)
-+++ interfaces/kscript/scriptinterface.desktop (.../branches/KDE/3.5/kdelibs) (revision 589209)
+--- interfaces/kscript/scriptinterface.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 590241)
++++ interfaces/kscript/scriptinterface.desktop (.../branches/KDE/3.5/kdelibs) (revision 590241)
@@ -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 589209)
-+++ interfaces/kimproxy/interface/dcopinstantmessenger.desktop (.../branches/KDE/3.5/kdelibs) (revision 589209)
+--- interfaces/kimproxy/interface/dcopinstantmessenger.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 590241)
++++ interfaces/kimproxy/interface/dcopinstantmessenger.desktop (.../branches/KDE/3.5/kdelibs) (revision 590241)
@@ -17,6 +17,7 @@
Comment[es]=Instant Messenger con un interfaz DCOP
Comment[et]=Kiirsuhtlemisrakendus DCOP-liidesega
@@ -65,9 +65,17 @@
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 589209)
-+++ interfaces/kimproxy/interface/kcm_instantmessenger.desktop (.../branches/KDE/3.5/kdelibs) (revision 589209)
-@@ -10,6 +10,7 @@
+--- interfaces/kimproxy/interface/kcm_instantmessenger.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 590241)
++++ interfaces/kimproxy/interface/kcm_instantmessenger.desktop (.../branches/KDE/3.5/kdelibs) (revision 590241)
+@@ -2,6 +2,7 @@
+ Name[af]=Oombliklike Boodskapper
+ Name[bg]=ĐĄŃŠĐžĐąŃ‰ĐľĐ˝Đ¸Ń Đ˛ роаНнО вроПо
+ Name[bn]=ŕŚ‡ŕŚ¨ŕŚ¸ŕ§ŕŚŸŕ§ŕŚŻŕŚžŕŚ¨ŕ§ŕŚŸ ŕŚŽŕ§‡ŕŚ¸ŕ§‡ŕŚžŕ§ŕŚœŕŚžŕŚ°
++Name[br]=Posteler a-benn-kaer
+ Name[bs]=Instant poruke
+ Name[ca]=Missatgeria instantĂ nia
+ Name[cs]=KomunikĂĄtor
+@@ -10,6 +11,7 @@
Name[eo]=TujmesaÄilo
Name[et]=Kiirsuhtlus
Name[eu]=Berehalako mezularitza
@@ -75,7 +83,7 @@
Name[fi]=Pikaviestiohjelma
Name[fr]=Messagerie instantanĂŠe
Name[ga]=ClĂĄr teachtaireachtaĂ meandaracha
-@@ -64,6 +65,7 @@
+@@ -64,6 +66,7 @@
Comment[es]=El Instant Messenger permite conversaciĂłn en dos sentidos entre indivĂduos y grupos.
Comment[et]=Kiirsuhtlus vĂľimaldab Ăźksikisikute ja gruppide kahepoolset vestlust.
Comment[eu]=Berehalako mezularitzak banan-banako edo taldeen arteko berriketan aritzeko.
@@ -85,8 +93,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 589209)
-+++ interfaces/kspeech/dcoptexttospeech.desktop (.../branches/KDE/3.5/kdelibs) (revision 589209)
+--- interfaces/kspeech/dcoptexttospeech.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 590241)
++++ interfaces/kspeech/dcoptexttospeech.desktop (.../branches/KDE/3.5/kdelibs) (revision 590241)
@@ -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 +105,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 589209)
-+++ interfaces/ktexteditor/ktexteditoreditor.desktop (.../branches/KDE/3.5/kdelibs) (revision 589209)
+--- interfaces/ktexteditor/ktexteditoreditor.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 590241)
++++ interfaces/ktexteditor/ktexteditoreditor.desktop (.../branches/KDE/3.5/kdelibs) (revision 590241)
@@ -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 +118,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 589209)
-+++ interfaces/ktexteditor/kcm_ktexteditor.desktop (.../branches/KDE/3.5/kdelibs) (revision 589209)
+--- interfaces/ktexteditor/kcm_ktexteditor.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 590241)
++++ interfaces/ktexteditor/kcm_ktexteditor.desktop (.../branches/KDE/3.5/kdelibs) (revision 590241)
@@ -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 +131,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 589209)
-+++ interfaces/ktexteditor/ktexteditor.desktop (.../branches/KDE/3.5/kdelibs) (revision 589209)
+--- interfaces/ktexteditor/ktexteditor.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 590241)
++++ interfaces/ktexteditor/ktexteditor.desktop (.../branches/KDE/3.5/kdelibs) (revision 590241)
@@ -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 +144,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 589209)
-+++ interfaces/ktexteditor/ktexteditorplugin.desktop (.../branches/KDE/3.5/kdelibs) (revision 589209)
+--- interfaces/ktexteditor/ktexteditorplugin.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 590241)
++++ interfaces/ktexteditor/ktexteditorplugin.desktop (.../branches/KDE/3.5/kdelibs) (revision 590241)
@@ -22,7 +22,7 @@
Comment[es]=Plugin de KTextEditor
Comment[et]=KTextEditori plugin
@@ -149,8 +157,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 589209)
-+++ kate/plugins/kdatatool/ktexteditor_kdatatool.desktop (.../branches/KDE/3.5/kdelibs) (revision 589209)
+--- kate/plugins/kdatatool/ktexteditor_kdatatool.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 590241)
++++ kate/plugins/kdatatool/ktexteditor_kdatatool.desktop (.../branches/KDE/3.5/kdelibs) (revision 590241)
@@ -17,7 +17,7 @@
Name[es]=Plugin KDataTool de KTextEditor
Name[et]=KTextEditori KDataTool plugin
@@ -171,8 +179,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 589209)
-+++ kate/plugins/insertfile/ktexteditor_insertfile.desktop (.../branches/KDE/3.5/kdelibs) (revision 589209)
+--- kate/plugins/insertfile/ktexteditor_insertfile.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 590241)
++++ kate/plugins/insertfile/ktexteditor_insertfile.desktop (.../branches/KDE/3.5/kdelibs) (revision 590241)
@@ -17,7 +17,7 @@
Name[es]=Plugin de inserciĂłn de archivos de KTextEditor
Name[et]=KTextEditori faili lisamise plugin
@@ -192,8 +200,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 589209)
-+++ kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop (.../branches/KDE/3.5/kdelibs) (revision 589209)
+--- kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 590241)
++++ kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop (.../branches/KDE/3.5/kdelibs) (revision 590241)
@@ -14,6 +14,7 @@
Name[es]=Automarcadores de KTextEditor
Name[et]=KTextEditori järjehoidjate märkija
@@ -212,8 +220,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 589209)
-+++ kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop (.../branches/KDE/3.5/kdelibs) (revision 589209)
+--- kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 590241)
++++ kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop (.../branches/KDE/3.5/kdelibs) (revision 590241)
@@ -13,6 +13,7 @@
Name[es]=Plugin de completado de palabras de KTextEditor
Name[et]=KTextEditori sĂľna lĂľpetamise plugin
@@ -241,8 +249,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 589209)
-+++ kate/plugins/isearch/ktexteditor_isearch.desktop (.../branches/KDE/3.5/kdelibs) (revision 589209)
+--- kate/plugins/isearch/ktexteditor_isearch.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 590241)
++++ kate/plugins/isearch/ktexteditor_isearch.desktop (.../branches/KDE/3.5/kdelibs) (revision 590241)
@@ -16,7 +16,7 @@
Name[es]=Plugin de bĂşsqueda incremental de KTextEditor
Name[et]=KTextEditori täpsustava otsingu plugin
@@ -262,8 +270,8 @@
Comment[fy]=Ek bekend as"Ăťnder it typen sykje"
Index: kate/part/katecodecompletion.cpp
===================================================================
---- kate/part/katecodecompletion.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 589209)
-+++ kate/part/katecodecompletion.cpp (.../branches/KDE/3.5/kdelibs) (revision 589209)
+--- kate/part/katecodecompletion.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 590241)
++++ kate/part/katecodecompletion.cpp (.../branches/KDE/3.5/kdelibs) (revision 590241)
@@ -137,6 +137,11 @@
this, SLOT(slotCursorPosChanged()) );
}
@@ -278,8 +286,8 @@
}
Index: kate/part/kateconfig.h
===================================================================
---- kate/part/kateconfig.h (.../tags/KDE/3.5.4/kdelibs) (revision 589209)
-+++ kate/part/kateconfig.h (.../branches/KDE/3.5/kdelibs) (revision 589209)
+--- kate/part/kateconfig.h (.../tags/KDE/3.5.4/kdelibs) (revision 590241)
++++ kate/part/kateconfig.h (.../branches/KDE/3.5/kdelibs) (revision 590241)
@@ -178,7 +178,8 @@
cfReplaceTabsDyn= 0x2000000,
cfRemoveTrailingDyn=0x4000000,
@@ -292,8 +300,8 @@
uint configFlags () const;
Index: kate/part/katedocument.h
===================================================================
---- kate/part/katedocument.h (.../tags/KDE/3.5.4/kdelibs) (revision 589209)
-+++ kate/part/katedocument.h (.../branches/KDE/3.5/kdelibs) (revision 589209)
+--- kate/part/katedocument.h (.../tags/KDE/3.5.4/kdelibs) (revision 590241)
++++ kate/part/katedocument.h (.../branches/KDE/3.5/kdelibs) (revision 590241)
@@ -993,7 +993,12 @@
*/
static bool checkColorValue( QString value, QColor &col );
@@ -309,8 +317,8 @@
KIO::TransferJob *m_job;
Index: kate/part/kateview.cpp
===================================================================
---- kate/part/kateview.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 589209)
-+++ kate/part/kateview.cpp (.../branches/KDE/3.5/kdelibs) (revision 589209)
+--- kate/part/kateview.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 590241)
++++ kate/part/kateview.cpp (.../branches/KDE/3.5/kdelibs) (revision 590241)
@@ -173,7 +173,6 @@
m_doc->removeView( this );
@@ -321,8 +329,8 @@
Index: kate/part/katedocument.cpp
===================================================================
---- kate/part/katedocument.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 589209)
-+++ kate/part/katedocument.cpp (.../branches/KDE/3.5/kdelibs) (revision 589209)
+--- kate/part/katedocument.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 590241)
++++ kate/part/katedocument.cpp (.../branches/KDE/3.5/kdelibs) (revision 590241)
@@ -2895,8 +2895,8 @@
{
QChar end_ch;
@@ -643,8 +651,8 @@
}
Index: kate/part/kateautoindent.h
===================================================================
---- kate/part/kateautoindent.h (.../tags/KDE/3.5.4/kdelibs) (revision 589209)
-+++ kate/part/kateautoindent.h (.../branches/KDE/3.5/kdelibs) (revision 589209)
+--- kate/part/kateautoindent.h (.../tags/KDE/3.5.4/kdelibs) (revision 590241)
++++ kate/part/kateautoindent.h (.../branches/KDE/3.5/kdelibs) (revision 590241)
@@ -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
@@ -770,8 +778,8 @@
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 589209)
-@@ -0,0 +1,186 @@
++++ kate/part/test_regression.h (.../branches/KDE/3.5/kdelibs) (revision 590241)
+@@ -0,0 +1,249 @@
+/**
+ * This file is part of the KDE project
+ *
@@ -816,6 +824,8 @@
+ class URLArgs;
+}
+
++class OutputObject;
++
+/**
+ * @internal
+ * The backbone of Kate's automatic regression tests.
@@ -834,6 +844,11 @@
+ KJS::Object document() const { return *m_document; }
+ /** returns the view scope */
+ KJS::Object view() const { return *m_view; }
++ /** returns the output object */
++ OutputObject *output() const { return m_output; }
++
++ protected:
++ OutputObject *m_output;
+};
+
+/**
@@ -867,12 +882,63 @@
+ bool implementsCall() const;
+ KJS::Value call(KJS::ExecState *exec, KJS::Object &thisObj, const KJS::List &args);
+
-+ enum { KeyReturn, Type };
++ enum { KeyReturn, Type, Backspace, DeleteWordLeft, KeyDelete,
++ DeleteWordRight, Transpose, CursorLeft, ShiftCursorLeft, CursorRight,
++ ShiftCursorRight, WordLeft, ShiftWordLeft, WordRight, ShiftWordRight,
++ Home, ShiftHome, End, ShiftEnd, Up, ShiftUp, Down, ShiftDown, ScrollUp,
++ ScrollDown, TopOfView, ShiftTopOfView, BottomOfView, ShiftBottomOfView,
++ PageUp, ShiftPageUp, PageDown, ShiftPageDown, Top, ShiftTop, Bottom,
++ ShiftBottom, ToMatchingBracket, ShiftToMatchingBracket };
+ private:
+ KateView *m_view;
+ int id;
+};
+
++class OutputFunction;
++
++/**
++ * Customizing output to result-files. Writing any output into result files
++ * inhibits outputting the content of the katepart after script execution, enabling one to check for coordinates and the like.
++ * @internal
++ */
++class OutputObject : public KJS::ObjectImp
++{
++ public:
++ OutputObject(KJS::ExecState *exec, KateDocument *d, KateView *v);
++ virtual ~OutputObject();
++
++ virtual KJS::UString className() const;
++
++ void setChangedFlag(bool *flag) { changed = flag; }
++ void setOutputString(QString *s) { outstr = s; }
++
++ private:
++ KateDocument *doc;
++ KateView *view;
++ bool *changed;
++ QString *outstr;
++
++ friend class OutputFunction;
++};
++
++/**
++ * Customizing output to result-files.
++ * @internal
++ */
++class OutputFunction : public KJS::ObjectImp
++{
++ public:
++ OutputFunction(KJS::ExecState *exec, OutputObject *obj, int _id, int length);
++
++ bool implementsCall() const;
++ virtual KJS::Value call(KJS::ExecState *exec, KJS::Object &thisObj, const KJS::List &args);
++
++ enum { Write, Writeln, WriteCursorPosition, WriteCursorPositionln };
++ private:
++ OutputObject *o;
++ int id;
++};
++
+/**
+ * @internal
+ */
@@ -881,8 +947,9 @@
+ Q_OBJECT
+public:
+
-+ RegressionTest(KateDocument *part, const QString &baseDir,
-+ const QString &outputDir, bool _genOutput);
++ RegressionTest(KateDocument *part, KConfig *baseConfig,
++ const QString &baseDir, const QString &outputDir,
++ bool _genOutput);
+ ~RegressionTest();
+
+ enum OutputType { ResultDocument };
@@ -893,7 +960,8 @@
+ bool runTests(QString relPath = QString::null, bool mustExist = false, int known_failure = NoFailure);
+ bool reportResult( bool passed, const QString & description = QString::null, bool *newfailure = 0 );
+ bool reportResult(CheckResult result, const QString & description = QString::null, bool *newfailure = 0 );
-+ void createMissingDirs(const QString &path);
++ void rereadConfig();
++ static void createMissingDirs(const QString &path);
+
+ void setFailureSnapshotConfig(KConfig *cfg, const QString &snapshotname);
+ void setFailureSnapshotSaver(KConfig *cfg, const QString &snapshotname);
@@ -903,6 +971,7 @@
+
+ KateDocument *m_part;
+ KateView *m_view;
++ KConfig *m_baseConfig;
+ QString m_baseDir;
+ QString m_outputDir;
+ bool m_genOutput;
@@ -927,6 +996,8 @@
+ bool saw_failure;
+ bool ignore_errors;
+ int m_known_failures;
++ bool m_outputCustomised;
++ QString m_outputString;
+
+ static RegressionTest *curr;
+
@@ -960,8 +1031,8 @@
+#endif
Index: kate/part/katedialogs.h
===================================================================
---- kate/part/katedialogs.h (.../tags/KDE/3.5.4/kdelibs) (revision 589209)
-+++ kate/part/katedialogs.h (.../branches/KDE/3.5/kdelibs) (revision 589209)
+--- kate/part/katedialogs.h (.../tags/KDE/3.5.4/kdelibs) (revision 590241)
++++ kate/part/katedialogs.h (.../branches/KDE/3.5/kdelibs) (revision 590241)
@@ -122,7 +122,7 @@
void indenterSelected (int);
@@ -973,8 +1044,8 @@
KIntNumInput *indentationWidth;
Index: kate/part/kateviewhelpers.cpp
===================================================================
---- kate/part/kateviewhelpers.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 589209)
-+++ kate/part/kateviewhelpers.cpp (.../branches/KDE/3.5/kdelibs) (revision 589209)
+--- kate/part/kateviewhelpers.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 590241)
++++ kate/part/kateviewhelpers.cpp (.../branches/KDE/3.5/kdelibs) (revision 590241)
@@ -583,7 +583,7 @@
".+++++++++.",
"..........."};
@@ -1006,8 +1077,8 @@
uint endz = startz + 1 + (height / h);
Index: kate/part/configure.in.in
===================================================================
---- kate/part/configure.in.in (.../tags/KDE/3.5.4/kdelibs) (revision 589209)
-+++ kate/part/configure.in.in (.../branches/KDE/3.5/kdelibs) (revision 589209)
+--- kate/part/configure.in.in (.../tags/KDE/3.5.4/kdelibs) (revision 590241)
++++ kate/part/configure.in.in (.../branches/KDE/3.5/kdelibs) (revision 590241)
@@ -4,6 +4,9 @@
HAVE_LUA=""
@@ -1038,8 +1109,8 @@
Index: kate/part/kateconfig.cpp
===================================================================
---- kate/part/kateconfig.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 589209)
-+++ kate/part/kateconfig.cpp (.../branches/KDE/3.5/kdelibs) (revision 589209)
+--- kate/part/kateconfig.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 590241)
++++ kate/part/kateconfig.cpp (.../branches/KDE/3.5/kdelibs) (revision 590241)
@@ -168,7 +168,8 @@
| KateDocumentConfig::cfKeepIndentProfile
| KateDocumentConfig::cfWrapCursor
@@ -1052,8 +1123,8 @@
Index: kate/part/kateviewinternal.cpp
===================================================================
---- kate/part/kateviewinternal.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 589209)
-+++ kate/part/kateviewinternal.cpp (.../branches/KDE/3.5/kdelibs) (revision 589209)
+--- kate/part/kateviewinternal.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 590241)
++++ kate/part/kateviewinternal.cpp (.../branches/KDE/3.5/kdelibs) (revision 590241)
@@ -870,7 +870,10 @@
void KateViewInternal::updateMicroFocusHint()
{
@@ -1156,8 +1227,8 @@
}
Index: kate/part/katecodecompletion.h
===================================================================
---- kate/part/katecodecompletion.h (.../tags/KDE/3.5.4/kdelibs) (revision 589209)
-+++ kate/part/katecodecompletion.h (.../branches/KDE/3.5/kdelibs) (revision 589209)
+--- kate/part/katecodecompletion.h (.../tags/KDE/3.5.4/kdelibs) (revision 590241)
++++ kate/part/katecodecompletion.h (.../branches/KDE/3.5/kdelibs) (revision 590241)
@@ -72,6 +72,7 @@
public:
@@ -1168,8 +1239,8 @@
Index: kate/part/kateautoindent.cpp
===================================================================
---- kate/part/kateautoindent.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 589209)
-+++ kate/part/kateautoindent.cpp (.../branches/KDE/3.5/kdelibs) (revision 589209)
+--- kate/part/kateautoindent.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 590241)
++++ kate/part/kateautoindent.cpp (.../branches/KDE/3.5/kdelibs) (revision 590241)
@@ -31,6 +31,8 @@
#include <kdebug.h>
#include <kpopupmenu.h>
@@ -1513,8 +1584,8 @@
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 589209)
-@@ -0,0 +1,1127 @@
++++ kate/part/test_regression.cpp (.../branches/KDE/3.5/kdelibs) (revision 590241)
+@@ -0,0 +1,1344 @@
+/**
+ * This file is part of the KDE project
+ *
@@ -1604,14 +1675,23 @@
+
+ *m_view = KJS::Object(wv);
+ *m_document = KJS::Object(wd);
++ m_output = new OutputObject(exec, part, v);
++ m_output->ref();
+
++ // recreate properties
++ m_interpreter->globalObject().put(exec, "document", *m_document);
++ m_interpreter->globalObject().put(exec, "view", *m_view);
++ // create new properties
++ m_interpreter->globalObject().put(exec, "output", KJS::Object(m_output));
+ // add convenience shortcuts
+ m_interpreter->globalObject().put(exec, "d", *m_document);
+ m_interpreter->globalObject().put(exec, "v", *m_view);
-+
++ m_interpreter->globalObject().put(exec, "out", KJS::Object(m_output));
++ m_interpreter->globalObject().put(exec, "o", KJS::Object(m_output));
+}
+
+TestJScriptEnv::~TestJScriptEnv() {
++ m_output->deref();
+}
+
+//END TestJScriptEnv
@@ -1621,11 +1701,66 @@
+KateViewObject::KateViewObject(ExecState *exec, KateView *v, ObjectImp *fallback)
+ : view(v), fallback(fallback)
+{
++// put a function
++#define PUT_FUNC(name, enumval) \
++ putDirect(#name, new KateViewFunction(exec,v,KateViewFunction::enumval,1), DontEnum)
+ 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);
++ PUT_FUNC(keyReturn, KeyReturn);
++ PUT_FUNC(enter, KeyReturn);
++ PUT_FUNC(type, Type);
++ PUT_FUNC(keyDelete, KeyDelete);
++ PUT_FUNC(deleteWordRight, DeleteWordRight);
++ PUT_FUNC(transpose, Transpose);
++ PUT_FUNC(cursorLeft, CursorLeft);
++ PUT_FUNC(cursorPrev, CursorLeft);
++ PUT_FUNC(left, CursorLeft);
++ PUT_FUNC(prev, CursorLeft);
++ PUT_FUNC(shiftCursorLeft, ShiftCursorLeft);
++ PUT_FUNC(shiftCursorPrev, ShiftCursorLeft);
++ PUT_FUNC(shiftLeft, ShiftCursorLeft);
++ PUT_FUNC(shiftPrev, ShiftCursorLeft);
++ PUT_FUNC(cursorRight, CursorRight);
++ PUT_FUNC(cursorNext, CursorRight);
++ PUT_FUNC(right, CursorRight);
++ PUT_FUNC(next, CursorRight);
++ PUT_FUNC(shiftCursorRight, ShiftCursorRight);
++ PUT_FUNC(shiftCursorNext, ShiftCursorRight);
++ PUT_FUNC(shiftRight, ShiftCursorRight);
++ PUT_FUNC(shiftNext, ShiftCursorRight);
++ PUT_FUNC(wordLeft, WordLeft);
++ PUT_FUNC(wordPrev, WordLeft);
++ PUT_FUNC(shiftWordLeft, ShiftWordLeft);
++ PUT_FUNC(shiftWordPrev, ShiftWordLeft);
++ PUT_FUNC(wordRight, WordRight);
++ PUT_FUNC(wordNext, WordRight);
++ PUT_FUNC(shiftWordRight, ShiftWordRight);
++ PUT_FUNC(shiftWordNext, ShiftWordRight);
++ PUT_FUNC(home, Home);
++ PUT_FUNC(shiftHome, ShiftHome);
++ PUT_FUNC(end, End);
++ PUT_FUNC(shiftEnd, ShiftEnd);
++ PUT_FUNC(up, Up);
++ PUT_FUNC(shiftUp, ShiftUp);
++ PUT_FUNC(down, Down);
++ PUT_FUNC(shiftDown, ShiftDown);
++ PUT_FUNC(scrollUp, ScrollUp);
++ PUT_FUNC(scrollDown, ScrollDown);
++ PUT_FUNC(topOfView, TopOfView);
++ PUT_FUNC(shiftTopOfView, ShiftTopOfView);
++ PUT_FUNC(bottomOfView, BottomOfView);
++ PUT_FUNC(shiftBottomOfView, ShiftBottomOfView);
++ PUT_FUNC(pageUp, PageUp);
++ PUT_FUNC(shiftPageUp, ShiftPageUp);
++ PUT_FUNC(pageDown, PageDown);
++ PUT_FUNC(shiftPageDown, ShiftPageDown);
++ PUT_FUNC(top, Top);
++ PUT_FUNC(shiftTop, ShiftTop);
++ PUT_FUNC(bottom, Bottom);
++ PUT_FUNC(shiftBottom, ShiftBottom);
++ PUT_FUNC(toMatchingBracket, ToMatchingBracket);
++ PUT_FUNC(shiftToMatchingBracket, ShiftToMatchingBracket);
++#undef PUT_FUNC
+}
+
+KateViewObject::~KateViewObject()
@@ -1665,26 +1800,154 @@
+
+Value KateViewFunction::call(ExecState *exec, Object &/*thisObj*/, const List &args)
+{
-+ Value result = Undefined();
-+
-+ switch (id) {
-+ case KeyReturn: {
-+ m_view->keyReturn();
-+ break;
++ // calls a function repeatedly as specified by its first parameter (once
++ // if not specified).
++#define REP_CALL(enumval, func) \
++ case enumval: {\
++ int cnt = 1;\
++ if (args.size() > 0) cnt = args[0].toInt32(exec);\
++ while (cnt-- > 0) { m_view->func(); }\
++ return Undefined();\
+ }
++ switch (id) {
++ REP_CALL(KeyReturn, keyReturn);
++ REP_CALL(KeyDelete, keyDelete);
++ REP_CALL(DeleteWordRight, deleteWordRight);
++ REP_CALL(Transpose, transpose);
++ REP_CALL(CursorLeft, cursorLeft);
++ REP_CALL(ShiftCursorLeft, shiftCursorLeft);
++ REP_CALL(CursorRight, cursorRight);
++ REP_CALL(ShiftCursorRight, shiftCursorRight);
++ REP_CALL(WordLeft, wordLeft);
++ REP_CALL(ShiftWordLeft, shiftWordLeft);
++ REP_CALL(WordRight, wordRight);
++ REP_CALL(ShiftWordRight, shiftWordRight);
++ REP_CALL(Home, home);
++ REP_CALL(ShiftHome, shiftHome);
++ REP_CALL(End, end);
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/kdelibs-branch.diff?r1=1.34&r2=1.35&f=u
More information about the pld-cvs-commit
mailing list