packages: kde4-kdelibs/kde4-kdelibs-branch.diff - updated
shadzik
shadzik at pld-linux.org
Wed Oct 13 14:43:24 CEST 2010
Author: shadzik Date: Wed Oct 13 12:43:24 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- updated
---- Files affected:
packages/kde4-kdelibs:
kde4-kdelibs-branch.diff (1.22 -> 1.23)
---- Diffs:
================================================================
Index: packages/kde4-kdelibs/kde4-kdelibs-branch.diff
diff -u packages/kde4-kdelibs/kde4-kdelibs-branch.diff:1.22 packages/kde4-kdelibs/kde4-kdelibs-branch.diff:1.23
--- packages/kde4-kdelibs/kde4-kdelibs-branch.diff:1.22 Fri Sep 24 19:52:31 2010
+++ packages/kde4-kdelibs/kde4-kdelibs-branch.diff Wed Oct 13 14:43:19 2010
@@ -1,5631 +1,2579 @@
-Index: interfaces/kimproxy/interface/dbusinstantmessenger.desktop
+Index: doc/kded4/man-kded4.8.docbook
===================================================================
---- interfaces/kimproxy/interface/dbusinstantmessenger.desktop (.../tags/KDE/4.5.1/kdelibs) (wersja 1179155)
-+++ interfaces/kimproxy/interface/dbusinstantmessenger.desktop (.../branches/KDE/4.5/kdelibs) (wersja 1179155)
-@@ -34,7 +34,7 @@
- Comment[hne]=डी-बस इंटरफेस के साथ इंस्टैंट मैसेंजर
- Comment[hr]=Aplikacija za komunikaciju s D-Bus sučeljem
- Comment[hsb]=Instant Messenger z DCOP-interfejsom
--Comment[hu]=Azonnali üzenetküldő DBus felülettel
-+Comment[hu]=Azonnali üzenetküldő D-Bus felülettel
- Comment[ia]=Messagero Instante con interfacie D-Bus
- Comment[id]=Pesan Instan dengan antarmuka D-Bus
- Comment[is]=Spjallforrit með D-Bus viðmóti
-Index: knotify/config/knotifyconfigactionswidgetbase.ui
-===================================================================
---- knotify/config/knotifyconfigactionswidgetbase.ui (.../tags/KDE/4.5.1/kdelibs) (wersja 1179155)
-+++ knotify/config/knotifyconfigactionswidgetbase.ui (.../branches/KDE/4.5/kdelibs) (wersja 1179155)
-@@ -116,7 +116,7 @@
- </sizepolicy>
- </property>
- <property name="whatsThis" >
-- <string><qt>Specifies how KTTS should speak the event when received. If you select "Speak custom text", enter the text in the box. You may use the following substitution strings in the text:<dl><dt>%e</dt><dd>Name of the event</dd><dt>%a</dt><dd>Application that sent the event</dd><dt>%m</dt><dd>The message sent by the application</dd></dl></qt></string>
-+ <string><qt>Specifies how Jovie should speak the event when received. If you select "Speak custom text", enter the text in the box. You may use the following substitution strings in the text:<dl><dt>%e</dt><dd>Name of the event</dd><dt>%a</dt><dd>Application that sent the event</dd><dt>%m</dt><dd>The message sent by the application</dd></dl></qt></string>
- </property>
- <item>
- <property name="text" >
-@@ -138,7 +138,7 @@
- <item row="5" column="3" >
- <widget class="KLineEdit" name="KTTS_select" >
- <property name="whatsThis" >
-- <string><qt>Specifies how KTTS should speak the event when received. If you select "Speak custom text", enter the text in the box. You may use the following substitution strings in the text:<dl><dt>%e</dt><dd>Name of the event</dd><dt>%a</dt><dd>Application that sent the event</dd><dt>%m</dt><dd>The message sent by the application</dd></dl></qt></string>
-+ <string><qt>Specifies how Jovie should speak the event when received. If you select "Speak custom text", enter the text in the box. You may use the following substitution strings in the text:<dl><dt>%e</dt><dd>Name of the event</dd><dt>%a</dt><dd>Application that sent the event</dd><dt>%m</dt><dd>The message sent by the application</dd></dl></qt></string>
- </property>
- </widget>
- </item>
-Index: kate/search/katesearchbar.cpp
-===================================================================
---- kate/search/katesearchbar.cpp (.../tags/KDE/4.5.1/kdelibs) (wersja 1179155)
-+++ kate/search/katesearchbar.cpp (.../branches/KDE/4.5/kdelibs) (wersja 1179155)
-@@ -351,7 +351,9 @@
-
-
- void KateSearchBar::selectRange2(const KTextEditor::Range & range) {
-+ disconnect(m_view, SIGNAL(selectionChanged(KTextEditor::View *)), this, SLOT(updateSelectionOnly()));
- selectRange(m_view, range);
-+ connect(m_view, SIGNAL(selectionChanged(KTextEditor::View *)), this, SLOT(updateSelectionOnly()));
- }
-
-
-@@ -774,7 +776,7 @@
- }
-
- // Replace
-- const Range afterReplace = match.replace(*replacement, ++matchCounter);
-+ const Range afterReplace = match.replace(*replacement, false, ++matchCounter);
-
- // Highlight and continue after adjusted match
- //highlightReplacement(*afterReplace);
-Index: kate/search/kateregexpsearch.cpp
-===================================================================
---- kate/search/kateregexpsearch.cpp (.../tags/KDE/4.5.1/kdelibs) (wersja 1179155)
-+++ kate/search/kateregexpsearch.cpp (.../branches/KDE/4.5/kdelibs) (wersja 1179155)
-@@ -32,7 +32,7 @@
- // #define FAST_DEBUG_ENABLE
-
- #ifdef FAST_DEBUG_ENABLE
--# define FAST_DEBUG(x) (kDebug( 13020 ) << x)
-+# define FAST_DEBUG(x) kDebug( 13020 ) << x
- #else
- # define FAST_DEBUG(x)
- #endif
-@@ -246,7 +246,7 @@
- QVector<int> lineLens (inputLineCount);
-
- // first line
-- if (firstLineIndex < 0 || m_document->lines() >= firstLineIndex)
-+ if (firstLineIndex < 0 || m_document->lines() <= firstLineIndex)
- {
- QVector<KTextEditor::Range> result;
- result.append(KTextEditor::Range::invalid());
-@@ -265,7 +265,7 @@
- for (int i = 1; i < inputLineCount; i++)
- {
- const int lineNum = firstLineIndex + i;
-- if (lineNum < 0 || m_document->lines() >= lineNum)
-+ if (lineNum < 0 || m_document->lines() <= lineNum)
- {
- QVector<KTextEditor::Range> result;
- result.append(KTextEditor::Range::invalid());
-@@ -496,7 +496,8 @@
- const int numCaptures = regexp.numCaptures();
- QVector<KTextEditor::Range> result(1 + numCaptures);
- result[0] = KTextEditor::Range(j, foundAt, j, foundAt + regexp.matchedLength());
-- FAST_DEBUG("result range " << 0 << ": (" << j << ", " << foundAt << ")..(" << j << ", " << foundAt + myMatchLen << ")");
-+ FAST_DEBUG("result range " << 0 << ": (" << j << ", " << foundAt << ")..(" << j << ", " <<
-+ foundAt + regexp.matchedLength() << ")");
- for (int y = 1; y <= numCaptures; y++)
- {
- const int openIndex = regexp.pos(y);
-Index: kate/buffer/katetexthistory.h
-===================================================================
---- kate/buffer/katetexthistory.h (.../tags/KDE/4.5.1/kdelibs) (wersja 1179155)
-+++ kate/buffer/katetexthistory.h (.../branches/KDE/4.5/kdelibs) (wersja 1179155)
-@@ -99,6 +99,14 @@
- * @param moveOnInsert behavior of this cursor on insert of text at it's position
- */
- void transformCursor (int &line, int &column, bool moveOnInsert) const;
-+
-+ /**
-+ * reverse transform cursor for this history entry
-+ * @param line line number of the cursor to transform
-+ * @param column column number of the cursor to transform
-+ * @param moveOnInsert behavior of this cursor on insert of text at it's position
-+ */
-+ void reverseTransformCursor (int &line, int &column, bool moveOnInsert) const;
-
- /**
- * Types of entries, matching editing primitives of buffer and placeholder
-@@ -195,8 +203,9 @@
- /**
- * Notify about remove text at given range.
- * @param range range of text to remove, must be on one line only.
-+ * @param oldLineLength text length of the line before this remove
- */
-- void removeText (const KTextEditor::Range &range);
-+ void removeText (const KTextEditor::Range &range, int oldLineLength);
-
- /**
- * Generic function to add a entry to the history. Is used by the above functions for the different editing primitives.
-Index: kate/buffer/katetextblock.cpp
+--- doc/kded4/man-kded4.8.docbook (.../tags/KDE/4.5.2/kdelibs) (wersja 1185458)
++++ doc/kded4/man-kded4.8.docbook (.../branches/KDE/4.5/kdelibs) (wersja 1185458)
+@@ -62,7 +62,7 @@
+ <para>
+ It monitors the directories containing .desktop files.
+ When a file is added/removed, it waits 5 seconds (in case of series of
+-updates), and then launches <command>kbuildsycoca</command>.
++updates), and then launches <command>kbuildsycoca4</command>.
+ </para>
+ <!--
+ <para>
+@@ -155,14 +155,14 @@
+ </para>
+ <para>
+ If <command>kded4</command> is called with <command>kded4 --check</command>, then
+-it updates the &kde; sycoca using <command>kbuildsycoca</command>.
++it updates the &kde; sycoca using <command>kbuildsycoca4</command>.
+ </para>
+ </refsect1>
+
+ <refsect1>
+ <title>See Also</title>
+ <para><replaceable>kdeoptions</replaceable>(7), <replaceable>qtoptions</replaceable>(7),
+-<replaceable>kbuildsycoca</replaceable>(8)
++<replaceable>kbuildsycoca4</replaceable>(8)
+ </para>
+ </refsect1>
+
+Index: doc/kbuildsycoca4/man-kbuildsycoca4.8.docbook
+===================================================================
+--- doc/kbuildsycoca4/man-kbuildsycoca4.8.docbook (.../tags/KDE/4.5.2/kdelibs) (wersja 1185458)
++++ doc/kbuildsycoca4/man-kbuildsycoca4.8.docbook (.../branches/KDE/4.5/kdelibs) (wersja 1185458)
+@@ -236,6 +236,12 @@
+ installations</para>
+ </listitem>
+ </varlistentry>
++<varlistentry>
++<term>$<envar>KDESYCOCA</envar></term>
++<listitem>
++<para>Specifies the path to the sycoca database file</para>
++</listitem>
++</varlistentry>
+ </variablelist>
+
+ </refsect1>
+Index: doc/sonnet/index.docbook
+===================================================================
+--- doc/sonnet/index.docbook (.../tags/KDE/4.5.2/kdelibs) (wersja 1185458)
++++ doc/sonnet/index.docbook (.../branches/KDE/4.5/kdelibs) (wersja 1185458)
+@@ -17,13 +17,14 @@
+ <!-- TRANS:ROLES_OF_TRANSLATORS -->
+ </authorgroup>
+
+-<date>2010-01-19</date>
+-<releaseinfo>&kde; 4.4</releaseinfo>
++<date>2010-09-02</date>
++<releaseinfo>&kde; 4.5</releaseinfo>
+ <abstract>
+ <para>&sonnet; is the spelling checker used by &kde; applications such
+-as &kate;, &kmail;, and &kword;. It is a &GUI;
+-frontend to <application>International ISpell</application> and
+-<application>ASpell</application>.</para>
++as &kate;, &kmail;, and &kword;. It is a &GUI; frontend to various free spell checkers.
++More Information about required spell checkers and dictionaries you find in the
++documentation of the &systemsettings; module
++<ulink url="help:kcontrol/spellchecking">Spell Checker</ulink>.</para>
+
+ </abstract>
+ <keywordset>
+Index: kioslave/http/kcookiejar/domain_info
+===================================================================
+--- kioslave/http/kcookiejar/domain_info (.../tags/KDE/4.5.2/kdelibs) (wersja 1185458)
++++ kioslave/http/kcookiejar/domain_info (.../branches/KDE/4.5/kdelibs) (wersja 1185458)
+@@ -1 +1,2 @@
+ twoLevelTLD=name,ai,au,bd,bh,ck,eg,et,fk,il,in,kh,kr,mk,mt,na,np,nz,pg,pk,qa,sa,sb,sg,sv,ua,ug,uk,uy,vn,za,zw
++gTLDs=com,edu,gov,int,mil,net,org,biz,info,name,pro,aero,coop,museum,asia,cat,jobs,mobi,tel,travel
+Index: kioslave/http/kcookiejar/kcookiejar.cpp
===================================================================
---- kate/buffer/katetextblock.cpp (.../tags/KDE/4.5.1/kdelibs) (wersja 1179155)
-+++ kate/buffer/katetextblock.cpp (.../branches/KDE/4.5/kdelibs) (wersja 1179155)
-@@ -355,6 +355,7 @@
-
- // get text
- QString &textOfLine = m_lines[line]->textReadWrite ();
-+ int oldLength = textOfLine.size ();
-
- // check if valid column
- Q_ASSERT (range.start().column() >= 0);
-@@ -371,7 +372,7 @@
- /**
- * notify the text history
- */
-- m_buffer->history().removeText (range);
-+ m_buffer->history().removeText (range, oldLength);
-
- /**
- * cursor and range handling below
-Index: kate/buffer/katetexthistory.cpp
-===================================================================
---- kate/buffer/katetexthistory.cpp (.../tags/KDE/4.5.1/kdelibs) (wersja 1179155)
-+++ kate/buffer/katetexthistory.cpp (.../branches/KDE/4.5/kdelibs) (wersja 1179155)
-@@ -94,7 +94,7 @@
- addEntry (entry);
- }
-
--void TextHistory::removeText (const KTextEditor::Range &range)
-+void TextHistory::removeText (const KTextEditor::Range &range, int oldLineLength)
- {
- // create and add new entry
- Entry entry;
-@@ -102,6 +102,7 @@
- entry.line = range.start().line ();
- entry.column = range.start().column ();
- entry.length = range.end().column() - range.start().column();
-+ entry.oldLineLength = oldLineLength;
- addEntry (entry);
- }
-
-@@ -315,11 +316,131 @@
- }
- }
+--- kioslave/http/kcookiejar/kcookiejar.cpp (.../tags/KDE/4.5.2/kdelibs) (wersja 1185458)
++++ kioslave/http/kcookiejar/kcookiejar.cpp (.../branches/KDE/4.5/kdelibs) (wersja 1185458)
+@@ -36,32 +36,6 @@
+
+ #include "kcookiejar.h"
+
+-#include <config.h>
+-#include <sys/types.h>
+-#include <sys/stat.h>
+-#ifdef HAVE_SYS_PARAM_H
+-#include <sys/param.h>
+-#endif
+-#include <fcntl.h>
+-#include <unistd.h>
+-#include <stdio.h>
+-#include <string.h>
+-
+-#ifdef USE_SOLARIS
+-#include <strings.h>
+-#endif
+-
+-#include <stdlib.h>
+-
+-//#include <netinet/in.h>
+-//#include <arpa/inet.h>
+-
+-#include <QtCore/QString>
+-#include <QtCore/QFile>
+-#include <QtCore/QDir>
+-#include <QtCore/QRegExp>
+-#include <QtCore/QTextStream>
+-
+ #include <kurl.h>
+ #include <kdatetime.h>
+ #include <ksystemtimezone.h>
+@@ -70,7 +44,12 @@
+ #include <ksavefile.h>
+ #include <kdebug.h>
-+void TextHistory::Entry::reverseTransformCursor (int &cursorLine, int &cursorColumn, bool moveOnInsert) const
-+{
-+ /**
-+ * handle all history types
-+ */
-+ switch (type) {
-+ /**
-+ * Wrap a line
-+ */
-+ case WrapLine:
-+ /**
-+ * ignore this line
-+ */
-+ if (cursorLine <= line)
-+ return;
-+
-+ /**
-+ * next line is unwrapped
-+ */
-+ if (cursorLine == line + 1) {
-+ /**
-+ * adjust column
-+ */
-+ cursorColumn = cursorColumn + column;
-+ }
-+
-+ /**
-+ * always decrement cursor line
-+ */
-+ cursorLine -= 1;
-+ return;
-+
-+ /**
-+ * Unwrap a line
-+ */
-+ case UnwrapLine:
-+ /**
-+ * ignore lines before unwrapped one
-+ */
-+ if (cursorLine < line - 1)
-+ return;
-+
-+ /**
-+ * we unwrap this line, try to adjust cursor column if needed
-+ */
-+ if (cursorLine == line - 1) {
-+ /**
-+ * skip cursors with to small columns
-+ */
-+ if (cursorColumn <= oldLineLength) {
-+ if (cursorColumn < oldLineLength || !moveOnInsert)
-+ return;
-+ }
-+
-+ cursorColumn -= oldLineLength;
-+ }
-+
-+ /**
-+ * increase cursor line
-+ */
-+ cursorLine += 1;
-+ return;
-+
-+ /**
-+ * Insert text
-+ */
-+ case InsertText:
-+ /**
-+ * only interesting, if same line
-+ */
-+ if (cursorLine != line)
-+ return;
-+
-+ // skip cursors with too small column
-+ if (cursorColumn <= column)
-+ return;
-+
-+ // patch column of cursor
-+ if (cursorColumn - length < column)
-+ cursorColumn = column;
-+ else
-+ cursorColumn -= length;
-+
-+ return;
-+
-+ /**
-+ * Remove text
-+ */
-+ case RemoveText:
-+ /**
-+ * only interesting, if same line
-+ */
-+ if (cursorLine != line)
-+ return;
-+
-+ // skip cursors with too small column
-+ if (cursorColumn <= column)
-+ if (cursorColumn < column || !moveOnInsert)
-+ return;
-+
-+ // patch column of cursor
-+ if (cursorColumn <= oldLineLength)
-+ cursorColumn += length;
-+
-+ // special handling if cursor behind the real line, e.g. non-wrapping cursor in block selection mode
-+ else if (cursorColumn < oldLineLength + length)
-+ cursorColumn = oldLineLength + length;
-+ return;
-+
-+ /**
-+ * nothing
-+ */
-+ default:
-+ return;
-+ }
-+}
-+
- void TextHistory::transformCursor (int& line, int& column, KTextEditor::MovingCursor::InsertBehavior insertBehavior, qint64 fromRevision, qint64 toRevision)
+-#include <algorithm>
++#include <QtCore/QString>
++#include <QtCore/QFile>
++#include <QtCore/QDir>
++#include <QtCore/QRegExp>
++#include <QtCore/QTextStream>
++#include <QtCore/QStringBuilder>
+
+ // BR87227
+ // Waba: Should the number of cookies be limited?
+@@ -84,13 +63,12 @@
+ #define READ_BUFFER_SIZE 8192
+ #define IP_ADDRESS_EXPRESSION "(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)"
+
+-// Note with respect to QString::fromLatin1( )
+-// Cookies are stored as 8 bit data and passed to kio_http as
+-// latin1 regardless of their actual encoding.
++// Note with respect to QLatin1String( )....
++// Cookies are stored as 8 bit data and passed to kio_http as Latin1
++// regardless of their actual encoding.
++#define QL1S(x) QLatin1String(x)
++#define QL1C(x) QLatin1Char(x)
+
+-// L1 is used to indicate latin1 constants
+-#define QL1S(x) QLatin1String(x)
+-
+ QString KCookieJar::adviceToStr(KCookieAdvice _advice)
+ {
+ switch( _advice )
+@@ -151,7 +129,7 @@
+ //
+ // Checks if a cookie has been expired
+ //
+-bool KHttpCookie::isExpired(qint64 currentDate) const
++bool KHttpCookie::isExpired(qint64 currentDate) const
+ {
+ if (currentDate == -1) {
+ KDateTime epoch;
+@@ -169,19 +147,27 @@
{
- /**
-- * -1 special meaning for toRevision
-+ * -1 special meaning for from/toRevision
- */
-+ if (fromRevision == -1)
-+ fromRevision = revision ();
-+
- if (toRevision == -1)
- toRevision = revision ();
+ QString result;
-@@ -333,7 +454,7 @@
- * some invariants must hold
- */
- Q_ASSERT (!m_historyEntries.empty ());
-- Q_ASSERT (fromRevision < toRevision);
-+ Q_ASSERT (fromRevision != toRevision);
- Q_ASSERT (fromRevision >= m_firstHistoryEntryRevision);
- Q_ASSERT (fromRevision < (m_firstHistoryEntryRevision + m_historyEntries.size()));
- Q_ASSERT (toRevision >= m_firstHistoryEntryRevision);
-@@ -343,9 +464,20 @@
- * transform cursor
- */
- bool moveOnInsert = insertBehavior == KTextEditor::MovingCursor::MoveOnInsert;
-- for (int rev = fromRevision - m_firstHistoryEntryRevision + 1; rev <= (toRevision - m_firstHistoryEntryRevision); ++rev) {
-- const Entry &entry = m_historyEntries[rev];
-- entry.transformCursor (line, column, moveOnInsert);
-+
-+ /**
-+ * forward or reverse transform?
-+ */
-+ if (toRevision > fromRevision) {
-+ for (int rev = fromRevision - m_firstHistoryEntryRevision + 1; rev <= (toRevision - m_firstHistoryEntryRevision); ++rev) {
-+ const Entry &entry = m_historyEntries[rev];
-+ entry.transformCursor (line, column, moveOnInsert);
-+ }
-+ } else {
-+ for (int rev = fromRevision - m_firstHistoryEntryRevision; rev >= (toRevision - m_firstHistoryEntryRevision + 1); --rev) {
-+ const Entry &entry = m_historyEntries[rev];
-+ entry.reverseTransformCursor (line, column, moveOnInsert);
-+ }
- }
- }
-
-@@ -361,8 +493,11 @@
- }
-
- /**
-- * -1 special meaning for toRevision
-+ * -1 special meaning for from/toRevision
- */
-+ if (fromRevision == -1)
-+ fromRevision = revision ();
-+
- if (toRevision == -1)
- toRevision = revision ();
-
-@@ -376,41 +511,69 @@
- * some invariants must hold
- */
- Q_ASSERT (!m_historyEntries.empty ());
-- Q_ASSERT (fromRevision < toRevision);
-+ Q_ASSERT (fromRevision != toRevision);
- Q_ASSERT (fromRevision >= m_firstHistoryEntryRevision);
- Q_ASSERT (fromRevision < (m_firstHistoryEntryRevision + m_historyEntries.size()));
- Q_ASSERT (toRevision >= m_firstHistoryEntryRevision);
- Q_ASSERT (toRevision < (m_firstHistoryEntryRevision + m_historyEntries.size()));
--
-+
- /**
- * transform cursors
- */
--
-+
- // first: copy cursors, without range association
- int startLine = range.start().line(), startColumn = range.start().column(), endLine = range.end().line(), endColumn = range.end().column();
-
- bool moveOnInsertStart = !(insertBehaviors & KTextEditor::MovingRange::ExpandLeft);
- bool moveOnInsertEnd = (insertBehaviors & KTextEditor::MovingRange::ExpandRight);
-- for (int rev = fromRevision - m_firstHistoryEntryRevision + 1; rev <= (toRevision - m_firstHistoryEntryRevision); ++rev) {
-- const Entry &entry = m_historyEntries[rev];
--
-- entry.transformCursor (startLine, startColumn, moveOnInsertStart);
--
-- entry.transformCursor (endLine, endColumn, moveOnInsertEnd);
-+
-+ /**
-+ * forward or reverse transform?
-+ */
-+ if (toRevision > fromRevision) {
-+ for (int rev = fromRevision - m_firstHistoryEntryRevision + 1; rev <= (toRevision - m_firstHistoryEntryRevision); ++rev) {
-+ const Entry &entry = m_historyEntries[rev];
-+
-+ entry.transformCursor (startLine, startColumn, moveOnInsertStart);
-+
-+ entry.transformCursor (endLine, endColumn, moveOnInsertEnd);
-
-- // got empty?
-- if(endLine < startLine || (endLine == startLine && endColumn <= startColumn))
+- if (useDOMFormat || (mProtocolVersion == 0))
- {
-- if (invalidateIfEmpty) {
-- range = KTextEditor::Range::invalid();
-- return;
-- }
-- else{
-- // else normalize them
-- endLine = startLine;
-- endColumn = startColumn;
-- }
-+ // got empty?
-+ if(endLine < startLine || (endLine == startLine && endColumn <= startColumn))
-+ {
-+ if (invalidateIfEmpty) {
-+ range = KTextEditor::Range::invalid();
-+ return;
-+ }
-+ else{
-+ // else normalize them
-+ endLine = startLine;
-+ endColumn = startColumn;
-+ }
-+ }
- }
-+ } else {
-+ for (int rev = fromRevision - m_firstHistoryEntryRevision ; rev >= (toRevision - m_firstHistoryEntryRevision + 1); --rev) {
-+ const Entry &entry = m_historyEntries[rev];
-+
-+ entry.reverseTransformCursor (startLine, startColumn, moveOnInsertStart);
-+
-+ entry.reverseTransformCursor (endLine, endColumn, moveOnInsertEnd);
-+
-+ // got empty?
-+ if(endLine < startLine || (endLine == startLine && endColumn <= startColumn))
-+ {
-+ if (invalidateIfEmpty) {
-+ range = KTextEditor::Range::invalid();
-+ return;
-+ }
-+ else{
-+ // else normalize them
-+ endLine = startLine;
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdelibs/kde4-kdelibs-branch.diff?r1=1.22&r2=1.23&f=u
More information about the pld-cvs-commit
mailing list