[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:41:55
Message-ID: 1142617315.377404.29586.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 519623 by eva:
Qt2:
- comment out highlighting for textareas as this doesn't work right
now for Qt2. Besides that this function is used anyways.
- updating patch line numbers
M +2 -2 findNext.patch
M +16 -16 image_scaling.patch
M +2 -2 khtml_improved_scrolling_3.5.patch
M +23 -9 khtml_qt2.3.patch
--- trunk/kdenox/konq-embed/kdesrc/khtml/patches/findNext.patch #519622:519623
@@ -1,5 +1,5 @@
---- khtml_part.cpp.1 2006-03-10 16:04:07.000000000 +0100
-+++ khtml_part.cpp 2006-03-10 16:03:35.000000000 +0100
+--- khtml_part.cpp.1
++++ khtml_part.cpp
@@ -2850,7 +2850,7 @@
// Old method (its API limits the available features - remove in KDE-4)
bool KHTMLPart::findTextNext( const QString &str, bool forward, bool caseSensitive, \
bool isRegExp )
--- trunk/kdenox/konq-embed/kdesrc/khtml/patches/image_scaling.patch #519622:519623
@@ -1,6 +1,6 @@
diff -u -r ../../../../khtml.org/css/css_valueimpl.cpp ./css/css_valueimpl.cpp
---- ../../../../khtml.org/css/css_valueimpl.cpp 2006-01-30 16:41:50.000000000 +0100
-+++ ./css/css_valueimpl.cpp 2006-02-27 18:44:53.000000000 +0100
+--- ../../../../khtml.org/css/css_valueimpl.cpp
++++ ./css/css_valueimpl.cpp
@@ -545,13 +545,16 @@
dpiY = 96.;
@@ -31,8 +31,8 @@
void CSSPrimitiveValueImpl::setFloatValue( unsigned short unitType, double \
floatValue, int &exceptioncode ) diff -u -r ../../../../khtml.org/khtml_part.cpp \
./khtml_part.cpp
---- ../../../../khtml.org/khtml_part.cpp 2006-02-27 13:13:17.000000000 +0100
-+++ ./khtml_part.cpp 2006-02-27 18:41:52.000000000 +0100
+--- ../../../../khtml.org/khtml_part.cpp
++++ ./khtml_part.cpp
@@ -5412,6 +5412,7 @@
stream << d->m_encoding << d->m_sheetUsed << docState;
@@ -114,8 +114,8 @@
{
if (!d->m_statusMessagesEnabled)
diff -u -r ../../../../khtml.org/khtml_part.h ./khtml_part.h
---- ../../../../khtml.org/khtml_part.h 2006-01-30 16:41:53.000000000 +0100
-+++ ./khtml_part.h 2006-02-27 18:12:09.000000000 +0100
+--- ../../../../khtml.org/khtml_part.h
++++ ./khtml_part.h
@@ -765,6 +765,11 @@
*/
int zoomFactor() const;
@@ -129,8 +129,8 @@
* Returns the text the user has marked.
*/
diff -u -r ../../../../khtml.org/khtmlpart_p.h ./khtmlpart_p.h
---- ../../../../khtml.org/khtmlpart_p.h 2006-02-27 13:51:58.000000000 +0100
-+++ ./khtmlpart_p.h 2006-02-27 18:12:09.000000000 +0100
+--- ../../../../khtml.org/khtmlpart_p.h
++++ ./khtmlpart_p.h
@@ -204,6 +204,7 @@
m_bClearing = false;
m_bCleared = false;
@@ -156,8 +156,8 @@
QString m_strSelectedURL;
QString m_strSelectedURLTarget;
diff -u -r ../../../../khtml.org/rendering/render_box.cpp ./rendering/render_box.cpp
---- ../../../../khtml.org/rendering/render_box.cpp 2006-01-30 16:41:45.000000000 \
+0100
-+++ ./rendering/render_box.cpp 2006-02-27 18:52:45.000000000 +0100
+--- ../../../../khtml.org/rendering/render_box.cpp
++++ ./rendering/render_box.cpp
@@ -1070,7 +1070,10 @@
}
// fall through
@@ -183,8 +183,8 @@
}
diff -u -r ../../../../khtml.org/rendering/render_style.h ./rendering/render_style.h
---- ../../../../khtml.org/rendering/render_style.h 2006-01-30 16:41:45.000000000 \
+0100
-+++ ./rendering/render_style.h 2006-02-27 18:12:09.000000000 +0100
+--- ../../../../khtml.org/rendering/render_style.h
++++ ./rendering/render_style.h
@@ -793,6 +793,8 @@
bool _page_break_inside : 1; // AUTO/AVOID
@@ -221,8 +221,8 @@
// CSS3 Setters
diff -u -r ../../../../khtml.org/xml/dom_docimpl.cpp ./xml/dom_docimpl.cpp
---- ../../../../khtml.org/xml/dom_docimpl.cpp 2006-01-30 16:41:53.000000000 +0100
-+++ ./xml/dom_docimpl.cpp 2006-02-27 18:12:09.000000000 +0100
+--- ../../../../khtml.org/xml/dom_docimpl.cpp
++++ ./xml/dom_docimpl.cpp
@@ -1048,6 +1048,7 @@
RenderStyle* oldStyle = m_render->style();
if ( oldStyle ) oldStyle->ref();
@@ -231,8 +231,8 @@
_style->setDisplay(BLOCK);
_style->setVisuallyOrdered( visuallyOrdered );
// ### make the font stuff _really_ work!!!!
---- rendering/render_image.cpp 2006-03-17 17:47:24.000000000 +0100
-+++ rendering/render_image.cpp.patched 2006-03-17 17:46:59.000000000 +0100
+--- rendering/render_image.cpp
++++ rendering/render_image.cpp.patched
@@ -298,17 +298,19 @@
if ( (cWidth != intrinsicWidth() || cHeight != intrinsicHeight()) &&
pix.width() > 0 && pix.height() > 0 && i->valid_rect().isValid())
--- trunk/kdenox/konq-embed/kdesrc/khtml/patches/khtml_improved_scrolling_3.5.patch \
#519622:519623 @@ -1,5 +1,5 @@
---- khtmlview.cpp.org 2006-03-09 21:38:45.000000000 +0100
-+++ khtmlview.cpp 2006-03-09 21:46:49.000000000 +0100
+--- khtmlview.cpp.org
++++ khtmlview.cpp
@@ -1439,13 +1507,13 @@
switch(_ke->key())
{
--- trunk/kdenox/konq-embed/kdesrc/khtml/patches/khtml_qt2.3.patch #519622:519623
@@ -134,7 +134,21 @@
}
}
}
-@@ -3464,7 +3480,13 @@ void KHTMLPart::slotHighlight( const QSt
+@@ -3440,11 +3456,13 @@ void KHTMLPart::slotHighlight( const QSt
+ for ( ; it != d->m_stringPortions.end() ; ++it )
+ kdDebug(6050) << " StringPortion: from index=" << (*it).index << " -> node=" \
<< (*it).node << endl; + #endif
++#if (QT_VERSION >= 0x030000)
+ if( renderAreaText )
+ {
+ if( parent )
+ parent->highLightWord( length, d->m_endOffset-length );
+ }
++#endif
+ else if ( renderLineText )
+ {
+ if( parentLine )
+@@ -3464,7 +3482,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 +162,7 @@
}
}
}
-@@ -3507,7 +3529,7 @@ QString KHTMLPart::selectedText() const
+@@ -3507,7 +3531,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 +171,7 @@
if(!str.isEmpty()) {
if(seenTDTag) {
text += " ";
-@@ -3785,7 +3807,7 @@ void KHTMLPart::overURL( const QString &
+@@ -3785,7 +3809,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 +180,7 @@
return;
}
-@@ -3900,7 +3922,7 @@ void KHTMLPart::overURL( const QString &
+@@ -3900,7 +3924,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 +189,7 @@
mailtoMsg.replace(QRegExp("([\n\r\t]|[ ]{10})"), QString::null);
setStatusBarText("<qt>"+mailtoMsg, BarHoverText);
return;
-@@ -5939,7 +5961,11 @@ QString KHTMLPart::lastModified() const
+@@ -5939,7 +5963,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 +201,7 @@
}
//kdDebug(6050) << "KHTMLPart::lastModified: " << d->m_lastModified << endl;
return d->m_lastModified;
-@@ -6041,6 +6067,46 @@ bool KHTMLPart::dndEnabled() const
+@@ -6041,6 +6069,46 @@ bool KHTMLPart::dndEnabled() const
return d->m_bDnd;
}
@@ -234,7 +248,7 @@
void KHTMLPart::customEvent( QCustomEvent *event )
{
if ( khtml::MousePressEvent::test( event ) )
-@@ -6075,6 +6141,7 @@ void KHTMLPart::customEvent( QCustomEven
+@@ -6075,6 +6143,7 @@ void KHTMLPart::customEvent( QCustomEven
KParts::ReadOnlyPart::customEvent( event );
}
@@ -242,7 +256,7 @@
/** returns the position of the first inline text box of the line at
* coordinate y in renderNode
-@@ -6753,6 +6820,7 @@ void KHTMLPart::guiActivateEvent( KParts
+@@ -6753,6 +6822,7 @@ void KHTMLPart::guiActivateEvent( KParts
void KHTMLPart::slotPrintFrame()
{
@@ -250,7 +264,7 @@
if ( d->m_frames.count() == 0 )
return;
-@@ -6772,6 +6840,7 @@ void KHTMLPart::slotPrintFrame()
+@@ -6772,6 +6842,7 @@ void KHTMLPart::slotPrintFrame()
QUObject o[ 1 ];
ext->qt_invoke( idx, o );
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic