[Rinside-commits] r275 - in pkg: . inst inst/examples/qt

[noreply at r-forge.r-project.org]

Author: edd
Date: 2013-08-11 15:46:54 +0200 (Sun, 11 Aug 2013)
New Revision: 275

Modified:
   pkg/ChangeLog
   pkg/inst/NEWS.Rd
   pkg/inst/examples/qt/qtdensity.cpp
   pkg/inst/examples/qt/qtdensity.h
Log:
more explicit header inclusionin qt/ example as needed by Qt 5.1 -- with thanks to Spencer Behling for the patch


Modified: pkg/ChangeLog
===================================================================
--- pkg/ChangeLog	2013-04-22 22:57:35 UTC (rev 274)
+++ pkg/ChangeLog	2013-08-11 13:46:54 UTC (rev 275)
@@ -1,3 +1,10 @@
+2013-08-11  Dirk Eddelbuettel  <edd at debian.org>
+
+	* inst/examples/qt/qtdensity.h: Added a few more explicit #include
+	statements which Qt 5.1 now appears to require -- with thanks to
+	Spencer Behling for the patch
+	* inst/examples/qt/qtdensity.h: Moved one #include to header file
+
 2013-04-22  Dirk Eddelbuettel  <edd at debian.org>
 
 	* inst/examples/armadillo/rinside_arma0.cpp: Reverse order of

Modified: pkg/inst/NEWS.Rd
===================================================================
--- pkg/inst/NEWS.Rd	2013-04-22 22:57:35 UTC (rev 274)
+++ pkg/inst/NEWS.Rd	2013-08-11 13:46:54 UTC (rev 275)
@@ -2,6 +2,14 @@
 \title{News for Package 'RInside'}
 \newcommand{\cpkg}{\href{http://CRAN.R-project.org/package=#1}{\pkg{#1}}}
 
+\section{Changes in RInside version 0.2.12-UNRELEASED (2013-xx-yy)}{
+  \itemize{
+    \item Added a few more explicit #include statements in the \code{qt}
+    example which Qt 5.1 now appears to require -- with thanks to
+    Spencer Behling for the patch
+  }
+}
+
 \section{Changes in RInside version 0.2.11 (2013-12-31)}{
   \itemize{
     \item Added new MPI example with worker functions and RInside

Modified: pkg/inst/examples/qt/qtdensity.cpp
===================================================================
--- pkg/inst/examples/qt/qtdensity.cpp	2013-04-22 22:57:35 UTC (rev 274)
+++ pkg/inst/examples/qt/qtdensity.cpp	2013-08-11 13:46:54 UTC (rev 275)
@@ -3,10 +3,8 @@
 // Qt usage example for RInside, inspired by the standard 'density
 // sliders' example for other GUI toolkits -- this time with SVG
 //
-// Copyright (C) 2011  Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2011 - 2013  Dirk Eddelbuettel and Romain Francois
 
-#include <QtGui>
-
 #include "qtdensity.h"
 
 QtDensity::QtDensity(RInside & R) : m_R(R)

Modified: pkg/inst/examples/qt/qtdensity.h
===================================================================
--- pkg/inst/examples/qt/qtdensity.h	2013-04-22 22:57:35 UTC (rev 274)
+++ pkg/inst/examples/qt/qtdensity.h	2013-08-11 13:46:54 UTC (rev 275)
@@ -3,13 +3,20 @@
 // Qt usage example for RInside, inspired by the standard 'density
 // sliders' example for other GUI toolkits
 //
-// Copyright (C) 2011  Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2011 - 2013  Dirk Eddelbuettel and Romain Francois
 
 #ifndef QTDENSITY_H
 #define QTDENSITY_H
 
 #include <RInside.h>
 
+#include <QtGui>
+#include <QWidget>
+#include <QLabel>
+#include <QLineEdit>
+#include <QRadioButton>
+#include <QGroupBox>
+#include <QButtonGroup>
 #include <QMainWindow>
 #include <QHBoxLayout>
 #include <QSlider>