(changed)); // n=
o check for isVariable needed. we only need to look up, if we have this obj=
ect, and where.
- if (cindex < 0) return; // none of our buisiness
+ if (cindex < 0) return; // none of our business
=
if (meta_model) meta_model->objectMetaChanged (cindex);
}
diff --git a/rkward/dialogs/rkimportdialog.h b/rkward/dialogs/rkimportdialo=
g.h
index bddaee34..b3d1687e 100644
--- a/rkward/dialogs/rkimportdialog.h
+++ b/rkward/dialogs/rkimportdialog.h
@@ -31,7 +31,7 @@ class RKImportDialog : public QFileDialog {
public:
/** constructor
@param context_id The id of the context containing the relevant plugins
-@param parent Parent widget (dialog will be centered on this widget, if no=
n-zeor */
+@param parent Parent widget (dialog will be centered on this widget, if no=
n-zero */
RKImportDialog (const QString &context_id, QWidget *parent);
/** dtor */
~RKImportDialog ();
diff --git a/rkward/dialogs/rkloadlibsdialog.cpp b/rkward/dialogs/rkloadlib=
sdialog.cpp
index d774ca9f..3c125a2f 100644
--- a/rkward/dialogs/rkloadlibsdialog.cpp
+++ b/rkward/dialogs/rkloadlibsdialog.cpp
@@ -950,7 +950,7 @@ void RKRPackageInstallationStatus::initialize (RCommand=
Chain *chain) {
=
_initialized =3D true; // will be re-set to false, should the command fai=
l / be cancelled
=
- RCommand *command =3D new RCommand (".rk.get.package.intallation.state ()=
", RCommand::App | RCommand::GetStructuredData);
+ RCommand *command =3D new RCommand (".rk.get.package.installation.state (=
)", RCommand::App | RCommand::GetStructuredData);
connect (command->notifier (), &RCommandNotifier::commandFinished, this, =
&RKRPackageInstallationStatus::statusCommandFinished);
RKProgressControl *control =3D new RKProgressControl (this, i18n ("Ple=
ase stand by while searching for installed and available packages.
Note: This requires a working internet connection, and may t=
ake some time, esp. if one or more repositories are temporarily unavailable=
.
"), i18n ("Searching for packages"), RKProgressControl::CancellablePro=
gress | RKProgressControl::AutoCancelCommands);
control->addRCommand (command, true);
diff --git a/rkward/dialogs/rkselectlistdialog.h b/rkward/dialogs/rkselectl=
istdialog.h
index 8af134a8..f889cffe 100644
--- a/rkward/dialogs/rkselectlistdialog.h
+++ b/rkward/dialogs/rkselectlistdialog.h
@@ -23,7 +23,7 @@
class QListWidget;
class QDialogButtonBox;
=
-/** This class represent a dialog asking for a choice among several optios=
n. It is used, when the backend calls select.list() / menu().
+/** This class represent a dialog asking for a choice among several option=
s. It is used, when the backend calls select.list() / menu().
=
@author Thomas Friedrichsmeier
*/
diff --git a/rkward/dialogs/startupdialog.h b/rkward/dialogs/startupdialog.h
index 883305bc..b24472bf 100644
--- a/rkward/dialogs/startupdialog.h
+++ b/rkward/dialogs/startupdialog.h
@@ -41,7 +41,7 @@ public:
EmptyWorkspace=3D0, /**< start with an empty workspace */
EmptyTable=3D1, /**< start with an empty table */
ChoseFile=3D2, /**< chose file to open */
- NoSavedSetting=3D3, /**< not acutally returned as a result. Used in RK=
SettingsModuleGeneral. This is saved, if user wants to be asked on every st=
artup */
+ NoSavedSetting=3D3, /**< not actually returned as a result. Used in RK=
SettingsModuleGeneral. This is saved, if user wants to be asked on every st=
artup */
OpenFile=3D4, /**< open a recent file (already specified) */
RestoreFromWD=3D5 /**< load workspace from current directory, if avai=
lable (R option --restore). */
};
diff --git a/rkward/misc/celleditor.h b/rkward/misc/celleditor.h
index 581220c2..5527008a 100644
--- a/rkward/misc/celleditor.h
+++ b/rkward/misc/celleditor.h
@@ -31,7 +31,7 @@ class QKeyEvent;
/**
This is the main editor used in the TwinTableMembers
=
-TODO: the acutal editor will have to be separated from the value_list-popu=
p in order to allow showing the popup, even if the list does not have strong
+TODO: the actual editor will have to be separated from the value_list-popu=
p in order to allow showing the popup, even if the list does not have strong
focus.
=
@author Thomas Friedrichsmeier
diff --git a/rkward/misc/multistringselector.h b/rkward/misc/multistringsel=
ector.h
index 31e3d7c3..4dc55459 100644
--- a/rkward/misc/multistringselector.h
+++ b/rkward/misc/multistringselector.h
@@ -59,7 +59,7 @@ signals:
void listChanged ();
};
=
-/** This convenience widget allows to select one or more strings (e.g. fil=
enames) and sort them in any order. The function to acutally select new str=
ings to add to the selection is not implemented in this class for more flex=
ibility. Rather, connect to the getNewStrings () signal and assign the desi=
red QString(s) in a custom slot.
+/** This convenience widget allows to select one or more strings (e.g. fil=
enames) and sort them in any order. The function to actually select new str=
ings to add to the selection is not implemented in this class for more flex=
ibility. Rather, connect to the getNewStrings () signal and assign the desi=
red QString(s) in a custom slot.
=
@author Thomas Friedrichsmeier
*/
diff --git a/rkward/misc/rkaccordiontable.cpp b/rkward/misc/rkaccordiontabl=
e.cpp
index a920e06f..5ef8f7cb 100644
--- a/rkward/misc/rkaccordiontable.cpp
+++ b/rkward/misc/rkaccordiontable.cpp
@@ -313,7 +313,7 @@ void RKAccordionTable::setShowAddRemoveButtons (bool sh=
ow) {
QSize RKAccordionTable::sizeHintWithoutEditor () const {
RK_TRACE (MISC);
=
- // NOTE: This is not totally correct, but seems to be, roughly. We can't =
use sizeHintForRow(0) for height calcuation, as the model may be empty
+ // NOTE: This is not totally correct, but seems to be, roughly. We can't =
use sizeHintForRow(0) for height calculation, as the model may be empty
// (for "driven" optionsets.
return (QSize (minimumSizeHint ().width (), header ()->sizeHint().height =
() + horizontalScrollBar ()->sizeHint ().height () + QFontMetrics (QFont ()=
).lineSpacing () * 4));
}
diff --git a/rkward/misc/rkjobsequence.h b/rkward/misc/rkjobsequence.h
index a5428e11..89aa2132 100644
--- a/rkward/misc/rkjobsequence.h
+++ b/rkward/misc/rkjobsequence.h
@@ -22,7 +22,7 @@
=
#include
=
-/** Simple class to queue up a sequnce of KJob that will be executed one a=
fter the other */
+/** Simple class to queue up a sequence of KJob that will be executed one =
after the other */
class RKJobSequence : public QObject {
Q_OBJECT
public:
diff --git a/rkward/misc/rkprogresscontrol.cpp b/rkward/misc/rkprogresscont=
rol.cpp
index f6932b1b..a761c5b4 100644
--- a/rkward/misc/rkprogresscontrol.cpp
+++ b/rkward/misc/rkprogresscontrol.cpp
@@ -105,7 +105,7 @@ void RKProgressControl::doNonModal (bool autodelete) {
RK_ASSERT (!dialog);
=
RKProgressControl::autodelete =3D autodelete;
- if ((!dialog) && (mode & ShowAtOnce)) { // actually, dialog should alway=
be 0 at this point
+ if ((!dialog) && (mode & ShowAtOnce)) { // actually, dialog should alway=
s be 0 at this point
createDialog ();
dialog->show ();
}
diff --git a/rkward/misc/rksaveobjectchooser.cpp b/rkward/misc/rksaveobject=
chooser.cpp
index 9bb39826..5d53111d 100644
--- a/rkward/misc/rksaveobjectchooser.cpp
+++ b/rkward/misc/rksaveobjectchooser.cpp
@@ -136,7 +136,7 @@ void RKSaveObjectChooser::objectRemoved (RObject* remov=
ed) {
setRootObject (0);
} else if (removed =3D=3D current_object) {
stopListenForObject (removed);
- current_full_name.clear (); // hack to achieve proper emittance of chang=
e signal
+ current_full_name.clear (); // hack to achieve proper emit of change sig=
nal
QTimer::singleShot (0, this, SLOT (updateState()));
} else {
RK_ASSERT (false);
diff --git a/rkward/misc/rkspinbox.h b/rkward/misc/rkspinbox.h
index 18036a48..871ef332 100644
--- a/rkward/misc/rkspinbox.h
+++ b/rkward/misc/rkspinbox.h
@@ -41,7 +41,7 @@ public:
@param max maximum acceptable value
@param initial initial value
@param default_precision default precision of steps. E.g. 2 to make the se=
cond sub-decimal digit the one that is change by pressing up/down arrows, w=
hen the value is 0
-@param max_precison maximum acceptable precision */
+@param max_precision maximum acceptable precision */
void setRealMode (double min, double max, double initial, int default_pre=
cision, int max_precision);
/** set the spinbox to operate on integer numbers (like a regular QSpinBox=
, but step sizes are adjusted automatically
@param min minimum acceptable value
diff --git a/rkward/misc/rkstandardicons.h b/rkward/misc/rkstandardicons.h
index 9f43c656..4710a9ab 100644
--- a/rkward/misc/rkstandardicons.h
+++ b/rkward/misc/rkstandardicons.h
@@ -25,7 +25,7 @@ class RKMDIWindow;
=
/** This class (it's a namespace, really, except I did not figure out how =
to put the storage array in it as a "private" member) provides easy access =
to the icons used in RKWard. This helps staying consistent across the whole=
application.
=
-Also, since QIcons are only loaded on demand, and implicitely shared, this=
should save some resources for icons that are used often.
+Also, since QIcons are only loaded on demand, and implicitly shared, this =
should save some resources for icons that are used often.
=
Eventually all icons (even those that are only used once, so far) should b=
e added, here. All direct constructions of QIcons (or KIconLoader) should b=
e removed elsewhere.
=
diff --git a/rkward/misc/rkxmlguisyncer.cpp b/rkward/misc/rkxmlguisyncer.cpp
index 0bf11004..02c41496 100644
--- a/rkward/misc/rkxmlguisyncer.cpp
+++ b/rkward/misc/rkxmlguisyncer.cpp
@@ -146,7 +146,7 @@ void RKXMLGUISyncerPrivate::actionCollectionDestroyed (=
QObject *object) {
QString path_key =3D client_map.key (static_cast (obj=
ect));
client_map.remove (path_key, ac);
=
- // if there are no futher clients with this path, stop watching it.
+ // if there are no further clients with this path, stop watching it.
if (!client_map.contains (path_key)) {
file_watcher->removeFile (path_key);
}
diff --git a/rkward/misc/xmlhelper.h b/rkward/misc/xmlhelper.h
index 86c61c65..3959ec6d 100644
--- a/rkward/misc/xmlhelper.h
+++ b/rkward/misc/xmlhelper.h
@@ -141,7 +141,7 @@ but you can re-open the file, if needed.
/** displays a custom-error message (also used internally by XMLHelper to =
display errors
@param in_node a pointer to the node/element to which the error relates (o=
r 0). If given and non-zero, a "backtrace" of where the error is located wi=
ll be generated
@param message the error-message to display
-@param debug_level the debug level to show the message at (highestError ()=
will be adujsted if applicable)
+@param debug_level the debug level to show the message at (highestError ()=
will be adjusted if applicable)
@param message_level sometime you may want to make sure your message is be=
ing shown even if it is not very important to your code. For instance, if t=
here is a typo/illegal value in an optional setting, your code can continue=
using a reasonable default, but the user should still be notified of this =
error. If you omit this parameter or set it to something smaller that debug=
_level, debug_level will be used instead. */
void displayError (const QDomNode *in_node, const QString &message, int d=
ebug_level, int message_level=3D-1) const;
private:
diff --git a/rkward/plugin/rkcomponent.cpp b/rkward/plugin/rkcomponent.cpp
index df724fb1..167191b7 100644
--- a/rkward/plugin/rkcomponent.cpp
+++ b/rkward/plugin/rkcomponent.cpp
@@ -245,7 +245,7 @@ RKComponentBase::ComponentStatus RKComponentBase::recur=
siveStatus () {
=
bool processing =3D false;
bool children_satisfied =3D true;
- // we always need to interate over all children, since we need to make su=
re to find any which are dead or processing.
+ // we always need to iterate over all children, since we need to make sur=
e to find any which are dead or processing.
for (QHash::const_iterator it =3D child_map.co=
nstBegin (); it !=3D child_map.constEnd (); ++it) {
ComponentStatus s =3D it.value ()->recursiveStatus ();
if (s =3D=3D Dead) return Dead;
@@ -299,7 +299,7 @@ RKComponent::~RKComponent () {
void RKComponent::propertyValueChanged (RKComponentPropertyBase *property)=
{
RK_TRACE (PLUGIN);
=
- // slightly more elaborat than necessary on first thought, to prevent loo=
ps
+ // slightly more elaborate than necessary on first thought, to prevent lo=
ops
if (property =3D=3D visibility_property) {
if (visibility_property->boolValue ()) {
if (isHidden ()) show ();
diff --git a/rkward/plugin/rkcomponent.h b/rkward/plugin/rkcomponent.h
index d3ecf232..0a3da042 100644
--- a/rkward/plugin/rkcomponent.h
+++ b/rkward/plugin/rkcomponent.h
@@ -115,7 +115,7 @@ public:
/** currently valid? default implementation always returns true. @see recu=
rsiveStatus()
* reimplement this in subclasses, if components may become invalid.
* =
- * @note: A component will be "satisfied" even when invalid, if is is not=
required. Also, a required component is implictily not satisfied, if any o=
f its children are not statisfied.
+ * @note: A component will be "satisfied" even when invalid, if is is not=
required. Also, a required component is implicitly not satisfied, if any o=
f its children are not satisfied.
* In general, use isSatisfied() to query the status of components, not i=
sValid(). */
virtual bool isValid () { return true; };
/** set to required: will only be satisfied if it is valid (and all it's c=
hildren). Else: always satisfied (but subclasses might override to always b=
e dissatisfied on really bad values. By default RKComponentBase is required=
at construction */
@@ -126,7 +126,7 @@ public:
typedef QMap PropertyValueMap;
static QString valueMapToString (const PropertyValueMap &map);
static bool stringListToValueMap (const QStringList &strings, PropertyVal=
ueMap *map);
-/** serialize the state of this component / property and all its children.=
Note: Only the non-internal property-values are serialzed, not the compone=
nts / properties themselves. @see fetchPropertyValuesRecursive() */
+/** serialize the state of this component / property and all its children.=
Note: Only the non-internal property-values are serialized, not the compon=
ents / properties themselves. @see fetchPropertyValuesRecursive() */
void serializeState (PropertyValueMap *map) const { fetchPropertyValuesRe=
cursive (map, true); };
/** set values from a map as created with serializeState(). @see serialize=
State (), @see setPropertyValues ().
@returns status code */
@@ -229,7 +229,7 @@ protected:
void createDefaultProperties ();
/** This function is needed internally, to set the Qt enabledness of this =
widget, and all child component widgets. Note that the enabledness as store=
d in the enabledness_property is not necessarily the same as the enablednes=
s in the GUI (and is not affected by this call). In general, a component is=
enabled in the GUI, if and only if a) it's enabledness_property is set to =
true, b) its parent widget is enabled in Qt, and c) it's parent component i=
s also enabled. */
void updateEnablednessRecursive (bool parent_component_enabled);
-/** Helper for getUiLabelPair(): Strips accelator key markup ("&") from st=
rings */
+/** Helper for getUiLabelPair(): Strips accelerator key markup ("&") from =
strings */
static QString stripAccelerators (const QString &in);
};
=
diff --git a/rkward/plugin/rkcomponentmap.cpp b/rkward/plugin/rkcomponentma=
p.cpp
index df6a07a7..d3f70dd1 100644
--- a/rkward/plugin/rkcomponentmap.cpp
+++ b/rkward/plugin/rkcomponentmap.cpp
@@ -574,7 +574,7 @@ RKPluginMapParseResult RKComponentMap::addPluginMap (co=
nst QString& plugin_map_f
=
QDomElement document_element =3D xml.openXMLFile (DL_ERROR);
if (document_element.isNull ()) {
- ret.addAndPrintError (DL_ERROR, i18n ("Could not open plugin map file %1=
. (Is not readble, or failed to parse)", plugin_map_file_abs));
+ ret.addAndPrintError (DL_ERROR, i18n ("Could not open plugin map file %1=
. (Is not readable, or failed to parse)", plugin_map_file_abs));
return ret;
}
=
diff --git a/rkward/plugin/rkcomponentmap.h b/rkward/plugin/rkcomponentmap.h
index cc2c78f3..52230144 100644
--- a/rkward/plugin/rkcomponentmap.h
+++ b/rkward/plugin/rkcomponentmap.h
@@ -115,7 +115,7 @@ class QDomElement;
class XMLHelper;
class RKContextHandler;
=
-/** This class keeps a QDomDocument that is a represenation of the GUI usi=
ng KDEs XML-GUI format (a ui.rc). Use createMenus () to have it parse the m=
enu descriptions from a .pluginmap file. It will adjust the XML description=
accordingly. When done, you can use to generated gui_xml to set it as the =
xmlGUIBuildDocument of a KXMLGUIClient. =
+/** This class keeps a QDomDocument that is a representation of the GUI us=
ing KDEs XML-GUI format (a ui.rc). Use createMenus () to have it parse the =
menu descriptions from a .pluginmap file. It will adjust the XML descriptio=
n accordingly. When done, you can use to generated gui_xml to set it as the=
xmlGUIBuildDocument of a KXMLGUIClient. =
=
One instance of this class is generally around, persistently: The RKComone=
ntMap (with context "global"). Further instances are around one for each co=
ntext.
=
diff --git a/rkward/plugin/rkcomponentmeta.cpp b/rkward/plugin/rkcomponentm=
eta.cpp
index 54ab3a6f..336292f7 100644
--- a/rkward/plugin/rkcomponentmeta.cpp
+++ b/rkward/plugin/rkcomponentmeta.cpp
@@ -201,7 +201,7 @@ QString numericVersionToString (quint32 numeric) {
ret.append (QString::number (ver_part));
if (i > 0) ret.append ('.');
}
- if (ret.endsWith (QLatin1String (".0"))) ret.chop (2); // HACK: Don't pri=
nt more than three verison parts, unless the fourth is non-zero
+ if (ret.endsWith (QLatin1String (".0"))) ret.chop (2); // HACK: Don't pri=
nt more than three version parts, unless the fourth is non-zero
return ret;
}
=
diff --git a/rkward/plugin/rkcomponentproperties.h b/rkward/plugin/rkcompon=
entproperties.h
index 9fda1e5f..827c3a5a 100644
--- a/rkward/plugin/rkcomponentproperties.h
+++ b/rkward/plugin/rkcomponentproperties.h
@@ -439,14 +439,14 @@ public:
/** reimplemented for setRequireTrue ()*/
bool isValid () override;
=
-/** string represenation of the options in ConvertMode. For use in XMLHelp=
er::getMultiChoiceAttribute */
+/** string representation of the options in ConvertMode. For use in XMLHel=
per::getMultiChoiceAttribute */
static QString convertModeOptionString () { return ("equals;notequals;ran=
ge;and;or"); };
/** reimplemented to do raise a warning, and do nothing else. */
void connectToGovernor (RKComponentPropertyBase *governor, const QString =
&modifier=3DQString (), bool reconcile_requirements=3Dtrue) override;
/** reimplemented to do raise a warning, and do nothing else. */
bool setValue (const QString &value) override;
public slots:
-/** unfortuntely, as the parent component likely does not know about us, w=
e have to notify it manually of any changes. That's done from this slot */
+/** unfortunately, as the parent component likely does not know about us, =
we have to notify it manually of any changes. That's done from this slot */
void selfChanged (RKComponentPropertyBase *);
/** a source property changed. Check the state */
void sourcePropertyChanged (RKComponentPropertyBase *);
diff --git a/rkward/plugin/rkpluginbrowser.h b/rkward/plugin/rkpluginbrowse=
r.h
index c15d6c48..c2bb65d3 100644
--- a/rkward/plugin/rkpluginbrowser.h
+++ b/rkward/plugin/rkpluginbrowser.h
@@ -29,7 +29,7 @@ class QDomElement;
=
/** RKComponent to select one or more file(s) or directories
=
-TODO: Rename to somehting like RKComponentFileSelect or a similarilly ugly=
name
+TODO: Rename to something like RKComponentFileSelect or a similarly ugly n=
ame
TODO: I ripped out multiple file selection for now. GetFileNameWidget shou=
ld be extended to handle that internally (tfry)
=
@author Adrien d'Hardemare
diff --git a/rkward/plugin/rkpluginsaveobject.cpp b/rkward/plugin/rkplugins=
aveobject.cpp
index ecc1394d..7c084a99 100644
--- a/rkward/plugin/rkpluginsaveobject.cpp
+++ b/rkward/plugin/rkpluginsaveobject.cpp
@@ -99,7 +99,7 @@ void RKPluginSaveObject::externalChange () {
groupbox->setChecked (active->boolValue ());
}
=
- // call internalChange, now, in case one or more setings could not be app=
lied
+ // call internalChange, now, in case one or more settings could not be ap=
plied
internalChange ();
}
=
diff --git a/rkward/plugin/rkstandardcomponent.h b/rkward/plugin/rkstandard=
component.h
index c3a3cea1..f29228da 100644
--- a/rkward/plugin/rkstandardcomponent.h
+++ b/rkward/plugin/rkstandardcomponent.h
@@ -57,7 +57,7 @@ public:
bool currentPageSatisfied () override;
/** for use by RKComponentBuilder to add a page to a wizardish component */
RKComponent *addPage () override;
-/** reimplemented to acutally register the component with the wizard */
+/** reimplemented to actually register the component with the wizard */
void addComponentToCurrentPage (RKComponent *component) override;
/** switch from dialog to wizard or vice versa */
void switchInterface ();
diff --git a/rkward/rbackend/rcommandstack.h b/rkward/rbackend/rcommandstac=
k.h
index b3ee8208..1eb16b41 100644
--- a/rkward/rbackend/rcommandstack.h
+++ b/rkward/rbackend/rcommandstack.h
@@ -64,7 +64,7 @@ friend class RCommandStackModel;
=
/** The model used to fetch a representation of and signal changes in the =
RCommandStack. Used for RKControlWindow.
=
-- All insertions / removals are signalled to the (single) model
+- All insertions / removals are signaled to the (single) model
- it is ok for the model to be slow.
- the model keeps track of (the number of) listeners, and does not do anyt=
hing unless there are any listeners (including walking the stack)
- RControlWindow will only be constructed on show, and destructed on hide,=
so as not to eat resources
diff --git a/rkward/rbackend/rdata.cpp b/rkward/rbackend/rdata.cpp
index e4a1f96e..f8cd8d02 100644
--- a/rkward/rbackend/rdata.cpp
+++ b/rkward/rbackend/rdata.cpp
@@ -34,7 +34,7 @@ RData::~RData () {
}
=
void RData::doAssert(RData::RDataType requested_type) const {
- RK_DEBUG (RBACKEND, DL_ERROR, "Reqeusted data of type %d, while %p has ty=
pe %d", requested_type, this, datatype);
+ RK_DEBUG (RBACKEND, DL_ERROR, "Requested data of type %d, while %p has ty=
pe %d", requested_type, this, datatype);
}
=
void RData::discardData () {
diff --git a/rkward/rbackend/rkrbackend.cpp b/rkward/rbackend/rkrbackend.cpp
index 4e879fd7..7cb1f54e 100644
--- a/rkward/rbackend/rkrbackend.cpp
+++ b/rkward/rbackend/rkrbackend.cpp
@@ -293,10 +293,10 @@ int RReadConsole (const char* prompt, unsigned char* =
buf, int buflen, int hist)
RKRBackend::this_pointer->runCommand (command);
RKRBackend::this_pointer->commandFinished ();
} else {
- // so, we are about to transmit a new user command, which is quite a =
complex endeavour...
+ // so, we are about to transmit a new user command, which is quite a =
complex endeavor...
/* Some words about running user commands:
- User commands can only be run at the top level of execution, not in=
any sub-stacks. But then, they should never get there, in the first place.
- - Handling user commands is totally different from all other commands=
, and relies on R's "REPL" (read-evaluate-print-loop). This is a whole bunc=
h of dedicated code, but there is no other way to achieve handling of comma=
nds as if they had been entered on a plain R console (incluing auto-printin=
g, and toplevel handlers). Most importantly, since important symbols are no=
t exported, such as R_Visible. Vice versa, it is not possible to treat all =
commands like user commands, esp. in substacks.
+ - Handling user commands is totally different from all other commands=
, and relies on R's "REPL" (read-evaluate-print-loop). This is a whole bunc=
h of dedicated code, but there is no other way to achieve handling of comma=
nds as if they had been entered on a plain R console (including auto-printi=
ng, and toplevel handlers). Most importantly, since important symbols are n=
ot exported, such as R_Visible. Vice versa, it is not possible to treat all=
commands like user commands, esp. in substacks.
=
Problems to deal with:
- R_ReadConsole serves a lot of different functions, including readin=
g in code, but also handling user input for readline() or browser(). This m=
akes it necessary to carefully track the current status using "repl_status"=
. You will find repl_status to be modified at a couple of different functio=
ns.
@@ -620,7 +620,7 @@ void RKRBackend::tryToDoEmergencySave () {
// Fortunately, if we are in the wrong thread, that probably means, the =
R thread did *not* crash, and will thus still be functional
this_pointer->killed =3D EmergencySaveThenExit;
RK_scheduleIntr ();
- for (int i =3D 0; i < 100; ++i) { // give it up to ten seconds to intte=
rrupt and exit the loop
+ for (int i =3D 0; i < 100; ++i) { // give it up to ten seconds to inter=
rupt and exit the loop
if (!this_pointer->r_running) break;
RKRBackendProtocolBackend::msleep (100);
}
@@ -907,7 +907,7 @@ SEXP doError (SEXP call) {
RKRBackend::repl_status.user_command_status =3D RKRBackend::RKReplStatus=
::UserCommandFailed;
}
if (RKRBackend::repl_status.interrupted) {
- // it is unlikely, but possible, that an interrupt signal was received, =
but the current command failed for some other reason, before processing was=
acutally interrupted. In this case, R_interrupts_pending if not yet cleare=
d.
+ // it is unlikely, but possible, that an interrupt signal was received, =
but the current command failed for some other reason, before processing was=
actually interrupted. In this case, R_interrupts_pending if not yet cleare=
d.
// NOTE: if R_interrupts_pending stops being exported one day, we might =
be able to use R_CheckUserInterrupt() inside an R_ToplevelExec() to find ou=
t, whether an interrupt was still pending.
if (!R_interrupts_pending) {
RKRBackend::repl_status.interrupted =3D false;
diff --git a/rkward/rbackend/rkrinterface.h b/rkward/rbackend/rkrinterface.h
index 15be279b..d7c666b4 100644
--- a/rkward/rbackend/rkrinterface.h
+++ b/rkward/rbackend/rkrinterface.h
@@ -98,7 +98,7 @@ private:
=
/** A list of all commands that have entered, and not yet left, the backen=
d thread */
QList all_current_commands;
-/** NOTE: processsing R events while waiting for the next command may, con=
ceivably, lead to new requests, which may also wait for sub-commands! Thus =
we keep a simple stack of requests. */
+/** NOTE: processing R events while waiting for the next command may, conc=
eivably, lead to new requests, which may also wait for sub-commands! Thus w=
e keep a simple stack of requests. */
QList command_requests;
RBackendRequest* currentCommandRequest () const { return (command_request=
s.isEmpty () ? 0 : command_requests.last ()); };
void tryNextCommand ();
diff --git a/rkward/rbackend/rkstructuregetter.cpp b/rkward/rbackend/rkstru=
cturegetter.cpp
index dada64ec..e569e395 100644
--- a/rkward/rbackend/rkstructuregetter.cpp
+++ b/rkward/rbackend/rkstructuregetter.cpp
@@ -372,7 +372,7 @@ void RKStructureGetter::getStructureWorker (SEXP val, c=
onst QString &name, int a
if (do_env) {
RK_DEBUG (RBACKEND, DL_DEBUG, "recurse into environment %s", name.toLat=
in1().data ());
if (!Rf_isEnvironment (value)) {
- // some classes (ReferenceClasses) are identified as envionments by is=
.environment(), but are not internally ENVSXPs.
+ // some classes (ReferenceClasses) are identified as environments by i=
s.environment(), but are not internally ENVSXPs.
// For these, Rf_findVar would fail.
REPROTECT (value =3D RKRSupport::callSimpleFun (as_environment_fun, va=
lue, R_GlobalEnv), value_index);
}
diff --git a/rkward/rbackend/rktransmitter.h b/rkward/rbackend/rktransmitte=
r.h
index 641615f9..b9ba2515 100644
--- a/rkward/rbackend/rktransmitter.h
+++ b/rkward/rbackend/rktransmitter.h
@@ -63,7 +63,7 @@ protected:
QLocalSocket *connection;
QString token;
private slots:
- /** Note: this blocks until a compelete request has been received. Connec=
ted to the "readyRead"-signal of the connection. Calls requestReceived() on=
ce the request has been read. */
+ /** Note: this blocks until a complete request has been received. Connect=
ed to the "readyRead"-signal of the connection. Calls requestReceived() onc=
e the request has been read. */
void fetchTransmission ();
void disconnected ();
private:
diff --git a/rkward/rbackend/rkwarddevice/rkgraphicsdevice_frontendtransmit=
ter.cpp b/rkward/rbackend/rkwarddevice/rkgraphicsdevice_frontendtransmitter=
.cpp
index 3de7c7b3..580e06f0 100644
--- a/rkward/rbackend/rkwarddevice/rkgraphicsdevice_frontendtransmitter.cpp
+++ b/rkward/rbackend/rkwarddevice/rkgraphicsdevice_frontendtransmitter.cpp
@@ -207,7 +207,7 @@ void RKGraphicsDeviceFrontendTransmitter::newData () {
// Actually, this is only needed once, but where to put it...
RKGraphicsDeviceFrontendTransmitter::lwdscale =3D desktop->physicalDp=
iX () / 96; // taken from devX11.c
} else {
- if (devnum) RK_DEBUG (GRAPHICS_DEVICE, DL_ERROR, "Received transmissi=
on of type %d for unknown device number %d. Skippping.", opcode, devnum+1);
+ if (devnum) RK_DEBUG (GRAPHICS_DEVICE, DL_ERROR, "Received transmissi=
on of type %d for unknown device number %d. Skipping.", opcode, devnum+1);
sendDummyReply (opcode);
}
continue;
@@ -338,7 +338,7 @@ void RKGraphicsDeviceFrontendTransmitter::newData () {
} else if (opcode =3D=3D RKDNewPageConfirm) {
device->confirmNewPage ();
} else {
- RK_DEBUG (GRAPHICS_DEVICE, DL_ERROR, "Unhandled operation of type %d fo=
r device number %d. Skippping.", opcode, devnum+1);
+ RK_DEBUG (GRAPHICS_DEVICE, DL_ERROR, "Unhandled operation of type %d fo=
r device number %d. Skipping.", opcode, devnum+1);
}
=
if (!streamer.instream.atEnd ()) {
diff --git a/rkward/rbackend/rkwarddevice/rkgraphicsdevice_stubs.cpp b/rkwa=
rd/rbackend/rkwarddevice/rkgraphicsdevice_stubs.cpp
index 03639821..f5428586 100644
--- a/rkward/rbackend/rkwarddevice/rkgraphicsdevice_stubs.cpp
+++ b/rkward/rbackend/rkwarddevice/rkgraphicsdevice_stubs.cpp
@@ -359,7 +359,7 @@ static void RKD_Close (pDevDesc dev) {
RKGraphicsDataStreamWriteGuard guard;
WRITE_HEADER (RKDClose, dev);
#ifdef _MSC_VER
- // Ok, this is a terribly crude HACK, obivously, and it's just waiting to=
come back to bite us. However:
+ // Ok, this is a terribly crude HACK, obviously, and it's just waiting to=
come back to bite us. However:
// We had to allocate the DevDesc in our own (MSVC-compiled) code (that's=
the way it is done), but if we allow R to delete
// it (also, as usual; in its MinGW-compiled code), we get a crash. Whate=
ver the _exact_ reason. So what we do here is
// reset R's pointer, and do the free, ourselves. Fortunately, we can do =
this, and fortunately, the pointer is no longer
diff --git a/rkward/rbackend/rpackages/rkward/NAMESPACE b/rkward/rbackend/r=
packages/rkward/NAMESPACE
index 724ba454..de54d453 100644
--- a/rkward/rbackend/rpackages/rkward/NAMESPACE
+++ b/rkward/rbackend/rpackages/rkward/NAMESPACE
@@ -18,7 +18,7 @@ export(.rk.fix.assignments.graphics)
export(.rk.get.environment.children)
export(.rk.get.installed.packages)
export(.rk.get.meta)
-export(.rk.get.package.intallation.state)
+export(.rk.get.package.installation.state)
export(.rk.get.search.results)
export(.rk.get.slots)
export(.rk.get.structure)
diff --git a/rkward/rbackend/rpackages/rkward/R/internal.R b/rkward/rbacken=
d/rpackages/rkward/R/internal.R
index 5250c8c5..1601bc13 100755
--- a/rkward/rbackend/rpackages/rkward/R/internal.R
+++ b/rkward/rbackend/rpackages/rkward/R/internal.R
@@ -155,7 +155,7 @@
# Gather status information on installed and available packages.
# Return value is used in class RKRPackageInstallationStatus of the fronte=
nd
#' @export
-".rk.get.package.intallation.state" <- function () {
+".rk.get.package.installation.state" <- function () {
# fetch all status information
available <- .rk.cached.available.packages ()
inst <- installed.packages (fields=3D"Title")
diff --git a/rkward/rkconsole.h b/rkward/rkconsole.h
index 98ad69d5..5b7f20de 100644
--- a/rkward/rkconsole.h
+++ b/rkward/rkconsole.h
@@ -119,7 +119,7 @@ friend class RKConsolePart;
/** This string stores the continuation prefix. */
QString iprefix;
=
-/** Create a proxy for the katepart action of the same name. The action is=
added to the actioncollection, automatically. Also any icon and label (but=
not shorcut) is copied.
+/** Create a proxy for the katepart action of the same name. The action is=
added to the actioncollection, automatically. Also any icon and label (but=
not shortcut) is copied.
@param actionName Identifier of the action in katepartui.rc and rkconsolep=
art.rc
@param label Label for the proxy action. If empty (default) copy the label=
from the katepartui
@returns a pointer to the proxy action */
diff --git a/rkward/rkward.h b/rkward/rkward.h
index a04cc8e6..64f6a99a 100644
--- a/rkward/rkward.h
+++ b/rkward/rkward.h
@@ -36,7 +36,7 @@ The main class of rkward. This is where all strings are t=
ied together, controls
class RKWardMainWindow : public KParts::MainWindow {
Q_OBJECT
public:
-/** construtor */
+/** constructor */
RKWardMainWindow ();
/** destructor */
~RKWardMainWindow ();
diff --git a/rkward/scriptbackends/qtscriptbackend.cpp b/rkward/scriptbacke=
nds/qtscriptbackend.cpp
index 5119b76f..cc9f8406 100644
--- a/rkward/scriptbackends/qtscriptbackend.cpp
+++ b/rkward/scriptbackends/qtscriptbackend.cpp
@@ -48,7 +48,7 @@ bool QtScriptBackend::initialize (RKComponentPropertyCode=
*code_property, bool a
RK_TRACE (PHP);
=
if (script_thread) {
- RK_DEBUG (PHP, DL_ERROR, "another template is already openend in this ba=
ckend");
+ RK_DEBUG (PHP, DL_ERROR, "another template is already opened in this bac=
kend");
return false;
}
=
diff --git a/rkward/settings/rksettingsmoduleobjectbrowser.cpp b/rkward/set=
tings/rksettingsmoduleobjectbrowser.cpp
index cc98d9ae..4c175326 100644
--- a/rkward/settings/rksettingsmoduleobjectbrowser.cpp
+++ b/rkward/settings/rksettingsmoduleobjectbrowser.cpp
@@ -43,7 +43,7 @@ RKSettingsModuleObjectBrowser::RKSettingsModuleObjectBrow=
ser (RKSettings *gui, Q
=
QVBoxLayout *layout =3D new QVBoxLayout (this);
=
- // Note: Up to RKWard 0.6.3, this settings module had a lot of additional=
checkboxes. Since 0.6.4, most settings are stored, implictily,
+ // Note: Up to RKWard 0.6.3, this settings module had a lot of additional=
checkboxes. Since 0.6.4, most settings are stored, implicitly,
// i.e. the Workspace Browser tool window "remembers" its latest se=
ttings (and so does the Varselector, separately). This modules
// is still responsible to storing / loading settings.
=
diff --git a/rkward/settings/rksettingsmoduleplugins.cpp b/rkward/settings/=
rksettingsmoduleplugins.cpp
index a04e9833..2439da0b 100644
--- a/rkward/settings/rksettingsmoduleplugins.cpp
+++ b/rkward/settings/rksettingsmoduleplugins.cpp
@@ -323,11 +323,11 @@ void RKSettingsModulePlugins::fixPluginMapLists () {
RK_TRACE (SETTINGS);
=
// Users who installed versions before 0.6.3, manually, are likely to hav=
e all.pluginmap left over. Let's handle this, on the fly.
- const QString obosolete_map =3D RKCommonFunctions::getRKWardDataDir () + =
"all.pluginmap";
+ const QString obsolete_map =3D RKCommonFunctions::getRKWardDataDir () + "=
all.pluginmap";
for (int i =3D 0; i < known_plugin_maps.size (); ++i) {
PluginMapStoredInfo &inf =3D known_plugin_maps[i];
QFileInfo info (inf.filename);
- if ((!info.isReadable ()) || (inf.filename =3D=3D obosolete_map)) {
+ if ((!info.isReadable ()) || (inf.filename =3D=3D obsolete_map)) {
known_plugin_maps.removeAt (i);
--i;
continue;
diff --git a/rkward/windows/rkcommandeditorwindow.cpp b/rkward/windows/rkco=
mmandeditorwindow.cpp
index f31a6069..e0d29772 100644
--- a/rkward/windows/rkcommandeditorwindow.cpp
+++ b/rkward/windows/rkcommandeditorwindow.cpp
@@ -847,9 +847,9 @@ void RKCommandEditorWindow::doRenderPreview () {
command =3D "if (!nzchar(Sys.which(\"pandoc\"))) {\n"
" output <- rk.set.output.html.file(%2, silent=3DTRUE)\n"
" rk.header (" + RObject::rQuote (i18n ("Pandoc is not instal=
led")) + ")\n"
- " rk.print (" + RObject::rQuote (i18n ("The software pand=
oc, required ot rendering R markdown files, is not installed, or not i=
n the system path of "
+ " rk.print (" + RObject::rQuote (i18n ("The software pand=
oc, required to rendering R markdown files, is not installed, or not i=
n the system path of "
"the running R session. You will need to instal=
l pandoc from https://pandoc.org/."
- "If is installed, but cannot be found, try addi=
ng it to the system path of the running R session at "
+ "If it is installed, but cannot be found, try a=
dding it to the system path of the running R session at "
"Setti=
ngs->Configure RKward->R-backend.")) + ")\n"
" rk.set.output.html.file(output, silent=3DTRUE)\n"
"} else {\n"
diff --git a/rkward/windows/rkhtmlwindow.cpp b/rkward/windows/rkhtmlwindow.=
cpp
index b7c94b80..f5f82589 100644
--- a/rkward/windows/rkhtmlwindow.cpp
+++ b/rkward/windows/rkhtmlwindow.cpp
@@ -67,7 +67,7 @@
#include "../debug.h"
=
// NOTE: According to an earlier note at this place, KIOIntegration used t=
o be very buggy around KF5 5.9.0. It seem to just work,
-// at 5.44.0, and the symptoms are probably not terible for earlier =
versions, so we use it here (allows us to render help:/-pages
+// at 5.44.0, and the symptoms are probably not terrible for earlier=
versions, so we use it here (allows us to render help:/-pages
// inside the help window.
RKWebPage::RKWebPage (RKHTMLWindow* window): KWebPage (window, KPartsInteg=
ration | KIOIntegration) {
RK_TRACE (APP);
diff --git a/rkward/windows/rkwindowcatcher.cpp b/rkward/windows/rkwindowca=
tcher.cpp
index 10afba5c..84750933 100644
--- a/rkward/windows/rkwindowcatcher.cpp
+++ b/rkward/windows/rkwindowcatcher.cpp
@@ -377,7 +377,7 @@ void RKCaughtX11Window::setWindowStyleHint (const QStri=
ng& hint) {
void RKCaughtX11Window::forceClose () {
killed_in_r =3D true;
if (embedded) {
- // HACK: Somehow (R 3.0.0alpha), the X11() window is surpisingly die-har=
d, if it is not closed "the regular way".
+ // HACK: Somehow (R 3.0.0alpha), the X11() window is surprisingly die-ha=
rd, if it is not closed "the regular way".
// So we expurge it, and leave the rest to the user.
embedded->setParent (0);
qApp->processEvents ();
diff --git a/rkward/windows/rkwindowcatcher.h b/rkward/windows/rkwindowcatc=
her.h
index 5bdf7554..07f45934 100644
--- a/rkward/windows/rkwindowcatcher.h
+++ b/rkward/windows/rkwindowcatcher.h
@@ -49,7 +49,7 @@ Catch R X11 device windows
- notify app right before device is created
- notify app right after device is created
- least preferable solution as we can not be sure we catch every use.
- - but definitely most. This is dispatched via CurrentDevice ()->options(=
"device"), and then evalued in R_GlobalEnv
+ - but definitely most. This is dispatched via CurrentDevice ()->options(=
"device"), and then evaluated in R_GlobalEnv
- remaining problem: how to get the window id given the device id?
- http://tronche.com/gui/x/xlib/events/window-state-change/create.html#XC=
reateWindowEvent
- for active / inactive: XPropertyEvent WM_NAME
diff --git a/rkward/windows/rkworkplace.cpp b/rkward/windows/rkworkplace.cpp
index 3988da86..81984175 100644
--- a/rkward/windows/rkworkplace.cpp
+++ b/rkward/windows/rkworkplace.cpp
@@ -258,7 +258,7 @@ void RKWorkplace::addWindow (RKMDIWindow *window, bool =
attached) {
break;
}
}
- if (pos < 0) { // not yet known: implicit registration -> create corre=
sponing named_window_spec on the fly.
+ if (pos < 0) { // not yet known: implicit registration -> create corre=
sponding named_window_spec on the fly.
registerNamedWindow (window_name_override, 0, attached ? RKWardMainWind=
ow::getMain () : 0);
pos =3D named_windows.size () - 1;
}
diff --git a/rkward/windows/rkworkplaceview.cpp b/rkward/windows/rkworkplac=
eview.cpp
index 04d76728..2200f5da 100644
--- a/rkward/windows/rkworkplaceview.cpp
+++ b/rkward/windows/rkworkplaceview.cpp
@@ -367,7 +367,7 @@ void RKWorkplaceView::splitView (Qt::Orientation orient=
ation, const QString &des
if (splitter->count () =3D=3D 1) {
splitter->setOrientation (orientation);
}
- if (splitter->orientation () =3D=3D orientation) { // not the same as ab=
ove: Also, if an existing larger splitter is suitably oriented, arleady
+ if (splitter->orientation () =3D=3D orientation) { // not the same as ab=
ove: Also, if an existing larger splitter is suitably oriented, already
// First calculate the size of the new and the old elements.
// This is not pixel perfect, but reasonably close.
for (int i =3D sizes.count () - 1; i >=3D 0; --i) {
diff --git a/rkward/windows/rkworkplaceview.h b/rkward/windows/rkworkplacev=
iew.h
index 2d0ab0e0..2f0f6c2b 100644
--- a/rkward/windows/rkworkplaceview.h
+++ b/rkward/windows/rkworkplaceview.h
@@ -33,7 +33,7 @@ private:
explicit RKWorkplaceViewPane (RKWorkplaceView *parent);
~RKWorkplaceViewPane ();
RKWorkplaceView* workplace_view;
-/** Close a page given the correspoding widget */
+/** Close a page given the corresponding widget */
void closePage (QWidget* page);
/** Close a page given its index */
void closePage (int page);