Skip site navigation (1)Skip section navigation (2) 
Date:      Sun, 7 Jul 2019 08:05:46 +0000 (UTC)
From:      "Tobias C. Berner" <tcberner@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r506108 - head/graphics/nomacs/files
Message-ID:  <201907070805.x6785ktj041089@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: tcberner
Date: Sun Jul  7 08:05:46 2019
New Revision: 506108
URL: https://svnweb.freebsd.org/changeset/ports/506108

Log:
  graphics/nomacs: fix logic

Added:
  head/graphics/nomacs/files/patch-src_DkCore_DkPluginManager.cpp   (contents, props changed)

Added: head/graphics/nomacs/files/patch-src_DkCore_DkPluginManager.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/nomacs/files/patch-src_DkCore_DkPluginManager.cpp	Sun Jul  7 08:05:46 2019	(r506108)
@@ -0,0 +1,19 @@
+/wrkdirs/usr/ports/graphics/nomacs/work/nomacs-3.6.1/ImageLounge/src/DkCore/DkPluginManager.cpp:371:13: warning: '&&' within '||' [-Wlogical-op-parentheses]
+        else if (p && p->interfaceType() == DkPluginInterface::interface_basic || p->interfaceType() == DkPluginInterface::interface_batch) {
+                 ~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~
+/wrkdirs/usr/ports/graphics/nomacs/work/nomacs-3.6.1/ImageLounge/src/DkCore/DkPluginManager.cpp:371:13: note: place parentheses around the '&&' expression to silence this warning
+        else if (p && p->interfaceType() == DkPluginInterface::interface_basic || p->interfaceType() == DkPluginInterface::interface_batch) {
+                   ^
+                 (                                                            )
+
+--- src/DkCore/DkPluginManager.cpp.orig	2019-07-07 07:04:23 UTC
++++ src/DkCore/DkPluginManager.cpp
+@@ -368,7 +368,7 @@ void DkPluginContainer::run() {
+ 		connect(vPlugin->getViewPort(), SIGNAL(showToolbar(QToolBar*, bool)), vPlugin->getMainWindow(), SLOT(showToolbar(QToolBar*, bool)));
+ 		emit runPlugin(vPlugin, false);
+ 	}
+-	else if (p && p->interfaceType() == DkPluginInterface::interface_basic || p->interfaceType() == DkPluginInterface::interface_batch) {
++	else if (p && (p->interfaceType() == DkPluginInterface::interface_basic || p->interfaceType() == DkPluginInterface::interface_batch)) {
+ 
+ 		QAction* a = qobject_cast<QAction*>(QObject::sender());
+

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201907070805.x6785ktj041089>