Commit eedc541f authored by eseidel's avatar eseidel

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:


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@11602 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 9c5f55d4
2005-12-15 Eric Seidel <eseidel@apple.com>
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@apple.com>
Reviewed by darin.
......@@ -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@apple.com>
This diff is collapsed.
......@@ -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>
......
......@@ -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 @@ KJSProxyImpl::KJSProxyImpl(KHTMLPart *part)
{
m_script = 0;
m_part = part;
m_handlerLineno = 0;
#ifndef NDEBUG
s_count++;
#endif
......@@ -157,10 +156,6 @@ void KJSProxyImpl::initScript()
// 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();
......
......@@ -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 @@ PausedTimeouts::~PausedTimeouts()
}
} // namespace KJS
#include "kjs_window.moc"
......@@ -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 @@ using namespace HTMLNames;
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 @@ DocumentTypeImpl *HTMLDocumentImpl::doctype() const
}
}
#include "html_documentimpl.moc"
......@@ -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 @@ bool HTMLGenericFormElementImpl::isMouseFocusable() const
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;
......
......@@ -205,7 +205,6 @@ public:
*/
virtual bool appendFormData(FormDataList&, bool) { return false; }
virtual void defaultEventHandler(EventImpl *evt);
virtual bool isEditable();
virtual QString state();
......
......@@ -206,14 +206,6 @@ RenderObject *HTMLAppletElementImpl::createRenderer(RenderArena *arena, RenderSt
#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();
......
......@@ -52,9 +52,6 @@ public:
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 &);
......
......@@ -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 DOM;
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 @@ using namespace HTMLNames;
#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 @@ bool KHTMLPart::didOpenURL(const KURL &url)
// 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 @@ void KHTMLPart::stopLoading(bool sendUnload)
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::javaContext()
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 @@ void KHTMLPart::begin( const KURL &url, int xOffset, int yOffset )
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 @@ void KHTMLPart::begin( const KURL &url, int xOffset, int yOffset )
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 @@ void KHTMLPart::begin( const KURL &url, int xOffset, int yOffset )
KWQ(this)->updatePolicyBaseURL();
setAutoloadImages( d->m_settings->autoLoadImages() );
QString userStyleSheet = d->m_settings->userStyleSheet();
......@@ -977,7 +937,6 @@ void KHTMLPart::begin( const KURL &url, int xOffset, int yOffset )
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::slotRedirect()
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 @@ void KHTMLPart::setSelection(const SelectionController &s, bool closeTyping, boo
clearTypingStyle();
KWQ(this)->respondToChangedSelection(oldSelection, closeTyping);
emitSelectionChanged();
}
void KHTMLPart::setDragCaret(const SelectionController &dragCaret)
......@@ -2199,10 +2152,6 @@ KHTMLPart *KHTMLPart::parentPart() const
return (KHTMLPart *)parent();
}
void KHTMLPart::emitSelectionChanged()
{
}
int KHTMLPart::zoomFactor() const
{
return d->m_zoomFactor;
......@@ -3435,6 +3384,3 @@ void KHTMLPart::handleFallbackContent()
return;
static_cast<HTMLObjectElementImpl *>(node)->renderFallbackContent();
}
using namespace KParts;
#include "khtml_part.moc"
......@@ -1097,11 +1097,6 @@ private:
*/
void selectionLayoutChanged();
/**
* @internal
*/
void emitSelectionChanged();
/**
* @internal
*/
......
......@@ -29,7 +29,6 @@
#include <kcursor.h>