[education/rkward] /: Some more test standards; fix inverted logic

[Thomas Friedrichsmeier]

Git commit 636b9984b950159e7abb5cd02e6e6b26bf764d74 by Thomas Friedrichsmeier.
Committed on 12/04/2022 at 05:53.
Pushed by tfry into branch 'master'.

Some more test standards; fix inverted logic

M  +1    -1    rkward/rbackend/rkwarddevice/rkgraphicsdevice.cpp
M  +1    -1    rkward/settings/rksettingsmodulegraphics.cpp
M  +0    -3    tests/import_export_plugins/import_xls.rkout
M  +1    -1    tests/plots/scatterplot_matrix.rkcommands.R

https://invent.kde.org/education/rkward/commit/636b9984b950159e7abb5cd02e6e6b26bf764d74

diff --git a/rkward/rbackend/rkwarddevice/rkgraphicsdevice.cpp b/rkward/rbackend/rkwarddevice/rkgraphicsdevice.cpp
index 42500baa..2bccc371 100644
--- a/rkward/rbackend/rkwarddevice/rkgraphicsdevice.cpp
+++ b/rkward/rbackend/rkwarddevice/rkgraphicsdevice.cpp
@@ -219,7 +219,7 @@ void RKGraphicsDevice::closeDevice (int devnum) {
 void RKGraphicsDevice::clear(const QBrush& brush) {
 	RK_TRACE (GRAPHICS_DEVICE);
 
-	setClip(area.rect ());	// R's devX11.c resets clip on clear, so we do this, too.
+	setClip(area.rect());	// R's devX11.c resets clip on clear, so we do this, too.
 	if (recording_path) {
 		recorded_path = QPainterPath();
 		return;
diff --git a/rkward/settings/rksettingsmodulegraphics.cpp b/rkward/settings/rksettingsmodulegraphics.cpp
index 22daf08c..91d2d364 100644
--- a/rkward/settings/rksettingsmodulegraphics.cpp
+++ b/rkward/settings/rksettingsmodulegraphics.cpp
@@ -81,7 +81,7 @@ RKSettingsModuleGraphics::RKSettingsModuleGraphics (RKSettings *gui, QWidget *pa
 	button = new QRadioButton (i18n ("Embed original device"), group);
 	replace_standard_devices_group->addButton (button, (int) EmbedDevice);
 	group_layout->addWidget (button);
-#ifndef Q_OS_MACOS
+#ifdef Q_OS_MACOS
 	button->setEnabled (false);
 #endif
 	button = new QRadioButton (i18n ("No device integration"), group);
diff --git a/tests/import_export_plugins/import_xls.rkout b/tests/import_export_plugins/import_xls.rkout
index 836cf2cb..2d67347b 100644
--- a/tests/import_export_plugins/import_xls.rkout
+++ b/tests/import_export_plugins/import_xls.rkout
@@ -9,9 +9,6 @@
 <li>Character for missing values: NA</li>
 </ul>
 DATE<br />
-<h2>Messages, warnings, or errors:</h2>
-<pre class="output_warning">Calling POSIX::isdigit() is deprecated at /home/thomas/.rkward/library/gdata/perl/xls2csv.pl line 118.
-</pre>
 
 
 <p align= center >
diff --git a/tests/plots/scatterplot_matrix.rkcommands.R b/tests/plots/scatterplot_matrix.rkcommands.R
index 23a0f05c..73d9054e 100644
--- a/tests/plots/scatterplot_matrix.rkcommands.R
+++ b/tests/plots/scatterplot_matrix.rkcommands.R
@@ -10,6 +10,6 @@ rk.header ("Scatterplot Matrix", parameters=list("Diagonal panels"="Histogram",
 	"Plot data concentration ellipses"="no"))
 
 rk.graph.on ()
-try (scatterplotMatrix(data, diagonal="histogram", plot.points=TRUE, smooth=FALSE, ellipse=FALSE))
+try (scatterplotMatrix(data, diagonal=list(method="histogram"), plot.points=TRUE, smooth=FALSE, ellipse=FALSE))
 rk.graph.off ()
 })