[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: kdenox/konq-embed/kdesrc/khtml/patches
From: Eva Brucherseifer <eva () kde ! org>
Date: 2006-03-17 17:20:53
Message-ID: 1142616053.375613.27630.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 519617 by eva:
update patch line numbers
M +16 -16 khtml_qt2.3.patch
--- trunk/kdenox/konq-embed/kdesrc/khtml/patches/khtml_qt2.3.patch #519616:519617
@@ -74,7 +74,7 @@
d->m_workingURL = KURL::join( urls );
//kdDebug(6050) << "Emitting fixed URL " << d->m_workingURL.prettyURL() << endl;
emit d->m_extension->setLocationBarURL( d->m_workingURL.prettyURL() );
-@@ -1069,7 +1074,7 @@ QVariant KHTMLPart::crossFrameExecuteScr
+@@ -1072,7 +1077,7 @@ QVariant KHTMLPart::crossFrameExecuteScr
}
//Enable this to see all JS scripts being executed
@@ -83,7 +83,7 @@
KJSErrorDlg *KHTMLPart::jsErrorExtension() {
#ifndef KONQ_EMBEDDED
-@@ -1177,7 +1182,7 @@ QVariant KHTMLPart::executeScript(const
+@@ -1180,7 +1185,7 @@ QVariant KHTMLPart::executeScript(const
KJSErrorDlg *dlg = jsErrorExtension();
if (dlg) {
KJS::UString msg = comp.value().toString(proxy->interpreter()->globalExec());
@@ -92,7 +92,7 @@
}
}
-@@ -1735,8 +1740,13 @@ void KHTMLPart::htmlError( int errorCode
+@@ -1744,8 +1749,13 @@ void KHTMLPart::htmlError( int errorCode
d->m_bJScriptForce = false;
d->m_bJScriptOverride = true;
begin();
@@ -106,7 +106,7 @@
errText += i18n( "Error while loading %1" ).arg( reqUrl.htmlURL() );
errText += QString::fromLatin1( "</TITLE></HEAD><BODY><P>" );
errText += i18n( "An error occurred while loading <B>%1</B>:" ).arg( reqUrl.htmlURL() );
-@@ -2832,11 +2842,11 @@ bool KHTMLPart::findTextNext( const QStr
+@@ -2848,11 +2858,11 @@ bool KHTMLPart::findTextNext( const QStr
{
DOMString nodeText = d->m_findNode->nodeValue();
DOMStringImpl *t = nodeText.implementation();
@@ -120,7 +120,7 @@
matcher.setCaseSensitive( caseSensitive );
d->m_findPos = matcher.search(s.string(), d->m_findPos+1);
if ( d->m_findPos != -1 )
-@@ -3358,7 +3368,13 @@ void KHTMLPart::slotHighlight( const QSt
+@@ -3393,7 +3403,13 @@ void KHTMLPart::slotHighlight( const QSt
gox = x - d->m_view->visibleWidth() - 10;
if (gox < 0) gox = 0;
d->m_view->setContentsPos(gox, y-50);
@@ -134,7 +134,7 @@
}
}
}
-@@ -3429,7 +3445,13 @@ void KHTMLPart::slotHighlight( const QSt
+@@ -3464,7 +3480,13 @@ void KHTMLPart::slotHighlight( const QSt
{
// if ( static_cast<khtml::RenderText *>(d->m_selectionEnd.handle()->renderer())
// ->posOfChar(d->m_endOffset-1, x, y))
@@ -148,7 +148,7 @@
}
}
}
-@@ -3472,7 +3494,7 @@ QString KHTMLPart::selectedText() const
+@@ -3507,7 +3529,7 @@ QString KHTMLPart::selectedText() const
while(!n.isNull()) {
if(n.nodeType() == DOM::Node::TEXT_NODE && n.handle()->renderer()) {
DOM::DOMStringImpl *dstr = static_cast<DOM::TextImpl*>(n.handle())->renderString();
@@ -157,7 +157,7 @@
if(!str.isEmpty()) {
if(seenTDTag) {
text += " ";
-@@ -3750,7 +3772,7 @@ void KHTMLPart::overURL( const QString &
+@@ -3785,7 +3807,7 @@ void KHTMLPart::overURL( const QString &
jscode = KStringHandler::rsqueeze( jscode, 80 ); // truncate if too long
if (url.startsWith("javascript:window.open"))
jscode += i18n(" (In new window)");
@@ -166,7 +166,7 @@
return;
}
-@@ -3865,7 +3887,7 @@ void KHTMLPart::overURL( const QString &
+@@ -3900,7 +3922,7 @@ void KHTMLPart::overURL( const QString &
mailtoMsg += i18n(" - CC: ") + KURL::decode_string((*it).mid(3));
else if ((*it).startsWith(QString::fromLatin1("bcc=")))
mailtoMsg += i18n(" - BCC: ") + KURL::decode_string((*it).mid(4));
@@ -175,7 +175,7 @@
mailtoMsg.replace(QRegExp("([\n\r\t]|[ ]{10})"), QString::null);
setStatusBarText("<qt>"+mailtoMsg, BarHoverText);
return;
-@@ -5856,7 +5878,11 @@ QString KHTMLPart::lastModified() const
+@@ -5939,7 +5961,11 @@ QString KHTMLPart::lastModified() const
// Done on demand to save time when this isn't needed - but can lead
// to slightly wrong results if updating the file on disk w/o reloading.
QDateTime lastModif = QFileInfo( m_url.path() ).lastModified();
@@ -187,7 +187,7 @@
}
//kdDebug(6050) << "KHTMLPart::lastModified: " << d->m_lastModified << endl;
return d->m_lastModified;
-@@ -5958,6 +5984,46 @@ bool KHTMLPart::dndEnabled() const
+@@ -6041,6 +6067,46 @@ bool KHTMLPart::dndEnabled() const
return d->m_bDnd;
}
@@ -234,7 +234,7 @@
void KHTMLPart::customEvent( QCustomEvent *event )
{
if ( khtml::MousePressEvent::test( event ) )
-@@ -5992,6 +6058,7 @@ void KHTMLPart::customEvent( QCustomEven
+@@ -6075,6 +6141,7 @@ void KHTMLPart::customEvent( QCustomEven
KParts::ReadOnlyPart::customEvent( event );
}
@@ -242,7 +242,7 @@
/** returns the position of the first inline text box of the line at
* coordinate y in renderNode
-@@ -6670,6 +6737,7 @@ void KHTMLPart::guiActivateEvent( KParts
+@@ -6753,6 +6820,7 @@ void KHTMLPart::guiActivateEvent( KParts
void KHTMLPart::slotPrintFrame()
{
@@ -250,7 +250,7 @@
if ( d->m_frames.count() == 0 )
return;
-@@ -6689,6 +6757,7 @@ void KHTMLPart::slotPrintFrame()
+@@ -6772,6 +6840,7 @@ void KHTMLPart::slotPrintFrame()
QUObject o[ 1 ];
ext->qt_invoke( idx, o );
}
@@ -260,7 +260,7 @@
void KHTMLPart::slotSelectAll()
--- ./khtml_part.h
+++ khtml/khtml_part.h
-@@ -1119,7 +1119,11 @@ protected:
+@@ -1124,7 +1124,11 @@ protected:
*/
void htmlError( int errorCode, const QString& text, const KURL& reqUrl );
@@ -272,7 +272,7 @@
/**
* Eventhandler of the khtml::MousePressEvent.
-@@ -1270,8 +1274,15 @@ public slots:
+@@ -1275,8 +1279,15 @@ public slots:
void submitFormProxy( const char *action, const QString &url,
const QByteArray &formData,
const QString &target,
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic