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

arekm arekm at pld-linux.org
Tue Mar 16 20:56:35 CET 2010 

Author: arekm                        Date: Tue Mar 16 19:56:35 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2; branch diff updated

---- Files affected:
packages/kde4-kdelibs:
   kde4-kdelibs-branch.diff (1.18 -> 1.19) , kde4-kdelibs.spec (1.183 -> 1.184) 

---- Diffs:

================================================================
Index: packages/kde4-kdelibs/kde4-kdelibs-branch.diff
diff -u packages/kde4-kdelibs/kde4-kdelibs-branch.diff:1.18 packages/kde4-kdelibs/kde4-kdelibs-branch.diff:1.19
--- packages/kde4-kdelibs/kde4-kdelibs-branch.diff:1.18	Thu Feb 18 00:16:35 2010
+++ packages/kde4-kdelibs/kde4-kdelibs-branch.diff	Tue Mar 16 20:56:29 2010
@@ -1,3481 +1,3520 @@
-Index: interfaces/ktexteditor/templateinterface.cpp
+Index: cmake/modules/FindBlitz.cmake
 ===================================================================
---- interfaces/ktexteditor/templateinterface.cpp	(.../tags/KDE/4.4.0/kdelibs)	(wersja 1091888)
-+++ interfaces/ktexteditor/templateinterface.cpp	(.../branches/KDE/4.4/kdelibs)	(wersja 1091888)
-@@ -114,7 +114,7 @@
- {
-   QMap<QString, QString> enhancedInitValues( initialValues );
- 
--  QRegExp rx( "[$%]\\{([^}\\s]+)\\}" );
-+  QRegExp rx( "[$%]\\{([^}\\r\\n]+)\\}" );
-   rx.setMinimal( true );
-   int pos = 0;
-   int offset;
-Index: kate/dialogs/katedialogs.cpp
-===================================================================
---- kate/dialogs/katedialogs.cpp	(.../tags/KDE/4.4.0/kdelibs)	(wersja 1091888)
-+++ kate/dialogs/katedialogs.cpp	(.../branches/KDE/4.4/kdelibs)	(wersja 1091888)
-@@ -743,6 +743,10 @@
-   ui->cmbDynamicWordWrapIndicator->addItem( i18n("Follow Line Numbers") );
-   ui->cmbDynamicWordWrapIndicator->addItem( i18n("Always On") );
- 
-+  // hide power user mode if activated anyway
-+  if (!KateGlobal::self()->simpleMode ())
-+    ui->chkDeveloperMode->hide ();
-+    
-   // What's This? help is in the ui-file
- 
-   reload();
-Index: kate/syntax/katehighlight.h
-===================================================================
---- kate/syntax/katehighlight.h	(.../tags/KDE/4.4.0/kdelibs)	(wersja 1091888)
-+++ kate/syntax/katehighlight.h	(.../branches/KDE/4.4/kdelibs)	(wersja 1091888)
-@@ -223,6 +223,7 @@
-      * the returned string is used as key for m_additionalData.
-      */
-     QString hlKeyForAttrib( int attrib ) const;
-+    QString hlKeyForContext( int attrib ) const;
+--- cmake/modules/FindBlitz.cmake	(.../tags/KDE/4.4.1/kdelibs)	(wersja 1104125)
++++ cmake/modules/FindBlitz.cmake	(.../branches/KDE/4.4/kdelibs)	(wersja 1104125)
+@@ -1,6 +1,6 @@
+-################################################################
+-########## DEPRECATED, use FindQImageBlitz instead #############
+-################################################################
++########################################################### 
++######### DEPRECATED, use FindQImageBlitz instead ######### 
++###########################################################
+ # - Try to find blitz lib
+ # Once done this will define
+ #
+Index: cmake/modules/Qt4ConfigDependentSettings.cmake
+===================================================================
+--- cmake/modules/Qt4ConfigDependentSettings.cmake	(.../tags/KDE/4.4.1/kdelibs)	(wersja 1104125)
++++ cmake/modules/Qt4ConfigDependentSettings.cmake	(.../branches/KDE/4.4/kdelibs)	(wersja 1104125)
+@@ -77,7 +77,18 @@
+ 
+ # QtOpenGL dependencies
+ QT_QUERY_QMAKE(QMAKE_LIBS_OPENGL "QMAKE_LIBS_OPENGL")
+-SEPARATE_ARGUMENTS(QMAKE_LIBS_OPENGL)
++IF(Q_WS_MAC)
++# On the Mac OpenGL is probably frameworks and QMAKE_LIBS_OPENGL can be e.g. "-framework OpenGL -framework AGL".
++# The separate_arguments() call in the other branch makes "-framework;-OpenGL;-framework;-lAGL" appear in the 
++# linker command. So we need to protect the "-framework foo" as non-separatable strings.
++# We do this by replacing the space after "-framework" with an underscore, then calling separate_arguments(),
++# and then we replace the underscores again with spaces. So we get proper linker commands. Alex
++  STRING(REGEX REPLACE "-framework +" "-framework_" QMAKE_LIBS_OPENGL "${QMAKE_LIBS_OPENGL}")
++  SEPARATE_ARGUMENTS(QMAKE_LIBS_OPENGL)
++  STRING(REGEX REPLACE "-framework_" "-framework " QMAKE_LIBS_OPENGL "${QMAKE_LIBS_OPENGL}")
++ELSE(Q_WS_MAC)
++  SEPARATE_ARGUMENTS(QMAKE_LIBS_OPENGL)
++ENDIF(Q_WS_MAC)
+ SET (QT_QTOPENGL_LIB_DEPENDENCIES ${QT_QTOPENGL_LIB_DEPENDENCIES} ${QMAKE_LIBS_OPENGL})
+ 
+ 
+Index: cmake/modules/KDE4Macros.cmake
+===================================================================
+--- cmake/modules/KDE4Macros.cmake	(.../tags/KDE/4.4.1/kdelibs)	(wersja 1104125)
++++ cmake/modules/KDE4Macros.cmake	(.../branches/KDE/4.4/kdelibs)	(wersja 1104125)
+@@ -1244,22 +1244,23 @@
+ # being automatically activated by the system bus.
+ # *WARNING* You have to install the helper in ${LIBEXEC_INSTALL_DIR} to make sure everything will work.
+ function(KDE4_INSTALL_AUTH_HELPER_FILES HELPER_TARGET HELPER_ID HELPER_USER)
+-    
+-  if (_kdeBootStrapping)
+-    set(_stubFilesDir  ${CMAKE_SOURCE_DIR}/kdecore/auth/backends/dbus/ )
+-  else (_kdeBootStrapping)
+-    set(_stubFilesDir  ${KDE4_DATA_INSTALL_DIR}/kauth/ )
+-  endif (_kdeBootStrapping)
++    if(KAUTH_HELPER_BACKEND_NAME STREQUAL "DBUS")
++        if (_kdeBootStrapping)
++            set(_stubFilesDir  ${CMAKE_SOURCE_DIR}/kdecore/auth/backends/dbus/ )
++        else (_kdeBootStrapping)
++            set(_stubFilesDir  ${KDE4_DATA_INSTALL_DIR}/kauth/ )
++        endif (_kdeBootStrapping)
+ 
+-  configure_file(${_stubFilesDir}/dbus_policy.stub
+-                 ${CMAKE_CURRENT_BINARY_DIR}/${HELPER_ID}.conf)
+-  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${HELPER_ID}.conf 
+-          DESTINATION ${SYSCONF_INSTALL_DIR}/dbus-1/system.d/)
+-       
+-  configure_file(${_stubFilesDir}/dbus_service.stub
+-                 ${CMAKE_CURRENT_BINARY_DIR}/${HELPER_ID}.service)
+-  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${HELPER_ID}.service 
+-          DESTINATION ${DBUS_SYSTEM_SERVICES_INSTALL_DIR})
++        configure_file(${_stubFilesDir}/dbus_policy.stub
++                        ${CMAKE_CURRENT_BINARY_DIR}/${HELPER_ID}.conf)
++        install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${HELPER_ID}.conf
++                DESTINATION ${SYSCONF_INSTALL_DIR}/dbus-1/system.d/)
++
++        configure_file(${_stubFilesDir}/dbus_service.stub
++                        ${CMAKE_CURRENT_BINARY_DIR}/${HELPER_ID}.service)
++        install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${HELPER_ID}.service
++                DESTINATION ${DBUS_SYSTEM_SERVICES_INSTALL_DIR})
++    endif(KAUTH_HELPER_BACKEND_NAME STREQUAL "DBUS")
+ endfunction(KDE4_INSTALL_AUTH_HELPER_FILES)
+ 
+ # This macro generates an action file, depending on the backend used, for applications using KAuth.
+@@ -1276,7 +1277,7 @@
+   elseif(KDE4_AUTH_BACKEND_NAME STREQUAL "POLKITQT" OR KDE4_AUTH_BACKEND_NAME STREQUAL "POLKITQT-1")
+     set(_output ${CMAKE_CURRENT_BINARY_DIR}/${HELPER_ID}.policy)
+     get_filename_component(_input ${ACTIONS_FILE} ABSOLUTE)
+-    
++
+     add_custom_command(OUTPUT ${_output} 
+                        COMMAND ${KDE4_KAUTH_POLICY_GEN_EXECUTABLE} ${_input} > ${_output} 
+                        MAIN_DEPENDENCY ${_input}
+Index: interfaces/kimproxy/interface/kcm_instantmessenger.desktop
+===================================================================
+--- interfaces/kimproxy/interface/kcm_instantmessenger.desktop	(.../tags/KDE/4.4.1/kdelibs)	(wersja 1104125)
++++ interfaces/kimproxy/interface/kcm_instantmessenger.desktop	(.../branches/KDE/4.4/kdelibs)	(wersja 1104125)
+@@ -33,6 +33,7 @@
+ Name[km]=កម្មវិធី​វិធី​ផ្ញើសារ​បន្ទាន់
+ Name[kn]=ತತ್ಷಣ ಓಲೆಕಾರ
+ Name[ko]=인스턴트 메신저
++Name[lt]=Momentinių žinučių klientas
+ Name[lv]=Tūlītējais ziņotājs
+ Name[ml]=ഇന്‍സ്റ്റന്റ് മെസഞ്ചര്‍
+ Name[ms]=Utusan Segera
+Index: interfaces/ktexteditor/kcm_ktexteditor.desktop
+===================================================================
+--- interfaces/ktexteditor/kcm_ktexteditor.desktop	(.../tags/KDE/4.4.1/kdelibs)	(wersja 1104125)
++++ interfaces/ktexteditor/kcm_ktexteditor.desktop	(.../branches/KDE/4.4/kdelibs)	(wersja 1104125)
+@@ -32,6 +32,7 @@
+ Name[km]=កម្មវិធី​និពន្ធ​អត្ថបទ​ដែល​បាន​បង្កប់
+ Name[kn]=ಹುದುಗಿಸಲಾದ (ಎಂಬೆಡೆಡ್) ಪಠ್ಯ ಸಂಪಾದಕ
+ Name[ko]=끼워넣은 텍스트 편집기
++Name[lt]=Įtaisyta tekstų rengyklė
+ Name[lv]=Iegultais teksta redaktors
+ Name[ml]=തുന്നിച്ചേര്‍ത്ത ചെയ്ത എഴുത്തിടം
+ Name[ms]=Editor Teks Terbinadalam
+Index: kate/plugins/autobrace/ktexteditor_autobrace.desktop
+===================================================================
+--- kate/plugins/autobrace/ktexteditor_autobrace.desktop	(.../tags/KDE/4.4.1/kdelibs)	(wersja 1104125)
++++ kate/plugins/autobrace/ktexteditor_autobrace.desktop	(.../branches/KDE/4.4/kdelibs)	(wersja 1104125)
+@@ -36,10 +36,11 @@
+ Name[hu]=Automatikus járójelbezáró
+ Name[id]=KurawalOtomatis
+ Name[is]=SjálfvirkirSvigar
+-Name[it]=GraffeAutomatiche
++Name[it]=Graffe automatiche
+ Name[ja]=自動括弧生成
+ Name[km]=AutoBrace
+ Name[ko]=괄호 닫기
++Name[lt]=Automatinis kabučių uždarymas
+ Name[nb]=AutoBrace
+ Name[nds]=AutoKlemmen
+ Name[nl]=AutoBrace
+@@ -85,6 +86,7 @@
+ Comment[ja]=Enter キーを押すことで閉じる括弧を挿入します
+ Comment[km]=បញ្ចូល​រង្វង់ក្រចក​បិទ​នៅ​ពេល​ចុច​គ្រាប់​ចុច​បញ្ចូល (Enter)
+ Comment[ko]=Enter 키를 누를 때 닫는 괄호 삽입하기
++Comment[lt]=Įterpti užveriančias kabutes nuspaudžiant Įvesti (Enter)
+ Comment[nb]=Sett inn avsluttende krøllparentes når Enter trykkes
+ Comment[nds]=Afsluten Klemmen mit de Ingaavtast infögen
+ Comment[nl]=Voert afsluit haakjes in bij indrukken van Enter
+Index: kate/plugins/exporter/exporterpluginview.cpp
+===================================================================
+--- kate/plugins/exporter/exporterpluginview.cpp	(.../tags/KDE/4.4.1/kdelibs)	(wersja 1104125)
++++ kate/plugins/exporter/exporterpluginview.cpp	(.../branches/KDE/4.4/kdelibs)	(wersja 1104125)
+@@ -83,13 +83,13 @@
+   }
+ 
+   QMimeData *data = new QMimeData();
+-  data->setText(m_view->selectionText());
+ 
+   QString s;
+   QTextStream output( &s, QIODevice::WriteOnly );
+   exportData(true, output);
+ 
+   data->setHtml(s);
++  data->setText(s);
+ 
+   QApplication::clipboard()->setMimeData(data);
+ }
+Index: kate/plugins/exporter/ktexteditor_exporter.desktop
+===================================================================
+--- kate/plugins/exporter/ktexteditor_exporter.desktop	(.../tags/KDE/4.4.1/kdelibs)	(wersja 1104125)
++++ kate/plugins/exporter/ktexteditor_exporter.desktop	(.../branches/KDE/4.4/kdelibs)	(wersja 1104125)
+@@ -41,6 +41,7 @@
+ Name[ja]=エクスポート
+ Name[km]=កម្មវិធីនាំចេញ
+ Name[ko]=내보내기
++Name[lt]=Eksportas
+ Name[nb]=Exporter
+ Name[nds]=Export
+ Name[nl]=Exporter
+@@ -86,6 +87,7 @@
+ Comment[ja]=選択した文書を HTML にエクスポートします
+ Comment[km]=នាំចេញ​ឯកសារ​ដែលបានបន្លិច​ទៅ HTML
+ Comment[ko]=강조한 문서를 HTML로 내보내기
++Comment[lt]=Eksportuoti pažymėtą dokumentą į HTML
+ Comment[nb]=Eksporterer fremhevede dokumenter til HTML
+ Comment[nds]=Syntaxmarkeert Dokment as HTML exporteren
+ Comment[nl]=Oplichtend document exporteren naar HTML
+Index: kate/plugins/pythonencoding/ktexteditor_python-encoding.desktop
+===================================================================
+--- kate/plugins/pythonencoding/ktexteditor_python-encoding.desktop	(.../tags/KDE/4.4.1/kdelibs)	(wersja 1104125)
++++ kate/plugins/pythonencoding/ktexteditor_python-encoding.desktop	(.../branches/KDE/4.4/kdelibs)	(wersja 1104125)
+@@ -39,6 +39,7 @@
+ Name[kn]=ಪೈಥಾನ್ ಸಂಕೇತೀಕರಣ (ಎಂಕೋಡಿಂಗ್) ಪರಿಶೀಲಕ/ಸೇರಿಸುಗ
+ Name[ko]=파이썬 인코딩 검사 및 추가기
+ Name[ku]=Python kod kirina kontrolker/lê zêdeker ê
++Name[lt]=Python koduočių tikrinimo/pridėjimo priemonė
+ Name[lv]=Python kodējuma pārbaudītājs/pievienotājs
+ Name[mai]=पाइथन एनकोडिंग जाँचकएनिहार/जोड़निहार
+ Name[ml]=പൈത്തണ്‍ എന്‍കോഡിങ്ങ് ചെക്കര്‍/ആഡര്‍
+@@ -105,6 +106,7 @@
+ Comment[kn]=ಉಳಿಸುವಾಗ ಪೈಥಾನ್ ಕಡತಗಳ ಸಂಕೇತೀಕರಣವನ್ನು (ಎಂಕೋಡಿಂಗ್) ಪರಿಶೀಲಿಸಿ, ಸಂಕೇತೀಕರಣ ಸಾಲನ್ನು ಸೇರಿಸು
+ Comment[ko]=파이썬 파일을 저장할 때 인코딩을 검사하여 인코딩 줄 추가하기
+ Comment[ku]=Demê tomar kirinê de kod kirina pelên python kontrol bike û rêzekê kod kirinê lê zêde bike
++Comment[lt]=Įrašant python failus patikrinti koduotę ir pridėti koduotės eilutę
+ Comment[lv]=Saglabājot pārbauda kodējumu python failiem un pievieno kodējuma rindu
+ Comment[mai]=सहेजबाक काले पाएथनक एनकोडिंग जाँचू आओर कोनो एनकोडिंग फाइलकेँ जोड़ू
+ Comment[ml]=സൂക്ഷിയ്ക്കുമ്പോള്‍ പൈത്തണ്‍ ഫയലുകളുടെ എന്‍കോഡിങ്ങ് പരിശോദിയ്ക്കുകയും എന്‍കോഡിങ്ങ് വരി ചേര്‍ക്കുകയും ചെയ്യുക
+Index: kate/vimode/kateviinsertmode.cpp
+===================================================================
+--- kate/vimode/kateviinsertmode.cpp	(.../tags/KDE/4.4.1/kdelibs)	(wersja 1104125)
++++ kate/vimode/kateviinsertmode.cpp	(.../branches/KDE/4.4/kdelibs)	(wersja 1104125)
+@@ -220,11 +220,6 @@
+       m_view->pageDown();
+       return true;
+     default:
+-      // accept completion if active
+-      if(m_view->completionWidget()->isCompletionActive()) {
+-        m_view->completionWidget()->execute();
+-      }
+-
+       return false;
+       break;
+     }
+Index: kate/data/katepartpluginsrc
+===================================================================
+--- kate/data/katepartpluginsrc	(.../tags/KDE/4.4.1/kdelibs)	(wersja 0)
++++ kate/data/katepartpluginsrc	(.../branches/KDE/4.4/kdelibs)	(wersja 1104125)
+@@ -0,0 +1,2 @@
++[Kate Part Plugins]
++ktexteditorexporter=true
+Index: kate/data/CMakeLists.txt
+===================================================================
+--- kate/data/CMakeLists.txt	(.../tags/KDE/4.4.1/kdelibs)	(wersja 1104125)
++++ kate/data/CMakeLists.txt	(.../branches/KDE/4.4/kdelibs)	(wersja 1104125)
+@@ -1,3 +1,3 @@
+ install( FILES katepartui.rc katepartsimpleui.rc  DESTINATION  ${DATA_INSTALL_DIR}/katepart )
+ install( FILES katepart.desktop  DESTINATION  ${SERVICES_INSTALL_DIR} )
+-install( FILES katemoderc  DESTINATION  ${CONFIG_INSTALL_DIR} )
++install( FILES katemoderc katepartpluginsrc  DESTINATION  ${CONFIG_INSTALL_DIR} )
+Index: kate/spellcheck/spellcheckdialog.cpp
+===================================================================
+--- kate/spellcheck/spellcheckdialog.cpp	(.../tags/KDE/4.4.1/kdelibs)	(wersja 1104125)
++++ kate/spellcheck/spellcheckdialog.cpp	(.../branches/KDE/4.4/kdelibs)	(wersja 1104125)
+@@ -1,5 +1,5 @@
+ /* This file is part of the KDE libraries
+-   Copyright (C) 2009 Michel ludwig <michel.ludwig at kdemail.net>
++   Copyright (C) 2009-2010 Michel ludwig <michel.ludwig at kdemail.net>
+    Copyright (C) 2008 Mirko Stocker <me at misto.ch>
+    Copyright (C) 2004-2005 Anders Lund <anders at alweb.dk>
+    Copyright (C) 2003 Clarence Dang <dang at kde.org>
+@@ -233,8 +233,6 @@
+   if ( m_spellCheckCancelledByUser
+        || m_currentLanguageRangeIterator == m_languagesInSpellCheckRange.end() )
+   {
+-    m_currentSpellCheckRange = KTextEditor::Range::invalid();
+-    m_currentDecToEncOffsetList.clear();
+     spellCheckDone();
+     return;
+   }
+@@ -250,7 +248,6 @@
+     const QString& dictionary = (*m_currentLanguageRangeIterator).second;
+     KTextEditor::Range languageSubRange = (nextRangeBegin.isValid() ? KTextEditor::Range(nextRangeBegin, currentLanguageRange.end())
+                                                                     : currentLanguageRange);
+-
+     rangeDictionaryPairList = spellCheckManager->spellCheckWrtHighlightingRanges(m_view->doc(),
+                                                                                  languageSubRange,
+                                                                                  dictionary,
+@@ -264,6 +261,30 @@
+       }
+     }
+     else {
++      m_currentSpellCheckRange = rangeDictionaryPairList.first().first;
++      const QString& dictionary = rangeDictionaryPairList.first().second;
++
++      m_spellPosCursor = m_currentSpellCheckRange.start();
++      m_spellLastPos = 0;
++
++      m_currentDecToEncOffsetList.clear();
++      KateDocument::OffsetList encToDecOffsetList;
++      QString text = m_view->doc()->decodeCharacters(m_currentSpellCheckRange,
++                                                     m_currentDecToEncOffsetList,
++                                                     encToDecOffsetList);
++      // ensure that no empty string is passed on to Sonnet as this can lead to a crash
++      // (bug 228789)
++      if(text.isEmpty()) {
++        nextRangeBegin = m_currentSpellCheckRange.end();
++        continue;
++      }
++
++      if(m_speller->language() != dictionary) {
++        m_speller->setLanguage(dictionary);
++        m_backgroundChecker->setSpeller(*m_speller);
++      }
++
++      m_sonnetDialog->setBuffer(text);
+       break;
+     }
+   }
+@@ -272,25 +293,6 @@
+     spellCheckDone();
+     return;
+   }
+-
+-  const KTextEditor::Range& range = rangeDictionaryPairList.first().first;
+-  const QString& dictionary = rangeDictionaryPairList.first().second;
+-
+-  m_spellPosCursor = range.start();
+-  m_spellLastPos = 0;
+-
+-  if(m_speller->language() != dictionary) {
+-    m_speller->setLanguage(dictionary);
+-    m_backgroundChecker->setSpeller(*m_speller);
+-  }
+-
+-  KateDocument *kateDocument = m_view->doc();
+-  m_currentSpellCheckRange = range;
+-  m_currentDecToEncOffsetList.clear();
+-  KateDocument::OffsetList encToDecOffsetList;
+-  QString text = kateDocument->decodeCharacters(m_currentSpellCheckRange, m_currentDecToEncOffsetList,
+-                                                encToDecOffsetList);
+-  m_sonnetDialog->setBuffer(text);
+ }
+ 
+ void KateSpellCheckDialog::cancelClicked()
+@@ -300,6 +302,8 @@
+ 
+ void KateSpellCheckDialog::spellCheckDone()
+ {
++  m_currentSpellCheckRange = KTextEditor::Range::invalid();
++  m_currentDecToEncOffsetList.clear();
+   m_view->clearSelection();
+ }
  
-     int defaultStyleForAttribute( int attrib ) const;
+Index: kate/document/katedocument.cpp
+===================================================================
+--- kate/document/katedocument.cpp	(.../tags/KDE/4.4.1/kdelibs)	(wersja 1104125)
++++ kate/document/katedocument.cpp	(.../branches/KDE/4.4/kdelibs)	(wersja 1104125)
+@@ -397,9 +397,6 @@
+     return QString();
+   }
  
-@@ -377,7 +378,7 @@
-      * @see hlKeyForAttrib
-      */
-     QMap<int, QString> m_hlIndex;
+-  if ( blockwise && (range.start().column() > range.end().column()) )
+-    return QString ();
 -
-+    QMap<int, QString> m_ctxIndex;
-   public:
-     inline bool foldingIndentationSensitive () { return m_foldingIndentationSensitive; }
-     inline bool allowsFolding(){return folding;}
-Index: kate/syntax/katehighlight.cpp
-===================================================================
---- kate/syntax/katehighlight.cpp	(.../tags/KDE/4.4.0/kdelibs)	(wersja 1091888)
-+++ kate/syntax/katehighlight.cpp	(.../branches/KDE/4.4/kdelibs)	(wersja 1091888)
-@@ -84,6 +84,7 @@
-     m_additionalData["none"]->deliminator = stdDeliminator;
-     m_additionalData["none"]->wordWrapDeliminator = stdDeliminator;
-     m_hlIndex[0] = "none";
-+    m_ctxIndex[0]="";
-   }
+   QString s;
+ 
+   if (range.start().line() == range.end().line())
+@@ -771,9 +768,6 @@
+   if (!isReadWrite())
+     return false;
+ 
+-  if ( block && (range.start().column() > range.end().column()) )
+-    return false;
+-
+   // Should now be impossible to trigger with the new Range class
+   Q_ASSERT( range.start().line() <= range.end().line() );
+ 
+@@ -818,8 +812,10 @@
    else
    {
-@@ -951,6 +952,20 @@
-   return true;
- }
+     int startLine = qMax(0, range.start().line());
+-    for (int line = qMin(range.end().line(), lastLine()); line >= startLine; --line)
+-      editRemoveText(line, range.start().column(), range.end().column() - range.start().column());
++    for (int line = qMin(range.end().line(), lastLine()); line >= startLine; --line) {
++      KTextEditor::Range subRange = rangeOnLine(range, line);
++      editRemoveText(line, subRange.start().column(), subRange.end().column() - subRange.start().column());
++    }
+   }
  
-+QString KateHighlighting::hlKeyForContext(int i) const
-+{
-+  int k = 0;
-+  QMap<int,QString>::const_iterator it = m_ctxIndex.constEnd();
-+  while ( it != m_hlIndex.constBegin() )
-+  {
-+    --it;
-+    k = it.key();
-+    if ( i >= k )
-+      break;
-+  }
-+  return it.value();
-+}
-+
- QString KateHighlighting::hlKeyForAttrib( int i ) const
- {
-   // find entry. This is faster than QMap::find. m_hlIndex always has an entry
-@@ -1651,7 +1666,7 @@
-  */
- int KateHighlighting::addToContextList(const QString &ident, int ctx0)
- {
--  kDebug(13010)<<"=== Adding hl with ident '"<<ident<<"'";
-+  //kDebug(13010)<<"=== Adding hl with ident '"<<ident<<"' ctx0="<<ctx0;
+   editEnd ();
+@@ -2945,6 +2941,8 @@
+   KTextEditor::Cursor pos = view->cursorPosition();
+   if (!view->config()->persistentSelection() && view->selection()) {
+     pos = view->selectionRange().start();
++    if (view->blockSelection())
++      pos = rangeOnLine(view->selectionRange(), pos.line()).start();
+     view->removeSelectedText();
+   }
+ 
+Index: CreateKDELibsDependenciesFile.cmake
+===================================================================
+--- CreateKDELibsDependenciesFile.cmake	(.../tags/KDE/4.4.1/kdelibs)	(wersja 1104125)
++++ CreateKDELibsDependenciesFile.cmake	(.../branches/KDE/4.4/kdelibs)	(wersja 1104125)
+@@ -19,7 +19,7 @@
+ 
+ # we need the absolute directories where stuff will be installed too
+ # but since the variables which contain the destinations can be relative
+-# or absolute paths, we need this macro to make them all absoulte, Alex
++# or absolute paths, we need this macro to make them all absolute, Alex
+ macro(MAKE_INSTALL_PATH_ABSOLUTE out in)
+    if (IS_ABSOLUTE "${in}")    # IS_ABSOLUTE is new since cmake 2.4.8
+       set(${out} "${in}")
+@@ -93,7 +93,7 @@
+ ")
+ 
+ 
+-# write the library dependencies
++# write library dependencies
+ 
+ if (WIN32)
+    file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/KDELibsDependencies.cmake"
+@@ -101,9 +101,9 @@
+    set (QT_INSTALL_DIR \"${QT_INSTALL_DIR}\")
+ endif (NOT QT_INSTALL_DIR)
+ ")
+-   # replace hard codes paths by variables
++   # replace hard coded paths by variables
+    # !!! the following stuff does not work because export_library_dependencies
+-   # !!! does not wait until the file is written completly
++   # !!! does not wait until the file is written completely
+ #        export_library_dependencies(${CMAKE_BINARY_DIR}/tmpdeps.cmake)
+ #        file(READ ${CMAKE_BINARY_DIR}/tmpdeps.cmake _deps)
+ #        string(REPLACE "${QT_INSTALL_DIR}" "\${QT_INSTALL_DIR}" __deps "${_deps}")
+@@ -120,5 +120,6 @@
+ file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/KDELibsDependencies.cmake" "
+ 
+ set(KDE4_AUTH_BACKEND_NAME \"${KDE4_AUTH_BACKEND_NAME}\")
++set(KDE4_AUTH_HELPER_BACKEND_NAME \"${KDE4_AUTH_HELPER_BACKEND_NAME}\")
+ set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR \"${KDE4_AUTH_POLICY_FILES_INSTALL_DIR}\" CACHE STRING \"The location where policy files generated by KAuth will be installed, if the installed backend needs to\")
+ ")
+Index: kfile/kfilemodule.desktop
+===================================================================
+--- kfile/kfilemodule.desktop	(.../tags/KDE/4.4.1/kdelibs)	(wersja 1104125)
++++ kfile/kfilemodule.desktop	(.../branches/KDE/4.4/kdelibs)	(wersja 1104125)
+@@ -25,6 +25,7 @@
+ Name[kk]=KFileModule
+ Name[km]=KFileModule
+ Name[ko]=KFileModule
++Name[lt]=KFileModule
+ Name[lv]=KFileModule
+ Name[ms]=KFileModule
+ Name[nb]=KFileModule
+@@ -74,6 +75,7 @@
+ Comment[kk]=Стандартты файл диалогын қамтамасыз ететін KDE файл модулі
+ Comment[km]=ម៉ូឌុល​ឯកសារ KDE លំនាំដើម​ផ្ដល់​នូវ​ប្រអប់​ឯកសារ​ស្តង់ដារ
+ Comment[ko]=표준 파일 대화상자를 제공하는 기본 KDE 파일 모듈
++Comment[lt]=Numatytasis KDE failų dialogo modulis
+ Comment[lv]=Noklusētais KDE failu modulis, kas nodrošina standarta failu dialogu
+ Comment[nb]=KDE standard filmodul som skaffer standard fildialog
+ Comment[nds]=Dat KDE-Standarddateimoduul, dat den Standard-Dateidialoog praatstellt
+Index: kfile/kdirsortfilterproxymodel.cpp
+===================================================================
+--- kfile/kdirsortfilterproxymodel.cpp	(.../tags/KDE/4.4.1/kdelibs)	(wersja 1104125)
++++ kfile/kdirsortfilterproxymodel.cpp	(.../branches/KDE/4.4/kdelibs)	(wersja 1104125)
+@@ -22,20 +22,19 @@
+ 
+ #include "kdirsortfilterproxymodel.h"
+ 
++#include <kdatetime.h>
+ #include <kdirmodel.h>
+ #include <kfileitem.h>
+-#include <kdatetime.h>
+ #include <kglobalsettings.h>
+ #include <klocale.h>
+ #include <kstringhandler.h>
  
-   buildIdentifier=ident;
-   KateSyntaxContextData *data, *datasub;
-@@ -1678,6 +1693,7 @@
-   RegionList<<"!KateInternal_TopLevel!";
- 
-   m_hlIndex[internalIDList.count()] = ident;
-+  m_ctxIndex[ctx0]=ident;
-   m_additionalData.insert( ident, new HighlightPropertyBag );
- 
-   // fill out the propertybag
-Index: kate/smart/katesmartregion.cpp
-===================================================================
---- kate/smart/katesmartregion.cpp	(.../tags/KDE/4.4.0/kdelibs)	(wersja 1091888)
-+++ kate/smart/katesmartregion.cpp	(.../branches/KDE/4.4/kdelibs)	(wersja 1091888)
-@@ -55,6 +55,8 @@
-     else
-       *m_bounding = m_bounding->encompass(*range);
-   }
+-#include <Qt>
+ 
+ class KDirSortFilterProxyModel::KDirSortFilterProxyModelPrivate
+ {
+ public:
+     KDirSortFilterProxyModelPrivate(KDirSortFilterProxyModel* q);
+-    
 +
-+  m_bounding->setInternal();
- }
+     int compare(const QString&, const QString&, Qt::CaseSensitivity caseSensitivity  = Qt::CaseSensitive) const;
+     void slotNaturalSortingChanged();
  
+@@ -154,7 +153,7 @@
  
-Index: kate/utils/kateglobal.cpp
-===================================================================
---- kate/utils/kateglobal.cpp	(.../tags/KDE/4.4.0/kdelibs)	(wersja 1091888)
-+++ kate/utils/kateglobal.cpp	(.../branches/KDE/4.4/kdelibs)	(wersja 1091888)
-@@ -157,9 +157,8 @@
-   m_viewConfig = new KateViewConfig ();
-   m_rendererConfig = new KateRendererConfig ();
+     switch (left.column()) {
+     case KDirModel::Name: {
+-        return d->compare(leftFileItem.name(), rightFileItem.name(), sortCaseSensitivity()) < 0;
++        return d->compare(leftFileItem.text(), rightFileItem.text(), sortCaseSensitivity()) < 0;
+     }
+ 
+     case KDirModel::Size: {
+@@ -171,7 +170,7 @@
+             // their names. So we have always everything ordered. We also check
+             // if we are taking in count their cases.
+             if (leftCount == rightCount) {
+-                return d->compare(leftFileItem.name(), rightFileItem.name(), sortCaseSensitivity()) < 0;
++                return d->compare(leftFileItem.text(), rightFileItem.text(), sortCaseSensitivity()) < 0;
+             }
  
--  // create script manager (search scripts) + register commands
-+  // create script manager (search scripts)
-   m_scriptManager = new KateScriptManager ();
--  KateCmd::self()->registerCommand (m_scriptManager);
+             // If one of them has unknown child items, place them on the end. If we
+@@ -194,7 +193,7 @@
+         // If what we are measuring is two files and they have the same size,
+         // sort them by their file names.
<<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.18&r2=1.19&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdelibs/kde4-kdelibs.spec?r1=1.183&r2=1.184&f=u

More information about the pld-cvs-commit mailing list