SOURCES: kdelibs-branch.diff - updated
arekm
arekm at pld-linux.org
Fri Sep 15 12:37:15 CEST 2006
Author: arekm Date: Fri Sep 15 10:37:15 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated
---- Files affected:
SOURCES:
kdelibs-branch.diff (1.30 -> 1.31)
---- Diffs:
================================================================
Index: SOURCES/kdelibs-branch.diff
diff -u SOURCES/kdelibs-branch.diff:1.30 SOURCES/kdelibs-branch.diff:1.31
--- SOURCES/kdelibs-branch.diff:1.30 Sat Sep 9 20:42:56 2006
+++ SOURCES/kdelibs-branch.diff Fri Sep 15 12:37:09 2006
@@ -1,7 +1,7 @@
Index: interfaces/kscript/sample/shellscript.desktop
===================================================================
---- 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)
+--- interfaces/kscript/sample/shellscript.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 584592)
++++ interfaces/kscript/sample/shellscript.desktop (.../branches/KDE/3.5/kdelibs) (revision 584592)
@@ -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 582545)
-+++ interfaces/kscript/scriptinterface.desktop (.../branches/KDE/3.5/kdelibs) (revision 582545)
+--- interfaces/kscript/scriptinterface.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 584592)
++++ interfaces/kscript/scriptinterface.desktop (.../branches/KDE/3.5/kdelibs) (revision 584592)
@@ -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 582545)
-+++ interfaces/kimproxy/interface/dcopinstantmessenger.desktop (.../branches/KDE/3.5/kdelibs) (revision 582545)
+--- interfaces/kimproxy/interface/dcopinstantmessenger.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 584592)
++++ interfaces/kimproxy/interface/dcopinstantmessenger.desktop (.../branches/KDE/3.5/kdelibs) (revision 584592)
@@ -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 582545)
-+++ interfaces/kimproxy/interface/kcm_instantmessenger.desktop (.../branches/KDE/3.5/kdelibs) (revision 582545)
+--- interfaces/kimproxy/interface/kcm_instantmessenger.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 584592)
++++ interfaces/kimproxy/interface/kcm_instantmessenger.desktop (.../branches/KDE/3.5/kdelibs) (revision 584592)
@@ -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 582545)
-+++ interfaces/kspeech/dcoptexttospeech.desktop (.../branches/KDE/3.5/kdelibs) (revision 582545)
+--- interfaces/kspeech/dcoptexttospeech.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 584592)
++++ interfaces/kspeech/dcoptexttospeech.desktop (.../branches/KDE/3.5/kdelibs) (revision 584592)
@@ -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 582545)
-+++ interfaces/ktexteditor/ktexteditoreditor.desktop (.../branches/KDE/3.5/kdelibs) (revision 582545)
+--- interfaces/ktexteditor/ktexteditoreditor.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 584592)
++++ interfaces/ktexteditor/ktexteditoreditor.desktop (.../branches/KDE/3.5/kdelibs) (revision 584592)
@@ -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 582545)
-+++ interfaces/ktexteditor/kcm_ktexteditor.desktop (.../branches/KDE/3.5/kdelibs) (revision 582545)
+--- interfaces/ktexteditor/kcm_ktexteditor.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 584592)
++++ interfaces/ktexteditor/kcm_ktexteditor.desktop (.../branches/KDE/3.5/kdelibs) (revision 584592)
@@ -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 582545)
-+++ interfaces/ktexteditor/ktexteditor.desktop (.../branches/KDE/3.5/kdelibs) (revision 582545)
+--- interfaces/ktexteditor/ktexteditor.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 584592)
++++ interfaces/ktexteditor/ktexteditor.desktop (.../branches/KDE/3.5/kdelibs) (revision 584592)
@@ -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 582545)
-+++ interfaces/ktexteditor/ktexteditorplugin.desktop (.../branches/KDE/3.5/kdelibs) (revision 582545)
+--- interfaces/ktexteditor/ktexteditorplugin.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 584592)
++++ interfaces/ktexteditor/ktexteditorplugin.desktop (.../branches/KDE/3.5/kdelibs) (revision 584592)
@@ -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 582545)
-+++ kate/plugins/kdatatool/ktexteditor_kdatatool.desktop (.../branches/KDE/3.5/kdelibs) (revision 582545)
+--- kate/plugins/kdatatool/ktexteditor_kdatatool.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 584592)
++++ kate/plugins/kdatatool/ktexteditor_kdatatool.desktop (.../branches/KDE/3.5/kdelibs) (revision 584592)
@@ -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 582545)
-+++ kate/plugins/insertfile/ktexteditor_insertfile.desktop (.../branches/KDE/3.5/kdelibs) (revision 582545)
+--- kate/plugins/insertfile/ktexteditor_insertfile.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 584592)
++++ kate/plugins/insertfile/ktexteditor_insertfile.desktop (.../branches/KDE/3.5/kdelibs) (revision 584592)
@@ -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 582545)
-+++ kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop (.../branches/KDE/3.5/kdelibs) (revision 582545)
+--- kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 584592)
++++ kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop (.../branches/KDE/3.5/kdelibs) (revision 584592)
@@ -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 582545)
-+++ kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop (.../branches/KDE/3.5/kdelibs) (revision 582545)
+--- kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 584592)
++++ kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop (.../branches/KDE/3.5/kdelibs) (revision 584592)
@@ -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 582545)
-+++ kate/plugins/isearch/ktexteditor_isearch.desktop (.../branches/KDE/3.5/kdelibs) (revision 582545)
+--- kate/plugins/isearch/ktexteditor_isearch.desktop (.../tags/KDE/3.5.4/kdelibs) (revision 584592)
++++ kate/plugins/isearch/ktexteditor_isearch.desktop (.../branches/KDE/3.5/kdelibs) (revision 584592)
@@ -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 582545)
-+++ kate/part/kateconfig.h (.../branches/KDE/3.5/kdelibs) (revision 582545)
+--- kate/part/kateconfig.h (.../tags/KDE/3.5.4/kdelibs) (revision 584592)
++++ kate/part/kateconfig.h (.../branches/KDE/3.5/kdelibs) (revision 584592)
@@ -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 582545)
-+++ kate/part/katedocument.h (.../branches/KDE/3.5/kdelibs) (revision 582545)
+--- kate/part/katedocument.h (.../tags/KDE/3.5.4/kdelibs) (revision 584592)
++++ kate/part/katedocument.h (.../branches/KDE/3.5/kdelibs) (revision 584592)
@@ -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 582545)
-+++ kate/part/katedocument.cpp (.../branches/KDE/3.5/kdelibs) (revision 582545)
+--- kate/part/katedocument.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 584592)
++++ kate/part/katedocument.cpp (.../branches/KDE/3.5/kdelibs) (revision 584592)
@@ -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 582545)
-+++ kate/part/kateautoindent.h (.../branches/KDE/3.5/kdelibs) (revision 582545)
+--- kate/part/kateautoindent.h (.../tags/KDE/3.5.4/kdelibs) (revision 584592)
++++ kate/part/kateautoindent.h (.../branches/KDE/3.5/kdelibs) (revision 584592)
@@ -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
@@ -722,8 +722,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 582545)
-@@ -0,0 +1,172 @@
++++ kate/part/test_regression.h (.../branches/KDE/3.5/kdelibs) (revision 584592)
+@@ -0,0 +1,186 @@
+/**
+ * This file is part of the KDE project
+ *
@@ -841,12 +841,15 @@
+ 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 );
++ enum FailureType { NoFailure = 0, AllFailure = 1, ResultFailure = 4, NewFailure = 65536 };
++ 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 setFailureSnapshotConfig(KConfig *cfg, const QString &snapshotname);
++ void setFailureSnapshotSaver(KConfig *cfg, const QString &snapshotname);
++
+ void createLink( const QString& test, int failures );
+ void doFailureReport( const QString& test, int failures );
+
@@ -856,6 +859,8 @@
+ QString m_outputDir;
+ bool m_genOutput;
+ QString m_currentBase;
++ KConfig *m_failureComp;
++ KConfig *m_failureSave;
+
+ QString m_currentOutput;
+ QString m_currentCategory;
@@ -866,8 +871,10 @@
+ bool m_showGui;
+ int m_passes_work;
+ int m_passes_fail;
++ int m_passes_new;
+ int m_failures_work;
+ int m_failures_fail;
++ int m_failures_new;
+ int m_errors;
+ bool saw_failure;
+ bool ignore_errors;
@@ -888,6 +895,13 @@
+ * @return true if script was valid, false otherwise
+ */
+ bool evalJS( KJS::Interpreter &interp, const QString &filename, bool ignore = false);
++ /**
++ * concatenate contents of all list files down to but not including the
++ * tests directory.
++ * @param relPath relative path against tests-directory
++ * @param filename file name of the list files
++ */
++ QStringList concatListFiles(const QString &relPath, const QString &filename);
+
+private slots:
+ void slotOpenURL(const KURL &url, const KParts::URLArgs &args);
@@ -898,8 +912,8 @@
+#endif
Index: kate/part/katedialogs.h
===================================================================
---- kate/part/katedialogs.h (.../tags/KDE/3.5.4/kdelibs) (revision 582545)
-+++ kate/part/katedialogs.h (.../branches/KDE/3.5/kdelibs) (revision 582545)
+--- kate/part/katedialogs.h (.../tags/KDE/3.5.4/kdelibs) (revision 584592)
++++ kate/part/katedialogs.h (.../branches/KDE/3.5/kdelibs) (revision 584592)
@@ -122,7 +122,7 @@
void indenterSelected (int);
@@ -911,8 +925,8 @@
KIntNumInput *indentationWidth;
Index: kate/part/kateviewhelpers.cpp
===================================================================
---- kate/part/kateviewhelpers.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 582545)
-+++ kate/part/kateviewhelpers.cpp (.../branches/KDE/3.5/kdelibs) (revision 582545)
+--- kate/part/kateviewhelpers.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 584592)
++++ kate/part/kateviewhelpers.cpp (.../branches/KDE/3.5/kdelibs) (revision 584592)
@@ -583,7 +583,7 @@
".+++++++++.",
"..........."};
@@ -944,8 +958,8 @@
uint endz = startz + 1 + (height / h);
Index: kate/part/kateconfig.cpp
===================================================================
---- kate/part/kateconfig.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 582545)
-+++ kate/part/kateconfig.cpp (.../branches/KDE/3.5/kdelibs) (revision 582545)
+--- kate/part/kateconfig.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 584592)
++++ kate/part/kateconfig.cpp (.../branches/KDE/3.5/kdelibs) (revision 584592)
@@ -168,7 +168,8 @@
| KateDocumentConfig::cfKeepIndentProfile
| KateDocumentConfig::cfWrapCursor
@@ -958,9 +972,78 @@
Index: kate/part/kateviewinternal.cpp
===================================================================
---- 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 @@
+--- kate/part/kateviewinternal.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 584592)
++++ kate/part/kateviewinternal.cpp (.../branches/KDE/3.5/kdelibs) (revision 584592)
+@@ -870,7 +870,10 @@
+ void KateViewInternal::updateMicroFocusHint()
+ {
+ int line = displayViewLine(displayCursor, true);
+- if (line == -1)
++ /* Check for hasFocus() to avoid crashes in QXIMInputContext as in bug #131266.
++ This is only a workaround until somebody can find the real reason of the crash
++ (probably it's in Qt). */
++ if (line == -1 || !hasFocus())
+ return;
+
+ KateRenderer *renderer = m_view->renderer();
+@@ -1258,20 +1261,17 @@
+ m_view->m_codeCompletion->handleKey(&e);
+ return;
+ }
+-
+- // FIXME: Both "smart end" and "smart home" use the current range's last/first character
+- // when jumping to the "absolute" extreme. For 4.0 and 3.5.5 (kling)
+- bool alreadyAtEndOfLine = false;
+
+- if (m_view->dynWordWrap() && currentRange().wrap) {
++ KateLineRange range = currentRange();
++
++ if (m_view->dynWordWrap() && range.wrap) {
+ // Allow us to go to the real end if we're already at the end of the view line
+- if (cursor.col() < currentRange().endCol - 1) {
+- KateTextCursor c(cursor.line(), currentRange().endCol - 1);
++ if (cursor.col() < range.endCol - 1) {
++ KateTextCursor c(cursor.line(), range.endCol - 1);
+ updateSelection( c, sel );
+ updateCursor( c );
+ return;
+ }
+- alreadyAtEndOfLine = true;
+ }
+
+ if( !(m_doc->configFlags() & KateDocument::cfSmartHome) ) {
+@@ -1286,23 +1286,16 @@
+
+ // "Smart End", as requested in bugs #78258 and #106970
+ KateTextCursor c = cursor;
+- int lc = l->lastChar();
+
+- // Apparently, currentRange().endCol differs by 1 depending on m_view->dynWordWrap()...
+- int endOfLine = currentRange().endCol - (m_view->dynWordWrap() ? 1 : 0);
+-
+- if (lc < 0 || c.col() == (lc + 1)) {
+- if (alreadyAtEndOfLine) {
+- moveEdge(right, sel);
+- return;
+- }
+- c.setCol(endOfLine);
++ // If the cursor is already the real end, jump to last non-space character.
++ // Otherwise, go to the real end ... obviously.
++ if (c.col() == m_doc->lineLength(c.line())) {
++ c.setCol(l->lastChar() + 1);
++ updateSelection(c, sel);
++ updateCursor(c, true);
+ } else {
+- c.setCol(lc + 1);
++ moveEdge(right, sel);
+ }
+-
+- updateSelection( c, sel );
+- updateCursor( c, true );
+ }
+
+ KateLineRange KateViewInternal::range(int realLine, const KateLineRange* previous)
+@@ -2682,8 +2675,6 @@
selStartCached = m_view->selectStart;
selEndCached = m_view->selectEnd;
@@ -969,7 +1052,7 @@
e->accept ();
return;
}
-@@ -2746,6 +2744,11 @@
+@@ -2746,6 +2737,11 @@
selectAnchor = KateTextCursor (m_view->selEndLine(), m_view->selEndCol());
selStartCached = m_view->selectStart;
selEndCached = m_view->selectEnd;
@@ -981,7 +1064,7 @@
}
// Move cursor to end of selected word
-@@ -2755,9 +2758,6 @@
+@@ -2755,9 +2751,6 @@
m_view->copy();
QApplication::clipboard()->setSelectionMode( false );
@@ -993,8 +1076,8 @@
}
Index: kate/part/kateautoindent.cpp
===================================================================
---- kate/part/kateautoindent.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 582545)
-+++ kate/part/kateautoindent.cpp (.../branches/KDE/3.5/kdelibs) (revision 582545)
+--- kate/part/kateautoindent.cpp (.../tags/KDE/3.5.4/kdelibs) (revision 584592)
++++ kate/part/kateautoindent.cpp (.../branches/KDE/3.5/kdelibs) (revision 584592)
@@ -31,6 +31,8 @@
#include <kdebug.h>
#include <kpopupmenu.h>
@@ -1309,8 +1392,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 582545)
-@@ -0,0 +1,1022 @@
++++ kate/part/test_regression.cpp (.../branches/KDE/3.5/kdelibs) (revision 584592)
+@@ -0,0 +1,1127 @@
+/**
+ * This file is part of the KDE project
+ *
@@ -1382,6 +1465,7 @@
+#include <kparts/browserextension.h>
+#include "katejscript.h"
+#include "katedocumenthelpers.h"
++#include "kateconfig.h"
+#include "../interfaces/katecmd.h"
+
+using namespace KJS;
@@ -1482,15 +1566,26 @@
+
+// -------------------------------------------------------------------------
+
++const char failureSnapshotPrefix[] = "testkateregressionrc-FS.";
++
++static QString findMostRecentFailureSnapshot() {
++ QDir dir(kapp->dirs()->saveLocation("config"),
++ QString(failureSnapshotPrefix)+"*",
++ QDir::Time, QDir::Files);
++ return dir[0].mid(sizeof failureSnapshotPrefix - 1);
++}
++
+static KCmdLineOptions options[] =
+{
+ { "b", 0, 0 },
+ { "base <base_dir>", "Directory containing tests, basedir and output directories.", 0},
++ { "cmp-failures <snapshot>", "Compare failures of this testrun against snapshot <snapshot>. Defaults to the most recently captured failure snapshot or none if none exists.", 0 },
+ { "d", 0, 0 },
+ { "debug", "Do not supress debug output", 0},
+ { "g", 0, 0 } ,
+ { "genoutput", "Regenerate baseline (instead of checking)", 0 } ,
+ { "keep-output", "Keep output files even on success", 0 },
++ { "save-failures <snapshot>", "Save failures of this testrun as failure snapshot <snapshot>", 0 },
+ { "s", 0, 0 } ,
+ { "show", "Show the window while running tests", 0 } ,
+ { "t", 0, 0 } ,
@@ -1573,31 +1668,30 @@
+ KApplication a;
+ a.disableAutoDcopRegistration();
+ a.setStyle("windows");
-+#if 0
-+ KSimpleConfig sc1( "cryptodefaults" );
-+ sc1.setGroup( "Warnings" );
-+ sc1.writeEntry( "OnUnencrypted", false );
-+ a.config()->setGroup( "Notification Messages" );
-+ a.config()->writeEntry( "kjscupguard_alarmhandler", true );
-+ a.config()->setGroup("HTML Settings");
-+ a.config()->writeEntry("ReportJSErrors", false);
-+ KConfig cfg( "khtmlrc" );
-+ cfg.setGroup("HTML Settings");
-+ cfg.writeEntry( "StandardFont", HTML_DEFAULT_VIEW_SANSSERIF_FONT );
-+ cfg.writeEntry( "FixedFont", HTML_DEFAULT_VIEW_FIXED_FONT );
-+ cfg.writeEntry( "SerifFont", HTML_DEFAULT_VIEW_SERIF_FONT );
-+ cfg.writeEntry( "SansSerifFont", HTML_DEFAULT_VIEW_SANSSERIF_FONT );
-+ cfg.writeEntry( "CursiveFont", HTML_DEFAULT_VIEW_CURSIVE_FONT );
-+ cfg.writeEntry( "FantasyFont", HTML_DEFAULT_VIEW_FANTASY_FONT );
-+ cfg.writeEntry( "MinimumFontSize", HTML_DEFAULT_MIN_FONT_SIZE );
-+ cfg.writeEntry( "MediumFontSize", 10 );
-+ cfg.writeEntry( "Fonts", QStringList() );
-+ cfg.writeEntry( "DefaultEncoding", "" );
-+ cfg.setGroup("Java/JavaScript Settings");
-+ cfg.writeEntry( "WindowOpenPolicy", KHTMLSettings::KJSWindowOpenAllow);
-+
++ KSimpleConfig cfg( "testkateregressionrc" );
++ cfg.setGroup("Kate Document Defaults");
++ cfg.writeEntry("Basic Config Flags",
++ KateDocumentConfig::cfBackspaceIndents
++// | KateDocumentConfig::cfWordWrap
++// | KateDocumentConfig::cfRemoveSpaces
++ | KateDocumentConfig::cfWrapCursor
++// | KateDocumentConfig::cfAutoBrackets
++// | KateDocumentConfig::cfTabIndentsMode
++// | KateDocumentConfig::cfOvr
++ | KateDocumentConfig::cfKeepIndentProfile
++ | KateDocumentConfig::cfKeepExtraSpaces
++ | KateDocumentConfig::cfTabIndents
++ | KateDocumentConfig::cfShowTabs
++ | KateDocumentConfig::cfSpaceIndent
++ | KateDocumentConfig::cfSmartHome
++ | KateDocumentConfig::cfTabInsertsTab
++// | KateDocumentConfig::cfReplaceTabsDyn
++// | KateDocumentConfig::cfRemoveTrailingDyn
++ | KateDocumentConfig::cfDoxygenAutoTyping
++// | KateDocumentConfig::cfMixedIndent
++ | KateDocumentConfig::cfIndentPastedText
++ );
+ cfg.sync();
-+#endif
+
+ int rv = 1;
+
@@ -1609,7 +1703,7 @@
+ 13040, 13050, 13051, 7000, 7006, 170,
+ 171, 7101, 7002, 7019, 7027, 7014,
+ 7001, 7011, 6070, 6080, 6090, 0};
-+ int channel = args->isSet( "debug" ) ? 0 : 4;
++ int channel = args->isSet( "debug" ) ? 2 : 4;
+ for ( int i = 0; areas[i]; ++i ) {
+ dc.setGroup( QString::number( areas[i] ) );
+ dc.writeEntry( "InfoOutput", channel );
@@ -1627,9 +1721,12 @@
+ /*bReadOnly*/false,
+ /*parentWidget*/toplevel,
+ /*widgetName*/"testkate");
++ part->readConfig(&cfg);
+
+ toplevel->setCentralWidget( part->widget() );
+
++ Q_ASSERT(part->config()->configFlags() & KateDocumentConfig::cfDoxygenAutoTyping);
++
+ bool visual = false;
+ if (args->isSet("show"))
+ visual = true;
@@ -1663,6 +1760,23 @@
+ regressionTest->m_keepOutput = args->isSet("keep-output");
+ regressionTest->m_showGui = args->isSet("show");
+
++ {
++ QString failureSnapshot = args->getOption("cmp-failures");
++ if (failureSnapshot.isEmpty())
++ failureSnapshot = findMostRecentFailureSnapshot();
++ if (!failureSnapshot.isEmpty())
++ regressionTest->setFailureSnapshotConfig(
++ new KSimpleConfig(failureSnapshotPrefix + failureSnapshot, true),
++ failureSnapshot);
++ }
++
++ if (args->isSet("save-failures")) {
++ QString failureSaver = args->getOption("save-failures");
++ regressionTest->setFailureSnapshotSaver(
++ new KSimpleConfig(failureSnapshotPrefix + failureSaver, false),
++ failureSaver);
++ }
++
+ bool result = false;
+ QCStringList tests = args->getOptionList("test");
+ // merge testcases specified on command line
@@ -1690,14 +1804,16 @@
+ regressionTest->m_errors);
+ printf("Passes: %d",regressionTest->m_passes_work);
+ if ( regressionTest->m_passes_fail )
-+ printf( " (%d unexpected passes)\n", regressionTest->m_passes_fail );
-+ else
-+ printf( "\n" );
++ printf( " (%d unexpected passes)", regressionTest->m_passes_fail );
++ if (regressionTest->m_passes_new)
++ printf(" (%d new since %s)", regressionTest->m_passes_new, regressionTest->m_failureComp->group().latin1());
++ printf( "\n" );
+ printf("Failures: %d",regressionTest->m_failures_work);
+ if ( regressionTest->m_failures_fail )
-+ printf( " (%d expected failures)\n", regressionTest->m_failures_fail );
-+ else
-+ printf( "\n" );
++ printf( " (%d expected failures)", regressionTest->m_failures_fail );
++ if ( regressionTest->m_failures_new )
++ printf(" (%d new since %s)", regressionTest->m_failures_new, regressionTest->m_failureComp->group().latin1());
++ printf( "\n" );
+ if ( regressionTest->m_errors )
+ printf("Errors: %d\n",regressionTest->m_errors);
+
@@ -1707,6 +1823,14 @@
+ link = QString( "<hr>%1 failures. (%2 expected failures)" )
+ .arg(regressionTest->m_failures_work )
+ .arg( regressionTest->m_failures_fail );
++ if (regressionTest->m_failures_new)
++ link += QString(" <span style=\"color:red;font-weight:bold\">(%1 new failures since %2)</span>")
++ .arg(regressionTest->m_failures_new)
++ .arg(regressionTest->m_failureComp->group());
++ if (regressionTest->m_passes_new)
++ link += QString(" <p style=\"color:green;font-weight:bold\">%1 new passes since %2</p>")
++ .arg(regressionTest->m_passes_new)
++ .arg(regressionTest->m_failureComp->group());
+ list.writeBlock( link.latin1(), link.length() );
+ list.close();
+ }
@@ -1746,9 +1870,11 @@
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/kdelibs-branch.diff?r1=1.30&r2=1.31&f=u
More information about the pld-cvs-commit
mailing list