[rkward-cvs] rkward/rkward khelpdlg.cpp,1.10,1.11 main.cpp,1.18,1.19 rkconsole.cpp,1.11,1.12 rkeditormanager.cpp,1.9,1.10 rkward.cpp,1.99,1.100 rkwatch.cpp,1.36,1.37 robjectviewer.cpp,1.4,1.5

Thu Sep 29 16:02:52 UTC 2005

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

Modified Files:
	khelpdlg.cpp main.cpp rkconsole.cpp rkeditormanager.cpp 
	rkward.cpp rkwatch.cpp robjectviewer.cpp 
Log Message:
Code cleanups, focus: replacing "" with QString::null / QString.isEmpty (). Fix credits

Index: rkconsole.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/rkconsole.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** rkconsole.cpp	23 Sep 2005 17:19:30 -0000	1.11
--- rkconsole.cpp	29 Sep 2005 16:02:50 -0000	1.12
***************
*** 150,154 ****
  		}

! 		RKGlobals::rInterface ()->issueCommand (c, RCommand::User, "", this);
  	} else {
  		command_incomplete = false;
--- 150,154 ----
  		}

! 		RKGlobals::rInterface ()->issueCommand (c, RCommand::User, QString::null, this);
  	} else {
  		command_incomplete = false;
***************
*** 214,218 ****
  		prefix = "> ";
  		command_incomplete = false;
! 		incomplete_command = "";
  	}

--- 214,218 ----
  		prefix = "> ";
  		command_incomplete = false;
! 		incomplete_command = QString::null;
  	}

Index: khelpdlg.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/khelpdlg.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** khelpdlg.cpp	17 Sep 2005 19:23:52 -0000	1.10
--- khelpdlg.cpp	29 Sep 2005 16:02:50 -0000	1.11
***************
*** 64,68 ****

! 	RKGlobals::rInterface ()->issueCommand (".rk.get.installed.packages ()", RCommand::App | RCommand::Sync | RCommand::GetStringVector, "", this, GET_INSTALLED_PACKAGES, 0);

--- 64,68 ----

! 	RKGlobals::rInterface ()->issueCommand (".rk.get.installed.packages ()", RCommand::App | RCommand::Sync | RCommand::GetStringVector, QString::null, this, GET_INSTALLED_PACKAGES, 0);

***************
*** 90,94 ****

  	// step 2: retrieve help
! 	RKGlobals::rInterface ()->issueCommand ("help(\"" + result + "\", htmlhelp=TRUE)[1]", RCommand::App | RCommand::Sync | RCommand::GetStringVector, "", this, GET_HELP_URL, 0);
  }

--- 90,94 ----

  	// step 2: retrieve help
! 	RKGlobals::rInterface ()->issueCommand ("help(\"" + result + "\", htmlhelp=TRUE)[1]", RCommand::App | RCommand::Sync | RCommand::GetStringVector, QString::null, this, GET_HELP_URL, 0);
  }

***************
*** 119,123 ****

  	// HACK the following is hardcoded, do not modify
! 	QString fields="";

  	switch(fieldsList->currentItem()){
--- 119,123 ----

  	// HACK the following is hardcoded, do not modify
! 	QString fields;

  	switch(fieldsList->currentItem()){
***************
*** 134,138 ****

! 	RKGlobals::rInterface ()->issueCommand (s, RCommand::App | RCommand::Sync | RCommand::GetStringVector, "", this, HELP_SEARCH, 0);
  	setEnabled(false);
  	field->insertItem(field->currentText());
--- 134,138 ----

! 	RKGlobals::rInterface ()->issueCommand (s, RCommand::App | RCommand::Sync | RCommand::GetStringVector, QString::null, this, HELP_SEARCH, 0);
  	setEnabled(false);
  	field->insertItem(field->currentText());
***************
*** 157,161 ****
  	s.append("\")");

! 	RKGlobals::rInterface ()->issueCommand (s, RCommand::App | RCommand::Sync | RCommand::GetStringVector, "", this, GET_HELP_URL, 0);
  }

--- 157,161 ----
  	s.append("\")");

! 	RKGlobals::rInterface ()->issueCommand (s, RCommand::App | RCommand::Sync | RCommand::GetStringVector, QString::null, this, GET_HELP_URL, 0);
  }

Index: main.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/main.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** main.cpp	11 Sep 2005 22:06:31 -0000	1.18
--- main.cpp	29 Sep 2005 16:02:50 -0000	1.19
***************
*** 84,99 ****
  };

! int main(int argc, char *argv[])
! {
! 
! 	KAboutData aboutData( "rkward", I18N_NOOP ("RKWard"), version, description, KAboutData::License_GPL, "(c) 2002, 2005", 0, "http://rkward.sf.net", "");
! 	aboutData.addAuthor ("Thomas Friedrichsmeier", i18n("Project leader"), "");
! 	aboutData.addAuthor ("Pierre Ecochard", i18n("Core coder since 0.29"), "");
! 	aboutData.addCredit ("Adrien d'Hardemare", i18n("Plugins and patches"), "");
! 	aboutData.addCredit ("Marco Martin", i18n("A cool icon"), "");
! 	aboutData.addCredit ("Daniele Medri", i18n("RKWard logo, many suggestions, help on wording"), "");
! 	aboutData.addCredit ("David Sibai", i18n("Several valuable comments, hints and patches"), "");
! 	aboutData.addCredit ("Philippe Grosjean", i18n("Several helpful comments and discussions"), "");
! 	aboutData.addCredit (i18n("Many more people on rkward-devel at lists.sourceforge.net"), i18n("Sorry, I forgot to list you. Please contact me to get added"), "");
  	KCmdLineArgs::init( argc, argv, &aboutData );
  	KCmdLineArgs::addCmdLineOptions( options ); // Add our own options.
--- 84,99 ----
  };

! int main(int argc, char *argv[]) {
! 	KAboutData aboutData( "rkward", I18N_NOOP ("RKWard"), version, description, KAboutData::License_GPL, "(c) 2002, 2004, 2005", 0, "http://rkward.sf.net", QString::null);
! 	aboutData.addAuthor ("Thomas Friedrichsmeier", I18N_NOOP ("Project leader"), QString::null);
! 	aboutData.addAuthor ("Pierre Ecochard",  I18N_NOOP ("Core coder since 0.2.9"), QString::null);
! 	aboutData.addCredit ("Contributors in alphabetical order", QString::null, QString::null);
! 	aboutData.addCredit ("Philippe Grosjean", I18N_NOOP ("Several helpful comments and discussions"), QString::null);
! 	aboutData.addCredit ("Adrien d'Hardemare", I18N_NOOP ("Plugins and patches"), QString::null);
! 	aboutData.addCredit ("Yves Jacolin", I18N_NOOP ("New website"), QString::null);
! 	aboutData.addCredit ("Marco Martin", I18N_NOOP ("A cool icon"), QString::null);
! 	aboutData.addCredit ("Daniele Medri", I18N_NOOP ("RKWard logo, many suggestions, help on wording"), QString::null);
! 	aboutData.addCredit ("David Sibai", I18N_NOOP ("Several valuable comments, hints and patches"), QString::null);
! 	aboutData.addCredit (I18N_NOOP ("Many more people on rkward-devel at lists.sourceforge.net"), I18N_NOOP ("Sorry, I forgot to list you. Please contact me to get added"), QString::null);
  	KCmdLineArgs::init( argc, argv, &aboutData );
  	KCmdLineArgs::addCmdLineOptions( options ); // Add our own options.

Index: rkwatch.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/rkwatch.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** rkwatch.cpp	25 Sep 2005 18:45:44 -0000	1.36
--- rkwatch.cpp	29 Sep 2005 16:02:50 -0000	1.37
***************
*** 123,127 ****
  	watch->append (command->output ());
  	watch->append (command->error ());
! 	if (command->failed () && (command->error () == "")) {
  		if (command->errorIncomplete ()) {
  			watch->append (i18n ("Incomplete statement.\n"));
--- 123,127 ----
  	watch->append (command->output ());
  	watch->append (command->error ());
! 	if (command->failed () && (command->error ().isEmpty ())) {
  		if (command->errorIncomplete ()) {
  			watch->append (i18n ("Incomplete statement.\n"));
***************
*** 156,160 ****

! 	watch->setText ("");

  	// set a fixed width font
--- 156,160 ----

! 	watch->setText (QString::null);

  	// set a fixed width font

Index: robjectviewer.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/robjectviewer.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** robjectviewer.cpp	17 Nov 2004 20:52:33 -0000	1.4
--- robjectviewer.cpp	29 Sep 2005 16:02:50 -0000	1.5
***************
*** 35,39 ****
  	view_area->setTextFormat (PlainText);
  	view_area->setReadOnly (true);
! 	view_area->setText ("");
  	QFont font ("Courier");
  	view_area->setCurrentFont (font);
--- 35,39 ----
  	view_area->setTextFormat (PlainText);
  	view_area->setReadOnly (true);
! 	view_area->setText (QString::null);
  	QFont font ("Courier");
  	view_area->setCurrentFont (font);
***************
*** 56,60 ****
  	view_area->append (i18n("\nResult of 'print (") + object->getFullName () + i18n(")':\n"));

! 	RCommand *command = new RCommand ("print (" + object->getFullName () + ")", RCommand::App, "", this);
  	RKGlobals::rInterface ()->issueCommand (command, 0);
  	waiting = true;
--- 56,60 ----
  	view_area->append (i18n("\nResult of 'print (") + object->getFullName () + i18n(")':\n"));

! 	RCommand *command = new RCommand ("print (" + object->getFullName () + ")", RCommand::App, QString::null, this);
  	RKGlobals::rInterface ()->issueCommand (command, 0);
  	waiting = true;

Index: rkward.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/rkward.cpp,v
retrieving revision 1.99
retrieving revision 1.100
diff -C2 -d -r1.99 -r1.100
*** rkward.cpp	17 Sep 2005 19:23:52 -0000	1.99
--- rkward.cpp	29 Sep 2005 16:02:50 -0000	1.100
***************
*** 527,531 ****
  void RKwardApp::slotFileOpenWorkspace () {
  	RK_TRACE (APP);
! 	fileOpenAskSave ("");
  }

--- 527,531 ----
  void RKwardApp::slotFileOpenWorkspace () {
  	RK_TRACE (APP);
! 	fileOpenAskSave (QString::null);
  }

Index: rkeditormanager.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/rkeditormanager.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** rkeditormanager.cpp	17 Sep 2005 15:55:30 -0000	1.9
--- rkeditormanager.cpp	29 Sep 2005 16:02:50 -0000	1.10
***************
*** 84,88 ****
  	restore_chain = RKGlobals::rInterface ()->startChain (restore_chain);

! 	RCommand *command = new RCommand ("if (exists (\".rk.editing\")) { .rk.editingtemp <- .rk.editing; remove (.rk.editing); .rk.editingtemp; }", RCommand::App | RCommand::Sync | RCommand::GetStringVector, "", this, RESTORE_COMMAND);
  	RKGlobals::rInterface ()->issueCommand (command, restore_chain);
  }
--- 84,88 ----
  	restore_chain = RKGlobals::rInterface ()->startChain (restore_chain);

! 	RCommand *command = new RCommand ("if (exists (\".rk.editing\")) { .rk.editingtemp <- .rk.editing; remove (.rk.editing); .rk.editingtemp; }", RCommand::App | RCommand::Sync | RCommand::GetStringVector, QString::null, this, RESTORE_COMMAND);
  	RKGlobals::rInterface ()->issueCommand (command, restore_chain);
  }