[rkward-cvs] SF.net SVN: rkward: [2039] branches/KDE4_port/rkward
tfry at users.sourceforge.net
tfry at users.sourceforge.net
Mon Oct 8 15:08:03 UTC 2007
Revision: 2039
http://rkward.svn.sourceforge.net/rkward/?rev=2039&view=rev
Author: tfry
Date: 2007-10-08 08:08:03 -0700 (Mon, 08 Oct 2007)
Log Message:
-----------
remove-qt3-support.pl results
Modified Paths:
--------------
branches/KDE4_port/rkward/agents/showedittextfileagent.cpp
branches/KDE4_port/rkward/core/rcontainerobject.cpp
branches/KDE4_port/rkward/core/robject.cpp
branches/KDE4_port/rkward/core/robjectlist.cpp
branches/KDE4_port/rkward/dataeditor/editlabelsdialog.cpp
branches/KDE4_port/rkward/dialogs/startupdialog.cpp
branches/KDE4_port/rkward/misc/rkcanceldialog.cpp
branches/KDE4_port/rkward/misc/rkprogresscontrol.cpp
branches/KDE4_port/rkward/misc/xmlhelper.cpp
branches/KDE4_port/rkward/plugin/rkabstractoptionselector.cpp
branches/KDE4_port/rkward/plugin/rkcomponent.cpp
branches/KDE4_port/rkward/plugin/rkcomponentcontext.cpp
branches/KDE4_port/rkward/plugin/rkcomponentmap.cpp
branches/KDE4_port/rkward/plugin/rkcomponentproperties.cpp
branches/KDE4_port/rkward/plugin/rkpreviewbox.cpp
branches/KDE4_port/rkward/plugin/rkstandardcomponent.cpp
branches/KDE4_port/rkward/plugin/rkstandardcomponentgui.cpp
branches/KDE4_port/rkward/plugin/rktext.cpp
branches/KDE4_port/rkward/plugin/rkvarselector.cpp
branches/KDE4_port/rkward/plugin/rkvarslot.cpp
branches/KDE4_port/rkward/rbackend/rcommand.cpp
branches/KDE4_port/rkward/rbackend/rdata.cpp
branches/KDE4_port/rkward/rbackend/rinterface.cpp
branches/KDE4_port/rkward/rbackend/rkstructuregetter.cpp
branches/KDE4_port/rkward/rbackend/rthread.cpp
branches/KDE4_port/rkward/rkconsole.cpp
branches/KDE4_port/rkward/rkward.cpp
branches/KDE4_port/rkward/scriptbackends/phpbackend.cpp
branches/KDE4_port/rkward/scriptbackends/scriptbackend.cpp
branches/KDE4_port/rkward/settings/rksettingsmodulegeneral.cpp
branches/KDE4_port/rkward/settings/rksettingsmodulephp.cpp
branches/KDE4_port/rkward/settings/rksettingsmoduleplugins.cpp
branches/KDE4_port/rkward/settings/rksettingsmoduler.cpp
branches/KDE4_port/rkward/settings/rksettingsmodulewatch.cpp
branches/KDE4_port/rkward/windows/detachedwindowcontainer.cpp
branches/KDE4_port/rkward/windows/qxembedcopy.cpp
branches/KDE4_port/rkward/windows/rcontrolwindow.cpp
branches/KDE4_port/rkward/windows/rkcommandeditorwindow.cpp
branches/KDE4_port/rkward/windows/rkfilebrowser.cpp
branches/KDE4_port/rkward/windows/rkhtmlwindow.cpp
Modified: branches/KDE4_port/rkward/agents/showedittextfileagent.cpp
===================================================================
--- branches/KDE4_port/rkward/agents/showedittextfileagent.cpp 2007-10-08 15:05:13 UTC (rev 2038)
+++ branches/KDE4_port/rkward/agents/showedittextfileagent.cpp 2007-10-08 15:08:03 UTC (rev 2039)
@@ -131,7 +131,7 @@
setMainWidget (page);
Q3VBoxLayout *layout = new Q3VBoxLayout (page, 0, spacingHint ());
QLabel *label = new QLabel (text, page);
- label->setAlignment (Qt::WordBreak | Qt::AlignAuto | Qt::AlignVCenter | Qt::ExpandTabs);
+ label->setAlignment (Qt::WordBreak | Qt::AlignLeft | Qt::AlignVCenter | Qt::ExpandTabs);
layout->addWidget (label);
setButtonOK (KGuiItem (i18n ("Done")));
Modified: branches/KDE4_port/rkward/core/rcontainerobject.cpp
===================================================================
--- branches/KDE4_port/rkward/core/rcontainerobject.cpp 2007-10-08 15:05:13 UTC (rev 2038)
+++ branches/KDE4_port/rkward/core/rcontainerobject.cpp 2007-10-08 15:08:03 UTC (rev 2039)
@@ -55,7 +55,7 @@
} else {
if (just_created) {
RK_ASSERT (false);
- RK_DO (qDebug ("%s", child->getFullName ().latin1 ()), OBJECTS, DL_ERROR);
+ RK_DO (qDebug ("%s", child->getFullName ().toLatin1 ()), OBJECTS, DL_ERROR);
delete child;
return 0;
} else {
@@ -116,7 +116,7 @@
} else if (child_type & RObject::Variable) {
child_object = new RKVariable (this, child_name);
} else {
- RK_DO (qDebug ("Can't represent object '%s', type %d", child_name.latin1 (), child_type), OBJECTS, DL_WARNING);
+ RK_DO (qDebug ("Can't represent object '%s', type %d", child_name.toLatin1 (), child_type), OBJECTS, DL_WARNING);
return 0;
}
RK_ASSERT (child_object);
@@ -172,7 +172,7 @@
// finally delete the missing old ones
for (Q3ValueList<RObject*>::iterator it = removed_list.begin (); it != removed_list.end (); ++it) {
- RK_DO (qDebug ("child no longer present: %s.", (*it)->getFullName ().latin1 ()), OBJECTS, DL_DEBUG);
+ RK_DO (qDebug ("child no longer present: %s.", (*it)->getFullName ().toLatin1 ()), OBJECTS, DL_DEBUG);
RKGlobals::tracker ()->removeObject ((*it), 0, true);
}
Modified: branches/KDE4_port/rkward/core/robject.cpp
===================================================================
--- branches/KDE4_port/rkward/core/robject.cpp 2007-10-08 15:05:13 UTC (rev 2038)
+++ branches/KDE4_port/rkward/core/robject.cpp 2007-10-08 15:08:03 UTC (rev 2039)
@@ -262,7 +262,7 @@
if (command->getFlags () == ROBJECT_UDPATE_STRUCTURE_COMMAND) {
if (command->failed ()) {
- RK_DO (qDebug ("command failed while trying to update object '%s'. No longer present?", getShortName ().latin1 ()), OBJECTS, DL_INFO);
+ RK_DO (qDebug ("command failed while trying to update object '%s'. No longer present?", getShortName ().toLatin1 ()), OBJECTS, DL_INFO);
// this may happen, if the object has been removed in the workspace in between
RKGlobals::tracker ()->removeObject (this, 0, true);
return;
Modified: branches/KDE4_port/rkward/core/robjectlist.cpp
===================================================================
--- branches/KDE4_port/rkward/core/robjectlist.cpp 2007-10-08 15:05:13 UTC (rev 2038)
+++ branches/KDE4_port/rkward/core/robjectlist.cpp 2007-10-08 15:08:03 UTC (rev 2039)
@@ -122,7 +122,7 @@
// remove the environments which are gone
for (Q3ValueList<REnvironmentObject *>::const_iterator it = removelist.constBegin (); it != removelist.constEnd (); ++it) {
- RK_DO (qDebug ("removing toplevel environment %s from list", (*it)->getShortName ().latin1 ()), OBJECTS, DL_INFO);
+ RK_DO (qDebug ("removing toplevel environment %s from list", (*it)->getShortName ().toLatin1 ()), OBJECTS, DL_INFO);
RKGlobals::tracker ()->removeObject (*it, 0, true);
}
Modified: branches/KDE4_port/rkward/dataeditor/editlabelsdialog.cpp
===================================================================
--- branches/KDE4_port/rkward/dataeditor/editlabelsdialog.cpp 2007-10-08 15:05:13 UTC (rev 2038)
+++ branches/KDE4_port/rkward/dataeditor/editlabelsdialog.cpp 2007-10-08 15:08:03 UTC (rev 2039)
@@ -227,7 +227,7 @@
Q3VBoxLayout *mainvbox = new Q3VBoxLayout (this, KDialog::marginHint (), KDialog::spacingHint ());
QLabel *label = new QLabel (i18n ("Levels can be assigned only to consecutive integers starting with 1 (the index column is read only). To remove levels at the end of the list, just set them to empty."), this);
- label->setAlignment (Qt::AlignAuto | Qt::AlignVCenter | Qt::ExpandTabs | Qt::WordBreak);
+ label->setAlignment (Qt::AlignLeft | Qt::AlignVCenter | Qt::ExpandTabs | Qt::WordBreak);
mainvbox->addWidget (label);
Q3HBoxLayout *hbox = new Q3HBoxLayout (mainvbox, KDialog::spacingHint ());
Modified: branches/KDE4_port/rkward/dialogs/startupdialog.cpp
===================================================================
--- branches/KDE4_port/rkward/dialogs/startupdialog.cpp 2007-10-08 15:05:13 UTC (rev 2038)
+++ branches/KDE4_port/rkward/dialogs/startupdialog.cpp 2007-10-08 15:08:03 UTC (rev 2039)
@@ -183,7 +183,7 @@
dialog->exec ();
delete dialog;
- RK_DO (qDebug ("startup-dialog result: %d, url: %s", result->result, result->open_url.fileName ().latin1 ()), DIALOGS, DL_DEBUG);
+ RK_DO (qDebug ("startup-dialog result: %d, url: %s", result->result, result->open_url.fileName ().toLatin1 ()), DIALOGS, DL_DEBUG);
return result;
}
Modified: branches/KDE4_port/rkward/misc/rkcanceldialog.cpp
===================================================================
--- branches/KDE4_port/rkward/misc/rkcanceldialog.cpp 2007-10-08 15:05:13 UTC (rev 2038)
+++ branches/KDE4_port/rkward/misc/rkcanceldialog.cpp 2007-10-08 15:08:03 UTC (rev 2039)
@@ -37,7 +37,7 @@
Q3VBoxLayout *layout = new Q3VBoxLayout (this, KDialog::marginHint (), KDialog::spacingHint ());
QLabel *label = new QLabel (text, this);
- label->setAlignment (Qt::AlignAuto | Qt::AlignVCenter | Qt::ExpandTabs | Qt::WordBreak);
+ label->setAlignment (Qt::AlignLeft | Qt::AlignVCenter | Qt::ExpandTabs | Qt::WordBreak);
layout->addWidget (label);
QPushButton *cancel_button = new QPushButton (i18n ("Cancel"), this);
Modified: branches/KDE4_port/rkward/misc/rkprogresscontrol.cpp
===================================================================
--- branches/KDE4_port/rkward/misc/rkprogresscontrol.cpp 2007-10-08 15:05:13 UTC (rev 2038)
+++ branches/KDE4_port/rkward/misc/rkprogresscontrol.cpp 2007-10-08 15:08:03 UTC (rev 2039)
@@ -202,7 +202,7 @@
Q3VBoxLayout *vbox = new Q3VBoxLayout (this, RKGlobals::marginHint (), RKGlobals::spacingHint ());
QLabel *label = new QLabel (text, this);
- label->setAlignment (Qt::AlignAuto | Qt::ExpandTabs | Qt::WordBreak);
+ label->setAlignment (Qt::AlignLeft | Qt::ExpandTabs | Qt::WordBreak);
vbox->addWidget (label);
error_indicator = new QLabel (i18n ("<b>There have been errors and / or warnings! See below for a transcript</b>"), this);
Modified: branches/KDE4_port/rkward/misc/xmlhelper.cpp
===================================================================
--- branches/KDE4_port/rkward/misc/xmlhelper.cpp 2007-10-08 15:05:13 UTC (rev 2038)
+++ branches/KDE4_port/rkward/misc/xmlhelper.cpp 2007-10-08 15:08:03 UTC (rev 2039)
@@ -330,7 +330,7 @@
backtrace += list.join ("->");
- RK_DO (qDebug ("%s: %s", backtrace.latin1 (), message.latin1 ()), XML, message_level);
+ RK_DO (qDebug ("%s: %s", backtrace.toLatin1 (), message.toLatin1 ()), XML, message_level);
}
}
Modified: branches/KDE4_port/rkward/plugin/rkabstractoptionselector.cpp
===================================================================
--- branches/KDE4_port/rkward/plugin/rkabstractoptionselector.cpp 2007-10-08 15:05:13 UTC (rev 2038)
+++ branches/KDE4_port/rkward/plugin/rkabstractoptionselector.cpp 2007-10-08 15:08:03 UTC (rev 2039)
@@ -88,7 +88,7 @@
QString mod = identifier.section (".", 1);
if (mod != "enabled") {
- RK_DO (qDebug ("options do not have property '%s'", mod.latin1()), PLUGIN, DL_DEBUG);
+ RK_DO (qDebug ("options do not have property '%s'", mod.toLatin1()), PLUGIN, DL_DEBUG);
return this;
}
Modified: branches/KDE4_port/rkward/plugin/rkcomponent.cpp
===================================================================
--- branches/KDE4_port/rkward/plugin/rkcomponent.cpp 2007-10-08 15:05:13 UTC (rev 2038)
+++ branches/KDE4_port/rkward/plugin/rkcomponent.cpp 2007-10-08 15:08:03 UTC (rev 2039)
@@ -26,7 +26,7 @@
RK_ASSERT (remainder);
if (identifier.isEmpty ()) return this;
- RK_DO (qDebug ("looking up '%s'", identifier.latin1 ()), PLUGIN, DL_DEBUG);
+ RK_DO (qDebug ("looking up '%s'", identifier.toLatin1 ()), PLUGIN, DL_DEBUG);
RKComponentBase *child = child_map.find (identifier.section (".", 0, 0));
if (!child) { // if we do not have such a child, return this (and set remainder)
@@ -84,7 +84,7 @@
QString RKComponentBase::value (const QString &modifier) {
RK_TRACE (PLUGIN);
- RK_DO (qDebug ("Component type %d does not have a value. Remaining modifier is: '%s'", type (), modifier.latin1 ()), PLUGIN, DL_WARNING);
+ RK_DO (qDebug ("Component type %d does not have a value. Remaining modifier is: '%s'", type (), modifier.toLatin1 ()), PLUGIN, DL_WARNING);
return QString ();
}
Modified: branches/KDE4_port/rkward/plugin/rkcomponentcontext.cpp
===================================================================
--- branches/KDE4_port/rkward/plugin/rkcomponentcontext.cpp 2007-10-08 15:05:13 UTC (rev 2038)
+++ branches/KDE4_port/rkward/plugin/rkcomponentcontext.cpp 2007-10-08 15:08:03 UTC (rev 2039)
@@ -82,7 +82,7 @@
void RKContextHandler::addAction (const QString &id, RKComponentHandle *handle) {
RK_TRACE (PLUGIN);
- action_map.insert (new KAction (handle->getLabel (), 0, this, SLOT (componentActionActivated ()), actionCollection (), id.latin1 ()), handle);
+ action_map.insert (new KAction (handle->getLabel (), 0, this, SLOT (componentActionActivated ()), actionCollection (), id.toLatin1 ()), handle);
}
void RKContextHandler::componentActionActivated () {
@@ -116,7 +116,7 @@
RK_ASSERT (it.current ()->isProperty ());
if (!(client && remainder.isEmpty () && client->isProperty () && it.current ()->isProperty ())) {
- RK_DO (qDebug ("Could not set context property %s", id.latin1 ()), PLUGIN, DL_INFO);
+ RK_DO (qDebug ("Could not set context property %s", id.toLatin1 ()), PLUGIN, DL_INFO);
continue;
}
Modified: branches/KDE4_port/rkward/plugin/rkcomponentmap.cpp
===================================================================
--- branches/KDE4_port/rkward/plugin/rkcomponentmap.cpp 2007-10-08 15:05:13 UTC (rev 2038)
+++ branches/KDE4_port/rkward/plugin/rkcomponentmap.cpp 2007-10-08 15:08:03 UTC (rev 2039)
@@ -114,7 +114,7 @@
RKComponentHandle* handle = RKComponentMap::getComponentHandle (id);
if ((!handle) || (!handle->isPlugin ())) {
- RK_DO (qDebug ("No such component found while creating menu-entries or component is not a standalone plugin: \"%s\". No entry created.", id.latin1 ()), PLUGIN, DL_ERROR);
+ RK_DO (qDebug ("No such component found while creating menu-entries or component is not a standalone plugin: \"%s\". No entry created.", id.toLatin1 ()), PLUGIN, DL_ERROR);
} else {
findOrCreateElement (menu_element, "Action", id, QString::null, xml->getIntAttribute ((*it), "index", -1, DL_INFO));
addedEntry (id, handle);
@@ -154,7 +154,7 @@
for (ComponentMap::iterator it = components.begin (); it != components.end (); ++it) {
delete (it.data ());
/* TODO: this is not technically correct, as there may be several actions for this id, and we're only deleting one. But practically this should not really be relevant. */
- delete (actionCollection ()->action (it.key ().latin1 ()));
+ delete (actionCollection ()->action (it.key ().toLatin1 ()));
}
components.clear ();
@@ -180,7 +180,7 @@
RKContextMap *context = getMap ()->getContextLocal (id);
if (context) return context;
- RK_DO (qDebug ("no such context %s", id.latin1 ()), PLUGIN, DL_WARNING);
+ RK_DO (qDebug ("no such context %s", id.toLatin1 ()), PLUGIN, DL_WARNING);
return (0);
}
@@ -197,7 +197,7 @@
RKComponentHandle *handle = getMap ()->getComponentHandleLocal (id);
if (handle) return handle;
- RK_DO (qDebug ("no such component %s", id.latin1 ()), PLUGIN, DL_WARNING);
+ RK_DO (qDebug ("no such component %s", id.toLatin1 ()), PLUGIN, DL_WARNING);
return (0);
}
@@ -237,9 +237,9 @@
int RKComponentMap::addPluginMapLocal (const QString& plugin_map_file) {
RK_TRACE (PLUGIN);
- QString plugin_map_file_abs = QFileInfo (plugin_map_file).absFilePath ();
+ QString plugin_map_file_abs = QFileInfo (plugin_map_file).absoluteFilePath ();
if (pluginmapfiles.contains (plugin_map_file_abs)) {
- RK_DO (qDebug ("Plugin map file '%s' already loaded", plugin_map_file.latin1()), PLUGIN, DL_INFO);
+ RK_DO (qDebug ("Plugin map file '%s' already loaded", plugin_map_file.toLatin1()), PLUGIN, DL_INFO);
return 0;
}
@@ -250,11 +250,11 @@
QDomElement document_element = xml->openXMLFile (plugin_map_file_abs, DL_ERROR);
if (xml->highestError () >= DL_ERROR) return (0);
- QString prefix = QFileInfo (plugin_map_file_abs).dirPath (true) + '/' + xml->getStringAttribute (document_element, "base_prefix", QString::null, DL_INFO);
+ QString prefix = QFileInfo (plugin_map_file_abs).absolutePath() + '/' + xml->getStringAttribute (document_element, "base_prefix", QString::null, DL_INFO);
QString cnamespace = xml->getStringAttribute (document_element, "namespace", "rkward", DL_INFO) + "::";
RKPluginMapFile *pluginmap_file_desc = new RKPluginMapFile (prefix);
- pluginmapfiles.insert (QFileInfo (plugin_map_file).absFilePath (), pluginmap_file_desc);
+ pluginmapfiles.insert (QFileInfo (plugin_map_file).absoluteFilePath (), pluginmap_file_desc);
// step 1: include required files
int counter = 0;
@@ -265,7 +265,7 @@
if (QFileInfo (file).isReadable ()) {
includelist.append (file);
} else {
- RK_DO (qDebug ("Specified required file '%s' does not exist or is not readable. Ignoring.", file.latin1 ()), PLUGIN, DL_ERROR);
+ RK_DO (qDebug ("Specified required file '%s' does not exist or is not readable. Ignoring.", file.toLatin1 ()), PLUGIN, DL_ERROR);
}
}
for (QStringList::const_iterator it = includelist.constBegin (); it != includelist.constEnd (); ++it) {
@@ -283,9 +283,9 @@
QString label = xml->getStringAttribute ((*it), "label", i18n ("(no label)"), DL_WARNING);
if (components.contains (id)) {
- RK_DO (qDebug ("RKComponentMap already contains a component with id \"%s\". Ignoring second entry.", id.latin1 ()), PLUGIN, DL_WARNING);
+ RK_DO (qDebug ("RKComponentMap already contains a component with id \"%s\". Ignoring second entry.", id.toLatin1 ()), PLUGIN, DL_WARNING);
} else if (!QFileInfo (pluginmap_file_desc->makeFileName (filename)).isReadable ()) {
- RK_DO (qDebug ("Specified file '%s' for component id \"%s\" does not exist or is not readable. Ignoring.", filename.latin1 (), id.latin1 ()), PLUGIN, DL_ERROR);
+ RK_DO (qDebug ("Specified file '%s' for component id \"%s\" does not exist or is not readable. Ignoring.", filename.toLatin1 (), id.toLatin1 ()), PLUGIN, DL_ERROR);
} else {
// create and initialize component handle
RKComponentHandle *handle = new RKComponentHandle (pluginmap_file_desc, filename, label, (RKComponentType) type);
@@ -322,7 +322,7 @@
RK_TRACE (PLUGIN);
if (handle->isPlugin ()) {
- new KAction (handle->getLabel (), 0, handle, SLOT (activated ()), actionCollection (), id.latin1 ());
+ new KAction (handle->getLabel (), 0, handle, SLOT (activated ()), actionCollection (), id.toLatin1 ());
}
}
Modified: branches/KDE4_port/rkward/plugin/rkcomponentproperties.cpp
===================================================================
--- branches/KDE4_port/rkward/plugin/rkcomponentproperties.cpp 2007-10-08 15:05:13 UTC (rev 2038)
+++ branches/KDE4_port/rkward/plugin/rkcomponentproperties.cpp 2007-10-08 15:08:03 UTC (rev 2039)
@@ -146,7 +146,7 @@
void RKComponentPropertyBase::warnModifierNotRecognized (const QString &modifier) {
RK_TRACE (PLUGIN);
- RK_DO (qDebug ("Modifier '%s' not recognized.", modifier.latin1 ()), PLUGIN, DL_ERROR);
+ RK_DO (qDebug ("Modifier '%s' not recognized.", modifier.toLatin1 ()), PLUGIN, DL_ERROR);
}
///////////////////////////////////////////// Bool //////////////////////////////////////////
@@ -758,7 +758,7 @@
if (!types.isEmpty ()) {
// TODO: this is not entirely correct, yet
if (object->isVariable ()) {
- if (!types.contains (RObject::typeToText (object->getDataType ()).lower ())) {
+ if (!types.contains (RObject::typeToText (object->getDataType ()).toLower ())) {
return false;
}
} else {
@@ -1076,7 +1076,7 @@
sources.append (s);
connect (s.property, SIGNAL (valueChanged (RKComponentPropertyBase *)), this, SLOT (sourcePropertyChanged (RKComponentPropertyBase *)));
} else {
- RK_DO (qDebug ("Not found or not a property: %s", (*it).latin1 ()), PLUGIN, DL_WARNING);
+ RK_DO (qDebug ("Not found or not a property: %s", (*it).toLatin1 ()), PLUGIN, DL_WARNING);
}
}
Modified: branches/KDE4_port/rkward/plugin/rkpreviewbox.cpp
===================================================================
--- branches/KDE4_port/rkward/plugin/rkpreviewbox.cpp 2007-10-08 15:05:13 UTC (rev 2038)
+++ branches/KDE4_port/rkward/plugin/rkpreviewbox.cpp 2007-10-08 15:08:03 UTC (rev 2039)
@@ -62,7 +62,7 @@
code_property = static_cast<RKComponentPropertyCode *> (cp);
connect (code_property, SIGNAL (valueChanged (RKComponentPropertyBase *)), this, SLOT (changedCode (RKComponentPropertyBase *)));
} else {
- RK_DO (qDebug ("Could not find code property in preview box (remainder: %s)", dummy.latin1()), PLUGIN, DL_WARNING);
+ RK_DO (qDebug ("Could not find code property in preview box (remainder: %s)", dummy.toLatin1()), PLUGIN, DL_WARNING);
code_property = 0;
}
Modified: branches/KDE4_port/rkward/plugin/rkstandardcomponent.cpp
===================================================================
--- branches/KDE4_port/rkward/plugin/rkstandardcomponent.cpp 2007-10-08 15:05:13 UTC (rev 2038)
+++ branches/KDE4_port/rkward/plugin/rkstandardcomponent.cpp 2007-10-08 15:08:03 UTC (rev 2039)
@@ -83,7 +83,7 @@
// initialize the PHP-backend with the code-template
QDomElement element = xml->getChildElement (doc_element, "code", DL_WARNING);
if (element.hasAttribute ("file")) {
- QString dummy = QFileInfo (filename).dirPath () + '/' + xml->getStringAttribute (element, "file", "code.php", DL_WARNING);
+ QString dummy = QFileInfo (filename).path() + '/' + xml->getStringAttribute (element, "file", "code.php", DL_WARNING);
backend = new PHPBackend (dummy);
} else {
SimpleBackend *back = new SimpleBackend ();
@@ -102,7 +102,7 @@
// check for existance of help file
element = xml->getChildElement (doc_element, "help", DL_WARNING);
- QString dummy = QFileInfo (filename).dirPath () + '/' + xml->getStringAttribute (element, "file", "::nosuchfile::", DL_INFO);
+ QString dummy = QFileInfo (filename).path() + '/' + xml->getStringAttribute (element, "file", "::nosuchfile::", DL_INFO);
have_help = QFileInfo (dummy).exists ();
handle_change_timer = new QTimer (this);
@@ -675,7 +675,7 @@
XMLHelper *xml = XMLHelper::getStaticHelper ();
for (ConnectionList::const_iterator it = connection_list.begin (); it != connection_list.end (); ++it) {
- RK_DO (qDebug ("Connecting '%s' to '%s'", (*it).client_property.latin1 (), (*it).governor_property.latin1 ()), PLUGIN, DL_DEBUG);
+ RK_DO (qDebug ("Connecting '%s' to '%s'", (*it).client_property.toLatin1 (), (*it).governor_property.toLatin1 ()), PLUGIN, DL_DEBUG);
QString dummy;
RKComponentBase *client = parent->lookupComponent ((*it).client_property, &dummy);
Modified: branches/KDE4_port/rkward/plugin/rkstandardcomponentgui.cpp
===================================================================
--- branches/KDE4_port/rkward/plugin/rkstandardcomponentgui.cpp 2007-10-08 15:05:13 UTC (rev 2038)
+++ branches/KDE4_port/rkward/plugin/rkstandardcomponentgui.cpp 2007-10-08 15:08:03 UTC (rev 2039)
@@ -304,7 +304,7 @@
RKComponent *last_page = stack->addPage (component);
Q3VBoxLayout *vbox = new Q3VBoxLayout (last_page, RKGlobals::spacingHint ());
QLabel *label = new QLabel (i18n ("Below you can see the command(s) corresponding to the settings you made. Click 'Submit' to run the command(s)."), last_page);
- label->setAlignment (Qt::AlignAuto | Qt::AlignVCenter | Qt::ExpandTabs | Qt::WordBreak);
+ label->setAlignment (Qt::AlignLeft | Qt::AlignVCenter | Qt::ExpandTabs | Qt::WordBreak);
code_display = new RKCommandEditorWindow (last_page, true);
vbox->addWidget (label);
vbox->addWidget (code_display);
Modified: branches/KDE4_port/rkward/plugin/rktext.cpp
===================================================================
--- branches/KDE4_port/rkward/plugin/rktext.cpp 2007-10-08 15:05:13 UTC (rev 2038)
+++ branches/KDE4_port/rkward/plugin/rktext.cpp 2007-10-08 15:08:03 UTC (rev 2039)
@@ -39,13 +39,13 @@
Q3VBoxLayout *vbox = new Q3VBoxLayout (this, RKGlobals::spacingHint ());
label = new QLabel (QString::null, this);
- label->setAlignment (Qt::AlignAuto | Qt::ExpandTabs | Qt::WordBreak);
+ label->setAlignment (Qt::AlignLeft | Qt::ExpandTabs | Qt::WordBreak);
vbox->addWidget (label);
QString initial_text;
QStringList lines = lines.split ("\n", element.text (), false);
for (unsigned int i=0; i < lines.count (); i++) {
- QString line = lines[i].stripWhiteSpace ();
+ QString line = lines[i].trimmed ();
if (!line.isEmpty ()) {
initial_text.append (line + '\n');
}
Modified: branches/KDE4_port/rkward/plugin/rkvarselector.cpp
===================================================================
--- branches/KDE4_port/rkward/plugin/rkvarselector.cpp 2007-10-08 15:05:13 UTC (rev 2038)
+++ branches/KDE4_port/rkward/plugin/rkvarselector.cpp 2007-10-08 15:08:03 UTC (rev 2039)
@@ -68,7 +68,7 @@
RK_TRACE (PLUGIN);
selected->setFromListView (list_view, true);
- RK_DO (qDebug ("selected in varselector: %s", selected->value ().latin1 ()), PLUGIN, DL_DEBUG);
+ RK_DO (qDebug ("selected in varselector: %s", selected->value ().toLatin1 ()), PLUGIN, DL_DEBUG);
}
#include "rkvarselector.moc"
Modified: branches/KDE4_port/rkward/plugin/rkvarslot.cpp
===================================================================
--- branches/KDE4_port/rkward/plugin/rkvarslot.cpp 2007-10-08 15:05:13 UTC (rev 2038)
+++ branches/KDE4_port/rkward/plugin/rkvarslot.cpp 2007-10-08 15:08:03 UTC (rev 2039)
@@ -133,7 +133,7 @@
list->clear ();
item_map.clear ();
- RK_DO (qDebug ("contained in varslot: %s", available->value ().latin1 ()), PLUGIN, DL_DEBUG);
+ RK_DO (qDebug ("contained in varslot: %s", available->value ().toLatin1 ()), PLUGIN, DL_DEBUG);
ObjectList objlist = available->objectList ();
ObjectList::const_iterator it = objlist.begin ();
@@ -171,7 +171,7 @@
void RKVarSlot::selectPressed () {
RK_TRACE (PLUGIN);
- RK_DO (qDebug ("select press in varslot: mode %d, source %s, selected %s", add_mode, source->value ().latin1 (), selected->value ().latin1 ()), PLUGIN, DL_DEBUG);
+ RK_DO (qDebug ("select press in varslot: mode %d, source %s, selected %s", add_mode, source->value ().toLatin1 (), selected->value ().toLatin1 ()), PLUGIN, DL_DEBUG);
// first update the properties
if (add_mode) {
Modified: branches/KDE4_port/rkward/rbackend/rcommand.cpp
===================================================================
--- branches/KDE4_port/rkward/rbackend/rcommand.cpp 2007-10-08 15:05:13 UTC (rev 2038)
+++ branches/KDE4_port/rkward/rbackend/rcommand.cpp 2007-10-08 15:08:03 UTC (rev 2039)
@@ -38,7 +38,7 @@
}
_type = type;
_flags = flags;
- if (type & Plugin) _command = command.stripWhiteSpace ();
+ if (type & Plugin) _command = command.trimmed ();
else _command = command;
if (_command.isEmpty ()) _type |= EmptyCommand;
status = 0;
Modified: branches/KDE4_port/rkward/rbackend/rdata.cpp
===================================================================
--- branches/KDE4_port/rkward/rbackend/rdata.cpp 2007-10-08 15:05:13 UTC (rev 2038)
+++ branches/KDE4_port/rkward/rbackend/rdata.cpp 2007-10-08 15:08:03 UTC (rev 2039)
@@ -93,36 +93,36 @@
void RData::printStructure (const QString &prefix) {
switch (datatype) {
case NoData:
- qDebug ("%s: NoData, length %d", prefix.latin1(), length);
+ qDebug ("%s: NoData, length %d", prefix.toLatin1(), length);
break;
case IntVector:
- qDebug ("%s: IntVector, length %d", prefix.latin1(), length);
+ qDebug ("%s: IntVector, length %d", prefix.toLatin1(), length);
for (unsigned int i = 0; i < length; ++i) {
- qDebug ("%s%d: %d", prefix.latin1(), i, getIntVector ()[i]);
+ qDebug ("%s%d: %d", prefix.toLatin1(), i, getIntVector ()[i]);
}
break;
case RealVector:
- qDebug ("%s: RealVector, length %d", prefix.latin1(), length);
+ qDebug ("%s: RealVector, length %d", prefix.toLatin1(), length);
for (unsigned int i = 0; i < length; ++i) {
- qDebug ("%s%d: %f", prefix.latin1(), i, getRealVector ()[i]);
+ qDebug ("%s%d: %f", prefix.toLatin1(), i, getRealVector ()[i]);
}
break;
case StringVector:
- qDebug ("%s: StringVector, length %d", prefix.latin1(), length);
+ qDebug ("%s: StringVector, length %d", prefix.toLatin1(), length);
for (unsigned int i = 0; i < length; ++i) {
- qDebug ("%s%d: %s", prefix.latin1(), i, getStringVector ()[i].latin1());
+ qDebug ("%s%d: %s", prefix.toLatin1(), i, getStringVector ()[i].toLatin1());
}
break;
case StructureVector:
- qDebug ("%s: StructureVector, length %d", prefix.latin1(), length);
+ qDebug ("%s: StructureVector, length %d", prefix.toLatin1(), length);
for (unsigned int i = 0; i < length; ++i) {
QString sub_prefix = prefix + QString::number (i);
getStructureVector ()[i]->printStructure (sub_prefix);
}
break;
default:
- qDebug ("%s: INVALID %d, length %d", prefix.latin1(), datatype, length);
+ qDebug ("%s: INVALID %d, length %d", prefix.toLatin1(), datatype, length);
}
- qDebug ("%s: END\n\n", prefix.latin1 ());
+ qDebug ("%s: END\n\n", prefix.toLatin1 ());
}
Modified: branches/KDE4_port/rkward/rbackend/rinterface.cpp
===================================================================
--- branches/KDE4_port/rkward/rbackend/rinterface.cpp 2007-10-08 15:05:13 UTC (rev 2038)
+++ branches/KDE4_port/rkward/rbackend/rinterface.cpp 2007-10-08 15:08:03 UTC (rev 2039)
@@ -305,11 +305,11 @@
QString object_name = request->call[i];
RObject *obj = RObjectList::getObjectList ()->findObject (object_name);
if (obj) {
- RK_DO (qDebug ("triggering update for symbol %s", object_name.latin1 ()), RBACKEND, DL_DEBUG);
+ RK_DO (qDebug ("triggering update for symbol %s", object_name.toLatin1 ()), RBACKEND, DL_DEBUG);
obj->markDataDirty ();
obj->updateFromR (request->in_chain);
} else {
- RK_DO (qDebug ("lookup failed for changed symbol %s", object_name.latin1 ()), RBACKEND, DL_WARNING);
+ RK_DO (qDebug ("lookup failed for changed symbol %s", object_name.toLatin1 ()), RBACKEND, DL_WARNING);
}
}
} else if (call == "syncall") {
@@ -410,7 +410,7 @@
}
filename = filename.left (args->int_b - 2);
args->int_c = filename.length ();
- qstrcpy (*(args->chars_a), filename.latin1 ());
+ qstrcpy (*(args->chars_a), filename.toLatin1 ());
} else if (type ==RCallbackArgs::RSuicide) {
QString message = i18n ("The R engine has encountered a fatal error:\n") + QString (*(args->chars_a));
message += i18n ("It will be shut down immediately. This means, you can not use any more functions that rely on the R backend. I.e. you can do hardly anything at all, not even save the workspace. What you can do, however, is save any open command-files, the output, or copy data out of open data editors. Quit RKWard after that. Sorry!");
Modified: branches/KDE4_port/rkward/rbackend/rkstructuregetter.cpp
===================================================================
--- branches/KDE4_port/rkward/rbackend/rkstructuregetter.cpp 2007-10-08 15:05:13 UTC (rev 2038)
+++ branches/KDE4_port/rkward/rbackend/rkstructuregetter.cpp 2007-10-08 15:08:03 UTC (rev 2039)
@@ -154,7 +154,7 @@
if (ok != TRUE) {
storage->discardData();
- Rf_warning ("failure to get object %s", name.latin1());
+ Rf_warning ("failure to get object %s", name.toLatin1());
getStructureWorker (R_NilValue, name, misplaced, storage);
}
}
@@ -201,7 +201,7 @@
unsigned int type = 0;
unsigned int count;
- RK_DO (qDebug ("fetching '%s': %p, s-type %d", name.latin1(), val, TYPEOF (val)), RBACKEND, DL_DEBUG);
+ RK_DO (qDebug ("fetching '%s': %p, s-type %d", name.toLatin1(), val, TYPEOF (val)), RBACKEND, DL_DEBUG);
PROTECT (val);
// manually resolve any promises
@@ -385,7 +385,7 @@
}
if (do_env) {
- RK_DO (qDebug ("recurse into environment %s", name.latin1()), RBACKEND, DL_DEBUG);
+ RK_DO (qDebug ("recurse into environment %s", name.toLatin1()), RBACKEND, DL_DEBUG);
for (unsigned int i = 0; i < childcount; ++i) {
SEXP current_childname = install(CHAR(STRING_ELT(childnames_s, i)));
PROTECT (current_childname);
@@ -416,7 +416,7 @@
UNPROTECT (2); /* childname, child */
}
} else if (do_cont) {
- RK_DO (qDebug ("recurse into list %s", name.latin1()), RBACKEND, DL_DEBUG);
+ RK_DO (qDebug ("recurse into list %s", name.toLatin1()), RBACKEND, DL_DEBUG);
if (Rf_isList (value) && (!Rf_isObject (value))) { // old style list
for (unsigned int i = 0; i < childcount; ++i) {
SEXP child = CAR (value);
Modified: branches/KDE4_port/rkward/rbackend/rthread.cpp
===================================================================
--- branches/KDE4_port/rkward/rbackend/rthread.cpp 2007-10-08 15:05:13 UTC (rev 2038)
+++ branches/KDE4_port/rkward/rbackend/rthread.cpp 2007-10-08 15:08:03 UTC (rev 2039)
@@ -159,7 +159,7 @@
int ctype = command->type ();
QString ccommand = command->command (); // easier typing below
- RK_DO (qDebug ("running command: %s", ccommand.latin1()), RBACKEND, DL_DEBUG);
+ RK_DO (qDebug ("running command: %s", ccommand.toLatin1()), RBACKEND, DL_DEBUG);
if (command->type () & RCommand::DirectToOutput) {
runCommandInternal (".rk.cat.output (\"<hr>\\n\")", &error, false);
@@ -207,7 +207,7 @@
#endif
RK_DO (qDebug ("Command failed (other)"), RBACKEND, dl);
}
- RK_DO (qDebug ("failed command was: '%s'", command->command ().latin1 ()), RBACKEND, dl);
+ RK_DO (qDebug ("failed command was: '%s'", command->command ().toLatin1 ()), RBACKEND, dl);
} else {
command->status |= RCommand::WasTried;
}
@@ -230,7 +230,7 @@
}
if (error) {
- RK_DO (qDebug ("- error message was: '%s'", command->error ().latin1 ()), RBACKEND, dl);
+ RK_DO (qDebug ("- error message was: '%s'", command->error ().toLatin1 ()), RBACKEND, dl);
// runCommandInternal (".rk.init.handlers ()\n", &dummy);
}
RK_DO (qDebug ("done running command"), RBACKEND, DL_DEBUG);
@@ -322,10 +322,10 @@
qApp->postEvent (RKGlobals::rInterface (), event);
}
- RK_DO (qDebug ("output '%s'", current_output->output.latin1 ()), RBACKEND, DL_DEBUG);
+ RK_DO (qDebug ("output '%s'", current_output->output.toLatin1 ()), RBACKEND, DL_DEBUG);
} else {
// running Rcmdr, eh?
- RK_DO (qDebug ("output without receiver'%s'", current_output->output.latin1 ()), RBACKEND, DL_WARNING);
+ RK_DO (qDebug ("output without receiver'%s'", current_output->output.toLatin1 ()), RBACKEND, DL_WARNING);
delete current_output;
}
@@ -359,7 +359,7 @@
current_command->status |= RCommand::HasError;
}
- RK_DO (qDebug ("error '%s'", call[0].latin1 ()), RBACKEND, DL_DEBUG);
+ RK_DO (qDebug ("error '%s'", call[0].toLatin1 ()), RBACKEND, DL_DEBUG);
MUTEX_UNLOCK;
}
@@ -509,7 +509,7 @@
runCommandInternal ((*it).local8Bit (), &error);
if (error) {
status |= OtherFail;
- RK_DO (qDebug ("error in initialization call '%s'", (*it).latin1()), RBACKEND, DL_ERROR);
+ RK_DO (qDebug ("error in initialization call '%s'", (*it).toLatin1()), RBACKEND, DL_ERROR);
}
}
Modified: branches/KDE4_port/rkward/rkconsole.cpp
===================================================================
--- branches/KDE4_port/rkward/rkconsole.cpp 2007-10-08 15:05:13 UTC (rev 2038)
+++ branches/KDE4_port/rkward/rkconsole.cpp 2007-10-08 15:08:03 UTC (rev 2039)
@@ -170,8 +170,8 @@
int i;
RK_DO (qDebug ("%s", "Looking for syntax highlighting definition"), COMMANDEDITOR, DL_INFO);
for (i = 0; i < modes_count; ++i) {
- RK_DO (qDebug ("%s", doc->hlModeName(i).lower().latin1 ()), COMMANDEDITOR, DL_DEBUG);
- if (doc->hlModeName(i).lower() == "rkward output") {
+ RK_DO (qDebug ("%s", doc->hlModeName(i).toLower().toLatin1 ()), COMMANDEDITOR, DL_DEBUG);
+ if (doc->hlModeName(i).toLower() == "rkward output") {
found_mode = true;
break;
}
@@ -225,14 +225,14 @@
submitCommand ();
return true;
}
- else if (e->state () == Qt::ShiftButton && e->key () == Qt::Key_Home){
+ else if (e->state () == Qt::ShiftModifier && e->key () == Qt::Key_Home){
if(hasSelectedText())
pos=selectionInterfaceExt(doc)->selEndCol (); //There is already a selection, we take it into account.
selectionInterface(doc)->setSelection(doc->numLines()-1,prefix.length (),doc->numLines()-1, pos);
cursorAtTheBeginning ();
return true;
}
- else if (e->state () == Qt::ShiftButton && e->key () == Qt::Key_Left){
+ else if (e->state () == Qt::ShiftModifier && e->key () == Qt::Key_Left){
if(pos<=prefix.length ()){
return true;
} else {
@@ -310,7 +310,7 @@
int i=0;
for (it = entries.constBegin (); it != entries.constEnd (); ++it) {
if (i % 3) {
- doc->insertText (doc->numLines () - 1, 0, (*it).leftJustify (35));
+ doc->insertText (doc->numLines () - 1, 0, (*it).leftJustified (35));
} else {
doc->insertText (doc->numLines (), 0, *it);
}
@@ -380,8 +380,8 @@
do_file_completion = true;
// however, some characters around quotes signify it's probably not really filename string
- char char_before_quote = current_line.at (quote_start - 1).latin1();
- char char_after_quote = current_line.at (quote_start + 1).latin1();
+ char char_before_quote = current_line.at (quote_start - 1).toLatin1();
+ char char_after_quote = current_line.at (quote_start + 1).toLatin1();
// these signifiy it might be an object in a list somewhere, e.g. my.data$"varname"
if ((char_before_quote == '[') || (char_before_quote == '$') || (char_before_quote == ':')) do_file_completion = false;
// these indicate, the quote has likely ended rather that started
@@ -394,7 +394,7 @@
QString current_name = current_line.mid (quote_start + 1, quote_end - quote_start - 1);
KURLCompletion comp (KURLCompletion::FileCompletion);
- comp.setDir (QDir::currentDirPath ());
+ comp.setDir (QDir::currentPath ());
QString test = comp.makeCompletion (current_name);
if (doTabCompletionHelper (current_line_num, current_line, quote_start+1, quote_end, comp.allMatches ())) return;
@@ -726,7 +726,7 @@
}
void RKConsole::unplugAction(const QString &action, KActionCollection* ac) {
- KAction* a = ac->action(action.latin1 ());
+ KAction* a = ac->action(action.toLatin1 ());
if( a ){
a->setEnabled(false);
}
Modified: branches/KDE4_port/rkward/rkward.cpp
===================================================================
--- branches/KDE4_port/rkward/rkward.cpp 2007-10-08 15:05:13 UTC (rev 2038)
+++ branches/KDE4_port/rkward/rkward.cpp 2007-10-08 15:08:03 UTC (rev 2039)
@@ -305,12 +305,12 @@
QDir dir (RKSettingsModuleGeneral::filesPath());
if (!dir.exists ()) {
- QDir current (dir.currentDirPath ());
+ QDir current (dir.currentPath ());
current.mkdir (dir.path (), true);
}
dir = dir.filePath (".packagetemp");
if (!dir.exists ()) {
- QDir current (dir.currentDirPath ());
+ QDir current (dir.currentPath ());
current.mkdir (dir.path (), true);
}
@@ -640,13 +640,13 @@
void RKWardMainWindow::updateCWD () {
RK_TRACE (APP);
- statusbar_cwd->setText (QDir::currentDirPath ());
+ statusbar_cwd->setText (QDir::currentPath ());
}
void RKWardMainWindow::slotSetStatusBarText (const QString &text) {
RK_TRACE (APP);
- QString ntext = text.stripWhiteSpace ();
+ QString ntext = text.trimmed ();
ntext.replace ("<qt>", ""); // WORKAROUND: what the ?!? is going on? The KTHMLPart seems to post such messages.
if (ntext.isEmpty ()) {
statusbar_action->hide ();
Modified: branches/KDE4_port/rkward/scriptbackends/phpbackend.cpp
===================================================================
--- branches/KDE4_port/rkward/scriptbackends/phpbackend.cpp 2007-10-08 15:05:13 UTC (rev 2038)
+++ branches/KDE4_port/rkward/scriptbackends/phpbackend.cpp 2007-10-08 15:08:03 UTC (rev 2039)
@@ -124,9 +124,9 @@
if (!command_stack.count ()) return;
}
- RK_DO (qDebug ("submitting PHP code: %s", command_stack.first ()->command.latin1 ()), PHP, DL_DEBUG);
+ RK_DO (qDebug ("submitting PHP code: %s", command_stack.first ()->command.toLatin1 ()), PHP, DL_DEBUG);
current_command = command_stack.first ()->command + eot_string;
- php_process->writeStdin (current_command.latin1 (), current_command.length ());
+ php_process->writeStdin (current_command.toLatin1 (), current_command.length ());
busy_writing = doing_command = busy = true;
command_stack.first ()->complete = true;
current_flags = command_stack.first ()->flags;
@@ -144,8 +144,8 @@
RK_TRACE (PHP);
if ((!busy_writing) && php_process && php_process->isRunning () && busy && (!data_stack.isEmpty ())) {
- RK_DO (qDebug ("submitting data: %s", data_stack.first ().latin1 ()), PHP, DL_DEBUG);
- php_process->writeStdin (data_stack.first ().latin1 (), data_stack.first ().length ());
+ RK_DO (qDebug ("submitting data: %s", data_stack.first ().toLatin1 ()), PHP, DL_DEBUG);
+ php_process->writeStdin (data_stack.first ().toLatin1 (), data_stack.first ().length ());
busy_writing = true;
doing_command = false;
}
@@ -194,7 +194,7 @@
if (have_data) {
if (!startup_done) {
php_process->detach ();
- KMessageBox::error (0, i18n ("There has been an error\n(\"%1\")\nwhile starting up the PHP backend. Most likely this is due to either a bug in RKWard or a problem with your PHP installation. Check the settings (Settings->Configure Settings->PHP backend) and try again.").arg (output_raw_buffer.stripWhiteSpace ()), i18n ("PHP-Error"));
+ KMessageBox::error (0, i18n ("There has been an error\n(\"%1\")\nwhile starting up the PHP backend. Most likely this is due to either a bug in RKWard or a problem with your PHP installation. Check the settings (Settings->Configure Settings->PHP backend) and try again.").arg (output_raw_buffer.trimmed ()), i18n ("PHP-Error"));
emit (haveError ());
destroy ();
return;
@@ -208,7 +208,7 @@
return;
} else {
_output.append (data);
- RK_DO (qDebug ("request: %s\ndata: %s", request.latin1 (), data.latin1 ()), PHP, DL_DEBUG);
+ RK_DO (qDebug ("request: %s\ndata: %s", request.toLatin1 (), data.toLatin1 ()), PHP, DL_DEBUG);
if (request == "requesting code") {
startup_done = true;
@@ -217,19 +217,19 @@
_output = QString::null;
} else if (request.startsWith ("requesting data:")) {
QString requested_object = request.remove ("requesting data:");
- RK_DO (qDebug ("requested data: \"%s\"", requested_object.latin1 ()), PHP, DL_DEBUG);
+ RK_DO (qDebug ("requested data: \"%s\"", requested_object.toLatin1 ()), PHP, DL_DEBUG);
emit (requestValue (requested_object));
busy = true;
// writeData (res + eot_string);
} else if (request.startsWith ("PHP-Error")) {
QString error = request.remove ("PHP-Error");
php_process->detach ();
- KMessageBox::error (0, i18n ("The PHP-backend has reported an error\n(\"%1\")\nand has been shut down. This is most likely due to a bug in the plugin. But of course you may want to try to close and restart the plugin to see whether it works with different settings.").arg (error.stripWhiteSpace ()), i18n ("PHP-Error"));
+ KMessageBox::error (0, i18n ("The PHP-backend has reported an error\n(\"%1\")\nand has been shut down. This is most likely due to a bug in the plugin. But of course you may want to try to close and restart the plugin to see whether it works with different settings.").arg (error.trimmed ()), i18n ("PHP-Error"));
emit (haveError ());
destroy ();
return;
} else {
- RK_DO (qDebug ("unrecognized request from PHP backend: \"%s\"", request.latin1()), PHP, DL_ERROR);
+ RK_DO (qDebug ("unrecognized request from PHP backend: \"%s\"", request.toLatin1()), PHP, DL_ERROR);
}
}
}
Modified: branches/KDE4_port/rkward/scriptbackends/scriptbackend.cpp
===================================================================
--- branches/KDE4_port/rkward/scriptbackends/scriptbackend.cpp 2007-10-08 15:05:13 UTC (rev 2038)
+++ branches/KDE4_port/rkward/scriptbackends/scriptbackend.cpp 2007-10-08 15:08:03 UTC (rev 2039)
@@ -33,7 +33,7 @@
void ScriptBackend::callFunction (const QString &function, int flags, int type) {
RK_TRACE (PHP);
- RK_DO (qDebug ("callFunction %s", function.latin1 ()), PHP, DL_DEBUG);
+ RK_DO (qDebug ("callFunction %s", function.toLatin1 ()), PHP, DL_DEBUG);
ScriptCommand *command = new ScriptCommand;
command->command = function;
Modified: branches/KDE4_port/rkward/settings/rksettingsmodulegeneral.cpp
===================================================================
--- branches/KDE4_port/rkward/settings/rksettingsmodulegeneral.cpp 2007-10-08 15:05:13 UTC (rev 2038)
+++ branches/KDE4_port/rkward/settings/rksettingsmodulegeneral.cpp 2007-10-08 15:08:03 UTC (rev 2039)
@@ -49,7 +49,7 @@
Q3VBoxLayout *main_vbox = new Q3VBoxLayout (this, RKGlobals::marginHint ());
QLabel *label = new QLabel (i18n ("Settings marked with (*) do not take effect until you restart RKWard"), this);
- label->setAlignment (Qt::AlignAuto | Qt::AlignVCenter | Qt::ExpandTabs | Qt::WordBreak);
+ label->setAlignment (Qt::AlignLeft | Qt::AlignVCenter | Qt::ExpandTabs | Qt::WordBreak);
main_vbox->addWidget (label);
files_choser = new GetFileNameWidget (this, GetFileNameWidget::ExistingDirectory, i18n ("Directory where the logfiles should be kept (*)"), QString::null, new_files_path);
@@ -74,7 +74,7 @@
main_vbox->addSpacing (2*RKGlobals::spacingHint ());
label = new QLabel (i18n ("The workplace layout (i.e. which script-, data-, help-windows are open) may be saved (and loaded) per R workspace, or independent of the R workspace. Which do you prefer?"), this);
- label->setAlignment (Qt::AlignAuto | Qt::AlignVCenter | Qt::ExpandTabs | Qt::WordBreak);
+ label->setAlignment (Qt::AlignLeft | Qt::AlignVCenter | Qt::ExpandTabs | Qt::WordBreak);
main_vbox->addWidget (label);
workplace_save_chooser = new Q3ButtonGroup (this);
@@ -165,7 +165,7 @@
RK_TRACE (SETTINGS);
config->setGroup ("Logfiles");
- files_path = new_files_path = config->readEntry ("logfile dir", QDir ().homeDirPath () + "/.rkward/");
+ files_path = new_files_path = config->readEntry ("logfile dir", QDir ().homePath () + "/.rkward/");
config->setGroup ("General");
startup_action = (StartupDialog::Result) config->readNumEntry ("startup action", StartupDialog::NoSavedSetting);
Modified: branches/KDE4_port/rkward/settings/rksettingsmodulephp.cpp
===================================================================
--- branches/KDE4_port/rkward/settings/rksettingsmodulephp.cpp 2007-10-08 15:05:13 UTC (rev 2038)
+++ branches/KDE4_port/rkward/settings/rksettingsmodulephp.cpp 2007-10-08 15:08:03 UTC (rev 2039)
@@ -37,7 +37,7 @@
Q3VBoxLayout *main_vbox = new Q3VBoxLayout (this, RKGlobals::marginHint ());
QLabel *label = new QLabel (i18n ("Changes in this section take effect the next time you start a plugin"), this);
- label->setAlignment (Qt::AlignAuto | Qt::AlignVCenter | Qt::ExpandTabs | Qt::WordBreak);
+ label->setAlignment (Qt::AlignLeft | Qt::AlignVCenter | Qt::ExpandTabs | Qt::WordBreak);
main_vbox->addWidget (label);
main_vbox->addSpacing (2*RKGlobals::spacingHint ());
Modified: branches/KDE4_port/rkward/settings/rksettingsmoduleplugins.cpp
===================================================================
--- branches/KDE4_port/rkward/settings/rksettingsmoduleplugins.cpp 2007-10-08 15:05:13 UTC (rev 2038)
+++ branches/KDE4_port/rkward/settings/rksettingsmoduleplugins.cpp 2007-10-08 15:08:03 UTC (rev 2039)
@@ -49,7 +49,7 @@
main_vbox->addSpacing (2*RKGlobals::spacingHint ());
QLabel *label = new QLabel (i18n ("Some plugins are available with both, a wizard-like interface and a traditional dialog interface. If both are available, which mode of presentation do you prefer?"), this);
- label->setAlignment (Qt::AlignAuto | Qt::AlignVCenter | Qt::ExpandTabs | Qt::WordBreak);
+ label->setAlignment (Qt::AlignLeft | Qt::AlignVCenter | Qt::ExpandTabs | Qt::WordBreak);
main_vbox->addWidget (label);
button_group = new Q3ButtonGroup (this);
Modified: branches/KDE4_port/rkward/settings/rksettingsmoduler.cpp
===================================================================
--- branches/KDE4_port/rkward/settings/rksettingsmoduler.cpp 2007-10-08 15:05:13 UTC (rev 2038)
+++ branches/KDE4_port/rkward/settings/rksettingsmoduler.cpp 2007-10-08 15:08:03 UTC (rev 2039)
@@ -59,7 +59,7 @@
main_vbox->addSpacing (2*RKGlobals::spacingHint ());
QLabel *label = new QLabel (i18n ("The following settings mostly affect R behavior in the console. It is generally safe to keep these unchanged."), this);
- label->setAlignment (Qt::AlignAuto | Qt::AlignVCenter | Qt::ExpandTabs | Qt::WordBreak);
+ label->setAlignment (Qt::AlignLeft | Qt::AlignVCenter | Qt::ExpandTabs | Qt::WordBreak);
main_vbox->addWidget (label);
Q3GridLayout *grid = new Q3GridLayout (main_vbox, 1, 2, RKGlobals::spacingHint ());
Modified: branches/KDE4_port/rkward/settings/rksettingsmodulewatch.cpp
===================================================================
--- branches/KDE4_port/rkward/settings/rksettingsmodulewatch.cpp 2007-10-08 15:05:13 UTC (rev 2038)
+++ branches/KDE4_port/rkward/settings/rksettingsmodulewatch.cpp 2007-10-08 15:08:03 UTC (rev 2039)
@@ -121,23 +121,23 @@
Q3VBoxLayout *vbox = new Q3VBoxLayout (this, RKGlobals::marginHint ());
QLabel *label = new QLabel (i18n ("For now, settings only apply to new commands. All previous commands remain visible/invisible."), this);
- label->setAlignment (Qt::AlignAuto | Qt::AlignVCenter | Qt::ExpandTabs | Qt::WordBreak);
+ label->setAlignment (Qt::AlignLeft | Qt::AlignVCenter | Qt::ExpandTabs | Qt::WordBreak);
vbox->addWidget (label);
vbox->addSpacing (10);
Q3GridLayout *grid = new Q3GridLayout (vbox, 5, 5);
label = new QLabel (i18n ("always show command"), this);
- label->setAlignment (Qt::AlignAuto | Qt::AlignVCenter | Qt::ExpandTabs | Qt::WordBreak);
+ label->setAlignment (Qt::AlignLeft | Qt::AlignVCenter | Qt::ExpandTabs | Qt::WordBreak);
grid->addWidget (label, 0, 1);
label = new QLabel (i18n ("always show result"), this);
- label->setAlignment (Qt::AlignAuto | Qt::AlignVCenter | Qt::ExpandTabs | Qt::WordBreak);
+ label->setAlignment (Qt::AlignLeft | Qt::AlignVCenter | Qt::ExpandTabs | Qt::WordBreak);
grid->addWidget (label, 0, 2);
label = new QLabel (i18n ("show errors"), this);
- label->setAlignment (Qt::AlignAuto | Qt::AlignVCenter | Qt::ExpandTabs | Qt::WordBreak);
+ label->setAlignment (Qt::AlignLeft | Qt::AlignVCenter | Qt::ExpandTabs | Qt::WordBreak);
grid->addWidget (label, 0, 3);
label = new QLabel (i18n ("show/raise window"), this);
- label->setAlignment (Qt::AlignAuto | Qt::AlignVCenter | Qt::ExpandTabs | Qt::WordBreak);
+ label->setAlignment (Qt::AlignLeft | Qt::AlignVCenter | Qt::ExpandTabs | Qt::WordBreak);
grid->addWidget (label, 0, 4);
user_filter_boxes = addFilterSettings (this, grid, 1, i18n ("User commands"), user_filter);
Modified: branches/KDE4_port/rkward/windows/detachedwindowcontainer.cpp
===================================================================
--- branches/KDE4_port/rkward/windows/detachedwindowcontainer.cpp 2007-10-08 15:05:13 UTC (rev 2038)
+++ branches/KDE4_port/rkward/windows/detachedwindowcontainer.cpp 2007-10-08 15:08:03 UTC (rev 2039)
@@ -81,7 +81,7 @@
void DetachedWindowContainer::slotSetStatusBarText (const QString &text) {
RK_TRACE (APP);
- QString ntext = text.stripWhiteSpace ();
+ QString ntext = text.trimmed ();
ntext.replace ("<qt>", ""); // WORKAROUND: what the ?!? is going on? The KTHMLPart seems to post such messages.
statusBar ()->message (ntext);
Modified: branches/KDE4_port/rkward/windows/qxembedcopy.cpp
===================================================================
--- branches/KDE4_port/rkward/windows/qxembedcopy.cpp 2007-10-08 15:05:13 UTC (rev 2038)
+++ branches/KDE4_port/rkward/windows/qxembedcopy.cpp 2007-10-08 15:08:03 UTC (rev 2039)
@@ -941,7 +941,7 @@
// L1610: Non managed windows have no WM_STATE property.
// Returning true ensures that the loop L1711 stops.
if ( r == Success && data && format == 32 ) {
- Q_UINT32 *wstate = (Q_UINT32*)data;
+ quint32 *wstate = (quint32*)data;
withdrawn = (*wstate == WithdrawnState );
XFree( (char *)data );
}
Modified: branches/KDE4_port/rkward/windows/rcontrolwindow.cpp
===================================================================
--- branches/KDE4_port/rkward/windows/rcontrolwindow.cpp 2007-10-08 15:05:13 UTC (rev 2038)
+++ branches/KDE4_port/rkward/windows/rcontrolwindow.cpp 2007-10-08 15:08:03 UTC (rev 2039)
@@ -387,7 +387,7 @@
RK_TRACE (APP);
RK_ASSERT (this);
- QString dummy = command->command ().left (40).stripWhiteSpace ();
+ QString dummy = command->command ().left (40).trimmed ();
if (dummy.length () > 37) {
dummy = dummy.left (37) + "...";
}
Modified: branches/KDE4_port/rkward/windows/rkcommandeditorwindow.cpp
===================================================================
--- branches/KDE4_port/rkward/windows/rkcommandeditorwindow.cpp 2007-10-08 15:05:13 UTC (rev 2038)
+++ branches/KDE4_port/rkward/windows/rkcommandeditorwindow.cpp 2007-10-08 15:08:03 UTC (rev 2039)
@@ -165,7 +165,7 @@
bool found_mode = false;
int i;
for (i = 0; i < modes_count; ++i) {
- if (highlightingInterface (m_doc)->hlModeName (i).lower() == "r script") {
+ if (highlightingInterface (m_doc)->hlModeName (i).toLower() == "r script") {
found_mode = true;
break;
}
Modified: branches/KDE4_port/rkward/windows/rkfilebrowser.cpp
===================================================================
--- branches/KDE4_port/rkward/windows/rkfilebrowser.cpp 2007-10-08 15:05:13 UTC (rev 2038)
+++ branches/KDE4_port/rkward/windows/rkfilebrowser.cpp 2007-10-08 15:08:03 UTC (rev 2039)
@@ -110,7 +110,7 @@
connect (dir, SIGNAL (fileSelected (const KFileItem*)), this, SLOT (fileActivated (const KFileItem*)));
- setURL (QDir::currentDirPath ());
+ setURL (QDir::currentPath ());
}
RKFileBrowserWidget::~RKFileBrowserWidget () {
@@ -149,7 +149,7 @@
Q3ListBox *lb = urlbox->listBox ();
if (watched == lb && e->type() == QEvent::Show) {
int add = lb->height() < lb->contentsHeight() ? lb->verticalScrollBar()->width() : 0;
- int w = QMIN (topLevelWidget ()->width(), lb->contentsWidth() + add);
+ int w = qMin (topLevelWidget ()->width(), lb->contentsWidth() + add);
lb->resize (w, lb->height());
}
return QWidget::eventFilter (watched, e);
Modified: branches/KDE4_port/rkward/windows/rkhtmlwindow.cpp
===================================================================
--- branches/KDE4_port/rkward/windows/rkhtmlwindow.cpp 2007-10-08 15:05:13 UTC (rev 2038)
+++ branches/KDE4_port/rkward/windows/rkhtmlwindow.cpp 2007-10-08 15:08:03 UTC (rev 2039)
@@ -359,7 +359,7 @@
out_dir.setNameFilter ("graph*.png");
QStringList graph_files = out_dir.entryList ();
for (QStringList::const_iterator it = graph_files.constBegin (); it != graph_files.constEnd (); ++it) {
- QFile file (out_dir.absFilePath (*it, false));
+ QFile file (out_dir.absoluteFilePath (*it, false));
file.remove ();
}
refreshOutput (false, false, false);
@@ -478,7 +478,7 @@
} else {
help_file_name = help_base_dir + url.path () + ".rkh";
}
- RK_DO (qDebug ("rendering help page for local file %s", help_file_name.latin1 ()), APP, DL_DEBUG);
+ RK_DO (qDebug ("rendering help page for local file %s", help_file_name.toLatin1 ()), APP, DL_DEBUG);
// open help file
QDomElement help_doc_element = help_xml->openXMLFile (help_file_name, DL_ERROR);
@@ -498,12 +498,12 @@
khtmlpart->write ("<html><head><title>" + page_title + "</title><link rel=\"stylesheet\" type=\"text/css\" href=\"" + css_filename + "\"></head>\n<body><div id=\"main\">\n<h1>" + page_title + "</h1>\n");
// fix all elements containing an "src" attribute
- QDir base_path (QFileInfo (help_file_name).dirPath (true));
+ QDir base_path (QFileInfo (help_file_name).absolutePath());
XMLChildList src_elements = help_xml->findElementsWithAttribute (help_doc_element, "src", QString (), true, DL_DEBUG);
for (XMLChildList::iterator it = src_elements.begin (); it != src_elements.end (); ++it) {
QString src = (*it).attribute ("src");
if (KURL::isRelativeURL (src)) {
- src = "file://" + QDir::cleanDirPath (base_path.filePath (src));
+ src = "file://" + QDir::cleanPath (base_path.filePath (src));
(*it).setAttribute ("src", src);
}
}
@@ -630,7 +630,7 @@
ret.append ("</p>");
ret.replace ("\n\n", "</p>\n<p>");
- RK_DO (qDebug ("%s", ret.latin1 ()), APP, DL_DEBUG);
+ RK_DO (qDebug ("%s", ret.toLatin1 ()), APP, DL_DEBUG);
return ret;
}
@@ -662,7 +662,7 @@
if (text.isEmpty ()) {
text = i18n ("BROKEN REFERENCE");
- RK_DO (qDebug ("Broken reference to %s", url.path ().latin1 ()), APP, DL_WARNING);
+ RK_DO (qDebug ("Broken reference to %s", url.path ().toLatin1 ()), APP, DL_WARNING);
}
link_element->appendChild (link_element->ownerDocument ().createTextNode (text));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the rkward-tracker
mailing list