Don't use false as pointer literal. Add explicit enum cast around bit

ops on enums.

4 files changed, 43 insertions, 1 deletions

diff --git a/x11/qt4-libs/distinfo b/x11/qt4-libs/distinfo
index 42d86c97d43..235725d5d8a 100644
--- a/x11/qt4-libs/distinfo
+++ b/x11/qt4-libs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.87 2013/07/07 18:13:56 adam Exp $
+$NetBSD: distinfo,v 1.88 2013/08/29 13:00:41 joerg Exp $
 
 SHA1 (qt-everywhere-opensource-src-4.8.5.tar.gz) = 745f9ebf091696c0d5403ce691dc28c039d77b9e
 RMD160 (qt-everywhere-opensource-src-4.8.5.tar.gz) = 1e7bb099d5d1cda0b663cebe207c846c8d04750d
@@ -60,6 +60,7 @@ SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_RefCountedLeakCounter.
 SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_StringImpl.h) = d5460bede6b3662df4d9dbec5826db98c6ef4f61
 SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_ThreadSafeRefCounted.h) = 2d3176beb56697d033387ab10729cfb6681d01c7
 SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_Threading.h) = fa7519ef6ac04cd13be085783f663c329e4a14be
+SHA1 (patch-src_3rdparty_webkit_Source_WebCore_dom_Element.cpp) = 90fd6a884f9fd058210c3011bea2ce695011d2e3
 SHA1 (patch-src_3rdparty_webkit_Source_WebCore_features.pri) = d0053dd2732604908fcec294b2a833aeb6d93f40
 SHA1 (patch-src_3rdparty_webkit_Source_WebCore_platform_DefaultLocalizationStrategy.cpp) = 0377066bd28d5eae02e8fcf200da4360c286ad84
 SHA1 (patch-src_3rdparty_webkit_Source_WebCore_platform_Timer.cpp) = 6327c7ea52b5a91adc5b96319c29c8ffd994524e
@@ -73,3 +74,5 @@ SHA1 (patch-src_corelib_io_io.pri) = cde98927b524c92fae1e053c2359e77bde2c240a
 SHA1 (patch-src_corelib_io_qfilesystemwatcher.cpp) = bb16b95d20286b1aa069dc25843d7e0067cc0268
 SHA1 (patch-src_network_ssl_qsslsocket__openssl__symbols.cpp) = 3ad682b86d2e9bd2b282caa298508dc3e9dd8566
 SHA1 (patch-src_network_ssl_qsslsocket__openssl__symbols__p.h) = 417846ba9edab8638cafa41a54ef60029467ef80
+SHA1 (patch-src_plugins_accessible_widgets_itemviews.cpp) = 1456fbaacef33f3b2422158d758d02990845048a
+SHA1 (patch-src_scripttools_debugging_qscriptdebuggerconsole.cpp) = eea948f07fd9e595c7813aa485e985407dfcfbf9
diff --git a/x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_WebCore_dom_Element.cpp b/x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_WebCore_dom_Element.cpp
new file mode 100644
index 00000000000..cca0d2be945
--- /dev/null
+++ b/x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_WebCore_dom_Element.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_3rdparty_webkit_Source_WebCore_dom_Element.cpp,v 1.1 2013/08/29 13:00:41 joerg Exp $
+
+--- src/3rdparty/webkit/Source/WebCore/dom/Element.cpp.orig	2013-07-12 11:02:45.000000000 +0000
++++ src/3rdparty/webkit/Source/WebCore/dom/Element.cpp
+@@ -1080,7 +1080,7 @@ void Element::recalcStyle(StyleChange ch
+ {
+     // Ref currentStyle in case it would otherwise be deleted when setRenderStyle() is called.
+     RefPtr<RenderStyle> currentStyle(renderStyle());
+-    bool hasParentStyle = parentNodeForRenderingAndStyle() ? parentNodeForRenderingAndStyle()->renderStyle() : false;
++    bool hasParentStyle = parentNodeForRenderingAndStyle() ? parentNodeForRenderingAndStyle()->renderStyle() != NULL : false;
+     bool hasDirectAdjacentRules = currentStyle && currentStyle->childrenAffectedByDirectAdjacentRules();
+     bool hasIndirectAdjacentRules = currentStyle && currentStyle->childrenAffectedByForwardPositionalRules();
+ 
diff --git a/x11/qt4-libs/patches/patch-src_plugins_accessible_widgets_itemviews.cpp b/x11/qt4-libs/patches/patch-src_plugins_accessible_widgets_itemviews.cpp
new file mode 100644
index 00000000000..bed4f8ea7b1
--- /dev/null
+++ b/x11/qt4-libs/patches/patch-src_plugins_accessible_widgets_itemviews.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_plugins_accessible_widgets_itemviews.cpp,v 1.1 2013/08/29 13:00:41 joerg Exp $
+
+--- src/plugins/accessible/widgets/itemviews.cpp.orig	2013-07-12 12:18:31.000000000 +0000
++++ src/plugins/accessible/widgets/itemviews.cpp
+@@ -393,7 +393,7 @@ bool QAccessibleTable2::unselectColumn(i
+     QModelIndex index = view()->model()->index(0, column, view()->rootIndex());
+     if (!index.isValid() || view()->selectionMode() & QAbstractItemView::NoSelection)
+         return false;
+-    view()->selectionModel()->select(index, QItemSelectionModel::Columns & QItemSelectionModel::Deselect);
++    view()->selectionModel()->select(index, QItemSelectionModel::SelectionFlags(QItemSelectionModel::Columns & QItemSelectionModel::Deselect));
+     return true;
+ }
+ 
diff --git a/x11/qt4-libs/patches/patch-src_scripttools_debugging_qscriptdebuggerconsole.cpp b/x11/qt4-libs/patches/patch-src_scripttools_debugging_qscriptdebuggerconsole.cpp
new file mode 100644
index 00000000000..33b9bea8fcd
--- /dev/null
+++ b/x11/qt4-libs/patches/patch-src_scripttools_debugging_qscriptdebuggerconsole.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_scripttools_debugging_qscriptdebuggerconsole.cpp,v 1.1 2013/08/29 13:00:41 joerg Exp $
+
+--- src/scripttools/debugging/qscriptdebuggerconsole.cpp.orig	2013-07-12 12:05:08.000000000 +0000
++++ src/scripttools/debugging/qscriptdebuggerconsole.cpp
+@@ -489,7 +489,7 @@ QScriptDebuggerConsoleCommandJob *QScrip
+     d->input += QLatin1Char('\n');
+     QScriptSyntaxCheckResult check = QScriptEngine::checkSyntax(d->input);
+     if (check.state() == QScriptSyntaxCheckResult::Intermediate)
+-        return false;
++        return 0;
+     d->input.chop(1); // remove the last \n
+     cmd = QString();
+     cmd.append(d->commandPrefix);