packages (DEVEL): kde4-kdelibs/kde4-kdelibs-branch.diff, kde4-kdelibs/kde4-...
arekm
arekm at pld-linux.org
Wed Feb 17 21:26:14 CET 2010
Author: arekm Date: Wed Feb 17 20:26:14 2010 GMT
Module: packages Tag: DEVEL
---- Log message:
- rel 6; branch diff updated
---- Files affected:
packages/kde4-kdelibs:
kde4-kdelibs-branch.diff (1.1.2.4 -> 1.1.2.5) , kde4-kdelibs.spec (1.157.2.40 -> 1.157.2.41)
---- Diffs:
================================================================
Index: packages/kde4-kdelibs/kde4-kdelibs-branch.diff
diff -u packages/kde4-kdelibs/kde4-kdelibs-branch.diff:1.1.2.4 packages/kde4-kdelibs/kde4-kdelibs-branch.diff:1.1.2.5
--- packages/kde4-kdelibs/kde4-kdelibs-branch.diff:1.1.2.4 Fri Feb 12 19:18:34 2010
+++ packages/kde4-kdelibs/kde4-kdelibs-branch.diff Wed Feb 17 21:26:08 2010
@@ -1,7 +1,7 @@
Index: interfaces/ktexteditor/templateinterface.cpp
===================================================================
---- interfaces/ktexteditor/templateinterface.cpp (.../tags/KDE/4.4.0/kdelibs) (wersja 1089224)
-+++ interfaces/ktexteditor/templateinterface.cpp (.../branches/KDE/4.4/kdelibs) (wersja 1089224)
+--- 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 );
@@ -11,10 +11,96 @@
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;
+
+ int defaultStyleForAttribute( int attrib ) const;
+
+@@ -377,7 +378,7 @@
+ * @see hlKeyForAttrib
+ */
+ QMap<int, QString> m_hlIndex;
+-
++ 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]="";
+ }
+ else
+ {
+@@ -951,6 +952,20 @@
+ return true;
+ }
+
++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;
+
+ 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 1089224)
-+++ kate/smart/katesmartregion.cpp (.../branches/KDE/4.4/kdelibs) (wersja 1089224)
+--- 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);
@@ -24,10 +110,57 @@
}
+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 ();
+
+- // create script manager (search scripts) + register commands
++ // create script manager (search scripts)
+ m_scriptManager = new KateScriptManager ();
+- KateCmd::self()->registerCommand (m_scriptManager);
+
+ //
+ // plugin manager
+Index: kate/utils/katecmd.cpp
+===================================================================
+--- kate/utils/katecmd.cpp (.../tags/KDE/4.4.0/kdelibs) (wersja 1091888)
++++ kate/utils/katecmd.cpp (.../branches/KDE/4.4/kdelibs) (wersja 1091888)
+@@ -48,6 +48,7 @@
+ }
+
+ m_cmds += l;
++ m_cmdCompletion.insertItems(l);
+
+ return true;
+ }
+@@ -64,6 +65,7 @@
+
+ for ( QStringList::Iterator it1 = l.begin(); it1 != l.end(); ++it1 ) {
+ m_dict.remove(*it1);
++ m_cmdCompletion.removeItem(*it1);
+ //kDebug(13050)<<"Removed command:"<<*it1;
+ }
+
+@@ -119,6 +121,11 @@
+ return QString();
+ return m_history[ index ];
+ }
++
++KCompletion* KateCmd::commandCompletionObject()
++{
++ return &m_cmdCompletion;
++}
+ //END KateCmd
+
+ //BEGIN KateCmdShellCompletion
Index: kate/utils/kateconfig.cpp
===================================================================
---- kate/utils/kateconfig.cpp (.../tags/KDE/4.4.0/kdelibs) (wersja 1089224)
-+++ kate/utils/kateconfig.cpp (.../branches/KDE/4.4/kdelibs) (wersja 1089224)
+--- kate/utils/kateconfig.cpp (.../tags/KDE/4.4.0/kdelibs) (wersja 1091888)
++++ kate/utils/kateconfig.cpp (.../branches/KDE/4.4/kdelibs) (wersja 1091888)
@@ -1392,6 +1392,7 @@
KColorScheme schemeView(QPalette::Active, KColorScheme::View);
KColorScheme schemeWindow(QPalette::Active, KColorScheme::Window);
@@ -59,11 +192,42 @@
m_templateColorsSet=true;
}
+Index: kate/utils/katecmd.h
+===================================================================
+--- kate/utils/katecmd.h (.../tags/KDE/4.4.0/kdelibs) (wersja 1091888)
++++ kate/utils/katecmd.h (.../branches/KDE/4.4/kdelibs) (wersja 1091888)
+@@ -45,10 +45,13 @@
+ const QString fromHistory( int i ) const;
+ uint historyLength() const { return m_history.count(); }
+
++ KCompletion* commandCompletionObject();
++
+ private:
+ QHash<QString, KTextEditor::Command *> m_dict;
+ QStringList m_cmds;
+ QStringList m_history;
++ KCompletion m_cmdCompletion; // shared completion object for all KateCmdLineEdits in each KTE::View
+ };
+
+ /**
Index: kate/utils/katetemplatehandler.cpp
===================================================================
---- kate/utils/katetemplatehandler.cpp (.../tags/KDE/4.4.0/kdelibs) (wersja 1089224)
-+++ kate/utils/katetemplatehandler.cpp (.../branches/KDE/4.4/kdelibs) (wersja 1089224)
-@@ -49,6 +49,9 @@
+--- kate/utils/katetemplatehandler.cpp (.../tags/KDE/4.4.0/kdelibs) (wersja 1091888)
++++ kate/utils/katetemplatehandler.cpp (.../branches/KDE/4.4/kdelibs) (wersja 1091888)
+@@ -39,6 +39,12 @@
+
+ #define ifDebug(x) x
+
++/// just like Range::contains() but returns true when the cursor is at the end of the range
++bool customContains(SmartRange* range, const Cursor& cursor)
++{
++ return range->start() <= cursor && range->end() >= cursor;
++}
++
+ /* ####################################### */
+
+ KateTemplateHandler::KateTemplateHandler( KateDocument *doc, const Cursor& position,
+@@ -49,6 +55,9 @@
{
ifDebug(kDebug() << templateString << initialValues;)
@@ -73,7 +237,17 @@
connect(m_doc, SIGNAL(textInserted(KTextEditor::Document*, KTextEditor::Range)),
this, SLOT(slotTemplateInserted(KTextEditor::Document*, KTextEditor::Range)));
-@@ -295,12 +298,12 @@
+@@ -162,7 +171,8 @@
+ void KateTemplateHandler::jumpToFinalCursorPosition()
+ {
+ if ( m_doc->activeView() && (!m_wholeTemplateRange
+- || m_wholeTemplateRange->contains(m_doc->activeView()->cursorPosition())) ) {
++ || customContains(m_wholeTemplateRange, m_doc->activeView()->cursorPosition())) )
++ {
+ m_doc->activeView()->setSelection(Range::invalid());
+ m_doc->activeView()->setCursorPosition(*m_finalCursorPosition);
+ }
+@@ -295,12 +305,12 @@
}
/**
@@ -89,7 +263,7 @@
attribute->setBackground(QBrush(color));
return attribute;
}
-@@ -433,12 +436,12 @@
+@@ -433,12 +443,12 @@
Attribute::Ptr editableAttribute = getAttribute(config->templateEditablePlaceholderColor());
editableAttribute->setDynamicAttribute(
@@ -104,10 +278,28 @@
m_doc->addHighlightToDocument(m_wholeTemplateRange, true);
// create smart ranges for each found variable
+@@ -520,7 +530,7 @@
+ SmartRange* leftAdjacentRange = 0;
+
+ foreach ( SmartRange* parent, m_templateRanges ) {
+- if ( parent->start() <= range.start() && parent->end() >= range.start() )
++ if ( customContains(parent, range.start()) )
+ {
+ if ( parent->childRanges().isEmpty() ) {
+ // simple, not-mirrored range got changed
+@@ -543,7 +553,7 @@
+ } else {
+ // find mirrored range that got edited
+ foreach ( SmartRange* child, parent->childRanges() ) {
+- if ( child->start() <= range.start() && child->end() >= range.start() ) {
++ if ( customContains(child, range.start()) ) {
+ baseRange = child;
+ break;
+ }
Index: kate/utils/katetemplatehandler.h
===================================================================
---- kate/utils/katetemplatehandler.h (.../tags/KDE/4.4.0/kdelibs) (wersja 1089224)
-+++ kate/utils/katetemplatehandler.h (.../branches/KDE/4.4/kdelibs) (wersja 1089224)
+--- kate/utils/katetemplatehandler.h (.../tags/KDE/4.4.0/kdelibs) (wersja 1091888)
++++ kate/utils/katetemplatehandler.h (.../branches/KDE/4.4/kdelibs) (wersja 1091888)
@@ -144,6 +144,13 @@
void syncMirroredRanges(KTextEditor::SmartRange* range);
@@ -136,10 +328,385 @@
* Saves the range of the inserted template. This is required since
* tabs could get expanded on insert. While we are at it, we can
* use it to auto-indent the code after insert.
+Index: kate/utils/katecmds.cpp
+===================================================================
+--- kate/utils/katecmds.cpp (.../tags/KDE/4.4.0/kdelibs) (wersja 1091888)
++++ kate/utils/katecmds.cpp (.../branches/KDE/4.4/kdelibs) (wersja 1091888)
+@@ -680,11 +680,19 @@
+
+ int replacementsDone = 0;
+ int linesTouched = 0;
++ int linesAdded = 0;
+
+ if (r.isValid()) { // given range
+- for (int line = r.start().line(); line <= r.end().line(); line++) {
++ for (int line = r.start().line(); line <= r.end().line()+linesAdded; line++) {
+ int temp = replacementsDone;
+- replacementsDone += sedMagic( doc, line, find, replace, d, !noCase, repeat );
++ int r = sedMagic( doc, line, find, replace, d, !noCase, repeat );
++ replacementsDone += r;
++
++ // if we replaced the text with n newlines, we have n new lines to look at
++ if (replace.contains('\n') ) {
++ linesAdded += r * replace.count('\n');
++ }
++
+ if (replacementsDone > temp) {
+ linesTouched++;
+ }
+Index: kate/script/katecommandlinescript.cpp
+===================================================================
+--- kate/script/katecommandlinescript.cpp (.../tags/KDE/4.4.0/kdelibs) (wersja 1091888)
++++ kate/script/katecommandlinescript.cpp (.../branches/KDE/4.4/kdelibs) (wersja 1091888)
+@@ -25,13 +25,21 @@
+
+ #include "katedocument.h"
+ #include "kateview.h"
++#include "katecmd.h"
++#include "kshell.h"
+
+ KateCommandLineScript::KateCommandLineScript(const QString &url, const KateCommandLineScriptHeader &header)
+ : KateScript(url)
+ , m_header(header)
+ {
++ KateCmd::self()->registerCommand (this);
+ }
+
++KateCommandLineScript::~KateCommandLineScript()
++{
++ KateCmd::self()->unregisterCommand (this);
++}
++
+ const KateCommandLineScriptHeader& KateCommandLineScript::header()
+ {
+ return m_header;
+@@ -64,9 +72,44 @@
+ return true;
+ }
+
++const QStringList &KateCommandLineScript::cmds ()
++{
++ return m_header.functions();
++}
++
++bool KateCommandLineScript::exec (KTextEditor::View *view, const QString &_cmd, QString &errorMsg)
++{
++ KShell::Errors errorCode;
++ QStringList args(KShell::splitArgs(_cmd, KShell::NoOptions, &errorCode));
++
++ if (errorCode != KShell::NoError) {
++ errorMsg = i18n("Bad quoting in call: %1. Please escape single quotes with a backslash.", _cmd);
++ return false;
++ }
++
++ QString cmd(args.first());
++ args.removeFirst();
++
++ if (!view) {
++ errorMsg = i18n("Could not access view");
++ return false;
++ }
++
++ if (setView(qobject_cast<KateView*>(view))) {
++ // setView fails, if the script cannot be loaded
++ return callFunction(cmd, args, errorMsg);
++ }
++
++ return false;
++}
++
++
+ bool KateCommandLineScript::help(KTextEditor::View* view, const QString& cmd, QString &msg)
+ {
+- setView(qobject_cast<KateView*>(view));
++ if (!setView(qobject_cast<KateView*>(view))) {
++ // setView fails, if the script cannot be loaded
++ return false;
++ }
+
+ clearExceptions();
+ QScriptValue helpFunction = function("help");
+Index: kate/script/katescriptmanager.cpp
+===================================================================
+--- kate/script/katescriptmanager.cpp (.../tags/KDE/4.4.0/kdelibs) (wersja 1091888)
++++ kate/script/katescriptmanager.cpp (.../branches/KDE/4.4/kdelibs) (wersja 1091888)
+@@ -35,15 +35,19 @@
+ #include <kde_file.h>
+
+ #include "kateglobal.h"
++#include "katecmd.h"
+
+ KateScriptManager::KateScriptManager() : QObject(), KTextEditor::Command()
+ {
++ KateCmd::self()->registerCommand (this);
++
+ // false = force (ignore cache)
+ collect("katepartscriptrc", "katepart/script/*.js", false);
+ }
+
+ KateScriptManager::~KateScriptManager()
+ {
++ KateCmd::self()->unregisterCommand (this);
+ qDeleteAll(m_indentationScripts);
+ qDeleteAll(m_commandLineScripts);
+ }
+@@ -95,7 +99,6 @@
+
+ m_languageToIndenters.clear();
+ m_indentationScriptMap.clear();
+- m_commandLineScriptMap.clear();
+
+ // iterate through the files and read info out of cache or file
+ for(QStringList::ConstIterator fileit = list.begin(); fileit != list.end(); ++fileit) {
+@@ -210,11 +213,7 @@
+ << qPrintable(*fileit) << '\n' << "-> skipping script" << '\n';
+ continue;
+ }
+- KateCommandLineScript* script = new KateCommandLineScript(*fileit, header);
+- foreach (const QString function, header.functions()) {
+- m_commandLineScriptMap.insert(function, script);
+- }
+- m_commandLineScripts.push_back(script);
++ m_commandLineScripts.push_back(new KateCommandLineScript(*fileit, header));
+ break;
+ }
+ case Kate::UnknownScript:
+@@ -311,33 +310,21 @@
+ if (cmd == "reload-scripts") {
+ reload();
+ return true;
+- } else if (!m_commandLineScriptMap.contains(cmd)) {
++ } else {
+ errorMsg = i18n("Command not found: %1", cmd);
+ return false;
+ }
+- KateCommandLineScript *script = m_commandLineScriptMap[cmd];
+- script->setView(qobject_cast<KateView*>(view));
+-
+- return script->callFunction(cmd, args, errorMsg);
+ }
+
+ bool KateScriptManager::help(KTextEditor::View *view, const QString &cmd, QString &msg)
+ {
+-// if (cmd == "run-buffer") {
+-// msg = i18n("This executes the current document or selection as JavaScript within Kate.");
+-// return true;
+-// }
+-
+ if (cmd == "reload-scripts") {
+ msg = i18n("Reload all JavaScript files (indenters, command line scripts, etc).");
+ return true;
+- } else if (!m_commandLineScriptMap.contains(cmd)) {
++ } else {
+ msg = i18n("Command not found: %1", cmd);
+ return false;
+ }
+-
+- KateCommandLineScript *script = m_commandLineScriptMap[cmd];
+- return script->help(view, cmd, msg);
+ }
+
+ const QStringList &KateScriptManager::cmds()
+@@ -345,14 +332,8 @@
+ static QStringList l;
+
+ l.clear();
+-// l << "run-buffer"; // not implemented right now
+ l << "reload-scripts";
+
+- QVector<KateCommandLineScript*>::ConstIterator it = m_commandLineScripts.constBegin();
+- for ( ; it != m_commandLineScripts.constEnd(); ++it) {
+- l << (*it)->header().functions();
+- }
+-
+ return l;
+ }
+
+Index: kate/script/katecommandlinescript.h
+===================================================================
+--- kate/script/katecommandlinescript.h (.../tags/KDE/4.4.0/kdelibs) (wersja 1091888)
++++ kate/script/katecommandlinescript.h (.../branches/KDE/4.4/kdelibs) (wersja 1091888)
+@@ -23,6 +23,7 @@
+ #include "kateview.h"
+
+ #include <QtCore/QPair>
++#include <ktexteditor/commandinterface.h>
+
+ class KateScriptDocument;
+
+@@ -51,16 +52,24 @@
+ * A specialized class for scripts that are of type
+ * KateScriptInformation::IndentationScript
+ */
+-class KateCommandLineScript : public KateScript
++class KateCommandLineScript : public KateScript, public KTextEditor::Command
+ {
+ public:
+ KateCommandLineScript(const QString &url, const KateCommandLineScriptHeader &header);
++ virtual ~KateCommandLineScript();
+
+ const KateCommandLineScriptHeader& header();
+
+ bool callFunction(const QString& cmd, const QStringList args, QString &errorMessage);
+- bool help(KTextEditor::View* view, const QString& cmd, QString &msg);
+
++ //
++ // KTextEditor::Command interface
++ //
++ public:
++ virtual const QStringList &cmds ();
++ virtual bool exec (KTextEditor::View *view, const QString &cmd, QString &msg);
++ virtual bool help (KTextEditor::View *view, const QString &cmd, QString &msg);
++
+ private:
+ KateCommandLineScriptHeader m_header;
+ };
+Index: kate/script/katescriptmanager.h
+===================================================================
+--- kate/script/katescriptmanager.h (.../tags/KDE/4.4.0/kdelibs) (wersja 1091888)
++++ kate/script/katescriptmanager.h (.../branches/KDE/4.4/kdelibs) (wersja 1091888)
+@@ -132,9 +132,6 @@
+
+ /** Map of language to indent scripts */
+ QHash<QString, QVector<KateIndentScript*> > m_languageToIndenters;
+-
+- /** Command line map to scripts */
+- QHash<QString, KateCommandLineScript*> m_commandLineScriptMap;
+ };
+
+
+Index: kate/view/kateview.cpp
+===================================================================
+--- kate/view/kateview.cpp (.../tags/KDE/4.4.0/kdelibs) (wersja 1091888)
++++ kate/view/kateview.cpp (.../branches/KDE/4.4/kdelibs) (wersja 1091888)
+@@ -264,8 +264,7 @@
+ m_topViewBar=0;
+ }
+
+- if (!m_doc->singleViewMode())
+- KatePartPluginManager::self()->removeView(this);
++ KatePartPluginManager::self()->removeView(this);
+
+ m_doc->removeView( this );
+
+Index: kate/view/kateviewhelpers.cpp
+===================================================================
+--- kate/view/kateviewhelpers.cpp (.../tags/KDE/4.4.0/kdelibs) (wersja 1091888)
++++ kate/view/kateviewhelpers.cpp (.../branches/KDE/4.4/kdelibs) (wersja 1091888)
+@@ -318,12 +318,11 @@
+ , m_histpos( 0 )
+ , m_cmdend( 0 )
+ , m_command( 0L )
+- , m_oldCompletionObject( 0L )
+ {
+ connect (this, SIGNAL(returnPressed(const QString &)),
+ this, SLOT(slotReturnPressed(const QString &)));
+
+- completionObject()->insertItems (KateCmd::self()->commandList());
++ setCompletionObject(KateCmd::self()->commandCompletionObject());
+ setAutoDeleteCompletionObject( false );
+ m_cmdRange.setPattern("^([0-9$]+|\\.([+-]\\d+)?)?,([0-9$]+|\\.([+-]\\d+)?)?");
+ m_cmdExpr.setPattern("^(\\d+)([+-])(\\d+)$");
+@@ -528,13 +527,11 @@
+ }
+
+ // clean up
+- if ( m_oldCompletionObject )
++ if (completionObject() != KateCmd::self()->commandCompletionObject())
+ {
+ KCompletion *c = completionObject();
+- setCompletionObject( m_oldCompletionObject );
+- m_oldCompletionObject = 0;
++ setCompletionObject(KateCmd::self()->commandCompletionObject());
+ delete c;
+- c = 0;
+ }
+ m_command = 0;
+ m_cmdend = 0;
+@@ -635,13 +632,11 @@
+ else
+ {
+ // clean up if needed
+- if ( m_oldCompletionObject )
++ if (completionObject() != KateCmd::self()->commandCompletionObject())
+ {
+ KCompletion *c = completionObject();
+- setCompletionObject( m_oldCompletionObject );
+- m_oldCompletionObject = 0;
++ setCompletionObject(KateCmd::self()->commandCompletionObject());
+ delete c;
+- c = 0;
+ }
+
+ m_cmdend = 0;
+@@ -658,12 +653,9 @@
+ KCompletion *cmpl = ce->completionObject( m_view, text().left( m_cmdend ).trimmed() );
+ if ( cmpl )
<<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.1.2.4&r2=1.1.2.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdelibs/kde4-kdelibs.spec?r1=1.157.2.40&r2=1.157.2.41&f=u
More information about the pld-cvs-commit
mailing list