packages: kde4-kdelibs/kde4-kdelibs-branch.diff, kde4-kdelibs/kde4-kdelibs....

arekm arekm at pld-linux.org
Wed Nov 25 10:41:52 CET 2009 

Author: arekm                        Date: Wed Nov 25 09:41:52 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2; branch diff updated

---- Files affected:
packages/kde4-kdelibs:
   kde4-kdelibs-branch.diff (1.15 -> 1.16) , kde4-kdelibs.spec (1.171 -> 1.172) 

---- Diffs:

================================================================
Index: packages/kde4-kdelibs/kde4-kdelibs-branch.diff
diff -u packages/kde4-kdelibs/kde4-kdelibs-branch.diff:1.15 packages/kde4-kdelibs/kde4-kdelibs-branch.diff:1.16
--- packages/kde4-kdelibs/kde4-kdelibs-branch.diff:1.15	Thu Oct  8 18:09:42 2009
+++ packages/kde4-kdelibs/kde4-kdelibs-branch.diff	Wed Nov 25 10:41:46 2009
@@ -1,680 +1,2041 @@
+Index: cmake/modules/FindPhonon.cmake
+===================================================================
+--- cmake/modules/FindPhonon.cmake	(.../tags/KDE/4.3.3/kdelibs)	(wersja 1053992)
++++ cmake/modules/FindPhonon.cmake	(.../branches/KDE/4.3/kdelibs)	(wersja 1053992)
+@@ -35,7 +35,7 @@
+    # then at the default system locations (CMAKE_SYSTEM_PREFIX_PATH, i.e. /usr etc.)
+    find_library(PHONON_LIBRARY NAMES phonon)
+ 
+-   find_path(PHONON_INCLUDE_DIR NAMES phonon/phonon_export.h PATHS ${KDE4_INCLUDE_INSTALL_DIR} ${QT_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR} NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH)
++   find_path(PHONON_INCLUDE_DIR NAMES phonon/phonon_export.h PATHS ${KDE4_INCLUDE_INSTALL_DIR} ${QT_INCLUDE_DIR} ${QT_LIBRARY_DIR} ${INCLUDE_INSTALL_DIR} NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH)
+    find_path(PHONON_INCLUDE_DIR NAMES phonon/phonon_export.h)
+ 
+    if(PHONON_INCLUDE_DIR AND PHONON_LIBRARY)
+Index: kate/render/katerenderer.h
+===================================================================
+--- kate/render/katerenderer.h	(.../tags/KDE/4.3.3/kdelibs)	(wersja 1053992)
++++ kate/render/katerenderer.h	(.../branches/KDE/4.3/kdelibs)	(wersja 1053992)
+@@ -236,6 +236,8 @@
+     int cursorToX(const KateTextLayout& range, int col) const;
+     /// \overload
+     int cursorToX(const KateTextLayout& range, const KTextEditor::Cursor& pos) const;
++    /// \overload
++    int cursorToX(const KateTextLayout& range, const KTextEditor::Cursor& pos, bool returnPastLine) const;
+ 
+     /**
+      * Returns the real cursor which is occupied by the specified x value, or that closest to it.
+Index: kate/render/katerenderer.cpp
+===================================================================
+--- kate/render/katerenderer.cpp	(.../tags/KDE/4.3.3/kdelibs)	(wersja 1053992)
++++ kate/render/katerenderer.cpp	(.../branches/KDE/4.3/kdelibs)	(wersja 1053992)
+@@ -660,7 +660,7 @@
+         const KateTextLayout& lastLine = range->viewLine(range->viewLineCount() - 1);
+         int x = range->widthOfLastLine() + spaceWidth() * (cursor->column() - range->length());
+         if ( (x >= xStart) && (x <= xEnd))
+-          paint.fillRect(x, (int)lastLine.lineLayout().y(), caretWidth, fm.height(), c);
++          paint.fillRect(x-xStart, (int)lastLine.lineLayout().y(), caretWidth, fm.height(), c);
+       }
+     }
+   }
+@@ -903,6 +903,17 @@
+   return (int)range.lineLayout().cursorToX(pos.column());
+ }
+ 
++int KateRenderer::cursorToX(const KateTextLayout& range, const KTextEditor::Cursor & pos, bool returnPastLine) const
++{
++  int x = cursorToX(range, pos);
++  int over = pos.column() * spaceWidth() - range.width();
++ 
++  if (returnPastLine && over > 0)
++    x += over;
++
++  return x;
++}
++
+ KTextEditor::Cursor KateRenderer::xToCursor(const KateTextLayout & range, int x, bool returnPastLine ) const
+ {
+   Q_ASSERT(range.isValid());
 Index: kate/syntax/data/lilypond.xml
 ===================================================================
---- kate/syntax/data/lilypond.xml	(.../tags/KDE/4.3.2/kdelibs)	(wersja 1032821)
-+++ kate/syntax/data/lilypond.xml	(.../branches/KDE/4.3/kdelibs)	(wersja 1032821)
+--- kate/syntax/data/lilypond.xml	(.../tags/KDE/4.3.3/kdelibs)	(wersja 1053992)
++++ kate/syntax/data/lilypond.xml	(.../branches/KDE/4.3/kdelibs)	(wersja 1053992)
 @@ -8,7 +8,7 @@
    <!ENTITY scripts "\d+|accent|marcato|staccat(issim)?o|espressivo|tenuto|portato|(up|down)(bow|mordent|prall)|flageolet|thumb|[lr](heel|toe)|open|stopped|turn|reverseturn|trill|mordent|prall(prall|mordent|down|up)?|lineprall|signumcongruentiae|(short|long|verylong)?fermata|segno|(var)?coda">
    <!ENTITY keywords "accepts|alias|consists|defaultchild|denies|description|grobdescriptions|include|invalid|name|objectid|once|remove|sequential|simultaneous|type|version|score|book|bookpart">
    <!ENTITY deprecatedkeywords "consistsend">
--  <!ENTITY commands "acciaccatura|addQuote|afterGrace|aikenHeads|allowPageTurn|alternative|apply(Context|Music|Output)|appoggiatura|arpeggio(Arrow(Down|Up)|Bracket|Normal|Parenthesis)?|(a|de)scendens|auctum|augmentum|autoBeamO(ff|n)|autochange|balloon(Grob)?Text|bar|barNumberCheck|bendAfter|breathe|break|cadenzaO(ff|n)|cavum|clef(\s+(treble|violin|G|alto|C|(sub)?bass|F|french|(mezzo)?soprano|(var)?baritone|percussion|tab))?|(end)?(de)?cr|cresc(TextCresc|Hairpin)|(cue|transposedCue)During|default|deminutum|dim(Text(Decresc|Decr|Dim)|Hairpin)|display(Lily)?Music|divisio(Maior|Maxima|Minima)|(dynamic|dots|phrasingSlur|slur|stem|tie|tuplet)(Down|Neutral|Up)|(balloon|text)LengthO(ff|n)|featherDurations|figure(mode|s)|finalis|flexa|(french|german|italian|semiGerman)Chords|glissando|grace|harmonic|(unH|h)ideNotes|(hide|show)StaffSwitch|inclinatum|(keep|remove)WithTag|key(\s+&pitch;)?|killCues|label|laissezVibrer|linea|mark|maxima|melisma(End)?|mergeDifferently(Head|Dott)edO(ff|n)|
 newSpacingSection|no(Beam|Break|PageBreak|PageTurn)|normalsize|numericTimeSignature|octaveCheck|oneVoice|oriscus|ottava|page(-ref|Break|Turn)|parallelMusic|parenthesize|partcombine|partial(\s*&duration;)?|pes|pitchedTrill|pointAndClickO(ff|n)|quilisma|quoteDuring|relative(\s+&pitch;)?|RemoveEmptyStaffContext|repeat(\s+(unfold|volta|tremolo|percent)(\s+\d+)?)?|repeatTie|resetRelativeOctave|rest|sacredHarpHeads|scaleDurations|scoreTweak|easyHeadsO(ff|n)|shift(Durations|Off|On{1,3})|(slur|tie)(Both|Dashed|Dotted|Solid)|small|spacingTweaks|(start|stop)(Group|(Text|Trill)Span|Staff)|stemBoth|stropha|super|(sustain|sostenuto)O(ff|n)|table-of-contents|tag|times?(\s*\d+/\d+)?|tiny|tocItem|transpose(\s+&pitch;\s*&pitch;)?|transposition(\s+&pitch;)|tweak|unfoldRepeats|virg(ul)?a|voice(One|Two|Three|Four)|withMusicProperty|cm|mm|in|pt|major|minor|ionian|locrian|aeolian|mixolydian|lydian|phrygian|dorian">
-+  <!ENTITY commands "acciaccatura|addQuote|afterGrace|aikenHeads|allowPageTurn|alternative|apply(Context|Music|Output)|appoggiatura|arpeggio(Arrow(Down|Up)|Bracket|Normal|Parenthesis)?|(a|de)scendens|auctum|augmentum|autoBeamO(ff|n)|autochange|balloon(Grob)?Text|bar|barNumberCheck|bendAfter|breathe|break|cadenzaO(ff|n)|cavum|clef(\s+(treble|violin|G|alto|C|tenor|(sub)?bass|F|french|(mezzo)?soprano|(var)?baritone|percussion|tab))?|(end)?(de)?cr|cresc(TextCresc|Hairpin)|(cue|transposedCue)During|default|deminutum|dim(Text(Decresc|Decr|Dim)|Hairpin)|display(Lily)?Music|divisio(Maior|Maxima|Minima)|(dynamic|dots|phrasingSlur|slur|stem|tie|tuplet)(Down|Neutral|Up)|(balloon|text)LengthO(ff|n)|featherDurations|figure(mode|s)|finalis|flexa|(french|german|italian|semiGerman)Chords|glissando|grace|harmonic|(unH|h)ideNotes|(hide|show)StaffSwitch|inclinatum|(keep|remove)WithTag|key(\s+&pitch;)?|killCues|label|laissezVibrer|linea|mark|maxima|melisma(End)?|mergeDifferently(Head|Dott)edO(
 ff|n)|newSpacingSection|no(Beam|Break|PageBreak|PageTurn)|normalsize|numericTimeSignature|octaveCheck|oneVoice|oriscus|ottava|page(-ref|Break|Turn)|parallelMusic|parenthesize|partcombine|partial(\s*&duration;)?|pes|pitchedTrill|pointAndClickO(ff|n)|quilisma|quoteDuring|relative(\s+&pitch;)?|RemoveEmptyStaffContext|repeat(\s+(unfold|volta|tremolo|percent)(\s+\d+)?)?|repeatTie|resetRelativeOctave|rest|sacredHarpHeads|scaleDurations|scoreTweak|easyHeadsO(ff|n)|shift(Durations|Off|On{1,3})|(slur|tie)(Both|Dashed|Dotted|Solid)|small|spacingTweaks|(start|stop)(Group|(Text|Trill)Span|Staff)|stemBoth|stropha|super|(sustain|sostenuto)O(ff|n)|table-of-contents|tag|times?(\s*\d+/\d+)?|tiny|tocItem|transpose(\s+&pitch;\s*&pitch;)?|transposition(\s+&pitch;)|tweak|unfoldRepeats|virg(ul)?a|voice(One|Two|Three|Four)|withMusicProperty|cm|mm|in|pt|major|minor|ionian|locrian|aeolian|mixolydian|lydian|phrygian|dorian">
+-  <!ENTITY commands "acciaccatura|addQuote|afterGrace|aikenHeads|allowPageTurn|alternative|apply(Context|Music|Output)|appoggiatura|arpeggio(Arrow(Down|Up)|Bracket|Normal|Parenthesis)?|(a|de)scendens|auctum|augmentum|autoBeamO(ff|n)|autochange|balloon(Grob)?Text|bar|barNumberCheck|bendAfter|breathe|break|cadenzaO(ff|n)|cavum|clef(\s+(treble|violin|G|alto|C|tenor|(sub)?bass|F|french|(mezzo)?soprano|(var)?baritone|percussion|tab))?|(end)?(de)?cr|cresc(TextCresc|Hairpin)|(cue|transposedCue)During|default|deminutum|dim(Text(Decresc|Decr|Dim)|Hairpin)|display(Lily)?Music|divisio(Maior|Maxima|Minima)|(dynamic|dots|phrasingSlur|slur|stem|tie|tuplet)(Down|Neutral|Up)|(balloon|text)LengthO(ff|n)|featherDurations|figure(mode|s)|finalis|flexa|(french|german|italian|semiGerman)Chords|glissando|grace|harmonic|(unH|h)ideNotes|(hide|show)StaffSwitch|inclinatum|(keep|remove)WithTag|key(\s+&pitch;)?|killCues|label|laissezVibrer|linea|mark|maxima|melisma(End)?|mergeDifferently(Head|Dott)edO(
 ff|n)|newSpacingSection|no(Beam|Break|PageBreak|PageTurn)|normalsize|numericTimeSignature|octaveCheck|oneVoice|oriscus|ottava|page(-ref|Break|Turn)|parallelMusic|parenthesize|partcombine|partial(\s*&duration;)?|pes|pitchedTrill|pointAndClickO(ff|n)|quilisma|quoteDuring|relative(\s+&pitch;)?|RemoveEmptyStaffContext|repeat(\s+(unfold|volta|tremolo|percent)(\s+\d+)?)?|repeatTie|resetRelativeOctave|rest|sacredHarpHeads|scaleDurations|scoreTweak|easyHeadsO(ff|n)|shift(Durations|Off|On{1,3})|(slur|tie)(Both|Dashed|Dotted|Solid)|small|spacingTweaks|(start|stop)(Group|(Text|Trill)Span|Staff)|stemBoth|stropha|super|(sustain|sostenuto)O(ff|n)|table-of-contents|tag|times?(\s*\d+/\d+)?|tiny|tocItem|transpose(\s+&pitch;\s*&pitch;)?|transposition(\s+&pitch;)|tweak|unfoldRepeats|virg(ul)?a|voice(One|Two|Three|Four)|withMusicProperty|cm|mm|in|pt|major|minor|ionian|locrian|aeolian|mixolydian|lydian|phrygian|dorian">
++  <!ENTITY commands "acciaccatura|addQuote|afterGrace|aikenHeads|allowPageTurn|alternative|apply(Context|Music|Output)|appoggiatura|arpeggio(Arrow(Down|Up)|Bracket|Normal|Parenthesis)?|(a|de)scendens|auctum|augmentum|autoBeamO(ff|n)|autochange|balloon(Grob)?Text|bar|barNumberCheck|bendAfter|breathe|break|cadenzaO(ff|n)|cavum|clef(\s+(treble|violin|G|alto|C|tenor|(sub)?bass|F|french|(mezzo)?soprano|(var)?baritone|percussion|tab))?|(end)?(de)?cr|cresc(TextCresc|Hairpin)|(cue|transposedCue)During|default|deminutum|dim(Text(Decresc|Decr|Dim)|Hairpin)|display(Lily)?Music|divisio(Maior|Maxima|Minima)|(dynamic|dots|phrasingSlur|slur|stem|tie|tuplet)(Down|Neutral|Up)|(balloon|text)LengthO(ff|n)|featherDurations|figure(mode|s)|finalis|flexa|(french|german|italian|semiGerman)Chords|glissando|grace|harmonic|(unH|h)ideNotes|(hide|show)StaffSwitch|inclinatum|(keep|remove)WithTag|key(\s+&pitch;)?|killCues|label|laissezVibrer|linea|makeClusters|mark|maxima|melisma(End)?|mergeDifferently(H
 ead|Dott)edO(ff|n)|newSpacingSection|no(Beam|Break|PageBreak|PageTurn)|normalsize|numericTimeSignature|octaveCheck|oneVoice|oriscus|ottava|page(-ref|Break|Turn)|parallelMusic|parenthesize|partcombine|partial(\s*&duration;)?|pes|pitchedTrill|pointAndClickO(ff|n)|quilisma|quoteDuring|relative(\s+&pitch;)?|RemoveEmptyStaffContext|repeat(\s+(unfold|volta|tremolo|percent)(\s+\d+)?)?|repeatTie|resetRelativeOctave|rest|sacredHarpHeads|scaleDurations|scoreTweak|easyHeadsO(ff|n)|shift(Durations|Off|On{1,3})|(slur|tie)(Both|Dashed|Dotted|Solid)|small|spacingTweaks|(start|stop)(Group|(Text|Trill)Span|Staff)|stemBoth|stropha|super|(sustain|sostenuto)O(ff|n)|table-of-contents|tag|times?(\s*\d+/\d+)?|tiny|tocItem|transpose(\s+&pitch;\s*&pitch;)?|transposition(\s+&pitch;)|tweak|unfoldRepeats|virg(ul)?a|voice(One|Two|Three|Four)|withMusicProperty|cm|mm|in|pt|major|minor|ionian|locrian|aeolian|mixolydian|lydian|phrygian|dorian">
    <!ENTITY deprecatedcommands "arpeggio(Up|Down|Neutral)|newpage|script(Up|Down|Both)|(empty|fat)Text|setEasyHeads|(default|voice|modernVoice|piano|forget)Accidentals|(modern(Voice)?|piano)Cautionaries|noResetKey|compressMusic|octave|(sustain|sostenuto)(Down|Up)|set(Hairpin|Text)(Cresc|Decresc|Dim)|setTextDecr">
    <!ENTITY markupnotextargs "arrow-head|beam|char|(semi|sesqui|double)?(flat|sharp)|draw-(circle|line)|epsfile|filled-box|fret-diagram(-terse|-verbose)?|fromproperty|harp-pedal|(justify|wordwrap)-(field|string)|lookup|markalphabet|markletter|musicglyph|natural|note-by-number|note|null|simple|(back)?slashed-digit|stencil|strut|tied-lyric|triangle|verbatim-file">
    <!ENTITY markupwithtextargs "markup|bold|(rounded-)?box|bracket|caps|(center|general|left|right)-align|circle|((center|dir|left|right)-)?column|combine|concat|dynamic|fill-line|finger|fontCaps|(abs-)?fontsize|fraction|halign|hbracket|hcenter-in|hcenter|hspace|huge|italic|justify|larger?|line|lower|magnify|medium|normal-size-(sub|super)|normal-text|normalsize|number|on-the-fly|override|pad-(around|markup|to-box|x)|page-ref|postscript|put-adjacent|raise|roman|rotate|sans|small(er)?|smallCaps|sub|super|teeny|text|tiny|translate(-scaled)?|transparent|typewriter|underline|upright|vcenter|whiteout|with-(color|dimensions|url)|wordwrap|(markup|column-|justified-|override-|wordwrap-)lines|wordwrap-(string-)?internal">
-@@ -26,7 +26,7 @@
+@@ -26,13 +26,21 @@
  ]>
  <language name="LilyPond" section="Other"
            style="lilypond" indenter="lilypond"
--          version="3.03" kateversion="3.0"
-+          version="3.04" kateversion="3.0"
+-          version="3.04" kateversion="3.0"
++          version="3.05" kateversion="3.0"
            extensions="*.ly;*.LY;*.ily;*.ILY;*.lyi;*.LYI"
            mimetype="text/x-lilypond"
            author="Wilbert Berendsen (info at wilbertberendsen.nl)" license="LGPL">
-Index: kioslave/file/file_unix.cpp
+ 
+   <!--
+     
++    November, 2009
++    Minor updates by Wilbert Berendsen
++    
++    Changes:
++    
++    - add makeClusters
++    - fix chords in drummode
++    
+     October, 2008
+     Minor updates by Wilbert Berendsen
+ 
+@@ -882,9 +890,15 @@
+       <context name="drumrules" attribute="Normal Text" lineEndContext="#stay">
+         <DetectChar char="{" attribute="Keyword" context="drumrules" beginRegion="sequential"/>
+         <DetectChar char="}" attribute="Keyword" context="#pop" endRegion="sequential"/>
++        <RegExpr String="&lt;(?!&lt;)" attribute="Chord" context="drumchord"/>
+         <keyword attribute="Other Text" String="drumpitchnames" context="duration"/>
+         <IncludeRules context="music"/>
+       </context>
++      
++      <context name="drumchord" attribute="Normal Text" lineEndContext="#stay">
++        <keyword attribute="Other Text" String="drumpitchnames"/>
++        <IncludeRules context="chord"/>
++      </context>
+ 
+       <!-- Chordmode -->
+       <context name="chordmode" attribute="Other Mode" lineEndContext="#stay"
+Index: kate/utils/kateautoindent.cpp
 ===================================================================
---- kioslave/file/file_unix.cpp	(.../tags/KDE/4.3.2/kdelibs)	(wersja 1032821)
-+++ kioslave/file/file_unix.cpp	(.../branches/KDE/4.3/kdelibs)	(wersja 1032821)
-@@ -531,8 +531,10 @@
-        *****/
- 
-       kDebug( 7101 ) << "Deleting directory " << url.url();
--      if (!deleteRecursive(path))
--          return;
-+      if (metaData(QLatin1String("recurse")) == QLatin1String("true")) {
-+          if (!deleteRecursive(path))
-+              return;
-+      }
-       if ( ::rmdir( _path.data() ) == -1 ) {
- 	if ((errno == EACCES) || (errno == EPERM))
- 	  error(KIO::ERR_ACCESS_DENIED, path);
-Index: kio/kio/accessmanagerreply_p.cpp
+--- kate/utils/kateautoindent.cpp	(.../tags/KDE/4.3.3/kdelibs)	(wersja 1053992)
++++ kate/utils/kateautoindent.cpp	(.../branches/KDE/4.3/kdelibs)	(wersja 1053992)
+@@ -204,13 +204,26 @@
+   if (line <= 0)
+     return;
+ 
+-  KateTextLine::Ptr textline = doc->plainKateTextLine(line-1);
++  KateTextLine::Ptr prevTextLine = doc->plainKateTextLine(line-1);
++  KateTextLine::Ptr textLine     = doc->plainKateTextLine(line);
+ 
+   // textline not found, cu
+-  if (!textline)
++  if (!prevTextLine || !textLine)
+     return;
+ 
+-  doIndent (line, textline->indentDepth (tabWidth));
++  const QString previousWhitespace = prevTextLine->leadingWhitespace();
++
++  // remove leading whitespace, then insert the leading indentation
++  doc->editStart ();
++
++  if (!keepExtra)
++  {
++    const QString currentWhitespace = textLine->leadingWhitespace();
++    doc->editRemoveText (line, 0, currentWhitespace.length());
++  }
++
++  doc->editInsertText (line, 0, previousWhitespace);
++  doc->editEnd ();
+ }
+ 
+ void KateAutoIndent::scriptIndent (KateView *view, const KTextEditor::Cursor &position, QChar typedChar)
+Index: kate/view/kateview.cpp
 ===================================================================
---- kio/kio/accessmanagerreply_p.cpp	(.../tags/KDE/4.3.2/kdelibs)	(wersja 1032821)
-+++ kio/kio/accessmanagerreply_p.cpp	(.../branches/KDE/4.3/kdelibs)	(wersja 1032821)
-@@ -141,7 +141,8 @@
-             }
-         }
+--- kate/view/kateview.cpp	(.../tags/KDE/4.3.3/kdelibs)	(wersja 1053992)
++++ kate/view/kateview.cpp	(.../branches/KDE/4.3/kdelibs)	(wersja 1053992)
+@@ -1669,7 +1669,7 @@
+   QMutexLocker l(m_doc->smartMutex());
+ 
+   KTextEditor::Range oldSelection = *m_selection;
+-  *m_selection = selection;
++  *m_selection = selection.isEmpty() ? KTextEditor::Range::invalid() : selection;
+ 
+   tagSelection(oldSelection);
+ 
+@@ -1711,9 +1711,6 @@
+ 
+ bool KateView::selection() const
+ {
+-  if (m_selection->isEmpty())
+-      return false;
+-
+   if(blockSelection())
+     return *m_selection != KateSmartRange::invalid();
+   else
+Index: kate/view/kateviewinternal.h
+===================================================================
+--- kate/view/kateviewinternal.h	(.../tags/KDE/4.3.3/kdelibs)	(wersja 1053992)
++++ kate/view/kateviewinternal.h	(.../branches/KDE/4.3/kdelibs)	(wersja 1053992)
+@@ -270,7 +270,6 @@
+     KateSmartCursor m_cursor;
+     KTextEditor::Cursor m_mouse;
+     KTextEditor::Cursor m_displayCursor;
+-    int m_cursorX;
+ 
+     bool m_possibleTripleClick;
+ 
+@@ -360,8 +359,8 @@
+     KTextEditor::Cursor toVirtualCursor(const KTextEditor::Cursor& realCursor) const;
+ 
+     // These variable holds the most recent maximum real & visible column number
+-    bool m_preserveMaxX;
+-    int m_currentMaxX;
++    bool m_preserveX;
++    int m_preservedX;
+ 
+     bool m_updatingView;
+     int m_wrapChangeViewLine;
+Index: kate/view/kateviewinternal.cpp
+===================================================================
+--- kate/view/kateviewinternal.cpp	(.../tags/KDE/4.3.3/kdelibs)	(wersja 1053992)
++++ kate/view/kateviewinternal.cpp	(.../branches/KDE/4.3/kdelibs)	(wersja 1053992)
+@@ -87,8 +87,8 @@
+   , m_selectAnchor (-1, -1)
+   , m_selectionMode( Default )
+   , m_layoutCache(new KateLayoutCache(renderer(), this))
+-  , m_preserveMaxX(false)
+-  , m_currentMaxX(0)
++  , m_preserveX(false)
++  , m_preservedX(0)
+   , m_updatingView(true)
+   , m_cachedMaxStartPos(-1, -1)
+   , m_dragScrollTimer(this)
+@@ -179,7 +179,6 @@
+ 
+   m_displayCursor.setPosition(0, 0);
+   m_cursor.setInsertBehavior(KTextEditor::SmartCursor::MoveOnInsert);
+-  m_cursorX = 0;
+ 
+   setAcceptDrops( true );
  
--        setAttribute(QNetworkRequest::User, kioJob->metaData().toVariant());
-+        setAttribute(static_cast<QNetworkRequest::Attribute>(KIO::AccessManager::MetaData),
-+                     kioJob->metaData().toVariant());
-         d->m_metaDataRead = true;
+@@ -677,12 +676,12 @@
      }
+   }
  
-@@ -215,10 +216,10 @@
+-  if (!m_view->dynWordWrap() && endCol != -1)
++  if (!m_view->dynWordWrap() && (endCol != -1 || m_view->wrapCursor()))
+   {
+     QMutexLocker lock(m_doc->smartMutex());
+  
+     KTextEditor::Cursor rc = toRealCursor(c);
+-    int sX = renderer()->cursorToX(cache()->textLayout(rc), rc);
++    int sX = renderer()->cursorToX(cache()->textLayout(rc), rc, !m_view->wrapCursor());
+ 
+     int sXborder = sX-8;
+     if (sXborder < 0)
+@@ -953,12 +952,12 @@
+       return *this;
+     }
+ 
+-    const bool noWrapCursor = m_vi->view()->blockSelection() || !m_vi->m_view->wrapCursor();
++    const bool wrapCursor = m_vi->view()->wrapCursor();
+     int maxColumn = -1;
+     if (n >= 0) {
+       for (int i = 0; i < n; i++) {
+         if (m_column >= thisLine->length()) {
+-          if (!noWrapCursor) {
++          if (wrapCursor) {
              break;
-         default:
-             setError(QNetworkReply::UnknownNetworkError, errorString());
--            setAttribute(static_cast<QNetworkRequest::Attribute>(KIO::AccessManager::KioError), errcode);
-             kDebug() << errcode;
+ 
+           } else if (m_vi->view()->dynWordWrap()) {
+@@ -1320,10 +1319,7 @@
+       KateTextLayout t = cache()->textLayout(realLine, 0);
+       Q_ASSERT(t.isValid());
+ 
+-      if (m_currentMaxX > m_cursorX)
+-        m_cursorX = m_currentMaxX;
+-
+-      ret.setColumn(renderer()->xToCursor(t, m_cursorX, !m_view->wrapCursor()).column());
++      ret.setColumn(renderer()->xToCursor(t, m_preservedX, !m_view->wrapCursor()).column());
      }
  
-+    setAttribute(static_cast<QNetworkRequest::Attribute>(KIO::AccessManager::KioError), errcode);
-     emit finished();
- }
+     return ret;
+@@ -1390,13 +1386,9 @@
+         if (keepX) {
+           KTextEditor::Cursor realCursor = toRealCursor(virtualCursor);
+           KateTextLayout t = cache()->textLayout(realCursor);
+-          m_cursorX = renderer()->cursorToX(t, realCursor);
++          // renderer()->cursorToX(t, realCursor, !m_view->wrapCursor());
+ 
+-          if (m_currentMaxX > m_cursorX) {
+-            m_cursorX = m_currentMaxX;
+-          }
+-
+-          realCursor = renderer()->xToCursor(thisViewLine, m_cursorX, !m_view->wrapCursor());
++          realCursor = renderer()->xToCursor(thisViewLine, m_preservedX, !m_view->wrapCursor());
+           ret.setColumn(realCursor.column());
+         }
  
-Index: kio/kio/job.h
-===================================================================
---- kio/kio/job.h	(.../tags/KDE/4.3.2/kdelibs)	(wersja 1032821)
-+++ kio/kio/job.h	(.../branches/KDE/4.3/kdelibs)	(wersja 1032821)
-@@ -47,9 +47,9 @@
-      * Removes a single directory.
-      *
-      * The directory is assumed to be empty.
-+     * The job will fail if the directory is not empty.
-+     * Use KIO::del() (DeleteJob) to delete non-empty directories.
-      *
--     *
--     *
-      * @param url The URL of the directory to remove.
-      * @return A pointer to the job handling the operation.
-      */
-Index: kio/kio/deletejob.cpp
+@@ -1457,7 +1449,7 @@
+   if (m_displayCursor.line() == 0 && (!m_view->dynWordWrap() || cache()->viewLine(m_cursor) == 0))
+     return;
+ 
+-  m_preserveMaxX = true;
++  m_preserveX = true;
+ 
+   KateTextLayout thisLine = currentLayout();
+   // This is not the first line because that is already simplified out above
+@@ -1468,14 +1460,8 @@
+   Q_ASSERT(m_cursor.column() >= thisLine.startCol());
+   Q_ASSERT(!thisLine.wrap() || m_cursor.column() < thisLine.endCol());
+ 
+-  // Retrieve current cursor x position
+-  m_cursorX = renderer()->cursorToX(thisLine, m_cursor);
++  KTextEditor::Cursor c = renderer()->xToCursor(pRange, m_preservedX, !m_view->wrapCursor());
+ 
+-  if (m_currentMaxX > m_cursorX)
+-    m_cursorX = m_currentMaxX;
+-
+-  KTextEditor::Cursor c = renderer()->xToCursor(pRange, m_cursorX, !m_view->wrapCursor());
+-
+   updateSelection( c, sel );
+   l.unlock();
+   updateCursor( c );
+@@ -1493,7 +1479,7 @@
+   if ((m_displayCursor.line() >= m_doc->numVisLines() - 1) && (!m_view->dynWordWrap() || cache()->viewLine(m_cursor) == cache()->lastViewLine(m_cursor.line())))
+     return;
+ 
+-  m_preserveMaxX = true;
++  m_preserveX = true;
+ 
+   KateTextLayout thisLine = currentLayout();
+   // This is not the last line because that is already simplified out above
+@@ -1504,14 +1490,8 @@
+       (m_cursor.column() >= thisLine.startCol()) &&
+       (!thisLine.wrap() || m_cursor.column() < thisLine.endCol()));
+ 
+-  // Retrieve current cursor x position
+-  m_cursorX = renderer()->cursorToX(thisLine, m_cursor);
++  KTextEditor::Cursor c = renderer()->xToCursor(nRange, m_preservedX, !m_view->wrapCursor());
+ 
+-  if (m_currentMaxX > m_cursorX)
+-    m_cursorX = m_currentMaxX;
+-
+-  KTextEditor::Cursor c = renderer()->xToCursor(nRange, m_cursorX, !m_view->wrapCursor());
+-
+   l.unlock();
+   updateSelection(c, sel);
+   l.unlock();
+@@ -1593,11 +1573,9 @@
+   int lineadj = m_minLinesVisible;
+ 
+   int linesToScroll = -qMax( (linesDisplayed() - 1) - lineadj, 0 );
+-  m_preserveMaxX = true;
++  m_preserveX = true;
+ 
+   if (!m_doc->pageUpDownMovesCursor () && !atTop) {
+-    m_cursorX = renderer()->cursorToX(currentLayout(), m_cursor);
+-
+     KTextEditor::Cursor newStartPos = viewLineOffset(startPos(), linesToScroll - 1);
+     scrollPos(newStartPos);
+ 
+@@ -1606,12 +1584,9 @@
+ 
+     KateTextLayout newLine = cache()->textLayout(newPos);
+ 
+-    if (m_currentMaxX> m_cursorX)
+-      m_cursorX = m_currentMaxX;
++    newPos = renderer()->xToCursor(newLine, m_preservedX, !view()->wrapCursor());
+ 
+-    newPos = renderer()->xToCursor(newLine, m_cursorX, !view()->wrapCursor());
+-
+-    m_preserveMaxX = true;
++    m_preserveX = true;
+     updateSelection( newPos, sel );
+     l.unlock();
+     updateCursor(newPos);
+@@ -1638,11 +1613,9 @@
+   int lineadj = m_minLinesVisible;
+ 
+   int linesToScroll = qMax( (linesDisplayed() - 1) - lineadj, 0 );
+-  m_preserveMaxX = true;
++  m_preserveX = true;
+ 
+   if (!m_doc->pageUpDownMovesCursor () && !atEnd) {
+-    m_cursorX = renderer()->cursorToX(currentLayout(), m_cursor);
+-
+     KTextEditor::Cursor newStartPos = viewLineOffset(startPos(), linesToScroll + 1);
+     scrollPos(newStartPos);
+ 
+@@ -1651,12 +1624,9 @@
+ 
+     KateTextLayout newLine = cache()->textLayout(newPos);
+ 
+-    if (m_currentMaxX> m_cursorX)
+-      m_cursorX = m_currentMaxX;
++    newPos = renderer()->xToCursor(newLine, m_preserveX, !view()->wrapCursor());
+ 
+-    newPos = renderer()->xToCursor(newLine, m_cursorX, !view()->wrapCursor());
+-
+-    m_preserveMaxX = true;
++    m_preserveX = true;
+     updateSelection( newPos, sel );
+     l.unlock();
+     updateCursor(newPos);
+@@ -1698,15 +1668,10 @@
+ {
+   QMutexLocker lock(m_doc->smartMutex());
+ 
+-  m_cursorX = renderer()->cursorToX(currentLayout(), m_cursor);
+-
+   KTextEditor::Cursor newCursor(0, 0);
+ 
+-  if (m_currentMaxX > m_cursorX)
+-    m_cursorX = m_currentMaxX;
++  newCursor = renderer()->xToCursor(cache()->textLayout(newCursor), m_preserveX, !view()->wrapCursor());
+ 
+-  newCursor = renderer()->xToCursor(cache()->textLayout(newCursor), m_cursorX, !view()->wrapCursor());
+-
+   updateSelection( newCursor, sel );
+   lock.unlock();
+   updateCursor( newCursor );
+@@ -1718,11 +1683,8 @@
+   
+   KTextEditor::Cursor newCursor(m_doc->lastLine(), 0);
+ 
+-  if (m_currentMaxX > m_cursorX)
+-    m_cursorX = m_currentMaxX;
++  newCursor = renderer()->xToCursor(cache()->textLayout(newCursor), m_preserveX, !view()->wrapCursor());
+ 
+-  newCursor = renderer()->xToCursor(cache()->textLayout(newCursor), m_cursorX, !view()->wrapCursor());
+-
+   updateSelection( newCursor, sel );
+   lock.unlock();
+   updateCursor( newCursor );
+@@ -1903,12 +1865,6 @@
+   m_cursor = newCursor;
+   m_displayCursor = toVirtualCursor(m_cursor);
+   
+-  {
+-    QMutexLocker lock(m_doc->smartMutex());
+-
+-    m_cursorX = renderer()->cursorToX(cache()->textLayout(m_cursor), m_cursor);
+-  }
+-  
+   if ( m_view == m_doc->activeView() )
+     makeVisible ( m_displayCursor, m_displayCursor.column(), false, center, calledExternally );
+ 
+@@ -1930,12 +1886,14 @@
+   }
+ 
+   // Remember the maximum X position if requested
+-  if (m_preserveMaxX)
+-    m_preserveMaxX = false;
+-  else
+-    m_currentMaxX = m_cursorX;
++  if (m_preserveX)
++    m_preserveX = false;
++  else {
++    QMutexLocker lock(m_doc->smartMutex());
++    m_preservedX = renderer()->cursorToX(cache()->textLayout(m_cursor), m_cursor, !m_view->wrapCursor());
++  }
+ 
+-  //kDebug(13030) << "m_currentMaxX: " << m_currentMaxX << " (was "<< oldmaxx << "), m_cursorX: " << m_cursorX;
++  //kDebug(13030) << "m_preservedX: " << m_preservedX << " (was "<< oldmaxx << "), m_cursorX: " << m_cursorX;
+   //kDebug(13030) << "Cursor now located at real " << cursor.line << "," << cursor.col << ", virtual " << m_displayCursor.line << ", " << m_displayCursor.col << "; Top is " << startLine() << ", " << startPos().col;
+ 
+   cursorMoved();
+Index: kate/document/katetextline.cpp
 ===================================================================
---- kio/kio/deletejob.cpp	(.../tags/KDE/4.3.2/kdelibs)	(wersja 1032821)
-+++ kio/kio/deletejob.cpp	(.../branches/KDE/4.3/kdelibs)	(wersja 1032821)
-@@ -219,7 +219,7 @@
-         // Fast path for KFileItems in directory views
-         while(m_currentStat != m_srcList.end()) {
-             m_currentURL = (*m_currentStat);
--            KFileItem cachedItem = KDirLister::cachedItemForUrl(m_currentURL);
-+            const KFileItem cachedItem = KDirLister::cachedItemForUrl(m_currentURL);
-             if (cachedItem.isNull())
-                 break;
-             //kDebug(7007) << "Found cached info about" << m_currentURL << "isDir=" << cachedItem.isDir() << "isLink=" << cachedItem.isLink();
-@@ -343,6 +343,7 @@
-                 // Call rmdir - works for kioslaves with canDeleteRecursive too,
-                 // CMD_DEL will trigger the recursive deletion in the slave.
-                 SimpleJob* job = KIO::rmdir( *it );
-+                job->addMetaData(QString::fromLatin1("recurse"), "true");
-                 Scheduler::scheduleJob(job);
-                 dirs.erase(it);
-                 q->addSubjob( job );
-Index: kio/tests/jobtest.h
-===================================================================
---- kio/tests/jobtest.h	(.../tags/KDE/4.3.2/kdelibs)	(wersja 1032821)
-+++ kio/tests/jobtest.h	(.../branches/KDE/4.3/kdelibs)	(wersja 1032821)
-@@ -64,6 +64,8 @@
-     void deleteManyDirs();
-     void deleteManyFilesIndependently();
-     void deleteManyFilesTogether();
-+    void rmdirEmpty();
-+    void rmdirNotEmpty();
-     void stat();
-     void mimeType();
-     //void newApiPerformance();
-Index: kio/tests/jobtest.cpp
-===================================================================
---- kio/tests/jobtest.cpp	(.../tags/KDE/4.3.2/kdelibs)	(wersja 1032821)
-+++ kio/tests/jobtest.cpp	(.../branches/KDE/4.3/kdelibs)	(wersja 1032821)
-@@ -1315,6 +1315,26 @@
-     deleteManyFilesTogether(false);
+--- kate/document/katetextline.cpp	(.../tags/KDE/4.3.3/kdelibs)	(wersja 1053992)
++++ kate/document/katetextline.cpp	(.../branches/KDE/4.3/kdelibs)	(wersja 1053992)
+@@ -124,6 +124,14 @@
+   return previousNonSpaceChar(m_text.length() - 1);
  }
  
-+void JobTest::rmdirEmpty()
++QString KateTextLine::leadingWhitespace() const
 +{
-+    const QString dir = homeTmpDir() + "dir";
-+    QDir().mkdir(dir);
-+    QVERIFY(QFile::exists(dir));
-+    KIO::Job* job = KIO::rmdir(dir);
-+    QVERIFY(job->exec());
-+    QVERIFY(!QFile::exists(dir));
-+}
++  if (firstChar() < 0)
++    return string(0, length());
 +
-+void JobTest::rmdirNotEmpty()
-+{
-+    const QString dir = homeTmpDir() + "dir";
-+    createTestDirectory(dir);
-+    createTestDirectory(dir + "/subdir");
-+    KIO::Job* job = KIO::rmdir(dir);
-+    QVERIFY(!job->exec());
-+    QVERIFY(QFile::exists(dir));
++  return string(0, firstChar());
 +}
 +
- void JobTest::stat()
+ int KateTextLine::indentDepth (int tabWidth) const
  {
- #if 1
-Index: kdecore/services/kmimetype.cpp
+   int d = 0;
+Index: kate/document/katetextline.h
 ===================================================================
---- kdecore/services/kmimetype.cpp	(.../tags/KDE/4.3.2/kdelibs)	(wersja 1032821)
-+++ kdecore/services/kmimetype.cpp	(.../branches/KDE/4.3/kdelibs)	(wersja 1032821)
-@@ -233,6 +233,11 @@
-     return KMimeType::Ptr();
- }
+--- kate/document/katetextline.h	(.../tags/KDE/4.3.3/kdelibs)	(wersja 1053992)
++++ kate/document/katetextline.h	(.../branches/KDE/4.3/kdelibs)	(wersja 1053992)
+@@ -167,6 +167,8 @@
+     inline QString string(int column, int length) const
+     { return m_text.mid(column, length); }
  
-+static bool mimeTypeListSortByName(const KMimeType::Ptr& m1, const KMimeType::Ptr& m2)
-+{
-+    return m1->name() < m2->name();
-+}
++    QString leadingWhitespace() const;
<<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.15&r2=1.16&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdelibs/kde4-kdelibs.spec?r1=1.171&r2=1.172&f=u

More information about the pld-cvs-commit mailing list