[rkward-cvs] rkward/rkward/settings rksettingsmodulelogfiles.cpp,1.4,1.5 rksettingsmodulephp.cpp,1.5,1.6 rksettingsmoduleplugins.cpp,1.10,1.11 rksettingsmoduler.cpp,1.7,1.8
Thomas Friedrichsmeier
tfry at users.sourceforge.net
Thu Sep 29 16:02:53 UTC 2005
Update of /cvsroot/rkward/rkward/rkward/settings
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6449/rkward/settings
Modified Files:
rksettingsmodulelogfiles.cpp rksettingsmodulephp.cpp
rksettingsmoduleplugins.cpp rksettingsmoduler.cpp
Log Message:
Code cleanups, focus: replacing "" with QString::null / QString.isEmpty (). Fix credits
Index: rksettingsmoduler.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/settings/rksettingsmoduler.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** rksettingsmoduler.cpp 18 Sep 2005 15:54:18 -0000 1.7
--- rksettingsmoduler.cpp 29 Sep 2005 16:02:51 -0000 1.8
***************
*** 107,111 ****
command.append ("\"" + *it + "\"");
}
! RKGlobals::rInterface ()->issueCommand (command + "))\n", RCommand::App, "", 0, 0, commandChain ());
}
--- 107,111 ----
command.append ("\"" + *it + "\"");
}
! RKGlobals::rInterface ()->issueCommand (command + "))\n", RCommand::App, QString::null, 0, 0, commandChain ());
}
***************
*** 125,129 ****
void RKSettingsModuleR::loadSettings (KConfig *config) {
config->setGroup ("R Settings");
! r_home_dir = config->readEntry ("R_HOME", "");
r_nosave = config->readBoolEntry ("--no-save", true);
r_slave = config->readBoolEntry ("--slave", true);
--- 125,129 ----
void RKSettingsModuleR::loadSettings (KConfig *config) {
config->setGroup ("R Settings");
! r_home_dir = config->readEntry ("R_HOME", QString::null);
r_nosave = config->readBoolEntry ("--no-save", true);
r_slave = config->readBoolEntry ("--slave", true);
Index: rksettingsmoduleplugins.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/settings/rksettingsmoduleplugins.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** rksettingsmoduleplugins.cpp 11 Sep 2005 18:53:05 -0000 1.10
--- rksettingsmoduleplugins.cpp 29 Sep 2005 16:02:51 -0000 1.11
***************
*** 114,118 ****
if (!plugin_maps.count ()) {
QString dummy = KGlobal::dirs()->findResourceDir("plugins", "standard_plugins.pluginmap");
! if (dummy == "") {
// try our luck with a relative path
dummy = "plugins";
--- 114,118 ----
if (!plugin_maps.count ()) {
QString dummy = KGlobal::dirs()->findResourceDir("plugins", "standard_plugins.pluginmap");
! if (dummy.isEmpty ()) {
// try our luck with a relative path
dummy = "plugins";
Index: rksettingsmodulelogfiles.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/settings/rksettingsmodulelogfiles.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** rksettingsmodulelogfiles.cpp 22 Apr 2005 13:56:18 -0000 1.4
--- rksettingsmodulelogfiles.cpp 29 Sep 2005 16:02:51 -0000 1.5
***************
*** 40,44 ****
main_vbox->addStretch ();
! files_choser = new GetFileNameWidget (this, GetFileNameWidget::ExistingDirectory, i18n ("Directory where the logfiles should be kept"), "", files_path);
connect (files_choser, SIGNAL (locationChanged ()), this, SLOT (pathChanged ()));
main_vbox->addWidget (files_choser);
--- 40,44 ----
main_vbox->addStretch ();
! files_choser = new GetFileNameWidget (this, GetFileNameWidget::ExistingDirectory, i18n ("Directory where the logfiles should be kept"), QString::null, files_path);
connect (files_choser, SIGNAL (locationChanged ()), this, SLOT (pathChanged ()));
main_vbox->addWidget (files_choser);
Index: rksettingsmodulephp.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/settings/rksettingsmodulephp.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** rksettingsmodulephp.cpp 22 Apr 2005 13:56:18 -0000 1.5
--- rksettingsmodulephp.cpp 29 Sep 2005 16:02:51 -0000 1.6
***************
*** 40,44 ****
main_vbox->addStretch ();
! bin_choser = new GetFileNameWidget (this, GetFileNameWidget::ExistingFile, i18n ("File-location of the PHP binary"), "", php_bin);
connect (bin_choser, SIGNAL (locationChanged ()), this, SLOT (pathChanged ()));
main_vbox->addWidget (bin_choser);
--- 40,44 ----
main_vbox->addStretch ();
! bin_choser = new GetFileNameWidget (this, GetFileNameWidget::ExistingFile, i18n ("File-location of the PHP binary"), QString::null, php_bin);
connect (bin_choser, SIGNAL (locationChanged ()), this, SLOT (pathChanged ()));
main_vbox->addWidget (bin_choser);
***************
*** 46,50 ****
main_vbox->addStretch ();
! files_choser = new GetFileNameWidget (this, GetFileNameWidget::ExistingDirectory, i18n ("Directory, where the PHP support files are located"), "", files_path);
connect (files_choser, SIGNAL (locationChanged ()), this, SLOT (pathChanged ()));
main_vbox->addWidget (files_choser);
--- 46,50 ----
main_vbox->addStretch ();
! files_choser = new GetFileNameWidget (this, GetFileNameWidget::ExistingDirectory, i18n ("Directory, where the PHP support files are located"), QString::null, files_path);
connect (files_choser, SIGNAL (locationChanged ()), this, SLOT (pathChanged ()));
main_vbox->addWidget (files_choser);
More information about the rkward-tracker
mailing list