SOURCES: kde4-kdelibs-branch.diff - from DEVEL
shadzik
shadzik at pld-linux.org
Tue Feb 3 12:14:31 CET 2009
Author: shadzik Date: Tue Feb 3 11:14:31 2009 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- from DEVEL
---- Files affected:
SOURCES:
kde4-kdelibs-branch.diff (1.1 -> 1.2)
---- Diffs:
================================================================
Index: SOURCES/kde4-kdelibs-branch.diff
diff -u /dev/null SOURCES/kde4-kdelibs-branch.diff:1.2
--- /dev/null Tue Feb 3 12:14:32 2009
+++ SOURCES/kde4-kdelibs-branch.diff Tue Feb 3 12:14:25 2009
@@ -0,0 +1,6322 @@
+Index: khtml/misc/borderarcstroker.cpp
+===================================================================
+--- khtml/misc/borderarcstroker.cpp (.../tags/KDE/4.2.0/kdelibs) (wersja 920543)
++++ khtml/misc/borderarcstroker.cpp (.../branches/KDE/4.2/kdelibs) (wersja 920543)
+@@ -347,7 +347,7 @@
+ const KCubicBezier inner(innerPath.elementAt(0), innerPath.elementAt(1), innerPath.elementAt(2), innerPath.elementAt(3));
+ const KCubicBezier outer(outerPath.elementAt(0), outerPath.elementAt(1), outerPath.elementAt(2), outerPath.elementAt(3));
+
+- qreal a = std::fmod(angle, 360.0);
++ qreal a = std::fmod(angle, qreal(360.0));
+ if (a < 0)
+ a += 360.0;
+
+Index: khtml/khtml_part.cpp
+===================================================================
+--- khtml/khtml_part.cpp (.../tags/KDE/4.2.0/kdelibs) (wersja 920543)
++++ khtml/khtml_part.cpp (.../branches/KDE/4.2/kdelibs) (wersja 920543)
+@@ -291,16 +291,26 @@
+ if ( prof == BrowserViewGUI ) {
+ d->m_paViewDocument = new KAction( i18n( "View Do&cument Source" ), this );
+ actionCollection()->addAction( "viewDocumentSource", d->m_paViewDocument );
+- d->m_paViewDocument->setShortcut( QKeySequence(Qt::CTRL + Qt::Key_U) );
+ connect( d->m_paViewDocument, SIGNAL( triggered( bool ) ), this, SLOT( slotViewDocumentSource() ) );
++ if (!parentPart()) {
++ d->m_paViewDocument->setShortcut( QKeySequence(Qt::CTRL + Qt::Key_U) );
++ d->m_paViewDocument->setShortcutContext( Qt::WidgetWithChildrenShortcut );
++ }
+
+ d->m_paViewFrame = new KAction( i18n( "View Frame Source" ), this );
+ actionCollection()->addAction( "viewFrameSource", d->m_paViewFrame );
+ connect( d->m_paViewFrame, SIGNAL( triggered( bool ) ), this, SLOT( slotViewFrameSource() ) );
++ if (!parentPart()) {
++ d->m_paViewFrame->setShortcut( QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_U) );
++ d->m_paViewFrame->setShortcutContext( Qt::WidgetWithChildrenShortcut );
++ }
+
+ d->m_paViewInfo = new KAction( i18n( "View Document Information" ), this );
+ actionCollection()->addAction( "viewPageInfo", d->m_paViewInfo );
+- d->m_paViewInfo->setShortcut( QKeySequence(Qt::CTRL+Qt::Key_I) );
++ if (!parentPart()) {
++ d->m_paViewInfo->setShortcut( QKeySequence(Qt::CTRL+Qt::Key_I) );
++ d->m_paViewInfo->setShortcutContext( Qt::WidgetWithChildrenShortcut );
++ }
+ connect( d->m_paViewInfo, SIGNAL( triggered( bool ) ), this, SLOT( slotViewPageInfo() ) );
+
+ d->m_paSaveBackground = new KAction( i18n( "Save &Background Image As..." ), this );
+@@ -461,7 +471,7 @@
+ d->m_paSelectAll = actionCollection()->addAction( KStandardAction::SelectAll, "selectAll",
+ this, SLOT( slotSelectAll() ) );
+ d->m_paSelectAll->setShortcutContext( Qt::WidgetWithChildrenShortcut );
+- if ( parentPart() )
++ if ( parentPart() ) // Only the frameset has the shortcut, but the slot uses the current frame.
+ d->m_paSelectAll->setShortcuts( KShortcut() ); // avoid clashes
+
+ d->m_paToggleCaretMode = new KToggleAction(i18n("Toggle Caret Mode"), this );
+Index: khtml/ecma/kjs_dom.cpp
+===================================================================
+--- khtml/ecma/kjs_dom.cpp (.../tags/KDE/4.2.0/kdelibs) (wersja 920543)
++++ khtml/ecma/kjs_dom.cpp (.../branches/KDE/4.2/kdelibs) (wersja 920543)
+@@ -655,15 +655,15 @@
+ static_cast<DOM::DocumentFragmentImpl*>(range->createContextualFragment(args[1]->toString(exec).domString(), exception).handle());
+ if (exception.triggered()) return jsUndefined();
+
+- DOMString where = args[0]->toString(exec).domString();
++ DOMString where = args[0]->toString(exec).domString().lower();
+
+- if (where == "beforeBegin" || where == "BeforeBegin")
++ if (where == "beforebegin")
+ node.parentNode()->insertBefore(docFrag.get(), &node, exception);
+- else if (where == "afterBegin" || where == "AfterBegin")
++ else if (where == "afterbegin")
+ node.insertBefore(docFrag.get(), node.firstChild(), exception);
+- else if (where == "beforeEnd" || where == "BeforeEnd")
++ else if (where == "beforeend")
+ return getDOMNode(exec, node.appendChild(docFrag.get(), exception));
+- else if (where == "afterEnd" || where == "AfterEnd")
++ else if (where == "afterend")
+ if (node.nextSibling())
+ node.parentNode()->insertBefore(docFrag.get(), node.nextSibling(),exception);
+ else
+Index: cmake/modules/FindGMP.cmake
+===================================================================
+--- cmake/modules/FindGMP.cmake (.../tags/KDE/4.2.0/kdelibs) (wersja 920543)
++++ cmake/modules/FindGMP.cmake (.../branches/KDE/4.2/kdelibs) (wersja 920543)
+@@ -15,7 +15,7 @@
+ endif (GMP_INCLUDE_DIR AND GMP_LIBRARIES)
+
+ find_path(GMP_INCLUDE_DIR NAMES gmp.h )
+-find_library(GMP_LIBRARIES NAMES gmp )
++find_library(GMP_LIBRARIES NAMES gmp libgmp)
+
+ include(FindPackageHandleStandardArgs)
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(GMP DEFAULT_MSG GMP_INCLUDE_DIR GMP_LIBRARIES)
+Index: interfaces/ktexteditor/ktexteditor_loadsavefiltercheckplugin.desktop
+===================================================================
+--- interfaces/ktexteditor/ktexteditor_loadsavefiltercheckplugin.desktop (.../tags/KDE/4.2.0/kdelibs) (wersja 920543)
++++ interfaces/ktexteditor/ktexteditor_loadsavefiltercheckplugin.desktop (.../branches/KDE/4.2/kdelibs) (wersja 920543)
+@@ -30,6 +30,7 @@
+ Comment[kn]=ಕೆಟೆಕ್ಸ್ಟ್ ಎಡಿಟರ್ ಉತ್ಥಾಪಿಸು/ಉಳಿಸು ಶೋಧಿಸು/ಪರಿಶೀಲಿಸಿ ಮಿಳಿತಾನ್ವಯ (ಪ್ಲಗಿನ್)
+ Comment[ko]=KTextEditor 필터/검사 불러오기/저장 플러그인
+ Comment[ku]=KEdîtoraNivîsê pêveka barbike/tomarbike parzûnbike/kontrolbike
++Comment[lt]=KTextEditor įkėlimo/įrašymo filtro/tikrinimo priedas
+ Comment[lv]=KTextEditor ielādēšanas/saglabāšanas filtrs/pārbaudīšanas spraudnis
+ Comment[mai]=KTextEditor लोड/सहेज फिल्टर/जाँच प्लगइन
+ Comment[ml]=കെടെക്സ്റ്റ്എഡിറ്റര് ചേര്ക്കുക/സൂക്ഷിയ്ക്കുക ഫില്ടര്/പരിശോദിയ്ക്കുക എന്നതിനുള്ള സംയോജകം
+@@ -42,7 +43,7 @@
+ Comment[pt]='Plugin' de filtragem/verificação do carregamento/gravação do KTextEditor
+ Comment[pt_BR]=Plug-in de carregamento/gravação e filtro/verificação do KTextEditor
+ Comment[ro]=Modul de încărcare/salvare filtrare/verificare pentru KTextEditor
+-Comment[ru]=Расширение фильтра загрузки и сохранения файла для KTextEditor
++Comment[ru]=Загрузка и сохранение фильтров для KTextEditor
+ Comment[sk]=KTextEditor nahrať/uložiť filtrovať/skontrolovať rozšírenie
+ Comment[sr]=Прикључак уређивача текста за филтрирање и проверу на учитавању и уписивању
+ Comment[sr at latin]=Priključak uređivača teksta za filtriranje i proveru na učitavanju i upisivanju
+Index: interfaces/ktexteditor/codecompletionmodelcontrollerinterface.cpp
+===================================================================
+--- interfaces/ktexteditor/codecompletionmodelcontrollerinterface.cpp (.../tags/KDE/4.2.0/kdelibs) (wersja 920543)
++++ interfaces/ktexteditor/codecompletionmodelcontrollerinterface.cpp (.../branches/KDE/4.2/kdelibs) (wersja 920543)
+@@ -19,6 +19,8 @@
+
+ #include "codecompletionmodelcontrollerinterface.h"
+
++#include <QtCore/QModelIndex>
++
+ #include <ktexteditor/view.h>
+ #include <ktexteditor/document.h>
+
+Index: kate/plugins/kdatatool/ktexteditor_kdatatool.desktop
+===================================================================
+--- kate/plugins/kdatatool/ktexteditor_kdatatool.desktop (.../tags/KDE/4.2.0/kdelibs) (wersja 920543)
++++ kate/plugins/kdatatool/ktexteditor_kdatatool.desktop (.../branches/KDE/4.2/kdelibs) (wersja 920543)
+@@ -64,7 +64,7 @@
+ Name[pt]=Ferramentas de Dados
+ Name[pt_BR]=Ferramentas de dados
+ Name[ro]=Utilitare de date
+-Name[ru]=Работа с данными
++Name[ru]=Обработка данных
+ Name[sk]=Dátové nástroje
+ Name[sl]=Podatkovna orodja
+ Name[sr]=Алатке за податке
+@@ -137,7 +137,7 @@
+ Comment[pt]=Activa as ferramentas de dados como os sinónimos e a verificação ortográfica (se estiverem instalados)
+ Comment[pt_BR]=Habilita ferramentas de dados, como dicionário de sinônimos e verificador ortográfico (se instalados)
+ Comment[ro]=Activează utilitare de date precum dicționarul și verificarea ortografică (dacă sînt instalate)
+-Comment[ru]=Расширения типа словаря и проверки орфографии (если они установлены)
++Comment[ru]=Обработка данных, например, показ синонимов и проверка орфографии (если они установлены)
+ Comment[se]=Geavat diehtoreaidduid nugo synonymasátnelisttu ja čállindárkkisteami (jos leat sajáiduhttojuvvon)
+ Comment[sk]=Podpora dátových nástrojov, ako je thesaurus a kontrola pravopisu (ak sú nainštalované)
+ Comment[sl]=Omogoči orodja za podatke, kot so slovar sopomenk in preverjanje črkovanja (če so nameščena)
+Index: kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop
+===================================================================
+--- kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop (.../tags/KDE/4.2.0/kdelibs) (wersja 920543)
++++ kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop (.../branches/KDE/4.2/kdelibs) (wersja 920543)
+@@ -71,7 +71,7 @@
+ Name[pt]=Completação de Palavras
+ Name[pt_BR]=Complementação de palavras
+ Name[ro]=Modul de completare cuvinte
+-Name[ru]=Дополнение слов
++Name[ru]=Завершение слов
+ Name[se]=Sátneollášuhttin
+ Name[sk]=Dokončenie slova
+ Name[sl]=Dopolnjevanje besed
+@@ -146,7 +146,7 @@
+ Comment[pt]=Completação direccional ou por lista de palavras no documento
+ Comment[pt_BR]=Complementação direcional ou baseada em popup, a partir de palavras do documento
+ Comment[ro]=Propune completarea cuvintelor din document dintr-o listă popup sau direcțională
+-Comment[ru]=Автодополнение слов в документе
++Comment[ru]=Автозавершение слов в документе
+ Comment[sk]=Dopĺňanie slov v dokumente priame alebo pomocou dialógu
+ Comment[sl]=Neposredno ali pojavno dopolnjevanje iz besed v dokumentu
+ Comment[sr]=Дирекционо или искачуће допуњавање према речима из документа
+Index: kate/plugins/pythonencoding/ktexteditor_python-encoding.desktop
+===================================================================
+--- kate/plugins/pythonencoding/ktexteditor_python-encoding.desktop (.../tags/KDE/4.2.0/kdelibs) (wersja 920543)
++++ kate/plugins/pythonencoding/ktexteditor_python-encoding.desktop (.../branches/KDE/4.2/kdelibs) (wersja 920543)
+@@ -39,7 +39,7 @@
+ Name[pt]=Verificação/adição da codificação em Python
+ Name[pt_BR]=Verificação/adição da codificação em Python
+ Name[ro]=Verificator/adăugător de codări Python
+-Name[ru]=Поддержка кодировки для Python
++Name[ru]=Проверка кодировки исходного кода на Python
+ Name[sk]=Python manažér kódovania
+ Name[sr]=Оверивач и додавач кодирања у питону
+ Name[sr at latin]=Overivač i dodavač kodiranja u Pythonu
+@@ -91,7 +91,7 @@
+ Comment[pt]=Ao gravar, verifica a codificação dos ficheiros em Python e adiciona uma linha de codificação
+ Comment[pt_BR]=Ao salvar, verifica a codificação dos arquivos em python e adiciona uma linha de codificação
+ Comment[ro]=Verifică codarea fișierelor python în timpul salvării și adaugă o linie de codare
+-Comment[ru]=Добавление строки с кодировкой при записи файлов с кодом Python
++Comment[ru]=Проверка кодировки при сохранении файла исходного кода на Python и вставка кодировки в текст
+ Comment[sk]=Pri ukladaní kontroluje kódovanie pythonových súborov a pridáva záznam o kódovaní
+ Comment[sl]=Med shranjevanje datotek pythona preveri kodiranje in doda kodno vrstico
+ Comment[sr]=При уписивању питонских фајлова, проверава и додаје ред о кодирању
+Index: kate/plugins/timedate/ktexteditor_timedate.desktop
+===================================================================
+--- kate/plugins/timedate/ktexteditor_timedate.desktop (.../tags/KDE/4.2.0/kdelibs) (wersja 920543)
++++ kate/plugins/timedate/ktexteditor_timedate.desktop (.../branches/KDE/4.2/kdelibs) (wersja 920543)
+@@ -120,7 +120,7 @@
+ Comment[hu]=Az aktuális dátum és idő beszúrása
+ Comment[hy]=Մտցրեք ընթացիք Ժամը և Ամսաթիվը
+ Comment[is]=Setja inn núverandi tíma- og dagsetningu
+-Comment[it]=Inserisce la data e ora correnti
++Comment[it]=Inserisce la data e ora attuali
+ Comment[ja]=現在の日付と時間を挿入
+ Comment[kk]=Уақыт пен күн белгісін қою
+ Comment[km]=បញ្ចូលពេលវេលា និងកាលបរិច្ឆេទបច្ចុប្បន្ន
+Index: kate/vimode/katevinormalmode.cpp
+===================================================================
+--- kate/vimode/katevinormalmode.cpp (.../tags/KDE/4.2.0/kdelibs) (wersja 920543)
++++ kate/vimode/katevinormalmode.cpp (.../branches/KDE/4.2/kdelibs) (wersja 920543)
+@@ -471,167 +471,6 @@
+ return false;
+ }
+
+-KateViRange KateViNormalMode::motionWordForward()
+-{
+- KTextEditor::Cursor c( m_view->cursorPosition() );
+- KateViRange r( c.line(), c.column(), ViMotion::ExclusiveMotion );
+-
+- // Special case: If we're already on the very last character in the document, the motion should be
+- // inclusive so the last character gets included
+- if ( c.line() == m_doc->lines()-1 && c.column() == m_doc->lineLength( c.line() )-1 ) {
+- r.motionType = ViMotion::InclusiveMotion;
+- } else {
+- for ( unsigned int i = 0; i < getCount(); i++ ) {
+- c = findNextWordStart( c.line(), c.column() );
+-
+- // stop when at the last char in the document
+- if ( c.line() == m_doc->lines()-1 && c.column() == m_doc->lineLength( c.line() )-1 ) {
+- // if we still haven't "used up the count", make the motion inclusive, so that the last char
+- // is included
+- if ( i < getCount() ) {
+- r.motionType = ViMotion::InclusiveMotion;
+- }
+- break;
+- }
+- }
+- }
+-
+- r.endColumn = c.column();
+- r.endLine = c.line();
+-
+- return r;
+-}
+-
+-KateViRange KateViNormalMode::motionWordBackward()
+-{
+- KTextEditor::Cursor c( m_view->cursorPosition() );
+- KateViRange r( c.line(), c.column(), ViMotion::ExclusiveMotion );
+-
+- for ( unsigned int i = 0; i < getCount(); i++ ) {
+- c = findPrevWordStart( c.line(), c.column() );
+-
+- // stop when at the first char in the document
+- if ( c.line() == 0 && c.column() == 0 ) {
+- break;
+- }
+- }
+-
+- r.endColumn = c.column();
+- r.endLine = c.line();
+-
+- return r;
+-}
+-
+-KateViRange KateViNormalMode::motionWORDForward()
+-{
+- KTextEditor::Cursor c( m_view->cursorPosition() );
+- KateViRange r( c.line(), c.column(), ViMotion::ExclusiveMotion );
+-
+- for ( unsigned int i = 0; i < getCount(); i++ ) {
+- c = findNextWORDStart( c.line(), c.column() );
+-
+- // stop when at the last char in the document
+- if ( c.line() == m_doc->lines()-1 && c.column() == m_doc->lineLength( c.line() )-1 ) {
+- break;
+- }
+- }
+-
+- r.endColumn = c.column();
+- r.endLine = c.line();
+-
+- return r;
+-}
+-
+-KateViRange KateViNormalMode::motionWORDBackward()
+-{
+- KTextEditor::Cursor c( m_view->cursorPosition() );
+- KateViRange r( c.line(), c.column(), ViMotion::ExclusiveMotion );
+-
+- for ( unsigned int i = 0; i < getCount(); i++ ) {
+- c = findPrevWORDStart( c.line(), c.column() );
+-
+- // stop when at the first char in the document
+- if ( c.line() == 0 && c.column() == 0 ) {
+- break;
+- }
+- }
+-
+- r.endColumn = c.column();
+- r.endLine = c.line();
+-
+- return r;
+-}
+-
+-KateViRange KateViNormalMode::motionToEndOfWord()
+-{
+- KTextEditor::Cursor c( m_view->cursorPosition() );
+- KateViRange r( c.line(), c.column(), ViMotion::InclusiveMotion );
+-
+- for ( unsigned int i = 0; i < getCount(); i++ ) {
+- c = findWordEnd( c.line(), c.column() );
+- }
+-
+- r.endColumn = c.column();
+- r.endLine = c.line();
+-
+- return r;
+-}
+-
+-KateViRange KateViNormalMode::motionToEndOfWORD()
+-{
+- KTextEditor::Cursor c( m_view->cursorPosition() );
+- KateViRange r( c.line(), c.column(), ViMotion::InclusiveMotion );
+-
+- for ( unsigned int i = 0; i < getCount(); i++ ) {
+- c = findWORDEnd( c.line(), c.column() );
+- }
+-
+- r.endColumn = c.column();
+- r.endLine = c.line();
+-
+- return r;
+-}
+-
+-KateViRange KateViNormalMode::motionToEndOfPrevWord()
+-{
+- KTextEditor::Cursor c( m_view->cursorPosition() );
+- KateViRange r( c.line(), c.column(), ViMotion::InclusiveMotion );
+-
+- for ( unsigned int i = 0; i < getCount(); i++ ) {
+- c = findPrevWordEnd( c.line(), c.column() );
+-
+- // stop when at the first char in the document
+- if ( c.line() == 0 && c.column() == 0 ) {
+- break;
+- }
+- }
+-
+- r.endColumn = c.column();
+- r.endLine = c.line();
+-
+- return r;
+-}
+-
+-KateViRange KateViNormalMode::motionToEndOfPrevWORD()
+-{
+- KTextEditor::Cursor c( m_view->cursorPosition() );
+- KateViRange r( c.line(), c.column(), ViMotion::InclusiveMotion );
+-
+- for ( unsigned int i = 0; i < getCount(); i++ ) {
+- c = findPrevWORDEnd( c.line(), c.column() );
+-
+- // stop when at the first char in the document
+- if ( c.line() == 0 && c.column() == 0 ) {
+- break;
+- }
+- }
+-
+- r.endColumn = c.column();
+- r.endLine = c.line();
+-
+- return r;
+-}
+-
+ bool KateViNormalMode::commandDeleteLine()
+ {
+ KTextEditor::Cursor c( m_view->cursorPosition() );
+@@ -1392,6 +1231,183 @@
+ return r;
+ }
+
++KateViRange KateViNormalMode::motionWordForward()
++{
++ KTextEditor::Cursor c( m_view->cursorPosition() );
++ KateViRange r( c.line(), c.column(), ViMotion::ExclusiveMotion );
++
++ m_stickyColumn = -1;
++
++ // Special case: If we're already on the very last character in the document, the motion should be
++ // inclusive so the last character gets included
++ if ( c.line() == m_doc->lines()-1 && c.column() == m_doc->lineLength( c.line() )-1 ) {
++ r.motionType = ViMotion::InclusiveMotion;
++ } else {
++ for ( unsigned int i = 0; i < getCount(); i++ ) {
++ c = findNextWordStart( c.line(), c.column() );
++
++ // stop when at the last char in the document
++ if ( c.line() == m_doc->lines()-1 && c.column() == m_doc->lineLength( c.line() )-1 ) {
++ // if we still haven't "used up the count", make the motion inclusive, so that the last char
++ // is included
++ if ( i < getCount() ) {
++ r.motionType = ViMotion::InclusiveMotion;
++ }
++ break;
++ }
++ }
++ }
++
++ r.endColumn = c.column();
++ r.endLine = c.line();
++
++ return r;
++}
++
++KateViRange KateViNormalMode::motionWordBackward()
++{
++ KTextEditor::Cursor c( m_view->cursorPosition() );
++ KateViRange r( c.line(), c.column(), ViMotion::ExclusiveMotion );
++
++ m_stickyColumn = -1;
++
++ for ( unsigned int i = 0; i < getCount(); i++ ) {
++ c = findPrevWordStart( c.line(), c.column() );
++
++ // stop when at the first char in the document
++ if ( c.line() == 0 && c.column() == 0 ) {
++ break;
++ }
++ }
++
++ r.endColumn = c.column();
++ r.endLine = c.line();
++
++ return r;
++}
++
++KateViRange KateViNormalMode::motionWORDForward()
++{
++ KTextEditor::Cursor c( m_view->cursorPosition() );
++ KateViRange r( c.line(), c.column(), ViMotion::ExclusiveMotion );
++
++ m_stickyColumn = -1;
++
++ for ( unsigned int i = 0; i < getCount(); i++ ) {
++ c = findNextWORDStart( c.line(), c.column() );
++
++ // stop when at the last char in the document
++ if ( c.line() == m_doc->lines()-1 && c.column() == m_doc->lineLength( c.line() )-1 ) {
++ break;
++ }
++ }
++
++ r.endColumn = c.column();
++ r.endLine = c.line();
++
++ return r;
++}
++
++KateViRange KateViNormalMode::motionWORDBackward()
++{
++ KTextEditor::Cursor c( m_view->cursorPosition() );
++ KateViRange r( c.line(), c.column(), ViMotion::ExclusiveMotion );
++
++ m_stickyColumn = -1;
++
++ for ( unsigned int i = 0; i < getCount(); i++ ) {
++ c = findPrevWORDStart( c.line(), c.column() );
++
++ // stop when at the first char in the document
++ if ( c.line() == 0 && c.column() == 0 ) {
++ break;
++ }
++ }
++
++ r.endColumn = c.column();
++ r.endLine = c.line();
++
++ return r;
++}
++
++KateViRange KateViNormalMode::motionToEndOfWord()
++{
++ KTextEditor::Cursor c( m_view->cursorPosition() );
++ KateViRange r( c.line(), c.column(), ViMotion::InclusiveMotion );
++
++ m_stickyColumn = -1;
++
++ for ( unsigned int i = 0; i < getCount(); i++ ) {
++ c = findWordEnd( c.line(), c.column() );
++ }
++
++ r.endColumn = c.column();
++ r.endLine = c.line();
++
++ return r;
++}
++
++KateViRange KateViNormalMode::motionToEndOfWORD()
++{
++ KTextEditor::Cursor c( m_view->cursorPosition() );
++ KateViRange r( c.line(), c.column(), ViMotion::InclusiveMotion );
++
++ m_stickyColumn = -1;
++
++ for ( unsigned int i = 0; i < getCount(); i++ ) {
++ c = findWORDEnd( c.line(), c.column() );
++ }
++
++ r.endColumn = c.column();
++ r.endLine = c.line();
++
++ return r;
++}
++
++KateViRange KateViNormalMode::motionToEndOfPrevWord()
++{
++ KTextEditor::Cursor c( m_view->cursorPosition() );
++ KateViRange r( c.line(), c.column(), ViMotion::InclusiveMotion );
++
++ m_stickyColumn = -1;
++
++ for ( unsigned int i = 0; i < getCount(); i++ ) {
++ c = findPrevWordEnd( c.line(), c.column() );
++
++ // stop when at the first char in the document
++ if ( c.line() == 0 && c.column() == 0 ) {
++ break;
++ }
++ }
++
++ r.endColumn = c.column();
++ r.endLine = c.line();
++
++ return r;
++}
++
++KateViRange KateViNormalMode::motionToEndOfPrevWORD()
++{
++ KTextEditor::Cursor c( m_view->cursorPosition() );
++ KateViRange r( c.line(), c.column(), ViMotion::InclusiveMotion );
++
++ m_stickyColumn = -1;
++
++ for ( unsigned int i = 0; i < getCount(); i++ ) {
++ c = findPrevWORDEnd( c.line(), c.column() );
++
++ // stop when at the first char in the document
++ if ( c.line() == 0 && c.column() == 0 ) {
++ break;
++ }
++ }
++
++ r.endColumn = c.column();
++ r.endLine = c.line();
++
++ return r;
++}
++
+ KateViRange KateViNormalMode::motionToEOL()
+ {
+ m_stickyColumn = -1;
+@@ -1428,6 +1444,8 @@
+ KTextEditor::Cursor cursor ( m_view->cursorPosition() );
+ QString line = getLine();
+
++ m_stickyColumn = -1;
++
+ int matchColumn = cursor.column();
+
+ for ( unsigned int i = 0; i < getCount(); i++ ) {
+@@ -1451,6 +1469,8 @@
+ KTextEditor::Cursor cursor ( m_view->cursorPosition() );
+ QString line = getLine();
+
++ m_stickyColumn = -1;
++
+ int matchColumn = -1;
+
+ unsigned int hits = 0;
+@@ -1479,6 +1499,8 @@
+ KTextEditor::Cursor cursor ( m_view->cursorPosition() );
+ QString line = getLine();
+
++ m_stickyColumn = -1;
++
+ int matchColumn = cursor.column()+1;
+
+ for ( unsigned int i = 0; i < getCount(); i++ ) {
+@@ -1500,6 +1522,8 @@
+ KTextEditor::Cursor cursor ( m_view->cursorPosition() );
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kde4-kdelibs-branch.diff?r1=1.1&r2=1.2&f=u
More information about the pld-cvs-commit
mailing list