Changeset 81968 in webkit


Ignore:
Timestamp:
Mar 25, 2011 10:25:34 AM (13 years ago)
Author:
benjamin.poulain@nokia.com
Message:

[Qt] QtWebKit will not compile with QT_ASCII_CAST_WARNINGS enabled
https://bugs.webkit.org/show_bug.cgi?id=57087

Reviewed by Andreas Kling.

Use explicit conversion for string to avoid depending on the default codec
installed by the user code.

  • Platform/qt/SharedMemoryQt.cpp:

(WebKit::SharedMemory::create):

  • Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp:

(WebKit::initializeGTK):

  • UIProcess/API/qt/tests/qgraphicswkview/tst_qgraphicswkview.cpp:

(tst_QGraphicsWKView::loadEmptyPage):
(tst_QGraphicsWKView::loadEmptyUrl):

  • UIProcess/API/qt/tests/qwkpage/tst_qwkpage.cpp:

(tst_QWKPage::loadEmptyUrl):

  • UIProcess/Launcher/qt/ProcessLauncherQt.cpp:

(WebKit::ProcessLauncher::launchProcess):

  • WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp:

(WebKit::getPluginDisplay):

  • WebProcess/qt/WebProcessMainQt.cpp:

(WebKit::EnvHttpProxyFactory::initializeFromEnvironment):
(WebKit::WebProcessMainQt):

Location:
trunk/Source/WebKit2
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit2/ChangeLog

    r81966 r81968  
     12011-03-25  Benjamin Poulain  <benjamin.poulain@nokia.com>
     2
     3        Reviewed by Andreas Kling.
     4
     5        [Qt] QtWebKit will not compile with QT_ASCII_CAST_WARNINGS enabled
     6        https://bugs.webkit.org/show_bug.cgi?id=57087
     7
     8        Use explicit conversion for string to avoid depending on the default codec
     9        installed by the user code.
     10
     11        * Platform/qt/SharedMemoryQt.cpp:
     12        (WebKit::SharedMemory::create):
     13        * Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp:
     14        (WebKit::initializeGTK):
     15        * UIProcess/API/qt/tests/qgraphicswkview/tst_qgraphicswkview.cpp:
     16        (tst_QGraphicsWKView::loadEmptyPage):
     17        (tst_QGraphicsWKView::loadEmptyUrl):
     18        * UIProcess/API/qt/tests/qwkpage/tst_qwkpage.cpp:
     19        (tst_QWKPage::loadEmptyUrl):
     20        * UIProcess/Launcher/qt/ProcessLauncherQt.cpp:
     21        (WebKit::ProcessLauncher::launchProcess):
     22        * WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp:
     23        (WebKit::getPluginDisplay):
     24        * WebProcess/qt/WebProcessMainQt.cpp:
     25        (WebKit::EnvHttpProxyFactory::initializeFromEnvironment):
     26        (WebKit::WebProcessMainQt):
     27
    1282011-03-25  Brent Fulgham  <bfulgham@webkit.org>
    229
  • trunk/Source/WebKit2/Platform/qt/SharedMemoryQt.cpp

    r77765 r81968  
    102102PassRefPtr<SharedMemory> SharedMemory::create(size_t size)
    103103{
    104     QString tempName = QDir::temp().filePath("qwkshm.XXXXXX");
     104    QString tempName = QDir::temp().filePath(QLatin1String("qwkshm.XXXXXX"));
    105105    QByteArray tempNameCSTR = tempName.toLocal8Bit();
    106106    char* tempNameC = tempNameCSTR.data();
  • trunk/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp

    r80007 r81968  
    4141static void initializeGTK()
    4242{
    43     QLibrary library("libgtk-x11-2.0.so.0");
     43    QLibrary library(QLatin1String("libgtk-x11-2.0.so.0"));
    4444    if (library.load()) {
    4545        typedef void *(*gtk_init_check_ptr)(int*, char***);
  • trunk/Source/WebKit2/UIProcess/API/qt/tests/qgraphicswkview/tst_qgraphicswkview.cpp

    r81237 r81968  
    8585    m_view->show();
    8686
    87     m_view->m_webView-> load(QUrl::fromLocalFile(TESTS_SOURCE_DIR "/html/basic_page.html"));
     87    m_view->m_webView-> load(QUrl::fromLocalFile(QLatin1String(TESTS_SOURCE_DIR "/html/basic_page.html")));
    8888    QVERIFY(waitForSignal(m_view->m_webView, SIGNAL(loadFinished(bool))));
    8989}
     
    9696    QVERIFY(!waitForSignal(m_view->m_webView->page(), SIGNAL(engineConnectionChanged(bool)), 50));
    9797
    98     m_view->m_webView->load(QUrl(""));
     98    m_view->m_webView->load(QUrl(QLatin1String("")));
    9999    QVERIFY(!waitForSignal(m_view->m_webView->page(), SIGNAL(engineConnectionChanged(bool)), 50));
    100100}
  • trunk/Source/WebKit2/UIProcess/API/qt/tests/qwkpage/tst_qwkpage.cpp

    r81237 r81968  
    5252{
    5353    m_page->load(QUrl());
    54     m_page->load(QUrl(""));
     54    m_page->load(QUrl(QLatin1String("")));
    5555}
    5656
  • trunk/Source/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp

    r81507 r81968  
    8686void ProcessLauncher::launchProcess()
    8787{
    88     QString applicationPath = "%1 %2";
     88    QString applicationPath = QLatin1String("%1 %2");
    8989
    90     if (QFile::exists(QCoreApplication::applicationDirPath() + "/QtWebProcess")) {
    91         applicationPath = applicationPath.arg(QCoreApplication::applicationDirPath() + "/QtWebProcess");
     90    if (QFile::exists(QCoreApplication::applicationDirPath() + QLatin1String("/QtWebProcess"))) {
     91        applicationPath = applicationPath.arg(QCoreApplication::applicationDirPath() + QLatin1String("/QtWebProcess"));
    9292    } else {
    93         applicationPath = applicationPath.arg("QtWebProcess");
     93        applicationPath = applicationPath.arg(QLatin1String("QtWebProcess"));
    9494    }
    9595
  • trunk/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp

    r81811 r81968  
    5252    // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default());
    5353
    54     QLibrary library("libgdk-x11-2.0", 0);
     54    QLibrary library(QLatin1String("libgdk-x11-2.0"), 0);
    5555    if (!library.load())
    5656        return 0;
  • trunk/Source/WebKit2/WebProcess/qt/WebProcessMainQt.cpp

    r81186 r81968  
    8383    bool wasSetByEnvironment = false;
    8484
    85     QUrl proxyUrl = QUrl::fromUserInput(qgetenv("http_proxy"));
     85    QUrl proxyUrl = QUrl::fromUserInput(QString::fromLocal8Bit(qgetenv("http_proxy")));
    8686    if (proxyUrl.isValid() && !proxyUrl.host().isEmpty()) {
    8787        int proxyPort = (proxyUrl.port() > 0) ? proxyUrl.port() : 8080;
     
    9191        m_httpProxy << QNetworkProxy::NoProxy;
    9292
    93     proxyUrl = QUrl::fromUserInput(qgetenv("https_proxy"));
     93    proxyUrl = QUrl::fromUserInput(QString::fromLocal8Bit(qgetenv("https_proxy")));
    9494    if (proxyUrl.isValid() && !proxyUrl.host().isEmpty()) {
    9595        int proxyPort = (proxyUrl.port() > 0) ? proxyUrl.port() : 8080;
     
    133133Q_DECL_EXPORT int WebProcessMainQt(int argc, char** argv)
    134134{
    135     QApplication::setGraphicsSystem("raster");
     135    QApplication::setGraphicsSystem(QLatin1String("raster"));
    136136    QApplication* app = new QApplication(argc, argv);
    137137#ifndef NDEBUG
Note: See TracChangeset for help on using the changeset viewer.