[rkward-cvs] rkward/rkward/rbackend rembedinternal.cpp,1.21,1.22 rinterface.cpp,1.29,1.30

[Thomas Friedrichsmeier]

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

Modified Files:
	rembedinternal.cpp rinterface.cpp 
Log Message:
Code cleanups, focus: wrap debug-output in RK_DO, add RK_TRACEs

Index: rembedinternal.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/rbackend/rembedinternal.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** rembedinternal.cpp	23 Sep 2005 14:29:47 -0000	1.21
--- rembedinternal.cpp	29 Sep 2005 13:24:48 -0000	1.22
***************
*** 286,290 ****
  void deleteStrings (char **strings, int count) {
  	for (int i= (count-1); i >=0; --i) {
! 		delete (strings[i]);
  	}
  	delete [] strings;
--- 286,290 ----
  void deleteStrings (char **strings, int count) {
  	for (int i= (count-1); i >=0; --i) {
! 		DELETE_STRING (strings[i]);
  	}
  	delete [] strings;

Index: rinterface.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/rbackend/rinterface.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** rinterface.cpp	25 Sep 2005 18:45:44 -0000	1.29
--- rinterface.cpp	29 Sep 2005 13:24:48 -0000	1.30
***************
*** 71,75 ****
  	if (!env_r_home) {
  		if (RKSettingsModuleR::r_home_dir == "") {
! 			qDebug ("guess");
  			RKSettingsModuleR::r_home_dir = "/usr/lib/R";
  			RKSettingsModuleR::r_home_dir = KInputDialog::getText (i18n ("R_HOME not set"), i18n ("Could not find an R_HOME-environment variable and don't have a stored setting for that either.\nThe R backend requires that variable. Please enter your R_HOME directory below.\nIf you don't get it right, the application will quit immediately and you'll have to start RKWard again."), RKSettingsModuleR:: r_home_dir);
--- 71,75 ----
  	if (!env_r_home) {
  		if (RKSettingsModuleR::r_home_dir == "") {
! 			RK_DO (qDebug ("guessing R_HOME"), RBACKEND, DL_WARNING);
  			RKSettingsModuleR::r_home_dir = "/usr/lib/R";
  			RKSettingsModuleR::r_home_dir = KInputDialog::getText (i18n ("R_HOME not set"), i18n ("Could not find an R_HOME-environment variable and don't have a stored setting for that either.\nThe R backend requires that variable. Please enter your R_HOME directory below.\nIf you don't get it right, the application will quit immediately and you'll have to start RKWard again."), RKSettingsModuleR:: r_home_dir);
***************
*** 77,81 ****
  	} else {
  		if (env_r_home != RKSettingsModuleR::r_home_dir) {
! 			qDebug ("conflict");
  			if (KMessageBox::warningYesNo (0, i18n ("RKWard has a stored setting for the R_HOME-variable. However, in the environment, that variable is currently set to a different value. It's probably safe to assume the environment-setting is correct/more up to date. Using a wrong setting however will cause the application to quit immediately. Do you want to use the stored setting instead of the environment-setting?"), i18n ("Conflicting settings for R_HOME")) != KMessageBox::Yes) {
  				RKSettingsModuleR::r_home_dir = env_r_home;
--- 77,81 ----
  	} else {
  		if (env_r_home != RKSettingsModuleR::r_home_dir) {
! 			RK_DO (qDebug ("R_HOME conflict"), RBACKEND, DL_WARNING);
  			if (KMessageBox::warningYesNo (0, i18n ("RKWard has a stored setting for the R_HOME-variable. However, in the environment, that variable is currently set to a different value. It's probably safe to assume the environment-setting is correct/more up to date. Using a wrong setting however will cause the application to quit immediately. Do you want to use the stored setting instead of the environment-setting?"), i18n ("Conflicting settings for R_HOME")) != KMessageBox::Yes) {
  				RKSettingsModuleR::r_home_dir = env_r_home;