summaryrefslogtreecommitdiff
path: root/Source/WebKit2/WebProcess/WebPage/qt
diff options
context:
space:
mode:
Diffstat (limited to 'Source/WebKit2/WebProcess/WebPage/qt')
-rw-r--r--Source/WebKit2/WebProcess/WebPage/qt/WebInspectorUIQt.cpp (renamed from Source/WebKit2/WebProcess/WebPage/qt/WebInspectorQt.cpp)9
-rw-r--r--Source/WebKit2/WebProcess/WebPage/qt/WebPageQt.cpp4
2 files changed, 6 insertions, 7 deletions
diff --git a/Source/WebKit2/WebProcess/WebPage/qt/WebInspectorQt.cpp b/Source/WebKit2/WebProcess/WebPage/qt/WebInspectorUIQt.cpp
index 1d7d539cc..838627309 100644
--- a/Source/WebKit2/WebProcess/WebPage/qt/WebInspectorQt.cpp
+++ b/Source/WebKit2/WebProcess/WebPage/qt/WebInspectorUIQt.cpp
@@ -24,7 +24,7 @@
*/
#include "config.h"
-#include "WebInspector.h"
+#include "WebInspectorUI.h"
#if ENABLE(INSPECTOR)
@@ -33,15 +33,14 @@
namespace WebKit {
-bool WebInspector::canSave() const
+bool WebInspectorUI::canSave()
{
return false;
}
-String WebInspector::localizedStringsURL() const
+String WebInspectorUI::localizedStringsURL()
{
- notImplemented();
- return String();
+ return ASCIILiteral("qrc:///org/webkitgtk/inspector/Localizations/en.lproj/localizedStrings.js");
}
} // namespace WebKit
diff --git a/Source/WebKit2/WebProcess/WebPage/qt/WebPageQt.cpp b/Source/WebKit2/WebProcess/WebPage/qt/WebPageQt.cpp
index 6ee8a1d12..654829487 100644
--- a/Source/WebKit2/WebProcess/WebPage/qt/WebPageQt.cpp
+++ b/Source/WebKit2/WebProcess/WebPage/qt/WebPageQt.cpp
@@ -300,7 +300,7 @@ PassRefPtr<SharedBuffer> WebPage::cachedResponseDataForURL(const URL&)
void WebPage::registerApplicationScheme(const String& scheme)
{
- QtNetworkAccessManager* qnam = qobject_cast<QtNetworkAccessManager*>(WebProcess::shared().networkAccessManager());
+ QtNetworkAccessManager* qnam = qobject_cast<QtNetworkAccessManager*>(WebProcess::singleton().networkAccessManager());
if (!qnam)
return;
qnam->registerApplicationScheme(this, QString(scheme));
@@ -334,7 +334,7 @@ void WebPage::hidePopupMenu()
return;
m_activePopupMenu->client()->popupDidHide();
- m_activePopupMenu = 0;
+ m_activePopupMenu = nullptr;
}
} // namespace WebKit