diff options
| author | Steve Block <steveblock@google.com> | 2010-02-15 12:23:52 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-02-16 11:48:32 +0000 |
| commit | 8a0914b749bbe7da7768e07a7db5c6d4bb09472b (patch) | |
| tree | 73f9065f370435d6fde32ae129d458a8c77c8dff /WebCore/platform/haiku/ContextMenuItemHaiku.cpp | |
| parent | bf14be70295513b8076f3fa47a268a7e42b2c478 (diff) | |
| download | external_webkit-8a0914b749bbe7da7768e07a7db5c6d4bb09472b.zip external_webkit-8a0914b749bbe7da7768e07a7db5c6d4bb09472b.tar.gz external_webkit-8a0914b749bbe7da7768e07a7db5c6d4bb09472b.tar.bz2 | |
Merge webkit.org at r54731 : Initial merge by git
Change-Id: Ia79977b6cf3b0b00c06ef39419989b28e57e4f4a
Diffstat (limited to 'WebCore/platform/haiku/ContextMenuItemHaiku.cpp')
| -rw-r--r-- | WebCore/platform/haiku/ContextMenuItemHaiku.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/WebCore/platform/haiku/ContextMenuItemHaiku.cpp b/WebCore/platform/haiku/ContextMenuItemHaiku.cpp index cd5abaf..469590d 100644 --- a/WebCore/platform/haiku/ContextMenuItemHaiku.cpp +++ b/WebCore/platform/haiku/ContextMenuItemHaiku.cpp @@ -70,7 +70,7 @@ ContextMenuItem::~ContextMenuItem() PlatformMenuItemDescription ContextMenuItem::releasePlatformDescription() { BMenuItem* item = m_platformDescription; - m_platformDescription = NULL; + m_platformDescription = 0; return item; } @@ -116,7 +116,7 @@ void ContextMenuItem::setAction(ContextMenuAction action) m_platformDescription->Message()->what = action; } -String ContextMenuItem::title() const +String ContextMenuItem::title() const { if (m_platformDescription) return ""; |