Changeset 50806 in webkit

Timestamp:

Nov 11, 2009 6:45:38 AM (14 years ago)

Author:

eric@webkit.org

Message:

2009-11-11 Laszlo Gombos <Laszlo Gombos>

Reviewed by Kenneth Rohde Christiansen.

​https://bugs.webkit.org/show_bug.cgi?id=31323
Fix a few compiler warnings

No new tests as there is no new functionality.

• editing/htmlediting.cpp: (WebCore::isRenderedAsNonInlineTableImageOrHR): Use explicit parentheses to silence gcc 4.4 -Wparentheses warnings

2009-11-11 Laszlo Gombos <Laszlo Gombos>

Reviewed by Kenneth Rohde Christiansen.

​https://bugs.webkit.org/show_bug.cgi?id=31323
Fix a few compiler warnings

• tests/qwebframe/tst_qwebframe.cpp: Add extra brackets to make it explicit where the else case belongs

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/editing/htmlediting.cpp (modified) (1 diff)
• WebKit/qt/ChangeLog (modified) (1 diff)
• WebKit/qt/tests/qwebframe/tst_qwebframe.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-11-11  Laszlo Gombos  <laszlo.1.gombos@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        https://bugs.webkit.org/show_bug.cgi?id=31323
+        Fix a few compiler warnings
+
+        No new tests as there is no new functionality.
+
+        * editing/htmlediting.cpp:
+        (WebCore::isRenderedAsNonInlineTableImageOrHR): Use explicit
+        parentheses to silence gcc 4.4 -Wparentheses warnings
+
 2009-11-11  Kenneth Rohde Christiansen  <kenneth@webkit.org>
 

trunk/WebCore/editing/htmlediting.cpp

@@ -1085 +1085 @@
         return false;
     RenderObject* renderer = node->renderer();
-    return renderer && ((renderer->isTable() && !renderer->isInline()) || renderer->isImage() && !renderer->isInline() || renderer->isHR());
+    return renderer && ((renderer->isTable() && !renderer->isInline()) || (renderer->isImage() && !renderer->isInline()) || renderer->isHR());
 }
 

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2009-11-11  Laszlo Gombos  <laszlo.1.gombos@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        https://bugs.webkit.org/show_bug.cgi?id=31323
+        Fix a few compiler warnings
+
+        * tests/qwebframe/tst_qwebframe.cpp: Add extra brackets 
+        to make it explicit where the else case belongs
+
 2009-11-11  Simon Hausmann  <simon.hausmann@nokia.com>
 

trunk/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp

@@ -2239 +2239 @@
     {
         QString url = request.url().toString();
-        if (op == QNetworkAccessManager::GetOperation)
+        if (op == QNetworkAccessManager::GetOperation) {
             if (url == "qrc:/test1.html" ||  url == "http://abcdef.abcdef/")
                 return new FakeReply(request, this);
@@ -2250 +2250 @@
             }
 #endif
+       }
 
         return QNetworkAccessManager::createRequest(op, request, outgoingData);