[rkward-cvs] rkward/rkward/rbackend rinterface.cpp,1.35,1.36 rthread.cpp,1.24,1.25

[Thomas Friedrichsmeier]

Update of /cvsroot/rkward/rkward/rkward/rbackend
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32612/rbackend

Modified Files:
	rinterface.cpp rthread.cpp 
Log Message:
Compile fixes after renaming RKSettingsModuleLogfiles

Index: rinterface.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/rbackend/rinterface.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** rinterface.cpp	18 Oct 2005 15:53:26 -0000	1.35
--- rinterface.cpp	20 Oct 2005 19:45:54 -0000	1.36
***************
*** 23,27 ****
  #include "../rkward.h"
  #include "../settings/rksettingsmoduler.h"
! #include "../settings/rksettingsmodulelogfiles.h"
  #include "../core/robjectlist.h"
  #include "../core/rkmodificationtracker.h"
--- 23,27 ----
  #include "../rkward.h"
  #include "../settings/rksettingsmoduler.h"
! #include "../settings/rksettingsmodulegeneral.h"
  #include "../core/robjectlist.h"
  #include "../core/rkmodificationtracker.h"
***************
*** 239,243 ****
  			QString file_prefix = request->call[1];
  			QString file_extension = request->call[2];
! 			QDir dir (RKSettingsModuleLogfiles::filesPath ());
  		
  			int i=0;
--- 239,243 ----
  			QString file_prefix = request->call[1];
  			QString file_extension = request->call[2];
! 			QDir dir (RKSettingsModuleGeneral::filesPath ());
  		
  			int i=0;
***************
*** 250,254 ****
  		}
  	} else if (call == "get.output.html.file") {
! 		QDir dir (RKSettingsModuleLogfiles::filesPath ());
  		// TODO: make more generic, get filename sanely
  		issueCommand (".rk.rkreply <- \"" + dir.filePath ("rk_out.html") + "\"", RCommand::App | RCommand::Sync, QString::null, 0, 0, request->in_chain);
--- 250,254 ----
  		}
  	} else if (call == "get.output.html.file") {
! 		QDir dir (RKSettingsModuleGeneral::filesPath ());
  		// TODO: make more generic, get filename sanely
  		issueCommand (".rk.rkreply <- \"" + dir.filePath ("rk_out.html") + "\"", RCommand::App | RCommand::Sync, QString::null, 0, 0, request->in_chain);

Index: rthread.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/rbackend/rthread.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** rthread.cpp	16 Oct 2005 14:06:50 -0000	1.24
--- rthread.cpp	20 Oct 2005 19:45:54 -0000	1.25
***************
*** 20,24 ****
  #include "rcommandstack.h"
  #include "../settings/rksettingsmoduler.h"
! #include "../settings/rksettingsmodulelogfiles.h"
  #include "../rkglobals.h"
  
--- 20,24 ----
  #include "rcommandstack.h"
  #include "../settings/rksettingsmoduler.h"
! #include "../settings/rksettingsmodulegeneral.h"
  #include "../rkglobals.h"
  
***************
*** 125,129 ****
  	
  		if (command->type () & RCommand::DirectToOutput) {
! 			runCommandInternal ("sink (\"" + RKSettingsModuleLogfiles::filesPath () + "/rk_out.html\", append=TRUE, split=TRUE)\n", &error);
  		}
  	
--- 125,129 ----
  	
  		if (command->type () & RCommand::DirectToOutput) {
! 			runCommandInternal ("sink (\"" + RKSettingsModuleGeneral::filesPath () + "/rk_out.html\", append=TRUE, split=TRUE)\n", &error);
  		}