[webkit-changes] cvs commit: WebCore/kwq KWQApplication.h
KWQComboBox.h KWQKHTMLPart.mm KWQKHTMLPartBrowserExtension.h
KWQKHistoryProvider.mm KWQKJavaAppletContext.h
KWQKPartsHistoryProvider.h KWQObject.h KWQScrollView.h
KWQScrollView.mm KWQWidget.h KWQKApplication.h
KWQKHTMLPageCache.h KWQKPartsPartManager.h KWQMovie.h KWQMovie.mm
Eric
eseidel at opensource.apple.com
Thu Dec 15 14:31:59 PST 2005
eseidel 05/12/15 14:31:59
Modified: . ChangeLog
WebCore.xcodeproj project.pbxproj
khtml khtml_part.cpp khtml_part.h khtmlpart_p.h
khtmlview.cpp khtmlview.h
khtml/css cssstyleselector.cpp
khtml/ecma kjs_proxy.cpp kjs_window.cpp
khtml/html html_documentimpl.cpp html_formimpl.cpp
html_formimpl.h html_objectimpl.cpp
html_objectimpl.h
khtml/misc loader.cpp loader.h
khtml/rendering render_form.cpp render_form.h
render_frames.cpp render_layer.cpp
render_replaced.cpp
khtml/xml dom_docimpl.cpp xml_tokenizer.cpp
ksvg2/svg SVGImageElementImpl.cpp
kwq KWQApplication.h KWQComboBox.h KWQKHTMLPart.mm
KWQKHTMLPartBrowserExtension.h
KWQKHistoryProvider.mm KWQKJavaAppletContext.h
KWQKPartsHistoryProvider.h KWQObject.h
KWQScrollView.h KWQScrollView.mm KWQWidget.h
Removed: ForwardingHeaders kapplication.h kcompletionbox.h
kdatastream.h kfiledialog.h kfileitem.h
khtml_iface.h khtml_pagecache.h
khtml_printsettings.h khtml_run.h kiconloader.h
kmessagebox.h kmimetype.h kmultipledrag.h
kprinter.h kprotocolmanager.h ksimpleconfig.h
ksslcertchain.h ksslinfodlg.h kstdaction.h
ktempfile.h ktrader.h kurldrag.h kxmlguifactory.h
netaccess.h qasyncimageio.h qbitmap.h qclipboard.h
qdir.h qdrawutil.h qfontdatabase.h qfontinfo.h
qglobal.h qhbox.h qinputdialog.h qintcache.h
qmetaobject.h qmovie.h qobjectlist.h qtooltip.h
scheduler.h
ForwardingHeaders/kio kprotocolmanager.h netaccess.h
ForwardingHeaders/kparts partmanager.h
ForwardingHeaders/private qucomextra_p.h
khtml khtml_part.moc khtmlview.moc
khtml/ecma kjs_window.moc
khtml/html html_documentimpl.moc htmltokenizer.moc
khtml/misc loader.moc
khtml/rendering render_form.moc render_frames.moc
render_replaced.moc
khtml/xml dom_docimpl.moc xml_tokenizer.moc
kwq KWQKApplication.h KWQKHTMLPageCache.h
KWQKPartsPartManager.h KWQMovie.h KWQMovie.mm
Log:
Bug #: 6091
Submitted by: eseidel
Reviewed by: darin
Remove more legacy code from khtml/kwq
http://bugzilla.opendarwin.org/show_bug.cgi?id=6091
No tests needed, no functionality changes.
* ForwardingHeaders/kapplication.h: Removed.
* ForwardingHeaders/kcompletionbox.h: Removed.
* ForwardingHeaders/kdatastream.h: Removed.
* ForwardingHeaders/kfiledialog.h: Removed.
* ForwardingHeaders/kfileitem.h: Removed.
* ForwardingHeaders/khtml_iface.h: Removed.
* ForwardingHeaders/khtml_pagecache.h: Removed.
* ForwardingHeaders/khtml_printsettings.h: Removed.
* ForwardingHeaders/khtml_run.h: Removed.
* ForwardingHeaders/kiconloader.h: Removed.
* ForwardingHeaders/kio/kprotocolmanager.h: Removed.
* ForwardingHeaders/kio/netaccess.h: Removed.
* ForwardingHeaders/kmessagebox.h: Removed.
* ForwardingHeaders/kmimetype.h: Removed.
* ForwardingHeaders/kmultipledrag.h: Removed.
* ForwardingHeaders/kparts/partmanager.h: Removed.
* ForwardingHeaders/kprinter.h: Removed.
* ForwardingHeaders/kprotocolmanager.h: Removed.
* ForwardingHeaders/ksimpleconfig.h: Removed.
* ForwardingHeaders/ksslcertchain.h: Removed.
* ForwardingHeaders/ksslinfodlg.h: Removed.
* ForwardingHeaders/kstdaction.h: Removed.
* ForwardingHeaders/ktempfile.h: Removed.
* ForwardingHeaders/ktrader.h: Removed.
* ForwardingHeaders/kurldrag.h: Removed.
* ForwardingHeaders/kxmlguifactory.h: Removed.
* ForwardingHeaders/netaccess.h: Removed.
* ForwardingHeaders/private/qucomextra_p.h: Removed.
* ForwardingHeaders/qasyncimageio.h: Removed.
* ForwardingHeaders/qbitmap.h: Removed.
* ForwardingHeaders/qclipboard.h: Removed.
* ForwardingHeaders/qdir.h: Removed.
* ForwardingHeaders/qdrawutil.h: Removed.
* ForwardingHeaders/qfontdatabase.h: Removed.
* ForwardingHeaders/qfontinfo.h: Removed.
* ForwardingHeaders/qglobal.h: Removed.
* ForwardingHeaders/qhbox.h: Removed.
* ForwardingHeaders/qinputdialog.h: Removed.
* ForwardingHeaders/qintcache.h: Removed.
* ForwardingHeaders/qmetaobject.h: Removed.
* ForwardingHeaders/qmovie.h: Removed.
* ForwardingHeaders/qobjectlist.h: Removed.
* ForwardingHeaders/qtooltip.h: Removed.
* ForwardingHeaders/scheduler.h: Removed.
* WebCore.xcodeproj/project.pbxproj:
* khtml/css/cssstyleselector.cpp:
* khtml/ecma/kjs_proxy.cpp:
(KJSProxyImpl::KJSProxyImpl):
(KJSProxyImpl::initScript):
* khtml/ecma/kjs_window.cpp:
* khtml/ecma/kjs_window.moc: Removed.
* khtml/html/html_documentimpl.cpp:
(DOM::HTMLDocumentImpl::HTMLDocumentImpl):
* khtml/html/html_documentimpl.moc: Removed.
* khtml/html/html_formimpl.cpp:
* khtml/html/html_formimpl.h:
* khtml/html/html_objectimpl.cpp:
* khtml/html/html_objectimpl.h:
* khtml/html/htmltokenizer.moc: Removed.
* khtml/khtml_part.cpp:
(KHTMLPart::didOpenURL):
(KHTMLPart::stopLoading):
(KHTMLPart::createJavaContext):
(KHTMLPart::begin):
(KHTMLPart::slotRedirection):
(KHTMLPart::setSelection):
(KHTMLPart::handleFallbackContent):
* khtml/khtml_part.h:
* khtml/khtml_part.moc: Removed.
* khtml/khtmlpart_p.h:
(KHTMLPartPrivate::KHTMLPartPrivate):
(KHTMLPartPrivate::~KHTMLPartPrivate):
* khtml/khtmlview.cpp:
(KHTMLViewPrivate::KHTMLViewPrivate):
(KHTMLViewPrivate::~KHTMLViewPrivate):
(KHTMLView::KHTMLView):
(KHTMLView::init):
(KHTMLView::resizeEvent):
(KHTMLView::layout):
(KHTMLView::viewportMousePressEvent):
(KHTMLView::viewportMouseDoubleClickEvent):
(KHTMLView::viewportMouseReleaseEvent):
(KHTMLView::scrollTo):
(KHTMLView::focusNextPrevNode):
(KHTMLView::focusInEvent):
(KHTMLView::focusOutEvent):
* khtml/khtmlview.h:
* khtml/khtmlview.moc: Removed.
* khtml/misc/loader.cpp:
(CachedImage::CachedImage):
(CachedImage::ref):
(CachedImage::deref):
(CachedImage::pixmap_size):
(CachedImage::valid_rect):
(CachedImage::clear):
(CachedXSLStyleSheet::CachedXSLStyleSheet):
(Cache::clear):
(Cache::flush):
(Cache::getStatistics):
(Cache::setCacheDisabled):
* khtml/misc/loader.h:
* khtml/misc/loader.moc: Removed.
* khtml/rendering/render_form.cpp:
(ComboBoxWidget::ComboBoxWidget):
(RenderSelect::createListBox):
(RenderSlider::slotClicked):
* khtml/rendering/render_form.h:
* khtml/rendering/render_form.moc: Removed.
* khtml/rendering/render_frames.cpp:
(RenderFrameSet::userResize):
(RenderPart::updateWidgetPosition):
* khtml/rendering/render_frames.moc: Removed.
* khtml/rendering/render_layer.cpp:
(khtml::RenderLayer::isTransparent):
* khtml/rendering/render_replaced.cpp:
(RenderWidget::destroy):
(RenderWidget::setSelectionState):
* khtml/rendering/render_replaced.moc: Removed.
* khtml/xml/dom_docimpl.cpp:
(DocumentTypeImpl::cloneNode):
* khtml/xml/dom_docimpl.moc: Removed.
* khtml/xml/xml_tokenizer.cpp:
* khtml/xml/xml_tokenizer.moc: Removed.
* ksvg2/svg/SVGImageElementImpl.cpp:
* kwq/KWQApplication.h:
(QApplication::sendEvent):
* kwq/KWQComboBox.h:
* kwq/KWQKApplication.h: Removed.
* kwq/KWQKHTMLPageCache.h: Removed.
* kwq/KWQKHTMLPart.mm:
(KWQKHTMLPart::openURLFromPageCache):
* kwq/KWQKHTMLPartBrowserExtension.h:
* kwq/KWQKHistoryProvider.mm:
* kwq/KWQKJavaAppletContext.h:
(KJavaAppletContext::KJavaAppletContext):
* kwq/KWQKPartsHistoryProvider.h:
* kwq/KWQKPartsPartManager.h: Removed.
* kwq/KWQMovie.h: Removed.
* kwq/KWQMovie.mm: Removed.
* kwq/KWQObject.h:
* kwq/KWQScrollView.h:
* kwq/KWQScrollView.mm:
* kwq/KWQWidget.h:
Revision Changes Path
1.537 +153 -2 WebCore/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebCore/ChangeLog,v
retrieving revision 1.536
retrieving revision 1.537
diff -u -r1.536 -r1.537
--- ChangeLog 15 Dec 2005 21:39:51 -0000 1.536
+++ ChangeLog 15 Dec 2005 22:31:03 -0000 1.537
@@ -2,6 +2,159 @@
Reviewed by darin.
+ Remove more legacy code from khtml/kwq
+ http://bugzilla.opendarwin.org/show_bug.cgi?id=6091
+
+ No tests needed, no functionality changes.
+
+ * ForwardingHeaders/kapplication.h: Removed.
+ * ForwardingHeaders/kcompletionbox.h: Removed.
+ * ForwardingHeaders/kdatastream.h: Removed.
+ * ForwardingHeaders/kfiledialog.h: Removed.
+ * ForwardingHeaders/kfileitem.h: Removed.
+ * ForwardingHeaders/khtml_iface.h: Removed.
+ * ForwardingHeaders/khtml_pagecache.h: Removed.
+ * ForwardingHeaders/khtml_printsettings.h: Removed.
+ * ForwardingHeaders/khtml_run.h: Removed.
+ * ForwardingHeaders/kiconloader.h: Removed.
+ * ForwardingHeaders/kio/kprotocolmanager.h: Removed.
+ * ForwardingHeaders/kio/netaccess.h: Removed.
+ * ForwardingHeaders/kmessagebox.h: Removed.
+ * ForwardingHeaders/kmimetype.h: Removed.
+ * ForwardingHeaders/kmultipledrag.h: Removed.
+ * ForwardingHeaders/kparts/partmanager.h: Removed.
+ * ForwardingHeaders/kprinter.h: Removed.
+ * ForwardingHeaders/kprotocolmanager.h: Removed.
+ * ForwardingHeaders/ksimpleconfig.h: Removed.
+ * ForwardingHeaders/ksslcertchain.h: Removed.
+ * ForwardingHeaders/ksslinfodlg.h: Removed.
+ * ForwardingHeaders/kstdaction.h: Removed.
+ * ForwardingHeaders/ktempfile.h: Removed.
+ * ForwardingHeaders/ktrader.h: Removed.
+ * ForwardingHeaders/kurldrag.h: Removed.
+ * ForwardingHeaders/kxmlguifactory.h: Removed.
+ * ForwardingHeaders/netaccess.h: Removed.
+ * ForwardingHeaders/private/qucomextra_p.h: Removed.
+ * ForwardingHeaders/qasyncimageio.h: Removed.
+ * ForwardingHeaders/qbitmap.h: Removed.
+ * ForwardingHeaders/qclipboard.h: Removed.
+ * ForwardingHeaders/qdir.h: Removed.
+ * ForwardingHeaders/qdrawutil.h: Removed.
+ * ForwardingHeaders/qfontdatabase.h: Removed.
+ * ForwardingHeaders/qfontinfo.h: Removed.
+ * ForwardingHeaders/qglobal.h: Removed.
+ * ForwardingHeaders/qhbox.h: Removed.
+ * ForwardingHeaders/qinputdialog.h: Removed.
+ * ForwardingHeaders/qintcache.h: Removed.
+ * ForwardingHeaders/qmetaobject.h: Removed.
+ * ForwardingHeaders/qmovie.h: Removed.
+ * ForwardingHeaders/qobjectlist.h: Removed.
+ * ForwardingHeaders/qtooltip.h: Removed.
+ * ForwardingHeaders/scheduler.h: Removed.
+ * WebCore.xcodeproj/project.pbxproj:
+ * khtml/css/cssstyleselector.cpp:
+ * khtml/ecma/kjs_proxy.cpp:
+ (KJSProxyImpl::KJSProxyImpl):
+ (KJSProxyImpl::initScript):
+ * khtml/ecma/kjs_window.cpp:
+ * khtml/ecma/kjs_window.moc: Removed.
+ * khtml/html/html_documentimpl.cpp:
+ (DOM::HTMLDocumentImpl::HTMLDocumentImpl):
+ * khtml/html/html_documentimpl.moc: Removed.
+ * khtml/html/html_formimpl.cpp:
+ * khtml/html/html_formimpl.h:
+ * khtml/html/html_objectimpl.cpp:
+ * khtml/html/html_objectimpl.h:
+ * khtml/html/htmltokenizer.moc: Removed.
+ * khtml/khtml_part.cpp:
+ (KHTMLPart::didOpenURL):
+ (KHTMLPart::stopLoading):
+ (KHTMLPart::createJavaContext):
+ (KHTMLPart::begin):
+ (KHTMLPart::slotRedirection):
+ (KHTMLPart::setSelection):
+ (KHTMLPart::handleFallbackContent):
+ * khtml/khtml_part.h:
+ * khtml/khtml_part.moc: Removed.
+ * khtml/khtmlpart_p.h:
+ (KHTMLPartPrivate::KHTMLPartPrivate):
+ (KHTMLPartPrivate::~KHTMLPartPrivate):
+ * khtml/khtmlview.cpp:
+ (KHTMLViewPrivate::KHTMLViewPrivate):
+ (KHTMLViewPrivate::~KHTMLViewPrivate):
+ (KHTMLView::KHTMLView):
+ (KHTMLView::init):
+ (KHTMLView::resizeEvent):
+ (KHTMLView::layout):
+ (KHTMLView::viewportMousePressEvent):
+ (KHTMLView::viewportMouseDoubleClickEvent):
+ (KHTMLView::viewportMouseReleaseEvent):
+ (KHTMLView::scrollTo):
+ (KHTMLView::focusNextPrevNode):
+ (KHTMLView::focusInEvent):
+ (KHTMLView::focusOutEvent):
+ * khtml/khtmlview.h:
+ * khtml/khtmlview.moc: Removed.
+ * khtml/misc/loader.cpp:
+ (CachedImage::CachedImage):
+ (CachedImage::ref):
+ (CachedImage::deref):
+ (CachedImage::pixmap_size):
+ (CachedImage::valid_rect):
+ (CachedImage::clear):
+ (CachedXSLStyleSheet::CachedXSLStyleSheet):
+ (Cache::clear):
+ (Cache::flush):
+ (Cache::getStatistics):
+ (Cache::setCacheDisabled):
+ * khtml/misc/loader.h:
+ * khtml/misc/loader.moc: Removed.
+ * khtml/rendering/render_form.cpp:
+ (ComboBoxWidget::ComboBoxWidget):
+ (RenderSelect::createListBox):
+ (RenderSlider::slotClicked):
+ * khtml/rendering/render_form.h:
+ * khtml/rendering/render_form.moc: Removed.
+ * khtml/rendering/render_frames.cpp:
+ (RenderFrameSet::userResize):
+ (RenderPart::updateWidgetPosition):
+ * khtml/rendering/render_frames.moc: Removed.
+ * khtml/rendering/render_layer.cpp:
+ (khtml::RenderLayer::isTransparent):
+ * khtml/rendering/render_replaced.cpp:
+ (RenderWidget::destroy):
+ (RenderWidget::setSelectionState):
+ * khtml/rendering/render_replaced.moc: Removed.
+ * khtml/xml/dom_docimpl.cpp:
+ (DocumentTypeImpl::cloneNode):
+ * khtml/xml/dom_docimpl.moc: Removed.
+ * khtml/xml/xml_tokenizer.cpp:
+ * khtml/xml/xml_tokenizer.moc: Removed.
+ * ksvg2/svg/SVGImageElementImpl.cpp:
+ * kwq/KWQApplication.h:
+ (QApplication::sendEvent):
+ * kwq/KWQComboBox.h:
+ * kwq/KWQKApplication.h: Removed.
+ * kwq/KWQKHTMLPageCache.h: Removed.
+ * kwq/KWQKHTMLPart.mm:
+ (KWQKHTMLPart::openURLFromPageCache):
+ * kwq/KWQKHTMLPartBrowserExtension.h:
+ * kwq/KWQKHistoryProvider.mm:
+ * kwq/KWQKJavaAppletContext.h:
+ (KJavaAppletContext::KJavaAppletContext):
+ * kwq/KWQKPartsHistoryProvider.h:
+ * kwq/KWQKPartsPartManager.h: Removed.
+ * kwq/KWQMovie.h: Removed.
+ * kwq/KWQMovie.mm: Removed.
+ * kwq/KWQObject.h:
+ * kwq/KWQScrollView.h:
+ * kwq/KWQScrollView.mm:
+ * kwq/KWQWidget.h:
+
+2005-12-15 Eric Seidel <eseidel at apple.com>
+
+ Reviewed by darin.
+
khtml/css should use RefPtr instead of manual ref() deref()
http://bugzilla.opendarwin.org/show_bug.cgi?id=6094
@@ -73,8 +226,6 @@
(CSSParser::parseColor):
* khtml/css/cssstyleselector.cpp:
(khtml::CSSStyleSelector::applyProperty):
- * khtml/xsl/xslt_processorimpl.cpp:
- (DOM::XSLTProcessorImpl::transformToString):
2005-12-15 Adele Peterson <adele at apple.com>
1.56 +0 -30 WebCore/WebCore.xcodeproj/project.pbxproj
Index: project.pbxproj
===================================================================
RCS file: /cvs/root/WebCore/WebCore.xcodeproj/project.pbxproj,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- project.pbxproj 14 Dec 2005 23:31:38 -0000 1.55
+++ project.pbxproj 15 Dec 2005 22:31:18 -0000 1.56
@@ -187,7 +187,6 @@
93F1993E08245E59001E9ABC /* KWQGuardedPtr.h in Headers */ = {isa = PBXBuildFile; fileRef = F587869002DE3B8601EA4122 /* KWQGuardedPtr.h */; };
93F1993F08245E59001E9ABC /* KWQIODevice.h in Headers */ = {isa = PBXBuildFile; fileRef = F587869602DE3B8601EA4122 /* KWQIODevice.h */; };
93F1994008245E59001E9ABC /* KWQImage.h in Headers */ = {isa = PBXBuildFile; fileRef = F587869202DE3B8601EA4122 /* KWQImage.h */; };
- 93F1994108245E59001E9ABC /* KWQKApplication.h in Headers */ = {isa = PBXBuildFile; fileRef = F58785F002DE382001EA4122 /* KWQKApplication.h */; };
93F1994208245E59001E9ABC /* KWQKCharsets.h in Headers */ = {isa = PBXBuildFile; fileRef = F58785F102DE382001EA4122 /* KWQKCharsets.h */; };
93F1994308245E59001E9ABC /* KWQKComboBox.h in Headers */ = {isa = PBXBuildFile; fileRef = F587861E02DE398401EA4122 /* KWQKComboBox.h */; };
93F1994408245E59001E9ABC /* KWQKConfigBase.h in Headers */ = {isa = PBXBuildFile; fileRef = F58785F302DE382001EA4122 /* KWQKConfigBase.h */; };
@@ -198,7 +197,6 @@
93F1994908245E59001E9ABC /* KWQKGlobalSettings.h in Headers */ = {isa = PBXBuildFile; fileRef = F58785F602DE382001EA4122 /* KWQKGlobalSettings.h */; };
93F1994A08245E59001E9ABC /* KWQKHTMLFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = F587863402DE3A1401EA4122 /* KWQKHTMLFactory.h */; };
93F1994B08245E59001E9ABC /* KWQKHTMLFind.h in Headers */ = {isa = PBXBuildFile; fileRef = F587863502DE3A1401EA4122 /* KWQKHTMLFind.h */; };
- 93F1994C08245E59001E9ABC /* KWQKHTMLPageCache.h in Headers */ = {isa = PBXBuildFile; fileRef = F587863702DE3A1401EA4122 /* KWQKHTMLPageCache.h */; };
93F1994D08245E59001E9ABC /* KWQKHTMLPart.h in Headers */ = {isa = PBXBuildFile; fileRef = F58784FA02DE375901EA4122 /* KWQKHTMLPart.h */; };
93F1994E08245E59001E9ABC /* KWQKHTMLPartBrowserExtension.h in Headers */ = {isa = PBXBuildFile; fileRef = F587863302DE3A1401EA4122 /* KWQKHTMLPartBrowserExtension.h */; };
93F1994F08245E59001E9ABC /* KWQKHTMLSettings.h in Headers */ = {isa = PBXBuildFile; fileRef = F587863A02DE3A1401EA4122 /* KWQKHTMLSettings.h */; };
@@ -218,7 +216,6 @@
93F1995E08245E59001E9ABC /* KWQKPartsEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = F587866902DE3B3201EA4122 /* KWQKPartsEvent.h */; };
93F1996008245E59001E9ABC /* KWQKPartsHistoryProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = F587866B02DE3B3201EA4122 /* KWQKPartsHistoryProvider.h */; };
93F1996108245E59001E9ABC /* KWQKPartsPart.h in Headers */ = {isa = PBXBuildFile; fileRef = F587866C02DE3B3201EA4122 /* KWQKPartsPart.h */; };
- 93F1996208245E59001E9ABC /* KWQKPartsPartManager.h in Headers */ = {isa = PBXBuildFile; fileRef = F587866D02DE3B3201EA4122 /* KWQKPartsPartManager.h */; };
93F1996308245E59001E9ABC /* KWQKSSLKeyGen.h in Headers */ = {isa = PBXBuildFile; fileRef = F587866202DE3B1101EA4122 /* KWQKSSLKeyGen.h */; };
93F1996408245E59001E9ABC /* KWQKStandardDirs.h in Headers */ = {isa = PBXBuildFile; fileRef = F58785FF02DE382001EA4122 /* KWQKStandardDirs.h */; };
93F1996508245E59001E9ABC /* KWQKStaticDeleter.h in Headers */ = {isa = PBXBuildFile; fileRef = F58785FE02DE382001EA4122 /* KWQKStaticDeleter.h */; };
@@ -235,7 +232,6 @@
93F1997008245E59001E9ABC /* KWQMap.h in Headers */ = {isa = PBXBuildFile; fileRef = F587869A02DE3B8601EA4122 /* KWQMap.h */; };
93F1997108245E59001E9ABC /* KWQMapImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = F587851802DE375901EA4122 /* KWQMapImpl.h */; };
93F1997208245E59001E9ABC /* KWQMemArray.h in Headers */ = {isa = PBXBuildFile; fileRef = F587867702DE3B8601EA4122 /* KWQMemArray.h */; };
- 93F1997308245E59001E9ABC /* KWQMovie.h in Headers */ = {isa = PBXBuildFile; fileRef = F587869D02DE3B8601EA4122 /* KWQMovie.h */; };
93F1997508245E59001E9ABC /* KWQNamespace.h in Headers */ = {isa = PBXBuildFile; fileRef = F587869E02DE3B8601EA4122 /* KWQNamespace.h */; };
93F1997608245E59001E9ABC /* KWQObject.h in Headers */ = {isa = PBXBuildFile; fileRef = F587869F02DE3B8601EA4122 /* KWQObject.h */; };
93F1997708245E59001E9ABC /* KWQPageState.h in Headers */ = {isa = PBXBuildFile; fileRef = 9394E0A403AA5BBE008635CE /* KWQPageState.h */; };
@@ -422,7 +418,6 @@
93F19A3B08245E59001E9ABC /* KWQListBox.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587851402DE375901EA4122 /* KWQListBox.mm */; };
93F19A3C08245E59001E9ABC /* KWQListImpl.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587851602DE375901EA4122 /* KWQListImpl.mm */; };
93F19A3D08245E59001E9ABC /* KWQMapImpl.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587851902DE375901EA4122 /* KWQMapImpl.mm */; };
- 93F19A3E08245E59001E9ABC /* KWQMovie.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587851A02DE375901EA4122 /* KWQMovie.mm */; };
93F19A3F08245E59001E9ABC /* KWQTextField.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587851C02DE375901EA4122 /* KWQTextField.mm */; };
93F19A4008245E59001E9ABC /* KWQObject.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587851D02DE375901EA4122 /* KWQObject.mm */; };
93F19A4108245E59001E9ABC /* KWQPaintDeviceMetrics.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587851E02DE375901EA4122 /* KWQPaintDeviceMetrics.mm */; };
@@ -721,7 +716,6 @@
A8212B0908794A2300677359 /* KWQGuardedPtr.h in Headers */ = {isa = PBXBuildFile; fileRef = F587869002DE3B8601EA4122 /* KWQGuardedPtr.h */; };
A8212B0A08794A2300677359 /* KWQIODevice.h in Headers */ = {isa = PBXBuildFile; fileRef = F587869602DE3B8601EA4122 /* KWQIODevice.h */; };
A8212B0B08794A2300677359 /* KWQImage.h in Headers */ = {isa = PBXBuildFile; fileRef = F587869202DE3B8601EA4122 /* KWQImage.h */; };
- A8212B0C08794A2300677359 /* KWQKApplication.h in Headers */ = {isa = PBXBuildFile; fileRef = F58785F002DE382001EA4122 /* KWQKApplication.h */; };
A8212B0D08794A2300677359 /* KWQKCharsets.h in Headers */ = {isa = PBXBuildFile; fileRef = F58785F102DE382001EA4122 /* KWQKCharsets.h */; };
A8212B0E08794A2300677359 /* KWQKComboBox.h in Headers */ = {isa = PBXBuildFile; fileRef = F587861E02DE398401EA4122 /* KWQKComboBox.h */; };
A8212B0F08794A2300677359 /* KWQKConfigBase.h in Headers */ = {isa = PBXBuildFile; fileRef = F58785F302DE382001EA4122 /* KWQKConfigBase.h */; };
@@ -732,7 +726,6 @@
A8212B1408794A2300677359 /* KWQKGlobalSettings.h in Headers */ = {isa = PBXBuildFile; fileRef = F58785F602DE382001EA4122 /* KWQKGlobalSettings.h */; };
A8212B1508794A2300677359 /* KWQKHTMLFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = F587863402DE3A1401EA4122 /* KWQKHTMLFactory.h */; };
A8212B1608794A2300677359 /* KWQKHTMLFind.h in Headers */ = {isa = PBXBuildFile; fileRef = F587863502DE3A1401EA4122 /* KWQKHTMLFind.h */; };
- A8212B1708794A2300677359 /* KWQKHTMLPageCache.h in Headers */ = {isa = PBXBuildFile; fileRef = F587863702DE3A1401EA4122 /* KWQKHTMLPageCache.h */; };
A8212B1808794A2300677359 /* KWQKHTMLPart.h in Headers */ = {isa = PBXBuildFile; fileRef = F58784FA02DE375901EA4122 /* KWQKHTMLPart.h */; };
A8212B1908794A2300677359 /* KWQKHTMLPartBrowserExtension.h in Headers */ = {isa = PBXBuildFile; fileRef = F587863302DE3A1401EA4122 /* KWQKHTMLPartBrowserExtension.h */; };
A8212B1A08794A2300677359 /* KWQKHTMLSettings.h in Headers */ = {isa = PBXBuildFile; fileRef = F587863A02DE3A1401EA4122 /* KWQKHTMLSettings.h */; };
@@ -752,7 +745,6 @@
A8212B2908794A2300677359 /* KWQKPartsEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = F587866902DE3B3201EA4122 /* KWQKPartsEvent.h */; };
A8212B2B08794A2300677359 /* KWQKPartsHistoryProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = F587866B02DE3B3201EA4122 /* KWQKPartsHistoryProvider.h */; };
A8212B2C08794A2300677359 /* KWQKPartsPart.h in Headers */ = {isa = PBXBuildFile; fileRef = F587866C02DE3B3201EA4122 /* KWQKPartsPart.h */; };
- A8212B2D08794A2300677359 /* KWQKPartsPartManager.h in Headers */ = {isa = PBXBuildFile; fileRef = F587866D02DE3B3201EA4122 /* KWQKPartsPartManager.h */; };
A8212B2E08794A2300677359 /* KWQKSSLKeyGen.h in Headers */ = {isa = PBXBuildFile; fileRef = F587866202DE3B1101EA4122 /* KWQKSSLKeyGen.h */; };
A8212B2F08794A2300677359 /* KWQKStandardDirs.h in Headers */ = {isa = PBXBuildFile; fileRef = F58785FF02DE382001EA4122 /* KWQKStandardDirs.h */; };
A8212B3008794A2300677359 /* KWQKStaticDeleter.h in Headers */ = {isa = PBXBuildFile; fileRef = F58785FE02DE382001EA4122 /* KWQKStaticDeleter.h */; };
@@ -769,7 +761,6 @@
A8212B3B08794A2300677359 /* KWQMap.h in Headers */ = {isa = PBXBuildFile; fileRef = F587869A02DE3B8601EA4122 /* KWQMap.h */; };
A8212B3C08794A2300677359 /* KWQMapImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = F587851802DE375901EA4122 /* KWQMapImpl.h */; };
A8212B3D08794A2300677359 /* KWQMemArray.h in Headers */ = {isa = PBXBuildFile; fileRef = F587867702DE3B8601EA4122 /* KWQMemArray.h */; };
- A8212B3E08794A2300677359 /* KWQMovie.h in Headers */ = {isa = PBXBuildFile; fileRef = F587869D02DE3B8601EA4122 /* KWQMovie.h */; };
A8212B4008794A2300677359 /* KWQNamespace.h in Headers */ = {isa = PBXBuildFile; fileRef = F587869E02DE3B8601EA4122 /* KWQNamespace.h */; };
A8212B4108794A2300677359 /* KWQObject.h in Headers */ = {isa = PBXBuildFile; fileRef = F587869F02DE3B8601EA4122 /* KWQObject.h */; };
A8212B4208794A2300677359 /* KWQPageState.h in Headers */ = {isa = PBXBuildFile; fileRef = 9394E0A403AA5BBE008635CE /* KWQPageState.h */; };
@@ -988,7 +979,6 @@
A8212C2208794A2300677359 /* KWQListBox.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587851402DE375901EA4122 /* KWQListBox.mm */; };
A8212C2308794A2300677359 /* KWQListImpl.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587851602DE375901EA4122 /* KWQListImpl.mm */; };
A8212C2408794A2300677359 /* KWQMapImpl.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587851902DE375901EA4122 /* KWQMapImpl.mm */; };
- A8212C2508794A2300677359 /* KWQMovie.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587851A02DE375901EA4122 /* KWQMovie.mm */; };
A8212C2608794A2300677359 /* KWQTextField.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587851C02DE375901EA4122 /* KWQTextField.mm */; };
A8212C2708794A2300677359 /* KWQObject.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587851D02DE375901EA4122 /* KWQObject.mm */; };
A8212C2808794A2300677359 /* KWQPaintDeviceMetrics.mm in Sources */ = {isa = PBXBuildFile; fileRef = F587851E02DE375901EA4122 /* KWQPaintDeviceMetrics.mm */; };
@@ -2598,7 +2588,6 @@
F587851702DE375901EA4122 /* KWQLoader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = KWQLoader.h; sourceTree = "<group>"; };
F587851802DE375901EA4122 /* KWQMapImpl.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = KWQMapImpl.h; sourceTree = "<group>"; };
F587851902DE375901EA4122 /* KWQMapImpl.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQMapImpl.mm; sourceTree = "<group>"; };
- F587851A02DE375901EA4122 /* KWQMovie.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQMovie.mm; sourceTree = "<group>"; };
F587851B02DE375901EA4122 /* KWQTextField.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = KWQTextField.h; sourceTree = "<group>"; };
F587851C02DE375901EA4122 /* KWQTextField.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQTextField.mm; sourceTree = "<group>"; };
F587851D02DE375901EA4122 /* KWQObject.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = KWQObject.mm; sourceTree = "<group>"; };
@@ -2648,7 +2637,6 @@
F587855402DE375901EA4122 /* WebCoreViewFactory.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebCoreViewFactory.h; sourceTree = "<group>"; };
F587855502DE375901EA4122 /* WebCoreViewFactory.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = WebCoreViewFactory.m; sourceTree = "<group>"; };
F58785EA02DE37CB01EA4122 /* KWQDCOPClient.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = KWQDCOPClient.h; sourceTree = "<group>"; };
- F58785F002DE382001EA4122 /* KWQKApplication.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = KWQKApplication.h; sourceTree = "<group>"; };
F58785F102DE382001EA4122 /* KWQKCharsets.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = KWQKCharsets.h; sourceTree = "<group>"; };
F58785F302DE382001EA4122 /* KWQKConfigBase.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = KWQKConfigBase.h; sourceTree = "<group>"; };
F58785F402DE382001EA4122 /* KWQKDebug.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = KWQKDebug.h; sourceTree = "<group>"; };
@@ -2671,7 +2659,6 @@
F587863302DE3A1401EA4122 /* KWQKHTMLPartBrowserExtension.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = KWQKHTMLPartBrowserExtension.h; sourceTree = "<group>"; };
F587863402DE3A1401EA4122 /* KWQKHTMLFactory.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = KWQKHTMLFactory.h; sourceTree = "<group>"; };
F587863502DE3A1401EA4122 /* KWQKHTMLFind.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = KWQKHTMLFind.h; sourceTree = "<group>"; };
- F587863702DE3A1401EA4122 /* KWQKHTMLPageCache.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = KWQKHTMLPageCache.h; sourceTree = "<group>"; };
F587863A02DE3A1401EA4122 /* KWQKHTMLSettings.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = KWQKHTMLSettings.h; sourceTree = "<group>"; };
F587864402DE3A7701EA4122 /* KWQKJavaAppletContext.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = KWQKJavaAppletContext.h; sourceTree = "<group>"; };
F587864502DE3A7701EA4122 /* KWQKJavaAppletWidget.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = KWQKJavaAppletWidget.h; sourceTree = "<group>"; };
@@ -2685,7 +2672,6 @@
F587866902DE3B3201EA4122 /* KWQKPartsEvent.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = KWQKPartsEvent.h; sourceTree = "<group>"; };
F587866B02DE3B3201EA4122 /* KWQKPartsHistoryProvider.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = KWQKPartsHistoryProvider.h; sourceTree = "<group>"; };
F587866C02DE3B3201EA4122 /* KWQKPartsPart.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = KWQKPartsPart.h; sourceTree = "<group>"; };
- F587866D02DE3B3201EA4122 /* KWQKPartsPartManager.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = KWQKPartsPartManager.h; sourceTree = "<group>"; };
F587867602DE3B8601EA4122 /* KWQApplication.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = KWQApplication.h; sourceTree = "<group>"; };
F587867702DE3B8601EA4122 /* KWQMemArray.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = KWQMemArray.h; sourceTree = "<group>"; };
F587867902DE3B8601EA4122 /* KWQAsyncIO.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = KWQAsyncIO.h; sourceTree = "<group>"; };
@@ -2711,7 +2697,6 @@
F587869902DE3B8601EA4122 /* KWQPtrList.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = KWQPtrList.h; sourceTree = "<group>"; };
F587869A02DE3B8601EA4122 /* KWQMap.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = KWQMap.h; sourceTree = "<group>"; };
F587869B02DE3B8601EA4122 /* KWQMemArray.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = KWQMemArray.h; sourceTree = "<group>"; };
- F587869D02DE3B8601EA4122 /* KWQMovie.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = KWQMovie.h; sourceTree = "<group>"; };
F587869E02DE3B8601EA4122 /* KWQNamespace.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = KWQNamespace.h; sourceTree = "<group>"; };
F587869F02DE3B8601EA4122 /* KWQObject.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = KWQObject.h; sourceTree = "<group>"; };
F58786A102DE3B8601EA4122 /* KWQPaintDevice.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = KWQPaintDevice.h; sourceTree = "<group>"; };
@@ -4032,7 +4017,6 @@
F587861C02DE382201EA4122 /* kdecore */ = {
isa = PBXGroup;
children = (
- F58785F002DE382001EA4122 /* KWQKApplication.h */,
F58784C402DE375801EA4122 /* KWQApplication.mm */,
F58785F102DE382001EA4122 /* KWQKCharsets.h */,
F58784EB02DE375901EA4122 /* KWQKCharsets.mm */,
@@ -4082,7 +4066,6 @@
F587863402DE3A1401EA4122 /* KWQKHTMLFactory.h */,
F58784F702DE375901EA4122 /* KWQKHTMLFactory.mm */,
F587863502DE3A1401EA4122 /* KWQKHTMLFind.h */,
- F587863702DE3A1401EA4122 /* KWQKHTMLPageCache.h */,
F587863A02DE3A1401EA4122 /* KWQKHTMLSettings.h */,
F587864402DE3A7701EA4122 /* KWQKJavaAppletContext.h */,
F587864502DE3A7701EA4122 /* KWQKJavaAppletWidget.h */,
@@ -4120,7 +4103,6 @@
F58784F602DE375901EA4122 /* KWQKHistoryProvider.mm */,
F587866C02DE3B3201EA4122 /* KWQKPartsPart.h */,
65732B68054EF483007B42F8 /* KWQKPartsPart.mm */,
- F587866D02DE3B3201EA4122 /* KWQKPartsPartManager.h */,
);
name = kparts;
sourceTree = "<group>";
@@ -4180,8 +4162,6 @@
F587851802DE375901EA4122 /* KWQMapImpl.h */,
F587851902DE375901EA4122 /* KWQMapImpl.mm */,
F587869B02DE3B8601EA4122 /* KWQMemArray.h */,
- F587869D02DE3B8601EA4122 /* KWQMovie.h */,
- F587851A02DE375901EA4122 /* KWQMovie.mm */,
F587869E02DE3B8601EA4122 /* KWQNamespace.h */,
F587869F02DE3B8601EA4122 /* KWQObject.h */,
F587851D02DE375901EA4122 /* KWQObject.mm */,
@@ -4374,7 +4354,6 @@
93F1993E08245E59001E9ABC /* KWQGuardedPtr.h in Headers */,
93F1993F08245E59001E9ABC /* KWQIODevice.h in Headers */,
93F1994008245E59001E9ABC /* KWQImage.h in Headers */,
- 93F1994108245E59001E9ABC /* KWQKApplication.h in Headers */,
93F1994208245E59001E9ABC /* KWQKCharsets.h in Headers */,
93F1994308245E59001E9ABC /* KWQKComboBox.h in Headers */,
93F1994408245E59001E9ABC /* KWQKConfigBase.h in Headers */,
@@ -4385,7 +4364,6 @@
93F1994908245E59001E9ABC /* KWQKGlobalSettings.h in Headers */,
93F1994A08245E59001E9ABC /* KWQKHTMLFactory.h in Headers */,
93F1994B08245E59001E9ABC /* KWQKHTMLFind.h in Headers */,
- 93F1994C08245E59001E9ABC /* KWQKHTMLPageCache.h in Headers */,
93F1994D08245E59001E9ABC /* KWQKHTMLPart.h in Headers */,
93F1994E08245E59001E9ABC /* KWQKHTMLPartBrowserExtension.h in Headers */,
93F1994F08245E59001E9ABC /* KWQKHTMLSettings.h in Headers */,
@@ -4405,7 +4383,6 @@
93F1995E08245E59001E9ABC /* KWQKPartsEvent.h in Headers */,
93F1996008245E59001E9ABC /* KWQKPartsHistoryProvider.h in Headers */,
93F1996108245E59001E9ABC /* KWQKPartsPart.h in Headers */,
- 93F1996208245E59001E9ABC /* KWQKPartsPartManager.h in Headers */,
93F1996308245E59001E9ABC /* KWQKSSLKeyGen.h in Headers */,
93F1996408245E59001E9ABC /* KWQKStandardDirs.h in Headers */,
93F1996508245E59001E9ABC /* KWQKStaticDeleter.h in Headers */,
@@ -4422,7 +4399,6 @@
93F1997008245E59001E9ABC /* KWQMap.h in Headers */,
93F1997108245E59001E9ABC /* KWQMapImpl.h in Headers */,
93F1997208245E59001E9ABC /* KWQMemArray.h in Headers */,
- 93F1997308245E59001E9ABC /* KWQMovie.h in Headers */,
93F1997508245E59001E9ABC /* KWQNamespace.h in Headers */,
93F1997608245E59001E9ABC /* KWQObject.h in Headers */,
93F1997708245E59001E9ABC /* KWQPageState.h in Headers */,
@@ -4713,7 +4689,6 @@
A8212B0908794A2300677359 /* KWQGuardedPtr.h in Headers */,
A8212B0A08794A2300677359 /* KWQIODevice.h in Headers */,
A8212B0B08794A2300677359 /* KWQImage.h in Headers */,
- A8212B0C08794A2300677359 /* KWQKApplication.h in Headers */,
A8212B0D08794A2300677359 /* KWQKCharsets.h in Headers */,
A8212B0E08794A2300677359 /* KWQKComboBox.h in Headers */,
A8212B0F08794A2300677359 /* KWQKConfigBase.h in Headers */,
@@ -4724,7 +4699,6 @@
A8212B1408794A2300677359 /* KWQKGlobalSettings.h in Headers */,
A8212B1508794A2300677359 /* KWQKHTMLFactory.h in Headers */,
A8212B1608794A2300677359 /* KWQKHTMLFind.h in Headers */,
- A8212B1708794A2300677359 /* KWQKHTMLPageCache.h in Headers */,
A8212B1808794A2300677359 /* KWQKHTMLPart.h in Headers */,
A8212B1908794A2300677359 /* KWQKHTMLPartBrowserExtension.h in Headers */,
A8212B1A08794A2300677359 /* KWQKHTMLSettings.h in Headers */,
@@ -4744,7 +4718,6 @@
A8212B2908794A2300677359 /* KWQKPartsEvent.h in Headers */,
A8212B2B08794A2300677359 /* KWQKPartsHistoryProvider.h in Headers */,
A8212B2C08794A2300677359 /* KWQKPartsPart.h in Headers */,
- A8212B2D08794A2300677359 /* KWQKPartsPartManager.h in Headers */,
A8212B2E08794A2300677359 /* KWQKSSLKeyGen.h in Headers */,
A8212B2F08794A2300677359 /* KWQKStandardDirs.h in Headers */,
A8212B3008794A2300677359 /* KWQKStaticDeleter.h in Headers */,
@@ -4761,7 +4734,6 @@
A8212B3B08794A2300677359 /* KWQMap.h in Headers */,
A8212B3C08794A2300677359 /* KWQMapImpl.h in Headers */,
A8212B3D08794A2300677359 /* KWQMemArray.h in Headers */,
- A8212B3E08794A2300677359 /* KWQMovie.h in Headers */,
A8212B4008794A2300677359 /* KWQNamespace.h in Headers */,
A8212B4108794A2300677359 /* KWQObject.h in Headers */,
A8212B4208794A2300677359 /* KWQPageState.h in Headers */,
@@ -6261,7 +6233,6 @@
93F19A3B08245E59001E9ABC /* KWQListBox.mm in Sources */,
93F19A3C08245E59001E9ABC /* KWQListImpl.mm in Sources */,
93F19A3D08245E59001E9ABC /* KWQMapImpl.mm in Sources */,
- 93F19A3E08245E59001E9ABC /* KWQMovie.mm in Sources */,
93F19A3F08245E59001E9ABC /* KWQTextField.mm in Sources */,
93F19A4008245E59001E9ABC /* KWQObject.mm in Sources */,
93F19A4108245E59001E9ABC /* KWQPaintDeviceMetrics.mm in Sources */,
@@ -6531,7 +6502,6 @@
A8212C2208794A2300677359 /* KWQListBox.mm in Sources */,
A8212C2308794A2300677359 /* KWQListImpl.mm in Sources */,
A8212C2408794A2300677359 /* KWQMapImpl.mm in Sources */,
- A8212C2508794A2300677359 /* KWQMovie.mm in Sources */,
A8212C2608794A2300677359 /* KWQTextField.mm in Sources */,
A8212C2708794A2300677359 /* KWQObject.mm in Sources */,
A8212C2808794A2300677359 /* KWQPaintDeviceMetrics.mm in Sources */,
1.367 +7 -61 WebCore/khtml/khtml_part.cpp
Index: khtml_part.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/khtml_part.cpp,v
retrieving revision 1.366
retrieving revision 1.367
diff -u -r1.366 -r1.367
--- khtml_part.cpp 14 Dec 2005 23:31:40 -0000 1.366
+++ khtml_part.cpp 15 Dec 2005 22:31:23 -0000 1.367
@@ -30,8 +30,6 @@
#define QT_NO_CLIPBOARD
#define QT_NO_DRAGANDDROP
-#include "khtml_pagecache.h"
-
#include "css/csshelper.h"
#include "css/cssproperties.h"
#include "css/cssstyleselector.h"
@@ -66,10 +64,10 @@
using namespace HTMLNames;
#include "khtmlview.h"
-#include <kparts/partmanager.h>
#include "ecma/kjs_proxy.h"
#include "ecma/xmlhttprequest.h"
#include "khtml_settings.h"
+#include "khtmlpart_p.h"
#include <sys/types.h>
#include <assert.h>
@@ -79,32 +77,15 @@
#include <kio/job.h>
#include <kio/global.h>
#include <kdebug.h>
-#include <kiconloader.h>
#include <klocale.h>
#include <kcharsets.h>
-#include <kmessagebox.h>
-#include <kstdaction.h>
-#include <kfiledialog.h>
-#include <ktrader.h>
-#include <kdatastream.h>
-#include <ktempfile.h>
#include <kglobalsettings.h>
-#include <kurldrag.h>
-#include <kapplication.h>
#if !defined(QT_NO_DRAGANDDROP)
#include <kmultipledrag.h>
#endif
-#include <ksslcertchain.h>
-#include <ksslinfodlg.h>
-
-#include <qclipboard.h>
#include <qfile.h>
-#include <qmetaobject.h>
#include <qptrlist.h>
-#include <private/qucomextra_p.h>
-
-#include "khtmlpart_p.h"
#include <CoreServices/CoreServices.h>
@@ -360,11 +341,8 @@
// initializing m_url to the new url breaks relative links when opening such a link after this call and _before_ begin() is called (when the first
// data arrives) (Simon)
m_url = url;
- if(m_url.protocol().startsWith( "http" ) && !m_url.host().isEmpty() &&
- m_url.path().isEmpty()) {
+ if(m_url.protocol().startsWith("http") && !m_url.host().isEmpty() && m_url.path().isEmpty())
m_url.setPath("/");
- emit d->m_extension->setLocationBarURL( m_url.prettyURL() );
- }
// copy to m_workingURL after fixing m_url above
d->m_workingURL = m_url;
@@ -431,14 +409,7 @@
slotFinishedParsing();
d->m_doc->setParsing(false);
}
-
- if ( !d->m_workingURL.isEmpty() )
- {
- // Aborted before starting to render
- kdDebug( 6050 ) << "Aborted before starting to render, reverting location bar to " << m_url.prettyURL() << endl;
- emit d->m_extension->setLocationBarURL( m_url.prettyURL() );
- }
-
+
d->m_workingURL = KURL();
if (DocumentImpl *doc = d->m_doc) {
@@ -620,9 +591,8 @@
KJavaAppletContext *KHTMLPart::createJavaContext()
{
#ifndef Q_WS_QWS
- if ( !d->m_javaContext ) {
- d->m_javaContext = new KJavaAppletContext(d->m_dcopobject, this);
- }
+ if (!d->m_javaContext)
+ d->m_javaContext = new KJavaAppletContext(this);
return d->m_javaContext;
#else
@@ -919,13 +889,6 @@
d->m_bLoadEventEmitted = false;
d->m_bLoadingMainResource = true;
- if(url.isValid()) {
- KHTMLFactory::vLinks()->insert( KWQ(this)->requestedURLString() );
- }
-
- // ###
- //stopParser();
-
KParts::URLArgs args( d->m_extension->urlArgs() );
args.xOffset = xOffset;
args.yOffset = yOffset;
@@ -940,10 +903,8 @@
KURL baseurl;
// We don't need KDE chained URI handling or window caption setting
- if ( !m_url.isEmpty() )
- {
+ if (!m_url.isEmpty())
baseurl = m_url;
- }
if (DOMImplementationImpl::isXMLMIMEType(args.serviceType))
d->m_doc = DOMImplementationImpl::instance()->createDocument( d->m_view );
@@ -963,7 +924,6 @@
KWQ(this)->updatePolicyBaseURL();
-
setAutoloadImages( d->m_settings->autoLoadImages() );
QString userStyleSheet = d->m_settings->userStyleSheet();
@@ -977,7 +937,6 @@
if (d->m_view)
d->m_view->resizeContents( 0, 0 );
connect(d->m_doc,SIGNAL(finishedParsing()),this,SLOT(slotFinishedParsing()));
-
}
void KHTMLPart::write( const char *str, int len )
@@ -1413,13 +1372,9 @@
void KHTMLPart::slotRedirection(KIO::Job*, const KURL& url)
{
- // the slave told us that we got redirected
- // kdDebug( 6050 ) << "redirection by KIO to " << url.url() << endl;
- emit d->m_extension->setLocationBarURL( url.prettyURL() );
- d->m_workingURL = url;
+ d->m_workingURL = url;
}
-
QString KHTMLPart::encoding() const
{
if(d->m_haveEncoding && !d->m_encoding.isEmpty())
@@ -1591,8 +1546,6 @@
clearTypingStyle();
KWQ(this)->respondToChangedSelection(oldSelection, closeTyping);
-
- emitSelectionChanged();
}
void KHTMLPart::setDragCaret(const SelectionController &dragCaret)
@@ -2199,10 +2152,6 @@
return (KHTMLPart *)parent();
}
-void KHTMLPart::emitSelectionChanged()
-{
-}
-
int KHTMLPart::zoomFactor() const
{
return d->m_zoomFactor;
@@ -3435,6 +3384,3 @@
return;
static_cast<HTMLObjectElementImpl *>(node)->renderFallbackContent();
}
-
-using namespace KParts;
-#include "khtml_part.moc"
1.144 +0 -5 WebCore/khtml/khtml_part.h
Index: khtml_part.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/khtml_part.h,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- khtml_part.h 14 Dec 2005 23:31:41 -0000 1.143
+++ khtml_part.h 15 Dec 2005 22:31:26 -0000 1.144
@@ -1100,11 +1100,6 @@
/**
* @internal
*/
- void emitSelectionChanged();
-
- /**
- * @internal
- */
void timerEvent(QTimerEvent *);
/**
1.64 +0 -8 WebCore/khtml/khtmlpart_p.h
Index: khtmlpart_p.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/khtmlpart_p.h,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- khtmlpart_p.h 14 Dec 2005 23:31:41 -0000 1.63
+++ khtmlpart_p.h 15 Dec 2005 22:31:28 -0000 1.64
@@ -29,7 +29,6 @@
#include <kcursor.h>
#include <kaction.h>
-#include <kparts/partmanager.h>
#include <kio/global.h>
#include "khtml_find.h"
@@ -88,8 +87,6 @@
typedef FrameList::ConstIterator ConstFrameIt;
typedef FrameList::Iterator FrameIt;
-static int khtml_part_dcop_counter = 0;
-
enum RedirectionScheduled {
noRedirectionScheduled,
redirectionScheduled,
@@ -181,12 +178,9 @@
m_opener = 0;
m_openedByJS = false;
m_newJSInterpreterExists = false;
- m_dcopobject = 0;
- m_dcop_counter = ++khtml_part_dcop_counter;
}
~KHTMLPartPrivate()
{
- delete m_dcopobject;
delete m_extension;
delete m_jscript;
#ifndef Q_WS_QWS
@@ -226,8 +220,6 @@
bool m_bPluginsOverride :1;
bool m_restored :1;
int m_frameNameId;
- int m_dcop_counter;
- DCOPObject *m_dcopobject;
#ifndef Q_WS_QWS
KJavaAppletContext *m_javaContext;
1.159 +4 -143 WebCore/khtml/khtmlview.cpp
Index: khtmlview.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/khtmlview.cpp,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -r1.158 -r1.159
--- khtmlview.cpp 8 Dec 2005 08:40:24 -0000 1.158
+++ khtmlview.cpp 15 Dec 2005 22:31:29 -0000 1.159
@@ -22,8 +22,6 @@
* Boston, MA 02111-1307, USA.
*/
#include "config.h"
-#include "khtmlview.moc"
-
#include "khtmlview.h"
#include "khtml_part.h"
@@ -45,29 +43,20 @@
#include "css/cssstyleselector.h"
#include "misc/helper.h"
#include "khtml_settings.h"
-#include "khtml_printsettings.h"
#include "khtmlpart_p.h"
#include <kcursor.h>
-#include <ksimpleconfig.h>
#include <kstandarddirs.h>
-#include <kprinter.h>
-#include <qtooltip.h>
#include <qpainter.h>
#include <qpaintdevicemetrics.h>
-#include <kapplication.h>
#include <kimageio.h>
#include <assert.h>
#include <kdebug.h>
-#include <kurldrag.h>
-#include <qobjectlist.h>
#include "KWQAccObjectCache.h"
-#define PAINT_BUFFER_HEIGHT 128
-
// #define INSTRUMENT_LAYOUT_SCHEDULING 1
using namespace DOM;
@@ -75,32 +64,7 @@
using namespace HTMLNames;
using namespace khtml;
-class KHTMLToolTip;
-
-#ifndef QT_NO_TOOLTIP
-
-class KHTMLToolTip : public QToolTip
-{
-public:
- KHTMLToolTip(KHTMLView *view, KHTMLViewPrivate* vp) : QToolTip(view->viewport())
- {
- m_view = view;
- m_viewprivate = vp;
- };
-
-protected:
- virtual void maybeTip(const QPoint &);
-
-private:
-
- KHTMLView *m_view;
- KHTMLViewPrivate* m_viewprivate;
-};
-
-#endif
-
class KHTMLViewPrivate {
- friend class KHTMLToolTip;
public:
KHTMLViewPrivate()
{
@@ -111,9 +75,6 @@
layoutTimerId = 0;
delayedLayout = false;
mousePressed = false;
-#ifndef QT_NO_TOOLTIP
- tooltip = 0;
-#endif
doFullRepaint = true;
isTransparent = false;
vmode = hmode = QScrollView::Auto;
@@ -122,14 +83,10 @@
}
~KHTMLViewPrivate()
{
-
if (underMouse)
underMouse->deref();
if (clickNode)
clickNode->deref();
-#ifndef QT_NO_TOOLTIP
- delete tooltip;
-#endif
delete repaintRects;
}
void reset()
@@ -194,9 +151,6 @@
bool needToInitScrollBars;
bool mousePressed;
bool isTransparent;
-#ifndef QT_NO_TOOLTIP
- KHTMLToolTip *tooltip;
-#endif
// Used by objects during layout to communicate repaints that need to take place only
// after all layout has been completed.
@@ -205,25 +159,6 @@
RefPtr<NodeImpl> dragTarget;
};
-#ifndef QT_NO_TOOLTIP
-
-void KHTMLToolTip::maybeTip(const QPoint& /*p*/)
-{
- NodeImpl *node = m_viewprivate->underMouse;
- while ( node ) {
- if ( node->isElementNode() ) {
- AtomicString s = static_cast<ElementImpl*>( node )->getAttribute(ATTR_TITLE);
- if (!s.isEmpty()) {
- QRect r( m_view->contentsToViewport( node->getRect().topLeft() ), node->getRect().size() );
- tip( r, s.qstring() );
- }
- break;
- }
- node = node->parentNode();
- }
-}
-#endif
-
KHTMLView::KHTMLView( KHTMLPart *part, QWidget *parent, const char *name)
: QScrollView( parent, name, WResizeNoErase | WRepaintNoErase | WPaintUnclipped ),
_refCount(1)
@@ -234,21 +169,10 @@
m_part->ref();
d = new KHTMLViewPrivate;
-
- connect(kapp, SIGNAL(kdisplayPaletteChanged()), this, SLOT(slotPaletteChanged()));
connect(this, SIGNAL(contentsMoving(int, int)), this, SLOT(slotScrollBarMoved()));
- // initialize QScrollview
- enableClipper(true);
- viewport()->setMouseTracking(true);
- viewport()->setBackgroundMode(NoBackground);
-
KImageIO::registerFormats();
-#ifndef QT_NO_TOOLTIP
- d->tooltip = new KHTMLToolTip( this, d );
-#endif
-
init();
viewport()->show();
@@ -303,9 +227,6 @@
_marginHeight = -1;
_width = 0;
_height = 0;
-
- setAcceptDrops(true);
-
}
void KHTMLView::clear()
@@ -329,26 +250,10 @@
suppressScrollBars(true);
}
-void KHTMLView::hideEvent(QHideEvent* e)
+void KHTMLView::resizeEvent(QResizeEvent* e)
{
-// viewport()->setBackgroundMode(PaletteBase);
- QScrollView::hideEvent(e);
-}
-
-void KHTMLView::showEvent(QShowEvent* e)
-{
-// viewport()->setBackgroundMode(NoBackground);
- QScrollView::showEvent(e);
-}
-
-void KHTMLView::resizeEvent (QResizeEvent* e)
-{
- QScrollView::resizeEvent(e);
-
- if ( m_part && m_part->xmlDocImpl() )
- m_part->xmlDocImpl()->dispatchWindowEvent( EventNames::resizeEvent, false, false );
-
- KApplication::sendPostedEvents(viewport(), QEvent::Paint);
+ if (m_part && m_part->xmlDocImpl())
+ m_part->xmlDocImpl()->dispatchWindowEvent(EventNames::resizeEvent, false, false);
}
void KHTMLView::initScrollBars()
@@ -359,7 +264,6 @@
setScrollBarsMode(hScrollBarMode());
}
-
void KHTMLView::setMarginWidth(int w)
{
// make it update the rendering area when set
@@ -372,7 +276,6 @@
_marginHeight = h;
}
-
void KHTMLView::adjustViewSize()
{
if( m_part->xmlDocImpl() ) {
@@ -551,8 +454,6 @@
root->layout();
m_part->invalidateSelection();
-
- //kdDebug( 6000 ) << "TIME: layout() dt=" << qt.elapsed() << endl;
d->layoutSchedulingEnabled=true;
d->layoutSuppressed = false;
@@ -619,8 +520,6 @@
int xm, ym;
viewportToContents(_mouse->x(), _mouse->y(), xm, ym);
- //kdDebug( 6000 ) << "\nmousePressEvent: x=" << xm << ", y=" << ym << endl;
-
d->mousePressed = true;
NodeImpl::MouseEvent mev( _mouse->stateAfter(), NodeImpl::MousePress );
@@ -664,8 +563,6 @@
int xm, ym;
viewportToContents(_mouse->x(), _mouse->y(), xm, ym);
- //kdDebug( 6000 ) << "mouseDblClickEvent: x=" << xm << ", y=" << ym << endl;
-
// We get this instead of a second mouse-up
d->mousePressed = false;
@@ -813,8 +710,6 @@
d->mousePressed = false;
- //kdDebug( 6000 ) << "\nmouseReleaseEvent: x=" << xm << ", y=" << ym << endl;
-
NodeImpl::MouseEvent mev( _mouse->stateAfter(), NodeImpl::MouseRelease );
m_part->xmlDocImpl()->prepareMouseEvent( false, xm, ym, &mev );
@@ -849,26 +744,6 @@
}
-void KHTMLView::keyReleaseEvent(QKeyEvent *_ke)
-{
- if(m_part->xmlDocImpl() && m_part->xmlDocImpl()->focusNode()) {
- // Qt is damn buggy. we receive release events from our child
- // widgets. therefore, do not support keyrelease event on generic
- // nodes for now until we found a workaround for the Qt bugs. (Dirk)
-// if (m_part->xmlDocImpl()->focusNode()->dispatchKeyEvent(_ke)) {
-// _ke->accept();
-// return;
-// }
-// QScrollView::keyReleaseEvent(_ke);
- Q_UNUSED(_ke);
- }
-}
-
-void KHTMLView::contentsContextMenuEvent ( QContextMenuEvent *_ce )
-{
-// ### what kind of c*** is that ?
-}
-
bool KHTMLView::dispatchDragEvent(const AtomicString &eventType, NodeImpl *dragTarget, const QPoint &loc, ClipboardImpl *clipboard)
{
int clientX, clientY;
@@ -957,9 +832,7 @@
y = bounds.top();
xe = bounds.right();
ye = bounds.bottom();
-
- //kdDebug(6000)<<"scrolling coords: x="<<x<<" y="<<y<<" width="<<xe-x<<" height="<<ye-y<<endl;
-
+
int deltax;
int deltay;
@@ -1010,8 +883,6 @@
scrollBy(scrollX, scrollY);
-
-
// generate abs(scroll.)
if (scrollX<0)
scrollX=-scrollX;
@@ -1046,9 +917,6 @@
// If there was previously no focus node and the user has scrolled the document, then instead of picking the first
// focusable node in the document, use the first one that lies within the visible area (if possible).
if (!oldFocusNode && newFocusNode && d->scrollBarMoved) {
-
- kdDebug(6000) << " searching for visible link" << endl;
-
bool visible = false;
NodeImpl *toFocus = newFocusNode;
while (!visible && toFocus) {
@@ -1238,8 +1106,6 @@
d->ignoreWheelEvents = e;
}
-#ifndef QT_NO_WHEELEVENT
-
void KHTMLView::viewportWheelEvent(QWheelEvent* e)
{
DocumentImpl *doc = m_part->xmlDocImpl();
@@ -1267,20 +1133,15 @@
}
-#endif
-
-
void KHTMLView::focusInEvent( QFocusEvent *e )
{
m_part->setCaretVisible();
- QScrollView::focusInEvent( e );
}
void KHTMLView::focusOutEvent( QFocusEvent *e )
{
m_part->stopAutoScroll();
m_part->setCaretVisible(false);
- QScrollView::focusOutEvent( e );
}
void KHTMLView::slotScrollBarMoved()
1.50 +3 -9 WebCore/khtml/khtmlview.h
Index: khtmlview.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/khtmlview.h,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- khtmlview.h 21 Nov 2005 01:19:49 -0000 1.49
+++ khtmlview.h 15 Dec 2005 22:31:31 -0000 1.50
@@ -164,15 +164,11 @@
void clear();
signals:
- void cleared();
-
-protected:
+ void cleared();
+
public:
- void clearPart();
+ void clearPart();
virtual void resizeEvent ( QResizeEvent * event );
- virtual void showEvent ( QShowEvent * );
- virtual void hideEvent ( QHideEvent *);
-
virtual void viewportMousePressEvent( QMouseEvent * );
virtual void focusInEvent( QFocusEvent * );
virtual void focusOutEvent( QFocusEvent * );
@@ -184,8 +180,6 @@
#endif
void keyPressEvent( QKeyEvent *_ke );
- void keyReleaseEvent ( QKeyEvent *_ke );
- void contentsContextMenuEvent ( QContextMenuEvent *_ce );
void doAutoScroll();
bool updateDragAndDrop(const QPoint &, DOM::ClipboardImpl *clipboard);
1.231 +0 -3 WebCore/khtml/css/cssstyleselector.cpp
Index: cssstyleselector.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/css/cssstyleselector.cpp,v
retrieving revision 1.230
retrieving revision 1.231
diff -u -r1.230 -r1.231
--- cssstyleselector.cpp 15 Dec 2005 21:39:57 -0000 1.230
+++ cssstyleselector.cpp 15 Dec 2005 22:31:33 -0000 1.231
@@ -54,8 +54,6 @@
#include <kstandarddirs.h>
#include <kcharsets.h>
#include <qfile.h>
-#include <qfontdatabase.h>
-#include <qfontinfo.h>
#include <qvaluelist.h>
#include <qstring.h>
#include <kdebug.h>
@@ -63,7 +61,6 @@
#include <qdatetime.h>
#include <assert.h>
#include <qpaintdevicemetrics.h>
-#include <qintcache.h>
#include <stdlib.h>
#include <kxmlcore/HashMap.h>
1.30 +1 -6 WebCore/khtml/ecma/kjs_proxy.cpp
Index: kjs_proxy.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_proxy.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- kjs_proxy.cpp 14 Dec 2005 23:31:46 -0000 1.29
+++ kjs_proxy.cpp 15 Dec 2005 22:31:36 -0000 1.30
@@ -24,8 +24,6 @@
#include "kjs_window.h"
#include "kjs_events.h"
#include <khtml_part.h>
-#include <kprotocolmanager.h>
-#include <kdebug.h>
#include <kjs/collector.h>
using namespace KJS;
@@ -40,6 +38,7 @@
{
m_script = 0;
m_part = part;
+ m_handlerLineno = 0;
#ifndef NDEBUG
s_count++;
#endif
@@ -157,10 +156,6 @@
// Create a KJS interpreter for this part
m_script = new KJS::ScriptInterpreter(globalObject, m_part);
-
-#ifdef KJS_DEBUGGER
- m_script->setDebuggingEnabled(m_debugEnabled);
-#endif
globalObject->put(m_script->globalExec(), "debug", new TestFunctionImp(), Internal);
QString userAgent = KWQ(m_part)->userAgent();
1.200 +0 -4 WebCore/khtml/ecma/kjs_window.cpp
Index: kjs_window.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/ecma/kjs_window.cpp,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -r1.199 -r1.200
--- kjs_window.cpp 14 Dec 2005 23:31:46 -0000 1.199
+++ kjs_window.cpp 15 Dec 2005 22:31:36 -0000 1.200
@@ -24,11 +24,9 @@
#include <qstylesheet.h>
#include <qtimer.h>
-#include <qinputdialog.h>
#include <qpaintdevicemetrics.h>
#include <qapplication.h>
#include <kdebug.h>
-#include <kmessagebox.h>
#include <klocale.h>
#include <kparts/browserinterface.h>
#include <kwin.h>
@@ -2581,5 +2579,3 @@
}
} // namespace KJS
-
-#include "kjs_window.moc"
1.78 +0 -14 WebCore/khtml/html/html_documentimpl.cpp
Index: html_documentimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/html_documentimpl.cpp,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- html_documentimpl.cpp 14 Dec 2005 23:31:50 -0000 1.77
+++ html_documentimpl.cpp 15 Dec 2005 22:31:38 -0000 1.78
@@ -76,7 +76,6 @@
#include "dom/dom_exception.h"
#include <dcopclient.h>
-#include <kapplication.h>
#include <kdebug.h>
#include <kurl.h>
#include <kcharsets.h>
@@ -90,7 +89,6 @@
#include "KWQKCookieJar.h"
-
// Turn off inlining to avoid warning with newer gcc.
#undef __inline
#define __inline
@@ -108,18 +106,8 @@
HTMLDocumentImpl::HTMLDocumentImpl(DOMImplementationImpl *_implementation, KHTMLView *v)
: DocumentImpl(_implementation, v)
{
-// kdDebug( 6090 ) << "HTMLDocumentImpl constructor this = " << this << endl;
bodyElement = 0;
htmlElement = 0;
-
-/* dynamic history stuff to be fixed later (pfeiffer)
- connect( KHTMLFactory::vLinks(), SIGNAL( inserted( const QString& )),
- SLOT( slotHistoryChanged() ));
- connect( KHTMLFactory::vLinks(), SIGNAL( removed( const QString& )),
- SLOT( slotHistoryChanged() ));
-*/
- connect( KHTMLFactory::vLinks(), SIGNAL( cleared()),
- SLOT( slotHistoryChanged() ));
}
HTMLDocumentImpl::~HTMLDocumentImpl()
@@ -496,5 +484,3 @@
}
}
-
-#include "html_documentimpl.moc"
1.210 +0 -33 WebCore/khtml/html/html_formimpl.cpp
Index: html_formimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/html_formimpl.cpp,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -r1.209 -r1.210
--- html_formimpl.cpp 14 Dec 2005 23:31:50 -0000 1.209
+++ html_formimpl.cpp 15 Dec 2005 22:31:38 -0000 1.210
@@ -51,11 +51,7 @@
#include <kcharsets.h>
#include <kdebug.h>
-#include <kmimetype.h>
-#include <kmessagebox.h>
#include <klocale.h>
-#include <netaccess.h>
-#include <kfileitem.h>
#include <qfile.h>
#include <qtextcodec.h>
@@ -963,35 +959,6 @@
return false;
}
-void HTMLGenericFormElementImpl::defaultEventHandler(EventImpl *evt)
-{
- if (evt->target()==this)
- {
- // Report focus in/out changes to the browser extension (editable widgets only)
- KHTMLPart *part = getDocument()->part();
- if (evt->type()==DOMFocusInEvent && isEditable() && part && m_render && m_render->isWidget()) {
- KHTMLPartBrowserExtension *ext = static_cast<KHTMLPartBrowserExtension *>(part->browserExtension());
- QWidget *widget = static_cast<RenderWidget*>(m_render)->widget();
- if (ext)
- ext->editableWidgetFocused(widget);
- }
-
- // We don't want this default key event handling, we'll count on
- // Cocoa event dispatch if the event doesn't get blocked.
-
- if (evt->type()==DOMFocusOutEvent && isEditable() && part && m_render && m_render->isWidget()) {
- KHTMLPartBrowserExtension *ext = static_cast<KHTMLPartBrowserExtension *>(part->browserExtension());
- QWidget *widget = static_cast<RenderWidget*>(m_render)->widget();
- if (ext)
- ext->editableWidgetBlurred(widget);
-
- // ### Don't count popup as a valid reason for losing the focus (example: opening the options of a select
- // combobox shouldn't emit onblur)
- }
- }
- HTMLElementImpl::defaultEventHandler(evt);
-}
-
bool HTMLGenericFormElementImpl::isEditable()
{
return false;
1.98 +0 -1 WebCore/khtml/html/html_formimpl.h
Index: html_formimpl.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/html_formimpl.h,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- html_formimpl.h 1 Dec 2005 10:32:18 -0000 1.97
+++ html_formimpl.h 15 Dec 2005 22:31:39 -0000 1.98
@@ -205,7 +205,6 @@
*/
virtual bool appendFormData(FormDataList&, bool) { return false; }
- virtual void defaultEventHandler(EventImpl *evt);
virtual bool isEditable();
virtual QString state();
1.91 +0 -8 WebCore/khtml/html/html_objectimpl.cpp
Index: html_objectimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/html_objectimpl.cpp,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- html_objectimpl.cpp 11 Dec 2005 09:26:12 -0000 1.90
+++ html_objectimpl.cpp 15 Dec 2005 22:31:39 -0000 1.91
@@ -206,14 +206,6 @@
#endif
}
-bool HTMLAppletElementImpl::getMember(const QString & name, JType & type, QString & val) {
- return false;
-}
-
-bool HTMLAppletElementImpl::callMember(const QString & name, const QStringList & args, JType & type, QString & val) {
- return false;
-}
-
KJS::Bindings::Instance *HTMLAppletElementImpl::getAppletInstance() const
{
KHTMLPart* part = getDocument()->part();
1.41 +0 -3 WebCore/khtml/html/html_objectimpl.h
Index: html_objectimpl.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/html_objectimpl.h,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- html_objectimpl.h 21 Nov 2005 01:20:14 -0000 1.40
+++ html_objectimpl.h 15 Dec 2005 22:31:40 -0000 1.41
@@ -52,9 +52,6 @@
virtual bool rendererIsNeeded(khtml::RenderStyle *);
virtual khtml::RenderObject *createRenderer(RenderArena *, khtml::RenderStyle *);
virtual void closeRenderer();
-
- bool getMember(const QString &, JType &, QString &);
- bool callMember(const QString &, const QStringList &, JType &, QString &);
DOMString align() const;
void setAlign(const DOMString &);
1.83 +10 -103 WebCore/khtml/misc/loader.cpp
Index: loader.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/misc/loader.cpp,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- loader.cpp 14 Dec 2005 23:31:54 -0000 1.82
+++ loader.cpp 15 Dec 2005 22:31:43 -0000 1.83
@@ -38,17 +38,12 @@
#define DEFCACHESIZE 4096*1024
#include <qasyncio.h>
-#include <qasyncimageio.h>
#include <qpainter.h>
-#include <qbitmap.h>
-#include <qmovie.h>
#include <kio/job.h>
#include <kio/jobclasses.h>
#include <kimageio.h>
#include <kcharsets.h>
-#include <kiconloader.h>
-#include <scheduler.h>
#include <kdebug.h>
#include "khtml_factory.h"
#include "khtml_part.h"
@@ -462,8 +457,6 @@
: QObject(), CachedObject(url, Image, _cachePolicy, _expireDate)
, m_dataSize(0)
{
-
- m = 0;
p = 0;
pixPart = 0;
bg = 0;
@@ -488,41 +481,24 @@
void CachedImage::ref( CachedObjectClient *c )
{
-#ifdef CACHE_DEBUG
- kdDebug( 6060 ) << this << " CachedImage::ref(" << c << ") " << endl;
-#endif
-
CachedObject::ref(c);
- if( m ) {
- m->unpause();
- if( m->finished() || m_clients.count() == 1 )
- m->restart();
- }
-
// for mouseovers, dynamic changes
if (!valid_rect().isNull())
c->setPixmap( pixmap(), valid_rect(), this);
- if(!m_loading) c->notifyFinished(this);
+ if(!m_loading)
+ c->notifyFinished(this);
}
void CachedImage::deref( CachedObjectClient *c )
{
-#ifdef CACHE_DEBUG
- kdDebug( 6060 ) << this << " CachedImage::deref(" << c << ") " << endl;
-#endif
Cache::flush();
CachedObject::deref(c);
- if(m && m_clients.isEmpty() && m->running())
- m->pause();
if ( canDelete() && m_free )
delete this;
}
-#define BGMINWIDTH 32
-#define BGMINHEIGHT 32
-
const QPixmap &CachedImage::tiled_pixmap(const QColor& newc)
{
return pixmap();
@@ -539,19 +515,16 @@
return *Cache::nullPixmap;
}
-
QSize CachedImage::pixmap_size() const
{
- return (m ? m->framePixmap().size() : ( p ? p->size() : QSize()));
+ return (p ? p->size() : QSize());
}
-
QRect CachedImage::valid_rect() const
{
- return m ? m->getValidRect() : ( p ? p->rect() : QRect());
+ return (p ? p->rect() : QRect());
}
-
void CachedImage::do_notify(const QPixmap& p, const QRect& r)
{
CachedObjectClientWalker w(m_clients);
@@ -559,16 +532,13 @@
c->setPixmap(p, r, this);
}
-
void CachedImage::setShowAnimations( KHTMLSettings::KAnimationAdvice showAnimations )
{
m_showAnimations = showAnimations;
}
-
void CachedImage::clear()
{
- delete m; m = 0;
delete p; p = 0;
delete bg; bg = 0;
delete pixPart; pixPart = 0;
@@ -665,6 +635,7 @@
: CachedObject(url, XSLStyleSheet, _cachePolicy, _expireDate)
{
// It's XML we want.
+ // FIXME: This should accept more general xml formats */*+xml, image/svg+xml for example.
setAccept(QString::fromLatin1("text/xml, application/xml, application/xhtml+xml, text/xsl, application/rss+xml, application/atom+xml"));
// load the file
@@ -1346,11 +1317,9 @@
void Cache::clear()
{
- if ( !cache ) return;
-#ifdef CACHE_DEBUG
- kdDebug( 6060 ) << "Cache: CLEAR!" << endl;
- statistics();
-#endif
+ if (!cache)
+ return;
+
cache->setAutoDelete( true );
delete cache; cache = 0;
delete nullPixmap; nullPixmap = 0;
@@ -1695,11 +1664,6 @@
init();
-#ifdef CACHE_DEBUG
- statistics();
- kdDebug( 6060 ) << "Cache: flush()" << endl;
-#endif
-
while (m_headOfUncacheableList)
removeCacheEntry(m_headOfUncacheableList);
@@ -1712,9 +1676,6 @@
}
flushCount = m_countOfLRUAndUncacheableLists+10; // Flush again when the cache has grown.
-#ifdef CACHE_DEBUG
- //statistics();
-#endif
}
@@ -1728,50 +1689,6 @@
flush(true);
}
-void Cache::statistics()
-{
- CachedObject *o;
- // this function is for debugging purposes only
- init();
-
- int size = 0;
- int msize = 0;
- int movie = 0;
- int stylesheets = 0;
- QDictIterator<CachedObject> it(*cache);
- for(it.toFirst(); it.current(); ++it)
- {
- o = it.current();
- if(o->type() == CachedObject::Image)
- {
- CachedImage *im = static_cast<CachedImage *>(o);
- if(im->m != 0)
- {
- movie++;
- msize += im->size();
- }
- }
- else
- {
- if(o->type() == CachedObject::CSSStyleSheet)
- stylesheets++;
-
- }
- size += o->size();
- }
- size /= 1024;
-
- kdDebug( 6060 ) << "------------------------- image cache statistics -------------------" << endl;
- kdDebug( 6060 ) << "Number of items in cache: " << cache->count() << endl;
- kdDebug( 6060 ) << "Number of items in lru : " << m_countOfLRUAndUncacheableLists << endl;
- kdDebug( 6060 ) << "Number of cached images: " << cache->count()-movie << endl;
- kdDebug( 6060 ) << "Number of cached movies: " << movie << endl;
- kdDebug( 6060 ) << "Number of cached stylesheets: " << stylesheets << endl;
- kdDebug( 6060 ) << "pixmaps: allocated space approx. " << size << " kB" << endl;
- kdDebug( 6060 ) << "movies : allocated space approx. " << msize/1024 << " kB" << endl;
- kdDebug( 6060 ) << "--------------------------------------------------------------------" << endl;
-}
-
void Cache::removeCacheEntry( CachedObject *object )
{
QString key = object->url().qstring();
@@ -1932,10 +1849,6 @@
#endif
void CachedObjectClient::notifyFinished(CachedObject * /*finishedObj*/) {}
-#include "loader.moc"
-
-
-
Cache::Statistics Cache::getStatistics()
{
Statistics stats;
@@ -1948,13 +1861,8 @@
CachedObject *o = i.current();
switch (o->type()) {
case CachedObject::Image:
- if (static_cast<CachedImage *>(o)->m) {
- stats.movies.count++;
- stats.movies.size += o->size();
- } else {
- stats.images.count++;
- stats.images.size += o->size();
- }
+ stats.images.count++;
+ stats.images.size += o->size();
break;
case CachedObject::CSSStyleSheet:
@@ -2007,4 +1915,3 @@
if (disabled)
flushAll();
}
-
1.48 +1 -17 WebCore/khtml/misc/loader.h
Index: loader.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/misc/loader.h,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- loader.h 21 Nov 2005 01:20:20 -0000 1.47
+++ loader.h 15 Dec 2005 22:31:44 -0000 1.48
@@ -54,7 +54,6 @@
#include <dom/dom_string.h>
#include "DocPtr.h"
-class QMovie;
class KHTMLPart;
namespace KIO {
@@ -360,20 +359,10 @@
virtual bool isImage() const { return true; }
void clear();
-
- private slots:
- /**
- * gets called, whenever a QMovie changes frame
- */
- void movieUpdated( const QRect &rect );
- void movieStatus(int);
- void movieResize(const QSize&);
- void deleteMovie();
-
+
private:
void do_notify(const QPixmap& p, const QRect& r);
- QMovie* m;
QPixmap* p;
QPixmap* bg;
QRgb bgColor;
@@ -646,11 +635,6 @@
static int maxCacheableObjectSize() { return maxCacheable; }
/**
- * prints some statistics to stdout
- */
- static void statistics();
-
- /**
* clean up cache
*/
static void flush(bool force=false);
1.135 +0 -11 WebCore/khtml/rendering/render_form.cpp
Index: render_form.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_form.cpp,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- render_form.cpp 3 Dec 2005 20:16:40 -0000 1.134
+++ render_form.cpp 15 Dec 2005 22:31:45 -0000 1.135
@@ -26,8 +26,6 @@
#include "config.h"
#include <kdebug.h>
#include <klocale.h>
-#include <kfiledialog.h>
-#include <kcompletionbox.h>
#include <kcursor.h>
#include <qstyle.h>
@@ -609,9 +607,6 @@
ComboBoxWidget::ComboBoxWidget(QWidget *parent)
: KComboBox(false, parent)
{
- setAutoMask(true);
- if (listBox()) listBox()->installEventFilter(this);
- setMouseTracking(true);
}
bool ComboBoxWidget::event(QEvent *e)
@@ -918,12 +913,9 @@
{
KListBox *lb = new KListBox(view()->viewport());
lb->setSelectionMode(m_multiple ? QListBox::Extended : QListBox::Single);
- // ### looks broken
- //lb->setAutoMask(true);
connect( lb, SIGNAL( selectionChanged() ), this, SLOT( slotSelectionChanged() ) );
connect( lb, SIGNAL( clicked( QListBoxItem * ) ), this, SLOT( slotClicked() ) );
m_ignoreSelectEvents = false;
- lb->setMouseTracking(true);
return lb;
}
@@ -1231,6 +1223,3 @@
// emit mouseClick event etc
RenderFormElement::slotClicked();
}
-
-
-#include "render_form.moc"
1.59 +0 -1 WebCore/khtml/rendering/render_form.h
Index: render_form.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_form.h,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- render_form.h 21 Nov 2005 01:20:24 -0000 1.58
+++ render_form.h 15 Dec 2005 22:31:46 -0000 1.59
@@ -36,7 +36,6 @@
#include <qtextedit.h>
#include <klineedit.h>
-#include <qhbox.h>
#include <klistbox.h>
#include <kcombobox.h>
1.87 +0 -7 WebCore/khtml/rendering/render_frames.cpp
Index: render_frames.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_frames.cpp,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- render_frames.cpp 14 Dec 2005 23:31:55 -0000 1.86
+++ render_frames.cpp 15 Dec 2005 22:31:46 -0000 1.87
@@ -39,10 +39,7 @@
#include "khtml_part.h"
#include "render_arena.h"
-#include <kapplication.h>
#include <kcursor.h>
-#include <kmessagebox.h>
-#include <kmimetype.h>
#include <klocale.h>
#include <kdebug.h>
#include <qtimer.h>
@@ -517,7 +514,6 @@
if(evt->type() == mousedownEvent)
{
setResizing(true);
- KApplication::setOverrideCursor(cursor);
m_vSplitPos = _x;
m_hSplitPos = _y;
m_oldpos = -1;
@@ -531,7 +527,6 @@
if(m_resizing && evt->type() == mouseupEvent)
{
setResizing(false);
- KApplication::restoreOverrideCursor();
if(m_vSplit != -1 )
{
@@ -1024,5 +1019,3 @@
static_cast<KHTMLView*>(view)->layout();
}
}
-
-#include "render_frames.moc"
1.130 +8 -0 WebCore/khtml/rendering/render_layer.cpp
Index: render_layer.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_layer.cpp,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- render_layer.cpp 15 Dec 2005 04:29:51 -0000 1.129
+++ render_layer.cpp 15 Dec 2005 22:31:46 -0000 1.130
@@ -55,6 +55,10 @@
#include "xml/EventNames.h"
#include "html/html_blockimpl.h"
+#if SVG_SUPPORT
+#include "SVGNames.h"
+#endif
+
#include <qscrollbar.h>
#include <qptrvector.h>
@@ -306,6 +310,10 @@
bool
RenderLayer::isTransparent() const
{
+#if SVG_SUPPORT
+ if (m_object->node()->namespaceURI() == KSVG::SVGNames::svgNamespaceURI)
+ return false;
+#endif
return m_object->style()->opacity() < 1.0f;
}
1.97 +0 -3 WebCore/khtml/rendering/render_replaced.cpp
Index: render_replaced.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_replaced.cpp,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- render_replaced.cpp 8 Dec 2005 08:54:40 -0000 1.96
+++ render_replaced.cpp 15 Dec 2005 22:31:47 -0000 1.97
@@ -254,7 +254,6 @@
m_view->removeChild( m_widget );
m_widget->removeEventFilter( this );
- m_widget->setMouseTracking( false );
}
RenderLayer* layer = m_layer;
@@ -515,5 +514,3 @@
m_widget->setIsSelected(m_selectionState != SelectionNone);
}
}
-
-#include "render_replaced.moc"
1.285 +0 -2 WebCore/khtml/xml/dom_docimpl.cpp
Index: dom_docimpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/xml/dom_docimpl.cpp,v
retrieving revision 1.284
retrieving revision 1.285
diff -u -r1.284 -r1.285
--- dom_docimpl.cpp 14 Dec 2005 23:31:58 -0000 1.284
+++ dom_docimpl.cpp 15 Dec 2005 22:31:49 -0000 1.285
@@ -3434,5 +3434,3 @@
// The DOM Level 2 specification says cloning DocumentType nodes is "implementation dependent" so for now we do not support it.
return 0;
}
-
-#include "dom_docimpl.moc"
1.57 +0 -2 WebCore/khtml/xml/xml_tokenizer.cpp
Index: xml_tokenizer.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/xml/xml_tokenizer.cpp,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- xml_tokenizer.cpp 11 Dec 2005 11:42:03 -0000 1.56
+++ xml_tokenizer.cpp 15 Dec 2005 22:31:49 -0000 1.57
@@ -925,5 +925,3 @@
}
}
-
-#include "xml_tokenizer.moc"
1.14 +0 -1 WebCore/ksvg2/svg/SVGImageElementImpl.cpp
Index: SVGImageElementImpl.cpp
===================================================================
RCS file: /cvs/root/WebCore/ksvg2/svg/SVGImageElementImpl.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- SVGImageElementImpl.cpp 6 Dec 2005 01:23:24 -0000 1.13
+++ SVGImageElementImpl.cpp 15 Dec 2005 22:31:51 -0000 1.14
@@ -21,7 +21,6 @@
*/
#include "config.h"
-#include <kmimetype.h>
#include <qimage.h>
#include <qbuffer.h>
1.25 +0 -1 WebCore/kwq/KWQApplication.h
Index: KWQApplication.h
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQApplication.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- KWQApplication.h 30 Aug 2005 09:30:23 -0000 1.24
+++ KWQApplication.h 15 Dec 2005 22:31:52 -0000 1.25
@@ -37,7 +37,6 @@
static void setOverrideCursor(const QCursor &);
static void restoreOverrideCursor();
static bool sendEvent(QObject *o, QEvent *e) { return o->event(e); }
- static void sendPostedEvents(QObject *receiver, int event_type) { }
static QStyle &style();
static QPalette palette() { return QPalette(); }
};
1.39 +0 -3 WebCore/kwq/KWQComboBox.h
Index: KWQComboBox.h
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQComboBox.h,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- KWQComboBox.h 3 Dec 2005 20:16:40 -0000 1.38
+++ KWQComboBox.h 15 Dec 2005 22:31:52 -0000 1.39
@@ -47,9 +47,6 @@
int currentItem() const { return _currentItem; }
void setCurrentItem(int);
-
- QListBox *listBox() const { return 0; }
- void popup() { }
QSize sizeHint() const;
QRect frameGeometry() const;
1.703 +1 -3 WebCore/kwq/KWQKHTMLPart.mm
Index: KWQKHTMLPart.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQKHTMLPart.mm,v
retrieving revision 1.702
retrieving revision 1.703
diff -u -r1.702 -r1.703
--- KWQKHTMLPart.mm 14 Dec 2005 23:32:00 -0000 1.702
+++ KWQKHTMLPart.mm 15 Dec 2005 22:31:52 -0000 1.703
@@ -1538,10 +1538,8 @@
// initializing m_url to the new url breaks relative links when opening such a link after this call and _before_ begin() is called (when the first
// data arrives) (Simon)
- if(m_url.protocol().startsWith( "http" ) && !m_url.host().isEmpty() && m_url.path().isEmpty()) {
+ if (m_url.protocol().startsWith("http") && !m_url.host().isEmpty() && m_url.path().isEmpty())
m_url.setPath("/");
- emit d->m_extension->setLocationBarURL( m_url.prettyURL() );
- }
// copy to m_workingURL after fixing m_url above
d->m_workingURL = m_url;
1.12 +0 -4 WebCore/kwq/KWQKHTMLPartBrowserExtension.h
Index: KWQKHTMLPartBrowserExtension.h
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQKHTMLPartBrowserExtension.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- KWQKHTMLPartBrowserExtension.h 19 Jun 2005 01:58:36 -0000 1.11
+++ KWQKHTMLPartBrowserExtension.h 15 Dec 2005 22:31:53 -0000 1.12
@@ -32,10 +32,6 @@
class KHTMLPartBrowserExtension : public KParts::BrowserExtension {
public:
KHTMLPartBrowserExtension(KHTMLPart *);
-
- void editableWidgetFocused(QWidget *) { }
- void editableWidgetBlurred(QWidget *) { }
- void setLocationBarURL(const QString &) { }
virtual KParts::BrowserInterface *browserInterface() { return &_browserInterface; }
1.20 +0 -5 WebCore/kwq/KWQKHistoryProvider.mm
Index: KWQKHistoryProvider.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQKHistoryProvider.mm,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- KWQKHistoryProvider.mm 3 Oct 2005 21:13:05 -0000 1.19
+++ KWQKHistoryProvider.mm 15 Dec 2005 22:31:53 -0000 1.20
@@ -38,11 +38,6 @@
return &instance;
}
-void HistoryProvider::insert(const QString &s)
-{
- // Insertion handled by WebKit.
-}
-
bool HistoryProvider::contains(const QString &s) const
{
// the other side of the bridge is careful not to throw exceptions here
1.6 +1 -5 WebCore/kwq/KWQKJavaAppletContext.h
Index: KWQKJavaAppletContext.h
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQKJavaAppletContext.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- KWQKJavaAppletContext.h 22 Jan 2003 00:12:35 -0000 1.5
+++ KWQKJavaAppletContext.h 15 Dec 2005 22:31:54 -0000 1.6
@@ -29,14 +29,10 @@
#include "KWQObject.h"
#include "khtml_part.h"
-class DCOPObject;
-
-typedef enum { } JType;
-
class KJavaAppletContext : public QObject
{
public:
- KJavaAppletContext(DCOPObject* = 0, KHTMLPart *p = 0) {m_part = p;}
+ KJavaAppletContext(KHTMLPart *p = 0) {m_part = p;}
KHTMLPart *part(){ return m_part; };
private:
KHTMLPart *m_part;
1.8 +0 -1 WebCore/kwq/KWQKPartsHistoryProvider.h
Index: KWQKPartsHistoryProvider.h
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQKPartsHistoryProvider.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- KWQKPartsHistoryProvider.h 22 Jan 2003 00:12:35 -0000 1.7
+++ KWQKPartsHistoryProvider.h 15 Dec 2005 22:31:54 -0000 1.8
@@ -34,7 +34,6 @@
public:
static HistoryProvider *self();
- void insert(const QString &);
bool contains(const QString &) const;
};
1.40 +0 -1 WebCore/kwq/KWQObject.h
Index: KWQObject.h
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQObject.h,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- KWQObject.h 10 Dec 2005 17:14:38 -0000 1.39
+++ KWQObject.h 15 Dec 2005 22:31:54 -0000 1.40
@@ -47,7 +47,6 @@
class QFont;
class QFontMetrics;
class QImage;
-class QMovie;
class QPaintDevice;
class QPaintDeviceMetrics;
class QPainter;
1.43 +0 -5 WebCore/kwq/KWQScrollView.h
Index: KWQScrollView.h
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQScrollView.h,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- KWQScrollView.h 15 Dec 2005 04:29:52 -0000 1.42
+++ KWQScrollView.h 15 Dec 2005 22:31:54 -0000 1.43
@@ -84,12 +84,7 @@
void contentsToViewport(int x, int y, int& vx, int& vy);
void viewportToContents(int vx, int vy, int& x, int& y);
- QWidget *clipper() const { return 0; }
- void enableClipper(bool) { }
-
void setStaticBackground(bool);
-
- void resizeEvent(QResizeEvent *);
NSView *getDocumentView() const;
1.89 +0 -4 WebCore/kwq/KWQScrollView.mm
Index: KWQScrollView.mm
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQScrollView.mm,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- KWQScrollView.mm 15 Dec 2005 04:29:52 -0000 1.88
+++ KWQScrollView.mm 15 Dec 2005 22:31:55 -0000 1.89
@@ -489,10 +489,6 @@
KWQ_UNBLOCK_EXCEPTIONS;
}
-void QScrollView::resizeEvent(QResizeEvent *)
-{
-}
-
NSView *QScrollView::getDocumentView() const
{
id view = getView();
1.69 +0 -16 WebCore/kwq/KWQWidget.h
Index: KWQWidget.h
===================================================================
RCS file: /cvs/root/WebCore/kwq/KWQWidget.h,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- KWQWidget.h 11 Oct 2005 19:16:45 -0000 1.68
+++ KWQWidget.h 15 Dec 2005 22:31:55 -0000 1.69
@@ -72,9 +72,6 @@
void setActiveWindow();
- void setAutoMask(bool) { }
- void setMouseTracking(bool) { }
-
long winId() const;
int x() const;
int y() const;
@@ -125,19 +122,6 @@
void show();
void hide();
- void showEvent(QShowEvent *) { }
- void hideEvent(QHideEvent *) { }
- void wheelEvent(QWheelEvent *) { }
- void keyPressEvent(QKeyEvent *) { }
- void keyReleaseEvent(QKeyEvent *) { }
- void focusInEvent(QFocusEvent *) { }
- void focusOutEvent(QFocusEvent *) { }
-
- enum BackgroundMode { NoBackground };
- void setBackgroundMode(BackgroundMode) { }
-
- void setAcceptDrops(bool) { }
-
NSView *getView() const;
NSView *getOuterView() const;
void setView(NSView *aView);
More information about the webkit-changes
mailing list