KHTML is still alive!

[kdelibs/KDE/4.8] kjs: Add missing include.

2012-01-27T05:20:00.003-08:00

Git commit 76b68b5bc6c7b2ad7eb0749a06c166dad8e955d1 by Sebastian Trueg, on behalf of Raphael Kubo da Costa.
Committed on 31/12/2011 at 02:25.
Pushed by trueg into branch 'KDE/4.8'.

Add missing include.

Casting from KJS::JSGlobalObject* to KJS::JSObject* failed with clang
because it missed the definition of JSGlobalObject.

M +1 -0 kjs/lookup.h

http://commits.kde.org/kdelibs/76b68b5bc6c7b2ad7eb0749a06c166dad8e955d1

diff --git a/kjs/lookup.h b/kjs/lookup.h
index 6fabc8f..00622d0 100644
--- a/kjs/lookup.h
+++ b/kjs/lookup.h
@@ -23,6 +23,7 @@
#ifndef _KJSLOOKUP_H_
#define _KJSLOOKUP_H_

+#include "JSVariableObject.h"
#include "interpreter.h"
#include "identifier.h"
#include "object.h"

[kdelibs/KDE/4.8] kjs/wtf: Revert "Revert "Add missing include.""

2012-01-27T05:20:00.002-08:00

Git commit 05674eb27c436dbb8ec90324beac25625ee41505 by Sebastian Trueg, on behalf of Nikita Churaev.
Committed on 31/12/2011 at 04:01.
Pushed by trueg into branch 'KDE/4.8'.

Revert "Revert "Add missing include.""

This reverts commit f29a482ce68558e2c5242bcfb7ead1f2381eaf5a.

M +1 -0 kjs/wtf/RefPtr.h

http://commits.kde.org/kdelibs/05674eb27c436dbb8ec90324beac25625ee41505

diff --git a/kjs/wtf/RefPtr.h b/kjs/wtf/RefPtr.h
index c16397e..493ab05 100644
--- a/kjs/wtf/RefPtr.h
+++ b/kjs/wtf/RefPtr.h
@@ -24,6 +24,7 @@

#include <algorithm>
#include "AlwaysInline.h"
+#include "PassRefPtr.h"

namespace WTF {

[kdelibs/KDE/4.8] kjs/wtf: Revert "Add missing include."

2012-01-27T05:20:00.001-08:00

Git commit 466466395c9df7d333a3d30fe9a4873bd3029b27 by Sebastian Trueg, on behalf of Nikita Churaev.
Committed on 31/12/2011 at 03:40.
Pushed by trueg into branch 'KDE/4.8'.

Revert "Add missing include."

This reverts commit 01b0c1a8051f372e400d213ac125311c398e4b17.

M +0 -1 kjs/wtf/RefPtr.h

http://commits.kde.org/kdelibs/466466395c9df7d333a3d30fe9a4873bd3029b27

diff --git a/kjs/wtf/RefPtr.h b/kjs/wtf/RefPtr.h
index 493ab05..c16397e 100644
--- a/kjs/wtf/RefPtr.h
+++ b/kjs/wtf/RefPtr.h
@@ -24,7 +24,6 @@

#include <algorithm>
#include "AlwaysInline.h"
-#include "PassRefPtr.h"

namespace WTF {

[kdelibs/KDE/4.8] kjs/wtf: Add missing include.

2012-01-27T05:20:00.000-08:00

Git commit 76035a9e6f020dd04b70d5bc938ba9085465bf9e by Sebastian Trueg, on behalf of Raphael Kubo da Costa.
Committed on 31/12/2011 at 02:27.
Pushed by trueg into branch 'KDE/4.8'.

Add missing include.

RefPtr::release() needs PassRefPtr.h for adoptRef(). The include is also
present in WebKit's wtf.

This should fix another build failure with clang.

M +1 -0 kjs/wtf/RefPtr.h

http://commits.kde.org/kdelibs/76035a9e6f020dd04b70d5bc938ba9085465bf9e

[kdelibs/KDE/4.8] kjs/wtf: Revert "Revert "Add missing include.""

2011-12-30T19:09:00.000-08:00

Git commit c5124005147233db366eacaea5a1821166338b37 by Nikita Churaev.
Committed on 31/12/2011 at 04:01.
Pushed by churaev into branch 'KDE/4.8'.

Revert "Revert "Add missing include.""

This reverts commit f29a482ce68558e2c5242bcfb7ead1f2381eaf5a.

M +1 -0 kjs/wtf/RefPtr.h

http://commits.kde.org/kdelibs/c5124005147233db366eacaea5a1821166338b37

[kdelibs/KDE/4.8] kjs/wtf: Revert "Add missing include."

2011-12-30T18:46:00.001-08:00

Git commit f29a482ce68558e2c5242bcfb7ead1f2381eaf5a by Nikita Churaev.
Committed on 31/12/2011 at 03:40.
Pushed by churaev into branch 'KDE/4.8'.

Revert "Add missing include."

This reverts commit 01b0c1a8051f372e400d213ac125311c398e4b17.

M +0 -1 kjs/wtf/RefPtr.h

http://commits.kde.org/kdelibs/f29a482ce68558e2c5242bcfb7ead1f2381eaf5a

[kdelibs/KDE/4.8] kjs/wtf: Add missing include.

2011-12-30T17:36:00.002-08:00

Git commit 01b0c1a8051f372e400d213ac125311c398e4b17 by Raphael Kubo da Costa.
Committed on 31/12/2011 at 02:27.
Pushed by rkcosta into branch 'KDE/4.8'.

Add missing include.

RefPtr::release() needs PassRefPtr.h for adoptRef(). The include is also
present in WebKit's wtf.

This should fix another build failure with clang.

M +1 -0 kjs/wtf/RefPtr.h

http://commits.kde.org/kdelibs/01b0c1a8051f372e400d213ac125311c398e4b17

[kdelibs/KDE/4.8] kjs: Add missing include.

2011-12-30T17:36:00.001-08:00

Git commit d1fe2074b4fbc8253a4533a7e6be24b4f5b20b8b by Raphael Kubo da Costa.
Committed on 31/12/2011 at 02:25.
Pushed by rkcosta into branch 'KDE/4.8'.

Add missing include.

Casting from KJS::JSGlobalObject* to KJS::JSObject* failed with clang
because it missed the definition of JSGlobalObject.

M +1 -0 kjs/lookup.h

http://commits.kde.org/kdelibs/d1fe2074b4fbc8253a4533a7e6be24b4f5b20b8b

[kdelibs/KDE/4.8] khtml: Do not connect to or disconnect from the signals of a non-existent object.

2011-12-22T07:24:00.000-08:00

Git commit 4dae52261a34e9a5fbd35c9ac4158874c1cbb4c5 by Dawit Alemayehu.
Committed on 16/12/2011 at 20:30.
Pushed by adawit into branch 'KDE/4.8'.

Do not connect to or disconnect from the signals of a non-existent object.

REVIEW: 103500

M +8 -4 khtml/khtml_part.cpp

http://commits.kde.org/kdelibs/4dae52261a34e9a5fbd35c9ac4158874c1cbb4c5

diff --git a/khtml/khtml_part.cpp b/khtml/khtml_part.cpp
index 9a02248..35a5785 100644
--- a/khtml/khtml_part.cpp
+++ b/khtml/khtml_part.cpp
@@ -1531,8 +1531,10 @@ void KHTMLPart::clear()
d->m_decoder = 0;

// We don't want to change between parts if we are going to delete all of them anyway
- disconnect( partManager(), SIGNAL( activePartChanged( KParts::Part * ) ),
- this, SLOT( slotActiveFrameChanged( KParts::Part * ) ) );
+ if (partManager()) {
+ disconnect( partManager(), SIGNAL( activePartChanged( KParts::Part * ) ),
+ this, SLOT( slotActiveFrameChanged( KParts::Part * ) ) );
+ }

if (d->m_frames.count())
{
@@ -1567,8 +1569,10 @@ void KHTMLPart::clear()
}

// Listen to part changes again
- connect( partManager(), SIGNAL( activePartChanged( KParts::Part * ) ),
- this, SLOT( slotActiveFrameChanged( KParts::Part * ) ) );
+ if (partManager()) {
+ connect( partManager(), SIGNAL( activePartChanged( KParts::Part * ) ),
+ this, SLOT( slotActiveFrameChanged( KParts::Part * ) ) );
+ }

d->clearRedirection();
d->m_redirectLockHistory = true;

[kdelibs/frameworks] /: Merge remote-tracking branch 'origin/KDE/4.7' into origin-frameworks

2011-12-08T09:38:00.000-08:00

Git commit 070a708aeac3ca811e1ac29d079cb7753aa7fa30 by David Faure.
Committed on 08/12/2011 at 19:05.
Pushed by dfaure into branch 'frameworks'.

Merge remote-tracking branch 'origin/KDE/4.7' into origin-frameworks

Conflicts:
experimental/libkactivities/
plasma/applet.h
plasma/theme.cpp
staging/libkcoreaddons/src/jobs/kjob.cpp

M +10 -8 kdecore/kernel/kstandarddirs.cpp
M +1 -1 kdecore/tests/kmimetypetest.cpp
M +4 -4 khtml/html/htmltokenizer.cpp
M +0 -2 kutils/kpluginselector.cpp
M +16 -15 plasma/applet.cpp
M +1 -1 plasma/applet.h
M +1 -1 plasma/containment.cpp
M +3 -9 plasma/dialog.cpp
M +1 -2 plasma/private/applet_p.h
M +1 -2 plasma/private/tooltip.cpp
M +56 -28 plasma/theme.cpp
M +6 -0 plasma/theme.h
M +23 -20 plasma/tooltipmanager.cpp
A +6 -0 staging/libkcoreaddons/src/jobs/kjob.cpp [License: LGPL (v2)]

http://commits.kde.org/kdelibs/070a708aeac3ca811e1ac29d079cb7753aa7fa30

diff --cc plasma/private/applet_p.h
index 1d927cf,3faf5b3..1c99f20
--- a/plasma/private/applet_p.h
+++ b/plasma/private/applet_p.h
@@@ -111,9 -121,11 +111,8 @@@ public
void updateRect(const QRectF &rect);
void setFocus();
void cleanUpAndDelete();
- void createMessageOverlay(bool usePopup = true);
- void positionMessageOverlay();
- void destroyMessageOverlay();
void addGlobalShortcutsPage(KConfigDialog *dialog);
void addPublishPage(KConfigDialog *dialog);
- void clearShortcutEditorPtr();
void configDialogFinished();
KConfigDialog *generateGenericConfigDialog();
void addStandardConfigurationPages(KConfigDialog *dialog);
@@@ -166,10 -192,10 +165,10 @@@
KAction *activationAction;

// configuration
- KKeySequenceWidget *shortcutEditor; //TODO: subclass KConfigDialog and encapsulate this in there
+ QWeakPointer<KKeySequenceWidget> shortcutEditor; //TODO: subclass KConfigDialog and encapsulate this in there

ItemStatus itemStatus;
- QString remoteLocation;
+ KUrl remoteLocation;
Ui::publishWidget publishUI;

// the applet can change size policy by itself, so save the old one for eventual restore
diff --cc plasma/theme.cpp
index 3bad6d2,3427315..cbfcd42
--- a/plasma/theme.cpp
+++ b/plasma/theme.cpp
@@@ -158,6 -166,8 +166,7 @@@ public
static const char *defaultTheme;
static const char *systemColorsTheme;
static const char *themeRcFile;
- static PackageStructure::Ptr packageStructure;
+ static EffectWatcher *s_blurEffectWatcher;

Theme *q;
QString themeName;
diff --cc staging/libkcoreaddons/src/jobs/kjob.cpp
index f028ba7,0000000..2858909
mode 100644,000000..100644
--- a/staging/libkcoreaddons/src/jobs/kjob.cpp
+++ b/staging/libkcoreaddons/src/jobs/kjob.cpp
@@@ -1,364 -1,0 +1,370 @@@
+/* This file is part of the KDE project
+ Copyright (C) 2000 Stephan Kulow <coolo@kde.org>
+ David Faure <faure@kde.org>
+ Copyright (C) 2006 Kevin Ottens <ervin@kde.org>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License version 2 as published by the Free Software Foundation.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
+
+*/
+
+#include "kjob.h"
+#include "kjob_p.h"
+
+#include "kjobuidelegate.h"
+
+#include <QEventLoop>
+#include <QMap>
+#include <QMetaType>
+#include <QTimer>
+
+bool KJobPrivate::_k_kjobUnitEnumRegistered = false;
+KJobPrivate::KJobPrivate()
+ : q_ptr(0), uiDelegate(0), error(KJob::NoError),
+ progressUnit(KJob::Bytes), percentage(0),
+ suspended(false), capabilities(KJob::NoCapabilities),
+ speedTimer(0), isAutoDelete(true), eventLoop(0), isFinished(false)
+{
+ if (!_k_kjobUnitEnumRegistered) {
+ _k_kjobUnitEnumRegistered = qRegisterMetaType<KJob::Unit>("KJob::Unit");
+ }
+}
+
+KJobPrivate::~KJobPrivate()
+{
+}
+
+KJob::KJob(QObject *parent)
+ : QObject(parent), d_ptr(new KJobPrivate)
+{
+ d_ptr->q_ptr = this;
+ // Don't exit while this job is running
+#pragma message ("KDE5 TODO: Revert ref-counting when it is in Qt5")
+ //KGlobal::ref();
+}
+
+KJob::KJob(KJobPrivate &dd, QObject *parent)
+ : QObject(parent), d_ptr(&dd)
+{
+ d_ptr->q_ptr = this;
+ // Don't exit while this job is running
+ //KGlobal::ref();
+}
+
+KJob::~KJob()
+{
++ if (!d_ptr->isFinished) {
++ Q_EMIT finished(this);
++ }
++
+ delete d_ptr->speedTimer;
+ delete d_ptr->uiDelegate;
+ delete d_ptr;
+
+ //KGlobal::deref();
+}
+
+void KJob::setUiDelegate( KJobUiDelegate *delegate )
+{
+ Q_D(KJob);
+ if ( delegate == 0 || delegate->setJob( this ) )
+ {
+ delete d->uiDelegate;
+ d->uiDelegate = delegate;
+
+ if ( d->uiDelegate )
+ {
+ d->uiDelegate->connectJob( this );
+ }
+ }
+}
+
+KJobUiDelegate *KJob::uiDelegate() const
+{
+ return d_func()->uiDelegate;
+}
+
+KJob::Capabilities KJob::capabilities() const
+{
+ return d_func()->capabilities;
+}
+
+bool KJob::isSuspended() const
+{
+ return d_func()->suspended;
+}
+
+bool KJob::kill( KillVerbosity verbosity )
+{
++ Q_D(KJob);
+ if ( doKill() )
+ {
+ setError( KilledJobError );
+
+ if ( verbosity!=Quietly )
+ {
+ emitResult();
+ }
+ else
+ {
+ // If we are displaying a progress dialog, remove it first.
++ d->isFinished = true;
+ Q_EMIT finished(this);
+
+ if ( isAutoDelete() )
+ deleteLater();
+ }
+
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+}
+
+bool KJob::suspend()
+{
+ Q_D(KJob);
+ if ( !d->suspended )
+ {
+ if ( doSuspend() )
+ {
+ d->suspended = true;
+ Q_EMIT suspended(this);
+
+ return true;
+ }
+ }
+
+ return false;
+}
+
+bool KJob::resume()
+{
+ Q_D(KJob);
+ if ( d->suspended )
+ {
+ if ( doResume() )
+ {
+ d->suspended = false;
+ Q_EMIT resumed(this);
+
+ return true;
+ }
+ }
+
+ return false;
+}
+
+bool KJob::doKill()
+{
+ return false;
+}
+
+bool KJob::doSuspend()
+{
+ return false;
+}
+
+bool KJob::doResume()
+{
+ return false;
+}
+
+void KJob::setCapabilities( KJob::Capabilities capabilities )
+{
+ Q_D(KJob);
+ d->capabilities = capabilities;
+}
+
+bool KJob::exec()
+{
+ Q_D(KJob);
+ // Usually this job would delete itself, via deleteLater() just after
+ // emitting result() (unless configured otherwise). Since we use an event
+ // loop below, that event loop will process the deletion event and we'll
+ // have been deleted when exec() returns. This crashes, so temporarily
+ // suspend autodeletion and manually do it afterwards.
+ const bool wasAutoDelete = isAutoDelete();
+ setAutoDelete( false );
+
+ Q_ASSERT( ! d->eventLoop );
+
+ QEventLoop loop( this );
+ d->eventLoop = &loop;
+
+ start();
+ if( !d->isFinished ) {
+ d->eventLoop->exec(QEventLoop::ExcludeUserInputEvents);
+ }
+ d->eventLoop = 0;
+
+ if ( wasAutoDelete ) {
+ deleteLater();
+ }
+ return ( d->error == NoError );
+}
+
+int KJob::error() const
+{
+ return d_func()->error;
+}
+
+QString KJob::errorText() const
+{
+ return d_func()->errorText;
+}
+
+QString KJob::errorString() const
+{
+ return d_func()->errorText;
+}
+
+qulonglong KJob::processedAmount(Unit unit) const
+{
+ return d_func()->processedAmount[unit];
+}
+
+qulonglong KJob::totalAmount(Unit unit) const
+{
+ return d_func()->totalAmount[unit];
+}
+
+unsigned long KJob::percent() const
+{
+ return d_func()->percentage;
+}
+
+void KJob::setError( int errorCode )
+{
+ Q_D(KJob);
+ d->error = errorCode;
+}
+
+void KJob::setErrorText( const QString &errorText )
+{
+ Q_D(KJob);
+ d->errorText = errorText;
+}
+
+void KJob::setProcessedAmount(Unit unit, qulonglong amount)
+{
+ Q_D(KJob);
+ bool should_emit = (d->processedAmount[unit] != amount);
+
+ d->processedAmount[unit] = amount;
+
+ if ( should_emit )
+ {
+ Q_EMIT processedAmount(this, unit, amount);
+ if (unit==d->progressUnit) {
+ Q_EMIT processedSize(this, amount);
+ emitPercent(d->processedAmount[unit], d->totalAmount[unit]);
+ }
+ }
+}
+
+void KJob::setTotalAmount(Unit unit, qulonglong amount)
+{
+ Q_D(KJob);
+ bool should_emit = (d->totalAmount[unit] != amount);
+
+ d->totalAmount[unit] = amount;
+
+ if ( should_emit )
+ {
+ Q_EMIT totalAmount(this, unit, amount);
+ if (unit==d->progressUnit) {
+ Q_EMIT totalSize(this, amount);
+ emitPercent(d->processedAmount[unit], d->totalAmount[unit]);
+ }
+ }
+}
+
+void KJob::setPercent( unsigned long percentage )
+{
+ Q_D(KJob);
+ if ( d->percentage!=percentage )
+ {
+ d->percentage = percentage;
+ Q_EMIT percent( this, percentage );
+ }
+}
+
+void KJob::emitResult()
+{
+ Q_D(KJob);
+ d->isFinished = true;
+
+ if ( d->eventLoop ) {
+ d->eventLoop->quit();
+ }
+
+ // If we are displaying a progress dialog, remove it first.
+ Q_EMIT finished( this );
+
+ Q_EMIT result( this );
+
+ if ( isAutoDelete() )
+ deleteLater();
+}
+
+void KJob::emitPercent( qulonglong processedAmount, qulonglong totalAmount )
+{
+ Q_D(KJob);
+ // calculate percents
+ if (totalAmount) {
+ unsigned long oldPercentage = d->percentage;
+ d->percentage = (unsigned long)(( (float)(processedAmount) / (float)(totalAmount) ) * 100.0);
+ if ( d->percentage != oldPercentage ) {
+ Q_EMIT percent( this, d->percentage );
+ }
+ }
+}
+
+void KJob::emitSpeed(unsigned long value)
+{
+ Q_D(KJob);
+ if (!d->speedTimer) {
+ d->speedTimer = new QTimer(this);
+ connect(d->speedTimer, SIGNAL(timeout()), SLOT(_k_speedTimeout()));
+ }
+
+ Q_EMIT speed(this, value);
+ d->speedTimer->start(5000); // 5 seconds interval should be enough
+}
+
+void KJobPrivate::_k_speedTimeout()
+{
+ Q_Q(KJob);
+ // send 0 and stop the timer
+ // timer will be restarted only when we receive another speed event
+ Q_EMIT q->speed(q, 0);
+ speedTimer->stop();
+}
+
+bool KJob::isAutoDelete() const
+{
+ Q_D(const KJob);
+ return d->isAutoDelete;
+}
+
+void KJob::setAutoDelete( bool autodelete )
+{
+ Q_D(KJob);
+ d->isAutoDelete = autodelete;
+}
+
+#include "moc_kjob.cpp"

[kdelibs/KDE/4.7] khtml/html: Use DOMString

2011-12-06T15:10:00.001-08:00

Git commit 06c84f365f4d20e14a5889bd9ef9e77d96543b8d by Andrea Iacovitti.
Committed on 07/12/2011 at 00:08.
Pushed by aiacovitti into branch 'KDE/4.7'.

Use DOMString

M +4 -4 khtml/html/htmltokenizer.cpp
M +4 -4 khtml/html/htmltokenizer.h

http://commits.kde.org/kdelibs/06c84f365f4d20e14a5889bd9ef9e77d96543b8d

diff --git a/khtml/html/htmltokenizer.cpp b/khtml/html/htmltokenizer.cpp
index 2ca8742..640c74b 100644
--- a/khtml/html/htmltokenizer.cpp
+++ b/khtml/html/htmltokenizer.cpp
@@ -1233,7 +1233,7 @@ void HTMLTokenizer::parseTag(TokenizerString &src)
{
tag = SearchValue;
*dest++ = 0;
- attrName.clear();
+ attrName = DOMString("");
}
else
tag = AttributeName;
@@ -1276,7 +1276,7 @@ void HTMLTokenizer::parseTag(TokenizerString &src)
cBuffer[cBufferPos - 1] = '/';
}
if (!a)
- attrName = QLatin1String(QByteArray(cBuffer, cBufferPos+1).data());
+ attrName = DOMString(cBuffer, cBufferPos);
}

dest = buffer;
@@ -1298,7 +1298,7 @@ void HTMLTokenizer::parseTag(TokenizerString &src)
}
if ( cBufferPos == CBUFLEN ) {
cBuffer[cBufferPos] = '\0';
- attrName = QLatin1String(QByteArray(cBuffer, cBufferPos+1).data());
+ attrName = DOMString(cBuffer, cBufferPos);
dest = buffer;
*dest++ = 0;
tag = SearchEqual;
@@ -1326,7 +1326,7 @@ void HTMLTokenizer::parseTag(TokenizerString &src)
{
tag = SearchValue;
*dest++ = 0;
- attrName.clear();
+ attrName = DOMString("");
}
else {
DOMString v("");
diff --git a/khtml/html/htmltokenizer.h b/khtml/html/htmltokenizer.h
index ccdb4bb..31b4071 100644
--- a/khtml/html/htmltokenizer.h
+++ b/khtml/html/htmltokenizer.h
@@ -73,7 +73,7 @@ namespace khtml {
if(attrs) attrs->deref();
if(text) text->deref();
}
- void addAttribute(DocumentImpl* /*doc*/, QChar* buffer, const QString& attrName, const DOMString& v)
+ void addAttribute(DocumentImpl* /*doc*/, QChar* buffer, const DOMString& _attrName, const DOMString& v)
{
DOMStringImpl *value = v.implementation();
LocalName localname = LocalName::fromId(0);
@@ -81,8 +81,8 @@ namespace khtml {
if(buffer->unicode()) {
localname = LocalName::fromId(buffer->unicode());
}
- else if ( !attrName.isEmpty() && attrName != "/" ) {
- splitPrefixLocalName(attrName, prefixname, localname, true /* htmlCompat*/);
+ else if ( !_attrName.isEmpty() && _attrName != "/" ) {
+ splitPrefixLocalName(_attrName, prefixname, localname, true /* htmlCompat*/);
}

if (value && localname.id()) {
@@ -351,7 +351,7 @@ protected:
} doctypeComment;

// name of an unknown attribute
- QString attrName;
+ DOMString attrName;

// Used to store the content of
QChar *rawContent;

[kdelibs/frameworks] khtml/dom: Implement check for extender char.

2011-12-02T12:53:00.001-08:00

Git commit 83038897681299f780174cc3fd853af35258ae1b by Aaron Seigo, on behalf of Andrea Iacovitti.
Committed on 02/12/2011 at 00:10.
Pushed by aseigo into branch 'frameworks'.

Implement check for extender char.
FIXED-IN: 4.7.4

M +11 -1 khtml/dom/dom_element.cpp

http://commits.kde.org/kdelibs/83038897681299f780174cc3fd853af35258ae1b

diff --git a/khtml/dom/dom_element.cpp b/khtml/dom/dom_element.cpp
index 366e96e..a2638f3 100644
--- a/khtml/dom/dom_element.cpp
+++ b/khtml/dom/dom_element.cpp
@@ -374,6 +374,16 @@ NodeList Element::querySelectorAll(const DOMString& query) const
return res;
}

+static inline bool isExtender(ushort c)
+{ return c > 0x00B6 &&
+ (c == 0x00B7 || c == 0x02D0 || c == 0x02D1 || c == 0x0387 ||
+ c == 0x0640 || c == 0x0E46 || c == 0x0EC6 || c == 0x3005 ||
+ (c >= 0x3031 && c <= 0x3035) ||
+ (c >= 0x309D && c <= 0x309E) ||
+ (c >= 0x30FC && c <= 0x30FE)
+ );
+}
+
bool Element::khtmlValidAttrName(const DOMString &name)
{
// Check if name is valid
@@ -388,7 +398,7 @@ bool Element::khtmlValidAttrName(const DOMString &name)
if ( !ch.isLetter() && !ch.isDigit() && ch != '.'
&& ch != '-' && ch != '_' && ch != ':'
&& ch.category() != QChar::Mark_SpacingCombining
- /* no idea what "extender is" */ )
+ && !isExtender(ch.unicode()) )
return false;
}
return true;

[kdelibs/frameworks] khtml: Avoid DOM->Q->DOM string conversion.

2011-12-02T12:53:00.000-08:00

Git commit f6679dfb06714d2fa651566c1d49cad1440f31ec by Aaron Seigo, on behalf of Andrea Iacovitti.
Committed on 02/12/2011 at 00:36.
Pushed by aseigo into branch 'frameworks'.

Avoid DOM->Q->DOM string conversion.
Remove redundant check on m_image.
FIXED-IN: 4.7.4

M +1 -1 khtml/khtmlimage.cpp
M +1 -1 khtml/xml/dom_nodelistimpl.cpp

http://commits.kde.org/kdelibs/f6679dfb06714d2fa651566c1d49cad1440f31ec

diff --git a/khtml/khtmlimage.cpp b/khtml/khtmlimage.cpp
index 7823f0e..5738d85 100644
--- a/khtml/khtmlimage.cpp
+++ b/khtml/khtmlimage.cpp
@@ -197,7 +197,7 @@ void KHTMLImage::notifyFinished( khtml::CachedObject *o )
if ( !m_mimeType.isEmpty() )
mimeType = KMimeType::mimeType(m_mimeType, KMimeType::ResolveAliases);

- if ( mimeType && m_image ) {
+ if ( mimeType ) {
if ( !m_image->suggestedTitle().isEmpty() ) {
caption = i18n( "%1 (%2 - %3x%4 Pixels)", m_image->suggestedTitle(), mimeType->comment(), m_image->pixmap_size().width(), m_image->pixmap_size().height() );
} else {
diff --git a/khtml/xml/dom_nodelistimpl.cpp b/khtml/xml/dom_nodelistimpl.cpp
index 2608b44..5c155da 100644
--- a/khtml/xml/dom_nodelistimpl.cpp
+++ b/khtml/xml/dom_nodelistimpl.cpp
@@ -306,7 +306,7 @@ bool NameNodeListImpl::nodeMatches( NodeImpl *testNode, bool& /*doRecurse*/ ) co
ClassNodeListImpl::ClassNodeListImpl(NodeImpl* rootNode, const DOMString& classNames)
: DynamicNodeListImpl(rootNode, UNCACHEABLE, DynamicNodeListImpl::Cache::makeClassName)
{
- m_classNames.parseClassAttribute(classNames.string(), m_refNode->document()->inCompatMode());
+ m_classNames.parseClassAttribute(classNames, m_refNode->document()->inCompatMode());
}

bool ClassNodeListImpl::nodeMatches(NodeImpl *testNode, bool& doRecurse) const

[kdelibs/KDE/4.7] khtml: Avoid DOM->Q->DOM string conversion.

2011-12-01T15:38:00.000-08:00

Git commit 4075515f02e42e00d4a959397f5934339501fcd7 by Andrea Iacovitti.
Committed on 02/12/2011 at 00:36.
Pushed by aiacovitti into branch 'KDE/4.7'.

Avoid DOM->Q->DOM string conversion.
Remove redundant check on m_image.
FIXED-IN: 4.7.4

M +1 -1 khtml/khtmlimage.cpp
M +1 -1 khtml/xml/dom_nodelistimpl.cpp

http://commits.kde.org/kdelibs/4075515f02e42e00d4a959397f5934339501fcd7

[kdelibs/KDE/4.7] khtml/dom: Implement check for extender char.

2011-12-01T15:21:00.001-08:00

Git commit 04f6232293f480734a462a25940713adbca82e52 by Andrea Iacovitti.
Committed on 02/12/2011 at 00:10.
Pushed by aiacovitti into branch 'KDE/4.7'.

Implement check for extender char.
FIXED-IN: 4.7.4

M +11 -1 khtml/dom/dom_element.cpp

http://commits.kde.org/kdelibs/04f6232293f480734a462a25940713adbca82e52

[kdelibs/KDE/4.7] khtml/css: Fix problem with first CSS rule being ignored

2011-11-24T03:44:00.001-08:00

Git commit 84b5ef88ce908d3a1464b9d725a1cca1ce6c31be by Allan Sandfeld.
Committed on 24/11/2011 at 12:43.
Pushed by carewolf into branch 'KDE/4.7'.

Fix problem with first CSS rule being ignored

M +339 -343 khtml/css/parser.cpp
M +2 -2 khtml/css/parser.y

http://commits.kde.org/kdelibs/84b5ef88ce908d3a1464b9d725a1cca1ce6c31be

diff --git a/khtml/css/parser.cpp b/khtml/css/parser.cpp
index 9cf78c4..d03211d 100644
--- a/khtml/css/parser.cpp
+++ b/khtml/css/parser.cpp
@@ -544,9 +544,9 @@ union yyalloc

[kdelibs/KDE/4.7] khtml/dom: Build null DOMString when passed null pointer

2011-11-24T03:39:00.001-08:00

Git commit 735f2d96a390d4413f120415b7e926693e33dd4d by Allan Sandfeld.
Committed on 24/11/2011 at 12:38.
Pushed by carewolf into branch 'KDE/4.7'.

Build null DOMString when passed null pointer

M +4 -0 khtml/dom/dom_string.cpp

http://commits.kde.org/kdelibs/735f2d96a390d4413f120415b7e926693e33dd4d

diff --git a/khtml/dom/dom_string.cpp b/khtml/dom/dom_string.cpp
index 4e8c295..604ee07 100644
--- a/khtml/dom/dom_string.cpp
+++ b/khtml/dom/dom_string.cpp
@@ -29,6 +29,10 @@ using namespace DOM;

DOMString::DOMString(const QChar *str, uint len)
{
+ if (!str) {
+ impl = 0;
+ return;
+ }
impl = new DOMStringImpl( str, len );
impl->ref();
}

[kdelibs/KDE/4.7] khtml: Fix confusion between XMLNS-namespace and XML-namespace

2011-11-24T03:26:00.001-08:00

Git commit b5dfb9854f124dcf846511b757319c12a6494219 by Allan Sandfeld.
Committed on 23/11/2011 at 20:45.
Pushed by carewolf into branch 'KDE/4.7'.

Fix confusion between XMLNS-namespace and XML-namespace

M +6 -1 khtml/misc/gennames.py
M +2 -0 khtml/misc/htmlattrs.in
M +5 -1 khtml/misc/htmlnames.cpp
M +322 -317 khtml/misc/htmlnames.h
M +3 -6 khtml/xml/dom_elementimpl.h
M +17 -11 khtml/xml/dom_nodeimpl.cpp

http://commits.kde.org/kdelibs/b5dfb9854f124dcf846511b757319c12a6494219

diff --git a/khtml/misc/gennames.py b/khtml/misc/gennames.py
index c2bffe8..d2f1791 100755
--- a/khtml/misc/gennames.py
+++ b/khtml/misc/gennames.py
@@ -8,7 +8,8 @@ namespaces = {
"empty": [ "DOMString()", False, 1 ],
"svg": ['"http://www.w3.org/2000/svg"', False, 2 ],
"xlink": ['"http://www.w3.org/1999/xlink"', True, 3 ],
- "xml": ['"http://www.w3.org/2000/xmlns/"', True, 4 ]
+ "xmlns": ['"http://www.w3.org/2000/xmlns/"', True, 4 ],
+ "xml": ['"http://www.w3.org/XML/1998/namespace"', True, 5 ],
}

cache = {}
@@ -124,6 +125,8 @@ for n in namespaces.keys():
out.write("const quint16 anyNamespace = 0xffff;\n\
const quint16 anyLocalName = 0xffff;\n\
const quint16 emptyPrefix = 0;\n\
+const quint16 xmlPrefix = 1;\n\
+const quint16 xmlnsPrefix = 2;\n\
\n\
inline quint16 localNamePart(quint32 id) { return id & NodeImpl_IdLocalMask; }\n\
inline quint16 namespacePart(quint32 id) { return (((unsigned int)id) & NodeImpl_IdNSMask) >> 16; }\n\
@@ -252,6 +255,8 @@ IDTable<PrefixFactory>* PrefixFactory::initIdTable()\n\
if (s_idTable) return s_idTable; // Can happen if KHTMLGlobal was recreated..\n\
s_idTable = new IDTable<PrefixFactory>();\n\
s_idTable->addStaticMapping(DOM::emptyPrefix, DOMString());\n\
+ s_idTable->addStaticMapping(DOM::xmlPrefix, \"xml\");\n\
+ s_idTable->addStaticMapping(DOM::xmlnsPrefix, \"xmlns\");\n\
return s_idTable;\n\
}\n" % temp)
out.write("\n}\n")
diff --git a/khtml/misc/htmlattrs.in b/khtml/misc/htmlattrs.in
index 24cfad7..21a2363b 100644
--- a/khtml/misc/htmlattrs.in
+++ b/khtml/misc/htmlattrs.in
@@ -160,3 +160,5 @@ summary
title
usemap
value
+# xmlns is not a HTML attribute, but like HTML attributes it has empty prefix and namespace
+xmlns
diff --git a/khtml/misc/htmlnames.cpp b/khtml/misc/htmlnames.cpp
index b8bffa7..3b22b6d 100644
--- a/khtml/misc/htmlnames.cpp
+++ b/khtml/misc/htmlnames.cpp
@@ -11,9 +11,10 @@ IDTable<NamespaceFactory>* NamespaceFactory::initIdTable()
if (s_idTable) return s_idTable; // Can happen if KHTMLGlobal was recreated..
s_idTable = new IDTable<NamespaceFactory>();
s_idTable->addStaticMapping(DOM::xmlNamespace, XML_NAMESPACE);
+ s_idTable->addStaticMapping(DOM::xmlnsNamespace, XMLNS_NAMESPACE);
s_idTable->addStaticMapping(DOM::svgNamespace, SVG_NAMESPACE);
- s_idTable->addStaticMapping(DOM::xhtmlNamespace, XHTML_NAMESPACE);
s_idTable->addStaticMapping(DOM::xlinkNamespace, XLINK_NAMESPACE);
+ s_idTable->addStaticMapping(DOM::xhtmlNamespace, XHTML_NAMESPACE);
s_idTable->addStaticMapping(DOM::emptyNamespace, DOMString());
return s_idTable;
}
@@ -279,6 +280,7 @@ IDTable<LocalNameFactory>* LocalNameFactory::initIdTable()
s_idTable->addStaticMapping(localNamePart(ATTR_SUMMARY), "summary");
s_idTable->addStaticMapping(localNamePart(ATTR_USEMAP), "usemap");
s_idTable->addStaticMapping(localNamePart(ATTR_VALUE), "value");
+ s_idTable->addStaticMapping(localNamePart(ATTR_XMLNS), "xmlns");
s_idTable->addStaticMapping(localNamePart(ID_ALTGLYPH), "altGlyph");
s_idTable->addStaticMapping(localNamePart(ID_ALTGLYPHDEF), "altGlyphDef");
s_idTable->addStaticMapping(localNamePart(ID_ALTGLYPHITEM), "altGlyphItem");
@@ -589,6 +591,8 @@ IDTable<PrefixFactory>* PrefixFactory::initIdTable()
if (s_idTable) return s_idTable; // Can happen if KHTMLGlobal was recreated..
s_idTable = new IDTable<PrefixFactory>();
s_idTable->addStaticMapping(DOM::emptyPrefix, DOMString());
+ s_idTable->addStaticMapping(DOM::xmlPrefix, "xml");
+ s_idTable->addStaticMapping(DOM::xmlnsPrefix, "xmlns");
return s_idTable;
}

diff --git a/khtml/misc/htmlnames.h b/khtml/misc/htmlnames.h
index e1dd7f3..e3adbe7 100644
--- a/khtml/misc/htmlnames.h
+++ b/khtml/misc/htmlnames.h
@@ -6,23 +6,27 @@

#include "misc/idstring.h"

-#define XML_NAMESPACE "http://www.w3.org/2000/xmlns/"
+#define XML_NAMESPACE "http://www.w3.org/XML/1998/namespace"
+#define XMLNS_NAMESPACE "http://www.w3.org/2000/xmlns/"
#define SVG_NAMESPACE "http://www.w3.org/2000/svg"
-#define XHTML_NAMESPACE "http://www.w3.org/1999/xhtml"
#define XLINK_NAMESPACE "http://www.w3.org/1999/xlink"
+#define XHTML_NAMESPACE "http://www.w3.org/1999/xhtml"
namespace DOM {

#define NodeImpl_IdNSMask 0xffff0000
#define NodeImpl_IdLocalMask 0x0000ffff

-const quint32 xmlNamespace = 4;
+const quint32 xmlNamespace = 5;
+const quint32 xmlnsNamespace = 4;
const quint32 svgNamespace = 2;
-const quint32 xhtmlNamespace = 0;
const quint32 xlinkNamespace = 3;
+const quint32 xhtmlNamespace = 0;
const quint32 emptyNamespace = 1;
const quint16 anyNamespace = 0xffff;
const quint16 anyLocalName = 0xffff;
const quint16 emptyPrefix = 0;
+const quint16 xmlPrefix = 1;
+const quint16 xmlnsPrefix = 2;

inline quint16 localNamePart(quint32 id) { return id & NodeImpl_IdLocalMask; }
inline quint16 namespacePart(quint32 id) { return (((unsigned int)id) & NodeImpl_IdNSMask) >> 16; }
@@ -305,321 +309,322 @@ const quint32 anyQName = makeId(anyNamespace, anyLocalName);
#define ATTR_SUMMARY ((DOM::emptyNamespace << 16) | 253)
#define ATTR_USEMAP ((DOM::emptyNamespace << 16) | 254)
#define ATTR_VALUE ((DOM::emptyNamespace << 16) | 255)
-#define ID_ALTGLYPH 256
-#define ID_ALTGLYPHDEF 257
-#define ID_ALTGLYPHITEM 258
-#define ID_ANIMATE 259
-#define ATTR_ANIMATE ((DOM::emptyNamespace << 16) | 259)
-#define ID_ANIMATECOLOR 260
-#define ID_ANIMATEMOTION 261
-#define ID_ANIMATETRANSFORM 262
-#define ID_SET 263
-#define ID_CIRCLE 264
-#define ID_CLIPPATH 265
-#define ID_COLOR_PROFILE 266
-#define ID_CURSOR 267
-#define ATTR_CURSOR ((DOM::emptyNamespace << 16) | 267)
-#define ID_DEFINITION_SRC 268
-#define ID_DEFS 269
-#define ID_DESC 270
-#define ID_ELLIPSE 271
-#define ID_FEBLEND 272
-#define ID_FECOLORMATRIX 273
-#define ATTR_FECOLORMATRIX ((DOM::emptyNamespace << 16) | 273)
-#define ID_FECOMPONENTTRANSFER 274
-#define ID_FECOMPOSITE 275
-#define ATTR_FECOMPOSITE ((DOM::emptyNamespace << 16) | 275)
-#define ID_FECONVOLVEMATRIX 276
-#define ID_FEDIFFUSELIGHTING 277
-#define ID_FEDISPLACEMENTMAP 278
-#define ID_FEDISTANTLIGHT 279
-#define ID_FEFLOOD 280
-#define ID_FEFUNCA 281
-#define ID_FEFUNCB 282
-#define ID_FEFUNCG 283
-#define ID_FEFUNCR 284
-#define ID_FEGAUSSIANBLUR 285
-#define ATTR_FEGAUSSIANBLUR ((DOM::emptyNamespace << 16) | 285)
-#define ID_FEIMAGE 286
-#define ID_FEMERGE 287
-#define ID_FEMERGENODE 288
-#define ID_FEMORPHOLOGY 289
-#define ATTR_FEMORPHOLOGY ((DOM::emptyNamespace << 16) | 289)
-#define ID_FEOFFSET 290
-#define ID_FEPOINTLIGHT 291
-#define ID_FESPECULARLIGHTING 292
-#define ID_FESPOTLIGHT 293
-#define ID_FETILE 294
-#define ATTR_FETILE ((DOM::emptyNamespace << 16) | 294)
-#define ID_FETURBULENCE 295
-#define ID_FILTER 296
-#define ATTR_FILTER ((DOM::emptyNamespace << 16) | 296)
-#define ID_FONT_FACE 297
-#define ID_FONT_FACE_FORMAT 298
-#define ID_FONT_FACE_NAME 299
-#define ID_FONT_FACE_SRC 300
-#define ID_FONT_FACE_URI 301
-#define ID_FOREIGNOBJECT 302
-#define ID_G 303
-#define ID_GLYPH 304
-#define ID_GLYPHREF 305
-#define ATTR_GLYPHREF ((DOM::emptyNamespace << 16) | 305)
-#define ID_HKERN 306
-#define ID_LINE 307
-#define ID_LINEARGRADIENT 308
-#define ID_MARKER 309
-#define ID_MASK 310
-#define ATTR_MASK ((DOM::emptyNamespace << 16) | 310)
-#define ID_METADATA 311
-#define ID_MISSING_GLYPH 312
-#define ID_MPATH 313
-#define ID_PATH 314
-#define ATTR_PATH ((DOM::emptyNamespace << 16) | 314)
-#define ID_PATTERN 315
-#define ID_POLYGON 316
-#define ID_POLYLINE 317
-#define ID_RADIALGRADIENT 318
-#define ID_RECT 319
-#define ID_STOP 320
-#define ID_SVG 321
-#define ID_SWITCH 322
-#define ID_SYMBOL 323
-#define ID_TEXTPATH 324
-#define ID_TREF 325
-#define ID_TSPAN 326
-#define ID_USE 327
-#define ID_VIEW 328
-#define ID_VKERN 329
-#define ATTR_ACCENT_HEIGHT ((DOM::emptyNamespace << 16) | 330)
-#define ATTR_ACCUMULATE ((DOM::emptyNamespace << 16) | 331)
-#define ATTR_ADDITIVE ((DOM::emptyNamespace << 16) | 332)
-#define ATTR_ALIGNMENT_BASELINE ((DOM::emptyNamespace << 16) | 333)
-#define ATTR_ALPHABETIC ((DOM::emptyNamespace << 16) | 334)
-#define ATTR_AMPLITUDE ((DOM::emptyNamespace << 16) | 335)
-#define ATTR_ARABIC_FORM ((DOM::emptyNamespace << 16) | 336)
-#define ATTR_ASCENT ((DOM::emptyNamespace << 16) | 337)
-#define ATTR_ATTRIBUTENAME ((DOM::emptyNamespace << 16) | 338)
-#define ATTR_ATTRIBUTETYPE ((DOM::emptyNamespace << 16) | 339)
-#define ATTR_AZIMUTH ((DOM::emptyNamespace << 16) | 340)
-#define ATTR_BASEFREQUENCY ((DOM::emptyNamespace << 16) | 341)
-#define ATTR_BASELINE_SHIFT ((DOM::emptyNamespace << 16) | 342)
-#define ATTR_BASEPROFILE ((DOM::emptyNamespace << 16) | 343)
-#define ATTR_BBOX ((DOM::emptyNamespace << 16) | 344)
-#define ATTR_BEGIN ((DOM::emptyNamespace << 16) | 345)
-#define ATTR_BIAS ((DOM::emptyNamespace << 16) | 346)
-#define ATTR_BY ((DOM::emptyNamespace << 16) | 347)
-#define ATTR_CALCMODE ((DOM::emptyNamespace << 16) | 348)
-#define ATTR_CAP_HEIGHT ((DOM::emptyNamespace << 16) | 349)
-#define ATTR_CLIP ((DOM::emptyNamespace << 16) | 350)
-#define ATTR_CLIP_PATH ((DOM::emptyNamespace << 16) | 351)
-#define ATTR_CLIP_RULE ((DOM::emptyNamespace << 16) | 352)
-#define ATTR_CLIPPATHUNITS ((DOM::emptyNamespace << 16) | 353)
-#define ATTR_COLOR_INTERPOLATION ((DOM::emptyNamespace << 16) | 354)
-#define ATTR_COLOR_INTERPOLATION_FILTERS ((DOM::emptyNamespace << 16) | 355)
-#define ATTR_COLOR_PROFILE ((DOM::emptyNamespace << 16) | 356)
-#define ATTR_COLOR_RENDERING ((DOM::emptyNamespace << 16) | 357)
-#define ATTR_CONTENTSCRIPTTYPE ((DOM::emptyNamespace << 16) | 358)
-#define ATTR_CONTENTSTYLETYPE ((DOM::emptyNamespace << 16) | 359)
-#define ATTR_CX ((DOM::emptyNamespace << 16) | 360)
-#define ATTR_CY ((DOM::emptyNamespace << 16) | 361)
-#define ATTR_D ((DOM::emptyNamespace << 16) | 362)
-#define ATTR_DESCENT ((DOM::emptyNamespace << 16) | 363)
-#define ATTR_DIFFUSECONSTANT ((DOM::emptyNamespace << 16) | 364)
-#define ATTR_DISPLAY ((DOM::emptyNamespace << 16) | 365)
-#define ATTR_DIVISOR ((DOM::emptyNamespace << 16) | 366)
-#define ATTR_DOMINANT_BASELINE ((DOM::emptyNamespace << 16) | 367)
-#define ATTR_DUR ((DOM::emptyNamespace << 16) | 368)
-#define ATTR_DX ((DOM::emptyNamespace << 16) | 369)
-#define ATTR_DY ((DOM::emptyNamespace << 16) | 370)
-#define ATTR_EDGEMODE ((DOM::emptyNamespace << 16) | 371)
-#define ATTR_ELEVATION ((DOM::emptyNamespace << 16) | 372)
-#define ATTR_ENABLE_BACKGROUND ((DOM::emptyNamespace << 16) | 373)
-#define ATTR_END ((DOM::emptyNamespace << 16) | 374)
-#define ATTR_EXPONENT ((DOM::emptyNamespace << 16) | 375)
-#define ATTR_EXTERNALRESOURCESREQUIRED ((DOM::emptyNamespace << 16) | 376)
-#define ATTR_FILL ((DOM::emptyNamespace << 16) | 377)
-#define ATTR_FILL_OPACITY ((DOM::emptyNamespace << 16) | 378)
-#define ATTR_FILL_RULE ((DOM::emptyNamespace << 16) | 379)
-#define ATTR_FILTERRES ((DOM::emptyNamespace << 16) | 380)
-#define ATTR_FILTERUNITS ((DOM::emptyNamespace << 16) | 381)
-#define ATTR_FLOOD_COLOR ((DOM::emptyNamespace << 16) | 382)
-#define ATTR_FLOOD_OPACITY ((DOM::emptyNamespace << 16) | 383)
-#define ATTR_FONT_FAMILY ((DOM::emptyNamespace << 16) | 384)
-#define ATTR_FONT_SIZE ((DOM::emptyNamespace << 16) | 385)
-#define ATTR_FONT_SIZE_ADJUST ((DOM::emptyNamespace << 16) | 386)
-#define ATTR_FONT_STRETCH ((DOM::emptyNamespace << 16) | 387)
-#define ATTR_FONT_STYLE ((DOM::emptyNamespace << 16) | 388)
-#define ATTR_FONT_VARIANT ((DOM::emptyNamespace << 16) | 389)
-#define ATTR_FONT_WEIGHT ((DOM::emptyNamespace << 16) | 390)
-#define ATTR_FORMAT ((DOM::emptyNamespace << 16) | 391)
-#define ATTR_FROM ((DOM::emptyNamespace << 16) | 392)
-#define ATTR_FX ((DOM::emptyNamespace << 16) | 393)
-#define ATTR_FY ((DOM::emptyNamespace << 16) | 394)
-#define ATTR_G1 ((DOM::emptyNamespace << 16) | 395)
-#define ATTR_G2 ((DOM::emptyNamespace << 16) | 396)
-#define ATTR_GLYPH_NAME ((DOM::emptyNamespace << 16) | 397)
-#define ATTR_GLYPH_ORIENTATION_HORIZONTAL ((DOM::emptyNamespace << 16) | 398)
-#define ATTR_GLYPH_ORIENTATION_VERTICAL ((DOM::emptyNamespace << 16) | 399)
-#define ATTR_GRADIENTTRANSFORM ((DOM::emptyNamespace << 16) | 400)
-#define ATTR_GRADIENTUNITS ((DOM::emptyNamespace << 16) | 401)
-#define ATTR_HANGING ((DOM::emptyNamespace << 16) | 402)
-#define ATTR_HORIZ_ADV_X ((DOM::emptyNamespace << 16) | 403)
-#define ATTR_HORIZ_ORIGIN_X ((DOM::emptyNamespace << 16) | 404)
-#define ATTR_HORIZ_ORIGIN_Y ((DOM::emptyNamespace << 16) | 405)
-#define ATTR_IDEOGRAPHIC ((DOM::emptyNamespace << 16) | 406)
-#define ATTR_IMAGE_RENDERING ((DOM::emptyNamespace << 16) | 407)
-#define ATTR_IN ((DOM::emptyNamespace << 16) | 408)
-#define ATTR_IN2 ((DOM::emptyNamespace << 16) | 409)
-#define ATTR_INTERCEPT ((DOM::emptyNamespace << 16) | 410)
-#define ATTR_K ((DOM::emptyNamespace << 16) | 411)
-#define ATTR_K1 ((DOM::emptyNamespace << 16) | 412)
-#define ATTR_K2 ((DOM::emptyNamespace << 16) | 413)
-#define ATTR_K3 ((DOM::emptyNamespace << 16) | 414)
-#define ATTR_K4 ((DOM::emptyNamespace << 16) | 415)
-#define ATTR_KERNELMATRIX ((DOM::emptyNamespace << 16) | 416)
-#define ATTR_KERNELUNITLENGTH ((DOM::emptyNamespace << 16) | 417)
-#define ATTR_KERNING ((DOM::emptyNamespace << 16) | 418)
-#define ATTR_KEYPOINTS ((DOM::emptyNamespace << 16) | 419)
-#define ATTR_KEYSPLINES ((DOM::emptyNamespace << 16) | 420)
-#define ATTR_KEYTIMES ((DOM::emptyNamespace << 16) | 421)
-#define ATTR_LENGTHADJUST ((DOM::emptyNamespace << 16) | 422)
-#define ATTR_LETTER_SPACING ((DOM::emptyNamespace << 16) | 423)
-#define ATTR_LIGHTING_COLOR ((DOM::emptyNamespace << 16) | 424)
-#define ATTR_LIMITINGCONEANGLE ((DOM::emptyNamespace << 16) | 425)
-#define ATTR_LOCAL ((DOM::emptyNamespace << 16) | 426)
-#define ATTR_MARKER_END ((DOM::emptyNamespace << 16) | 427)
-#define ATTR_MARKER_MID ((DOM::emptyNamespace << 16) | 428)
-#define ATTR_MARKER_START ((DOM::emptyNamespace << 16) | 429)
-#define ATTR_MARKERHEIGHT ((DOM::emptyNamespace << 16) | 430)
-#define ATTR_MARKERUNITS ((DOM::emptyNamespace << 16) | 431)
-#define ATTR_MARKERWIDTH ((DOM::emptyNamespace << 16) | 432)
-#define ATTR_MASKCONTENTUNITS ((DOM::emptyNamespace << 16) | 433)
-#define ATTR_MASKUNITS ((DOM::emptyNamespace << 16) | 434)
-#define ATTR_MATHEMATICAL ((DOM::emptyNamespace << 16) | 435)
-#define ATTR_MAX ((DOM::emptyNamespace << 16) | 436)
-#define ATTR_MIN ((DOM::emptyNamespace << 16) | 437)
-#define ATTR_MODE ((DOM::emptyNamespace << 16) | 438)
-#define ATTR_NUMOCTAVES ((DOM::emptyNamespace << 16) | 439)
-#define ATTR_OFFSET ((DOM::emptyNamespace << 16) | 440)
-#define ATTR_ONACTIVATE ((DOM::emptyNamespace << 16) | 441)
-#define ATTR_ONBEGIN ((DOM::emptyNamespace << 16) | 442)
-#define ATTR_ONEND ((DOM::emptyNamespace << 16) | 443)
-#define ATTR_ONFOCUSIN ((DOM::emptyNamespace << 16) | 444)
-#define ATTR_ONFOCUSOUT ((DOM::emptyNamespace << 16) | 445)
-#define ATTR_ONREPEAT ((DOM::emptyNamespace << 16) | 446)
-#define ATTR_ONZOOM ((DOM::emptyNamespace << 16) | 447)
-#define ATTR_OPACITY ((DOM::emptyNamespace << 16) | 448)
-#define ATTR_OPERATOR ((DOM::emptyNamespace << 16) | 449)
-#define ATTR_ORDER ((DOM::emptyNamespace << 16) | 450)
-#define ATTR_ORIENT ((DOM::emptyNamespace << 16) | 451)
-#define ATTR_ORIENTATION ((DOM::emptyNamespace << 16) | 452)
-#define ATTR_ORIGIN ((DOM::emptyNamespace << 16) | 453)
-#define ATTR_OVERFLOW ((DOM::emptyNamespace << 16) | 454)
-#define ATTR_OVERLINE_POSITION ((DOM::emptyNamespace << 16) | 455)
-#define ATTR_OVERLINE_THICKNESS ((DOM::emptyNamespace << 16) | 456)
-#define ATTR_PANOSE_1 ((DOM::emptyNamespace << 16) | 457)
-#define ATTR_PATHLENGTH ((DOM::emptyNamespace << 16) | 458)
-#define ATTR_PATTERNCONTENTUNITS ((DOM::emptyNamespace << 16) | 459)
-#define ATTR_PATTERNTRANSFORM ((DOM::emptyNamespace << 16) | 460)
-#define ATTR_PATTERNUNITS ((DOM::emptyNamespace << 16) | 461)
-#define ATTR_POINTER_EVENTS ((DOM::emptyNamespace << 16) | 462)
-#define ATTR_POINTS ((DOM::emptyNamespace << 16) | 463)
-#define ATTR_POINTSATX ((DOM::emptyNamespace << 16) | 464)
-#define ATTR_POINTSATY ((DOM::emptyNamespace << 16) | 465)
-#define ATTR_POINTSATZ ((DOM::emptyNamespace << 16) | 466)
-#define ATTR_PRESERVEALPHA ((DOM::emptyNamespace << 16) | 467)
-#define ATTR_PRESERVEASPECTRATIO ((DOM::emptyNamespace << 16) | 468)
-#define ATTR_PRIMITIVEUNITS ((DOM::emptyNamespace << 16) | 469)
-#define ATTR_R ((DOM::emptyNamespace << 16) | 470)
-#define ATTR_RADIUS ((DOM::emptyNamespace << 16) | 471)
-#define ATTR_REFX ((DOM::emptyNamespace << 16) | 472)
-#define ATTR_REFY ((DOM::emptyNamespace << 16) | 473)
-#define ATTR_RENDERING_INTENT ((DOM::emptyNamespace << 16) | 474)
-#define ATTR_REPEATCOUNT ((DOM::emptyNamespace << 16) | 475)
-#define ATTR_REPEATDUR ((DOM::emptyNamespace << 16) | 476)
-#define ATTR_REQUIREDEXTENSIONS ((DOM::emptyNamespace << 16) | 477)
-#define ATTR_REQUIREDFEATURES ((DOM::emptyNamespace << 16) | 478)
-#define ATTR_RESTART ((DOM::emptyNamespace << 16) | 479)
-#define ATTR_RESULT ((DOM::emptyNamespace << 16) | 480)
-#define ATTR_ROTATE ((DOM::emptyNamespace << 16) | 481)
-#define ATTR_RX ((DOM::emptyNamespace << 16) | 482)
-#define ATTR_RY ((DOM::emptyNamespace << 16) | 483)
-#define ATTR_SCALE ((DOM::emptyNamespace << 16) | 484)
-#define ATTR_SEED ((DOM::emptyNamespace << 16) | 485)
-#define ATTR_SHAPE_RENDERING ((DOM::emptyNamespace << 16) | 486)
-#define ATTR_SLOPE ((DOM::emptyNamespace << 16) | 487)
-#define ATTR_SPACING ((DOM::emptyNamespace << 16) | 488)
-#define ATTR_SPECULARCONSTANT ((DOM::emptyNamespace << 16) | 489)
-#define ATTR_SPECULAREXPONENT ((DOM::emptyNamespace << 16) | 490)
-#define ATTR_SPREADMETHOD ((DOM::emptyNamespace << 16) | 491)
-#define ATTR_STARTOFFSET ((DOM::emptyNamespace << 16) | 492)
-#define ATTR_STDDEVIATION ((DOM::emptyNamespace << 16) | 493)
-#define ATTR_STEMH ((DOM::emptyNamespace << 16) | 494)
-#define ATTR_STEMV ((DOM::emptyNamespace << 16) | 495)
-#define ATTR_STITCHTILES ((DOM::emptyNamespace << 16) | 496)
-#define ATTR_STOP_COLOR ((DOM::emptyNamespace << 16) | 497)
-#define ATTR_STOP_OPACITY ((DOM::emptyNamespace << 16) | 498)
-#define ATTR_STRIKETHROUGH_POSITION ((DOM::emptyNamespace << 16) | 499)
-#define ATTR_STRIKETHROUGH_THICKNESS ((DOM::emptyNamespace << 16) | 500)
-#define ATTR_STROKE ((DOM::emptyNamespace << 16) | 501)
-#define ATTR_STROKE_DASHARRAY ((DOM::emptyNamespace << 16) | 502)
-#define ATTR_STROKE_DASHOFFSET ((DOM::emptyNamespace << 16) | 503)
-#define ATTR_STROKE_LINECAP ((DOM::emptyNamespace << 16) | 504)
-#define ATTR_STROKE_LINEJOIN ((DOM::emptyNamespace << 16) | 505)
-#define ATTR_STROKE_MITERLIMIT ((DOM::emptyNamespace << 16) | 506)
-#define ATTR_STROKE_OPACITY ((DOM::emptyNamespace << 16) | 507)
-#define ATTR_STROKE_WIDTH ((DOM::emptyNamespace << 16) | 508)
-#define ATTR_SURFACESCALE ((DOM::emptyNamespace << 16) | 509)
-#define ATTR_SYSTEMLANGUAGE ((DOM::emptyNamespace << 16) | 510)
-#define ATTR_TABLEVALUES ((DOM::emptyNamespace << 16) | 511)
-#define ATTR_TARGETX ((DOM::emptyNamespace << 16) | 512)
-#define ATTR_TARGETY ((DOM::emptyNamespace << 16) | 513)
-#define ATTR_TEXT_ANCHOR ((DOM::emptyNamespace << 16) | 514)
-#define ATTR_TEXT_DECORATION ((DOM::emptyNamespace << 16) | 515)
-#define ATTR_TEXT_RENDERING ((DOM::emptyNamespace << 16) | 516)
-#define ATTR_TEXTLENGTH ((DOM::emptyNamespace << 16) | 517)
-#define ATTR_TO ((DOM::emptyNamespace << 16) | 518)
-#define ATTR_TRANSFORM ((DOM::emptyNamespace << 16) | 519)
-#define ATTR_U1 ((DOM::emptyNamespace << 16) | 520)
-#define ATTR_U2 ((DOM::emptyNamespace << 16) | 521)
-#define ATTR_UNDERLINE_POSITION ((DOM::emptyNamespace << 16) | 522)
-#define ATTR_UNDERLINE_THICKNESS ((DOM::emptyNamespace << 16) | 523)
-#define ATTR_UNICODE ((DOM::emptyNamespace << 16) | 524)
-#define ATTR_UNICODE_BIDI ((DOM::emptyNamespace << 16) | 525)
-#define ATTR_UNICODE_RANGE ((DOM::emptyNamespace << 16) | 526)
-#define ATTR_UNITS_PER_EM ((DOM::emptyNamespace << 16) | 527)
-#define ATTR_V_ALPHABETIC ((DOM::emptyNamespace << 16) | 528)
-#define ATTR_V_HANGING ((DOM::emptyNamespace << 16) | 529)
-#define ATTR_V_IDEOGRAPHIC ((DOM::emptyNamespace << 16) | 530)
-#define ATTR_V_MATHEMATICAL ((DOM::emptyNamespace << 16) | 531)
-#define ATTR_VALUES ((DOM::emptyNamespace << 16) | 532)
-#define ATTR_VERT_ADV_Y ((DOM::emptyNamespace << 16) | 533)
-#define ATTR_VERT_ORIGIN_X ((DOM::emptyNamespace << 16) | 534)
-#define ATTR_VERT_ORIGIN_Y ((DOM::emptyNamespace << 16) | 535)
-#define ATTR_VIEWBOX ((DOM::emptyNamespace << 16) | 536)
-#define ATTR_VIEWTARGET ((DOM::emptyNamespace << 16) | 537)
-#define ATTR_WIDTHS ((DOM::emptyNamespace << 16) | 538)
-#define ATTR_WORD_SPACING ((DOM::emptyNamespace << 16) | 539)
-#define ATTR_WRITING_MODE ((DOM::emptyNamespace << 16) | 540)
-#define ATTR_X ((DOM::emptyNamespace << 16) | 541)
-#define ATTR_X_HEIGHT ((DOM::emptyNamespace << 16) | 542)
-#define ATTR_X1 ((DOM::emptyNamespace << 16) | 543)
-#define ATTR_X2 ((DOM::emptyNamespace << 16) | 544)
-#define ATTR_XCHANNELSELECTOR ((DOM::emptyNamespace << 16) | 545)
-#define ATTR_Y ((DOM::emptyNamespace << 16) | 546)
-#define ATTR_Y1 ((DOM::emptyNamespace << 16) | 547)
-#define ATTR_Y2 ((DOM::emptyNamespace << 16) | 548)
-#define ATTR_YCHANNELSELECTOR ((DOM::emptyNamespace << 16) | 549)
-#define ATTR_Z ((DOM::emptyNamespace << 16) | 550)
-#define ATTR_ZOOMANDPAN ((DOM::emptyNamespace << 16) | 551)
-#define ATTR_XLINK_ACTUATE ((DOM::xlinkNamespace << 16) | 552)
-#define ATTR_XLINK_ARCROLE ((DOM::xlinkNamespace << 16) | 553)
-#define ATTR_XLINK_ROLE ((DOM::xlinkNamespace << 16) | 554)
-#define ATTR_XLINK_SHOW ((DOM::xlinkNamespace << 16) | 555)
-#define ATTR_XML_SPACE ((DOM::xmlNamespace << 16) | 556)
+#define ATTR_XMLNS ((DOM::emptyNamespace << 16) | 256)
+#define ID_ALTGLYPH 257
+#define ID_ALTGLYPHDEF 258
+#define ID_ALTGLYPHITEM 259
+#define ID_ANIMATE 260
+#define ATTR_ANIMATE ((DOM::emptyNamespace << 16) | 260)
+#define ID_ANIMATECOLOR 261
+#define ID_ANIMATEMOTION 262
+#define ID_ANIMATETRANSFORM 263
+#define ID_SET 264
+#define ID_CIRCLE 265
+#define ID_CLIPPATH 266
+#define ID_COLOR_PROFILE 267
+#define ID_CURSOR 268
+#define ATTR_CURSOR ((DOM::emptyNamespace << 16) | 268)
+#define ID_DEFINITION_SRC 269
+#define ID_DEFS 270
+#define ID_DESC 271
+#define ID_ELLIPSE 272
+#define ID_FEBLEND 273
+#define ID_FECOLORMATRIX 274
+#define ATTR_FECOLORMATRIX ((DOM::emptyNamespace << 16) | 274)
+#define ID_FECOMPONENTTRANSFER 275
+#define ID_FECOMPOSITE 276
+#define ATTR_FECOMPOSITE ((DOM::emptyNamespace << 16) | 276)
+#define ID_FECONVOLVEMATRIX 277
+#define ID_FEDIFFUSELIGHTING 278
+#define ID_FEDISPLACEMENTMAP 279
+#define ID_FEDISTANTLIGHT 280
+#define ID_FEFLOOD 281
+#define ID_FEFUNCA 282
+#define ID_FEFUNCB 283
+#define ID_FEFUNCG 284
+#define ID_FEFUNCR 285
+#define ID_FEGAUSSIANBLUR 286
+#define ATTR_FEGAUSSIANBLUR ((DOM::emptyNamespace << 16) | 286)
+#define ID_FEIMAGE 287
+#define ID_FEMERGE 288
+#define ID_FEMERGENODE 289
+#define ID_FEMORPHOLOGY 290
+#define ATTR_FEMORPHOLOGY ((DOM::emptyNamespace << 16) | 290)
+#define ID_FEOFFSET 291
+#define ID_FEPOINTLIGHT 292
+#define ID_FESPECULARLIGHTING 293
+#define ID_FESPOTLIGHT 294
+#define ID_FETILE 295
+#define ATTR_FETILE ((DOM::emptyNamespace << 16) | 295)
+#define ID_FETURBULENCE 296
+#define ID_FILTER 297
+#define ATTR_FILTER ((DOM::emptyNamespace << 16) | 297)
+#define ID_FONT_FACE 298
+#define ID_FONT_FACE_FORMAT 299
+#define ID_FONT_FACE_NAME 300
+#define ID_FONT_FACE_SRC 301
+#define ID_FONT_FACE_URI 302
+#define ID_FOREIGNOBJECT 303
+#define ID_G 304
+#define ID_GLYPH 305
+#define ID_GLYPHREF 306
+#define ATTR_GLYPHREF ((DOM::emptyNamespace << 16) | 306)
+#define ID_HKERN 307
+#define ID_LINE 308
+#define ID_LINEARGRADIENT 309
+#define ID_MARKER 310
+#define ID_MASK 311
+#define ATTR_MASK ((DOM::emptyNamespace << 16) | 311)
+#define ID_METADATA 312
+#define ID_MISSING_GLYPH 313
+#define ID_MPATH 314
+#define ID_PATH 315
+#define ATTR_PATH ((DOM::emptyNamespace << 16) | 315)
+#define ID_PATTERN 316
+#define ID_POLYGON 317
+#define ID_POLYLINE 318
+#define ID_RADIALGRADIENT 319
+#define ID_RECT 320
+#define ID_STOP 321
+#define ID_SVG 322
+#define ID_SWITCH 323
+#define ID_SYMBOL 324
+#define ID_TEXTPATH 325
+#define ID_TREF 326
+#define ID_TSPAN 327
+#define ID_USE 328
+#define ID_VIEW 329
+#define ID_VKERN 330
+#define ATTR_ACCENT_HEIGHT ((DOM::emptyNamespace << 16) | 331)
+#define ATTR_ACCUMULATE ((DOM::emptyNamespace << 16) | 332)
+#define ATTR_ADDITIVE ((DOM::emptyNamespace << 16) | 333)
+#define ATTR_ALIGNMENT_BASELINE ((DOM::emptyNamespace << 16) | 334)
+#define ATTR_ALPHABETIC ((DOM::emptyNamespace << 16) | 335)
+#define ATTR_AMPLITUDE ((DOM::emptyNamespace << 16) | 336)
+#define ATTR_ARABIC_FORM ((DOM::emptyNamespace << 16) | 337)
+#define ATTR_ASCENT ((DOM::emptyNamespace << 16) | 338)
+#define ATTR_ATTRIBUTENAME ((DOM::emptyNamespace << 16) | 339)
+#define ATTR_ATTRIBUTETYPE ((DOM::emptyNamespace << 16) | 340)
+#define ATTR_AZIMUTH ((DOM::emptyNamespace << 16) | 341)
+#define ATTR_BASEFREQUENCY ((DOM::emptyNamespace << 16) | 342)
+#define ATTR_BASELINE_SHIFT ((DOM::emptyNamespace << 16) | 343)
+#define ATTR_BASEPROFILE ((DOM::emptyNamespace << 16) | 344)
+#define ATTR_BBOX ((DOM::emptyNamespace << 16) | 345)
+#define ATTR_BEGIN ((DOM::emptyNamespace << 16) | 346)
+#define ATTR_BIAS ((DOM::emptyNamespace << 16) | 347)
+#define ATTR_BY ((DOM::emptyNamespace << 16) | 348)
+#define ATTR_CALCMODE ((DOM::emptyNamespace << 16) | 349)
+#define ATTR_CAP_HEIGHT ((DOM::emptyNamespace << 16) | 350)
+#define ATTR_CLIP ((DOM::emptyNamespace << 16) | 351)
+#define ATTR_CLIP_PATH ((DOM::emptyNamespace << 16) | 352)
+#define ATTR_CLIP_RULE ((DOM::emptyNamespace << 16) | 353)
+#define ATTR_CLIPPATHUNITS ((DOM::emptyNamespace << 16) | 354)
+#define ATTR_COLOR_INTERPOLATION ((DOM::emptyNamespace << 16) | 355)
+#define ATTR_COLOR_INTERPOLATION_FILTERS ((DOM::emptyNamespace << 16) | 356)
+#define ATTR_COLOR_PROFILE ((DOM::emptyNamespace << 16) | 357)
+#define ATTR_COLOR_RENDERING ((DOM::emptyNamespace << 16) | 358)
+#define ATTR_CONTENTSCRIPTTYPE ((DOM::emptyNamespace << 16) | 359)
+#define ATTR_CONTENTSTYLETYPE ((DOM::emptyNamespace << 16) | 360)
+#define ATTR_CX ((DOM::emptyNamespace << 16) | 361)
+#define ATTR_CY ((DOM::emptyNamespace << 16) | 362)
+#define ATTR_D ((DOM::emptyNamespace << 16) | 363)
+#define ATTR_DESCENT ((DOM::emptyNamespace << 16) | 364)
+#define ATTR_DIFFUSECONSTANT ((DOM::emptyNamespace << 16) | 365)
+#define ATTR_DISPLAY ((DOM::emptyNamespace << 16) | 366)
+#define ATTR_DIVISOR ((DOM::emptyNamespace << 16) | 367)
+#define ATTR_DOMINANT_BASELINE ((DOM::emptyNamespace << 16) | 368)
+#define ATTR_DUR ((DOM::emptyNamespace << 16) | 369)
+#define ATTR_DX ((DOM::emptyNamespace << 16) | 370)
+#define ATTR_DY ((DOM::emptyNamespace << 16) | 371)
+#define ATTR_EDGEMODE ((DOM::emptyNamespace << 16) | 372)
+#define ATTR_ELEVATION ((DOM::emptyNamespace << 16) | 373)
+#define ATTR_ENABLE_BACKGROUND ((DOM::emptyNamespace << 16) | 374)
+#define ATTR_END ((DOM::emptyNamespace << 16) | 375)
+#define ATTR_EXPONENT ((DOM::emptyNamespace << 16) | 376)
+#define ATTR_EXTERNALRESOURCESREQUIRED ((DOM::emptyNamespace << 16) | 377)
+#define ATTR_FILL ((DOM::emptyNamespace << 16) | 378)
+#define ATTR_FILL_OPACITY ((DOM::emptyNamespace << 16) | 379)
+#define ATTR_FILL_RULE ((DOM::emptyNamespace << 16) | 380)
+#define ATTR_FILTERRES ((DOM::emptyNamespace << 16) | 381)
+#define ATTR_FILTERUNITS ((DOM::emptyNamespace << 16) | 382)
+#define ATTR_FLOOD_COLOR ((DOM::emptyNamespace << 16) | 383)
+#define ATTR_FLOOD_OPACITY ((DOM::emptyNamespace << 16) | 384)
+#define ATTR_FONT_FAMILY ((DOM::emptyNamespace << 16) | 385)
+#define ATTR_FONT_SIZE ((DOM::emptyNamespace << 16) | 386)
+#define ATTR_FONT_SIZE_ADJUST ((DOM::emptyNamespace << 16) | 387)
+#define ATTR_FONT_STRETCH ((DOM::emptyNamespace << 16) | 388)
+#define ATTR_FONT_STYLE ((DOM::emptyNamespace << 16) | 389)
+#define ATTR_FONT_VARIANT ((DOM::emptyNamespace << 16) | 390)
+#define ATTR_FONT_WEIGHT ((DOM::emptyNamespace << 16) | 391)
+#define ATTR_FORMAT ((DOM::emptyNamespace << 16) | 392)
+#define ATTR_FROM ((DOM::emptyNamespace << 16) | 393)
+#define ATTR_FX ((DOM::emptyNamespace << 16) | 394)
+#define ATTR_FY ((DOM::emptyNamespace << 16) | 395)
+#define ATTR_G1 ((DOM::emptyNamespace << 16) | 396)
+#define ATTR_G2 ((DOM::emptyNamespace << 16) | 397)
+#define ATTR_GLYPH_NAME ((DOM::emptyNamespace << 16) | 398)
+#define ATTR_GLYPH_ORIENTATION_HORIZONTAL ((DOM::emptyNamespace << 16) | 399)
+#define ATTR_GLYPH_ORIENTATION_VERTICAL ((DOM::emptyNamespace << 16) | 400)
+#define ATTR_GRADIENTTRANSFORM ((DOM::emptyNamespace << 16) | 401)
+#define ATTR_GRADIENTUNITS ((DOM::emptyNamespace << 16) | 402)
+#define ATTR_HANGING ((DOM::emptyNamespace << 16) | 403)
+#define ATTR_HORIZ_ADV_X ((DOM::emptyNamespace << 16) | 404)
+#define ATTR_HORIZ_ORIGIN_X ((DOM::emptyNamespace << 16) | 405)
+#define ATTR_HORIZ_ORIGIN_Y ((DOM::emptyNamespace << 16) | 406)
+#define ATTR_IDEOGRAPHIC ((DOM::emptyNamespace << 16) | 407)
+#define ATTR_IMAGE_RENDERING ((DOM::emptyNamespace << 16) | 408)
+#define ATTR_IN ((DOM::emptyNamespace << 16) | 409)
+#define ATTR_IN2 ((DOM::emptyNamespace << 16) | 410)
+#define ATTR_INTERCEPT ((DOM::emptyNamespace << 16) | 411)
+#define ATTR_K ((DOM::emptyNamespace << 16) | 412)
+#define ATTR_K1 ((DOM::emptyNamespace << 16) | 413)
+#define ATTR_K2 ((DOM::emptyNamespace << 16) | 414)
+#define ATTR_K3 ((DOM::emptyNamespace << 16) | 415)
+#define ATTR_K4 ((DOM::emptyNamespace << 16) | 416)
+#define ATTR_KERNELMATRIX ((DOM::emptyNamespace << 16) | 417)
+#define ATTR_KERNELUNITLENGTH ((DOM::emptyNamespace << 16) | 418)
+#define ATTR_KERNING ((DOM::emptyNamespace << 16) | 419)
+#define ATTR_KEYPOINTS ((DOM::emptyNamespace << 16) | 420)
+#define ATTR_KEYSPLINES ((DOM::emptyNamespace << 16) | 421)
+#define ATTR_KEYTIMES ((DOM::emptyNamespace << 16) | 422)
+#define ATTR_LENGTHADJUST ((DOM::emptyNamespace << 16) | 423)
+#define ATTR_LETTER_SPACING ((DOM::emptyNamespace << 16) | 424)
+#define ATTR_LIGHTING_COLOR ((DOM::emptyNamespace << 16) | 425)
+#define ATTR_LIMITINGCONEANGLE ((DOM::emptyNamespace << 16) | 426)
+#define ATTR_LOCAL ((DOM::emptyNamespace << 16) | 427)
+#define ATTR_MARKER_END ((DOM::emptyNamespace << 16) | 428)
+#define ATTR_MARKER_MID ((DOM::emptyNamespace << 16) | 429)
+#define ATTR_MARKER_START ((DOM::emptyNamespace << 16) | 430)
+#define ATTR_MARKERHEIGHT ((DOM::emptyNamespace << 16) | 431)
+#define ATTR_MARKERUNITS ((DOM::emptyNamespace << 16) | 432)
+#define ATTR_MARKERWIDTH ((DOM::emptyNamespace << 16) | 433)
+#define ATTR_MASKCONTENTUNITS ((DOM::emptyNamespace << 16) | 434)
+#define ATTR_MASKUNITS ((DOM::emptyNamespace << 16) | 435)
+#define ATTR_MATHEMATICAL ((DOM::emptyNamespace << 16) | 436)
+#define ATTR_MAX ((DOM::emptyNamespace << 16) | 437)
+#define ATTR_MIN ((DOM::emptyNamespace << 16) | 438)
+#define ATTR_MODE ((DOM::emptyNamespace << 16) | 439)
+#define ATTR_NUMOCTAVES ((DOM::emptyNamespace << 16) | 440)
+#define ATTR_OFFSET ((DOM::emptyNamespace << 16) | 441)
+#define ATTR_ONACTIVATE ((DOM::emptyNamespace << 16) | 442)
+#define ATTR_ONBEGIN ((DOM::emptyNamespace << 16) | 443)
+#define ATTR_ONEND ((DOM::emptyNamespace << 16) | 444)
+#define ATTR_ONFOCUSIN ((DOM::emptyNamespace << 16) | 445)
+#define ATTR_ONFOCUSOUT ((DOM::emptyNamespace << 16) | 446)
+#define ATTR_ONREPEAT ((DOM::emptyNamespace << 16) | 447)
+#define ATTR_ONZOOM ((DOM::emptyNamespace << 16) | 448)
+#define ATTR_OPACITY ((DOM::emptyNamespace << 16) | 449)
+#define ATTR_OPERATOR ((DOM::emptyNamespace << 16) | 450)
+#define ATTR_ORDER ((DOM::emptyNamespace << 16) | 451)
+#define ATTR_ORIENT ((DOM::emptyNamespace << 16) | 452)
+#define ATTR_ORIENTATION ((DOM::emptyNamespace << 16) | 453)
+#define ATTR_ORIGIN ((DOM::emptyNamespace << 16) | 454)
+#define ATTR_OVERFLOW ((DOM::emptyNamespace << 16) | 455)
+#define ATTR_OVERLINE_POSITION ((DOM::emptyNamespace << 16) | 456)
+#define ATTR_OVERLINE_THICKNESS ((DOM::emptyNamespace << 16) | 457)
+#define ATTR_PANOSE_1 ((DOM::emptyNamespace << 16) | 458)
+#define ATTR_PATHLENGTH ((DOM::emptyNamespace << 16) | 459)
+#define ATTR_PATTERNCONTENTUNITS ((DOM::emptyNamespace << 16) | 460)
+#define ATTR_PATTERNTRANSFORM ((DOM::emptyNamespace << 16) | 461)
+#define ATTR_PATTERNUNITS ((DOM::emptyNamespace << 16) | 462)
+#define ATTR_POINTER_EVENTS ((DOM::emptyNamespace << 16) | 463)
+#define ATTR_POINTS ((DOM::emptyNamespace << 16) | 464)
+#define ATTR_POINTSATX ((DOM::emptyNamespace << 16) | 465)
+#define ATTR_POINTSATY ((DOM::emptyNamespace << 16) | 466)
+#define ATTR_POINTSATZ ((DOM::emptyNamespace << 16) | 467)
+#define ATTR_PRESERVEALPHA ((DOM::emptyNamespace << 16) | 468)
+#define ATTR_PRESERVEASPECTRATIO ((DOM::emptyNamespace << 16) | 469)
+#define ATTR_PRIMITIVEUNITS ((DOM::emptyNamespace << 16) | 470)
+#define ATTR_R ((DOM::emptyNamespace << 16) | 471)
+#define ATTR_RADIUS ((DOM::emptyNamespace << 16) | 472)
+#define ATTR_REFX ((DOM::emptyNamespace << 16) | 473)
+#define ATTR_REFY ((DOM::emptyNamespace << 16) | 474)
+#define ATTR_RENDERING_INTENT ((DOM::emptyNamespace << 16) | 475)
+#define ATTR_REPEATCOUNT ((DOM::emptyNamespace << 16) | 476)
+#define ATTR_REPEATDUR ((DOM::emptyNamespace << 16) | 477)
+#define ATTR_REQUIREDEXTENSIONS ((DOM::emptyNamespace << 16) | 478)
+#define ATTR_REQUIREDFEATURES ((DOM::emptyNamespace << 16) | 479)
+#define ATTR_RESTART ((DOM::emptyNamespace << 16) | 480)
+#define ATTR_RESULT ((DOM::emptyNamespace << 16) | 481)
+#define ATTR_ROTATE ((DOM::emptyNamespace << 16) | 482)
+#define ATTR_RX ((DOM::emptyNamespace << 16) | 483)
+#define ATTR_RY ((DOM::emptyNamespace << 16) | 484)
+#define ATTR_SCALE ((DOM::emptyNamespace << 16) | 485)
+#define ATTR_SEED ((DOM::emptyNamespace << 16) | 486)
+#define ATTR_SHAPE_RENDERING ((DOM::emptyNamespace << 16) | 487)
+#define ATTR_SLOPE ((DOM::emptyNamespace << 16) | 488)
+#define ATTR_SPACING ((DOM::emptyNamespace << 16) | 489)
+#define ATTR_SPECULARCONSTANT ((DOM::emptyNamespace << 16) | 490)
+#define ATTR_SPECULAREXPONENT ((DOM::emptyNamespace << 16) | 491)
+#define ATTR_SPREADMETHOD ((DOM::emptyNamespace << 16) | 492)
+#define ATTR_STARTOFFSET ((DOM::emptyNamespace << 16) | 493)
+#define ATTR_STDDEVIATION ((DOM::emptyNamespace << 16) | 494)
+#define ATTR_STEMH ((DOM::emptyNamespace << 16) | 495)
+#define ATTR_STEMV ((DOM::emptyNamespace << 16) | 496)
+#define ATTR_STITCHTILES ((DOM::emptyNamespace << 16) | 497)
+#define ATTR_STOP_COLOR ((DOM::emptyNamespace << 16) | 498)
+#define ATTR_STOP_OPACITY ((DOM::emptyNamespace << 16) | 499)
+#define ATTR_STRIKETHROUGH_POSITION ((DOM::emptyNamespace << 16) | 500)
+#define ATTR_STRIKETHROUGH_THICKNESS ((DOM::emptyNamespace << 16) | 501)
+#define ATTR_STROKE ((DOM::emptyNamespace << 16) | 502)
+#define ATTR_STROKE_DASHARRAY ((DOM::emptyNamespace << 16) | 503)
+#define ATTR_STROKE_DASHOFFSET ((DOM::emptyNamespace << 16) | 504)
+#define ATTR_STROKE_LINECAP ((DOM::emptyNamespace << 16) | 505)
+#define ATTR_STROKE_LINEJOIN ((DOM::emptyNamespace << 16) | 506)
+#define ATTR_STROKE_MITERLIMIT ((DOM::emptyNamespace << 16) | 507)
+#define ATTR_STROKE_OPACITY ((DOM::emptyNamespace << 16) | 508)
+#define ATTR_STROKE_WIDTH ((DOM::emptyNamespace << 16) | 509)
+#define ATTR_SURFACESCALE ((DOM::emptyNamespace << 16) | 510)
+#define ATTR_SYSTEMLANGUAGE ((DOM::emptyNamespace << 16) | 511)
+#define ATTR_TABLEVALUES ((DOM::emptyNamespace << 16) | 512)
+#define ATTR_TARGETX ((DOM::emptyNamespace << 16) | 513)
+#define ATTR_TARGETY ((DOM::emptyNamespace << 16) | 514)
+#define ATTR_TEXT_ANCHOR ((DOM::emptyNamespace << 16) | 515)
+#define ATTR_TEXT_DECORATION ((DOM::emptyNamespace << 16) | 516)
+#define ATTR_TEXT_RENDERING ((DOM::emptyNamespace << 16) | 517)
+#define ATTR_TEXTLENGTH ((DOM::emptyNamespace << 16) | 518)
+#define ATTR_TO ((DOM::emptyNamespace << 16) | 519)
+#define ATTR_TRANSFORM ((DOM::emptyNamespace << 16) | 520)
+#define ATTR_U1 ((DOM::emptyNamespace << 16) | 521)
+#define ATTR_U2 ((DOM::emptyNamespace << 16) | 522)
+#define ATTR_UNDERLINE_POSITION ((DOM::emptyNamespace << 16) | 523)
+#define ATTR_UNDERLINE_THICKNESS ((DOM::emptyNamespace << 16) | 524)
+#define ATTR_UNICODE ((DOM::emptyNamespace << 16) | 525)
+#define ATTR_UNICODE_BIDI ((DOM::emptyNamespace << 16) | 526)
+#define ATTR_UNICODE_RANGE ((DOM::emptyNamespace << 16) | 527)
+#define ATTR_UNITS_PER_EM ((DOM::emptyNamespace << 16) | 528)
+#define ATTR_V_ALPHABETIC ((DOM::emptyNamespace << 16) | 529)
+#define ATTR_V_HANGING ((DOM::emptyNamespace << 16) | 530)
+#define ATTR_V_IDEOGRAPHIC ((DOM::emptyNamespace << 16) | 531)
+#define ATTR_V_MATHEMATICAL ((DOM::emptyNamespace << 16) | 532)
+#define ATTR_VALUES ((DOM::emptyNamespace << 16) | 533)
+#define ATTR_VERT_ADV_Y ((DOM::emptyNamespace << 16) | 534)
+#define ATTR_VERT_ORIGIN_X ((DOM::emptyNamespace << 16) | 535)
+#define ATTR_VERT_ORIGIN_Y ((DOM::emptyNamespace << 16) | 536)
+#define ATTR_VIEWBOX ((DOM::emptyNamespace << 16) | 537)
+#define ATTR_VIEWTARGET ((DOM::emptyNamespace << 16) | 538)
+#define ATTR_WIDTHS ((DOM::emptyNamespace << 16) | 539)
+#define ATTR_WORD_SPACING ((DOM::emptyNamespace << 16) | 540)
+#define ATTR_WRITING_MODE ((DOM::emptyNamespace << 16) | 541)
+#define ATTR_X ((DOM::emptyNamespace << 16) | 542)
+#define ATTR_X_HEIGHT ((DOM::emptyNamespace << 16) | 543)
+#define ATTR_X1 ((DOM::emptyNamespace << 16) | 544)
+#define ATTR_X2 ((DOM::emptyNamespace << 16) | 545)
+#define ATTR_XCHANNELSELECTOR ((DOM::emptyNamespace << 16) | 546)
+#define ATTR_Y ((DOM::emptyNamespace << 16) | 547)
+#define ATTR_Y1 ((DOM::emptyNamespace << 16) | 548)
+#define ATTR_Y2 ((DOM::emptyNamespace << 16) | 549)
+#define ATTR_YCHANNELSELECTOR ((DOM::emptyNamespace << 16) | 550)
+#define ATTR_Z ((DOM::emptyNamespace << 16) | 551)
+#define ATTR_ZOOMANDPAN ((DOM::emptyNamespace << 16) | 552)
+#define ATTR_XLINK_ACTUATE ((DOM::xlinkNamespace << 16) | 553)
+#define ATTR_XLINK_ARCROLE ((DOM::xlinkNamespace << 16) | 554)
+#define ATTR_XLINK_ROLE ((DOM::xlinkNamespace << 16) | 555)
+#define ATTR_XLINK_SHOW ((DOM::xlinkNamespace << 16) | 556)
+#define ATTR_XML_SPACE ((DOM::xmlNamespace << 16) | 557)
#define ID_LAST_TAG 110
#define ID_CLOSE_TAG 16384
-#define ATTR_LAST_ATTR 255
+#define ATTR_LAST_ATTR 256
#define ATTR_LAST_CI_ATTR 211

#define caseSensitiveAttr(id) (((localNamePart(id)) > ATTR_LAST_CI_ATTR || (id) == ATTR_ABBR || (id) == ATTR_CITE || (id) == ATTR_CODE || (id) == ATTR_LABEL || (id) == ATTR_OBJECT || (id) == ATTR_TITLE))
diff --git a/khtml/xml/dom_elementimpl.h b/khtml/xml/dom_elementimpl.h
index 5f33d49..ffce365 100644
--- a/khtml/xml/dom_elementimpl.h
+++ b/khtml/xml/dom_elementimpl.h
@@ -507,12 +507,9 @@ inline bool checkQualifiedName(const DOMString &qualifiedName, const DOMString &
(colonpos >= 0 && namespaceURI.isNull()) ||
colonpos == 0 || // prefix has to consist of at least a letter
(qualifiedName.isNull() && !namespaceURI.isNull()) ||
- (hasXMLPrefix &&
- namespaceURI != "http://www.w3.org/XML/1998/namespace") ||
- (hasXMLNSPrefix &&
- namespaceURI != "http://www.w3.org/2000/xmlns/") ||
- (namespaceURI == "http://www.w3.org/2000/xmlns/" &&
- !hasXMLNSPrefix && qualifiedName != "xmlns")) {
+ (hasXMLPrefix && namespaceURI != XML_NAMESPACE) ||
+ (hasXMLNSPrefix && namespaceURI != XMLNS_NAMESPACE) ||
+ (namespaceURI == XMLNS_NAMESPACE && !hasXMLNSPrefix && qualifiedName != "xmlns")) {
if (pExceptioncode)
*pExceptioncode = DOMException::NAMESPACE_ERR;
return false;
diff --git a/khtml/xml/dom_nodeimpl.cpp b/khtml/xml/dom_nodeimpl.cpp
index 0f70ff3..343caa6 100644
--- a/khtml/xml/dom_nodeimpl.cpp
+++ b/khtml/xml/dom_nodeimpl.cpp
@@ -1387,6 +1387,13 @@ DOM::DOMString DOM::NodeImpl::lookupNamespaceURI(const DOM::DOMString& prefix)
{
//for details see http://www.w3.org/TR/DOM-Level-3-Core/namespaces-algorithms.html#lookupNamespaceURIAlgo

+ // check if this is one of the hard defined prefixes
+ PrefixName ppn = PrefixName::fromString(prefix);
+ if (ppn.id() == xmlPrefix)
+ return DOM::DOMString(XML_NAMESPACE);
+ if (ppn.id() == xmlnsPrefix)
+ return DOM::DOMString(XMLNS_NAMESPACE);
+
switch( this->nodeType() ) {
case Node::ELEMENT_NODE:
if( !this->namespaceURI().isNull() && this->prefix() == prefix ) {
@@ -1394,19 +1401,18 @@ DOM::DOMString DOM::NodeImpl::lookupNamespaceURI(const DOM::DOMString& prefix)
}
if( this->hasAttributes() ) {
ElementImpl* node = static_cast<ElementImpl*>(this);
-
- NamedAttrMapImpl* attributes = node->attributes( true /*readonly*/);
- LocalName pln = LocalName::fromString(prefix);
- PrefixName xmlns = PrefixName::fromString("xmlns");

- DOM::DOMString result = attributes->getValue(pln.id(), xmlns);
- if( !result.isNull() ) {
- return result;
- }
+ NamedAttrMapImpl* attributes = node->attributes( true /*readonly*/);
+ if (ppn.id() != emptyPrefix) {
+ LocalName pln = LocalName::fromString(prefix);
+ PrefixName xmlns = PrefixName::fromId(xmlnsNamespace);

- if( prefix.isNull() ) {
- pln = LocalName::fromString("xmlns");
- result = attributes->getValue(pln.id());
+ DOM::DOMString result = attributes->getValue(pln.id(), xmlns);
+ if( !result.isNull() ) {
+ return result;
+ }
+ } else {
+ DOM::DOMString result = attributes->getValue(ATTR_XMLNS);
if( !result.isEmpty() ) {
return result;
}

[kdelibs/KDE/4.7] khtml/css: Fix memory leak in parsing of invalid CSS

2011-11-24T03:26:00.000-08:00

Git commit 185d2dadd05a54d3013c1fe599622c2b6cf1e880 by Allan Sandfeld.
Committed on 23/11/2011 at 21:03.
Pushed by carewolf into branch 'KDE/4.7'.

Fix memory leak in parsing of invalid CSS

M +414 -363 khtml/css/parser.cpp
M +3 -4 khtml/css/parser.h
M +2 -1 khtml/css/parser.y

http://commits.kde.org/kdelibs/185d2dadd05a54d3013c1fe599622c2b6cf1e880

diff --git a/khtml/css/parser.cpp b/khtml/css/parser.cpp
index cb9477b..9cf78c4 100644
--- a/khtml/css/parser.cpp
+++ b/khtml/css/parser.cpp
@@ -1,9 +1,8 @@
-/* A Bison parser, made by GNU Bison 2.4.3. */
+/* A Bison parser, made by GNU Bison 2.5. */

-/* Skeleton implementation for Bison's Yacc-like parsers in C
+/* Bison implementation for Yacc-like parsers in C

- Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2009, 2010 Free Software Foundation, Inc.
+ Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc.

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -45,7 +44,7 @@
#define YYBISON 1

/* Bison version. */
-#define YYBISON_VERSION "2.4.3"
+#define YYBISON_VERSION "2.5"

/* Skeleton name. */
#define YYSKELETON_NAME "yacc.c"
@@ -431,11 +430,11 @@ YYID (yyi)
# define alloca _alloca
# else
# define YYSTACK_ALLOC alloca
-# if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+# if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
|| defined __cplusplus || defined _MSC_VER)
# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-# ifndef _STDLIB_H
-# define _STDLIB_H 1
+# ifndef EXIT_SUCCESS
+# define EXIT_SUCCESS 0
# endif
# endif
# endif
@@ -458,24 +457,24 @@ YYID (yyi)
# ifndef YYSTACK_ALLOC_MAXIMUM
# define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
# endif
-# if (defined __cplusplus && ! defined _STDLIB_H \
+# if (defined __cplusplus && ! defined EXIT_SUCCESS \
&& ! ((defined YYMALLOC || defined malloc) \
&& (defined YYFREE || defined free)))
# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-# ifndef _STDLIB_H
-# define _STDLIB_H 1
+# ifndef EXIT_SUCCESS
+# define EXIT_SUCCESS 0
# endif
# endif
# ifndef YYMALLOC
# define YYMALLOC malloc
-# if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+# if ! defined malloc && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
|| defined __cplusplus || defined _MSC_VER)
void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
# endif
# endif
# ifndef YYFREE
# define YYFREE free
-# if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+# if ! defined free && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
|| defined __cplusplus || defined _MSC_VER)
void free (void *); /* INFRINGES ON USER NAME SPACE */
# endif
@@ -504,23 +503,7 @@ union yyalloc
((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
+ YYSTACK_GAP_MAXIMUM)

-/* Copy COUNT objects from FROM to TO. The source and destination do
- not overlap. */
-# ifndef YYCOPY
-# if defined __GNUC__ && 1 < __GNUC__
-# define YYCOPY(To, From, Count) \
- __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
-# else
-# define YYCOPY(To, From, Count) \
- do \
- { \
- YYSIZE_T yyi; \
- for (yyi = 0; yyi < (Count); yyi++) \
- (To)[yyi] = (From)[yyi]; \
- } \
- while (YYID (0))
-# endif
-# endif
+# define YYCOPY_NEEDED 1

/* Relocate STACK from its old location to the new one. The
local variables YYSIZE and YYSTACKSIZE give the old and new number of
@@ -540,6 +523,26 @@ union yyalloc

[kdelibs/frameworks] /: Move libkarchive to kdecore.

2011-11-23T02:40:00.000-08:00

Git commit 633e91669be46470bfcf6950bbcb7ffd5ba78405 by Stephen Kelly.
Committed on 23/11/2011 at 11:32.
Pushed by skelly into branch 'frameworks'.

Move libkarchive to kdecore.

It still depends on kdecore, and too much stuff depends on it for
it to be commented out for now.

M +1 -0 kdecore/CMakeLists.txt
R +0 -0 kdecore/libkarchive/CMakeLists.txt [from: tier1/libkarchive/CMakeLists.txt - 100% similarity]
R +0 -0 kdecore/libkarchive/autotests/CMakeLists.txt [from: tier1/libkarchive/autotests/CMakeLists.txt - 100% similarity]
R +0 -0 kdecore/libkarchive/autotests/karchivetest.cpp [from: tier1/libkarchive/autotests/karchivetest.cpp - 100% similarity]
R +0 -0 kdecore/libkarchive/autotests/karchivetest.h [from: tier1/libkarchive/autotests/karchivetest.h - 100% similarity]
R +0 -0 kdecore/libkarchive/autotests/kfiltertest.cpp [from: tier1/libkarchive/autotests/kfiltertest.cpp - 100% similarity]
R +0 -0 kdecore/libkarchive/autotests/kfiltertest.h [from: tier1/libkarchive/autotests/kfiltertest.h - 100% similarity]
R +0 -0 kdecore/libkarchive/autotests/klimitediodevicetest.cpp [from: tier1/libkarchive/autotests/klimitediodevicetest.cpp - 100% similarity]
R +0 -0 kdecore/libkarchive/autotests/klimitediodevicetest.h [from: tier1/libkarchive/autotests/klimitediodevicetest.h - 100% similarity]
R +0 -0 kdecore/libkarchive/autotests/ktartest.cpp [from: tier1/libkarchive/autotests/ktartest.cpp - 100% similarity]
R +0 -0 kdecore/libkarchive/autotests/kziptest.cpp [from: tier1/libkarchive/autotests/kziptest.cpp - 100% similarity]
R +0 -0 kdecore/libkarchive/src/CMakeLists.txt [from: tier1/libkarchive/src/CMakeLists.txt - 100% similarity]
R +0 -0 kdecore/libkarchive/src/ConfigureChecks.cmake [from: tier1/libkarchive/src/ConfigureChecks.cmake - 100% similarity]
R +0 -0 kdecore/libkarchive/src/TODO [from: tier1/libkarchive/src/TODO - 100% similarity]
R +0 -0 kdecore/libkarchive/src/config-compression.h.cmake [from: tier1/libkarchive/src/config-compression.h.cmake - 100% similarity]
R +0 -0 kdecore/libkarchive/src/kar.cpp [from: tier1/libkarchive/src/kar.cpp - 100% similarity]
R +0 -0 kdecore/libkarchive/src/kar.h [from: tier1/libkarchive/src/kar.h - 100% similarity]
R +0 -0 kdecore/libkarchive/src/karchive.cpp [from: tier1/libkarchive/src/karchive.cpp - 100% similarity]
R +0 -0 kdecore/libkarchive/src/karchive.h [from: tier1/libkarchive/src/karchive.h - 100% similarity]
R +0 -0 kdecore/libkarchive/src/kbzip2filter.cpp [from: tier1/libkarchive/src/kbzip2filter.cpp - 100% similarity]
R +0 -0 kdecore/libkarchive/src/kbzip2filter.h [from: tier1/libkarchive/src/kbzip2filter.h - 100% similarity]
R +0 -0 kdecore/libkarchive/src/kcompressiondevice.cpp [from: tier1/libkarchive/src/kcompressiondevice.cpp - 100% similarity]
R +0 -0 kdecore/libkarchive/src/kcompressiondevice.h [from: tier1/libkarchive/src/kcompressiondevice.h - 100% similarity]
R +0 -0 kdecore/libkarchive/src/kfilterbase.cpp [from: tier1/libkarchive/src/kfilterbase.cpp - 100% similarity]
R +0 -0 kdecore/libkarchive/src/kfilterbase.h [from: tier1/libkarchive/src/kfilterbase.h - 100% similarity]
R +0 -0 kdecore/libkarchive/src/kfilterdev.cpp [from: tier1/libkarchive/src/kfilterdev.cpp - 100% similarity]
R +0 -0 kdecore/libkarchive/src/kfilterdev.h [from: tier1/libkarchive/src/kfilterdev.h - 100% similarity]
R +0 -0 kdecore/libkarchive/src/kgzipfilter.cpp [from: tier1/libkarchive/src/kgzipfilter.cpp - 100% similarity]
R +0 -0 kdecore/libkarchive/src/kgzipfilter.h [from: tier1/libkarchive/src/kgzipfilter.h - 100% similarity]
R +0 -0 kdecore/libkarchive/src/klimitediodevice.cpp [from: tier1/libkarchive/src/klimitediodevice.cpp - 100% similarity]
R +0 -0 kdecore/libkarchive/src/klimitediodevice_p.h [from: tier1/libkarchive/src/klimitediodevice_p.h - 100% similarity]
R +0 -0 kdecore/libkarchive/src/knonefilter.cpp [from: tier1/libkarchive/src/knonefilter.cpp - 100% similarity]
R +0 -0 kdecore/libkarchive/src/knonefilter.h [from: tier1/libkarchive/src/knonefilter.h - 100% similarity]
R +0 -0 kdecore/libkarchive/src/ktar.cpp [from: tier1/libkarchive/src/ktar.cpp - 100% similarity]
R +0 -0 kdecore/libkarchive/src/ktar.h [from: tier1/libkarchive/src/ktar.h - 100% similarity]
R +0 -0 kdecore/libkarchive/src/kxzfilter.cpp [from: tier1/libkarchive/src/kxzfilter.cpp - 100% similarity]
R +0 -0 kdecore/libkarchive/src/kxzfilter.h [from: tier1/libkarchive/src/kxzfilter.h - 100% similarity]
R +0 -0 kdecore/libkarchive/src/kzip.cpp [from: tier1/libkarchive/src/kzip.cpp - 100% similarity]
R +0 -0 kdecore/libkarchive/src/kzip.h [from: tier1/libkarchive/src/kzip.h - 100% similarity]
M +2 -2 kdoctools/CMakeLists.txt
M +2 -2 khtml/kmultipart/CMakeLists.txt
M +2 -2 kioslave/http/CMakeLists.txt
M +2 -2 knewstuff/knewstuff2/CMakeLists.txt
M +2 -2 knewstuff/knewstuff3/CMakeLists.txt
M +2 -2 kutils/CMakeLists.txt
M +2 -2 plasma/CMakeLists.txt
M +2 -2 plasma/tests/CMakeLists.txt
M +0 -1 tier1/CMakeLists.txt

http://commits.kde.org/kdelibs/633e91669be46470bfcf6950bbcb7ffd5ba78405

diff --git a/kdecore/CMakeLists.txt b/kdecore/CMakeLists.txt
index f0fffbe..87628b9 100644
--- a/kdecore/CMakeLists.txt
+++ b/kdecore/CMakeLists.txt
@@ -373,6 +373,7 @@ if(NOT WINCE)
endif(NOT WINCE)

add_subdirectory(libkcoreaddons)
+add_subdirectory(libkarchive)

########### install files ###############
install( FILES ${CMAKE_CURRENT_BINARY_DIR}/all_languages DESTINATION ${LOCALE_INSTALL_DIR} )
diff --git a/tier1/libkarchive/CMakeLists.txt b/kdecore/libkarchive/CMakeLists.txt
similarity index 100%
rename from tier1/libkarchive/CMakeLists.txt
rename to kdecore/libkarchive/CMakeLists.txt
diff --git a/tier1/libkarchive/autotests/CMakeLists.txt b/kdecore/libkarchive/autotests/CMakeLists.txt
similarity index 100%
rename from tier1/libkarchive/autotests/CMakeLists.txt
rename to kdecore/libkarchive/autotests/CMakeLists.txt
diff --git a/tier1/libkarchive/autotests/karchivetest.cpp b/kdecore/libkarchive/autotests/karchivetest.cpp
similarity index 100%
rename from tier1/libkarchive/autotests/karchivetest.cpp
rename to kdecore/libkarchive/autotests/karchivetest.cpp
diff --git a/tier1/libkarchive/autotests/karchivetest.h b/kdecore/libkarchive/autotests/karchivetest.h
similarity index 100%
rename from tier1/libkarchive/autotests/karchivetest.h
rename to kdecore/libkarchive/autotests/karchivetest.h
diff --git a/tier1/libkarchive/autotests/kfiltertest.cpp b/kdecore/libkarchive/autotests/kfiltertest.cpp
similarity index 100%
rename from tier1/libkarchive/autotests/kfiltertest.cpp
rename to kdecore/libkarchive/autotests/kfiltertest.cpp
diff --git a/tier1/libkarchive/autotests/kfiltertest.h b/kdecore/libkarchive/autotests/kfiltertest.h
similarity index 100%
rename from tier1/libkarchive/autotests/kfiltertest.h
rename to kdecore/libkarchive/autotests/kfiltertest.h
diff --git a/tier1/libkarchive/autotests/klimitediodevicetest.cpp b/kdecore/libkarchive/autotests/klimitediodevicetest.cpp
similarity index 100%
rename from tier1/libkarchive/autotests/klimitediodevicetest.cpp
rename to kdecore/libkarchive/autotests/klimitediodevicetest.cpp
diff --git a/tier1/libkarchive/autotests/klimitediodevicetest.h b/kdecore/libkarchive/autotests/klimitediodevicetest.h
similarity index 100%
rename from tier1/libkarchive/autotests/klimitediodevicetest.h
rename to kdecore/libkarchive/autotests/klimitediodevicetest.h
diff --git a/tier1/libkarchive/autotests/ktartest.cpp b/kdecore/libkarchive/autotests/ktartest.cpp
similarity index 100%
rename from tier1/libkarchive/autotests/ktartest.cpp
rename to kdecore/libkarchive/autotests/ktartest.cpp
diff --git a/tier1/libkarchive/autotests/kziptest.cpp b/kdecore/libkarchive/autotests/kziptest.cpp
similarity index 100%
rename from tier1/libkarchive/autotests/kziptest.cpp
rename to kdecore/libkarchive/autotests/kziptest.cpp
diff --git a/tier1/libkarchive/src/CMakeLists.txt b/kdecore/libkarchive/src/CMakeLists.txt
similarity index 100%
rename from tier1/libkarchive/src/CMakeLists.txt
rename to kdecore/libkarchive/src/CMakeLists.txt
diff --git a/tier1/libkarchive/src/ConfigureChecks.cmake b/kdecore/libkarchive/src/ConfigureChecks.cmake
similarity index 100%
rename from tier1/libkarchive/src/ConfigureChecks.cmake
rename to kdecore/libkarchive/src/ConfigureChecks.cmake
diff --git a/tier1/libkarchive/src/TODO b/kdecore/libkarchive/src/TODO
similarity index 100%
rename from tier1/libkarchive/src/TODO
rename to kdecore/libkarchive/src/TODO
diff --git a/tier1/libkarchive/src/config-compression.h.cmake b/kdecore/libkarchive/src/config-compression.h.cmake
similarity index 100%
rename from tier1/libkarchive/src/config-compression.h.cmake
rename to kdecore/libkarchive/src/config-compression.h.cmake
diff --git a/tier1/libkarchive/src/kar.cpp b/kdecore/libkarchive/src/kar.cpp
similarity index 100%
rename from tier1/libkarchive/src/kar.cpp
rename to kdecore/libkarchive/src/kar.cpp
diff --git a/tier1/libkarchive/src/kar.h b/kdecore/libkarchive/src/kar.h
similarity index 100%
rename from tier1/libkarchive/src/kar.h
rename to kdecore/libkarchive/src/kar.h
diff --git a/tier1/libkarchive/src/karchive.cpp b/kdecore/libkarchive/src/karchive.cpp
similarity index 100%
rename from tier1/libkarchive/src/karchive.cpp
rename to kdecore/libkarchive/src/karchive.cpp
diff --git a/tier1/libkarchive/src/karchive.h b/kdecore/libkarchive/src/karchive.h
similarity index 100%
rename from tier1/libkarchive/src/karchive.h
rename to kdecore/libkarchive/src/karchive.h
diff --git a/tier1/libkarchive/src/kbzip2filter.cpp b/kdecore/libkarchive/src/kbzip2filter.cpp
similarity index 100%
rename from tier1/libkarchive/src/kbzip2filter.cpp
rename to kdecore/libkarchive/src/kbzip2filter.cpp
diff --git a/tier1/libkarchive/src/kbzip2filter.h b/kdecore/libkarchive/src/kbzip2filter.h
similarity index 100%
rename from tier1/libkarchive/src/kbzip2filter.h
rename to kdecore/libkarchive/src/kbzip2filter.h
diff --git a/tier1/libkarchive/src/kcompressiondevice.cpp b/kdecore/libkarchive/src/kcompressiondevice.cpp
similarity index 100%
rename from tier1/libkarchive/src/kcompressiondevice.cpp
rename to kdecore/libkarchive/src/kcompressiondevice.cpp
diff --git a/tier1/libkarchive/src/kcompressiondevice.h b/kdecore/libkarchive/src/kcompressiondevice.h
similarity index 100%
rename from tier1/libkarchive/src/kcompressiondevice.h
rename to kdecore/libkarchive/src/kcompressiondevice.h
diff --git a/tier1/libkarchive/src/kfilterbase.cpp b/kdecore/libkarchive/src/kfilterbase.cpp
similarity index 100%
rename from tier1/libkarchive/src/kfilterbase.cpp
rename to kdecore/libkarchive/src/kfilterbase.cpp
diff --git a/tier1/libkarchive/src/kfilterbase.h b/kdecore/libkarchive/src/kfilterbase.h
similarity index 100%
rename from tier1/libkarchive/src/kfilterbase.h
rename to kdecore/libkarchive/src/kfilterbase.h
diff --git a/tier1/libkarchive/src/kfilterdev.cpp b/kdecore/libkarchive/src/kfilterdev.cpp
similarity index 100%
rename from tier1/libkarchive/src/kfilterdev.cpp
rename to kdecore/libkarchive/src/kfilterdev.cpp
diff --git a/tier1/libkarchive/src/kfilterdev.h b/kdecore/libkarchive/src/kfilterdev.h
similarity index 100%
rename from tier1/libkarchive/src/kfilterdev.h
rename to kdecore/libkarchive/src/kfilterdev.h
diff --git a/tier1/libkarchive/src/kgzipfilter.cpp b/kdecore/libkarchive/src/kgzipfilter.cpp
similarity index 100%
rename from tier1/libkarchive/src/kgzipfilter.cpp
rename to kdecore/libkarchive/src/kgzipfilter.cpp
diff --git a/tier1/libkarchive/src/kgzipfilter.h b/kdecore/libkarchive/src/kgzipfilter.h
similarity index 100%
rename from tier1/libkarchive/src/kgzipfilter.h
rename to kdecore/libkarchive/src/kgzipfilter.h
diff --git a/tier1/libkarchive/src/klimitediodevice.cpp b/kdecore/libkarchive/src/klimitediodevice.cpp
similarity index 100%
rename from tier1/libkarchive/src/klimitediodevice.cpp
rename to kdecore/libkarchive/src/klimitediodevice.cpp
diff --git a/tier1/libkarchive/src/klimitediodevice_p.h b/kdecore/libkarchive/src/klimitediodevice_p.h
similarity index 100%
rename from tier1/libkarchive/src/klimitediodevice_p.h
rename to kdecore/libkarchive/src/klimitediodevice_p.h
diff --git a/tier1/libkarchive/src/knonefilter.cpp b/kdecore/libkarchive/src/knonefilter.cpp
similarity index 100%
rename from tier1/libkarchive/src/knonefilter.cpp
rename to kdecore/libkarchive/src/knonefilter.cpp
diff --git a/tier1/libkarchive/src/knonefilter.h b/kdecore/libkarchive/src/knonefilter.h
similarity index 100%
rename from tier1/libkarchive/src/knonefilter.h
rename to kdecore/libkarchive/src/knonefilter.h
diff --git a/tier1/libkarchive/src/ktar.cpp b/kdecore/libkarchive/src/ktar.cpp
similarity index 100%
rename from tier1/libkarchive/src/ktar.cpp
rename to kdecore/libkarchive/src/ktar.cpp
diff --git a/tier1/libkarchive/src/ktar.h b/kdecore/libkarchive/src/ktar.h
similarity index 100%
rename from tier1/libkarchive/src/ktar.h
rename to kdecore/libkarchive/src/ktar.h
diff --git a/tier1/libkarchive/src/kxzfilter.cpp b/kdecore/libkarchive/src/kxzfilter.cpp
similarity index 100%
rename from tier1/libkarchive/src/kxzfilter.cpp
rename to kdecore/libkarchive/src/kxzfilter.cpp
diff --git a/tier1/libkarchive/src/kxzfilter.h b/kdecore/libkarchive/src/kxzfilter.h
similarity index 100%
rename from tier1/libkarchive/src/kxzfilter.h
rename to kdecore/libkarchive/src/kxzfilter.h
diff --git a/tier1/libkarchive/src/kzip.cpp b/kdecore/libkarchive/src/kzip.cpp
similarity index 100%
rename from tier1/libkarchive/src/kzip.cpp
rename to kdecore/libkarchive/src/kzip.cpp
diff --git a/tier1/libkarchive/src/kzip.h b/kdecore/libkarchive/src/kzip.h
similarity index 100%
rename from tier1/libkarchive/src/kzip.h
rename to kdecore/libkarchive/src/kzip.h
diff --git a/kdoctools/CMakeLists.txt b/kdoctools/CMakeLists.txt
index 12f118b..89803c3 100644
--- a/kdoctools/CMakeLists.txt
+++ b/kdoctools/CMakeLists.txt
@@ -9,8 +9,8 @@ macro_log_feature(LIBXML2_FOUND "LibXML2" "Required by the KDE help system to pr
macro_log_feature(LIBXML2_XMLLINT_EXECUTABLE "xmllint" "Required by the KDE help system to process DocBook XML" "http://xmlsoft.org" TRUE "" "")

include_directories( ${KDE4_KIO_INCLUDES}
- ${CMAKE_SOURCE_DIR}/tier1/libkarchive/src
- ${CMAKE_BINARY_DIR}/tier1/libkarchive/src
+ ${karchive_SOURCE_DIR}/src
+ ${karchive_BINARY_DIR}/src
)
#include_directories( ${CMAKE_SOURCE_DIR}/kioslave ${CMAKE_SOURCE_DIR}/kioslave/bzip2 )

diff --git a/khtml/kmultipart/CMakeLists.txt b/khtml/kmultipart/CMakeLists.txt
index 606f603..218d679 100644
--- a/khtml/kmultipart/CMakeLists.txt
+++ b/khtml/kmultipart/CMakeLists.txt
@@ -1,8 +1,8 @@

include_directories( ${CMAKE_SOURCE_DIR}/khtml
${CMAKE_SOURCE_DIR}/kio/httpfilter
- ${CMAKE_SOURCE_DIR}/tier1/libkarchive/src
- ${CMAKE_BINARY_DIR}/tier1/libkarchive
+ ${karchive_SOURCE_DIR}/src
+ ${karchive_BINARY_DIR}
)
include_directories(${ZLIB_INCLUDE_DIR})

diff --git a/kioslave/http/CMakeLists.txt b/kioslave/http/CMakeLists.txt
index 54f588c..372ef2f 100644
--- a/kioslave/http/CMakeLists.txt
+++ b/kioslave/http/CMakeLists.txt
@@ -27,8 +27,8 @@ include_directories( ${KDE4_KIO_INCLUDES}
${ZLIB_INCLUDE_DIR}
${CMAKE_SOURCE_DIR}/tier1/solid
${CMAKE_BINARY_DIR}/tier1/solid
- ${CMAKE_SOURCE_DIR}/tier1/libkarchive/src
- ${CMAKE_BINARY_DIR}/tier1/libkarchive/src
+ ${karchive_SOURCE_DIR}/src
+ ${karchive_BINARY_DIR}/src
${kcoreaddons_SOURCE_DIR}/src/randomness
${kcoreaddons_SOURCE_DIR}/src/kernel
${kcoreaddons_SOURCE_DIR}/src/io
diff --git a/knewstuff/knewstuff2/CMakeLists.txt b/knewstuff/knewstuff2/CMakeLists.txt
index c5040dd..3e66f38 100644
--- a/knewstuff/knewstuff2/CMakeLists.txt
+++ b/knewstuff/knewstuff2/CMakeLists.txt
@@ -4,8 +4,8 @@ add_definitions(-DKDE_DEFAULT_DEBUG_AREA=550)

include_directories(${KDE4_KIO_INCLUDES}
${CMAKE_CURRENT_SOURCE_DIR}/..
- ${CMAKE_SOURCE_DIR}/tier1/libkarchive/src
- ${CMAKE_BINARY_DIR}/tier1/libkarchive/src
+ ${karchive_SOURCE_DIR}/src
+ ${karchive_BINARY_DIR}/src
${kcoreaddons_SOURCE_DIR}/src/randomness
${kcoreaddons_BINARY_DIR}/src
)
diff --git a/knewstuff/knewstuff3/CMakeLists.txt b/knewstuff/knewstuff3/CMakeLists.txt
index 9156142..8349e9c 100644
--- a/knewstuff/knewstuff3/CMakeLists.txt
+++ b/knewstuff/knewstuff3/CMakeLists.txt
@@ -6,8 +6,8 @@ include_directories(
${KDE4_KIO_INCLUDES}
${CMAKE_CURRENT_SOURCE_DIR}/..
${LIBATTICA_INCLUDE_DIR}
- ${CMAKE_SOURCE_DIR}/tier1/libkarchive/src
- ${CMAKE_BINARY_DIR}/tier1/libkarchive/src
+ ${karchive_SOURCE_DIR}/src
+ ${karchive_BINARY_DIR}/src
${kcoreaddons_SOURCE_DIR}/src/randomness
${kcoreaddons_BINARY_DIR}/src

diff --git a/kutils/CMakeLists.txt b/kutils/CMakeLists.txt
index dde482e..bfbc698 100644
--- a/kutils/CMakeLists.txt
+++ b/kutils/CMakeLists.txt
@@ -2,8 +2,8 @@ project(kutils)
include_directories( ${KDE4_KDEUI_INCLUDES}
${KDE4_KPARTS_INCLUDES}
${CMAKE_CURRENT_SOURCE_DIR}
- ${CMAKE_SOURCE_DIR}/tier1/libkarchive/src
- ${CMAKE_BINARY_DIR}/tier1/libkarchive/src
+ ${karchive_SOURCE_DIR}/src
+ ${karchive_BINARY_DIR}/src
${CMAKE_SOURCE_DIR}/tier1/libkauth/
${CMAKE_BINARY_DIR}/tier1/libkauth/
)
diff --git a/plasma/CMakeLists.txt b/plasma/CMakeLists.txt
index 8d85991..eccbb16 100644
--- a/plasma/CMakeLists.txt
+++ b/plasma/CMakeLists.txt
@@ -21,8 +21,8 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}
${KDE4_KDEUI_INCLUDES}
${CMAKE_SOURCE_DIR}/experimental/libkdeclarative
${CMAKE_BINARY_DIR}/experimental/libkdeclarative
- ${CMAKE_SOURCE_DIR}/tier1/libkarchive/src
- ${CMAKE_BINARY_DIR}/tier1/libkarchive/src
+ ${karchive_SOURCE_DIR}/src
+ ${karchive_BINARY_DIR}/src
${CMAKE_SOURCE_DIR}/tier1/libkauth/
${CMAKE_BINARY_DIR}/tier1/libkauth/
${CMAKE_SOURCE_DIR}/tier1/threadweaver/
diff --git a/plasma/tests/CMakeLists.txt b/plasma/tests/CMakeLists.txt
index 2b75024..bbc4668 100644
--- a/plasma/tests/CMakeLists.txt
+++ b/plasma/tests/CMakeLists.txt
@@ -1,7 +1,7 @@
set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})

-include_directories ( ${CMAKE_SOURCE_DIR}/tier1/libkarchive/src
- ${CMAKE_BINARY_DIR}/tier1/libkarchive
+include_directories ( ${karchive_SOURCE_DIR}/src
+ ${karchive_BINARY_DIR}
)

MACRO(PLASMA_UNIT_TESTS)
diff --git a/tier1/CMakeLists.txt b/tier1/CMakeLists.txt
index dad31df..df0bd74 100644
--- a/tier1/CMakeLists.txt
+++ b/tier1/CMakeLists.txt
@@ -4,7 +4,6 @@ project(tier1)

add_subdirectory(itemmodels)
add_subdirectory(libkauth)
-add_subdirectory(libkarchive)
add_subdirectory(libkdbus)
add_subdirectory(libkplotting)
add_subdirectory(solid)

[kdelibs/KDE/4.7] khtml/java: When KJavaAppletServer's dtor is called, disconnect from KJavaProcess first to

2011-11-20T07:58:00.001-08:00

Git commit 6bc46d11b1204d437fea92c5ea2115f238360050 by Dawit Alemayehu.
Committed on 19/11/2011 at 21:58.
Pushed by adawit into branch 'KDE/4.7'.

When KJavaAppletServer's dtor is called, disconnect from KJavaProcess first to
avoid crashes.

BUG: 281099
BUG: 233677
FIXED-IN: 4.7.4
REVIEW: 103188

M +2 -0 khtml/java/kjavaappletserver.cpp

http://commits.kde.org/kdelibs/6bc46d11b1204d437fea92c5ea2115f238360050

diff --git a/khtml/java/kjavaappletserver.cpp b/khtml/java/kjavaappletserver.cpp
index aa6dab9..52e1790 100644
--- a/khtml/java/kjavaappletserver.cpp
+++ b/khtml/java/kjavaappletserver.cpp
@@ -154,9 +154,11 @@ KJavaAppletServer::KJavaAppletServer()

KJavaAppletServer::~KJavaAppletServer()
{
+ disconnect(process, 0, 0, 0); // first disconnect from process.
quit();

delete process;
+ process = 0;
delete d;
}

[kdelibs/frameworks] /: Build fixes

2011-11-16T07:58:00.000-08:00

Git commit 2a991767b466d536a99a3c2dbe9e2876278d40b1 by Torgny Nyblom.
Committed on 16/11/2011 at 15:40.
Pushed by tnyblom into branch 'frameworks'.

Build fixes

Missing lib and missing include path

REVIEW: 103148

M +2 -2 kde3support/tests/CMakeLists.txt
M +7 -7 kdecore/tests/CMakeLists.txt
M +5 -5 kdeui/sonnet/tests/CMakeLists.txt
M +2 -2 kdeui/tests/CMakeLists.txt
M +2 -2 kdeui/tests/kconfig_compiler/CMakeLists.txt
M +3 -3 kio/tests/CMakeLists.txt
M +1 -1 kioslave/http/kcookiejar/tests/CMakeLists.txt
M +1 -1 kioslave/http/tests/CMakeLists.txt
M +1 -1 kjs/api/CMakeLists.txt
M +8 -7 knewstuff/tests/CMakeLists.txt
M +1 -1 knotify/tests/CMakeLists.txt
M +5 -5 kparts/tests/CMakeLists.txt
M +1 -1 kpty/tests/CMakeLists.txt
M +1 -1 kross/qts/CMakeLists.txt
M +1 -1 kross/test/CMakeLists.txt
M +2 -1 kunitconversion/tests/CMakeLists.txt
M +11 -1 nepomuk/test/CMakeLists.txt
M +2 -2 tier1/libkarchive/autotests/CMakeLists.txt
M +3 -0 tier2/sonnet/core/tests/CMakeLists.txt

http://commits.kde.org/kdelibs/2a991767b466d536a99a3c2dbe9e2876278d40b1

diff --git a/kde3support/tests/CMakeLists.txt b/kde3support/tests/CMakeLists.txt
index c015c6d..2eb5ced 100644
--- a/kde3support/tests/CMakeLists.txt
+++ b/kde3support/tests/CMakeLists.txt
@@ -4,13 +4,13 @@ include_directories( ${CMAKE_SOURCE_DIR}/kde3support ${CMAKE_SOURCE_DIR}/kde3sup
MACRO(KDE3SUPPORT_UNIT_TESTS)
FOREACH(_testname ${ARGN})
kde4_add_unit_test(${_testname} TESTNAME kde3support-${_testname} ${_testname}.cpp)
- target_link_libraries(${_testname} ${KDE4_KDE3SUPPORT_LIBS} ${QT_QTTEST_LIBRARY})
+ target_link_libraries(${_testname} ${KDE4_KDE3SUPPORT_LIBS} ${QT_QTTEST_LIBRARY} kcoreaddons)
ENDFOREACH(_testname)
ENDMACRO(KDE3SUPPORT_UNIT_TESTS)
MACRO(KDE3SUPPORT_EXECUTABLE_TESTS)
FOREACH(_testname ${ARGN})
kde4_add_executable(${_testname} TEST ${_testname}.cpp)
- target_link_libraries(${_testname} ${KDE4_KDE3SUPPORT_LIBS} ${QT_QTTEST_LIBRARY})
+ target_link_libraries(${_testname} ${KDE4_KDE3SUPPORT_LIBS} ${QT_QTTEST_LIBRARY} kcoreaddons)
ENDFOREACH(_testname)
ENDMACRO(KDE3SUPPORT_EXECUTABLE_TESTS)

diff --git a/kdecore/tests/CMakeLists.txt b/kdecore/tests/CMakeLists.txt
index 2d94d6a..033fcbd 100644
--- a/kdecore/tests/CMakeLists.txt
+++ b/kdecore/tests/CMakeLists.txt
@@ -5,7 +5,7 @@ remove_definitions(-DQT_NO_CAST_FROM_ASCII)
MACRO(KDECORE_UNIT_TESTS)
FOREACH(_testname ${ARGN})
kde4_add_unit_test(${_testname} TESTNAME "kdecore-${_testname}" NOGUI ${_testname}.cpp)
- target_link_libraries(${_testname} ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTNETWORK_LIBRARY})
+ target_link_libraries(${_testname} ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTNETWORK_LIBRARY} kcoreaddons)
if(WINCE)
target_link_libraries(${_testname} ${WCECOMPAT_LIBRARIES})
endif(WINCE)
@@ -14,7 +14,7 @@ ENDMACRO(KDECORE_UNIT_TESTS)
MACRO(KDECORE_EXECUTABLE_TESTS)
FOREACH(_testname ${ARGN})
kde4_add_executable(${_testname} NOGUI TEST ${_testname}.cpp)
- target_link_libraries(${_testname} ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY})
+ target_link_libraries(${_testname} ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} kcoreaddons)
if(WINCE)
target_link_libraries(${_testname} ${WCECOMPAT_LIBRARIES})
endif(WINCE)
@@ -102,33 +102,33 @@ KDECORE_EXECUTABLE_TESTS(
# compile into the test since it's not exported
set(klocaletest_SRCS klocaletest.cpp ../date/kdayperiod.cpp)
kde4_add_unit_test(klocaletest ${klocaletest_SRCS})
-target_link_libraries(klocaletest ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} )
+target_link_libraries(klocaletest ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} kcoreaddons)

########### kdatetimeformattertest ###############

# compile KDateTimeFormatter and KDayPeriod into the test since it's not exported
set(kdatetimeformattertest_SRCS kdatetimeformattertest.cpp ../date/kdatetimeformatter.cpp ../date/kdayperiod.cpp)
kde4_add_unit_test(kdatetimeformattertest ${kdatetimeformattertest_SRCS})
-target_link_libraries(kdatetimeformattertest ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} )
+target_link_libraries(kdatetimeformattertest ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} kcoreaddons)

########### kdirwatchtest_gui ###############

kde4_add_executable(kdirwatchtest_gui TEST kdirwatchtest_gui.cpp)
-target_link_libraries(kdirwatchtest_gui ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY})
+target_link_libraries(kdirwatchtest_gui ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} kcoreaddons)

########### kmimetypetest ###############

# compile kmimemagicrule.cpp into the test since it's not exported and we call match().
set(kmimetypetest_SRCS kmimetypetest.cpp ../services/kmimemagicrule.cpp)
kde4_add_unit_test(kmimetypetest TESTNAME kdecore-kmimetypetest ${kmimetypetest_SRCS})
-target_link_libraries(kmimetypetest ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} )
+target_link_libraries(kmimetypetest ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} kcoreaddons)

########### kmimeglobsfileparsertest ###############

# compile kmimeglobsfileparser.cpp into the test since it's not exported
set(kmimeglobsfileparsertest_SRCS kmimeglobsfileparsertest.cpp ../services/kmimeglobsfileparser.cpp)
kde4_add_unit_test(kmimeglobsfileparsertest TESTNAME kdecore-kmimeglobsfileparsertest ${kmimeglobsfileparsertest_SRCS})
-target_link_libraries(kmimeglobsfileparsertest ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} )
+target_link_libraries(kmimeglobsfileparsertest ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} kcoreaddons)

########### module for klibloadertest ###############

diff --git a/kdeui/sonnet/tests/CMakeLists.txt b/kdeui/sonnet/tests/CMakeLists.txt
index 8a5c1f4..1c00dec 100644
--- a/kdeui/sonnet/tests/CMakeLists.txt
+++ b/kdeui/sonnet/tests/CMakeLists.txt
@@ -7,7 +7,7 @@ set(backgroundtest_SRCS backgroundtest.cpp)

kde4_add_executable(backgroundtest TEST ${backgroundtest_SRCS})

-target_link_libraries(backgroundtest ${KDE4_KDEUI_LIBS})
+target_link_libraries(backgroundtest ${KDE4_KDEUI_LIBS} kcoreaddons)

########### next target ###############
@@ -17,7 +17,7 @@ set(test_dialog_SRCS test_dialog.cpp)

kde4_add_executable(test_dialog TEST ${test_dialog_SRCS})

-target_link_libraries(test_dialog ${KDE4_KDEUI_LIBS} )
+target_link_libraries(test_dialog ${KDE4_KDEUI_LIBS} kcoreaddons)

########### next target ###############
@@ -27,7 +27,7 @@ set(test_highlighter_SRCS test_highlighter.cpp)

kde4_add_executable(test_highlighter TEST ${test_highlighter_SRCS})

-target_link_libraries(test_highlighter ${KDE4_KDEUI_LIBS} )
+target_link_libraries(test_highlighter ${KDE4_KDEUI_LIBS} kcoreaddons)

########### next target ###############
@@ -37,9 +37,9 @@ set(test_configdialog_SRCS test_configdialog.cpp)

kde4_add_executable(test_configdialog TEST ${test_configdialog_SRCS})

-target_link_libraries(test_configdialog ${KDE4_KDEUI_LIBS} )
+target_link_libraries(test_configdialog ${KDE4_KDEUI_LIBS} kcoreaddons)

########### next target ###############

kde4_add_executable(test_dictionarycombobox TEST test_dictionarycombobox.cpp)
-target_link_libraries(test_dictionarycombobox ${KDE4_KDEUI_LIBS})
+target_link_libraries(test_dictionarycombobox ${KDE4_KDEUI_LIBS} kcoreaddons)
diff --git a/kdeui/tests/CMakeLists.txt b/kdeui/tests/CMakeLists.txt
index d71faa1..5375933 100644
--- a/kdeui/tests/CMakeLists.txt
+++ b/kdeui/tests/CMakeLists.txt
@@ -11,13 +11,13 @@ add_definitions(-DQT_GUI_LIB)
MACRO(KDEUI_UNIT_TESTS)
FOREACH(_testname ${ARGN})
kde4_add_unit_test(${_testname} TESTNAME kdeui-${_testname} ${_testname}.cpp)
- target_link_libraries(${_testname} ${KDE4_KDEUI_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTXML_LIBRARY} ${KDEWIN_LIBRARIES})
+ target_link_libraries(${_testname} ${KDE4_KDEUI_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTXML_LIBRARY} ${KDEWIN_LIBRARIES} kcoreaddons)
ENDFOREACH(_testname)
ENDMACRO(KDEUI_UNIT_TESTS)
MACRO(KDEUI_EXECUTABLE_TESTS)
FOREACH(_testname ${ARGN})
kde4_add_executable(${_testname} TEST ${_testname}.cpp)
- target_link_libraries(${_testname} ${KDE4_KDEUI_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTXML_LIBRARY} ${KDEWIN_LIBRARIES})
+ target_link_libraries(${_testname} ${KDE4_KDEUI_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTXML_LIBRARY} ${KDEWIN_LIBRARIES} kcoreaddons)
ENDFOREACH(_testname)
ENDMACRO(KDEUI_EXECUTABLE_TESTS)

diff --git a/kdeui/tests/kconfig_compiler/CMakeLists.txt b/kdeui/tests/kconfig_compiler/CMakeLists.txt
index 28e916f..a94d065 100644
--- a/kdeui/tests/kconfig_compiler/CMakeLists.txt
+++ b/kdeui/tests/kconfig_compiler/CMakeLists.txt
@@ -150,7 +150,7 @@ gen_kcfg_test_source(test10 test10_SRCS)

kde4_add_executable(test10 TEST ${test10_SRCS})

-target_link_libraries(test10 ${KDE4_KDEUI_LIBS} )
+target_link_libraries(test10 ${KDE4_KDEUI_LIBS} kcoreaddons)

########### next target ###############
@@ -198,7 +198,7 @@ set(kconfigcompiler_test_SRCS kconfigcompiler_test.cpp )

kde4_add_unit_test(kconfigcompiler_test ${kconfigcompiler_test_SRCS})

-target_link_libraries(kconfigcompiler_test ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY})
+target_link_libraries(kconfigcompiler_test ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} kcoreaddons)

########### install files ###############

diff --git a/kio/tests/CMakeLists.txt b/kio/tests/CMakeLists.txt
index 77552ed..f403211 100644
--- a/kio/tests/CMakeLists.txt
+++ b/kio/tests/CMakeLists.txt
@@ -5,13 +5,13 @@ include_directories( ${KDE4_KIO_INCLUDES} )
MACRO(KIO_UNIT_TESTS)
FOREACH(_testname ${ARGN})
kde4_add_unit_test(${_testname} TESTNAME kio-${_testname} ${_testname}.cpp)
- target_link_libraries(${_testname} ${KDE4_KIO_LIBS} ${QT_QTTEST_LIBRARY})
+ target_link_libraries(${_testname} ${KDE4_KIO_LIBS} ${QT_QTTEST_LIBRARY} kcoreaddons)
ENDFOREACH(_testname)
ENDMACRO(KIO_UNIT_TESTS)
MACRO(KIO_EXECUTABLE_TESTS)
FOREACH(_testname ${ARGN})
kde4_add_executable(${_testname} TEST ${_testname}.cpp)
- target_link_libraries(${_testname} ${KDE4_KIO_LIBS} ${QT_QTTEST_LIBRARY})
+ target_link_libraries(${_testname} ${KDE4_KIO_LIBS} ${QT_QTTEST_LIBRARY} kcoreaddons)
ENDFOREACH(_testname)
ENDMACRO(KIO_EXECUTABLE_TESTS)

@@ -67,5 +67,5 @@ endif(NOT KDE_NO_DEPRECATED)

set(kfstest_SRCS kfstest.cpp kfdtest.cpp)
kde4_add_executable(kfstest TEST ${kfstest_SRCS})
-target_link_libraries(kfstest ${KDE4_KIO_LIBS} )
+target_link_libraries(kfstest ${KDE4_KIO_LIBS} kcoreaddons)

diff --git a/kioslave/http/kcookiejar/tests/CMakeLists.txt b/kioslave/http/kcookiejar/tests/CMakeLists.txt
index f436958..7e9693f 100644
--- a/kioslave/http/kcookiejar/tests/CMakeLists.txt
+++ b/kioslave/http/kcookiejar/tests/CMakeLists.txt
@@ -6,7 +6,7 @@ set(kcookiejartest_SRCS kcookiejartest.cpp )

kde4_add_unit_test(kcookiejartest NOGUI ${kcookiejartest_SRCS})

-target_link_libraries(kcookiejartest ${KDE4_KIO_LIBS} ${QT_QTTEST_LIBRARY})
+target_link_libraries(kcookiejartest ${KDE4_KIO_LIBS} ${QT_QTTEST_LIBRARY} kcoreaddons)

########### install files ###############

diff --git a/kioslave/http/tests/CMakeLists.txt b/kioslave/http/tests/CMakeLists.txt
index 697f1d7..200b966 100644
--- a/kioslave/http/tests/CMakeLists.txt
+++ b/kioslave/http/tests/CMakeLists.txt
@@ -13,7 +13,7 @@ target_link_libraries(httpheaderdispositiontest ${KDE4_KDECORE_LIBS} ${QT_QTTEST

kde4_add_unit_test(httpauthenticationtest httpauthenticationtest.cpp)
target_link_libraries(httpauthenticationtest ${KDE4_KDECORE_LIBS} kntlm ${QT_QTTEST_LIBRARY}
- ${QT_QTNETWORK_LIBRARY} ${QT_QTGUI_LIBRARY})
+ ${QT_QTNETWORK_LIBRARY} ${QT_QTGUI_LIBRARY} kcoreaddons)
if(GSSAPI_FOUND)
target_link_libraries(httpauthenticationtest ${GSSAPI_LIBS})
endif(GSSAPI_FOUND)
diff --git a/kjs/api/CMakeLists.txt b/kjs/api/CMakeLists.txt
index ff1726d..3adca04 100644
--- a/kjs/api/CMakeLists.txt
+++ b/kjs/api/CMakeLists.txt
@@ -28,4 +28,4 @@ install(FILES
############# tests ########################

kde4_add_unit_test(kjsapitest NOGUI kjsapitest.cpp)
-target_link_libraries(kjsapitest kjsapi ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY})
+target_link_libraries(kjsapitest kjsapi ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} kcoreaddons)
diff --git a/knewstuff/tests/CMakeLists.txt b/knewstuff/tests/CMakeLists.txt
index c3eb5e8..9d21387 100644
--- a/knewstuff/tests/CMakeLists.txt
+++ b/knewstuff/tests/CMakeLists.txt
@@ -19,7 +19,7 @@ set(knewstuffauthortest_SRCS
knewstuffauthortest.cpp
)
kde4_add_unit_test(knewstuffauthortest ${knewstuffauthortest_SRCS})
-target_link_libraries(knewstuffauthortest ${KDE4_KDECORE_LIBS} knewstuff2 ${QT_QTTEST_LIBRARY})
+target_link_libraries(knewstuffauthortest ${KDE4_KDECORE_LIBS} knewstuff2 ${QT_QTTEST_LIBRARY} kcoreaddons)

#entry test

@@ -27,7 +27,7 @@ set (knewstuffentrytest_SRCS
knewstuffentrytest.cpp
)
kde4_add_unit_test(knewstuffentrytest ${knewstuffentrytest_SRCS})
-target_link_libraries(knewstuffentrytest ${KDE4_KDECORE_LIBS} knewstuff2 ${QT_QTTEST_LIBRARY})
+target_link_libraries(knewstuffentrytest ${KDE4_KDECORE_LIBS} knewstuff2 ${QT_QTTEST_LIBRARY} kcoreaddons)

#ktranslatable test

@@ -35,7 +35,7 @@ set(testTranslatable_SRCS
testTranslatable.cpp
)
kde4_add_unit_test(testTranslatable ${testTranslatable_SRCS})
-target_link_libraries(testTranslatable ${KDE4_KDECORE_LIBS} knewstuff2 ${QT_QTTEST_LIBRARY})
+target_link_libraries(testTranslatable ${KDE4_KDECORE_LIBS} knewstuff2 ${QT_QTTEST_LIBRARY} kcoreaddons)
endif(NOT KDE_NO_DEPRECATED)

##########################
@@ -47,7 +47,8 @@ set(knewstuff2_test_SRCS

kde4_add_executable(knewstuff2_test TEST ${knewstuff2_test_SRCS})

-target_link_libraries(knewstuff2_test ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QTXML_LIBRARY} knewstuff2)
+target_link_libraries(knewstuff2_test ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY}
+ ${QT_QTXML_LIBRARY} kcoreaddons knewstuff2)
#install(FILES knewstuff2_test.knsrc DESTINATION ${CONFIG_INSTALL_DIR})
endif(NOT KDE_NO_DEPRECATED)

@@ -60,7 +61,7 @@ set(knewstuff2_download_SRCS

kde4_add_executable(knewstuff2_download TEST ${knewstuff2_download_SRCS})

-target_link_libraries(knewstuff2_download ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} knewstuff2)
+target_link_libraries(knewstuff2_download ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} kcoreaddons knewstuff2)
endif(NOT KDE_NO_DEPRECATED)

##########################
@@ -72,7 +73,7 @@ set(knewstuff2_standard_SRCS

kde4_add_executable(knewstuff2_standard TEST ${knewstuff2_standard_SRCS})

-target_link_libraries(knewstuff2_standard ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} knewstuff2)
+target_link_libraries(knewstuff2_standard ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} kcoreaddons knewstuff2)
endif(NOT KDE_NO_DEPRECATED)

##########################
@@ -84,7 +85,7 @@ set(knewstuff2_cache_SRCS

kde4_add_executable(knewstuff2_cache TEST ${knewstuff2_cache_SRCS})

-target_link_libraries(knewstuff2_cache ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} knewstuff2)
+target_link_libraries(knewstuff2_cache ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} kcoreaddons knewstuff2)
endif(NOT KDE_NO_DEPRECATED)

##########################
diff --git a/knotify/tests/CMakeLists.txt b/knotify/tests/CMakeLists.txt
index ce42557..df8c183 100644
--- a/knotify/tests/CMakeLists.txt
+++ b/knotify/tests/CMakeLists.txt
@@ -13,7 +13,7 @@ kde4_add_ui_files(knotifytest_SRCS knotifytestview.ui)

kde4_add_executable(knotifytest TEST ${knotifytest_SRCS})

-target_link_libraries(knotifytest ${KDE4_KIO_LIBS} knotifyconfig )
+target_link_libraries(knotifytest ${KDE4_KIO_LIBS} knotifyconfig kcoreaddons)

#the binary file doesn't need to be installed
#install(TARGETS knotifytest DESTINATION ${BIN_INSTALL_DIR} )
diff --git a/kparts/tests/CMakeLists.txt b/kparts/tests/CMakeLists.txt
index d283970..95cd480 100644
--- a/kparts/tests/CMakeLists.txt
+++ b/kparts/tests/CMakeLists.txt
@@ -13,7 +13,7 @@ notepad.cpp

kde4_add_executable(kpartstest TEST ${kpartstest_SRCS})

-target_link_libraries(kpartstest ${KDE4_KPARTS_LIBS} )
+target_link_libraries(kpartstest ${KDE4_KPARTS_LIBS} kcoreaddons)

########### next target ###############
@@ -27,7 +27,7 @@ notepad.cpp

kde4_add_executable(normalktmtest TEST ${normalktmtest_SRCS})

-target_link_libraries(normalktmtest ${KDE4_KPARTS_LIBS} )
+target_link_libraries(normalktmtest ${KDE4_KPARTS_LIBS} kcoreaddons)

########### next target ###############
@@ -37,12 +37,12 @@ partviewer.cpp
)

kde4_add_executable(partviewer TEST ${partviewer_SRCS})
-target_link_libraries(partviewer ${KDE4_KPARTS_LIBS} )
+target_link_libraries(partviewer ${KDE4_KPARTS_LIBS} kcoreaddons)

########### test prog for "open or save question" ###############

kde4_add_executable(openorsavequestion TEST openorsavequestion.cpp)
-target_link_libraries(openorsavequestion ${KDE4_KPARTS_LIBS} )
+target_link_libraries(openorsavequestion ${KDE4_KPARTS_LIBS} kcoreaddons)

########### next target ###############

@@ -73,7 +73,7 @@ install(TARGETS notepadpart DESTINATION ${PLUGIN_INSTALL_DIR} )
MACRO(KPARTS_UNIT_TESTS)
FOREACH(_testname ${ARGN})
kde4_add_unit_test(${_testname} TESTNAME kparts-${_testname} ${_testname}.cpp)
- target_link_libraries(${_testname} ${KDE4_KPARTS_LIBS} ${QT_QTTEST_LIBRARY})
+ target_link_libraries(${_testname} ${KDE4_KPARTS_LIBS} ${QT_QTTEST_LIBRARY} kcoreaddons)
ENDFOREACH(_testname)
ENDMACRO(KPARTS_UNIT_TESTS)
MACRO(KPARTS_EXECUTABLE_TESTS)
diff --git a/kpty/tests/CMakeLists.txt b/kpty/tests/CMakeLists.txt
index d3eee12..23db65a 100644
--- a/kpty/tests/CMakeLists.txt
+++ b/kpty/tests/CMakeLists.txt
@@ -2,4 +2,4 @@ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
include_directories( ${KDE4_KPTY_INCLUDES} )

kde4_add_unit_test(kptyprocesstest kptyprocesstest.cpp)
-target_link_libraries(kptyprocesstest ${KDE4_KPTY_LIBS} ${QT_QTTEST_LIBRARY})
+target_link_libraries(kptyprocesstest ${KDE4_KPTY_LIBS} ${QT_QTTEST_LIBRARY} kcoreaddons)
diff --git a/kross/qts/CMakeLists.txt b/kross/qts/CMakeLists.txt
index 640d027..332c4ac 100644
--- a/kross/qts/CMakeLists.txt
+++ b/kross/qts/CMakeLists.txt
@@ -16,7 +16,7 @@ set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
include_directories(${CMAKE_SOURCE_DIR}/kross ${KDE4_KDECORE_INCLUDES} kcoreaddons ${KDE4_KDEUI_INCLUDES} ${KDE4_KIO_INCLUDES})
set(krossqtstest_SRCS main.cpp)
kde4_add_executable(krossqtstest TEST ${krossqtstest_SRCS})
-target_link_libraries(krossqtstest ${KDE4_KDEUI_LIBS} krossqtsplugin ${QT_QTSCRIPT_LIBRARY})
+target_link_libraries(krossqtstest ${KDE4_KDEUI_LIBS} krossqtsplugin ${QT_QTSCRIPT_LIBRARY} kcoreaddons)
# set(krossqtsplugintest_SRCS main.cpp)
# target_link_libraries(krossqtsplugintest ${KDE4_KDECORE_LIBS} )
# kde4_add_executable(krossqtsplugintest ${krossqtsplugintest_SRCS})
diff --git a/kross/test/CMakeLists.txt b/kross/test/CMakeLists.txt
index b82c01b..be001a6 100644
--- a/kross/test/CMakeLists.txt
+++ b/kross/test/CMakeLists.txt
@@ -8,5 +8,5 @@ set(krosstest_SRCS

kde4_add_executable(krosstest TEST ${krosstest_SRCS})

-target_link_libraries(krosstest ${KDE4_KDEUI_LIBS} krosscore )
+target_link_libraries(krosstest ${KDE4_KDEUI_LIBS} krosscore kcoreaddons)

diff --git a/kunitconversion/tests/CMakeLists.txt b/kunitconversion/tests/CMakeLists.txt
index 6938d3a..ace7664 100644
--- a/kunitconversion/tests/CMakeLists.txt
+++ b/kunitconversion/tests/CMakeLists.txt
@@ -4,7 +4,8 @@ include_directories(${KDE4_KDECORE_INCLUDES})
macro(KUNITCONVERSION_UNIT_TESTS)
foreach(_testname ${ARGN})
kde4_add_unit_test(${_testname} TESTNAME kunitconversion-${_testname} ${_testname}.cpp)
- target_link_libraries(${_testname} ${KDE4_KDECORE_LIBS} kunitconversion ${QT_QTTEST_LIBRARY} ${QT_QTGUI_LIBRARY} )
+ target_link_libraries(${_testname} ${KDE4_KDECORE_LIBS} kunitconversion ${QT_QTTEST_LIBRARY}
+ ${QT_QTGUI_LIBRARY} kcoreaddons)
endforeach(_testname)
endmacro(KUNITCONVERSION_UNIT_TESTS)

diff --git a/nepomuk/test/CMakeLists.txt b/nepomuk/test/CMakeLists.txt
index 177cfab..e7ece33 100644
--- a/nepomuk/test/CMakeLists.txt
+++ b/nepomuk/test/CMakeLists.txt
@@ -17,6 +17,7 @@ target_link_libraries(queryparsertest nepomuk nepomukquery
${QT_QTTEST_LIBRARY}
${SOPRANO_LIBRARIES}
${KDE4_KDECORE_LIBS}
+ kcoreaddons
)

set(querytest_SRC querytest.cpp)
@@ -25,6 +26,7 @@ target_link_libraries(querytest nepomuk nepomukquery
${QT_QTTEST_LIBRARY}
${SOPRANO_LIBRARIES}
${KDE4_KDECORE_LIBS}
+ kcoreaddons
)

set(queryserializertest_SRC queryserializertest.cpp)
@@ -33,6 +35,7 @@ target_link_libraries(queryserializertest nepomuk nepomukquery
${QT_QTTEST_LIBRARY}
${SOPRANO_LIBRARIES}
${KDE4_KDECORE_LIBS}
+ kcoreaddons
)

@@ -52,7 +55,9 @@ target_link_libraries(resourcetest
${QT_QTTEST_LIBRARY}
${KDE4_KDECORE_LIBS}
${SOPRANO_LIBRARIES}
- kdecore)
+ kdecore
+ kcoreaddons
+)

@@ -78,6 +83,7 @@ target_link_libraries(simplefacettest
${QT_QTTEST_LIBRARY}
${SOPRANO_LIBRARIES}
${KDE4_KDECORE_LIBS}
+ kcoreaddons
nepomuk
nepomukquery
nepomukutils
@@ -91,6 +97,7 @@ target_link_libraries(dynamicresourcefacettest
nepomuk
nepomukquery
nepomukutils
+ kcoreaddons
)

kde4_add_unit_test(proxyfacettest TESTNAME nepomuk-proxyfacettest proxyfacettest.cpp)
@@ -101,6 +108,7 @@ target_link_libraries(proxyfacettest
nepomuk
nepomukquery
nepomukutils
+ kcoreaddons
)

kde4_add_unit_test(facetmodeltest TESTNAME nepomuk-facetmodeltest facetmodeltest.cpp)
@@ -111,6 +119,7 @@ target_link_libraries(facetmodeltest
nepomuk
nepomukquery
nepomukutils
+ kcoreaddons
)

kde4_add_unit_test(typefacettest TESTNAME nepomuk-typefacettest typefacettest.cpp)
@@ -118,6 +127,7 @@ target_link_libraries(typefacettest
${QT_QTTEST_LIBRARY}
${SOPRANO_LIBRARIES}
${KDE4_KDECORE_LIBS}
+ kcoreaddons
nepomuk
nepomukquery
nepomukutils
diff --git a/tier1/libkarchive/autotests/CMakeLists.txt b/tier1/libkarchive/autotests/CMakeLists.txt
index 679a3e0..e1cc09d 100644
--- a/tier1/libkarchive/autotests/CMakeLists.txt
+++ b/tier1/libkarchive/autotests/CMakeLists.txt
@@ -9,7 +9,7 @@ include_directories(
MACRO(KARCHIVE_UNIT_TESTS)
FOREACH(_testname ${ARGN})
kde4_add_unit_test(${_testname} TESTNAME "karchive-${_testname}" NOGUI ${_testname}.cpp)
- target_link_libraries(${_testname} karchive ${QT_QTTEST_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${KDE4_KDECORE_LIBS})
+ target_link_libraries(${_testname} karchive ${QT_QTTEST_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${KDE4_KDECORE_LIBS} kcoreaddons)
if(WINCE)
target_link_libraries(${_testname} ${WCECOMPAT_LIBRARIES})
endif(WINCE)
@@ -46,5 +46,5 @@ target_link_libraries(klimitediodevicetest ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBR
set(kfiltertest_SRCS kfiltertest.cpp ${CMAKE_SOURCE_DIR}/kio/httpfilter/httpfilter.cc)
include_directories( ${CMAKE_SOURCE_DIR}/kio/httpfilter )
kde4_add_unit_test(kfiltertest TESTNAME karchive-kfiltertest ${kfiltertest_SRCS})
-target_link_libraries(kfiltertest ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} karchive)
+target_link_libraries(kfiltertest ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} karchive kcoreaddons)
target_link_libraries(kfiltertest ${ZLIB_LIBRARIES})
diff --git a/tier2/sonnet/core/tests/CMakeLists.txt b/tier2/sonnet/core/tests/CMakeLists.txt
index 208593a..2727b87 100644
--- a/tier2/sonnet/core/tests/CMakeLists.txt
+++ b/tier2/sonnet/core/tests/CMakeLists.txt
@@ -2,6 +2,9 @@ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )

remove_definitions(-DQT_NO_CAST_FROM_ASCII)

+include_directories(
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../../../tier1/libkcoreaddons/src/kernel
+)
########### next target ###############

# TODO automate and merge with test_filter?

[kdelibs/frameworks] /: Merge remote-tracking branch 'origin/KDE/4.7' into origin-frameworks

2011-11-16T04:47:00.000-08:00

Git commit 40c14d3d13c1c1e814594b9bf829ba4f12bfdf52 by David Faure.
Committed on 16/11/2011 at 14:44.
Pushed by dfaure into branch 'frameworks'.

Merge remote-tracking branch 'origin/KDE/4.7' into origin-frameworks

Conflicts:
tier1/libkcoreaddons/src/io/kdirwatch.cpp

M +2 -0 kdecore/services/kservice.h
M +1 -1 kdecore/tests/kmimetypetest.cpp
M +13 -0 kdeui/CMakeLists.txt
M +15 -0 kdeui/widgets/ktabwidget.cpp
M +6 -30 kdewebkit/kwebpage.cpp
M +4 -4 khtml/html/htmltokenizer.cpp
M +1 -0 kio/kfile/kfiledialog.cpp
M +42 -5 kio/kio/previewjob.cpp
M +5 -26 kioslave/http/http.cpp
M +1 -0 plasma/CMakeLists.txt
M +2 -0 plasma/applet.cpp
M +3 -5 plasma/widgets/declarativewidget.cpp
A +1 -1 tier1/itemmodels/autotests/proxymodeltestsuite/proxymodeltest.cpp [License: LGPL (v2+)]
R +1 -1 tier1/itemmodels/autotests/proxymodeltestsuite/templates/datachanged.cpp
R +1 -1 tier1/itemmodels/autotests/proxymodeltestsuite/templates/init.cpp
R +1 -1 tier1/itemmodels/autotests/proxymodeltestsuite/templates/main.cpp
R +1 -1 tier1/itemmodels/autotests/proxymodeltestsuite/templates/rowsinserted.cpp
R +1 -1 tier1/itemmodels/autotests/proxymodeltestsuite/templates/rowsremoved.cpp
A +1 -1 tier1/libkcoreaddons/src/io/kdirwatch.cpp [License: LGPL (v2)]
R +7 -5 tier1/libkcoreaddons/src/io/kfilesystemtype_p.cpp
A +1 -1 tier1/solid/solid/backends/hal/halbutton.cpp [License: LGPL]
R +1 -1 tier1/solid/solid/backends/hal/halbutton.h
R +1 -1 tier1/solid/solid/backends/hal/halportablemediaplayer.cpp
R +1 -1 tier1/solid/solid/backends/hal/halportablemediaplayer.h
R +1 -1 tier1/solid/solid/backends/udev/udevaudiointerface_p.cpp
A +1 -1 tier1/solid/solid/backends/wmi/wmibutton.cpp [License: LGPL]
R +1 -1 tier1/solid/solid/backends/wmi/wmibutton.h
R +1 -1 tier1/solid/solid/backends/wmi/wmiportablemediaplayer.cpp
R +1 -1 tier1/solid/solid/backends/wmi/wmiportablemediaplayer.h
R +1 -1 tier1/solid/solid/button.cpp
R +2 -2 tier1/solid/solid/button.h
R +1 -1 tier1/solid/solid/button_p.h
R +1 -1 tier1/solid/solid/ifaces/button.cpp
R +2 -2 tier1/solid/solid/ifaces/button.h
R +1 -1 tier1/solid/solid/ifaces/portablemediaplayer.cpp
R +2 -2 tier1/solid/solid/ifaces/portablemediaplayer.h
R +1 -1 tier1/solid/solid/portablemediaplayer.cpp
R +2 -2 tier1/solid/solid/portablemediaplayer.h
R +1 -1 tier1/solid/solid/portablemediaplayer_p.h

http://commits.kde.org/kdelibs/40c14d3d13c1c1e814594b9bf829ba4f12bfdf52

diff --cc kdewebkit/kwebpage.cpp
index 92da2d8,2865ffc..c0ff220
--- a/kdewebkit/kwebpage.cpp
+++ b/kdewebkit/kwebpage.cpp
@@@ -42,8 -42,10 +42,9 @@@
#include <kdebug.h>
#include <kmimetypetrader.h>
#include <klocalizedstring.h>
-#include <ktemporaryfile.h>
#include <kio/accessmanager.h>
#include <kio/job.h>
+ #include <kio/copyjob.h>
#include <kio/jobuidelegate.h>
#include <kio/renamedialog.h>
#include <kparts/browseropenorsavequestion.h>
diff --cc kio/kio/previewjob.cpp
index 686b441,5635875..6f9a73a
--- a/kio/kio/previewjob.cpp
+++ b/kio/kio/previewjob.cpp
@@@ -566,12 -586,29 +586,29 @@@ void PreviewJobPrivate::getOrCreateThum
// We still need to load the orig file ! (This is getting tedious) :)
const KFileItem& item = currentItem.item;
const QString localPath = item.localPath();
- if ( !localPath.isEmpty() )
+ if (!localPath.isEmpty()) {
createThumbnail( localPath );
- else
- {
+ } else {
+ const KUrl fileUrl = item.url();
+ // heuristics for remote URL support
+ bool supportsProtocol = false;
+ if (m_remoteProtocolPlugins.value(fileUrl.scheme()).contains(item.mimetype())) {
+ // There's a plugin supporting this protocol and mimetype
+ supportsProtocol = true;
+ } else if (m_remoteProtocolPlugins.value("KIO").contains(item.mimetype())) {
+ // Assume KIO understands any URL, ThumbCreator slaves who have
+ // X-KDE-Protocol=KIO, will get feed the remote URL directly.
+ supportsProtocol = true;
+ }
+
+ if (supportsProtocol) {
+ createThumbnail(fileUrl.url());
+ return;
+ }
+ // No plugin support access to this remote content, copy the file
+ // to the local machine, then create the thumbnail
state = PreviewJobPrivate::STATE_GETORIG;
- KTemporaryFile localFile;
+ QTemporaryFile localFile;
localFile.setAutoRemove(false);
localFile.open();
KUrl localURL;
diff --cc plasma/CMakeLists.txt
index efb4bbb,fd86df1..095a099
--- a/plasma/CMakeLists.txt
+++ b/plasma/CMakeLists.txt
@@@ -6,15 -6,10 +6,16 @@@ if(KDE_PLATFORM_FEATURE_BINARY_COMPATIB
set(PLASMA_NO_KNEWSTUFF TRUE)
set(PLASMA_NO_SOLID TRUE)
set(PLASMA_NO_KIO TRUE)
+ set(PLASMA_NO_PACKAGEKIT TRUE)
+ set(PLASMA_NO_PACKAGE_EXTRADATA TRUE)
set(PLASMA_NO_KUTILS TRUE)
+ set(PLASMA_NO_GLOBAL_SHORTCUTS TRUE)
endif(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION)

+if(NOT Q_WS_X11)
+ set(PLASMA_NO_PACKAGEKIT TRUE)
+endif(NOT Q_WS_X11)
+
include_directories(${CMAKE_CURRENT_SOURCE_DIR}
${KDE4_KDECORE_INCLUDES}
${KDE4_KDEUI_INCLUDES}
diff --cc tier1/itemmodels/autotests/proxymodeltestsuite/proxymodeltest.cpp
index f3294ea,0000000..ab07c0b
mode 100644,000000..100644
--- a/tier1/itemmodels/autotests/proxymodeltestsuite/proxymodeltest.cpp
+++ b/tier1/itemmodels/autotests/proxymodeltestsuite/proxymodeltest.cpp
@@@ -1,749 -1,0 +1,749 @@@
+/*
+ Copyright (c) 2009 Stephen Kelly <steveire@gmail.com>
+
+ This library is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Library General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or (at your
+ option) any later version.
+
+ This library is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public
+ License for more details.
+
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to the
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301, USA.
+*/
+
+#include "proxymodeltest.h"
+
+#include "dynamictreemodel.h"
+
+#include <QItemSelectionModel>
+#include <QSortFilterProxyModel>
+
+#include "modelspy.h"
+
+ProxyModelTest::ProxyModelTest(QObject *parent)
+ : QObject(parent),
+ m_rootModel(new DynamicTreeModel(this)),
+ m_sourceModel(m_rootModel),
+ m_proxyModel(0),
+ m_intermediateProxyModel(0),
+ m_modelSpy(new ModelSpy(this)),
+ m_modelCommander(new ModelCommander(m_rootModel, this))
+{
+}
+
+void ProxyModelTest::setLazyPersistence(Persistence persistence)
+{
+ m_modelSpy->setLazyPersistence(persistence == LazyPersistence);
+}
+
+void ProxyModelTest::setUseIntermediateProxy(SourceModel sourceModel)
+{
+ if (sourceModel == DynamicTree)
+ return;
+
+ m_intermediateProxyModel = new QSortFilterProxyModel(this);
+ m_intermediateProxyModel->setSourceModel(m_rootModel);
+ m_sourceModel = m_intermediateProxyModel;
+}
+
+
+static bool hasMetaMethodStartingWith(QObject *object, const QString &checkedSignature)
+{
+ const QMetaObject *mo = object->metaObject();
+ bool found = false;
+ for (int methodIndex = 0; methodIndex < mo->methodCount(); ++methodIndex) {
+ QMetaMethod mm = mo->method(methodIndex);
+ QString signature = QString::fromLatin1( mm.signature() );
+
+ if (signature.startsWith(checkedSignature)) {
+ found = true;
+ break;
+ }
+ }
+ return found;
+}
+
+void ProxyModelTest::initRootModel(DynamicTreeModel *rootModel, const QString &currentTest, const QString &currentTag)
+{
+ Q_UNUSED(rootModel)
+ // Get the model into the state it is expected to be in.
+
+ if (!hasMetaMethodStartingWith(m_modelCommander, "init_" + currentTest))
+ return;
+
+ QMetaObject::invokeMethod(m_modelCommander, QString("init_" + currentTest).toAscii(), Q_ARG(QString, currentTag));
+}
+
+void ProxyModelTest::verifyExecutedTests()
+{
+ if (m_dataTags.contains(ProxyModelTestData::failTag()))
+ return;
+ QSet<QString> unimplemented = m_modelCommanderTags.toSet().subtract(m_dataTags.toSet());
+ QString unimplementedTestsString("(");
+ Q_FOREACH(const QString &test, unimplemented)
+ unimplementedTestsString.append(test + ",");
+ unimplementedTestsString.append(")");
+
+ if (!unimplemented.isEmpty())
+ {
+ QString failString = QString("Some tests in %1 were not implemented: %2").arg(m_currentTest, unimplementedTestsString);
+ m_dataTags.clear();
+ m_currentTest = QTest::currentTestFunction();
+ QFAIL(failString.toAscii());
+ }
+}
+
+void ProxyModelTest::init()
+{
+ QVERIFY(m_modelSpy->isEmpty());
+ m_rootModel->clear();
+
+ const char *currentTest = QTest::currentTestFunction();
+ const char *currentTag = QTest::currentDataTag();
+ QVERIFY(currentTest != 0);
+ initRootModel(m_rootModel, currentTest, currentTag);
+
+ Q_ASSERT(sourceModel());
+ QAbstractProxyModel *proxyModel = getProxy();
+
+ Q_ASSERT(proxyModel);
+ // Don't set the sourceModel in getProxy.
+ Q_ASSERT(!proxyModel->sourceModel());
+ connectProxy(proxyModel);
+
+ // Get the model into the state it is expected to be in.
+ m_modelSpy->startSpying();
+ QVERIFY(m_modelSpy->isEmpty());
+
+ if (m_currentTest != currentTest)
+ {
+ verifyExecutedTests();
+ m_dataTags.clear();
+
+ QString metaMethod = QString("execute_" + QLatin1String(currentTest));
+
+ if (!hasMetaMethodStartingWith(m_modelCommander, metaMethod))
+ return;
+
+ QMetaObject::invokeMethod(m_modelCommander, metaMethod.toAscii(), Q_RETURN_ARG(QStringList, m_modelCommanderTags), Q_ARG(QString, QString()));
+ m_currentTest = currentTest;
+ }
+ m_dataTags.append(currentTag);
+}
+
+void ProxyModelTest::cleanup()
+{
+ QVERIFY(m_modelSpy->isEmpty());
+ m_modelSpy->stopSpying();
+ m_modelSpy->setModel(0);
+ m_proxyModel->setSourceModel(0);
+ delete m_proxyModel;
+ m_proxyModel = 0;
+ QVERIFY(m_modelSpy->isEmpty());
+}
+
+void ProxyModelTest::cleanupTestCase()
+{
+ verifyExecutedTests();
+ m_modelCommanderTags.clear();
+ if (!m_intermediateProxyModel)
+ return;
+
+ m_sourceModel = m_rootModel;
+ delete m_intermediateProxyModel;
+ m_intermediateProxyModel = 0;
+
+ m_modelSpy->clear();
+}
+
+PersistentIndexChange ProxyModelTest::getChange(IndexFinder parentFinder, int start, int end, int difference, bool toInvalid)
+{
+ Q_ASSERT(start <= end);
+ PersistentIndexChange change;
+ change.parentFinder = parentFinder;
+ change.startRow = start;
+ change.endRow = end;
+ change.difference = difference;
+ change.toInvalid = toInvalid;
+ return change;
+}
+
+void ProxyModelTest::handleSignal(QVariantList expected)
+{
+ QVERIFY(!expected.isEmpty());
+ int signalType = expected.takeAt(0).toInt();
+ if (NoSignal == signalType)
+ return;
+
+ Q_ASSERT(!m_modelSpy->isEmpty());
+ QVariantList result = getResultSignal();
+
+ QCOMPARE(result.takeAt(0).toInt(), signalType);
+ // Check that the signal we expected to recieve was emitted exactly.
+ switch (signalType)
+ {
+ case RowsAboutToBeInserted:
+ case RowsInserted:
+ case RowsAboutToBeRemoved:
+ case RowsRemoved:
+ {
+ QVERIFY( expected.size() == 3 );
+ IndexFinder parentFinder = qvariant_cast<IndexFinder>(expected.at(0));
+ parentFinder.setModel(m_proxyModel);
+ QModelIndex parent = parentFinder.getIndex();
+
+// This is where is usually goes wrong...
+#if 0
+ qDebug() << qvariant_cast<QModelIndex>(result.at(0)) << parent;
+ qDebug() << result.at(1) << expected.at(1);
+ qDebug() << result.at(2) << expected.at(2);
+

[kdelibs/KDE/4.7] khtml/html: Disallow XML-style flat tag for all HTML tags except SCRIPT

2011-11-09T10:00:00.003-08:00

Git commit db819299ed81466cb45b3fef69e8f489edbeeb30 by Allan Sandfeld.
Committed on 09/08/2011 at 16:53.
Pushed by carewolf into branch 'KDE/4.7'.

Disallow XML-style flat tag for all HTML tags except SCRIPT

The test was incomplete and allowed selfclosing HTML-tags such as <li/> and <td/>.

BUG: 136463

M +4 -4 khtml/html/htmltokenizer.cpp

http://commits.kde.org/kdelibs/db819299ed81466cb45b3fef69e8f489edbeeb30

diff --git a/khtml/html/htmltokenizer.cpp b/khtml/html/htmltokenizer.cpp
index b64e83d..24fee18 100644
--- a/khtml/html/htmltokenizer.cpp
+++ b/khtml/html/htmltokenizer.cpp
@@ -1468,11 +1468,11 @@ void HTMLTokenizer::parseTag(TokenizerString &src)
#if defined(TOKEN_DEBUG) && TOKEN_DEBUG > 0
kDebug( 6036 ) << "appending Tag: " << tagID;

[kdelibs/KDE/4.7] khtml/html: Merge branch 'KDE/4.7' of git://anongit.kde.org/kdelibs into KDE/4.7

2011-11-09T10:00:00.001-08:00

Git commit bdcdb90a49a9855416820e35ff96b337fa0bc0c3 by Allan Sandfeld.
Committed on 09/11/2011 at 18:59.
Pushed by carewolf into branch 'KDE/4.7'.

Merge branch 'KDE/4.7' of git://anongit.kde.org/kdelibs into KDE/4.7

M +0 -2 khtml/html/htmltokenizer.cpp

http://commits.kde.org/kdelibs/bdcdb90a49a9855416820e35ff96b337fa0bc0c3

[kdelibs/frameworks] kjsembed/kjscmd: Fix kjscmd building.

2011-11-03T06:31:00.000-07:00

Git commit f63a43a88dd3039a37393fed3f18aeba972a2a9e by Jeremy Whiting.
Committed on 03/11/2011 at 14:28.
Pushed by whiting into branch 'frameworks'.

Fix kjscmd building.

M +1 -1 kjsembed/kjscmd/CMakeLists.txt
M +10 -10 kjsembed/kjscmd/kjscmd.cpp

http://commits.kde.org/kdelibs/f63a43a88dd3039a37393fed3f18aeba972a2a9e

diff --git a/kjsembed/kjscmd/CMakeLists.txt b/kjsembed/kjscmd/CMakeLists.txt
index 4b3a76f..dea10e0 100644
--- a/kjsembed/kjscmd/CMakeLists.txt
+++ b/kjsembed/kjscmd/CMakeLists.txt
@@ -34,7 +34,7 @@ endif (NOT DEFINED QT_ONLY)

kde4_add_executable(${KJSCMDNAME} ${kjscmd_SRCS})

-target_link_libraries(${KJSCMDNAME} ${KDE4_KDEUI_LIBS} ${KDE4_KDECORE_LIBS} ${KJSEMBEDLIBNAME} kjs )
+target_link_libraries(${KJSCMDNAME} ${KDE4_KDEUI_LIBS} ${KDE4_KDECORE_LIBS} kcoreaddons ${KJSEMBEDLIBNAME} kjs )

install(TARGETS ${KJSCMDNAME} ${INSTALL_TARGETS_DEFAULT_ARGS} )

diff --git a/kjsembed/kjscmd/kjscmd.cpp b/kjsembed/kjscmd/kjscmd.cpp
index 8e88133..301c88b 100644
--- a/kjsembed/kjscmd/kjscmd.cpp
+++ b/kjsembed/kjscmd/kjscmd.cpp
@@ -149,20 +149,20 @@ int main( int argc, char **argv )
#ifndef QT_ONLY
if (kde)
{
- KAboutData aboutData( "kjscmd", 0, ki18n("KJSCmd"), "0.2",
- ki18n(""
+ KAboutData aboutData( "kjscmd", 0, qi18n("KJSCmd"), "0.2",
+ qi18n(""
"Utility for running KJSEmbed scripts \n" ),
KAboutData::License_LGPL,
- ki18n("(C) 2005-2006 The KJSEmbed Authors") );
+ qi18n("(C) 2005-2006 The KJSEmbed Authors") );

KCmdLineOptions options;
- options.add("e", ki18n("Execute script without gui support"));
- options.add("exec", ki18n("Execute script without gui support"));
- options.add("i", ki18n("start interactive kjs interpreter"));
- options.add("interactive", ki18n("start interactive kjs interpreter"));
- options.add("n", ki18n("start without KDE KApplication support."));
- options.add("no-kde", ki18n("start without KDE KApplication support."));
- options.add("!+command", ki18n("Script to execute"));
+ options.add("e", qi18n("Execute script without gui support"));
+ options.add("exec", qi18n("Execute script without gui support"));
+ options.add("i", qi18n("start interactive kjs interpreter"));
+ options.add("interactive", qi18n("start interactive kjs interpreter"));
+ options.add("n", qi18n("start without KDE KApplication support."));
+ options.add("no-kde", qi18n("start without KDE KApplication support."));
+ options.add("!+command", qi18n("Script to execute"));

KCmdLineArgs::addCmdLineOptions( options ); // Add our own options.
KCmdLineArgs::init( argc, argv, &aboutData );

[kdelibs/frameworks] /: KGlobal::charsets -> KCharsets::charsets

2011-11-02T09:17:00.000-07:00

Git commit 2e1cdd1f39087a7d2500054299ba8e84e7bcc78b by David Faure.
Committed on 02/11/2011 at 18:19.
Pushed by dfaure into branch 'frameworks'.

KGlobal::charsets -> KCharsets::charsets

M +1 -1 kdecore/tests/kurltest.cpp
M +4 -4 kdeui/actions/kcodecaction.cpp
M +1 -1 khtml/html/html_formimpl.cpp
M +2 -2 khtml/html/htmltokenizer.cpp
M +2 -2 khtml/misc/loader.cpp
M +2 -2 kio/kfile/kencodingfiledialog.cpp
M +1 -1 kio/misc/kpac/downloader.cpp

http://commits.kde.org/kdelibs/2e1cdd1f39087a7d2500054299ba8e84e7bcc78b

diff --git a/kdecore/tests/kurltest.cpp b/kdecore/tests/kurltest.cpp
index 94bd480..d904426 100644
--- a/kdecore/tests/kurltest.cpp
+++ b/kdecore/tests/kurltest.cpp
@@ -1813,7 +1813,7 @@ void KUrlTest::testUtf8()

void KUrlTest::testOtherEncodings()
{
- QTextCodec::setCodecForLocale( KGlobal::charsets()->codecForName( "koi8-r" ) );
+ QTextCodec::setCodecForLocale( KCharsets::charsets()->codecForName( "koi8-r" ) );
KUrl baseURL( "file:/home/coolo" );
KUrl russian = KUrl::fromPath( baseURL.directory(KUrl::AppendTrailingSlash) + QString::fromUtf8( "фгн7" ) );
//QCOMPARE( russian.url(), QString("file:///home/%C6%C7%CE7" ) ); // KDE3: was not using utf8
diff --git a/kdeui/actions/kcodecaction.cpp b/kdeui/actions/kcodecaction.cpp
index 2309fc4..7b84b14 100644
--- a/kdeui/actions/kcodecaction.cpp
+++ b/kdeui/actions/kcodecaction.cpp
@@ -91,7 +91,7 @@ void KCodecAction::Private::init(bool showAutoOptions)
defaultAction = q->addAction(i18nc("Encodings menu", "Default"));

int i;
- foreach(const QStringList &encodingsForScript, KGlobal::charsets()->encodingsByScript())
+ foreach(const QStringList &encodingsForScript, KCharsets::charsets()->encodingsByScript())
{
KSelectAction* tmp = new KSelectAction(encodingsForScript.at(0),q);
if (showAutoOptions)
@@ -120,7 +120,7 @@ int KCodecAction::mibForName(const QString &codecName, bool *ok) const

bool success = false;
int mib = MIB_DEFAULT;
- KCharsets *charsets = KGlobal::charsets();
+ KCharsets *charsets = KCharsets::charsets();

if (codecName == d->defaultAction->text())
success = true;
@@ -207,7 +207,7 @@ bool KCodecAction::setCurrentCodec( QTextCodec *codec )
{
if (!j && !actions().at(i)->menu()->actions().at(j)->data().isNull())
continue;
- if (codec==KGlobal::charsets()->codecForName(actions().at(i)->menu()->actions().at(j)->text()))
+ if (codec==KCharsets::charsets()->codecForName(actions().at(i)->menu()->actions().at(j)->text()))
{
d->currentSubAction=actions().at(i)->menu()->actions().at(j);
d->currentSubAction->trigger();
@@ -227,7 +227,7 @@ QString KCodecAction::currentCodecName() const

bool KCodecAction::setCurrentCodec( const QString &codecName )
{
- return setCurrentCodec(KGlobal::charsets()->codecForName(codecName));
+ return setCurrentCodec(KCharsets::charsets()->codecForName(codecName));
}

int KCodecAction::currentCodecMib() const
diff --git a/khtml/html/html_formimpl.cpp b/khtml/html/html_formimpl.cpp
index 986f301..0b4998d 100644
--- a/khtml/html/html_formimpl.cpp
+++ b/khtml/html/html_formimpl.cpp
@@ -293,7 +293,7 @@ QByteArray HTMLFormElementImpl::formData(bool& ok)
if(view && view->part())
enc = view->part()->encoding();
}
- if((codec = KGlobal::charsets()->codecForName(enc.toLatin1().constData())))
+ if((codec = KCharsets::charsets()->codecForName(enc.toLatin1().constData())))
break;
}
}
diff --git a/khtml/html/htmltokenizer.cpp b/khtml/html/htmltokenizer.cpp
index 2c4761d..e5aa98b 100644
--- a/khtml/html/htmltokenizer.cpp
+++ b/khtml/html/htmltokenizer.cpp
@@ -142,7 +142,7 @@ HTMLTokenizer::HTMLTokenizer(DOM::DocumentImpl *_doc, KHTMLView *_view)
buffer = 0;
rawContent = 0;
rawContentSize = rawContentMaxSize = rawContentResync = rawContentSinceLastEntity = 0;
- charsets = KGlobal::charsets();
+ charsets = KCharsets::charsets();
parser = new KHTMLParser(_view, _doc);
m_executingScript = 0;
m_externalScriptsTimerId = 0;
@@ -162,7 +162,7 @@ HTMLTokenizer::HTMLTokenizer(DOM::DocumentImpl *_doc, DOM::DocumentFragmentImpl
buffer = 0;
rawContent = 0;
rawContentSize = rawContentMaxSize = rawContentResync = rawContentSinceLastEntity = 0;
- charsets = KGlobal::charsets();
+ charsets = KCharsets::charsets();
parser = new KHTMLParser( i, _doc );
m_executingScript = 0;
m_externalScriptsTimerId = 0;
diff --git a/khtml/misc/loader.cpp b/khtml/misc/loader.cpp
index 38b623b..b862abe 100644
--- a/khtml/misc/loader.cpp
+++ b/khtml/misc/loader.cpp
@@ -215,7 +215,7 @@ QTextCodec* CachedObject::codecForBuffer( const QString& charset, const QByteArr
// Link or @charset
if(!charset.isEmpty())
{
- QTextCodec* c = KGlobal::charsets()->codecForName(charset);
+ QTextCodec* c = KCharsets::charsets()->codecForName(charset);
if(c->mibEnum() == 11) {
// iso8859-8 (visually ordered)
c = QTextCodec::codecForName("iso8859-8-i");
@@ -286,7 +286,7 @@ void CachedCSSStyleSheet::data( QBuffer &buffer, bool eof )
m_charset = checkCharset( buffer.buffer() );
QTextCodec* c = 0;
if (!m_charset.isEmpty()) {
- c = KGlobal::charsets()->codecForName(m_charset);
+ c = KCharsets::charsets()->codecForName(m_charset);
if(c->mibEnum() == 11) c = QTextCodec::codecForName("iso8859-8-i");
}
else {
diff --git a/kio/kfile/kencodingfiledialog.cpp b/kio/kfile/kencodingfiledialog.cpp
index 4686065..b5be1a6 100644
--- a/kio/kfile/kencodingfiledialog.cpp
+++ b/kio/kfile/kencodingfiledialog.cpp
@@ -54,13 +54,13 @@ KEncodingFileDialog::KEncodingFileDialog(const QString& startDir, const QString&
if (sEncoding.isEmpty() || sEncoding == "System")
sEncoding = systemEncoding;

- const QStringList encodings (KGlobal::charsets()->availableEncodingNames());
+ const QStringList encodings (KCharsets::charsets()->availableEncodingNames());
int insert = 0, system = 0;
bool foundRequested=false;
foreach (const QString& encoding, encodings)
{
bool found = false;
- QTextCodec *codecForEnc = KGlobal::charsets()->codecForName(encoding, found);
+ QTextCodec *codecForEnc = KCharsets::charsets()->codecForName(encoding, found);

if (found)
{
diff --git a/kio/misc/kpac/downloader.cpp b/kio/misc/kpac/downloader.cpp
index 8d9f7f3..e311f10 100644
--- a/kio/misc/kpac/downloader.cpp
+++ b/kio/misc/kpac/downloader.cpp
@@ -77,7 +77,7 @@ namespace KPAC
if ( !job->error() && !static_cast< KIO::TransferJob* >( job )->isErrorPage() )
{
bool dummy;
- m_script = KGlobal::charsets()->codecForName(
+ m_script = KCharsets::charsets()->codecForName(
static_cast<KIO::Job*>( job )->queryMetaData( "charset" ), dummy )->toUnicode( m_data );
emit result( true );
}

[kdelibs/KDE/4.7] /: -Wmissing-include-dirs (don't include nonexistent dirs)

2011-10-19T12:44:00.000-07:00

Git commit d9fe56cb2d3a6cf66731392eb1e0f62a98f08d13 by Christophe Giboudeaux.
Committed on 19/10/2011 at 21:44.
Pushed by cgiboudeaux into branch 'KDE/4.7'.

-Wmissing-include-dirs (don't include nonexistent dirs)

M +4 -2 experimental/libkdeclarative/CMakeLists.txt
M +0 -2 kdeui/tests/proxymodeltestapp/CMakeLists.txt
M +0 -12 khtml/tests/CMakeLists.txt
M +1 -1 solid/tests/CMakeLists.txt
M +1 -1 threadweaver/Tests/CMakeLists.txt

http://commits.kde.org/kdelibs/d9fe56cb2d3a6cf66731392eb1e0f62a98f08d13

diff --git a/experimental/libkdeclarative/CMakeLists.txt b/experimental/libkdeclarative/CMakeLists.txt
index 8649ac3..0db647c 100644
--- a/experimental/libkdeclarative/CMakeLists.txt
+++ b/experimental/libkdeclarative/CMakeLists.txt
@@ -6,15 +6,17 @@ endif(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION)

configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-kdeclarative.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kdeclarative.h)

-
include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_BINARY_DIR}
- ${KDE4_INCLUDES}
${KDE4_KIO_INCLUDES}
${CMAKE_SOURCE_DIR}/kio
)

+if(BUILDING_EXPERIMENTAL_SEPARATELY)
+ include_directories(${KDE4_INCLUDES})
+endif()
+
set(kdeclarative_LIB_SRCS
kdeclarative.cpp
private/engineaccess.cpp
diff --git a/kdeui/tests/proxymodeltestapp/CMakeLists.txt b/kdeui/tests/proxymodeltestapp/CMakeLists.txt
index e3e6ddb..71ef4b9 100644
--- a/kdeui/tests/proxymodeltestapp/CMakeLists.txt
+++ b/kdeui/tests/proxymodeltestapp/CMakeLists.txt
@@ -4,8 +4,6 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}/..
${CMAKE_CURRENT_SOURCE_DIR}/..
- ${CMAKE_CURRENT_BINARY_DIR}/../tests
- ${CMAKE_CURRENT_SOURCE_DIR}/../tests
)

set(proxymodeltestapp_SRCS
diff --git a/khtml/tests/CMakeLists.txt b/khtml/tests/CMakeLists.txt
index 6a9fb23..070ee26 100644
--- a/khtml/tests/CMakeLists.txt
+++ b/khtml/tests/CMakeLists.txt
@@ -20,20 +20,8 @@ include_directories(
${CMAKE_SOURCE_DIR}/khtml/css
)
include_directories(
- ${CMAKE_CURRENT_BINARY_DIR}/../misc
- ${CMAKE_CURRENT_BINARY_DIR}/../dom
- ${CMAKE_CURRENT_BINARY_DIR}/../xml
- ${CMAKE_CURRENT_BINARY_DIR}/../html
- ${CMAKE_CURRENT_BINARY_DIR}/../rendering
${CMAKE_CURRENT_BINARY_DIR}/../ecma
- ${CMAKE_CURRENT_BINARY_DIR}/../imload
- ${CMAKE_CURRENT_BINARY_DIR}/../imload/decoders
${CMAKE_CURRENT_BINARY_DIR}/../java
- ${CMAKE_CURRENT_BINARY_DIR}/../svg
- ${CMAKE_CURRENT_BINARY_DIR}/../svg/graphics
- ${CMAKE_CURRENT_BINARY_DIR}/../platform/graphics
- ${CMAKE_CURRENT_BINARY_DIR}/../platform/text
- ${CMAKE_CURRENT_BINARY_DIR}/../compat
${CMAKE_CURRENT_BINARY_DIR}/../css
)
kde4_add_unit_test( khtmlparttest khtmlparttest.cpp )
diff --git a/solid/tests/CMakeLists.txt b/solid/tests/CMakeLists.txt
index 3ed10d1..ef507d1 100644
--- a/solid/tests/CMakeLists.txt
+++ b/solid/tests/CMakeLists.txt
@@ -81,7 +81,7 @@ target_link_libraries(solidmttest ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT

########### networkingclient ###############

-include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES}
+include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR}
${KDE4_KDECORE_INCLUDES} ${KDE4_KDEUI_INCLUDES} ${KDE4_KIO_INCLUDES})

set(networkingclient_SRCS networkingclient.cpp)
diff --git a/threadweaver/Tests/CMakeLists.txt b/threadweaver/Tests/CMakeLists.txt
index 4c0900f..02af234 100644
--- a/threadweaver/Tests/CMakeLists.txt
+++ b/threadweaver/Tests/CMakeLists.txt
@@ -1,5 +1,5 @@

-include_directories(${QT_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}/Weaver/)
+include_directories(${QT_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})

include_directories( ../Weaver/ )

[kdelibs/KDE/4.7] khtml/rendering: remove and unused variable and calculated value

2011-10-07T09:47:00.004-07:00

Git commit dcc50c2216cf0d535fe90d569c0970fb2c165ce2 by Jaime Torres.
Committed on 07/10/2011 at 18:44.
Pushed by jtamate into branch 'KDE/4.7'.

remove and unused variable and calculated value

the calculated value is not used
part 4 of 5

M +0 -1 khtml/rendering/render_table.cpp

http://commits.kde.org/kdelibs/dcc50c2216cf0d535fe90d569c0970fb2c165ce2

diff --git a/khtml/rendering/render_table.cpp b/khtml/rendering/render_table.cpp
index 5b07714..1f030a9 100644
--- a/khtml/rendering/render_table.cpp
+++ b/khtml/rendering/render_table.cpp
@@ -2014,7 +2014,6 @@ bool RenderTableSection::canClear(RenderObject * /*child*/, PageBreakLevel level

void RenderTableSection::addSpaceAt(int pos, int dy)
{
- const int nEffCols = table()->numEffCols();
const int totalRows = numRows();
for ( int r = 0; r < totalRows; r++ ) {
if (rowPos[r] > pos) {

[kdelibs/KDE/4.7] khtml/html: no need for break; after a continue;

2011-10-07T09:47:00.003-07:00

Git commit ddec3dbbbddb4349513ee4fbe6dc4d6ab2244ad3 by Jaime Torres.
Committed on 07/10/2011 at 18:43.
Pushed by jtamate into branch 'KDE/4.7'.

no need for break; after a continue;

remove the break;
part 2 of 4

M +0 -2 khtml/html/htmltokenizer.cpp

http://commits.kde.org/kdelibs/ddec3dbbbddb4349513ee4fbe6dc4d6ab2244ad3

diff --git a/khtml/html/htmltokenizer.cpp b/khtml/html/htmltokenizer.cpp
index b64e83d..2c4761d 100644
--- a/khtml/html/htmltokenizer.cpp
+++ b/khtml/html/htmltokenizer.cpp
@@ -1741,8 +1741,6 @@ void HTMLTokenizer::write( const TokenizerString &str, bool appendData )
tquote = NoQuote;
parseProcessingInstruction(src);
continue;
-
- break;
}
case '%':
if (!brokenServer) {

[kdelibs/KDE/4.7] khtml: move local variables inside the #if where they are only used

2011-10-07T09:47:00.002-07:00

Git commit 5f4e59f940b0c1ba697dc24ef4f79df04237e80f by Jaime Torres.
Committed on 07/10/2011 at 18:40.
Pushed by jtamate into branch 'KDE/4.7'.

move local variables inside the #if where they are only used

Move some variables inside the #ifdef block where they are used
part 1 of 4 from review

M +1 -2 khtml/ecma/kjs_window.cpp
M +1 -1 khtml/khtml_part.cpp
M +1 -1 khtml/khtmlview.cpp

http://commits.kde.org/kdelibs/5f4e59f940b0c1ba697dc24ef4f79df04237e80f

diff --git a/khtml/ecma/kjs_window.cpp b/khtml/ecma/kjs_window.cpp
index 0e7394b..92f3fcd 100644
--- a/khtml/ecma/kjs_window.cpp
+++ b/khtml/ecma/kjs_window.cpp
@@ -2849,12 +2849,11 @@ JSValue *ExternalFunc::callAsFunction(ExecState *exec, JSObject *thisObj, const
if (!part)
return jsUndefined();

- KHTMLView *widget = part->view();
-
switch (id) {
case External::AddFavorite:
{
#ifndef KONQ_EMBEDDED
+ KHTMLView *widget = part->view();
if (!widget->dialogsAllowed())
return jsUndefined();
part->xmlDocImpl()->updateRendering();
diff --git a/khtml/khtml_part.cpp b/khtml/khtml_part.cpp
index 53929fa..9a02248 100644
--- a/khtml/khtml_part.cpp
+++ b/khtml/khtml_part.cpp
@@ -6544,8 +6544,8 @@ void KHTMLPart::khtmlMouseReleaseEvent( khtml::MouseReleaseEvent *event )
// the mouse is pressed again.
d->m_bMousePressed = false;

- QMouseEvent *_mouse = event->qmouseEvent();
#ifndef QT_NO_CLIPBOARD
+ QMouseEvent *_mouse = event->qmouseEvent();
if ((d->m_guiProfile == BrowserViewGUI) && (_mouse->button() == Qt::MidButton) && (event->url().isNull())) {
kDebug( 6050 ) << "MMB shouldOpen=" << d->m_bOpenMiddleClick;

diff --git a/khtml/khtmlview.cpp b/khtml/khtmlview.cpp
index 28dbac3..c15578d 100644
--- a/khtml/khtmlview.cpp
+++ b/khtml/khtmlview.cpp
@@ -3123,9 +3123,9 @@ void KHTMLView::print(bool quick)

pageHeight -= headerHeight;

+#ifndef QT_NO_TRANSFORMATIONS
bool scalePage = false;
double scale = 0.0;
-#ifndef QT_NO_TRANSFORMATIONS
if(root->docWidth() > printer.width()) {
scalePage = true;
scale = ((double) printer.width())/((double) root->docWidth());

[kdelibs/KDE/4.7] khtml/java: check index is in limits before accesing the array

2011-10-07T09:47:00.001-07:00

Git commit 11371f7bb2e2a609db0177c6b2bca2573c9d0c9d by Jaime Torres.
Committed on 07/10/2011 at 18:43.
Pushed by jtamate into branch 'KDE/4.7'.

check index is in limits before accesing the array

the order of the check does matter
part 3 of 4

M +1 -1 khtml/java/kjavaappletserver.cpp

http://commits.kde.org/kdelibs/11371f7bb2e2a609db0177c6b2bca2573c9d0c9d

diff --git a/khtml/java/kjavaappletserver.cpp b/khtml/java/kjavaappletserver.cpp
index 234c6f3..aa6dab9 100644
--- a/khtml/java/kjavaappletserver.cpp
+++ b/khtml/java/kjavaappletserver.cpp
@@ -479,7 +479,7 @@ void KJavaAppletServer::slotJavaRequest( const QByteArray& qb )

//get contextID
QString contextID;
- while( qb[index] != 0 && index < qb_size )
+ while( index < qb_size && qb[index] != 0 )
{
contextID += qb[ index++ ];
}

[kdelibs/KDE/4.7] khtml: Avoid possible null pointer dereferences in khtml

2011-10-07T09:47:00.000-07:00

Git commit 4eb2bb4b9b5fc206f88e56eceac2cca6b34d0521 by Jaime Torres.
Committed on 07/10/2011 at 18:46.
Pushed by jtamate into branch 'KDE/4.7'.

Avoid possible null pointer dereferences in khtml

Avoid possible null pointer dereferences in khtml.
only use the pointer when you are sure it is not null.

REVIEW: 102794

M +2 -1 khtml/css/css_valueimpl.cpp
M +3 -3 khtml/khtmlimage.cpp
M +1 -2 khtml/rendering/render_form.cpp
M +22 -14 khtml/xpath/util.cpp

http://commits.kde.org/kdelibs/4eb2bb4b9b5fc206f88e56eceac2cca6b34d0521

diff --git a/khtml/css/css_valueimpl.cpp b/khtml/css/css_valueimpl.cpp
index 3fb2898..dfd9e3e 100644
--- a/khtml/css/css_valueimpl.cpp
+++ b/khtml/css/css_valueimpl.cpp
@@ -1376,11 +1376,12 @@ CSSImageValueImpl::CSSImageValueImpl(const DOMString &url, StyleBaseImpl* style)
root = root->parent();
if (root->isCSSStyleSheet())
docLoader = static_cast<const CSSStyleSheetImpl*>(root)->docLoader();
-
+ if (docLoader) {
KUrl fullURL( style->baseURL(), khtml::parseURL(url).string() );
m_image = docLoader->requestImage( fullURL.url() );
if(m_image) m_image->ref(this);
}
+}

CSSImageValueImpl::CSSImageValueImpl()
: CSSPrimitiveValueImpl(CSS_VAL_NONE)
diff --git a/khtml/khtmlimage.cpp b/khtml/khtmlimage.cpp
index c6e6366..7823f0e 100644
--- a/khtml/khtmlimage.cpp
+++ b/khtml/khtmlimage.cpp
@@ -197,15 +197,15 @@ void KHTMLImage::notifyFinished( khtml::CachedObject *o )
if ( !m_mimeType.isEmpty() )
mimeType = KMimeType::mimeType(m_mimeType, KMimeType::ResolveAliases);

- if ( mimeType ) {
- if (m_image && !m_image->suggestedTitle().isEmpty()) {
+ if ( mimeType && m_image ) {
+ if ( !m_image->suggestedTitle().isEmpty() ) {
caption = i18n( "%1 (%2 - %3x%4 Pixels)", m_image->suggestedTitle(), mimeType->comment(), m_image->pixmap_size().width(), m_image->pixmap_size().height() );
} else {
caption = i18n( "%1 - %2x%3 Pixels" , mimeType->comment() ,
m_image->pixmap_size().width() , m_image->pixmap_size().height() );
}
} else {
- if (m_image && !m_image->suggestedTitle().isEmpty()) {
+ if ( !m_image->suggestedTitle().isEmpty() ) {
caption = i18n( "%1 (%2x%3 Pixels)" , m_image->suggestedTitle(), m_image->pixmap_size().width() , m_image->pixmap_size().height() );
} else {
caption = i18n( "Image - %1x%2 Pixels" , m_image->pixmap_size().width() , m_image->pixmap_size().height() );
diff --git a/khtml/rendering/render_form.cpp b/khtml/rendering/render_form.cpp
index c15247a..aa59d3d 100644
--- a/khtml/rendering/render_form.cpp
+++ b/khtml/rendering/render_form.cpp
@@ -137,9 +137,8 @@ using namespace DOM;
const QComboBox* cb = qobject_cast<const QComboBox*>(widget);
const QStyleOptionComboBox* cbOpt = qstyleoption_cast<const QStyleOptionComboBox*>(opt);

- QFontMetrics fm = cb->fontMetrics();
-
if (cb && cbOpt) {
+ QFontMetrics fm = cb->fontMetrics();
// Compute content width; Qt uses the usual +4 magic number for icon/text margin
int maxW = 0;
for (int c = 0; c < cb->count(); ++c) {
diff --git a/khtml/xpath/util.cpp b/khtml/xpath/util.cpp
index 079008d..116744b 100644
--- a/khtml/xpath/util.cpp
+++ b/khtml/xpath/util.cpp
@@ -111,34 +111,42 @@ bool isValidContextNode( NodeImpl *node )

DOM::NodeImpl *xpathParentNode( DOM::NodeImpl *node )
{
- if ( node && node->nodeType() == Node::ATTRIBUTE_NODE )
- return static_cast<DOM::AttrImpl*>(node)->ownerElement();
+ DOM::NodeImpl *res = 0;
+ if ( node ) {
+ if ( node->nodeType() == Node::ATTRIBUTE_NODE )
+ res = static_cast<DOM::AttrImpl*>(node)->ownerElement();
else
- return node->parentNode();
+ res = node->parentNode();
+ }
+ return res;
}

DOM::NodeImpl *xpathFirstChild( DOM::NodeImpl *node )
{
- if ( node && node->nodeType() == Node::ATTRIBUTE_NODE )
- return 0;
- else
- return node->firstChild();
+ DOM::NodeImpl *res = 0;
+ if ( node && node->nodeType() != Node::ATTRIBUTE_NODE )
+ res = node->firstChild();
+ return res;
}

DOM::NodeImpl *xpathLastChild( DOM::NodeImpl *node )
{
- if ( node && node->nodeType() == Node::ATTRIBUTE_NODE )
- return 0;
- else
- return node->lastChild();
+ DOM::NodeImpl *res = 0;
+ if ( node && node->nodeType() != Node::ATTRIBUTE_NODE )
+ res = node->lastChild();
+ return res;
}

DOM::NodeImpl *nextSiblingForFollowing( DOM::NodeImpl *node )
{
- if ( node && node->nodeType() == Node::ATTRIBUTE_NODE )
- return static_cast<DOM::AttrImpl*>(node)->ownerElement()->firstChild();
+ DOM::NodeImpl *res = 0;
+ if ( node ) {
+ if ( node->nodeType() == Node::ATTRIBUTE_NODE )
+ res = static_cast<DOM::AttrImpl*>(node)->ownerElement()->firstChild();
else
- return node->nextSibling();
+ res = node->nextSibling();
+ }
+ return res;
}

} // namespace khtml

[kdelibs/KDE/4.7] khtml/imload/decoders: imload/png: Fix build with libpng 1.5

2011-09-26T18:35:00.001-07:00

Git commit aeb7ff3b1d7b5a945b52660c5079e43c1e567d1f by Michael Pyne.
Committed on 27/09/2011 at 03:31.
Pushed by mpyne into branch 'KDE/4.7'.

imload/png: Fix build with libpng 1.5

AFAICS this is the proper function to use to access the PNG bit depth,
and is available from at the very least libpng 1.2.

This should fix the build for libpng 1.5.0 and later, and will be
included in kdelibs 4.7.2.

M +2 -1 khtml/imload/decoders/pngloader.cpp

http://commits.kde.org/kdelibs/aeb7ff3b1d7b5a945b52660c5079e43c1e567d1f

diff --git a/khtml/imload/decoders/pngloader.cpp b/khtml/imload/decoders/pngloader.cpp
index a837a84..5e97e6d 100644
--- a/khtml/imload/decoders/pngloader.cpp
+++ b/khtml/imload/decoders/pngloader.cpp
@@ -198,7 +198,8 @@ private:
{
if (interlaced)
{
- Q_ASSERT(pngReadStruct->row_info.pixel_depth <= depth * 8);
+ png_byte pngDepth = png_get_bit_depth(pngReadStruct, pngInfoStruct);
+ Q_ASSERT(pngDepth <= depth * 8);
requestScanline(rowNum, scanlineBuf);
png_progressive_combine_row(pngReadStruct, scanlineBuf, data);
notifyScanline(pass + 1, scanlineBuf);

[kdelibs/frameworks] khtml/imload/decoders: imload/png: Fix build with libpng 1.5

2011-09-26T18:35:00.000-07:00

Git commit 2966f365bbe3f0e70822519f79ce5f827a123c80 by Michael Pyne.
Committed on 27/09/2011 at 03:31.
Pushed by mpyne into branch 'frameworks'.

imload/png: Fix build with libpng 1.5

AFAICS this is the proper function to use to access the PNG bit depth,
and is available from at the very least libpng 1.2.

This should fix the build for libpng 1.5.0 and later.
(Forward port of a kdelibs 4.7 fix)

M +2 -1 khtml/imload/decoders/pngloader.cpp

http://commits.kde.org/kdelibs/2966f365bbe3f0e70822519f79ce5f827a123c80

[kdelibs/KDE/4.7] /: Revert my previous changes to klineedit code and attempt to fix the bug

2011-09-17T09:10:00.000-07:00

Git commit 6828cc00a65f1a1034065c787781043ae16dede8 by Andrea Iacovitti.
Committed on 17/09/2011 at 17:57.
Pushed by aiacovitti into branch 'KDE/4.7'.

Revert my previous changes to klineedit code and attempt to fix the bug
khtml side as David suggested.

CCBUG: 282133
FIXED-IN: 4.7.2
CCMAIL: faure@kde.org

M +1 -1 kdeui/widgets/klineedit.cpp
M +1 -1 khtml/rendering/render_form.cpp

http://commits.kde.org/kdelibs/6828cc00a65f1a1034065c787781043ae16dede8

diff --git a/kdeui/widgets/klineedit.cpp b/kdeui/widgets/klineedit.cpp
index c919b99..701b8f1 100644
--- a/kdeui/widgets/klineedit.cpp
+++ b/kdeui/widgets/klineedit.cpp
@@ -1150,7 +1150,7 @@ void KLineEdit::mouseReleaseEvent( QMouseEvent* e )
{
if ( d->clickInClear ) {
if ( d->clearButton == childAt(e->pos()) || d->clearButton->underMouse() ) {
- QString newText = QString::fromLatin1("");
+ QString newText;
if ( e->button() == Qt::MidButton ) {
newText = QApplication::clipboard()->text( QClipboard::Selection );
setText( newText );
diff --git a/khtml/rendering/render_form.cpp b/khtml/rendering/render_form.cpp
index 24bcbe1..c15247a 100644
--- a/khtml/rendering/render_form.cpp
+++ b/khtml/rendering/render_form.cpp
@@ -1159,7 +1159,7 @@ void RenderLineEdit::slotTextChanged(const QString &string)
if (m_blockElementUpdates) return;

// don't use setValue here!
- element()->m_value = string;
+ element()->m_value = string.isNull() ? DOMString("") : string;
element()->m_unsubmittedFormChange = true;
}

[kdelibs/KDE/4.7] khtml/rendering: Fix baseline position for checkboxes and radio buttons.

2011-09-17T02:16:00.001-07:00

Git commit 4b41e546a12ae4ccf7930f78ed09fe7a6ea745d0 by Andrea Iacovitti.
Committed on 17/09/2011 at 11:13.
Pushed by aiacovitti into branch 'KDE/4.7'.

Fix baseline position for checkboxes and radio buttons.
BUG: 281405
FIXED-IN: 4.7.2

M +4 -1 khtml/rendering/render_form.cpp

http://commits.kde.org/kdelibs/4b41e546a12ae4ccf7930f78ed09fe7a6ea745d0

diff --git a/khtml/rendering/render_form.cpp b/khtml/rendering/render_form.cpp
index 3302920..24bcbe1 100644
--- a/khtml/rendering/render_form.cpp
+++ b/khtml/rendering/render_form.cpp
@@ -331,7 +331,10 @@ RenderButton::RenderButton(HTMLGenericFormElementImpl *element)

short RenderButton::baselinePosition( bool f ) const
{
- return RenderWidget::baselinePosition( f ) - 2;
+ int ret = (height()-RenderWidget::paddingTop()-RenderWidget::paddingBottom()+1)/2;
+ ret += marginTop() + RenderWidget::paddingTop();
+ ret += ((fontMetrics( f ).ascent())/2)-1;
+ return ret;
}

void RenderButton::layout()

[kdelibs/KDE/4.7] /: -Do not set WA_OpaquePaintEvent attribute for line edit clearButton

2011-09-17T02:09:00.001-07:00

Git commit 07d20a558da67fb9f849e2b20c52cf275ea01794 by Andrea Iacovitti.
Committed on 17/09/2011 at 10:12.
Pushed by aiacovitti into branch 'KDE/4.7'.

-Do not set WA_OpaquePaintEvent attribute for line edit clearButton
(should fix the not transparent background bug)
-Optimize a bit the code to enable/disable it

BUG: 230024
CCBUG: 280226
FIXED-IN: 4.7.2

M +1 -0 kdeui/widgets/klineedit.cpp
M +5 -2 khtml/khtmlview.cpp
M +8 -7 khtml/rendering/render_form.cpp

http://commits.kde.org/kdelibs/07d20a558da67fb9f849e2b20c52cf275ea01794

diff --git a/kdeui/widgets/klineedit.cpp b/kdeui/widgets/klineedit.cpp
index 715e182..c919b99 100644
--- a/kdeui/widgets/klineedit.cpp
+++ b/kdeui/widgets/klineedit.cpp
@@ -291,6 +291,7 @@ void KLineEdit::setClearButtonShown(bool show)
}

d->clearButton = new KLineEditButton(this);
+ d->clearButton->setObjectName("KLineEditButton");
d->clearButton->setCursor( Qt::ArrowCursor );
d->clearButton->setToolTip( i18nc( "@action:button Clear current text in the line edit", "Clear text" ) );

diff --git a/khtml/khtmlview.cpp b/khtml/khtmlview.cpp
index 1db9b1a..28dbac3 100644
--- a/khtml/khtmlview.cpp
+++ b/khtml/khtmlview.cpp
@@ -1363,7 +1363,7 @@ void KHTMLView::mouseMoveEvent( QMouseEvent * _mouse )
if (kw && kw->m_kwp->isRedirected())
setCursor = false;
else if (QLineEdit* le = qobject_cast<QLineEdit*>(rw->widget())) {
- QList<QWidget*> wl = qFindChildren<QWidget *>( le, "KHTMLLineEditButton" );
+ QList<QWidget*> wl = qFindChildren<QWidget *>( le, "KLineEditButton" );
// force arrow cursor above lineedit clear button
foreach (QWidget*w, wl) {
if (w->underMouse()) {
@@ -1942,7 +1942,10 @@ static void handleWidget(QWidget* w, KHTMLView* view, bool recurse=true)
w->setAttribute( Qt::WA_NoSystemBackground );

w->setAttribute(Qt::WA_WState_InPaintEvent);
- w->setAttribute(Qt::WA_OpaquePaintEvent);
+
+ if (!(w->objectName() == "KLineEditButton"))
+ w->setAttribute(Qt::WA_OpaquePaintEvent);
+
w->installEventFilter(view);

if (!recurse)
diff --git a/khtml/rendering/render_form.cpp b/khtml/rendering/render_form.cpp
index 845db1a..3302920 100644
--- a/khtml/rendering/render_form.cpp
+++ b/khtml/rendering/render_form.cpp
@@ -1044,20 +1044,21 @@ void RenderLineEdit::setStyle(RenderStyle* _style)
RenderFormElement::setStyle( _style );

widget()->setAlignment(textAlignment());
+
bool showClearButton = (!shouldDisableNativeBorders() && !_style->hasBackgroundImage());
- widget()->setClearButtonShown( showClearButton );
- if (showClearButton) {
+
+ if (!showClearButton && widget()->isClearButtonShown()) {
+ widget()->setClearButtonShown(false);
+ }
+ else if (showClearButton && !widget()->isClearButtonShown()) {
+ widget()->setClearButtonShown(true);
QObjectList children = widget()->children();
foreach (QObject* object, children) {
QWidget *w = qobject_cast<QWidget*>(object);
- if (w && !w->isWindow()) {
+ if (w && !w->isWindow() && (w->objectName() == "KLineEditButton")) {
// this duplicates KHTMLView's handleWidget but this widget
// is created on demand, so it might not be here at ChildPolished time
- w->setObjectName("KHTMLLineEditButton");
w->installEventFilter(view());
- w->setAttribute(Qt::WA_NoSystemBackground);
- w->setAttribute(Qt::WA_WState_InPaintEvent);
- w->setAttribute(Qt::WA_OpaquePaintEvent);
}
}
}

[kdelibs/frameworks] /: Remove the exports targets from libraries in frameworks.

2011-09-04T12:47:00.000-07:00

Git commit 24d1fb1228cc534d3de2324236fcad9a637e7906 by Stephen Kelly.
Committed on 04/09/2011 at 21:33.
Pushed by skelly into branch 'frameworks'.

Remove the exports targets from libraries in frameworks.

If there is no kdelibs, there is no kdelibs exports. This fixes some
cmake errors resulting from making it possible to build itemmodels
standalone.

M +2 -2 plasma/CMakeLists.txt
M +1 -1 kparts/CMakeLists.txt
M +1 -1 kde3support/CMakeLists.txt
M +1 -1 tier1/threadweaver/Experimental/CMakeLists.txt
M +1 -1 tier1/threadweaver/WeaverGui/CMakeLists.txt
M +0 -1 CMakeLists.txt
M +1 -1 kfile/CMakeLists.txt
M +1 -1 knewstuff/knewstuff3/CMakeLists.txt
M +1 -1 interfaces/kmediaplayer/CMakeLists.txt
M +1 -1 kross/core/CMakeLists.txt
M +1 -1 kjs/CMakeLists.txt
M +1 -1 kpty/CMakeLists.txt
M +1 -1 kdesu/CMakeLists.txt
M +1 -1 kio/CMakeLists.txt
M +1 -1 kunitconversion/CMakeLists.txt
M +1 -1 kjs/api/CMakeLists.txt
M +1 -1 kio/misc/kntlm/CMakeLists.txt
M +1 -1 knotify/config/CMakeLists.txt
M +1 -1 kdeui/CMakeLists.txt
M +1 -1 interfaces/ktexteditor/CMakeLists.txt
M +1 -1 tier1/solid/solid/CMakeLists.txt
M +1 -1 nepomuk/CMakeLists.txt
M +1 -1 nepomuk/query/CMakeLists.txt
M +1 -1 kdewebkit/CMakeLists.txt
M +1 -1 tier2/sonnet/core/CMakeLists.txt
M +1 -1 khtml/CMakeLists.txt
M +1 -1 dnssd/CMakeLists.txt
M +2 -2 kdecore/CMakeLists.txt
M +1 -1 experimental/libkdeclarative/CMakeLists.txt
M +1 -1 kjsembed/kjsembed/CMakeLists.txt
M +1 -1 interfaces/kimproxy/library/CMakeLists.txt
M +1 -1 nepomuk/utils/CMakeLists.txt
M +5 -5 kutils/CMakeLists.txt
M +1 -1 tier1/libkarchive/src/CMakeLists.txt
M +1 -1 kross/ui/CMakeLists.txt
M +1 -1 knewstuff/knewstuff2/CMakeLists.txt
M +1 -1 kde3support/kunittest/CMakeLists.txt
M +1 -1 libinqt5/src/CMakeLists.txt

http://commits.kde.org/kdelibs/24d1fb1228cc534d3de2324236fcad9a637e7906

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3dc8ea1..15896b8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -366,7 +366,6 @@ install( FILES ${CMAKE_CURRENT_BINARY_DIR}/KDEPlatformProfile.cmake DESTINATION
install(CODE "set(EXPORT_FILES KDELibs4LibraryTargets.cmake KDELibs4ToolsTargets.cmake)"
CODE "set(EXPORT_INSTALL_DIR \"${DATA_INSTALL_DIR}/cmake/modules\")"
SCRIPT "${CMAKE_SOURCE_DIR}/cmake/modules/check_installed_exports_file.cmake" )
-install( EXPORT kdelibsLibraryTargets DESTINATION ${DATA_INSTALL_DIR}/cmake/modules NAMESPACE ${KDE4_TARGET_PREFIX} FILE KDELibs4LibraryTargets.cmake )
install( EXPORT kdelibsToolsTargets DESTINATION ${DATA_INSTALL_DIR}/cmake/modules NAMESPACE ${KDE4_TARGET_PREFIX} FILE KDELibs4ToolsTargets.cmake )
# the following will be the correct locations once cmake has the improved FIND_PACKAGE()
# install( FILES ${CMAKE_CURRENT_BINARY_DIR}/KDELibsDependencies.cmake DESTINATION ${PLUGIN_INSTALL_DIR}/cmake RENAME KDE4Config.cmake)
diff --git a/dnssd/CMakeLists.txt b/dnssd/CMakeLists.txt
index d0ab663..3e318a8 100644
--- a/dnssd/CMakeLists.txt
+++ b/dnssd/CMakeLists.txt
@@ -78,7 +78,7 @@ set_target_properties(kdnssd PROPERTIES
VERSION ${GENERIC_LIB_VERSION}
SOVERSION ${GENERIC_LIB_SOVERSION}
)
-install(TARGETS kdnssd EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS kdnssd ${INSTALL_TARGETS_DEFAULT_ARGS})

########### install files ###############
install( FILES dnssd_export.h domainbrowser.h remoteservice.h servicetypebrowser.h publicservice.h
diff --git a/experimental/libkdeclarative/CMakeLists.txt b/experimental/libkdeclarative/CMakeLists.txt
index 8649ac3..10c67cd 100644
--- a/experimental/libkdeclarative/CMakeLists.txt
+++ b/experimental/libkdeclarative/CMakeLists.txt
@@ -47,6 +47,6 @@ set(kdeclarative_LIB_HEADERS

install(FILES ${kdeclarative_LIB_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/ COMPONENT Devel)

-install(TARGETS kdeclarative EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS kdeclarative ${INSTALL_TARGETS_DEFAULT_ARGS})

diff --git a/interfaces/kimproxy/library/CMakeLists.txt b/interfaces/kimproxy/library/CMakeLists.txt
index 564a0dd..82562c9 100644
--- a/interfaces/kimproxy/library/CMakeLists.txt
+++ b/interfaces/kimproxy/library/CMakeLists.txt
@@ -26,5 +26,5 @@ set_target_properties(kimproxy PROPERTIES

########### install files ###############

-install(TARGETS kimproxy EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS kimproxy ${INSTALL_TARGETS_DEFAULT_ARGS})
install( FILES kimproxy_export.h kimproxy.h DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel)
diff --git a/interfaces/kmediaplayer/CMakeLists.txt b/interfaces/kmediaplayer/CMakeLists.txt
index dd84672..2725cfd 100644
--- a/interfaces/kmediaplayer/CMakeLists.txt
+++ b/interfaces/kmediaplayer/CMakeLists.txt
@@ -21,7 +21,7 @@ set_target_properties(kmediaplayer PROPERTIES
VERSION ${GENERIC_LIB_VERSION}
SOVERSION ${GENERIC_LIB_SOVERSION}
)
-install(TARGETS kmediaplayer EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS kmediaplayer ${INSTALL_TARGETS_DEFAULT_ARGS})

########### install files ###############
diff --git a/interfaces/ktexteditor/CMakeLists.txt b/interfaces/ktexteditor/CMakeLists.txt
index 9813734..b78c3d7 100644
--- a/interfaces/ktexteditor/CMakeLists.txt
+++ b/interfaces/ktexteditor/CMakeLists.txt
@@ -39,7 +39,7 @@ set_target_properties(ktexteditor
PROPERTIES VERSION ${GENERIC_LIB_VERSION}
SOVERSION ${GENERIC_LIB_SOVERSION}
)
-install(TARGETS ktexteditor EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS ktexteditor ${INSTALL_TARGETS_DEFAULT_ARGS})

########### install files ###############
install( FILES
diff --git a/kde3support/CMakeLists.txt b/kde3support/CMakeLists.txt
index 2e91b73..eba408c 100644
--- a/kde3support/CMakeLists.txt
+++ b/kde3support/CMakeLists.txt
@@ -90,7 +90,7 @@ set_target_properties(kde3support PROPERTIES VERSION ${GENERIC_LIB_VERSION}
SOVERSION ${GENERIC_LIB_SOVERSION}
)

-install(TARGETS kde3support EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS kde3support ${INSTALL_TARGETS_DEFAULT_ARGS})

########### install files ###############

diff --git a/kde3support/kunittest/CMakeLists.txt b/kde3support/kunittest/CMakeLists.txt
index 2479377..92c7282 100644
--- a/kde3support/kunittest/CMakeLists.txt
+++ b/kde3support/kunittest/CMakeLists.txt
@@ -15,7 +15,7 @@ set_target_properties(kunittest PROPERTIES
VERSION ${GENERIC_LIB_VERSION}
SOVERSION ${GENERIC_LIB_SOVERSION}
)
-install(TARGETS kunittest EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
+install(TARGETS kunittest ${INSTALL_TARGETS_DEFAULT_ARGS} )

########### next target ###############
diff --git a/kdecore/CMakeLists.txt b/kdecore/CMakeLists.txt
index 9fa56c5..5106277 100644
--- a/kdecore/CMakeLists.txt
+++ b/kdecore/CMakeLists.txt
@@ -158,7 +158,7 @@ if (UNIX)
if (NOT HAVE_TRUNC)
target_link_libraries(kdefakes m )
endif (NOT HAVE_TRUNC)
- install(TARGETS kdefakes EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
+ install(TARGETS kdefakes ${INSTALL_TARGETS_DEFAULT_ARGS} )

endif (UNIX)

@@ -398,7 +398,7 @@ set_target_properties(kdecore PROPERTIES
)

-install(TARGETS kdecore EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS kdecore ${INSTALL_TARGETS_DEFAULT_ARGS})

########### next target ###############

diff --git a/kdesu/CMakeLists.txt b/kdesu/CMakeLists.txt
index bed062b..c4f1eaf 100644
--- a/kdesu/CMakeLists.txt
+++ b/kdesu/CMakeLists.txt
@@ -39,7 +39,7 @@ set_target_properties(kdesu PROPERTIES
SOVERSION ${KDE_NON_GENERIC_LIB_SOVERSION}
)

-install(TARGETS kdesu EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
+install(TARGETS kdesu ${INSTALL_TARGETS_DEFAULT_ARGS} )

########### next target ###############
diff --git a/kdeui/CMakeLists.txt b/kdeui/CMakeLists.txt
index 3005f25..55feda3 100644
--- a/kdeui/CMakeLists.txt
+++ b/kdeui/CMakeLists.txt
@@ -447,7 +447,7 @@ set_target_properties(kdeui PROPERTIES VERSION ${KDE_NON_GENERIC_LIB_VERSION}
SOVERSION ${KDE_NON_GENERIC_LIB_SOVERSION}
)

-install(TARGETS kdeui EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS kdeui ${INSTALL_TARGETS_DEFAULT_ARGS})
########### install files ###############

if (Q_WS_MAC)
diff --git a/kdewebkit/CMakeLists.txt b/kdewebkit/CMakeLists.txt
index a11e572..b58b652 100644
--- a/kdewebkit/CMakeLists.txt
+++ b/kdewebkit/CMakeLists.txt
@@ -23,7 +23,7 @@ target_link_libraries(kdewebkit LINK_INTERFACE_LIBRARIES kparts kio kdecore ${QT

set_target_properties(kdewebkit PROPERTIES VERSION ${KDE_NON_GENERIC_LIB_VERSION} SOVERSION ${KDE_NON_GENERIC_LIB_SOVERSION})

-install(TARGETS kdewebkit EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS kdewebkit ${INSTALL_TARGETS_DEFAULT_ARGS})

install(FILES
kdewebkit_export.h
diff --git a/kfile/CMakeLists.txt b/kfile/CMakeLists.txt
index 6749584..0098619 100644
--- a/kfile/CMakeLists.txt
+++ b/kfile/CMakeLists.txt
@@ -56,7 +56,7 @@ set_target_properties(kfile PROPERTIES VERSION ${GENERIC_LIB_VERSION}
SOVERSION ${GENERIC_LIB_SOVERSION}
)

-install(TARGETS kfile EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS kfile ${INSTALL_TARGETS_DEFAULT_ARGS})

install( FILES
kdiroperator.h
diff --git a/khtml/CMakeLists.txt b/khtml/CMakeLists.txt
index dba6d40..4bf868e 100644
--- a/khtml/CMakeLists.txt
+++ b/khtml/CMakeLists.txt
@@ -657,7 +657,7 @@ create_js_binding(html/HTMLVideoElement.idl)
#create_js_binding(svg/SVGPathSegMovetoAbs.idl)
#create_js_binding(svg/SVGPathSegMovetoRel.idl)

-install(TARGETS khtml EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS khtml ${INSTALL_TARGETS_DEFAULT_ARGS})

########### khtmlpart ###############

diff --git a/kio/CMakeLists.txt b/kio/CMakeLists.txt
index c63f2e8..dd518cb 100644
--- a/kio/CMakeLists.txt
+++ b/kio/CMakeLists.txt
@@ -350,7 +350,7 @@ set_target_properties(kio PROPERTIES VERSION ${KDE_NON_GENERIC_LIB_VERSION}

########### install files ###############
-install(TARGETS kio EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS kio ${INSTALL_TARGETS_DEFAULT_ARGS})
if(NOT KIO_NO_NEPOMUK)
install(TARGETS kfilemetadatareader ${INSTALL_TARGETS_DEFAULT_ARGS})
endif(NOT KIO_NO_NEPOMUK)
diff --git a/kio/misc/kntlm/CMakeLists.txt b/kio/misc/kntlm/CMakeLists.txt
index 4cf440b..f0e13e3 100644
--- a/kio/misc/kntlm/CMakeLists.txt
+++ b/kio/misc/kntlm/CMakeLists.txt
@@ -7,7 +7,7 @@ target_link_libraries(kntlm ${KDE4_KDECORE_LIBS} )

set_target_properties(kntlm PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )

-install(TARGETS kntlm EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS kntlm ${INSTALL_TARGETS_DEFAULT_ARGS})

install( FILES kntlm_export.h kntlm.h DESTINATION ${INCLUDE_INSTALL_DIR}/kio COMPONENT Devel)

diff --git a/kjs/CMakeLists.txt b/kjs/CMakeLists.txt
index 1188064..631e89b 100644
--- a/kjs/CMakeLists.txt
+++ b/kjs/CMakeLists.txt
@@ -218,7 +218,7 @@ if(PCRE_FOUND)
endif(PCRE_FOUND)

set_target_properties(${KJSLIBNAME} PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
-install(TARGETS ${KJSLIBNAME} EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS ${KJSLIBNAME} ${INSTALL_TARGETS_DEFAULT_ARGS})

########### kjs - basic shell ###############

diff --git a/kjs/api/CMakeLists.txt b/kjs/api/CMakeLists.txt
index 1dba4b2..ff1726d 100644
--- a/kjs/api/CMakeLists.txt
+++ b/kjs/api/CMakeLists.txt
@@ -13,7 +13,7 @@ kde4_add_library(kjsapi ${LIBRARY_TYPE} ${kjsapi_LIB_SRCS})
target_link_libraries(kjsapi ${KJSLIBNAME} ${KDE4_KDECORE_LIBS})

set_target_properties(kjsapi PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
-install(TARGETS kjsapi EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS kjsapi ${INSTALL_TARGETS_DEFAULT_ARGS})

install(FILES
kjsapi_export.h
diff --git a/kjsembed/kjsembed/CMakeLists.txt b/kjsembed/kjsembed/CMakeLists.txt
index d70f260..0dd789d 100644
--- a/kjsembed/kjsembed/CMakeLists.txt
+++ b/kjsembed/kjsembed/CMakeLists.txt
@@ -69,7 +69,7 @@ kde4_add_library(${KJSEMBEDLIBNAME} ${LIBRARY_TYPE} ${kjsembed_LIB_SRCS})
target_link_libraries(${KJSEMBEDLIBNAME} ${KDE4_KDECORE_LIBS} ${QT_QTUITOOLS_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTSVG_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTCORE_LIBRARY} ${KJSLIBNAME} )

set_target_properties(${KJSEMBEDLIBNAME} PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
-install(TARGETS ${KJSEMBEDLIBNAME} EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS ${KJSEMBEDLIBNAME} ${INSTALL_TARGETS_DEFAULT_ARGS})

diff --git a/knewstuff/knewstuff2/CMakeLists.txt b/knewstuff/knewstuff2/CMakeLists.txt
index 293b362..7121700 100644
--- a/knewstuff/knewstuff2/CMakeLists.txt
+++ b/knewstuff/knewstuff2/CMakeLists.txt
@@ -64,7 +64,7 @@ set_target_properties(knewstuff2 PROPERTIES
VERSION ${GENERIC_LIB_VERSION}
SOVERSION ${GENERIC_LIB_SOVERSION}
)
-install(TARGETS knewstuff2 EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS knewstuff2 ${INSTALL_TARGETS_DEFAULT_ARGS})

install(FILES
core/author.h
diff --git a/knewstuff/knewstuff3/CMakeLists.txt b/knewstuff/knewstuff3/CMakeLists.txt
index 1bff639..42cdb20 100644
--- a/knewstuff/knewstuff3/CMakeLists.txt
+++ b/knewstuff/knewstuff3/CMakeLists.txt
@@ -61,7 +61,7 @@ set_target_properties(knewstuff3 PROPERTIES
SOVERSION ${GENERIC_LIB_SOVERSION}
)

-install(TARGETS knewstuff3 EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS knewstuff3 ${INSTALL_TARGETS_DEFAULT_ARGS})

install(FILES
downloaddialog.h
diff --git a/knotify/config/CMakeLists.txt b/knotify/config/CMakeLists.txt
index d0b1e8c..2a04660 100644
--- a/knotify/config/CMakeLists.txt
+++ b/knotify/config/CMakeLists.txt
@@ -25,7 +25,7 @@ set_target_properties(knotifyconfig PROPERTIES
VERSION ${GENERIC_LIB_VERSION}
SOVERSION ${GENERIC_LIB_SOVERSION}
)
-install(TARGETS knotifyconfig EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS knotifyconfig ${INSTALL_TARGETS_DEFAULT_ARGS})

########### install files ###############
install( FILES knotifyconfig_export.h knotifyconfigwidget.h DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel)
diff --git a/kparts/CMakeLists.txt b/kparts/CMakeLists.txt
index 96fa31f..2dc2a48 100644
--- a/kparts/CMakeLists.txt
+++ b/kparts/CMakeLists.txt
@@ -46,7 +46,7 @@ set_target_properties(kparts PROPERTIES VERSION ${GENERIC_LIB_VERSION}
)

-install(TARGETS kparts EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS kparts ${INSTALL_TARGETS_DEFAULT_ARGS})

########### install files ###############

diff --git a/kpty/CMakeLists.txt b/kpty/CMakeLists.txt
index d47c062..b653835 100644
--- a/kpty/CMakeLists.txt
+++ b/kpty/CMakeLists.txt
@@ -18,7 +18,7 @@ set_target_properties(kpty PROPERTIES
VERSION ${GENERIC_LIB_VERSION}
SOVERSION ${GENERIC_LIB_SOVERSION}
)
-install(TARGETS kpty EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS kpty ${INSTALL_TARGETS_DEFAULT_ARGS})

install( FILES
kpty_export.h
diff --git a/kross/core/CMakeLists.txt b/kross/core/CMakeLists.txt
index d7a52ff..2b364b2 100644
--- a/kross/core/CMakeLists.txt
+++ b/kross/core/CMakeLists.txt
@@ -19,7 +19,7 @@ set_target_properties(krosscore PROPERTIES VERSION ${GENERIC_LIB_VERSION}
)

-install(TARGETS krosscore EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS krosscore ${INSTALL_TARGETS_DEFAULT_ARGS})

install(FILES
kross_export.h
diff --git a/kross/ui/CMakeLists.txt b/kross/ui/CMakeLists.txt
index 48f0d5e..ca11b85 100644
--- a/kross/ui/CMakeLists.txt
+++ b/kross/ui/CMakeLists.txt
@@ -20,7 +20,7 @@ set_target_properties(krossui PROPERTIES VERSION ${GENERIC_LIB_VERSION}
)

-install(TARGETS krossui EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS krossui ${INSTALL_TARGETS_DEFAULT_ARGS})

########### install files ###############

diff --git a/kunitconversion/CMakeLists.txt b/kunitconversion/CMakeLists.txt
index 8315a9d..677af54 100644
--- a/kunitconversion/CMakeLists.txt
+++ b/kunitconversion/CMakeLists.txt
@@ -62,5 +62,5 @@ include_directories (${CMAKE_SOURCE_DIR} ${KDE4_KDECORE_INCLUDES})
kde4_add_library(kunitconversion ${LIBRARY_TYPE} ${kunitconversion_LIB_SRCS})
target_link_libraries(kunitconversion ${KDE4_KDECORE_LIBS} ${KUNITCONVERSION_EXTRA_LIBS})
set_target_properties(kunitconversion PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
-install(TARGETS kunitconversion EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS kunitconversion ${INSTALL_TARGETS_DEFAULT_ARGS})
install(FILES ${kunitconversion_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/kunitconversion COMPONENT Devel)
diff --git a/kutils/CMakeLists.txt b/kutils/CMakeLists.txt
index ec92f7b..d3d323c 100644
--- a/kutils/CMakeLists.txt
+++ b/kutils/CMakeLists.txt
@@ -33,7 +33,7 @@ install(FILES
COMPONENT Devel
)

-install(TARGETS kemoticons EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS kemoticons ${INSTALL_TARGETS_DEFAULT_ARGS})

######## kidletime ####################
@@ -83,7 +83,7 @@ install( FILES
kidletime/kidletime.h
DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel)

-install(TARGETS kidletime EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS kidletime ${INSTALL_TARGETS_DEFAULT_ARGS})

########### kcmutils ###############
@@ -126,7 +126,7 @@ install(FILES
DESTINATION ${INCLUDE_INSTALL_DIR}/ksettings
COMPONENT Devel)

-install(TARGETS kcmutils EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS kcmutils ${INSTALL_TARGETS_DEFAULT_ARGS})

########### kprintutils ###############
@@ -147,7 +147,7 @@ install( FILES
kprintpreview.h
DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel)

-install(TARGETS kprintutils EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS kprintutils ${INSTALL_TARGETS_DEFAULT_ARGS})

########### kutils ###############
@@ -165,6 +165,6 @@ set_target_properties(kutils PROPERTIES
VERSION ${GENERIC_LIB_VERSION}
SOVERSION ${GENERIC_LIB_SOVERSION})

-install(TARGETS kutils EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS kutils ${INSTALL_TARGETS_DEFAULT_ARGS})
endif(NOT KDE_PLATFORM_FEATURE_DISABLE_DEPRECATED)

diff --git a/libinqt5/src/CMakeLists.txt b/libinqt5/src/CMakeLists.txt
index b84be5c..104f80e 100644
--- a/libinqt5/src/CMakeLists.txt
+++ b/libinqt5/src/CMakeLists.txt
@@ -17,7 +17,7 @@ set_target_properties(inqt5 PROPERTIES VERSION ${GENERIC_LIB_VERSION}
SOVERSION ${GENERIC_LIB_SOVERSION}
)

-install(TARGETS inqt5 EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS inqt5 ${INSTALL_TARGETS_DEFAULT_ARGS})

#install(FILES
# qstandardpaths.h
diff --git a/nepomuk/CMakeLists.txt b/nepomuk/CMakeLists.txt
index b562200..70d489e 100644
--- a/nepomuk/CMakeLists.txt
+++ b/nepomuk/CMakeLists.txt
@@ -145,7 +145,7 @@ set_target_properties(nepomuk PROPERTIES
SOVERSION ${GENERIC_LIB_SOVERSION}
)

-install(TARGETS nepomuk EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS nepomuk ${INSTALL_TARGETS_DEFAULT_ARGS})

install(FILES
nepomuk_export.h
diff --git a/nepomuk/query/CMakeLists.txt b/nepomuk/query/CMakeLists.txt
index 6e09476..e54741e 100644
--- a/nepomuk/query/CMakeLists.txt
+++ b/nepomuk/query/CMakeLists.txt
@@ -64,7 +64,7 @@ target_link_libraries(nepomukquery
nepomuk
)

-install(TARGETS nepomukquery EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS nepomukquery ${INSTALL_TARGETS_DEFAULT_ARGS})
install(FILES
term.h
negationterm.h
diff --git a/nepomuk/utils/CMakeLists.txt b/nepomuk/utils/CMakeLists.txt
index 6d21aa6..2ceb76f 100644
--- a/nepomuk/utils/CMakeLists.txt
+++ b/nepomuk/utils/CMakeLists.txt
@@ -50,7 +50,7 @@ set_target_properties(nepomukutils PROPERTIES
SOVERSION ${GENERIC_LIB_SOVERSION}
)

-install(TARGETS nepomukutils EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS nepomukutils ${INSTALL_TARGETS_DEFAULT_ARGS})

install(FILES
utils.h
diff --git a/plasma/CMakeLists.txt b/plasma/CMakeLists.txt
index 074e6ac..32aa0d3 100644
--- a/plasma/CMakeLists.txt
+++ b/plasma/CMakeLists.txt
@@ -304,8 +304,8 @@ set_target_properties(plasmaqgv PROPERTIES
SOVERSION 1
)

-install(TARGETS plasma EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
-install(TARGETS plasmaqgv EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS plasma ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS plasmaqgv ${INSTALL_TARGETS_DEFAULT_ARGS})

########### install files ###############

diff --git a/tier1/libkarchive/src/CMakeLists.txt b/tier1/libkarchive/src/CMakeLists.txt
index 39cd265..2c5d202 100644
--- a/tier1/libkarchive/src/CMakeLists.txt
+++ b/tier1/libkarchive/src/CMakeLists.txt
@@ -36,7 +36,7 @@ set_target_properties(karchive PROPERTIES VERSION ${GENERIC_LIB_VERSION}
SOVERSION ${GENERIC_LIB_SOVERSION}
)

-install(TARGETS karchive EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS karchive ${INSTALL_TARGETS_DEFAULT_ARGS})

install( FILES
karchive.h
diff --git a/tier1/solid/solid/CMakeLists.txt b/tier1/solid/solid/CMakeLists.txt
index 5ce0f74..c6c0b9f 100644
--- a/tier1/solid/solid/CMakeLists.txt
+++ b/tier1/solid/solid/CMakeLists.txt
@@ -376,7 +376,7 @@ set_target_properties(solid PROPERTIES
VERSION ${GENERIC_LIB_VERSION}
SOVERSION ${GENERIC_LIB_SOVERSION}
)
-install(TARGETS solid EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS solid ${INSTALL_TARGETS_DEFAULT_ARGS})

install(FILES org.kde.Solid.Networking.Client.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR})
install(FILES org.kde.Solid.PowerManagement.PolicyAgent.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR})
diff --git a/tier1/threadweaver/Experimental/CMakeLists.txt b/tier1/threadweaver/Experimental/CMakeLists.txt
index 3deaf08..5465a13 100644
--- a/tier1/threadweaver/Experimental/CMakeLists.txt
+++ b/tier1/threadweaver/Experimental/CMakeLists.txt
@@ -11,7 +11,7 @@ kde4_add_library(ThreadWeaverExperimental ${LIBRARY_TYPE} ${ThreadWeaverExperime
target_link_libraries(ThreadWeaverExperimental threadweaver)
set_target_properties(ThreadWeaverExperimental PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})

-install(TARGETS ThreadWeaverExperimental EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS ThreadWeaverExperimental ${INSTALL_TARGETS_DEFAULT_ARGS})

install(FILES FileLoaderJob.h
DESTINATION ${INCLUDE_INSTALL_DIR}/threadweaver/ COMPONENT Devel )
diff --git a/tier1/threadweaver/WeaverGui/CMakeLists.txt b/tier1/threadweaver/WeaverGui/CMakeLists.txt
index f5e370b..c110369 100644
--- a/tier1/threadweaver/WeaverGui/CMakeLists.txt
+++ b/tier1/threadweaver/WeaverGui/CMakeLists.txt
@@ -10,7 +10,7 @@ kde4_add_library(ThreadWeaverGui ${LIBRARY_TYPE} ${ThreadWeaverGui_LIB_SRCS})
target_link_libraries(ThreadWeaverGui threadweaver ${QT_QTGUI_LIBRARY})
set_target_properties(ThreadWeaverGui PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})

-install(TARGETS ThreadWeaverGui EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS ThreadWeaverGui ${INSTALL_TARGETS_DEFAULT_ARGS})

install(FILES WeaverThreadGrid.h
DESTINATION ${INCLUDE_INSTALL_DIR}/threadweaver/ COMPONENT Devel
diff --git a/tier2/sonnet/core/CMakeLists.txt b/tier2/sonnet/core/CMakeLists.txt
index ef3cbb0..9ef78b0 100644
--- a/tier2/sonnet/core/CMakeLists.txt
+++ b/tier2/sonnet/core/CMakeLists.txt
@@ -37,7 +37,7 @@ set_target_properties(sonnetcore PROPERTIES VERSION ${GENERIC_LIB_VERSION}
SOVERSION ${GENERIC_LIB_SOVERSION}
)

-install(TARGETS sonnetcore EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS sonnetcore ${INSTALL_TARGETS_DEFAULT_ARGS})

install( FILES backgroundchecker.h speller.h globals.h ${CMAKE_CURRENT_BINARY_DIR}/sonnetcore_export.h

[kdelibs/frameworks] /: Remove usage of macro_optional_find_package.

2011-08-27T09:20:00.000-07:00

Git commit 9422f315cb2a3e27417d897b0756cd21c1f466cf by Stephen Kelly.
Committed on 27/08/2011 at 18:19.
Pushed by skelly into branch 'frameworks'.

Remove usage of macro_optional_find_package.

It is obsolete with CMake 2.8.6 which provides options to disable finding packages.

M +5 -6 kjsembed/qtonly/CMakeLists.txt
M +4 -4 kdecore/auth/ConfigureChecks.cmake
M +2 -2 kimgio/CMakeLists.txt
M +2 -2 solid/solid/CMakeLists.txt
M +2 -2 tier1/libkarchive/src/ConfigureChecks.cmake
M +1 -1 kioslave/http/CMakeLists.txt
M +5 -5 tier2/sonnet/plugins/CMakeLists.txt
M +1 -1 plasma/CMakeLists.txt
M +2 -2 dnssd/CMakeLists.txt
M +6 -6 CMakeLists.txt
M +1 -1 kdecore/CMakeLists.txt

http://commits.kde.org/kdelibs/9422f315cb2a3e27417d897b0756cd21c1f466cf

diff --git a/CMakeLists.txt b/CMakeLists.txt
index aa33764..88a3169 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -112,23 +112,23 @@ if(X11_FOUND)
endif(X11_FOUND)

-macro_optional_find_package(OpenSSL)
+find_package(OpenSSL)
macro_log_feature(OPENSSL_FOUND "OpenSSL" "Support for secure network communications (SSL and TLS)" "http://openssl.org" FALSE "" "STRONGLY RECOMMENDED: KDE uses OpenSSL for the bulk of secure communications, including secure web browsing via HTTPS")

-macro_optional_find_package(Libintl)
+find_package(Libintl)
macro_log_feature(LIBINTL_FOUND "Libintl" "Support for multiple languages" "http://www.gnu.org/software/gettext" FALSE "" "STRONGLY RECOMMENDED: Enables KDE to be available in many different languages")

set(SOPRANO_MIN_VERSION "2.5.60")
-macro_optional_find_package(Soprano ${SOPRANO_MIN_VERSION} COMPONENTS PLUGIN_RAPTORPARSER PLUGIN_REDLANDBACKEND)
+find_package(Soprano ${SOPRANO_MIN_VERSION} COMPONENTS PLUGIN_RAPTORPARSER PLUGIN_REDLANDBACKEND)
macro_log_feature(SOPRANO_FOUND "Soprano" "Support for the Nepomuk semantic desktop system" "http://soprano.sourceforge.net" FALSE "${SOPRANO_MIN_VERSION}" "")
macro_log_feature(SOPRANO_PLUGIN_RAPTORPARSER_FOUND "Soprano Raptor Parser" "Support for the Nepomuk semantic desktop system" "http://soprano.sourceforge.net" FALSE "" "")
macro_log_feature(SOPRANO_PLUGIN_REDLANDBACKEND_FOUND "Soprano Redland Backend" "Support for the Nepomuk semantic desktop system" "http://soprano.sourceforge.net" FALSE "" "")

set(SHAREDDESKTOPONTOLOGIES_MIN_VERSION 0.6.50)
-macro_optional_find_package(SharedDesktopOntologies ${SHAREDDESKTOPONTOLOGIES_MIN_VERSION})
+find_package(SharedDesktopOntologies ${SHAREDDESKTOPONTOLOGIES_MIN_VERSION})
macro_log_feature(SHAREDDESKTOPONTOLOGIES_FOUND "Shared desktop ontologies" "Support for the Nepomuk semantic desktop system" "http://oscaf.sourceforge.net" FALSE "${SHAREDDESKTOPONTOLOGIES_MIN_VERSION}" "")

-macro_optional_find_package(QCA2)
+find_package(QCA2)
macro_log_feature(QCA2_FOUND "QCA2" "Support for remote plasma widgets" "http://delta.affinix.com/qca" FALSE "2.0.0" "")

find_package(DBusMenuQt)
@@ -259,7 +259,7 @@ else(STATIC_LIBRARY)
endif(STATIC_LIBRARY)

# ACL stuff (used in kio/ and kioslaves/)
-macro_optional_find_package(ACL)
+find_package(ACL)
macro_bool_to_01(ACL_FOUND HAVE_LIBACL HAVE_POSIX_ACL)
macro_log_feature(ACL_FOUND "LibACL" "Support for manipulating access control lists" "ftp://oss.sgi.com/projects/xfs/cmd_tars" FALSE "" "STRONGLY RECOMMENDED")
configure_file(config-acl.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-acl.h )
diff --git a/dnssd/CMakeLists.txt b/dnssd/CMakeLists.txt
index 4a44acf..d0ab663 100644
--- a/dnssd/CMakeLists.txt
+++ b/dnssd/CMakeLists.txt
@@ -1,5 +1,5 @@
project(dnssd)
-macro_optional_find_package(Avahi)
+find_package(Avahi)
macro_bool_to_01(AVAHI_FOUND HAVE_AVAHI)
macro_log_feature(AVAHI_FOUND "Avahi" "Facilities for service discovery on a local network (DNSSD)" "http://avahi.org" FALSE "" "Either Avahi or DNSSD is required for KDE applications to make use of multicast DNS/DNS-SD service discovery")

@@ -33,7 +33,7 @@ if (HAVE_AVAHI)
qt4_add_dbus_interface (kdnssd_LIB_SRCS org.freedesktop.Avahi.ServiceTypeBrowser.xml avahi_servicetypebrowser_interface )
else (HAVE_AVAHI)

- macro_optional_find_package(DNSSD)
+ find_package(DNSSD)
macro_bool_to_01(DNSSD_FOUND HAVE_DNSSD)
macro_log_feature(DNSSD_FOUND "DNSSD" "Facilities for service discovery on a local network" "http://avahi.org" FALSE "" "Either Avahi or DNSSD is required for KDE applications to make use of multicast DNS/DNS-SD service discovery")

diff --git a/kdecore/CMakeLists.txt b/kdecore/CMakeLists.txt
index 22823f0..9fa56c5 100644
--- a/kdecore/CMakeLists.txt
+++ b/kdecore/CMakeLists.txt
@@ -10,7 +10,7 @@ configure_file(kdefakes.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/kdefakes.h )
configure_file(util/kdeversion.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/kdeversion.h )

# Configure checks for kdirwatch
-macro_optional_find_package(FAM)
+find_package(FAM)
macro_bool_to_01(FAM_FOUND HAVE_FAM)

check_include_files(sys/inotify.h SYS_INOTIFY_H_FOUND)
diff --git a/kdecore/auth/ConfigureChecks.cmake b/kdecore/auth/ConfigureChecks.cmake
index ff17ff0..1445aa0 100644
--- a/kdecore/auth/ConfigureChecks.cmake
+++ b/kdecore/auth/ConfigureChecks.cmake
@@ -14,14 +14,14 @@ if(NOT KAUTH_BACKEND)
if (APPLE)
set (KAUTH_BACKEND "OSX")
elseif (UNIX)
- macro_optional_find_package(PolkitQt-1 0.99.0)
+ find_package(PolkitQt-1 0.99.0)

if (POLKITQT-1_FOUND)
set (KAUTH_BACKEND "PolkitQt-1")
macro_log_feature(POLKITQT-1_FOUND "PolkitQt-1" "Support for executing priviledged actions in a controlled way (KAuth)" "http://techbase.kde.org/Polkit-Qt-1"
FALSE "" "STRONGLY RECOMMENDED")
else (POLKITQT-1_FOUND)
- macro_optional_find_package(PolkitQt)
+ find_package(PolkitQt)

if (POLKITQT_FOUND)
set (KAUTH_BACKEND "PolkitQt")
@@ -60,7 +60,7 @@ else(NOT KAUTH_BACKEND)
set (KAUTH_BACKEND "FAKE")
endif (KAUTH_BACKEND STREQUAL "OSX" AND NOT APPLE)
if (KAUTH_BACKEND STREQUAL "POLKITQT")
- macro_optional_find_package(PolkitQt)
+ find_package(PolkitQt)
macro_log_feature(POLKITQT_FOUND "PolkitQt" "Support for executing priviledged actions in a controlled way (KAuth)" "http://api.kde.org/polkit-qt"
FALSE "" "STRONGLY RECOMMENDED: Required to make KAuth work, and hence enable certain workspace functionalities")

@@ -71,7 +71,7 @@ else(NOT KAUTH_BACKEND)
endif (NOT POLKITQT_FOUND)
endif (KAUTH_BACKEND STREQUAL "POLKITQT")
if (KAUTH_BACKEND STREQUAL "POLKITQT-1")
- macro_optional_find_package(PolkitQt-1 0.99.0)
+ find_package(PolkitQt-1 0.99.0)
macro_log_feature(POLKITQT-1_FOUND "PolkitQt-1" "Support for executing priviledged actions in a controlled way (KAuth)" "http://techbase.kde.org/Polkit-Qt-1"
FALSE "" "STRONGLY RECOMMENDED: Required to make KAuth work, and hence enable certain workspace functionalities")

diff --git a/kimgio/CMakeLists.txt b/kimgio/CMakeLists.txt
index 546e2c1..f0a9074 100644
--- a/kimgio/CMakeLists.txt
+++ b/kimgio/CMakeLists.txt
@@ -1,9 +1,9 @@

project(kimgio)

-macro_optional_find_package(Jasper)
+find_package(Jasper)

-macro_optional_find_package(OpenEXR)
+find_package(OpenEXR)

include_directories( ${KDE4_KDEUI_INCLUDES} )

diff --git a/kioslave/http/CMakeLists.txt b/kioslave/http/CMakeLists.txt
index 53ed711..3851c7a 100644
--- a/kioslave/http/CMakeLists.txt
+++ b/kioslave/http/CMakeLists.txt
@@ -2,7 +2,7 @@
project(kioslave-http)

-macro_optional_find_package(GSSAPI)
+find_package(GSSAPI)
macro_log_feature(GSSAPI_FOUND "GSSAPI" "Allows KIO to make use of certain HTTP authentication services" "http://web.mit.edu/kerberos/www" FALSE "" "A MIT or HEIMDAL flavor of GSSAPI can be used")

if(GSSAPI_FOUND)
diff --git a/kjsembed/qtonly/CMakeLists.txt b/kjsembed/qtonly/CMakeLists.txt
index 8eb49a3..d466b98 100644
--- a/kjsembed/qtonly/CMakeLists.txt
+++ b/kjsembed/qtonly/CMakeLists.txt
@@ -78,11 +78,10 @@ include(KDE4Defaults)
# make some more macros available
include (MacroLibrary)

-# macro_optional_find_package() is the same as FIND_PACKAGE(<name>) but additionally creates an OPTION(WITH_<name>)
-# so the checking for the software can be disabled via ccmake or -DWITH_<name>=OFF
-macro_optional_find_package(BZip2)
-macro_optional_find_package(OpenSSL)
-macro_optional_find_package(Libintl)
+# The checking for the software can be disabled via ccmake or -DCMAKE_DISABLE_FIND_PACKAGE_<name>=ON
+find_package(BZip2)
+find_package(OpenSSL)
+find_package(Libintl)

add_definitions(${QT_DEFINITIONS})
@@ -101,7 +100,7 @@ set(KDE4_KJS_INCLUDES ${CMAKE_SOURCE_DIR}/kjs

# ACL stuff (used in kio/ and kioslaves/)
-macro_optional_find_package(ACL)
+find_package(ACL)
macro_bool_to_01(ACL_FOUND HAVE_LIBACL HAVE_POSIX_ACL)

include(${CMAKE_SOURCE_DIR}/../../ConfigureChecks.cmake)
diff --git a/plasma/CMakeLists.txt b/plasma/CMakeLists.txt
index 3c33189..a2470fa 100644
--- a/plasma/CMakeLists.txt
+++ b/plasma/CMakeLists.txt
@@ -63,7 +63,7 @@ endif(QCA2_FOUND)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-plasma.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-plasma.h)

#FIXME: gpgme++ is in kdepimlibs, must move somewhere else!
-macro_optional_find_package(KdepimLibs 4.5.60)
+find_package(KdepimLibs 4.5.60)
macro_log_feature(KDEPIMLIBS_FOUND "kdepimlibs" "KDE PIM libraries" "http://www.kde.org" FALSE "" "Needed for building several Plasma DataEngines")
include_directories(${KDEPIMLIBS_INCLUDE_DIRS})

diff --git a/solid/solid/CMakeLists.txt b/solid/solid/CMakeLists.txt
index 1a4adfa..067a076 100644
--- a/solid/solid/CMakeLists.txt
+++ b/solid/solid/CMakeLists.txt
@@ -133,7 +133,7 @@ set(solid_LIB_SRCS
)

if(NOT APPLE)
- macro_optional_find_package( HUpnp )
+ find_package( HUpnp )

if ( HUPNP_FOUND AND ((HUPNP_VERSION_MAJOR EQUAL 0 AND HUPNP_VERSION_MINOR EQUAL 9) OR (HUPNP_VERSION_MAJOR EQUAL 1)))
include_directories( ${HUPNP_INCLUDE_DIR} )
@@ -170,7 +170,7 @@ if(NOT WIN32 AND NOT APPLE)

# )

- macro_optional_find_package( UDev )
+ find_package( UDev )
macro_log_feature( UDEV_FOUND "UDev" "UDev support for Solid" "http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html" FALSE "" "Allows Solid to use UDev to provide information about devices on Linux" )
configure_file( config-solid.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-solid.h )

diff --git a/tier1/libkarchive/src/ConfigureChecks.cmake b/tier1/libkarchive/src/ConfigureChecks.cmake
index 9283864..893f8e4 100644
--- a/tier1/libkarchive/src/ConfigureChecks.cmake
+++ b/tier1/libkarchive/src/ConfigureChecks.cmake
@@ -1,4 +1,4 @@
-macro_optional_find_package(BZip2)
+find_package(BZip2)
set_package_properties(BZip2 PROPERTIES
URL "http://www.bzip.org"
DESCRIPTION "Support for BZip2 compressed files and data streams"
@@ -6,7 +6,7 @@ set_package_properties(BZip2 PROPERTIES
PURPOSE "Support for BZip2 compressed files and data streams"
)

-macro_optional_find_package(LibLZMA)
+find_package(LibLZMA)
set_package_properties(LibLZMA PROPERTIES
URL "http://tukaani.org/xz/"
DESCRIPTION "Support for xz compressed files and data streams"
diff --git a/tier2/sonnet/plugins/CMakeLists.txt b/tier2/sonnet/plugins/CMakeLists.txt
index ae0df4b..b6eaa3b 100644
--- a/tier2/sonnet/plugins/CMakeLists.txt
+++ b/tier2/sonnet/plugins/CMakeLists.txt
@@ -5,28 +5,28 @@ include_directories(
${KDE4_KDECORE_INCLUDES}
)

-# you can find macro_optional_find_package() in kdelibs/cmake/modules/OptionalFindPackage.cmake
+# you can find find_package() in kdelibs/cmake/modules/OptionalFindPackage.cmake
# it is the same as FIND_PACKAGE(<name>) but additionally creates an OPTION(WITH_<name>)
# so the checking for the software can be disabled via ccmake or -DWITH_<name>=OFF
-macro_optional_find_package(ASPELL)
+find_package(ASPELL)
macro_log_feature(ASPELL_FOUND "Aspell" "Spell checking support via Aspell" "http://aspell.net/" FALSE "" "This is not needed for spell checking if Enchant is provided or only Hebrew spell checking is required")
if (ASPELL_FOUND)
add_subdirectory( aspell )
endif (ASPELL_FOUND)

-macro_optional_find_package(HSPELL)
+find_package(HSPELL)
macro_log_feature(HSPELL_FOUND "HSpell" "Spell checking support for Hebrew" "http://ivrix.org.il/projects/spell-checker/" FALSE "" "Hebrew support can also be provided via Enchant, providing the correct Enchant backends are installed")
if (HSPELL_FOUND)
add_subdirectory( hspell )
endif (HSPELL_FOUND)

-macro_optional_find_package(ENCHANT)
+find_package(ENCHANT)
macro_log_feature(ENCHANT_FOUND "Enchant" "Spell checking support via Enchant" "http://www.abisource.com/projects/enchant/" FALSE "" "")
if (ENCHANT_FOUND)
add_subdirectory( enchant )
endif (ENCHANT_FOUND)

-#macro_optional_find_package(HUNSPELL)
+#find_package(HUNSPELL)
#macro_log_feature(HUNSPELL_FOUND "Hunspell" "Spell checking support via Hunspell" "http://hunspell.sourceforge.net/" FALSE "" "This is not needed for spell checking if Enchant or Aspell is provided or only Hebrew spell checking is required.")
#if (HUNSPELL_FOUND)
# add_subdirectory( hunspell )

[kdelibs/frameworks] khtml/rendering: Painting the background of LineEdit widget with css borders (!hasFrame()==true)

2011-08-20T12:46:00.000-07:00

Git commit dd030f60d7aad1ba0d9db1675a5845132ca0beb0 by Andrea Iacovitti.
Committed on 20/08/2011 at 21:39.
Pushed by aiacovitti into branch 'frameworks'.

Painting the background of LineEdit widget with css borders (!hasFrame()==true)
is already accomplished by khtml, so why redo in paintEvent?

BUG: 204826
FIXED-IN: 4.7.1
(cherry picked from commit 5bd5c1f781c3ffc6dcd6352429d1e33f8295db10)

M +1 -6 khtml/rendering/render_form.cpp

http://commits.kde.org/kdelibs/dd030f60d7aad1ba0d9db1675a5845132ca0beb0

diff --git a/khtml/rendering/render_form.cpp b/khtml/rendering/render_form.cpp
index a65a4863..845db1a 100644
--- a/khtml/rendering/render_form.cpp
+++ b/khtml/rendering/render_form.cpp
@@ -967,11 +967,6 @@ void LineEditWidget::clearHistoryActivated()

void LineEditWidget::paintEvent( QPaintEvent *pe )
{
- if (!hasFrame()) {
- QPainter p(this);
- p.fillRect(pe->rect(), palette().brush(QPalette::Base));
- p.end();
- }
KLineEdit::paintEvent( pe );
}

@@ -1050,7 +1045,7 @@ void RenderLineEdit::setStyle(RenderStyle* _style)

widget()->setAlignment(textAlignment());
bool showClearButton = (!shouldDisableNativeBorders() && !_style->hasBackgroundImage());
- static_cast<LineEditWidget*>(widget())->setClearButtonShown( showClearButton );
+ widget()->setClearButtonShown( showClearButton );
if (showClearButton) {
QObjectList children = widget()->children();
foreach (QObject* object, children) {

[kdelibs/KDE/4.7] khtml/rendering: Painting the background of LineEdit widget with css borders (!hasFrame()==true)

2011-08-20T12:44:00.001-07:00

Git commit 5bd5c1f781c3ffc6dcd6352429d1e33f8295db10 by Andrea Iacovitti.
Committed on 20/08/2011 at 21:39.
Pushed by aiacovitti into branch 'KDE/4.7'.

Painting the background of LineEdit widget with css borders (!hasFrame()==true)
is already accomplished by khtml, so why redo in paintEvent?

BUG: 204826
FIXED-IN: 4.7.1

M +1 -6 khtml/rendering/render_form.cpp

http://commits.kde.org/kdelibs/5bd5c1f781c3ffc6dcd6352429d1e33f8295db10

[kdelibs/frameworks] khtml/rendering: Unbreak completion on tab-out.

2011-08-18T12:32:00.000-07:00

Git commit 79bbca4aea5af9f0a73b8ff92c6a96c0ebc102af by Andrea Iacovitti.
Committed on 05/08/2011 at 21:45.
Pushed by aiacovitti into branch 'frameworks'.

Unbreak completion on tab-out.

KLineEdit no longer emits textEdited signal when scrolling completion
list (see commit 8db60a2f) then use textChanged as in the past.
BUG: 277457
FIXED-IN: 4.7.1
(cherry picked from commit 2a90109ab5ff7f53b4ed0555eef3e45428619f9b)

M +2 -1 khtml/rendering/render_form.h
M +7 -3 khtml/rendering/render_form.cpp

http://commits.kde.org/kdelibs/79bbca4aea5af9f0a73b8ff92c6a96c0ebc102af

diff --git a/khtml/rendering/render_form.cpp b/khtml/rendering/render_form.cpp
index 15e6efb..a65a4863 100644
--- a/khtml/rendering/render_form.cpp
+++ b/khtml/rendering/render_form.cpp
@@ -1012,11 +1012,11 @@ void LineEditWidget::mouseMoveEvent(QMouseEvent *e)
// -----------------------------------------------------------------------------

RenderLineEdit::RenderLineEdit(HTMLInputElementImpl *element)
- : RenderFormElement(element)
+ : RenderFormElement(element), m_blockElementUpdates(false)
{
LineEditWidget *edit = new LineEditWidget(element, view(), view()->widget());
connect(edit,SIGNAL(returnPressed()), this, SLOT(slotReturnPressed()));
- connect(edit,SIGNAL(textEdited(QString)),this,SLOT(slotTextEdited(QString)));
+ connect(edit,SIGNAL(textChanged(QString)),this,SLOT(slotTextChanged(QString)));

if(element->inputType() == HTMLInputElementImpl::PASSWORD)
edit->setEchoMode( QLineEdit::Password );
@@ -1142,9 +1142,11 @@ void RenderLineEdit::updateFromElement()
}

if (element()->value().string() != widget()->text()) {
+ m_blockElementUpdates = true; // Do not block signals here (#188374)
int pos = widget()->cursorPosition();
widget()->setText(element()->value().string());
widget()->setCursorPosition(pos);
+ m_blockElementUpdates = false;
}
widget()->setReadOnly(element()->readOnly());

@@ -1153,8 +1155,10 @@ void RenderLineEdit::updateFromElement()
RenderFormElement::updateFromElement();
}

-void RenderLineEdit::slotTextEdited(const QString &string)
+void RenderLineEdit::slotTextChanged(const QString &string)
{
+ if (m_blockElementUpdates) return;
+
// don't use setValue here!
element()->m_value = string;
element()->m_unsubmittedFormChange = true;
diff --git a/khtml/rendering/render_form.h b/khtml/rendering/render_form.h
index 1966910..2be4df5 100644
--- a/khtml/rendering/render_form.h
+++ b/khtml/rendering/render_form.h
@@ -282,12 +282,13 @@ public:
void setSelectionRange(long start, long end);
public Q_SLOTS:
void slotReturnPressed();
- void slotTextEdited(const QString &string);
+ void slotTextChanged(const QString &string);
protected:

private:
virtual bool isEditable() const { return true; }
virtual bool canHaveBorder() const { return true; }
+ bool m_blockElementUpdates;
};

// -------------------------------------------------------------------------

[kdelibs/frameworks] /: Build fix

2011-08-10T16:25:00.002-07:00

Git commit 47cbead099b81bf04a9491a1934776ba1598ac7b by Mario Bensi.
Committed on 11/08/2011 at 01:16.
Pushed by bensi into branch 'frameworks'.

Build fix

Add karchive missing include

M +1 -1 khtml/kmultipart/CMakeLists.txt
M +6 -1 kutils/CMakeLists.txt
M +4 -0 plasma/tests/CMakeLists.txt
M +1 -1 kioslave/http/CMakeLists.txt
M +5 -1 knewstuff/knewstuff2/CMakeLists.txt
M +4 -1 kdoctools/CMakeLists.txt

http://commits.kde.org/kdelibs/47cbead099b81bf04a9491a1934776ba1598ac7b

diff --git a/kdoctools/CMakeLists.txt b/kdoctools/CMakeLists.txt
index 3ec8d54..78b6842 100644
--- a/kdoctools/CMakeLists.txt
+++ b/kdoctools/CMakeLists.txt
@@ -8,7 +8,10 @@ macro_log_feature(LIBXML2_FOUND "LibXML2" "Required by the KDE help system to pr

macro_log_feature(LIBXML2_XMLLINT_EXECUTABLE "xmllint" "Required by the KDE help system to process DocBook XML" "http://xmlsoft.org" TRUE "" "")

-include_directories( ${KDE4_KIO_INCLUDES} )
+include_directories( ${KDE4_KIO_INCLUDES}
+ ${CMAKE_SOURCE_DIR}/tier1/libkarchive/src
+ ${CMAKE_BINARY_DIR}/tier1/libkarchive
+)
#include_directories( ${CMAKE_SOURCE_DIR}/kioslave ${CMAKE_SOURCE_DIR}/kioslave/bzip2 )

include_directories( ${LIBXML2_INCLUDE_DIR} ${LIBXSLT_INCLUDE_DIR} )
diff --git a/khtml/kmultipart/CMakeLists.txt b/khtml/kmultipart/CMakeLists.txt
index be20089..606f603 100644
--- a/khtml/kmultipart/CMakeLists.txt
+++ b/khtml/kmultipart/CMakeLists.txt
@@ -1,7 +1,7 @@

include_directories( ${CMAKE_SOURCE_DIR}/khtml
${CMAKE_SOURCE_DIR}/kio/httpfilter
- ${CMAKE_SOURCE_DIR}/tier1/libkarchive
+ ${CMAKE_SOURCE_DIR}/tier1/libkarchive/src
${CMAKE_BINARY_DIR}/tier1/libkarchive
)
include_directories(${ZLIB_INCLUDE_DIR})
diff --git a/kioslave/http/CMakeLists.txt b/kioslave/http/CMakeLists.txt
index 1b082e8..21bd6f5 100644
--- a/kioslave/http/CMakeLists.txt
+++ b/kioslave/http/CMakeLists.txt
@@ -27,7 +27,7 @@ include_directories( ${KDE4_KIO_INCLUDES}
${ZLIB_INCLUDE_DIR}
${CMAKE_SOURCE_DIR}/solid
${CMAKE_BINARY_DIR}/solid
- ${CMAKE_SOURCE_DIR}/tier1/libkarchive
+ ${CMAKE_SOURCE_DIR}/tier1/libkarchive/src
${CMAKE_BINARY_DIR}/tier1/libkarchive
)
include_directories( ${CMAKE_SOURCE_DIR}/interfaces ${CMAKE_SOURCE_DIR}/kio/httpfilter )
diff --git a/knewstuff/knewstuff2/CMakeLists.txt b/knewstuff/knewstuff2/CMakeLists.txt
index 069b677..a7a787d 100644
--- a/knewstuff/knewstuff2/CMakeLists.txt
+++ b/knewstuff/knewstuff2/CMakeLists.txt
@@ -2,7 +2,11 @@ project(knewstuff2)

add_definitions(-DKDE_DEFAULT_DEBUG_AREA=550)

-include_directories(${KDE4_KIO_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR}/..)
+include_directories(${KDE4_KIO_INCLUDES}
+ ${CMAKE_CURRENT_SOURCE_DIR}/..
+ ${CMAKE_SOURCE_DIR}/tier1/libkarchive/src
+ ${CMAKE_BINARY_DIR}/tier1/libkarchive
+)

set(knewstuff2_core_SRCS
core/ktranslatable.cpp
diff --git a/kutils/CMakeLists.txt b/kutils/CMakeLists.txt
index 85e82f1..54a884f 100644
--- a/kutils/CMakeLists.txt
+++ b/kutils/CMakeLists.txt
@@ -1,5 +1,10 @@
project(kutils)
-include_directories( ${KDE4_KDEUI_INCLUDES} ${KDE4_KPARTS_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR})
+include_directories( ${KDE4_KDEUI_INCLUDES}
+ ${KDE4_KPARTS_INCLUDES}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_SOURCE_DIR}/tier1/libkarchive/src
+ ${CMAKE_BINARY_DIR}/tier1/libkarchive
+)

########### kemoticons ################
add_subdirectory(kemoticons)
diff --git a/plasma/tests/CMakeLists.txt b/plasma/tests/CMakeLists.txt
index 1d04aa5..28a0c64 100644
--- a/plasma/tests/CMakeLists.txt
+++ b/plasma/tests/CMakeLists.txt
@@ -1,5 +1,9 @@
set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})

+include_directories ( ${CMAKE_SOURCE_DIR}/tier1/libkarchive/src
+ ${CMAKE_BINARY_DIR}/tier1/libkarchive
+)
+
MACRO(PLASMA_UNIT_TESTS)
FOREACH(_testname ${ARGN})
kde4_add_unit_test(${_testname} TESTNAME plasma-${_testname} ${_testname}.cpp)

[kdelibs/frameworks] khtml: Build Fix

2011-08-10T16:25:00.001-07:00

Git commit 0b78e302d9e5d21941a0312fdc57492e067e4dda by Mario Bensi.
Committed on 11/08/2011 at 01:14.
Pushed by bensi into branch 'frameworks'.

Build Fix

Add Sonnet missing includes and library

M +2 -1 khtml/CMakeLists.txt

http://commits.kde.org/kdelibs/0b78e302d9e5d21941a0312fdc57492e067e4dda

diff --git a/khtml/CMakeLists.txt b/khtml/CMakeLists.txt
index 79c09e8..dba6d40 100644
--- a/khtml/CMakeLists.txt
+++ b/khtml/CMakeLists.txt
@@ -441,6 +441,7 @@ add_subdirectory( ecma )
include_directories( ${KDE4_PHONON_INCLUDES} ${KDE4_KPARTS_INCLUDES} )
include_directories( ${CMAKE_BINARY_DIR}/kio/kssl )
include_directories( ${KDE4_KJS_INCLUDES} ${CMAKE_SOURCE_DIR}/kimgio ${CMAKE_SOURCE_DIR}/kio/kssl ${CMAKE_SOURCE_DIR}/interfaces ${CMAKE_SOURCE_DIR}/interfaces/kregexpeditor)
+include_directories( ${CMAKE_SOURCE_DIR}/tier2/sonnet ${CMAKE_SOURCE_DIR}/tier2/sonnet/core ${CMAKE_BINARY_DIR}/tier2/sonnet/core )

include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/misc
@@ -536,7 +537,7 @@ kde4_add_ui_files(khtml_LIB_SRCS kjserrordlgbase.ui htmlpageinfo.ui )

kde4_add_library(khtml ${LIBRARY_TYPE} ${khtml_LIB_SRCS})

-target_link_libraries(khtml ${KDE4_PHONON_LIBRARY} ${KDE4_KPARTS_LIBS} ktexteditor kjs karchive ${JPEG_LIBRARIES} ${GIF_LIBRARIES} ${PNG_LIBRARIES} ${X11_LIBRARIES})
+target_link_libraries(khtml ${KDE4_PHONON_LIBRARY} ${KDE4_KPARTS_LIBS} ktexteditor kjs karchive sonnetcore ${JPEG_LIBRARIES} ${GIF_LIBRARIES} ${PNG_LIBRARIES} ${X11_LIBRARIES})
target_link_libraries(khtml LINK_INTERFACE_LIBRARIES ${KDE4_PHONON_LIBRARY} kparts kjs kio kdeui kdecore ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} )

set_target_properties(khtml PROPERTIES VERSION ${KDE_NON_GENERIC_LIB_VERSION}

[kdelibs/frameworks] /: Add some consistency to the naming of the new libraries

2011-08-10T06:11:00.000-07:00

Git commit 481ca6c25be6106be3acba2cce02cf23b3b40e79 by Kevin Ottens.
Committed on 10/08/2011 at 15:12.
Pushed by ervin into branch 'frameworks'.

Add some consistency to the naming of the new libraries

R +0 -0 tier1/libkarchive/kxzfilter.h [from: tier1/karchive/kxzfilter.h - 100% similarity]
R +0 -0 tier1/libkplotting/README [from: tier1/plotting/README - 100% similarity]
R +0 -0 tier1/libkarchive/klimitediodevice_p.h [from: tier1/karchive/klimitediodevice_p.h - 100% similarity]
M +2 -2 tier1/CMakeLists.txt
R +0 -0 tier1/libkarchive/klimitediodevice.cpp [from: tier1/karchive/klimitediodevice.cpp - 100% similarity]
R +0 -0 tier1/libkarchive/kfilterbase.h [from: tier1/karchive/kfilterbase.h - 100% similarity]
R +0 -0 tier1/libkplotting/kplotobject.cpp [from: tier1/plotting/kplotobject.cpp - 100% similarity]
R +0 -0 tier1/libkarchive/tests/karchivetest.cpp [from: tier1/karchive/tests/karchivetest.cpp - 100% similarity]
R +0 -0 tier1/libkarchive/CMakeLists.txt [from: tier1/karchive/CMakeLists.txt - 100% similarity]
R +0 -0 tier1/libkarchive/tests/karchivetest.h [from: tier1/karchive/tests/karchivetest.h - 100% similarity]
R +0 -0 tier1/libkarchive/karchive.cpp [from: tier1/karchive/karchive.cpp - 100% similarity]
R +0 -0 tier1/libkplotting/tests/testplot_widget.h [from: tier1/plotting/tests/testplot_widget.h - 100% similarity]
R +0 -0 tier1/libkarchive/kar.cpp [from: tier1/karchive/kar.cpp - 100% similarity]
R +0 -0 tier1/libkarchive/tests/klimitediodevicetest.cpp [from: tier1/karchive/tests/klimitediodevicetest.cpp - 100% similarity]
R +0 -0 tier1/libkarchive/kbzip2filter.cpp [from: tier1/karchive/kbzip2filter.cpp - 100% similarity]
R +0 -0 tier1/libkarchive/ktar.h [from: tier1/karchive/ktar.h - 100% similarity]
R +0 -0 tier1/libkarchive/config-compression.h.cmake [from: tier1/karchive/config-compression.h.cmake - 100% similarity]
R +0 -0 tier1/libkarchive/ConfigureChecks.cmake [from: tier1/karchive/ConfigureChecks.cmake - 100% similarity]
R +0 -0 tier1/libkplotting/kplotaxis.h [from: tier1/plotting/kplotaxis.h - 100% similarity]
R +0 -0 tier1/libkarchive/ktar.cpp [from: tier1/karchive/ktar.cpp - 100% similarity]
R +0 -0 tier1/libkarchive/kbzip2filter.h [from: tier1/karchive/kbzip2filter.h - 100% similarity]
R +0 -0 tier1/libkplotting/kplotpoint.cpp [from: tier1/plotting/kplotpoint.cpp - 100% similarity]
R +0 -0 tier1/libkarchive/kzip.cpp [from: tier1/karchive/kzip.cpp - 100% similarity]
R +0 -0 tier1/libkplotting/CMakeLists.txt [from: tier1/plotting/CMakeLists.txt - 100% similarity]
R +0 -0 tier1/libkarchive/karchive.h [from: tier1/karchive/karchive.h - 100% similarity]
R +0 -0 tier1/libkplotting/kplotpoint.h [from: tier1/plotting/kplotpoint.h - 100% similarity]
R +0 -0 tier1/libkarchive/kxzfilter.cpp [from: tier1/karchive/kxzfilter.cpp - 100% similarity]
R +0 -0 tier1/libkplotting/tests/testplot_widget.cpp [from: tier1/plotting/tests/testplot_widget.cpp - 100% similarity]
R +0 -0 tier1/libkarchive/tests/kfiltertest.cpp [from: tier1/karchive/tests/kfiltertest.cpp - 100% similarity]
R +0 -0 tier1/libkarchive/kzip.h [from: tier1/karchive/kzip.h - 100% similarity]
M +2 -2 khtml/kmultipart/CMakeLists.txt
R +0 -0 tier1/libkarchive/tests/ktartest.cpp [from: tier1/karchive/tests/ktartest.cpp - 100% similarity]
R +0 -0 tier1/libkarchive/kgzipfilter.h [from: tier1/karchive/kgzipfilter.h - 100% similarity]
R +0 -0 tier1/libkplotting/kplotwidget.cpp [from: tier1/plotting/kplotwidget.cpp - 100% similarity]
R +0 -0 tier1/libkarchive/tests/kziptest.cpp [from: tier1/karchive/tests/kziptest.cpp - 100% similarity]
R +0 -0 tier1/libkplotting/tests/CMakeLists.txt [from: tier1/plotting/tests/CMakeLists.txt - 100% similarity]
R +0 -0 tier1/libkarchive/kfilterdev.h [from: tier1/karchive/kfilterdev.h - 100% similarity]
R +0 -0 tier1/libkplotting/kplotobject.h [from: tier1/plotting/kplotobject.h - 100% similarity]
M +2 -2 kioslave/http/CMakeLists.txt
R +0 -0 tier1/libkarchive/kgzipfilter.cpp [from: tier1/karchive/kgzipfilter.cpp - 100% similarity]
R +0 -0 tier1/libkplotting/kplotaxis.cpp [from: tier1/plotting/kplotaxis.cpp - 100% similarity]
R +0 -0 tier1/libkarchive/tests/CMakeLists.txt [from: tier1/karchive/tests/CMakeLists.txt - 100% similarity]
R +0 -0 tier1/libkarchive/tests/kfiltertest.h [from: tier1/karchive/tests/kfiltertest.h - 100% similarity]
R +0 -0 tier1/libkarchive/kar.h [from: tier1/karchive/kar.h - 100% similarity]
R +0 -0 tier1/libkarchive/kfilterdev.cpp [from: tier1/karchive/kfilterdev.cpp - 100% similarity]
R +0 -0 tier1/libkarchive/kfilterbase.cpp [from: tier1/karchive/kfilterbase.cpp - 100% similarity]
R +0 -0 tier1/libkarchive/tests/klimitediodevicetest.h [from: tier1/karchive/tests/klimitediodevicetest.h - 100% similarity]
R +0 -0 tier1/libkplotting/kplotwidget.h [from: tier1/plotting/kplotwidget.h - 100% similarity]
R +0 -0 tier1/libkplotting/tests/testplot_main.cpp [from: tier1/plotting/tests/testplot_main.cpp - 100% similarity]

http://commits.kde.org/kdelibs/481ca6c25be6106be3acba2cce02cf23b3b40e79

diff --git a/khtml/kmultipart/CMakeLists.txt b/khtml/kmultipart/CMakeLists.txt
index a326613..be20089 100644
--- a/khtml/kmultipart/CMakeLists.txt
+++ b/khtml/kmultipart/CMakeLists.txt
@@ -1,8 +1,8 @@

include_directories( ${CMAKE_SOURCE_DIR}/khtml
${CMAKE_SOURCE_DIR}/kio/httpfilter
- ${CMAKE_SOURCE_DIR}/tier1/karchive
- ${CMAKE_BINARY_DIR}/tier1/karchive
+ ${CMAKE_SOURCE_DIR}/tier1/libkarchive
+ ${CMAKE_BINARY_DIR}/tier1/libkarchive
)
include_directories(${ZLIB_INCLUDE_DIR})

diff --git a/kioslave/http/CMakeLists.txt b/kioslave/http/CMakeLists.txt
index b2f7b52..1b082e8 100644
--- a/kioslave/http/CMakeLists.txt
+++ b/kioslave/http/CMakeLists.txt
@@ -27,8 +27,8 @@ include_directories( ${KDE4_KIO_INCLUDES}
${ZLIB_INCLUDE_DIR}
${CMAKE_SOURCE_DIR}/solid
${CMAKE_BINARY_DIR}/solid
- ${CMAKE_SOURCE_DIR}/tier1/karchive
- ${CMAKE_BINARY_DIR}/tier1/karchive
+ ${CMAKE_SOURCE_DIR}/tier1/libkarchive
+ ${CMAKE_BINARY_DIR}/tier1/libkarchive
)
include_directories( ${CMAKE_SOURCE_DIR}/interfaces ${CMAKE_SOURCE_DIR}/kio/httpfilter )

diff --git a/tier1/CMakeLists.txt b/tier1/CMakeLists.txt
index bc552cb..4d175697 100644
--- a/tier1/CMakeLists.txt
+++ b/tier1/CMakeLists.txt
@@ -1,7 +1,7 @@
project(tier1)

add_subdirectory(itemmodels)
-add_subdirectory(karchive)
+add_subdirectory(libkarchive)
add_subdirectory(libkdbus)
-add_subdirectory(plotting)
+add_subdirectory(libkplotting)

diff --git a/tier1/karchive/CMakeLists.txt b/tier1/libkarchive/CMakeLists.txt
similarity index 100%
rename from tier1/karchive/CMakeLists.txt
rename to tier1/libkarchive/CMakeLists.txt
diff --git a/tier1/karchive/ConfigureChecks.cmake b/tier1/libkarchive/ConfigureChecks.cmake
similarity index 100%
rename from tier1/karchive/ConfigureChecks.cmake
rename to tier1/libkarchive/ConfigureChecks.cmake
diff --git a/tier1/karchive/config-compression.h.cmake b/tier1/libkarchive/config-compression.h.cmake
similarity index 100%
rename from tier1/karchive/config-compression.h.cmake
rename to tier1/libkarchive/config-compression.h.cmake
diff --git a/tier1/karchive/kar.cpp b/tier1/libkarchive/kar.cpp
similarity index 100%
rename from tier1/karchive/kar.cpp
rename to tier1/libkarchive/kar.cpp
diff --git a/tier1/karchive/kar.h b/tier1/libkarchive/kar.h
similarity index 100%
rename from tier1/karchive/kar.h
rename to tier1/libkarchive/kar.h
diff --git a/tier1/karchive/karchive.cpp b/tier1/libkarchive/karchive.cpp
similarity index 100%
rename from tier1/karchive/karchive.cpp
rename to tier1/libkarchive/karchive.cpp
diff --git a/tier1/karchive/karchive.h b/tier1/libkarchive/karchive.h
similarity index 100%
rename from tier1/karchive/karchive.h
rename to tier1/libkarchive/karchive.h
diff --git a/tier1/karchive/kbzip2filter.cpp b/tier1/libkarchive/kbzip2filter.cpp
similarity index 100%
rename from tier1/karchive/kbzip2filter.cpp
rename to tier1/libkarchive/kbzip2filter.cpp
diff --git a/tier1/karchive/kbzip2filter.h b/tier1/libkarchive/kbzip2filter.h
similarity index 100%
rename from tier1/karchive/kbzip2filter.h
rename to tier1/libkarchive/kbzip2filter.h
diff --git a/tier1/karchive/kfilterbase.cpp b/tier1/libkarchive/kfilterbase.cpp
similarity index 100%
rename from tier1/karchive/kfilterbase.cpp
rename to tier1/libkarchive/kfilterbase.cpp
diff --git a/tier1/karchive/kfilterbase.h b/tier1/libkarchive/kfilterbase.h
similarity index 100%
rename from tier1/karchive/kfilterbase.h
rename to tier1/libkarchive/kfilterbase.h
diff --git a/tier1/karchive/kfilterdev.cpp b/tier1/libkarchive/kfilterdev.cpp
similarity index 100%
rename from tier1/karchive/kfilterdev.cpp
rename to tier1/libkarchive/kfilterdev.cpp
diff --git a/tier1/karchive/kfilterdev.h b/tier1/libkarchive/kfilterdev.h
similarity index 100%
rename from tier1/karchive/kfilterdev.h
rename to tier1/libkarchive/kfilterdev.h
diff --git a/tier1/karchive/kgzipfilter.cpp b/tier1/libkarchive/kgzipfilter.cpp
similarity index 100%
rename from tier1/karchive/kgzipfilter.cpp
rename to tier1/libkarchive/kgzipfilter.cpp
diff --git a/tier1/karchive/kgzipfilter.h b/tier1/libkarchive/kgzipfilter.h
similarity index 100%
rename from tier1/karchive/kgzipfilter.h
rename to tier1/libkarchive/kgzipfilter.h
diff --git a/tier1/karchive/klimitediodevice.cpp b/tier1/libkarchive/klimitediodevice.cpp
similarity index 100%
rename from tier1/karchive/klimitediodevice.cpp
rename to tier1/libkarchive/klimitediodevice.cpp
diff --git a/tier1/karchive/klimitediodevice_p.h b/tier1/libkarchive/klimitediodevice_p.h
similarity index 100%
rename from tier1/karchive/klimitediodevice_p.h
rename to tier1/libkarchive/klimitediodevice_p.h
diff --git a/tier1/karchive/ktar.cpp b/tier1/libkarchive/ktar.cpp
similarity index 100%
rename from tier1/karchive/ktar.cpp
rename to tier1/libkarchive/ktar.cpp
diff --git a/tier1/karchive/ktar.h b/tier1/libkarchive/ktar.h
similarity index 100%
rename from tier1/karchive/ktar.h
rename to tier1/libkarchive/ktar.h
diff --git a/tier1/karchive/kxzfilter.cpp b/tier1/libkarchive/kxzfilter.cpp
similarity index 100%
rename from tier1/karchive/kxzfilter.cpp
rename to tier1/libkarchive/kxzfilter.cpp
diff --git a/tier1/karchive/kxzfilter.h b/tier1/libkarchive/kxzfilter.h
similarity index 100%
rename from tier1/karchive/kxzfilter.h
rename to tier1/libkarchive/kxzfilter.h
diff --git a/tier1/karchive/kzip.cpp b/tier1/libkarchive/kzip.cpp
similarity index 100%
rename from tier1/karchive/kzip.cpp
rename to tier1/libkarchive/kzip.cpp
diff --git a/tier1/karchive/kzip.h b/tier1/libkarchive/kzip.h
similarity index 100%
rename from tier1/karchive/kzip.h
rename to tier1/libkarchive/kzip.h
diff --git a/tier1/karchive/tests/CMakeLists.txt b/tier1/libkarchive/tests/CMakeLists.txt
similarity index 100%
rename from tier1/karchive/tests/CMakeLists.txt
rename to tier1/libkarchive/tests/CMakeLists.txt
diff --git a/tier1/karchive/tests/karchivetest.cpp b/tier1/libkarchive/tests/karchivetest.cpp
similarity index 100%
rename from tier1/karchive/tests/karchivetest.cpp
rename to tier1/libkarchive/tests/karchivetest.cpp
diff --git a/tier1/karchive/tests/karchivetest.h b/tier1/libkarchive/tests/karchivetest.h
similarity index 100%
rename from tier1/karchive/tests/karchivetest.h
rename to tier1/libkarchive/tests/karchivetest.h
diff --git a/tier1/karchive/tests/kfiltertest.cpp b/tier1/libkarchive/tests/kfiltertest.cpp
similarity index 100%
rename from tier1/karchive/tests/kfiltertest.cpp
rename to tier1/libkarchive/tests/kfiltertest.cpp
diff --git a/tier1/karchive/tests/kfiltertest.h b/tier1/libkarchive/tests/kfiltertest.h
similarity index 100%
rename from tier1/karchive/tests/kfiltertest.h
rename to tier1/libkarchive/tests/kfiltertest.h
diff --git a/tier1/karchive/tests/klimitediodevicetest.cpp b/tier1/libkarchive/tests/klimitediodevicetest.cpp
similarity index 100%
rename from tier1/karchive/tests/klimitediodevicetest.cpp
rename to tier1/libkarchive/tests/klimitediodevicetest.cpp
diff --git a/tier1/karchive/tests/klimitediodevicetest.h b/tier1/libkarchive/tests/klimitediodevicetest.h
similarity index 100%
rename from tier1/karchive/tests/klimitediodevicetest.h
rename to tier1/libkarchive/tests/klimitediodevicetest.h
diff --git a/tier1/karchive/tests/ktartest.cpp b/tier1/libkarchive/tests/ktartest.cpp
similarity index 100%
rename from tier1/karchive/tests/ktartest.cpp
rename to tier1/libkarchive/tests/ktartest.cpp
diff --git a/tier1/karchive/tests/kziptest.cpp b/tier1/libkarchive/tests/kziptest.cpp
similarity index 100%
rename from tier1/karchive/tests/kziptest.cpp
rename to tier1/libkarchive/tests/kziptest.cpp
diff --git a/tier1/plotting/CMakeLists.txt b/tier1/libkplotting/CMakeLists.txt
similarity index 100%
rename from tier1/plotting/CMakeLists.txt
rename to tier1/libkplotting/CMakeLists.txt
diff --git a/tier1/plotting/README b/tier1/libkplotting/README
similarity index 100%
rename from tier1/plotting/README
rename to tier1/libkplotting/README
diff --git a/tier1/plotting/kplotaxis.cpp b/tier1/libkplotting/kplotaxis.cpp
similarity index 100%
rename from tier1/plotting/kplotaxis.cpp
rename to tier1/libkplotting/kplotaxis.cpp
diff --git a/tier1/plotting/kplotaxis.h b/tier1/libkplotting/kplotaxis.h
similarity index 100%
rename from tier1/plotting/kplotaxis.h
rename to tier1/libkplotting/kplotaxis.h
diff --git a/tier1/plotting/kplotobject.cpp b/tier1/libkplotting/kplotobject.cpp
similarity index 100%
rename from tier1/plotting/kplotobject.cpp
rename to tier1/libkplotting/kplotobject.cpp
diff --git a/tier1/plotting/kplotobject.h b/tier1/libkplotting/kplotobject.h
similarity index 100%
rename from tier1/plotting/kplotobject.h
rename to tier1/libkplotting/kplotobject.h
diff --git a/tier1/plotting/kplotpoint.cpp b/tier1/libkplotting/kplotpoint.cpp
similarity index 100%
rename from tier1/plotting/kplotpoint.cpp
rename to tier1/libkplotting/kplotpoint.cpp
diff --git a/tier1/plotting/kplotpoint.h b/tier1/libkplotting/kplotpoint.h
similarity index 100%
rename from tier1/plotting/kplotpoint.h
rename to tier1/libkplotting/kplotpoint.h
diff --git a/tier1/plotting/kplotwidget.cpp b/tier1/libkplotting/kplotwidget.cpp
similarity index 100%
rename from tier1/plotting/kplotwidget.cpp
rename to tier1/libkplotting/kplotwidget.cpp
diff --git a/tier1/plotting/kplotwidget.h b/tier1/libkplotting/kplotwidget.h
similarity index 100%
rename from tier1/plotting/kplotwidget.h
rename to tier1/libkplotting/kplotwidget.h
diff --git a/tier1/plotting/tests/CMakeLists.txt b/tier1/libkplotting/tests/CMakeLists.txt
similarity index 100%
rename from tier1/plotting/tests/CMakeLists.txt
rename to tier1/libkplotting/tests/CMakeLists.txt
diff --git a/tier1/plotting/tests/testplot_main.cpp b/tier1/libkplotting/tests/testplot_main.cpp
similarity index 100%
rename from tier1/plotting/tests/testplot_main.cpp
rename to tier1/libkplotting/tests/testplot_main.cpp
diff --git a/tier1/plotting/tests/testplot_widget.cpp b/tier1/libkplotting/tests/testplot_widget.cpp
similarity index 100%
rename from tier1/plotting/tests/testplot_widget.cpp
rename to tier1/libkplotting/tests/testplot_widget.cpp
diff --git a/tier1/plotting/tests/testplot_widget.h b/tier1/libkplotting/tests/testplot_widget.h
similarity index 100%
rename from tier1/plotting/tests/testplot_widget.h
rename to tier1/libkplotting/tests/testplot_widget.h

[kdelibs/frameworks] /: Move KArchive in a library

2011-08-09T15:46:00.000-07:00

Git commit 9afb1ae5b24d496ddba82a18fbe9ab54233394c6 by Mario Bensi.
Committed on 09/08/2011 at 17:26.
Pushed by bensi into branch 'frameworks'.

Move KArchive in a library

Move the base class for the view state maintenance to the karchive
library.

R +11 -11 tier1/karchive/kxzfilter.cpp [from: kdecore/compression/kxzfilter.cpp - 080% similarity]
R +0 -0 tier1/karchive/tests/klimitediodevicetest.h [from: kdecore/tests/klimitediodevicetest.h - 100% similarity]
R +0 -0 tier1/karchive/karchive.h [from: kdecore/io/karchive.h - 100% similarity]
R +29 -28 tier1/karchive/ktar.cpp [from: kdecore/io/ktar.cpp - 093% similarity]
A +64 -0 tier1/karchive/CMakeLists.txt
D +0 -55 kdecore/compression/karchive_export.h
R +28 -27 tier1/karchive/karchive.cpp [from: kdecore/io/karchive.cpp - 093% similarity]
R +0 -0 tier1/karchive/kar.h [from: kdecore/io/kar.h - 100% similarity]
M +1 -1 plasma/CMakeLists.txt
M +1 -1 knewstuff/knewstuff3/CMakeLists.txt
A +46 -0 tier1/karchive/tests/CMakeLists.txt
R +8 -8 tier1/karchive/kbzip2filter.cpp [from: kdecore/compression/kbzip2filter.cpp - 087% similarity]
R +93 -92 tier1/karchive/kzip.cpp [from: kdecore/io/kzip.cpp - 087% similarity]
R +0 -0 tier1/karchive/config-compression.h.cmake [from: kdecore/compression/config-compression.h.cmake - 100% similarity]
R +2 -2 tier1/karchive/tests/klimitediodevicetest.cpp [from: kdecore/tests/klimitediodevicetest.cpp - 097% similarity]
M +0 -18 kdecore/tests/CMakeLists.txt
R +25 -23 tier1/karchive/kfilterdev.cpp [from: kdecore/compression/kfilterdev.cpp - 085% similarity]
R +4 -4 tier1/karchive/klimitediodevice.cpp [from: kdecore/io/klimitediodevice.cpp - 091% similarity]
R +0 -0 tier1/karchive/kfilterdev.h [from: kdecore/compression/kfilterdev.h - 100% similarity]
R +1 -1 tier1/karchive/kfilterbase.h [from: kdecore/compression/kfilterbase.h - 098% similarity]
R +0 -0 tier1/karchive/kbzip2filter.h [from: kdecore/compression/kbzip2filter.h - 100% similarity]
R +13 -12 tier1/karchive/kgzipfilter.cpp [from: kdecore/compression/kgzipfilter.cpp - 092% similarity]
R +0 -0 tier1/karchive/kxzfilter.h [from: kdecore/compression/kxzfilter.h - 100% similarity]
R +7 -7 tier1/karchive/tests/karchivetest.cpp [from: kdecore/tests/karchivetest.cpp - 098% similarity]
R +0 -0 tier1/karchive/kzip.h [from: kdecore/io/kzip.h - 100% similarity]
M +9 -4 kioslave/http/CMakeLists.txt
R +0 -0 tier1/karchive/ConfigureChecks.cmake [from: kdecore/compression/ConfigureChecks.cmake - 100% similarity]
R +0 -0 tier1/karchive/ktar.h [from: kdecore/io/ktar.h - 100% similarity]
M +0 -34 kdecore/CMakeLists.txt
R +1 -1 tier1/karchive/tests/ktartest.cpp [from: kdecore/tests/ktartest.cpp - 098% similarity]
M +1 -1 khtml/CMakeLists.txt
R +11 -11 tier1/karchive/kar.cpp [from: kdecore/io/kar.cpp - 089% similarity]
M +6 -2 khtml/kmultipart/CMakeLists.txt
R +0 -0 tier1/karchive/tests/kfiltertest.h [from: kdecore/tests/kfiltertest.h - 100% similarity]
R +0 -0 tier1/karchive/kfilterbase.cpp [from: kdecore/compression/kfilterbase.cpp - 100% similarity]
R +25 -25 tier1/karchive/tests/kfiltertest.cpp [from: kdecore/tests/kfiltertest.cpp - 092% similarity]
M +1 -1 kutils/CMakeLists.txt
R +1 -1 tier1/karchive/klimitediodevice_p.h [from: kdecore/io/klimitediodevice_p.h - 098% similarity]
R +0 -0 tier1/karchive/tests/karchivetest.h [from: kdecore/tests/karchivetest.h - 100% similarity]
M +1 -0 tier1/CMakeLists.txt
R +5 -5 tier1/karchive/tests/kziptest.cpp [from: kdecore/tests/kziptest.cpp - 097% similarity]
M +1 -1 knewstuff/knewstuff2/CMakeLists.txt
M +3 -3 kdoctools/CMakeLists.txt
R +0 -0 tier1/karchive/kgzipfilter.h [from: kdecore/compression/kgzipfilter.h - 100% similarity]

http://commits.kde.org/kdelibs/9afb1ae5b24d496ddba82a18fbe9ab54233394c6

diff --git a/kdecore/CMakeLists.txt b/kdecore/CMakeLists.txt
index 029f408..8b6dead 100644
--- a/kdecore/CMakeLists.txt
+++ b/kdecore/CMakeLists.txt
@@ -30,11 +30,6 @@ include(date/ConfigureChecks.cmake)
configure_file(date/config-date.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/date/config-date.h)
include_directories( ${CMAKE_CURRENT_BINARY_DIR}/date )

-# Configure checks for compression/
-include(compression/ConfigureChecks.cmake)
-configure_file(compression/config-compression.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/compression/config-compression.h)
-include_directories( ${CMAKE_CURRENT_BINARY_DIR}/compression )
-
# This file handles all the logic for compiling KAuth's backends
include(auth/ConfigureChecks.cmake)
include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/auth/ )
@@ -78,20 +73,6 @@ if(KDE4_BUILD_TESTS)
add_definitions(-DCOMPILING_TESTS)
endif(KDE4_BUILD_TESTS)

-# compile bzip2 support if available
-if(BZIP2_FOUND)
- include_directories(${BZIP2_INCLUDE_DIR})
- set(kdecore_OPTIONAL_SRCS ${kdecore_OPTIONAL_SRCS} compression/kbzip2filter.cpp )
- set(kdecore_OPTIONAL_LIBS ${kdecore_OPTIONAL_LIBS} ${BZIP2_LIBRARIES})
-endif(BZIP2_FOUND)
-
-# compile lzma support if available
-if(LIBLZMA_FOUND)
- include_directories(${LIBLZMA_INCLUDE_DIRS})
- set(kdecore_OPTIONAL_SRCS ${kdecore_OPTIONAL_SRCS} compression/kxzfilter.cpp )
- set(kdecore_OPTIONAL_LIBS ${kdecore_OPTIONAL_LIBS} ${LIBLZMA_LIBRARIES})
-endif(LIBLZMA_FOUND)
-
# compile Gettext support if available
if(LIBINTL_FOUND)
include_directories(${LIBINTL_INCLUDE_DIR})
@@ -187,9 +168,6 @@ endif (UNIX)
########### next target ###############

set(kdecore_LIB_SRCS
- compression/kgzipfilter.cpp
- compression/kfilterbase.cpp
- compression/kfilterdev.cpp
config/kconfig.cpp
config/kconfigbase.cpp
config/kconfiggroup.cpp
@@ -220,23 +198,18 @@ set(kdecore_LIB_SRCS
date/ktimezone.cpp
date/ksystemtimezone.cpp
date/ktzfiletimezone.cpp
- io/kar.cpp
- io/karchive.cpp
io/kautosavefile.cpp
io/kdebug.cpp
io/kdebugdbusiface.cpp
io/kdirwatch.cpp
io/kfilesystemtype_p.cpp
- io/klimitediodevice.cpp
io/kmessage.cpp
io/kmountpoint.cpp
io/kprocess.cpp
io/ksavefile.cpp
- io/ktar.cpp
io/ktempdir.cpp
io/ktemporaryfile.cpp
io/kurl.cpp
- io/kzip.cpp
jobs/kcompositejob.cpp
jobs/kjob.cpp
jobs/kjobuidelegate.cpp
@@ -535,9 +508,6 @@ install( FILES localization/entry.desktop DESTINATION ${LOCALE_INSTALL_DIR}/en
install( FILES kdebug.areas kdebugrc DESTINATION ${CONFIG_INSTALL_DIR} )
install( FILES
kdecore_export.h
- compression/kfilterbase.h
- compression/karchive_export.h
- compression/kfilterdev.h
config/conversion_check.h
config/kconfig.h
#config/kconfigbackend.h re-enable post-API review and implementation (4.2?)
@@ -552,8 +522,6 @@ install( FILES
date/ksystemtimezone.h
date/ktimezone.h
date/ktzfiletimezone.h
- io/kar.h
- io/karchive.h
io/kautosavefile.h
io/kdebug.h
io/kdirwatch.h
@@ -562,11 +530,9 @@ install( FILES
io/klockfile.h
io/kmountpoint.h
io/ksavefile.h
- io/ktar.h
io/ktempdir.h
io/ktemporaryfile.h
io/kurl.h
- io/kzip.h
jobs/kcompositejob.h
jobs/kjob.h
jobs/kjobuidelegate.h
diff --git a/kdecore/compression/karchive_export.h b/kdecore/compression/karchive_export.h
deleted file mode 100644
index 621c269..0000000
--- a/kdecore/compression/karchive_export.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* This file is part of the KDE project
- Copyright (C) 2007 David Faure <faure@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#ifndef KARCHIVE_EXPORT_H
-#define KARCHIVE_EXPORT_H
-
-#ifdef COMPILE_KARCHIVE_STANDALONE
-
-/* needed for KDE_EXPORT and KDE_IMPORT macros */
-#include <kdemacros.h>
-
-#ifndef KARCHIVE_EXPORT
-# if defined(KDELIBS_STATIC_LIBS)
- /* No export/import for static libraries */
-# define KARCHIVE_EXPORT
-# elif defined(MAKE_KARCHIVE_LIB)
- /* We are building this library */
-# define KARCHIVE_EXPORT KDE_EXPORT
-# else
- /* We are using this library */
-# define KARCHIVE_EXPORT KDE_IMPORT
-# endif
-

[kdelibs/KDE/4.7] /: Fixed -Wunused-parameter compiler warning.

2011-08-06T15:51:00.000-07:00

Git commit cfeaa8ec35b93cbcff9948def8b6404c3186d4c6 by David Faure, on behalf of Dawit Alemayehu.
Committed on 07/07/2011 at 01:16.
Pushed by dfaure into branch 'KDE/4.7'.

Fixed -Wunused-parameter compiler warning.

REVIEW: 101881

M +1 -0 khtml/svg/SVGDocumentExtensions.cpp
M +1 -1 kdeui/itemviews/kviewstatesaver.cpp
M +1 -0 kdeui/itemviews/kselectionproxymodel.cpp
M +5 -5 khtml/ecma/kjs_scriptable.cpp
M +7 -7 kdeui/tests/proxymodeltestsuite/modeleventlogger.cpp
M +1 -1 knewstuff/knewstuff3/ui/imagepreviewwidget.cpp
M +4 -0 khtml/khtml_part.cpp
M +1 -1 plasma/abstracttoolbox.cpp
M +1 -0 khtml/xml/dom_docimpl.cpp
M +1 -1 khtml/dom/dom_doc.cpp
M +1 -1 nepomuk/query/standardqueries.cpp
M +1 -1 kjs/CompileState.cpp
M +3 -0 khtml/misc/paintbuffer.cpp
M +1 -0 khtml/svg/SVGElementInstance.cpp
M +2 -0 khtml/rendering/RenderSVGInline.cpp
M +1 -0 khtml/ecma/kjs_views.cpp
M +1 -0 kfile/kurlnavigatorbutton.cpp
M +1 -1 kio/bookmarks/kbookmarkmanager.cc
M +1 -1 khtml/ecma/kjs_data.cpp
M +1 -1 khtml/ecma/kjs_dom.cpp
M +2 -0 khtml/ecma/kjs_navigator.cpp
M +1 -1 khtml/rendering/RenderPath.cpp
M +1 -0 khtml/rendering/render_text.cpp
M +1 -1 kio/kfile/kacleditwidget.cpp
M +2 -0 kdecore/network/ktcpsocket.cpp
M +1 -0 khtml/ecma/kjs_css.cpp
M +1 -1 nepomuk/utils/utils.cpp
M +1 -1 plasma/private/qtjolie-branch/qtjolie/abstractadaptor.cpp
M +1 -1 nepomuk/utils/searchlineedit.cpp

http://commits.kde.org/kdelibs/cfeaa8ec35b93cbcff9948def8b6404c3186d4c6

diff --git a/kdecore/network/ktcpsocket.cpp b/kdecore/network/ktcpsocket.cpp
index 8a23f0c..eed2a86 100644
--- a/kdecore/network/ktcpsocket.cpp
+++ b/kdecore/network/ktcpsocket.cpp
@@ -737,6 +737,8 @@ void KTcpSocket::setVerificationPeerName(const QString& hostName)
{
#if QT_VERSION >= 0x040800
d->sock.setPeerVerifyName(hostName);
+#else
+ Q_UNUSED(hostName);

[kdelibs/KDE/4.7] khtml/rendering: Unbreak completion on tab-out.

2011-08-05T13:16:00.000-07:00

Git commit 2a90109ab5ff7f53b4ed0555eef3e45428619f9b by Andrea Iacovitti.
Committed on 05/08/2011 at 21:45.
Pushed by aiacovitti into branch 'KDE/4.7'.

Unbreak completion on tab-out.

KLineEdit no longer emits textEdited signal when scrolling completion
list (see commit 8db60a2f) then use textChanged as in the past.
BUG: 277457
FIXED-IN: 4.7.1

M +2 -1 khtml/rendering/render_form.h
M +7 -3 khtml/rendering/render_form.cpp

http://commits.kde.org/kdelibs/2a90109ab5ff7f53b4ed0555eef3e45428619f9b

[kdelibs/KDE/4.6] khtml/rendering: Unbreak completion on tab-out in KDE/4.6 branch

2011-08-04T10:33:00.000-07:00

Git commit 3c5318801156e18f3b48208a883a8596296f9f22 by Andrea Iacovitti.
Committed on 04/08/2011 at 19:25.
Pushed by aiacovitti into branch 'KDE/4.6'.

Unbreak completion on tab-out in KDE/4.6 branch
CCBUG: 277457

M +2 -1 khtml/rendering/render_form.h
M +7 -3 khtml/rendering/render_form.cpp

http://commits.kde.org/kdelibs/3c5318801156e18f3b48208a883a8596296f9f22

diff --git a/khtml/rendering/render_form.cpp b/khtml/rendering/render_form.cpp
index 83eba14..5ec9275 100644
--- a/khtml/rendering/render_form.cpp
+++ b/khtml/rendering/render_form.cpp
@@ -1012,11 +1012,11 @@ void LineEditWidget::mouseMoveEvent(QMouseEvent *e)
// -----------------------------------------------------------------------------

RenderLineEdit::RenderLineEdit(HTMLInputElementImpl *element)
- : RenderFormElement(element)
+ : RenderFormElement(element), m_blockElementUpdates(false)
{
LineEditWidget *edit = new LineEditWidget(element, view(), view()->widget());
connect(edit,SIGNAL(returnPressed()), this, SLOT(slotReturnPressed()));
- connect(edit,SIGNAL(textEdited(QString)),this,SLOT(slotTextEdited(QString)));
+ connect(edit,SIGNAL(textChanged(QString)),this,SLOT(slotTextChanged(QString)));

if(element->inputType() == HTMLInputElementImpl::PASSWORD)
edit->setEchoMode( QLineEdit::Password );
@@ -1142,17 +1142,21 @@ void RenderLineEdit::updateFromElement()
}

if (element()->value().string() != widget()->text()) {
+ m_blockElementUpdates = true;
int pos = widget()->cursorPosition();
widget()->setText(element()->value().string());
widget()->setCursorPosition(pos);
+ m_blockElementUpdates = false;
}
widget()->setReadOnly(element()->readOnly());

RenderFormElement::updateFromElement();
}

-void RenderLineEdit::slotTextEdited(const QString &string)
+void RenderLineEdit::slotTextChanged(const QString &string)
{
+ if (m_blockElementUpdates) return;
+
// don't use setValue here!
element()->m_value = string;
element()->m_unsubmittedFormChange = true;
diff --git a/khtml/rendering/render_form.h b/khtml/rendering/render_form.h
index 1966910..2be4df5 100644
--- a/khtml/rendering/render_form.h
+++ b/khtml/rendering/render_form.h
@@ -282,12 +282,13 @@ public:
void setSelectionRange(long start, long end);
public Q_SLOTS:
void slotReturnPressed();
- void slotTextEdited(const QString &string);
+ void slotTextChanged(const QString &string);
protected:

private:
virtual bool isEditable() const { return true; }
virtual bool canHaveBorder() const { return true; }
+ bool m_blockElementUpdates;
};

// -------------------------------------------------------------------------

[kdelibs/KDE/4.6] khtml/rendering: Fix infinite loop that can happen in some cases where colspan=0 or rowspan=0

2011-08-03T15:33:00.000-07:00

Git commit 1a32ccc4759d47d48ddf8aab596d1b2178943406 by Andrea Iacovitti.
Committed on 23/07/2011 at 10:52.
Pushed by aiacovitti into branch 'KDE/4.6'.

Fix infinite loop that can happen in some cases where colspan=0 or rowspan=0
because accessing empty structures. Tracking for not empty qmap by using
additional flag is redundant and buggy in this case.
BUG: 205348
(cherry picked from commit 543c2751da42c1664171685e25fbce594024d9cd)

M +6 -6 khtml/rendering/render_table.cpp
M +0 -2 khtml/rendering/render_table.h

http://commits.kde.org/kdelibs/1a32ccc4759d47d48ddf8aab596d1b2178943406

diff --git a/khtml/rendering/render_table.cpp b/khtml/rendering/render_table.cpp
index ac703ef..5b07714 100644
--- a/khtml/rendering/render_table.cpp
+++ b/khtml/rendering/render_table.cpp
@@ -1027,7 +1027,6 @@ FindSelectionResult RenderTable::checkSelectionPoint( int _x, int _y, int _tx, i

RenderTableSection::RenderTableSection(DOM::NodeImpl* node)
: RenderBox(node)
- , containsSpansZero(false)
{
// init RenderObject attributes
setInline(false); // our object is not Inline
@@ -1170,7 +1169,7 @@ void RenderTableSection::addCell( RenderTableCell *cell, RenderTableRow *row )
if ( !cRowHeight.isPercent() ||
(cRowHeight.isPercent() && cRowHeight.rawValue() < height.rawValue() ) )
grid[cRow].height = height;
- break;
+ break;
case Fixed:
if ( cRowHeight.type() < Percent ||
( cRowHeight.isFixed() && cRowHeight.value() < height.value() ) )
@@ -1213,7 +1212,7 @@ void RenderTableSection::addCell( RenderTableCell *cell, RenderTableRow *row )

//check whether we need to update any of the cells with span = 0
QList< int > columnsToAvoid;
- if( containsSpansZero ) {
+ if( !cellsWithColSpanZero.isEmpty() ) {
//Update any column which its last span update was in a previous column
int lowestCol = cellsWithColSpanZero.lowerBound( 0 ).key();
if( lowestCol < cCol ) {
@@ -1240,6 +1239,9 @@ void RenderTableSection::addCell( RenderTableCell *cell, RenderTableRow *row )
lowestCol = cellsWithColSpanZero.lowerBound( 0 ).key();
}
}
+ }
+
+ if( !cellsWithRowSpanZero.isEmpty() ) {
if( cellsWithRowSpanZero.contains( cRow ) ) {
//No need to check if we have enough columns, we already found the first cell
//when rowspan="0", and as such, we've already inserted it
@@ -1280,7 +1282,7 @@ void RenderTableSection::addCell( RenderTableCell *cell, RenderTableRow *row )

const int finalSpan = colgroup->span() - alreadyUsedSpan;
cell->setColSpan( finalSpan );
-
+
//We know exactly the cSpan so we can handle the cell as a normal cell
//unless, of course, the rowspan is also 0
cSpan = finalSpan;
@@ -1295,7 +1297,6 @@ void RenderTableSection::addCell( RenderTableCell *cell, RenderTableRow *row )
cell->setColSpan( finalSpan );

cellsWithColSpanZero.insertMulti( cCol + finalSpan - 1, cell );
- containsSpansZero = true;
}
}

@@ -1306,7 +1307,6 @@ void RenderTableSection::addCell( RenderTableCell *cell, RenderTableRow *row )

//mark it to be inserted in next row
cellsWithRowSpanZero.insertMulti( cRow + 1, cell );
- containsSpansZero = true;
}

while ( cSpan ) {
diff --git a/khtml/rendering/render_table.h b/khtml/rendering/render_table.h
index a5c1a0e..4048175 100644
--- a/khtml/rendering/render_table.h
+++ b/khtml/rendering/render_table.h
@@ -278,8 +278,6 @@ public:
QMap< int, RenderTableCell* > cellsWithColSpanZero;
//QMap< nextRowToInsert, cell >
QMap< int, RenderTableCell* > cellsWithRowSpanZero;
- //True if any of the cells has a span of 0
- bool containsSpansZero;

int cRow;
int cCol;

[kdelibs/KDE/4.7] khtml/rendering: Fix infinite loop that can happen in some cases where colspan=0 or rowspan=0

2011-08-03T15:31:00.001-07:00

Git commit 037937acfafde34ebc7cbcdb0d0abcdde6c863cd by Andrea Iacovitti.
Committed on 04/08/2011 at 00:28.
Pushed by aiacovitti into branch 'KDE/4.7'.

M +6 -6 khtml/rendering/render_table.cpp
M +0 -2 khtml/rendering/render_table.h

http://commits.kde.org/kdelibs/037937acfafde34ebc7cbcdb0d0abcdde6c863cd

[kdelibs] khtml/rendering: Fix infinite loop that can happen in some cases where colspan=0 or rowspan=0

2011-07-23T01:56:00.000-07:00

Git commit 543c2751da42c1664171685e25fbce594024d9cd by Andrea Iacovitti.
Committed on 23/07/2011 at 10:52.
Pushed by aiacovitti into branch 'master'.

M +6 -6 khtml/rendering/render_table.cpp
M +0 -2 khtml/rendering/render_table.h

http://commits.kde.org/kdelibs/543c2751da42c1664171685e25fbce594024d9cd

[kdelibs] /: Fixed -Wunused-parameter compiler warning.

2011-07-11T09:45:00.000-07:00

Git commit 5e012b55379288f6ead97d748b455dba003a190c by Dawit Alemayehu.
Committed on 07/07/2011 at 01:16.
Pushed by adawit into branch 'master'.

Fixed -Wunused-parameter compiler warning.

REVIEW: 101881

M +2 -0 kdecore/network/ktcpsocket.cpp
M +1 -0 kdeui/itemviews/kselectionproxymodel.cpp
M +1 -1 kdeui/itemviews/kviewstatesaver.cpp
M +7 -7 kdeui/tests/proxymodeltestsuite/modeleventlogger.cpp
M +1 -0 kfile/kurlnavigatorbutton.cpp
M +1 -1 khtml/dom/dom_doc.cpp
M +1 -0 khtml/ecma/kjs_css.cpp
M +1 -1 khtml/ecma/kjs_data.cpp
M +1 -1 khtml/ecma/kjs_dom.cpp
M +2 -0 khtml/ecma/kjs_navigator.cpp
M +5 -5 khtml/ecma/kjs_scriptable.cpp
M +1 -0 khtml/ecma/kjs_views.cpp
M +4 -0 khtml/khtml_part.cpp
M +3 -0 khtml/misc/paintbuffer.cpp
M +1 -1 khtml/rendering/RenderPath.cpp
M +2 -0 khtml/rendering/RenderSVGInline.cpp
M +1 -0 khtml/rendering/render_text.cpp
M +1 -0 khtml/svg/SVGDocumentExtensions.cpp
M +1 -0 khtml/svg/SVGElementInstance.cpp
M +1 -0 khtml/xml/dom_docimpl.cpp
M +1 -1 kio/bookmarks/kbookmarkmanager.cc
M +1 -1 kio/kfile/kacleditwidget.cpp
M +1 -1 kjs/CompileState.cpp
M +1 -1 knewstuff/knewstuff3/ui/imagepreviewwidget.cpp
M +1 -1 nepomuk/query/standardqueries.cpp
M +1 -1 nepomuk/utils/searchlineedit.cpp
M +1 -1 nepomuk/utils/utils.cpp
M +1 -1 plasma/abstracttoolbox.cpp
M +1 -1 plasma/private/qtjolie-branch/qtjolie/abstractadaptor.cpp

http://commits.kde.org/kdelibs/5e012b55379288f6ead97d748b455dba003a190c

[kdelibs/KDE/4.7] khtml/ecma: Use value() here instead of [] operator to get a value from QHash.

2011-07-10T14:06:00.000-07:00

Git commit 598d70ee959c0172009f9f040cdef6bf7222b139 by Andrea Iacovitti.
Committed on 09/07/2011 at 23:16.
Pushed by aiacovitti into branch 'KDE/4.7'.

Use value() here instead of [] operator to get a value from QHash.
[] inserts a default-costructed value in the hash if no item is found.

M +1 -1 khtml/ecma/kjs_window.cpp

http://commits.kde.org/kdelibs/598d70ee959c0172009f9f040cdef6bf7222b139

diff --git a/khtml/ecma/kjs_window.cpp b/khtml/ecma/kjs_window.cpp
index 6f32cce..0e7394b 100644
--- a/khtml/ecma/kjs_window.cpp
+++ b/khtml/ecma/kjs_window.cpp
@@ -1432,7 +1432,7 @@ JSEventListener *Window::getJSEventListener(JSValue *val, bool html)
}
}

- JSEventListener *existingListener = jsEventListeners[QPair<void*, bool>(thisObject, html)];
+ JSEventListener *existingListener = jsEventListeners.value(QPair<void*, bool>(thisObject, html));
if (existingListener) {
assert( existingListener->isHTMLEventListener() == html );
return existingListener;

[kdelibs] khtml/ecma: Use value() here instead of [] operator to get a value from QHash.

2011-07-09T14:20:00.000-07:00

Git commit 81184223072498e9719bff833113498a5b0ece3b by Andrea Iacovitti.
Committed on 09/07/2011 at 23:16.
Pushed by aiacovitti into branch 'master'.

Use value() here instead of [] operator to get a value from QHash.
[] inserts a default-costructed value in the hash if no item is found.

M +1 -1 khtml/ecma/kjs_window.cpp

http://commits.kde.org/kdelibs/81184223072498e9719bff833113498a5b0ece3b

[kdelibs] khtml/html: Correct side-tokenizer network resources (Images,Stylesheets,Scripts)

2011-07-09T10:00:00.000-07:00

Git commit 1bd0f69982721d1e9df7c83dc2a9c97bb4f0832c by Andrea Iacovitti.
Committed on 09/07/2011 at 18:40.
Pushed by aiacovitti into branch 'master'.

Correct side-tokenizer network resources (Images,Stylesheets,Scripts)
preloading code; actually it was never executed:
- fix ATTR checks (attribute is the local name)
- fix case sensitivity compare of attribute's value for stylesheets

This will improve page loading performance.
(Thanks to SadEagle for his suggestions to make the patch better)

M +5 -5 khtml/html/htmlprospectivetokenizer.cpp

http://commits.kde.org/kdelibs/1bd0f69982721d1e9df7c83dc2a9c97bb4f0832c

diff --git a/khtml/html/htmlprospectivetokenizer.cpp b/khtml/html/htmlprospectivetokenizer.cpp
index 2985f5f..0e58709 100644
--- a/khtml/html/htmlprospectivetokenizer.cpp
+++ b/khtml/html/htmlprospectivetokenizer.cpp
@@ -705,7 +705,7 @@ void ProspectiveTokenizer::processAttribute()
DOMStringImpl attrDS(DOMStringImpl::ShallowCopy, m_attributeName.data(), m_attributeName.size());
LocalName attrLocal = LocalName::fromString(&attrDS, IDS_NormalizeLower);
uint attribute = attrLocal.id();
- if (attribute == ATTR_SRC && m_urlToLoad.isEmpty())
+ if (attribute == localNamePart(ATTR_SRC) && m_urlToLoad.isEmpty())
m_urlToLoad = parseURL(DOMString(m_attributeValue.data(), m_attributeValue.size()));
break;
}
@@ -714,11 +714,11 @@ void ProspectiveTokenizer::processAttribute()
DOMStringImpl attrDS(DOMStringImpl::ShallowCopy, m_attributeName.data(), m_attributeName.size());
LocalName attrLocal = LocalName::fromString(&attrDS, IDS_NormalizeLower);
uint attribute = attrLocal.id();
- if (attribute == ATTR_HREF && m_urlToLoad.isEmpty())
+ if (attribute == localNamePart(ATTR_HREF) && m_urlToLoad.isEmpty())
m_urlToLoad = parseURL(DOMString(m_attributeValue.data(), m_attributeValue.size()));
- else if (attribute == ATTR_REL) {
- QString val = QString::fromRawData(m_attributeValue.data(), m_attributeValue.size());
- m_linkIsStyleSheet = val.contains("styleSheet") && !val.contains("alternate") && !val.contains("icon");
+ else if (attribute == localNamePart(ATTR_REL)) {
+ QString val = DOMStringImpl(DOMStringImpl::ShallowCopy, m_attributeValue.data(), m_attributeValue.size()).lower()->string();
+ m_linkIsStyleSheet = val.contains("stylesheet") && !val.contains("alternate") && !val.contains("icon");
}
}
default:

[kdelibs/KDE/4.7] khtml/html: Correct side-tokenizer network resources (Images,Stylesheets,Scripts)

2011-07-09T09:45:00.000-07:00

Git commit 93a773aad9d5410d61b8bfb72c14cda51b92fde0 by Andrea Iacovitti.
Committed on 09/07/2011 at 18:40.
Pushed by aiacovitti into branch 'KDE/4.7'.

This will improve page loading performance.
(Thanks to SadEagle for his suggestions to make the patch better)

M +5 -5 khtml/html/htmlprospectivetokenizer.cpp

http://commits.kde.org/kdelibs/93a773aad9d5410d61b8bfb72c14cda51b92fde0

[kdelibs/KDE/4.7] khtml/ecma: Make sure that setting the hash to empty sets it #, as per HTML5 2.6

2011-06-22T14:47:00.002-07:00

Git commit 7b3cbac3c4fd2d555ff77f6881cd60b52f23cb76 by Maks Orlovich.
Committed on 22/06/2011 at 23:33.
Pushed by orlovich into branch 'KDE/4.7'.

Make sure that setting the hash to empty sets it #, as per HTML5 2.6
Fixes reload loop on the correlate googlelab (reported on IRC)

M +9 -2 khtml/ecma/kjs_window.cpp

http://commits.kde.org/kdelibs/7b3cbac3c4fd2d555ff77f6881cd60b52f23cb76

diff --git a/khtml/ecma/kjs_window.cpp b/khtml/ecma/kjs_window.cpp
index 5437591..6b6a795 100644
--- a/khtml/ecma/kjs_window.cpp
+++ b/khtml/ecma/kjs_window.cpp
@@ -2723,8 +2723,15 @@ void Location::put(ExecState *exec, const Identifier &p, JSValue *v, int attr)
str = str.mid(1);

// Note that we want to do gotoAnchor even when the hash is already set, so we
- // scroll the destination into view
- url.setRef(str);
+ // scroll the destination into view.
+
+ // Setting this must always provide a ref, even if just ; see
+ // HTML5 2.6.
+ if (str.isEmpty()) {
+ url.setHTMLRef("");
+ } else {
+ url.setRef(str);
+ }
break;
case Host: {
QString host = str.left(str.indexOf(":"));

[kdelibs/KDE/4.7] khtml/ecma: Fix toString not matching the implicit stringifier for .

2011-06-22T14:47:00.001-07:00

Git commit a3afaa84ce3e2dbcb31ed1d2798e0e0bbcc17813 by Maks Orlovich.
Committed on 22/06/2011 at 23:32.
Pushed by orlovich into branch 'KDE/4.7'.

Fix toString not matching the implicit stringifier for <a>.

Fixes problem with Flash for Linux download page. Ultimately, we probably
want DOMObject::toString gone and everything done via toString, but that'd
be cleaner in WebIDL land.

BUG: 273941

M +3 -0 khtml/ecma/kjs_html.cpp
M +1 -1 khtml/ecma/kjs_html.h

http://commits.kde.org/kdelibs/a3afaa84ce3e2dbcb31ed1d2798e0e0bbcc17813

diff --git a/khtml/ecma/kjs_html.cpp b/khtml/ecma/kjs_html.cpp
index 826baa1..e3da95c 100644
--- a/khtml/ecma/kjs_html.cpp
+++ b/khtml/ecma/kjs_html.cpp
@@ -984,6 +984,7 @@ const ClassInfo* KJS::HTMLElement::classInfo() const
@end
@begin HTMLAnchorElementProtoTable 3
click KJS::HTMLElement::AnchorClick DontDelete|Function 0
+ toString KJS::HTMLElement::AnchorToString DontDelete|Function 0
@end
@begin HTMLImageElementTable 15
name KJS::HTMLElement::ImageName DontDelete
@@ -2257,6 +2258,8 @@ JSValue* KJS::HTMLElementFunction::callAsFunction(ExecState *exec, JSObject *thi
if (id == KJS::HTMLElement::AnchorClick) {
anchor.click();
return jsUndefined();
+ } else if (id == KJS::HTMLElement::AnchorToString) {
+ return jsString(static_cast<KJS::HTMLElement *>(thisObj)->toString(exec));
}
}
break;
diff --git a/khtml/ecma/kjs_html.h b/khtml/ecma/kjs_html.h
index 6cfcca8..0f3f544c 100644
--- a/khtml/ecma/kjs_html.h
+++ b/khtml/ecma/kjs_html.h
@@ -126,7 +126,7 @@ namespace KJS {
AnchorAccessKey, AnchorCoords, AnchorHref, AnchorProtocol, AnchorHost,
AnchorCharset, AnchorHrefLang, AnchorHostname, AnchorType,
AnchorPort, AnchorPathName, AnchorHash, AnchorSearch, AnchorName,
- AnchorRev, AnchorTarget, AnchorText, AnchorClick,
+ AnchorRev, AnchorTarget, AnchorText, AnchorClick, AnchorToString,
ImageName, ImageAlign, ImageHspace, ImageVspace, ImageUseMap, ImageAlt,
ImageLowSrc, ImageWidth, ImageIsMap, ImageBorder, ImageHeight,
ImageLongDesc, ImageSrc, ImageX, ImageY, ImageComplete, ObjectHspace, ObjectHeight, ObjectAlign,

[kdelibs/KDE/4.7] khtml: Don't ask KHTMLRun to handle embedding cases with onlyLocalReferences, we want to

2011-06-22T14:47:00.000-07:00

Git commit b25d506ed4938eb858654549f0208a4948505fe8 by Maks Orlovich.
Committed on 28/05/2011 at 17:01.
Pushed by orlovich into branch 'KDE/4.7'.

Don't ask KHTMLRun to handle embedding cases with onlyLocalReferences, we want to
swallow them ourselves given what the mode is for.

Fixes what #248478 turned to (original issue got fixed organically, follow up
comments are technically unrelated)

+ Remove unused return and indent inconsistency while I am at it

BUG: 248478

M +15 -16 khtml/khtml_part.cpp
M +1 -1 khtml/khtml_part.h

http://commits.kde.org/kdelibs/b25d506ed4938eb858654549f0208a4948505fe8

diff --git a/khtml/khtml_part.cpp b/khtml/khtml_part.cpp
index ec89b0c..817e606 100644
--- a/khtml/khtml_part.cpp
+++ b/khtml/khtml_part.cpp
@@ -4131,7 +4131,7 @@ KParts::ScriptableExtension *KHTMLPart::scriptableExtension( const DOM::NodeImpl
return 0L;
}

-bool KHTMLPart::loadFrameElement( DOM::HTMLPartContainerElementImpl *frame, const QString &url,
+void KHTMLPart::loadFrameElement( DOM::HTMLPartContainerElementImpl *frame, const QString &url,
const QString &frameName, const QStringList &params, bool isIFrame )
{
//kDebug( 6050 ) << this << " requestFrame( ..., " << url << ", " << frameName << " )";
@@ -4165,20 +4165,18 @@ bool KHTMLPart::loadFrameElement( DOM::HTMLPartContainerElementImpl *frame, cons
// ### load event on the kid?
navigateLocalProtocol(child, part, KUrl("about:blank"));
connectToChildPart(child, part, "text/html" /* mimetype of the part, not what's being loaded */);
- }
+ }

- KUrl u = url.isEmpty() ? KUrl() : completeURL( url );
+ KUrl u = url.isEmpty() ? KUrl() : completeURL( url );

- // Since we don't specify args here a KHTMLRun will be used to determine the
- // mimetype, which will then be passed down at the bottom of processObjectRequest
- // inside URLArgs to the part. In our particular case, this means that we can
- // use that inside KHTMLPart::openUrl to route things appropriately.
- child->m_bCompleted = false;
- if (!requestObject( child, u ) && !child->m_run) {
- child->m_bCompleted = true;
- return false;
- }
- return true;
+ // Since we don't specify args here a KHTMLRun will be used to determine the
+ // mimetype, which will then be passed down at the bottom of processObjectRequest
+ // inside URLArgs to the part. In our particular case, this means that we can
+ // use that inside KHTMLPart::openUrl to route things appropriately.
+ child->m_bCompleted = false;
+ if (!requestObject( child, u ) && !child->m_run) {
+ child->m_bCompleted = true;
+ }
}

QString KHTMLPart::requestFrameName()
@@ -4299,11 +4297,12 @@ bool KHTMLPart::processObjectRequest( khtml::ChildFrame *child, const KUrl &_url
// though -> the reference becomes invalid -> crash is likely
KUrl url( _url );

- // If we are not permitting anything remote, or khtmlrun called us with
- // empty url + mimetype to indicate a loading error, we obviosuly failed
+ // khtmlrun called us with empty url + mimetype to indicate a loading error,
+ // we obviosuly failed; but we can return true here since we don't want it
+ // doing anything more, while childLoadFailure is enough to notify our kid.
if ( d->m_onlyLocalReferences || ( url.isEmpty() && mimetype.isEmpty() ) ) {
childLoadFailure(child);
- return false;
+ return true;
}

// we also want to ignore any spurious requests due to closing when parser is being cleared. These should be
diff --git a/khtml/khtml_part.h b/khtml/khtml_part.h
index a0104e3..18d3a9a 100644
--- a/khtml/khtml_part.h
+++ b/khtml/khtml_part.h
@@ -1751,7 +1751,7 @@ private:
QString requestFrameName();

// Requests loading of a frame or iframe element
- bool loadFrameElement( DOM::HTMLPartContainerElementImpl *frame, const QString &url, const QString &frameName,
+ void loadFrameElement( DOM::HTMLPartContainerElementImpl *frame, const QString &url, const QString &frameName,
const QStringList &args = QStringList(), bool isIFrame = false );

// Requests loading of an object or embed element. Returns true if

[kdelibs] khtml/ecma: Make sure that setting the hash to empty sets it #, as per HTML5 2.6

2011-06-22T14:42:00.002-07:00

Git commit 11f9b5f4b44053f7088ebd429280e97bc184169d by Maks Orlovich.
Committed on 22/06/2011 at 23:33.
Pushed by orlovich into branch 'master'.

Make sure that setting the hash to empty sets it #, as per HTML5 2.6
Fixes reload loop on the correlate googlelab (reported on IRC)

M +9 -2 khtml/ecma/kjs_window.cpp

http://commits.kde.org/kdelibs/11f9b5f4b44053f7088ebd429280e97bc184169d

diff --git a/khtml/ecma/kjs_window.cpp b/khtml/ecma/kjs_window.cpp
index 5b363f4..6f32cce 100644
--- a/khtml/ecma/kjs_window.cpp
+++ b/khtml/ecma/kjs_window.cpp
@@ -2723,8 +2723,15 @@ void Location::put(ExecState *exec, const Identifier &p, JSValue *v, int attr)
str = str.mid(1);

// Note that we want to do gotoAnchor even when the hash is already set, so we
- // scroll the destination into view
- url.setRef(str);
+ // scroll the destination into view.
+
+ // Setting this must always provide a ref, even if just ; see
+ // HTML5 2.6.
+ if (str.isEmpty()) {
+ url.setHTMLRef("");
+ } else {
+ url.setRef(str);
+ }
break;
case Host: {
QString host = str.left(str.indexOf(":"));

[kdelibs] khtml/ecma: Fix toString not matching the implicit stringifier for .

2011-06-22T14:42:00.001-07:00

Git commit c8aaa79fd289c71ac4b1f93e8e27c834695a4140 by Maks Orlovich.
Committed on 22/06/2011 at 23:32.
Pushed by orlovich into branch 'master'.

Fix toString not matching the implicit stringifier for <a>.

Fixes problem with Flash for Linux download page. Ultimately, we probably
want DOMObject::toString gone and everything done via toString, but that'd
be cleaner in WebIDL land.

BUG: 273941

M +3 -0 khtml/ecma/kjs_html.cpp
M +1 -1 khtml/ecma/kjs_html.h

http://commits.kde.org/kdelibs/c8aaa79fd289c71ac4b1f93e8e27c834695a4140

[kdelibs] khtml: Don't ask KHTMLRun to handle embedding cases with onlyLocalReferences, we want to

2011-06-22T14:42:00.000-07:00

Git commit 9cdda935c08b547f63bdc6da32faabcfa2024e0b by Maks Orlovich.
Committed on 28/05/2011 at 17:01.
Pushed by orlovich into branch 'master'.

Don't ask KHTMLRun to handle embedding cases with onlyLocalReferences, we want to
swallow them ourselves given what the mode is for.

Fixes what #248478 turned to (original issue got fixed organically, follow up
comments are technically unrelated)

+ Remove unused return and indent inconsistency while I am at it

BUG: 248478

M +15 -16 khtml/khtml_part.cpp
M +1 -1 khtml/khtml_part.h

http://commits.kde.org/kdelibs/9cdda935c08b547f63bdc6da32faabcfa2024e0b

diff --git a/khtml/khtml_part.cpp b/khtml/khtml_part.cpp
index 9c3a350..86a5f0f 100644
--- a/khtml/khtml_part.cpp
+++ b/khtml/khtml_part.cpp
@@ -4126,7 +4126,7 @@ KParts::ScriptableExtension *KHTMLPart::scriptableExtension( const DOM::NodeImpl
return 0L;
}

-bool KHTMLPart::loadFrameElement( DOM::HTMLPartContainerElementImpl *frame, const QString &url,
+void KHTMLPart::loadFrameElement( DOM::HTMLPartContainerElementImpl *frame, const QString &url,
const QString &frameName, const QStringList &params, bool isIFrame )
{
//kDebug( 6050 ) << this << " requestFrame( ..., " << url << ", " << frameName << " )";
@@ -4160,20 +4160,18 @@ bool KHTMLPart::loadFrameElement( DOM::HTMLPartContainerElementImpl *frame, cons
// ### load event on the kid?
navigateLocalProtocol(child, part, KUrl("about:blank"));
connectToChildPart(child, part, "text/html" /* mimetype of the part, not what's being loaded */);
- }
+ }

- KUrl u = url.isEmpty() ? KUrl() : completeURL( url );
+ KUrl u = url.isEmpty() ? KUrl() : completeURL( url );

- // Since we don't specify args here a KHTMLRun will be used to determine the
- // mimetype, which will then be passed down at the bottom of processObjectRequest
- // inside URLArgs to the part. In our particular case, this means that we can
- // use that inside KHTMLPart::openUrl to route things appropriately.
- child->m_bCompleted = false;
- if (!requestObject( child, u ) && !child->m_run) {
- child->m_bCompleted = true;
- return false;
- }
- return true;
+ // Since we don't specify args here a KHTMLRun will be used to determine the
+ // mimetype, which will then be passed down at the bottom of processObjectRequest
+ // inside URLArgs to the part. In our particular case, this means that we can
+ // use that inside KHTMLPart::openUrl to route things appropriately.
+ child->m_bCompleted = false;
+ if (!requestObject( child, u ) && !child->m_run) {
+ child->m_bCompleted = true;
+ }
}

QString KHTMLPart::requestFrameName()
@@ -4294,11 +4292,12 @@ bool KHTMLPart::processObjectRequest( khtml::ChildFrame *child, const KUrl &_url
// though -> the reference becomes invalid -> crash is likely
KUrl url( _url );

- // If we are not permitting anything remote, or khtmlrun called us with
- // empty url + mimetype to indicate a loading error, we obviosuly failed
+ // khtmlrun called us with empty url + mimetype to indicate a loading error,
+ // we obviosuly failed; but we can return true here since we don't want it
+ // doing anything more, while childLoadFailure is enough to notify our kid.
if ( d->m_onlyLocalReferences || ( url.isEmpty() && mimetype.isEmpty() ) ) {
childLoadFailure(child);
- return false;
+ return true;
}

// we also want to ignore any spurious requests due to closing when parser is being cleared. These should be
diff --git a/khtml/khtml_part.h b/khtml/khtml_part.h
index a0104e3..18d3a9a 100644
--- a/khtml/khtml_part.h
+++ b/khtml/khtml_part.h
@@ -1751,7 +1751,7 @@ private:
QString requestFrameName();

// Requests loading of a frame or iframe element
- bool loadFrameElement( DOM::HTMLPartContainerElementImpl *frame, const QString &url, const QString &frameName,
+ void loadFrameElement( DOM::HTMLPartContainerElementImpl *frame, const QString &url, const QString &frameName,
const QStringList &args = QStringList(), bool isIFrame = false );

// Requests loading of an object or embed element. Returns true if

[kdelibs] khtml/xpath: Delete ancient Makefile.am from khtml/xpath.

2011-06-20T16:14:00.000-07:00

Git commit bdbb754aee7adcc50c1df633cecf97b339a7b60c by Nicolás Alvarez.
Committed on 21/06/2011 at 01:14.
Pushed by nalvarez into branch 'master'.

Delete ancient Makefile.am from khtml/xpath.

D +0 -43 khtml/xpath/Makefile.am

http://commits.kde.org/kdelibs/bdbb754aee7adcc50c1df633cecf97b339a7b60c

diff --git a/khtml/xpath/Makefile.am b/khtml/xpath/Makefile.am
deleted file mode 100644
index 513b39e..0000000
--- a/khtml/xpath/Makefile.am
+++ /dev/null
@@ -1,43 +0,0 @@
-include $(top_srcdir)/kdom/Makefile.global
-
-INCLUDES = -I$(top_srcdir) \
- -I$(top_srcdir)/kdom \
- -I$(top_srcdir)/kdom/core \
- -I$(top_srcdir)/kdom/parser \
- -I$(top_srcdir)/kdom/xpath \
- $(all_includes)
-
-YACC = bison
-
-noinst_LTLIBRARIES = libkdomxpathimpl.la
-
-check_PROGRAMS = tokenizer_tester parser_tester interpreter_tester
-
-libkdomxpathimpl_la_SOURCES = expression.cpp functions.cpp \
- parsedstatement.cpp path.cpp predicate.cpp step.cpp \
- parser.cpp tokenizer.cpp util.cpp variablereference.cpp
-libkdomxpathimpl_la_LDFLAGS = $(all_libraries)
-
-tokenizer_tester_SOURCES = tokenizer_tester.cpp
-tokenizer_tester_LDADD = libkdomxpathimpl.la $(top_builddir)/kdom/libkdom.la
-tokenizer_tester_LDFLAGS = $(all_libraries)
-
-parser_tester_SOURCES = parser_tester.cpp
-parser_tester_LDADD = libkdomxpathimpl.la $(top_builddir)/kdom/libkdom.la
-parser_tester_LDFLAGS = $(all_libraries)
-
-interpreter_tester_SOURCES = interpreter_tester.cpp
-interpreter_tester_LDADD = libkdomxpathimpl.la $(top_builddir)/kdom/libkdom.la $(top_builddir)/kdom/xpath/libkdomxpath.la
-interpreter_tester_LDFLAGS = $(all_libraries)
-
-EXTRA_DIST = parser.y
-CLEANFILES = $(top_srcdir)/kdom/xpath/impl/parser.cpp $(top_srcdir)/kdom/xpath/impl/parser.h $(top_srcdir)/kdom/xpath/impl/parser.output
-
-parser.cpp: $(srcdir)/parser.y
-$(top_srcdir)/kdom/xpath/impl/parser.cpp: $(srcdir)/parser.y
- cd $(srcdir); \
- $(YACC) -v -d -p xpathyy parser.y && mv parser.tab.c $(top_srcdir)/kdom/xpath/impl/parser.cpp; \
- if test -f parser.tab.h; then \
- if cmp -s parser.tab.h parser.h; then rm -f parser.tab.h; \
- else mv parser.tab.h $(top_srcdir)/kdom/xpath/impl/parser.h; fi \
- else :; fi