diff options
Diffstat (limited to 'Source/WebCore/platform/qt')
-rw-r--r-- | Source/WebCore/platform/qt/CookieJarQt.cpp | 9 | ||||
-rw-r--r-- | Source/WebCore/platform/qt/FileSystemQt.cpp | 8 | ||||
-rw-r--r-- | Source/WebCore/platform/qt/LanguageQt.cpp | 2 | ||||
-rw-r--r-- | Source/WebCore/platform/qt/PasteboardQt.cpp | 2 | ||||
-rw-r--r-- | Source/WebCore/platform/qt/RenderThemeQt.cpp | 2 |
5 files changed, 9 insertions, 14 deletions
diff --git a/Source/WebCore/platform/qt/CookieJarQt.cpp b/Source/WebCore/platform/qt/CookieJarQt.cpp index db4a42a..3c4cd42 100644 --- a/Source/WebCore/platform/qt/CookieJarQt.cpp +++ b/Source/WebCore/platform/qt/CookieJarQt.cpp @@ -91,8 +91,7 @@ String cookies(const Document* document, const KURL& url) foreach (QNetworkCookie networkCookie, cookies) { if (networkCookie.isHttpOnly()) continue; - resultCookies.append(QString::fromAscii( - networkCookie.toRawForm(QNetworkCookie::NameAndValueOnly).constData())); + resultCookies.append(QString::fromLatin1(networkCookie.toRawForm(QNetworkCookie::NameAndValueOnly).constData())); } return resultCookies.join(QLatin1String("; ")); @@ -110,10 +109,8 @@ String cookieRequestHeaderFieldValue(const Document* document, const KURL &url) return String(); QStringList resultCookies; - foreach (QNetworkCookie networkCookie, cookies) { - resultCookies.append(QString::fromAscii( - networkCookie.toRawForm(QNetworkCookie::NameAndValueOnly).constData())); - } + foreach (QNetworkCookie networkCookie, cookies) + resultCookies.append(QString::fromLatin1(networkCookie.toRawForm(QNetworkCookie::NameAndValueOnly).constData())); return resultCookies.join(QLatin1String("; ")); } diff --git a/Source/WebCore/platform/qt/FileSystemQt.cpp b/Source/WebCore/platform/qt/FileSystemQt.cpp index d88a967..32644d1 100644 --- a/Source/WebCore/platform/qt/FileSystemQt.cpp +++ b/Source/WebCore/platform/qt/FileSystemQt.cpp @@ -114,19 +114,19 @@ Vector<String> listDirectory(const String& path, const String& filter) return entries; } -CString openTemporaryFile(const char* prefix, PlatformFileHandle& handle) +String openTemporaryFile(const String& prefix, PlatformFileHandle& handle) { #ifndef QT_NO_TEMPORARYFILE - QTemporaryFile* tempFile = new QTemporaryFile(QDir::tempPath() + QLatin1Char('/') + QLatin1String(prefix)); + QTemporaryFile* tempFile = new QTemporaryFile(QDir::tempPath() + QLatin1Char('/') + QString(prefix)); tempFile->setAutoRemove(false); QFile* temp = tempFile; if (temp->open(QIODevice::ReadWrite)) { handle = temp; - return String(temp->fileName()).utf8(); + return temp->fileName(); } #endif handle = invalidPlatformFileHandle; - return CString(); + return String(); } PlatformFileHandle openFile(const String& path, FileOpenMode mode) diff --git a/Source/WebCore/platform/qt/LanguageQt.cpp b/Source/WebCore/platform/qt/LanguageQt.cpp index 71e554f..5a1d707 100644 --- a/Source/WebCore/platform/qt/LanguageQt.cpp +++ b/Source/WebCore/platform/qt/LanguageQt.cpp @@ -35,7 +35,7 @@ namespace WebCore { String platformDefaultLanguage() { QLocale locale; - return locale.name().replace("_", "-"); + return locale.name().replace(QLatin1Char('_'), QLatin1Char('-')); } } diff --git a/Source/WebCore/platform/qt/PasteboardQt.cpp b/Source/WebCore/platform/qt/PasteboardQt.cpp index 6865fd7..850d68a 100644 --- a/Source/WebCore/platform/qt/PasteboardQt.cpp +++ b/Source/WebCore/platform/qt/PasteboardQt.cpp @@ -77,7 +77,7 @@ void Pasteboard::writeSelection(Range* selectedRange, bool canSmartCopyOrDelete, QApplication::clipboard()->setMimeData(md, m_selectionMode ? QClipboard::Selection : QClipboard::Clipboard); #endif if (canSmartCopyOrDelete) - md->setData("application/vnd.qtwebkit.smartpaste", QByteArray()); + md->setData(QLatin1String("application/vnd.qtwebkit.smartpaste"), QByteArray()); } bool Pasteboard::canSmartReplace() diff --git a/Source/WebCore/platform/qt/RenderThemeQt.cpp b/Source/WebCore/platform/qt/RenderThemeQt.cpp index ca8c6dd..cc654d5 100644 --- a/Source/WebCore/platform/qt/RenderThemeQt.cpp +++ b/Source/WebCore/platform/qt/RenderThemeQt.cpp @@ -1368,7 +1368,6 @@ bool RenderThemeQt::paintMediaSliderTrack(RenderObject* o, const PaintInfo& pain paintMediaBackground(p.painter, r); -#if QT_VERSION >= QT_VERSION_CHECK(4, 7, 0) if (MediaPlayer* player = mediaElement->player()) { // Get the buffered parts of the media PassRefPtr<TimeRanges> buffered = player->buffered(); @@ -1386,7 +1385,6 @@ bool RenderThemeQt::paintMediaSliderTrack(RenderObject* o, const PaintInfo& pain } } } -#endif return false; } |