From 82912660d55e139b15faeb4efaa5743faf7762ee Mon Sep 17 00:00:00 2001 From: stippi Date: Sat, 20 Feb 2010 11:13:44 +0000 Subject: [PATCH] * Began renaming some public API with the B* prefix and using the Haiku coding style. (WebPage -> BWebPage). Documented what needs to go where in WebPage.h. * Moved misplaced functionality from WebFrame to BWebPage (navigation). * EditorClientHaiku takes a BWebPage pointer now, which brings a slight cleanup. * Exposed WebFrame::isEditable() to EditorClientHaiku, so isEditable() can be implemented. * Added some asserts in FrameLoaderClientHaiku according to the Gtk port and placed some debug output. git-svn-id: http://svn.haiku-os.org/webpositive/webkit/trunk@150 94f232f2-1747-11df-bad5-a5bfde151594 --- src/apps/webpositive/DownloadWindow.cpp | 4 ++-- src/apps/webpositive/LauncherApp.cpp | 4 ++-- src/apps/webpositive/LauncherWindow.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/apps/webpositive/DownloadWindow.cpp b/src/apps/webpositive/DownloadWindow.cpp index f6e94b1072..335b526a20 100644 --- a/src/apps/webpositive/DownloadWindow.cpp +++ b/src/apps/webpositive/DownloadWindow.cpp @@ -385,13 +385,13 @@ DownloadWindow::~DownloadWindow() void DownloadWindow::MessageReceived(BMessage* message) { switch (message->what) { - case DOWNLOAD_ADDED: { + case B_DOWNLOAD_ADDED: { WebDownload* download; if (message->FindPointer("download", reinterpret_cast(&download)) == B_OK) downloadStarted(download); break; } - case DOWNLOAD_REMOVED: { + case B_DOWNLOAD_REMOVED: { WebDownload* download; if (message->FindPointer("download", reinterpret_cast(&download)) == B_OK) downloadFinished(download); diff --git a/src/apps/webpositive/LauncherApp.cpp b/src/apps/webpositive/LauncherApp.cpp index 9503f2c3e7..4f01619717 100644 --- a/src/apps/webpositive/LauncherApp.cpp +++ b/src/apps/webpositive/LauncherApp.cpp @@ -92,8 +92,8 @@ void LauncherApp::ArgvReceived(int32 argc, char** argv) void LauncherApp::ReadyToRun() { - WebPage::initializeOnce(); - WebPage::setCacheModel(WEBKIT_CACHE_MODEL_WEB_BROWSER); + BWebPage::InitializeOnce(); + BWebPage::SetCacheModel(B_WEBKIT_CACHE_MODEL_WEB_BROWSER); BFile settingsFile; BRect windowFrameFromSettings = m_lastWindowFrame; diff --git a/src/apps/webpositive/LauncherWindow.cpp b/src/apps/webpositive/LauncherWindow.cpp index 3a4171c277..b8f07ad021 100644 --- a/src/apps/webpositive/LauncherWindow.cpp +++ b/src/apps/webpositive/LauncherWindow.cpp @@ -201,7 +201,7 @@ LauncherWindow::LauncherWindow(BRect frame, const BMessenger& downloadListener, ); } - currentWebView()->webPage()->setDownloadListener(downloadListener); + currentWebView()->webPage()->SetDownloadListener(downloadListener); m_findGroup->SetVisible(false);