[rkward-cvs] rkward/rkward/dialogs rkloadlibsdialog.cpp,1.12,1.13 startupdialog.cpp,1.2,1.3

[Thomas Friedrichsmeier]

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

Modified Files:
	rkloadlibsdialog.cpp startupdialog.cpp 
Log Message:
Code cleanups, focus: replacing "" with QString::null / QString.isEmpty (). Fix credits

Index: rkloadlibsdialog.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/dialogs/rkloadlibsdialog.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** rkloadlibsdialog.cpp	18 Sep 2005 15:17:52 -0000	1.12
--- rkloadlibsdialog.cpp	29 Sep 2005 16:02:51 -0000	1.13
***************
*** 148,152 ****
  	
  	QString package_string = "c (\"" + packages.join ("\", \"") + "\")";
! 	RCommand *command = new RCommand ("download.packages (pkgs=" + package_string + ", destdir=\"" + to_dir + "\")", RCommand::App, "", this, DOWNLOAD_PACKAGES_COMMAND);
  	RKGlobals::rInterface ()->issueCommand (command, chain);
  	
--- 148,152 ----
  	
  	QString package_string = "c (\"" + packages.join ("\", \"") + "\")";
! 	RCommand *command = new RCommand ("download.packages (pkgs=" + package_string + ", destdir=\"" + to_dir + "\")", RCommand::App, QString::null, this, DOWNLOAD_PACKAGES_COMMAND);
  	RKGlobals::rInterface ()->issueCommand (command, chain);
  	
***************
*** 259,264 ****
  	setEnabled (false);
  	
! 	RKGlobals::rInterface ()->issueCommand (".rk.get.installed.packages ()", RCommand::App | RCommand::Sync | RCommand::GetStringVector, "", this, GET_INSTALLED_PACKAGES, dialog->chain);
! 	RKGlobals::rInterface ()->issueCommand (".packages ()", RCommand::App | RCommand::Sync | RCommand::GetStringVector, "", this, GET_LOADED_PACKAGES, dialog->chain);
  	
  	connect (dialog, SIGNAL (okClicked ()), this, SLOT (ok ()));
--- 259,264 ----
  	setEnabled (false);
  	
! 	RKGlobals::rInterface ()->issueCommand (".rk.get.installed.packages ()", RCommand::App | RCommand::Sync | RCommand::GetStringVector, QString::null, this, GET_INSTALLED_PACKAGES, dialog->chain);
! 	RKGlobals::rInterface ()->issueCommand (".packages ()", RCommand::App | RCommand::Sync | RCommand::GetStringVector, QString::null, this, GET_LOADED_PACKAGES, dialog->chain);
  	
  	connect (dialog, SIGNAL (okClicked ()), this, SLOT (ok ()));
***************
*** 356,360 ****
  	while (loaded) {
  		if (!prev_packages.contains (loaded->text (0))) {
! 			RKGlobals::rInterface ()->issueCommand ("library (\"" + loaded->text (0) + "\")", RCommand::App, "", this, LOAD_PACKAGE_COMMAND, parent->chain);
  		}
  		loaded = loaded->nextSibling ();
--- 356,360 ----
  	while (loaded) {
  		if (!prev_packages.contains (loaded->text (0))) {
! 			RKGlobals::rInterface ()->issueCommand ("library (\"" + loaded->text (0) + "\")", RCommand::App, QString::null, this, LOAD_PACKAGE_COMMAND, parent->chain);
  		}
  		loaded = loaded->nextSibling ();
***************
*** 374,378 ****
  		}
  		if (!found) {
! 			RKGlobals::rInterface ()->issueCommand ("detach (package:" + (*it) + ")", RCommand::App, "", this, LOAD_PACKAGE_COMMAND, parent->chain);
  		}
  	}
--- 374,378 ----
  		}
  		if (!found) {
! 			RKGlobals::rInterface ()->issueCommand ("detach (package:" + (*it) + ")", RCommand::App, QString::null, this, LOAD_PACKAGE_COMMAND, parent->chain);
  		}
  	}
***************
*** 502,506 ****
  void UpdatePackagesWidget::getListButtonClicked () {
  	RK_TRACE (DIALOGS);
! 	RCommand *command = new RCommand ("as.vector (old.packages ())", RCommand::App | RCommand::GetStringVector, "", this, FIND_OLD_PACKAGES_COMMAND);
  	RKGlobals::rInterface ()->issueCommand (command, parent->chain);
  	
--- 502,506 ----
  void UpdatePackagesWidget::getListButtonClicked () {
  	RK_TRACE (DIALOGS);
! 	RCommand *command = new RCommand ("as.vector (old.packages ())", RCommand::App | RCommand::GetStringVector, QString::null, this, FIND_OLD_PACKAGES_COMMAND);
  	RKGlobals::rInterface ()->issueCommand (command, parent->chain);
  	
***************
*** 614,618 ****
  void InstallPackagesWidget::getListButtonClicked () {
  	RK_TRACE (DIALOGS);
! 	RCommand *command = new RCommand (".rk.get.CRAN.packages ()", RCommand::App | RCommand::GetStringVector, "", this, FIND_AVAILABLE_PACKAGES_COMMAND);
  	RKGlobals::rInterface ()->issueCommand (command, parent->chain);
  	
--- 614,618 ----
  void InstallPackagesWidget::getListButtonClicked () {
  	RK_TRACE (DIALOGS);
! 	RCommand *command = new RCommand (".rk.get.CRAN.packages ()", RCommand::App | RCommand::GetStringVector, QString::null, this, FIND_AVAILABLE_PACKAGES_COMMAND);
  	RKGlobals::rInterface ()->issueCommand (command, parent->chain);
  	

Index: startupdialog.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/dialogs/startupdialog.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** startupdialog.cpp	2 Sep 2004 19:02:09 -0000	1.2
--- startupdialog.cpp	29 Sep 2005 16:02:51 -0000	1.3
***************
*** 65,69 ****
  		QStringList items = recent_files->items ();
  		for (QStringList::iterator it = items.begin (); it != items.end (); ++it) {
! 			if ((*it) != "") new QListViewItem (file_list, (*it));
  		}
  	}
--- 65,69 ----
  		QStringList items = recent_files->items ();
  		for (QStringList::iterator it = items.begin (); it != items.end (); ++it) {
! 			if (!(*it).isEmpty ()) new QListViewItem (file_list, (*it));
  		}
  	}