diff options
| author | Steve Block <steveblock@google.com> | 2011-05-25 19:08:45 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-06-08 13:51:31 +0100 |
| commit | 2bde8e466a4451c7319e3a072d118917957d6554 (patch) | |
| tree | 28f4a1b869a513e565c7760d0e6a06e7cf1fe95a /Source/WebCore/platform/haiku | |
| parent | 6939c99b71d9372d14a0c74a772108052e8c48c8 (diff) | |
| download | external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.zip external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.gz external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.bz2 | |
Merge WebKit at r82507: Initial merge by git
Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
Diffstat (limited to 'Source/WebCore/platform/haiku')
| -rw-r--r-- | Source/WebCore/platform/haiku/FileSystemHaiku.cpp | 4 | ||||
| -rw-r--r-- | Source/WebCore/platform/haiku/LocalizedStringsHaiku.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Source/WebCore/platform/haiku/FileSystemHaiku.cpp b/Source/WebCore/platform/haiku/FileSystemHaiku.cpp index b0d34f2..7985c54 100644 --- a/Source/WebCore/platform/haiku/FileSystemHaiku.cpp +++ b/Source/WebCore/platform/haiku/FileSystemHaiku.cpp @@ -56,11 +56,11 @@ String homeDirectoryPath() return String(path.Path()); } -CString openTemporaryFile(const char* prefix, PlatformFileHandle& handle) +String openTemporaryFile(const String&, PlatformFileHandle& handle) { notImplemented(); handle = invalidPlatformFileHandle; - return CString(); + return String(); } void closeFile(PlatformFileHandle&) diff --git a/Source/WebCore/platform/haiku/LocalizedStringsHaiku.cpp b/Source/WebCore/platform/haiku/LocalizedStringsHaiku.cpp index 63b9b91..c1f3641 100644 --- a/Source/WebCore/platform/haiku/LocalizedStringsHaiku.cpp +++ b/Source/WebCore/platform/haiku/LocalizedStringsHaiku.cpp @@ -213,7 +213,7 @@ String contextMenuItemTagSearchWeb() return "Search web"; } -String contextMenuItemTagLookUpInDictionary() +String contextMenuItemTagLookUpInDictionary(const String&) { return "Lookup in dictionary"; } |