[rkward-cvs] SF.net SVN: rkward-code:[4792] trunk/rkward/rkward

[tfry at users.sf.net]

Revision: 4792
          http://sourceforge.net/p/rkward/code/4792
Author:   tfry
Date:     2014-05-02 15:50:12 +0000 (Fri, 02 May 2014)
Log Message:
-----------
Fix some compiler warnings.

Modified Paths:
--------------
    trunk/rkward/rkward/agents/showedittextfileagent.h
    trunk/rkward/rkward/rbackend/rinterface.cpp
    trunk/rkward/rkward/rbackend/rinterface.h
    trunk/rkward/rkward/rkconsole.h
    trunk/rkward/rkward/windows/rkcommandlog.h

Modified: trunk/rkward/rkward/agents/showedittextfileagent.h
===================================================================
--- trunk/rkward/rkward/agents/showedittextfileagent.h	2014-05-01 18:23:52 UTC (rev 4791)
+++ trunk/rkward/rkward/agents/showedittextfileagent.h	2014-05-02 15:50:12 UTC (rev 4792)
@@ -20,7 +20,7 @@
 
 #include <qobject.h>
 
-struct RBackendRequest;
+class RBackendRequest;
 class KDialog;
 
 /** The purpose of this agent is to display text files for showing and/or editing on request of the R backend. Technically speaking, it gets invoked, whenever the standard R callbacks (ptr_)R_ShowFiles, (ptr_)R_EditFiles, or (ptr_)R_EditFile are called. While the task of simply opening such files for display/editing is rather simple, there is one slightly more difficult issue involved (and hence this class to handle it): In standard R, all these calls are blocking further processing, until the user has closed the shown/edited files. In some cases this may be necessary (for instance if R wants to use with the edited files immediately), in some cases this is an unnecessary nuisance (such as when R simply wants to display a help page or some other purely informational text).

Modified: trunk/rkward/rkward/rbackend/rinterface.cpp
===================================================================
--- trunk/rkward/rkward/rbackend/rinterface.cpp	2014-05-01 18:23:52 UTC (rev 4791)
+++ trunk/rkward/rkward/rbackend/rinterface.cpp	2014-05-02 15:50:12 UTC (rev 4792)
@@ -381,7 +381,7 @@
 	} else if (request->type == RBackendRequest::PlainGenericRequest) {
 		request->params["return"] = QVariant (processPlainGenericRequest (request->params["call"].toStringList ()));
 		RKRBackendProtocolFrontend::setRequestCompleted (request);
-	} else if ((request->type == RBackendRequest::Started)) {
+	} else if (request->type == RBackendRequest::Started) {
 		// The backend thread has finished basic initialization, but we still have more to do...
 		startup_errors = request->params["message"].toString ();
 

Modified: trunk/rkward/rkward/rbackend/rinterface.h
===================================================================
--- trunk/rkward/rkward/rbackend/rinterface.h	2014-05-01 18:23:52 UTC (rev 4791)
+++ trunk/rkward/rkward/rbackend/rinterface.h	2014-05-02 15:50:12 UTC (rev 4792)
@@ -27,7 +27,7 @@
 class RCommand;
 class RKWardMainWindow;
 class RKRBackend;
-struct RBackendRequest;
+class RBackendRequest;
 
 /** This class provides the main interface to the R-processor.
 

Modified: trunk/rkward/rkward/rkconsole.h
===================================================================
--- trunk/rkward/rkward/rkconsole.h	2014-05-01 18:23:52 UTC (rev 4791)
+++ trunk/rkward/rkward/rkconsole.h	2014-05-02 15:50:12 UTC (rev 4792)
@@ -135,7 +135,6 @@
 
 	bool tab_key_pressed_before;
 
-	KAction* copy_lines_to_output_action;
 	KAction* context_help_action;
 	KAction* run_selection_action;
 	KAction* interrupt_command_action;

Modified: trunk/rkward/rkward/windows/rkcommandlog.h
===================================================================
--- trunk/rkward/rkward/windows/rkcommandlog.h	2014-05-01 18:23:52 UTC (rev 4791)
+++ trunk/rkward/rkward/windows/rkcommandlog.h	2014-05-02 15:50:12 UTC (rev 4792)
@@ -26,7 +26,7 @@
 #include "../rbackend/rcommandreceiver.h"
 
 class RCommand;
-class ROutput;
+struct ROutput;
 class RKCommandLogView;
 class RKCommandLogPart;