Commit 76eb5c1d authored by zack's avatar zack

Cleanup more of the FrameQt crack - mainly finally remove

the methods that have been moved to their proper locations.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@18132 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent bbfc68bc
2006-12-10 Zack Rusin <zack@kde.org>
Fix the link directory location.
* WebKit.pri:
2006-12-10 Lars Knoll <lars@trolltech.com>
Reviewed by Zack
......
2006-12-10 Zack Rusin <zack@kde.org>
Cleaning up the code after removals.
* platform/qt/FrameQt.cpp:
* platform/qt/FrameQt.h: Remove virtual methods
which have been moved to different objects
2006-12-10 Zack Rusin <zack@kde.org>
Cleanup the FrameQtClient a little bit more. Remove
......@@ -130,33 +130,6 @@ FrameQt::~FrameQt()
loader()->cancelAndClear();
}
void FrameQt::runJavaScriptAlert(String const& message)
{
m_client->runJavaScriptAlert(message);
}
bool FrameQt::runJavaScriptConfirm(String const& message)
{
return m_client->runJavaScriptConfirm(message);
}
bool FrameQt::locationbarVisible()
{
return m_client->locationbarVisible();
}
bool FrameQt::passWheelEventToChildWidget(Node*)
{
notImplemented();
return false;
}
bool FrameQt::passSubframeEventToSubframe(MouseEventWithHitTestResults& mev, Frame*)
{
notImplemented();
return false;
}
bool FrameQt::passMouseDownEventToWidget(Widget*)
{
notImplemented();
......@@ -169,26 +142,6 @@ bool FrameQt::isLoadTypeReload()
return false;
}
bool FrameQt::menubarVisible()
{
return m_client->menubarVisible();
}
bool FrameQt::personalbarVisible()
{
return m_client->personalbarVisible();
}
bool FrameQt::statusbarVisible()
{
return m_client->statusbarVisible();
}
bool FrameQt::toolbarVisible()
{
return m_client->toolbarVisible();
}
Range* FrameQt::markedTextRange() const
{
// FIXME: Handle selections.
......@@ -201,42 +154,6 @@ String FrameQt::mimeTypeForFileName(const String&) const
return String();
}
void FrameQt::ignoreSpelling()
{
notImplemented();
}
void FrameQt::learnSpelling()
{
notImplemented();
}
void FrameQt::markMisspellingsInAdjacentWords(const VisiblePosition&)
{
notImplemented();
}
void FrameQt::markMisspellings(const Selection&)
{
notImplemented();
}
bool FrameQt::lastEventIsMouseUp() const
{
// no-op
return false;
}
void FrameQt::saveDocumentState()
{
// FIXME: Implement this as soon a KPart is created...
}
void FrameQt::restoreDocumentState()
{
// FIXME: Implement this as soon a KPart is created...
}
void FrameQt::scheduleClose()
{
// no-op
......@@ -260,17 +177,6 @@ void FrameQt::focusWindow()
view()->qwidget()->setFocus();
}
void FrameQt::addMessageToConsole(const String& message, unsigned lineNumber, const String& sourceID)
{
qDebug("[FrameQt::addMessageToConsole] message=%s lineNumber=%d sourceID=%s",
qPrintable(QString(message)), lineNumber, qPrintable(QString(sourceID)));
}
bool FrameQt::runJavaScriptPrompt(const String& message, const String& defaultValue, String& result)
{
return m_client->runJavaScriptPrompt(message, defaultValue, result);
}
KJS::Bindings::Instance* FrameQt::getEmbedInstanceForWidget(Widget*)
{
notImplemented();
......@@ -289,53 +195,6 @@ KJS::Bindings::Instance* FrameQt::getAppletInstanceForWidget(Widget*)
return 0;
}
KJS::Bindings::RootObject* FrameQt::bindingRootObject()
{
ASSERT(javaScriptEnabled());
if (!m_bindingRoot) {
KJS::JSLock lock;
m_bindingRoot = new KJS::Bindings::RootObject(0); // The root gets deleted by JavaScriptCore.
KJS::JSObject* win = KJS::Window::retrieveWindow(this);
m_bindingRoot->setRootObjectImp(win);
m_bindingRoot->setInterpreter(scriptProxy()->interpreter());
addPluginRootObject(m_bindingRoot);
}
return m_bindingRoot;
}
void FrameQt::addPluginRootObject(KJS::Bindings::RootObject* root)
{
m_rootObjects.append(root);
}
void FrameQt::registerCommandForUndo(PassRefPtr<EditCommand>)
{
// FIXME: Implement this in the FrameQtClient, to be used within WebKitPart.
}
void FrameQt::registerCommandForRedo(PassRefPtr<EditCommand>)
{
// FIXME: Implement this in the FrameQtClient, to be used within WebKitPart.
}
void FrameQt::clearUndoRedoOperations()
{
// FIXME: Implement this in the FrameQtClient, to be used within WebKitPart.
}
void FrameQt::issueUndoCommand()
{
notImplemented();
}
void FrameQt::issueRedoCommand()
{
notImplemented();
}
void FrameQt::issueCutCommand()
{
notImplemented();
......@@ -366,38 +225,12 @@ void FrameQt::respondToChangedSelection(const Selection& oldSelection, bool clos
// TODO: If we want continous spell checking, we need to implement this.
}
void FrameQt::respondToChangedContents(const Selection& endingSelection)
{
// TODO: If we want accessibility, we need to implement this.
}
bool FrameQt::shouldChangeSelection(const Selection& oldSelection, const Selection& newSelection, EAffinity affinity, bool stillSelecting) const
{
// no-op
return true;
}
bool FrameQt::canPaste() const
{
// FIXME: Implement this in the FrameQtClient, to be used within WebKitPart.
notImplemented();
return false;
}
bool FrameQt::canRedo() const
{
// FIXME: Implement this in the FrameQtClient, to be used within WebKitPart.
notImplemented();
return false;
}
bool FrameQt::canUndo() const
{
// FIXME: Implement this in the FrameQtClient, to be used within WebKitPart.
notImplemented();
return false;
}
void FrameQt::print()
{
notImplemented();
......
......@@ -50,65 +50,34 @@ public:
FrameQt(Page*, Element*, FrameQtClient*, FrameLoaderClient *frameLoader);
virtual ~FrameQt();
virtual void scheduleClose();
virtual void unfocusWindow();
virtual void focusWindow();
virtual void saveDocumentState();
virtual void restoreDocumentState();
virtual void addMessageToConsole(const String& message, unsigned lineNumber, const String& sourceID);
virtual KJS::Bindings::Instance* getEmbedInstanceForWidget(Widget*);
virtual KJS::Bindings::Instance* getObjectInstanceForWidget(Widget*);
virtual KJS::Bindings::Instance* getAppletInstanceForWidget(Widget*);
virtual KJS::Bindings::RootObject* bindingRootObject();
//should be in Chrome
virtual void runJavaScriptAlert(const String& message);
virtual bool runJavaScriptConfirm(const String& message);
virtual bool runJavaScriptPrompt(const String& message, const String& defaultValue, String& result);
virtual bool locationbarVisible();
virtual bool menubarVisible();
virtual bool personalbarVisible();
virtual bool statusbarVisible();
virtual bool toolbarVisible();
virtual bool shouldInterruptJavaScript();
virtual void scheduleClose();
virtual void focusWindow();
virtual void unfocusWindow();
virtual void print();
//should be in Editor
virtual Range* markedTextRange() const;
virtual String mimeTypeForFileName(const String&) const;
virtual void ignoreSpelling();
virtual void learnSpelling();
virtual void markMisspellingsInAdjacentWords(const VisiblePosition&);
virtual void markMisspellings(const Selection&);
virtual bool lastEventIsMouseUp() const;
virtual bool passSubframeEventToSubframe(MouseEventWithHitTestResults&, Frame* subframe = 0);
virtual bool passWheelEventToChildWidget(Node*);
virtual KJS::Bindings::Instance* getEmbedInstanceForWidget(Widget*);
virtual KJS::Bindings::Instance* getObjectInstanceForWidget(Widget*);
virtual KJS::Bindings::Instance* getAppletInstanceForWidget(Widget*);
virtual KJS::Bindings::RootObject* bindingRootObject();
void addPluginRootObject(KJS::Bindings::RootObject*);
virtual void registerCommandForUndo(PassRefPtr<EditCommand>);
virtual void registerCommandForRedo(PassRefPtr<EditCommand>);
virtual void clearUndoRedoOperations();
virtual void issueUndoCommand();
virtual void issueRedoCommand();
virtual void issueCutCommand();
virtual void issueCopyCommand();
virtual void issuePasteCommand();
virtual void issuePasteAndMatchStyleCommand();
virtual void issueTransposeCommand();
virtual void respondToChangedSelection(const Selection& oldSelection, bool closeTyping);
virtual void respondToChangedContents(const Selection& endingSelection);
virtual bool shouldChangeSelection(const Selection& oldSelection, const Selection& newSelection, EAffinity, bool stillSelecting) const;
virtual bool shouldChangeSelection(const Selection& oldSelection, const Selection& newSelection,
EAffinity, bool stillSelecting) const;
virtual bool canPaste() const;
virtual bool canRedo() const;
virtual bool canUndo() const;
virtual void print();
virtual bool shouldInterruptJavaScript();
//should be somewhere in platform
virtual String mimeTypeForFileName(const String&) const;
bool keyEvent(const PlatformKeyboardEvent& keyEvent);
......
......@@ -20,7 +20,7 @@ DEFINES += BUILDING_QT__=1
isEmpty(OUTPUT_DIR):OUTPUT_DIR=$$PWD
LIBS += -L$$OUTPUT_DIR/WebKitBuild/Release/lib -lWebKitQt -lJavaScriptCore
LIBS += -L$$OUTPUT_DIR/lib -lWebKitQt -lJavaScriptCore
macx {
INCLUDEPATH += /opt/local/include /opt/local/include/libxml2
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment