branches/work/kdelibs4_snapshot

Adam Treat treat at kde.org
Sun Sep 18 00:38:04 UTC 2005


SVN commit 461541 by treat:

* My first big svn backport so please forgive if this is wrong...

svn merge -r 455239:461093 $KDESVN/trunk/KDE/kdelibs/kate .
svn merge -r 455100:461093
$KDESVN/trunk/KDE/kdelibs/interfaces/ktexteditor .
svn merge -r 455351:461093 $KDESVN/trunk/KDE/kdelibs/kdecore/kurl.cpp
kurl.cpp
svn merge -r 455351:461093 $KDESVN/trunk/KDE/kdelibs/kdecore/kurl.h
kurl.h
Manually added HEAD kmenu.cpp and HEAD kmenu.h and include them in
Makefile.am
Changed calls to ::copy to ::copyBlock in katebuffer.cpp

This fixes kate so that it doesn't crash.

CCMAIL: kdevelop-devel at kdevelop.org
CCMAIL: kwrite-devel at kde.org



 D             interfaces/ktexteditor/DESIGN  
 A             interfaces/ktexteditor/Mainpage.dox   trunk/KDE/kdelibs/interfaces/ktexteditor/Mainpage.dox#461093
 M  +21 -23    interfaces/ktexteditor/cursor.cpp  
 M  +4 -3      interfaces/ktexteditor/cursor.h  
 M  +3 -3      interfaces/ktexteditor/editorchooser.cpp  
 M  +51 -2     interfaces/ktexteditor/editorchooser.h  
 M  +13 -2     interfaces/ktexteditor/range.cpp  
 M  +7 -5      interfaces/ktexteditor/range.h  
 M  +7 -7      interfaces/ktexteditor/view.h  
 M  +0 -1      kate/data/inform.xml  
 M  +1 -1      kate/part/Makefile.am  
 M  +9 -9      kate/part/kateautoindent.cpp  
 M  +3 -3      kate/part/kateautoindent.h  
 M  +6 -6      kate/part/katebookmarks.cpp  
 M  +3 -2      kate/part/katebookmarks.h  
 M  +3 -3      kate/part/katebuffer.cpp  
 M  +5 -5      kate/part/katecmds.cpp  
 M  +18 -18    kate/part/katecodecompletion.cpp  
 M  +4 -4      kate/part/katecodecompletion.h  
 M  +1 -7      kate/part/katecursor.h  
 M  +95 -69    kate/part/katedialogs.cpp  
 M  +17 -18    kate/part/katedialogs.h  
 M  +79 -66    kate/part/katedocument.cpp  
 M  +3 -3      kate/part/katedocument.h  
 M  +3 -2      kate/part/katedocumenthelpers.cpp  
 M  +2 -0      kate/part/kateedit.h  
 M  +1 -1      kate/part/katefactory.cpp  
 M  +1 -1      kate/part/kateglobal.cpp  
 M  +10 -10    kate/part/katehighlight.cpp  
 M  +3 -4      kate/part/katehighlight.h  
 M  +2 -2      kate/part/kateindentscriptabstracts.h  
 M  +5 -5      kate/part/katejscript.cpp  
 M  +1 -1      kate/part/katekeyinterceptorfunctor.h  
 M  +17 -17    kate/part/kateluaindentscript.cpp  
 M  +6 -6      kate/part/kateprinter.cpp  
 M  +13 -13    kate/part/kateprinter.h  
 M  +16 -16    kate/part/katerenderer.cpp  
 M  +1 -1      kate/part/katerenderer.h  
 M  +15 -15    kate/part/kateschema.cpp  
 M  +1 -1      kate/part/kateschema.h  
 M  +10 -10    kate/part/katesearch.cpp  
 M  +0 -2      kate/part/katesearch.h  
 M  +24 -29    kate/part/katesmartmanager.cpp  
 M  +4 -3      kate/part/katesmartmanager.h  
 M  +2 -2      kate/part/katespell.cpp  
 M  +21 -16    kate/part/katesupercursor.cpp  
 M  +2 -0      kate/part/katesuperrange.cpp  
 M  +1 -1      kate/part/katetemplatehandler.h  
 M  +37 -41    kate/part/kateview.cpp  
 M  +3 -3      kate/part/kateview.h  
 M  +22 -17    kate/part/kateviewhelpers.cpp  
 M  +65 -51    kate/part/kateviewinternal.cpp  
 M  +4 -2      kate/part/kateviewinternal.h  
 M  +4 -4      kate/plugins/autobookmarker/autobookmarker.h  
 M  +2 -5      kate/plugins/insertfile/insertfileplugin.h  
 M  +3 -3      kate/plugins/kdatatool/kate_kdatatool.cpp  
 M  +1 -3      kate/plugins/kdatatool/kate_kdatatool.h  
 M  +1 -1      kate/plugins/wordcompletion/docwordcompletion.h  
 M  +10 -9     kate/tests/Makefile.am  
 M  +63 -46    kate/tests/kateregression.cpp  
 M  +4 -6      kate/tests/kateregression.h  
 M  +247 -139  kate/tests/katetest.cpp  
 M  +38 -14    kate/tests/katetest.h  
 M  +2 -1      kate/tests/katetestui.rc  
 M  +158 -5    kdecore/kurl.cpp  
 M  +88 -19    kdecore/kurl.h  
 M  +2 -2      kdeui/Makefile.am  
 A             kdeui/kmenu.cpp   [License: LGPL (wrong address)]
 A             kdeui/kmenu.h   [License: LGPL (wrong address)]






More information about the KDevelop-devel mailing list