[GTK] Fix concatenations of string literals that are not C++11-compliant

https://bugs.webkit.org/show_bug.cgi?id=116449

Reviewed by Martin Robinson.

Fix the problematic concatenations of string literals so they are compilable under the C++11 standard. This
is simply a matter of separating the string and the string literal that are being concatenated with a space.

Source/WebCore:

* platform/graphics/gtk/FullscreenVideoControllerGtk.cpp:
* platform/gtk/FileSystemGtk.cpp:
(WebCore::sharedResourcesPath):

Source/WebKit2:

* UIProcess/API/gtk/tests/TestPrinting.cpp:
(testPrintOperationPrint):
* UIProcess/API/gtk/tests/WebExtensionTest.cpp:
(methodCallCallback):

Tools:

* ImageDiff/gtk/ImageDiff.cpp:
(printImage):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@150421 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 22fd0d9..425d8a3 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,5 +1,19 @@
 2013-05-20  Zan Dobersek  <zdobersek@igalia.com>
 
 2013-05-20  Zan Dobersek  <zdobersek@igalia.com>
 

+        [GTK] Fix concatenations of string literals that are not C++11-compliant
+        https://bugs.webkit.org/show_bug.cgi?id=116449
+
+        Reviewed by Martin Robinson.
+
+        Fix the problematic concatenations of string literals so they are compilable under the C++11 standard. This
+        is simply a matter of separating the string and the string literal that are being concatenated with a space.
+
+        * platform/graphics/gtk/FullscreenVideoControllerGtk.cpp:
+        * platform/gtk/FileSystemGtk.cpp:
+        (WebCore::sharedResourcesPath):
+
+2013-05-20  Zan Dobersek  <zdobersek@igalia.com>
+

         [GTK] Support application/x-mimearchive mimetype for MHTML archives instead of message/rfc822
         https://bugs.webkit.org/show_bug.cgi?id=116442
 
         [GTK] Support application/x-mimearchive mimetype for MHTML archives instead of message/rfc822
         https://bugs.webkit.org/show_bug.cgi?id=116442
 

diff --git a/Source/WebCore/platform/graphics/gtk/FullscreenVideoControllerGtk.cpp b/Source/WebCore/platform/graphics/gtk/FullscreenVideoControllerGtk.cpp
index 46813be..a2f08b6 100644 (file)
--- a/Source/WebCore/platform/graphics/gtk/FullscreenVideoControllerGtk.cpp
+++ b/Source/WebCore/platform/graphics/gtk/FullscreenVideoControllerGtk.cpp
@@ -48,9 +48,9 @@
 #define ICON_NAME_SUFFIX
 #endif
 
 #define ICON_NAME_SUFFIX
 #endif
 

-#define PLAY_ICON_NAME "media-playback-start"ICON_NAME_SUFFIX
-#define PAUSE_ICON_NAME "media-playback-pause"ICON_NAME_SUFFIX
-#define EXIT_FULLSCREEN_ICON_NAME "view-restore"ICON_NAME_SUFFIX
+#define PLAY_ICON_NAME "media-playback-start" ICON_NAME_SUFFIX
+#define PAUSE_ICON_NAME "media-playback-pause" ICON_NAME_SUFFIX
+#define EXIT_FULLSCREEN_ICON_NAME "view-restore" ICON_NAME_SUFFIX

 
 namespace WebCore {
 
 
 namespace WebCore {
 

diff --git a/Source/WebCore/platform/gtk/FileSystemGtk.cpp b/Source/WebCore/platform/gtk/FileSystemGtk.cpp
index fa20729..84eec62 100644 (file)
--- a/Source/WebCore/platform/gtk/FileSystemGtk.cpp
+++ b/Source/WebCore/platform/gtk/FileSystemGtk.cpp
@@ -222,7 +222,7 @@ CString sharedResourcesPath()
     GOwnPtr<gchar> runtimeDir(g_win32_get_package_installation_directory_of_module(hmodule));
     GOwnPtr<gchar> dataPath(g_build_filename(runtimeDir.get(), "share", "webkitgtk-"WEBKITGTK_API_VERSION_STRING, NULL));
 #else
     GOwnPtr<gchar> runtimeDir(g_win32_get_package_installation_directory_of_module(hmodule));
     GOwnPtr<gchar> dataPath(g_build_filename(runtimeDir.get(), "share", "webkitgtk-"WEBKITGTK_API_VERSION_STRING, NULL));
 #else

-    GOwnPtr<gchar> dataPath(g_build_filename(DATA_DIR, "webkitgtk-"WEBKITGTK_API_VERSION_STRING, NULL));
+    GOwnPtr<gchar> dataPath(g_build_filename(DATA_DIR, "webkitgtk-" WEBKITGTK_API_VERSION_STRING, NULL));

 #endif
 
     cachedPath = dataPath.get();
 #endif
 
     cachedPath = dataPath.get();

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 0350317..2a1c251 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,18 @@
+2013-05-20  Zan Dobersek  <zdobersek@igalia.com>
+
+        [GTK] Fix concatenations of string literals that are not C++11-compliant
+        https://bugs.webkit.org/show_bug.cgi?id=116449
+
+        Reviewed by Martin Robinson.
+
+        Fix the problematic concatenations of string literals so they are compilable under the C++11 standard. This
+        is simply a matter of separating the string and the string literal that are being concatenated with a space.
+
+        * UIProcess/API/gtk/tests/TestPrinting.cpp:
+        (testPrintOperationPrint):
+        * UIProcess/API/gtk/tests/WebExtensionTest.cpp:
+        (methodCallCallback):
+

 2013-05-20  Commit Queue  <commit-queue@webkit.org>
 
         Unreviewed, rolling out r150384.
 2013-05-20  Commit Queue  <commit-queue@webkit.org>
 
         Unreviewed, rolling out r150384.

diff --git a/Source/WebKit2/UIProcess/API/gtk/tests/TestPrinting.cpp b/Source/WebKit2/UIProcess/API/gtk/tests/TestPrinting.cpp
index 123831f..72c2cfb 100644 (file)
--- a/Source/WebKit2/UIProcess/API/gtk/tests/TestPrinting.cpp
+++ b/Source/WebKit2/UIProcess/API/gtk/tests/TestPrinting.cpp
@@ -146,7 +146,7 @@ static void testPrintOperationPrint(PrintTest* test, gconstpointer)
     webkit_print_operation_print(test->m_printOperation.get());
     test->waitUntilPrintFinished();
 
     webkit_print_operation_print(test->m_printOperation.get());
     test->waitUntilPrintFinished();
 

-    GRefPtr<GFileInfo> fileInfo = adoptGRef(g_file_query_info(outputFile.get(), G_FILE_ATTRIBUTE_STANDARD_SIZE","G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE,
+    GRefPtr<GFileInfo> fileInfo = adoptGRef(g_file_query_info(outputFile.get(), G_FILE_ATTRIBUTE_STANDARD_SIZE "," G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE,

                                                               static_cast<GFileQueryInfoFlags>(0), 0, 0));
     g_assert(fileInfo.get());
     g_assert_cmpint(g_file_info_get_size(fileInfo.get()), >, 0);
                                                               static_cast<GFileQueryInfoFlags>(0), 0, 0));
     g_assert(fileInfo.get());
     g_assert_cmpint(g_file_info_get_size(fileInfo.get()), >, 0);

diff --git a/Source/WebKit2/UIProcess/API/gtk/tests/WebExtensionTest.cpp b/Source/WebKit2/UIProcess/API/gtk/tests/WebExtensionTest.cpp
index 2060147..287c610 100644 (file)
--- a/Source/WebKit2/UIProcess/API/gtk/tests/WebExtensionTest.cpp
+++ b/Source/WebKit2/UIProcess/API/gtk/tests/WebExtensionTest.cpp
@@ -107,7 +107,7 @@ static void methodCallCallback(GDBusConnection* connection, const char* sender,
         if (!page) {
             g_dbus_method_invocation_return_error(
                 invocation, G_DBUS_ERROR, G_DBUS_ERROR_INVALID_ARGS,
         if (!page) {
             g_dbus_method_invocation_return_error(
                 invocation, G_DBUS_ERROR, G_DBUS_ERROR_INVALID_ARGS,

-                "Invalid page ID: %"G_GUINT64_FORMAT, pageID);
+                "Invalid page ID: %" G_GUINT64_FORMAT, pageID);

             return;
         }
         g_assert_cmpuint(webkit_web_page_get_id(page), ==, pageID);
             return;
         }
         g_assert_cmpuint(webkit_web_page_get_id(page), ==, pageID);

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index efe8cab..22b0dc7 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,5 +1,18 @@
 2013-05-20  Zan Dobersek  <zdobersek@igalia.com>
 
 2013-05-20  Zan Dobersek  <zdobersek@igalia.com>
 

+        [GTK] Fix concatenations of string literals that are not C++11-compliant
+        https://bugs.webkit.org/show_bug.cgi?id=116449
+
+        Reviewed by Martin Robinson.
+
+        Fix the problematic concatenations of string literals so they are compilable under the C++11 standard. This
+        is simply a matter of separating the string and the string literal that are being concatenated with a space.
+
+        * ImageDiff/gtk/ImageDiff.cpp:
+        (printImage):
+
+2013-05-20  Zan Dobersek  <zdobersek@igalia.com>
+

         [GTK] Pass GTEST_HAS_RTTI=0 cppflag to TestWebKitAPI programs at compilation-time
         https://bugs.webkit.org/show_bug.cgi?id=116450
 
         [GTK] Pass GTEST_HAS_RTTI=0 cppflag to TestWebKitAPI programs at compilation-time
         https://bugs.webkit.org/show_bug.cgi?id=116450
 

diff --git a/Tools/ImageDiff/gtk/ImageDiff.cpp b/Tools/ImageDiff/gtk/ImageDiff.cpp
index 84c4003..2cb9f3b 100644 (file)
--- a/Tools/ImageDiff/gtk/ImageDiff.cpp
+++ b/Tools/ImageDiff/gtk/ImageDiff.cpp
@@ -157,7 +157,7 @@ void printImage(GdkPixbuf* image)
         return; // Don't bail out, as we can still use the percentage output.
     }
 
         return; // Don't bail out, as we can still use the percentage output.
     }
 

-    printf("Content-Length: %"G_GSIZE_FORMAT"\n", bufferSize);
+    printf("Content-Length: %" G_GSIZE_FORMAT "\n", bufferSize);

     fwrite(buffer, 1, bufferSize, stdout);
 }
 
     fwrite(buffer, 1, bufferSize, stdout);
 }