[education/rkward] /: Fix minor typos
Yuri Chornoivan
null at kde.org
Sun Sep 27 06:58:36 BST 2020
Git commit fb4a7f1a17b7118e239240db73d8e47178b0cf14 by Yuri Chornoivan.
Committed on 27/09/2020 at 05:58.
Pushed by yurchor into branch 'master'.
Fix minor typos
M +1 -1 ChangeLog
M +2 -2 doc/rkwardplugins/index.docbook
M +1 -1 rkward/agents/rkprintagent.cpp
M +1 -1 rkward/agents/rkquitagent.h
M +1 -1 rkward/core/rkvariable.cpp
M +1 -1 rkward/core/robject.cpp
M +1 -1 rkward/dataeditor/rkvareditmodel.cpp
M +1 -1 rkward/dialogs/rksetupwizard.cpp
M +2 -2 rkward/main.cpp
M +1 -1 rkward/misc/rkaccordiontable.cpp
M +1 -1 rkward/misc/rkxmlguipreviewarea.h
M +1 -1 rkward/plugin/rkcomponent.cpp
M +1 -1 rkward/plugin/rkcomponent.h
M +1 -1 rkward/rbackend/rkrbackend.cpp
M +1 -1 rkward/rbackend/rkrbackend.h
M +1 -1 rkward/rbackend/rkrinterface.h
M +1 -1 rkward/rbackend/rkwarddevice/rkgraphicsdevice_stubs.cpp
M +1 -1 rkward/rbackend/rpackages/rkward/R/rk.utility-functions.R
M +1 -1 rkward/rbackend/rpackages/rkward/man/rk.adjust.system.path.Rd
M +1 -1 rkward/rkconsole.cpp
M +3 -3 rkward/windows/rkcodecompletion.cpp
M +1 -1 rkward/windows/rkworkplace.h
https://invent.kde.org/education/rkward/commit/fb4a7f1a17b7118e239240db73d8e47178b0cf14
diff --git a/ChangeLog b/ChangeLog
index 0d8bfa4d..a3150d95 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -36,7 +36,7 @@
- Fixed: max.print option was not saved, correctly, when set from RKWard settings
- Add command-line option --autoreuse to avoid shipping two separate .desktop files
- <select> elements in plugin dialogs can be set to accept only a single selection
-- New R functions rk.capture.output() and and rk.end.capture.output()
+- New R functions rk.capture.output() and rk.end.capture.output()
- Allow to reference current script file in plugins
- Add various live-preview options for R scripts, including a preview of R markdown rendering
- Make it possible to "link" to specific settings pages from the internal documentation
diff --git a/doc/rkwardplugins/index.docbook b/doc/rkwardplugins/index.docbook
index 22e62387..041eb375 100644
--- a/doc/rkwardplugins/index.docbook
+++ b/doc/rkwardplugins/index.docbook
@@ -1990,8 +1990,8 @@ x </components ...>
For &rkward;'s &XML; files, i18n will mostly just work. If you are writing your own <command>.pluginmap</command> (⪚ for an <link linkend="external_plugins">external plugin</link>),
you will have to specify a <replaceable>po_id</replaceable> next to the pluginmap's <replaceable>id</replaceable>. This defines the "message catalog" to use. In general this should
be set identical to the <replaceable>id</replaceable> of your <command>.pluginmap</command>, but if you provide several related <command>.pluginmap</command>s in a single package, you will
- probaly want to specify a common <replaceable>po_id</replaceable> in your maps. The <replaceable>po_id</replaceable> of a <command>.pluginmap</command> file is inherited by all plugins
- declared in it, unless unless that declares a different <replaceable>po_id</replaceable>.
+ probably want to specify a common <replaceable>po_id</replaceable> in your maps. The <replaceable>po_id</replaceable> of a <command>.pluginmap</command> file is inherited by all plugins
+ declared in it, unless that declares a different <replaceable>po_id</replaceable>.
</para>
<para>
For plugins and help pages, you do not need to tell &rkward; which strings are to be translated, because that is generally evident from their usage. However, as explained above,
diff --git a/rkward/agents/rkprintagent.cpp b/rkward/agents/rkprintagent.cpp
index 35d22b7a..41f6e4d4 100644
--- a/rkward/agents/rkprintagent.cpp
+++ b/rkward/agents/rkprintagent.cpp
@@ -70,7 +70,7 @@ void RKPrintAgent::printPostscript (const QString &file, bool delete_file) {
}
if (!provider) {
- RK_DEBUG (APP, DL_WARNING, "No valid postscript postscript provider was found");
+ RK_DEBUG (APP, DL_WARNING, "No valid postscript provider was found");
KMessageBox::sorry (RKWardMainWindow::getMain (), i18n ("No service was found to provide a KDE print dialog for PostScript files. We will try to open a generic PostScript viewer (if any), instead.<br><br>Consider installing 'okular', or configure RKWard not to attempt to print using a KDE print dialog."), i18n ("Unable to open KDE print dialog"));
// fallback: If we can't find a proper part, try to invoke a standalone PS reader, instead
#if KIO_VERSION < QT_VERSION_CHECK(5, 31, 0)
diff --git a/rkward/agents/rkquitagent.h b/rkward/agents/rkquitagent.h
index c620496c..bce3c678 100644
--- a/rkward/agents/rkquitagent.h
+++ b/rkward/agents/rkquitagent.h
@@ -28,7 +28,7 @@ class RKProgressControl;
class RKQuitAgent : public QObject, public RCommandReceiver {
Q_OBJECT
public:
-/** Constructor. As soon as you contruct an object of this type, the RKWard application *will* quit (but maybe with a short delay)! */
+/** Constructor. As soon as you construct an object of this type, the RKWard application *will* quit (but maybe with a short delay)! */
explicit RKQuitAgent (QObject *parent);
~RKQuitAgent ();
diff --git a/rkward/core/rkvariable.cpp b/rkward/core/rkvariable.cpp
index b8d6d9a6..53f201f7 100644
--- a/rkward/core/rkvariable.cpp
+++ b/rkward/core/rkvariable.cpp
@@ -79,7 +79,7 @@ void RKVariable::setVarType (RObject::RDataType new_type, bool sync) {
setDataType (new_type);
allocateEditData ();
- // re-set presistent aspects of the edit data
+ // re-set persistent aspects of the edit data
data->value_labels = value_labels;
data->formatting_options = formatting_options;
data->num_listeners = num_listeners;
diff --git a/rkward/core/robject.cpp b/rkward/core/robject.cpp
index d6807e60..b25fcb1a 100644
--- a/rkward/core/robject.cpp
+++ b/rkward/core/robject.cpp
@@ -202,7 +202,7 @@ void RObject::writeMetaData (RCommandChain *chain) {
if (meta_map->isEmpty ()) {
map_string.append ("NULL");
- delete meta_map; // now that is is synced, delete it
+ delete meta_map; // now that it is synced, delete it
meta_map = 0;
} else {
for (MetaMap::const_iterator it = meta_map->constBegin (); it != meta_map->constEnd (); ++it) {
diff --git a/rkward/dataeditor/rkvareditmodel.cpp b/rkward/dataeditor/rkvareditmodel.cpp
index 9ade266c..edd1b466 100644
--- a/rkward/dataeditor/rkvareditmodel.cpp
+++ b/rkward/dataeditor/rkvareditmodel.cpp
@@ -160,7 +160,7 @@ void RKVarEditModel::objectDataChanged (RObject* object, const RObject::ChangeSe
RK_TRACE (EDITOR);
int cindex = objects.indexOf (static_cast<RKVariable*> (object)); // no check for isVariable needed. we only need to look up, if we have this object, and where.
- if (cindex < 0) return; // none of our buisiness
+ if (cindex < 0) return; // none of our business
RK_ASSERT (changes);
diff --git a/rkward/dialogs/rksetupwizard.cpp b/rkward/dialogs/rksetupwizard.cpp
index 91fcf4f8..b14e06ec 100644
--- a/rkward/dialogs/rksetupwizard.cpp
+++ b/rkward/dialogs/rksetupwizard.cpp
@@ -164,7 +164,7 @@ RKSetupWizard::RKSetupWizard(QWidget* parent, InvokationReason reason, const QLi
pluginmaps->addOption(i18n("Restore defaults"), i18n("Enable the default plugins"), [](RKSetupWizard*) { RKSettingsModulePlugins::registerDefaultPluginMaps(RKSettingsModulePlugins::AddIfDefault); });
pluginmaps->addOption(i18n("No change"), i18n("Proceed without plugins"), [](RKSetupWizard*) {});
- // TODO: Also offer help, if a suspicioulsy small share of plugins is active? RKSettingsModulePlugins::knownUsablePluginCount();
+ // TODO: Also offer help, if a suspiciously small share of plugins is active? RKSettingsModulePlugins::knownUsablePluginCount();
} else {
pluginmaps->setStatus(RKSetupWizardItem::Good, i18n("Found."));
}
diff --git a/rkward/main.cpp b/rkward/main.cpp
index 36b52718..8eafd25c 100644
--- a/rkward/main.cpp
+++ b/rkward/main.cpp
@@ -240,7 +240,7 @@ QString resolveRSpecOrFail (QString input, QString message) {
int main (int argc, char *argv[]) {
RK_Debug::RK_Debug_Level = DL_WARNING;
#ifndef NO_QT_WEBENGINE
- // annoingly, QWebEngineUrlSchemes have to be registered before creating the app.
+ // annoyingly, QWebEngineUrlSchemes have to be registered before creating the app.
QWebEngineUrlScheme scheme("help");
scheme.setSyntax (QWebEngineUrlScheme::Syntax::Path);
scheme.setFlags (QWebEngineUrlScheme::LocalScheme|QWebEngineUrlScheme::LocalAccessAllowed);
@@ -264,7 +264,7 @@ int main (int argc, char *argv[]) {
aboutData.addAuthor (i18n ("Stefan Roediger"), i18n ("Many plugins, suggestions, marketing, translations"));
aboutData.addCredit (i18n ("Contributors in alphabetical order"));
aboutData.addCredit (i18n ("Björn Balazs"), i18n ("Extensive usability feedback"));
- aboutData.addCredit (i18n ("Aaron Batty"), i18n ("Whealth of feedback, hardware donations"));
+ aboutData.addCredit (i18n ("Aaron Batty"), i18n ("Wealth of feedback, hardware donations"));
aboutData.addCredit (i18n ("Jan Dittrich"), i18n ("Extensive usability feedback"));
aboutData.addCredit (i18n ("Philippe Grosjean"), i18n ("Several helpful comments and discussions"));
aboutData.addCredit (i18n ("Adrien d'Hardemare"), i18n ("Plugins and patches"));
diff --git a/rkward/misc/rkaccordiontable.cpp b/rkward/misc/rkaccordiontable.cpp
index 5ef8f7cb..5ff958c8 100644
--- a/rkward/misc/rkaccordiontable.cpp
+++ b/rkward/misc/rkaccordiontable.cpp
@@ -292,7 +292,7 @@ RKAccordionTable::~RKAccordionTable () {
void RKAccordionTable::drawRow (QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const {
if (index.parent ().isValid ()) { // must be the editor widget
- painter->fillRect (option.rect, palette ().background ()); // fill to paper over any padding around the widget (whereever it comes from)
+ painter->fillRect (option.rect, palette ().background ()); // fill to paper over any padding around the widget (wherever it comes from)
QTreeView::drawRow (painter, option, index);
painter->drawLine (option.rect.bottomLeft (), option.rect.bottomRight ());
} else {
diff --git a/rkward/misc/rkxmlguipreviewarea.h b/rkward/misc/rkxmlguipreviewarea.h
index f1d05ddf..c185a96e 100644
--- a/rkward/misc/rkxmlguipreviewarea.h
+++ b/rkward/misc/rkxmlguipreviewarea.h
@@ -38,7 +38,7 @@ public:
void setLabel (const QString &label);
protected:
/** build / destroy menu, when child is added removed. Note that we are in the fortunate situation that RKMDIWindow-children only ever get to the
- * preview area via reparenting, i.e. contrary to usual QEvent::ChildAdded semnatics, they are always fully constructed, when added. */
+ * preview area via reparenting, i.e. contrary to usual QEvent::ChildAdded semantics, they are always fully constructed, when added. */
void childEvent (QChildEvent *event) override;
protected slots:
void prepareMenu ();
diff --git a/rkward/plugin/rkcomponent.cpp b/rkward/plugin/rkcomponent.cpp
index 167191b7..93efac3c 100644
--- a/rkward/plugin/rkcomponent.cpp
+++ b/rkward/plugin/rkcomponent.cpp
@@ -334,7 +334,7 @@ void RKComponent::updateEnablednessRecursive (bool parent_enabled) {
bool RKComponent::isInactive () {
if (!isEnabled ()) return true;
- if (parentWidget () && isHidden ()) return true; // Note: Components embedded as button may be "hidden" without being inaccessible
+ if (parentWidget () && isHidden ()) return true; // Note: Components embedded as button may be "hidden" without being unaccessible
if (!visibility_property->boolValue ()) return true; // Note for those, this is the appropriate check
return false;
}
diff --git a/rkward/plugin/rkcomponent.h b/rkward/plugin/rkcomponent.h
index 0a3da042..79b333dc 100644
--- a/rkward/plugin/rkcomponent.h
+++ b/rkward/plugin/rkcomponent.h
@@ -115,7 +115,7 @@ public:
/** currently valid? default implementation always returns true. @see recursiveStatus()
* 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 implicitly not satisfied, if any of its children are not satisfied.
+ * @note: A component will be "satisfied" even when invalid, if it is not required. Also, a required component is implicitly not satisfied, if any of its children are not satisfied.
* In general, use isSatisfied() to query the status of components, not isValid(). */
virtual bool isValid () { return true; };
/** set to required: will only be satisfied if it is valid (and all it's children). Else: always satisfied (but subclasses might override to always be dissatisfied on really bad values. By default RKComponentBase is required at construction */
diff --git a/rkward/rbackend/rkrbackend.cpp b/rkward/rbackend/rkrbackend.cpp
index c5482013..a16936c7 100644
--- a/rkward/rbackend/rkrbackend.cpp
+++ b/rkward/rbackend/rkrbackend.cpp
@@ -546,7 +546,7 @@ void RCleanUp (SA_TYPE saveact, int status, int RunLast) {
if (RKRBackend::this_pointer->killed == RKRBackend::AlreadyDead) return; // Nothing to clean up
if (!RKRBackend::this_pointer->r_running) return; // prevent recursion (if an error occurs, here, we get jumped to the console repl, again!)
- R_CheckUserInterrupt (); // if there are any user interrupts pendinging, we want them handled *NOW*
+ R_CheckUserInterrupt (); // if there are any user interrupts pending, we want them handled *NOW*
RKRBackend::this_pointer->r_running = false;
// we could be in a signal handler, and the stack base may have changed.
diff --git a/rkward/rbackend/rkrbackend.h b/rkward/rbackend/rkrbackend.h
index 2ca555be..8f101888 100644
--- a/rkward/rbackend/rkrbackend.h
+++ b/rkward/rbackend/rkrbackend.h
@@ -135,7 +135,7 @@ handleHistoricalSubstackRequest(). Exactly which requests get handled by which f
EmergencySaveThenExit = 2,
AlreadyDead = 3
} killed;
-/** "Kills" the backend. Actually this just tells the thread that is is about to be terminated. Allows the thread to terminate gracefully */
+/** "Kills" the backend. Actually this just tells the thread that it is about to be terminated. Allows the thread to terminate gracefully */
void kill () { killed = ExitNow; };
bool isKilled () { return (killed != NotKilled); };
diff --git a/rkward/rbackend/rkrinterface.h b/rkward/rbackend/rkrinterface.h
index 478ecdd7..bd3d8cad 100644
--- a/rkward/rbackend/rkrinterface.h
+++ b/rkward/rbackend/rkrinterface.h
@@ -264,7 +264,7 @@ So far we've discussed RInterface:issueCommand () and RCommandReceiver::rCommand
First the RCommand is placed in a first-in-first-out stack. This stack is needed, since - as discussed - the commands get executed in a separate thread, so several command may get stacked up, before the first one gets run.
-Then, in the backend thread (RThread) there is a loop running, which fetches those commands from the stack and executes them one by one. Whenver a command has been executed in this thread, it gets updated with information on any errors that occurred and of course also with the result of running the command. Next, a QCustomEvent is being posted. What this does is - rougly speaking -, transfer the pointer to the command back to the main thread in a safe way.
+Then, in the backend thread (RThread) there is a loop running, which fetches those commands from the stack and executes them one by one. Whenever a command has been executed in this thread, it gets updated with information on any errors that occurred and of course also with the result of running the command. Next, a QCustomEvent is being posted. What this does is - rougly speaking -, transfer the pointer to the command back to the main thread in a safe way.
Whenever the main thread becomes active again, it will find that QCustomEvent and handle it in RInterface::customEvent.
diff --git a/rkward/rbackend/rkwarddevice/rkgraphicsdevice_stubs.cpp b/rkward/rbackend/rkwarddevice/rkgraphicsdevice_stubs.cpp
index f5428586..716a9511 100644
--- a/rkward/rbackend/rkwarddevice/rkgraphicsdevice_stubs.cpp
+++ b/rkward/rbackend/rkwarddevice/rkgraphicsdevice_stubs.cpp
@@ -400,7 +400,7 @@ static void RKD_Mode (int mode, pDevDesc dev) {
RKGraphicsDataStreamWriteGuard guard;
RKD_OUT_STREAM << WRITE_HEADER (RKDMode, dev);
- connectoin << (qint8) mode; */
+ connection << (qint8) mode; */
}
static void RKD_Raster (unsigned int *raster, int w, int h, double x, double y, double width, double height, double rot, Rboolean interpolate, const pGEcontext gc, pDevDesc dev) {
diff --git a/rkward/rbackend/rpackages/rkward/R/rk.utility-functions.R b/rkward/rbackend/rpackages/rkward/R/rk.utility-functions.R
index d39dad33..cd51008d 100644
--- a/rkward/rbackend/rpackages/rkward/R/rk.utility-functions.R
+++ b/rkward/rbackend/rpackages/rkward/R/rk.utility-functions.R
@@ -180,7 +180,7 @@
#' Add one or more paths to the filesystem search path used in this session
#'
-#' Add the given path to to the "PATH" environment variable of the running R session. This
+#' Add the given path to the "PATH" environment variable of the running R session. This
#' can be useful to make sure external binaries are found by Sys.which. Paths are normalized
#' before being added, and duplicates are stripped from the path.
#'
diff --git a/rkward/rbackend/rpackages/rkward/man/rk.adjust.system.path.Rd b/rkward/rbackend/rpackages/rkward/man/rk.adjust.system.path.Rd
index 6de1941b..e0a8821d 100644
--- a/rkward/rbackend/rpackages/rkward/man/rk.adjust.system.path.Rd
+++ b/rkward/rbackend/rpackages/rkward/man/rk.adjust.system.path.Rd
@@ -13,7 +13,7 @@ rk.adjust.system.path(add)
A vector of the directories in the file sytem path after the adjustment
}
\description{
-Add the given path to to the "PATH" environment variable of the running R session. This
+Add the given path to the "PATH" environment variable of the running R session. This
can be useful to make sure external binaries are found by Sys.which. Paths are normalized
before being added, and duplicates are stripped from the path.
}
diff --git a/rkward/rkconsole.cpp b/rkward/rkconsole.cpp
index 54c152db..f9572fd8 100644
--- a/rkward/rkconsole.cpp
+++ b/rkward/rkconsole.cpp
@@ -419,7 +419,7 @@ bool RKConsole::eventFilter (QObject *o, QEvent *e) {
return true;
} else {
if (e->type () == QEvent::DragMove) {
- // Not sure why this is needed, here, but without this, the move will remain permanently inacceptable,
+ // Not sure why this is needed, here, but without this, the move will remain permanently unacceptable,
// once it has been ignored, above, once. KF5 5.9.0
e->accept ();
// But also _not_ filtering it.
diff --git a/rkward/windows/rkcodecompletion.cpp b/rkward/windows/rkcodecompletion.cpp
index 32845229..fe4f87b7 100644
--- a/rkward/windows/rkcodecompletion.cpp
+++ b/rkward/windows/rkcodecompletion.cpp
@@ -75,7 +75,7 @@ RKCompletionManager::RKCompletionManager(KTextEditor::View* view, const RKCodeCo
file_completion_model = new RKFileCompletionModel (this);
callhint_model = new RKCallHintModel (this);
arghint_model = new RKArgumentHintModel (this);
- cc_iface->registerCompletionModel (new RKCompletionNotifierModel (this)); // (at least) one model needs to be registerd, so we will know, when completion was triggered by the user (shortcut)
+ cc_iface->registerCompletionModel (new RKCompletionNotifierModel (this)); // (at least) one model needs to be registered, so we will know, when completion was triggered by the user (shortcut)
completion_timer = new QTimer (this);
completion_timer->setSingleShot (true);
connect (completion_timer, &QTimer::timeout, this, &RKCompletionManager::tryCompletion);
@@ -394,7 +394,7 @@ bool RKCompletionManager::eventFilter (QObject*, QEvent* event) {
if (k->key () == Qt::Key_Tab && (!k->modifiers ())) {
// Try to do partial completion. Unfortunately, the base implementation in ktexteditor is totally broken (inserts the whole partial completion, without removing the start).
// TODO: It is not quite clear, what behavior is desirable, in case more than one completion model is active at a time.
- // For now, we use the simplest solution (implemenation-wise), and complete from the topmost-model, only
+ // For now, we use the simplest solution (implementation-wise), and complete from the topmost-model, only
// TODO: Handle the ktexteditor builtin models, too.
bool exact = false;
QString comp;
@@ -569,7 +569,7 @@ QVariant RKCodeCompletionModel::data (const QModelIndex& index, int role) const
QString findCommonCompletion (const QStringList &list, const QString &lead, bool *exact_match) {
RK_TRACE (COMMANDEDITOR);
- RK_DEBUG(COMMANDEDITOR, DL_DEBUG, "Looking for commong completion among set of %d, starting with %s", list.size (), qPrintable (lead));
+ RK_DEBUG(COMMANDEDITOR, DL_DEBUG, "Looking for common completion among set of %d, starting with %s", list.size (), qPrintable (lead));
*exact_match = true;
QString ret;
diff --git a/rkward/windows/rkworkplace.h b/rkward/windows/rkworkplace.h
index 30cdfa20..6eeddce4 100644
--- a/rkward/windows/rkworkplace.h
+++ b/rkward/windows/rkworkplace.h
@@ -107,7 +107,7 @@ public:
/** Attach an already created window. */
void attachWindow (RKMDIWindow *window);
-/** Dettach a window (it is removed from the view (), and placed in a top-level DetachedWindowContainer instead. */
+/** Detouch a window (it is removed from the view (), and placed in a top-level DetachedWindowContainer instead. */
void detachWindow (RKMDIWindow *window, bool was_attached=true);
/** @returns a pointer to the current window. state specifies, which windows should be considered. */
RKMDIWindow *activeWindow (RKMDIWindow::State state);
More information about the rkward-tracker
mailing list