[rkward-cvs] [rkward] /: Fix some EBN issues
Yuri Chornoivan
yurchor at ukr.net
Sat Nov 22 16:55:32 UTC 2014
Git commit 87536b353cc6023eebabd9f83d3e5eb841a8e176 by Yuri Chornoivan.
Committed on 22/11/2014 at 16:55.
Pushed by yurchor into branch 'master'.
Fix some EBN issues
M +1 -1 CMakeLists.txt
M +1 -1 rkward/core/rkpseudoobjects.cpp
M +1 -1 rkward/core/rkpseudoobjects.h
M +1 -1 rkward/icons/app-icon/CMakeLists.txt
M +1 -1 rkward/misc/editlabelsdialog.h
M +1 -1 rkward/misc/rkcommandhistory.h
M +1 -1 rkward/misc/rkjobsequence.h
M +1 -1 rkward/misc/rkxmlguisyncer.h
M +1 -1 rkward/rbackend/rkrbackend.cpp
M +1 -1 rkward/rbackend/rkrbackend.h
M +1 -1 rkward/rbackend/rkrbackendprotocol_backend.cpp
M +1 -1 rkward/rbackend/rkstructuregetter.cpp
M +2 -2 rkward/rbackend/rkwarddevice/rkgraphicsdevice_protocol_shared.h
M +1 -1 rkward/rbackend/rkwarddevice/rkgraphicsdevice_setup.cpp
M +1 -1 rkward/rbackend/rkwarddevice/rkgraphicsdevice_stubs.cpp
M +1 -1 rkward/rkconsole.cpp
M +1 -1 rkward/rkward.desktop
M +2 -2 rkward/rkward.h
M +2 -2 rkward/rkward_startup_wrapper.cpp
M +1 -1 rkward/scriptbackends/qtscriptbackend.h
M +1 -1 rkward/windows/rkcommandeditorwindow.cpp
M +1 -1 rkward/windows/rkdebugmessagewindow.cpp
M +1 -1 rkward/windows/rktoolwindowbar.h
http://commits.kde.org/rkward/87536b353cc6023eebabd9f83d3e5eb841a8e176
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0df40fd..218b1b7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,4 +25,4 @@ ADD_SUBDIRECTORY(i18n)
ADD_SUBDIRECTORY(doc)
ADD_SUBDIRECTORY(tests)
-# TODO: figure out how to make source distributions (with REAMDE files, etc.)
+# TODO: figure out how to make source distributions (with README files, etc.)
diff --git a/rkward/core/rkpseudoobjects.cpp b/rkward/core/rkpseudoobjects.cpp
index 26f2c6a..e15d56c 100644
--- a/rkward/core/rkpseudoobjects.cpp
+++ b/rkward/core/rkpseudoobjects.cpp
@@ -115,7 +115,7 @@ void RKOrphanNamespacesObject::updateFromR (RCommandChain* chain) {
void RKOrphanNamespacesObject::updateFromR (RCommandChain* chain, const QStringList& current_symbols) {
RK_TRACE (OBJECTS);
- Q_UNUSED (chain); // becuase the namespace objects themselves are not updated, only added as incomplete objects
+ Q_UNUSED (chain); // because the namespace objects themselves are not updated, only added as incomplete objects
// which former children are missing?
for (int i = childmap.size () - 1; i >= 0; --i) {
diff --git a/rkward/core/rkpseudoobjects.h b/rkward/core/rkpseudoobjects.h
index 9efe324..cf4bea3 100644
--- a/rkward/core/rkpseudoobjects.h
+++ b/rkward/core/rkpseudoobjects.h
@@ -64,7 +64,7 @@ class RObjectList;
This class represents the list of namespace environments which are loaded, but do not belong to a package on the search path.
(TODO: Actually, we should relax the assumption that objects can only be at one place in the hierarchy, and turn this into a list of
-all namespace environemnts!)
+all namespace environments!)
It exists only once, as a direct child of the RObjectList.
diff --git a/rkward/icons/app-icon/CMakeLists.txt b/rkward/icons/app-icon/CMakeLists.txt
index 59abf1f..7071361 100644
--- a/rkward/icons/app-icon/CMakeLists.txt
+++ b/rkward/icons/app-icon/CMakeLists.txt
@@ -1 +1 @@
-KDE4_INSTALL_ICONS(${ICON_INSTALL_DIR})
\ No newline at end of file
+KDE4_INSTALL_ICONS(${ICON_INSTALL_DIR})
diff --git a/rkward/misc/editlabelsdialog.h b/rkward/misc/editlabelsdialog.h
index edcdff8..4c9a264 100644
--- a/rkward/misc/editlabelsdialog.h
+++ b/rkward/misc/editlabelsdialog.h
@@ -75,7 +75,7 @@ Allows editing of value labels / factor levels for an RKVariable. Use EditLabels
class EditLabelsDialog : public KDialog {
protected:
friend class EditLabelsDialogProxy;
-/** constuctor., the variable to work on.
+/** constructor., the variable to work on.
@param parent a QWidget parent */
EditLabelsDialog (QWidget *parent, const RObject::ValueLabels& labels, const QString& varname);
diff --git a/rkward/misc/rkcommandhistory.h b/rkward/misc/rkcommandhistory.h
index 5bd6470..f5ea0fa 100644
--- a/rkward/misc/rkcommandhistory.h
+++ b/rkward/misc/rkcommandhistory.h
@@ -44,4 +44,4 @@ private:
QStringList history;
};
-#endif
\ No newline at end of file
+#endif
diff --git a/rkward/misc/rkjobsequence.h b/rkward/misc/rkjobsequence.h
index a36f647..9cf3358 100644
--- a/rkward/misc/rkjobsequence.h
+++ b/rkward/misc/rkjobsequence.h
@@ -44,4 +44,4 @@ private:
QStringList _errors;
};
-#endif
\ No newline at end of file
+#endif
diff --git a/rkward/misc/rkxmlguisyncer.h b/rkward/misc/rkxmlguisyncer.h
index 966518f..6cfb212 100644
--- a/rkward/misc/rkxmlguisyncer.h
+++ b/rkward/misc/rkxmlguisyncer.h
@@ -36,7 +36,7 @@ public:
/** You can use this function to receive a signal, when an KXMLGUIClient's ui.rc file has been reloaded (after the reload, before the factory is told to rebuild).
@param watched_client The client to monitor. This needs to be registered using watchXMLGUIClientUIrc, first.
@param receiver QObject to receive notification
- @param method slot to recieve notification. This needs to have the signature
+ @param method slot to receive notification. This needs to have the signature
\code
void someSlotName (KXMLGUIClient *changed_client);
\endcode
diff --git a/rkward/rbackend/rkrbackend.cpp b/rkward/rbackend/rkrbackend.cpp
index 963a87d..3776295 100644
--- a/rkward/rbackend/rkrbackend.cpp
+++ b/rkward/rbackend/rkrbackend.cpp
@@ -467,7 +467,7 @@ void RWriteConsoleEx (const char *buf, int buflen, int type) {
RKRBackend::repl_status.user_command_status = RKRBackend::RKReplStatus::UserCommandSyntaxError;
}
} else if (RKRBackend::repl_status.user_command_status == RKRBackend::RKReplStatus::ReplIterationKilled) {
- // purge superflous newlines and empty output
+ // purge superfluous newlines and empty output
return;
} else {
RK_ASSERT (RKRBackend::repl_status.user_command_status != RKRBackend::RKReplStatus::NoUserCommand);
diff --git a/rkward/rbackend/rkrbackend.h b/rkward/rbackend/rkrbackend.h
index 499f399..9cab5fa 100644
--- a/rkward/rbackend/rkrbackend.h
+++ b/rkward/rbackend/rkrbackend.h
@@ -213,7 +213,7 @@ private:
QStringList toplevel_env_names;
/** A copy of the names of the toplevel symbols in the .GlobalEnv. */
QStringList global_env_toplevel_names;
-/** check wether the object list / global environment / individual symbols have changed, and updates them, if needed */
+/** check whether the object list / global environment / individual symbols have changed, and updates them, if needed */
void checkObjectUpdatesNeeded (bool check_list);
/** The previously executed command. Only non-zero until a new command has been requested. */
diff --git a/rkward/rbackend/rkrbackendprotocol_backend.cpp b/rkward/rbackend/rkrbackendprotocol_backend.cpp
index 2d4bbc6..47309ce 100644
--- a/rkward/rbackend/rkrbackendprotocol_backend.cpp
+++ b/rkward/rbackend/rkrbackendprotocol_backend.cpp
@@ -92,7 +92,7 @@
} else if (args[i].startsWith ("--rkd-server-name")) {
rkd_server_name = args[i].section ('=', 1);
} else {
- printf ("unkown argument %s", qPrintable (args[i]));
+ printf ("unknown argument %s", qPrintable (args[i]));
}
}
if (servername.isEmpty ()) {
diff --git a/rkward/rbackend/rkstructuregetter.cpp b/rkward/rbackend/rkstructuregetter.cpp
index c948220..6b225d3 100644
--- a/rkward/rbackend/rkstructuregetter.cpp
+++ b/rkward/rbackend/rkstructuregetter.cpp
@@ -362,7 +362,7 @@ void RKStructureGetter::getStructureWorker (SEXP val, const QString &name, int a
RData::RDataStorage children (childcount, 0);
for (int i = 0; i < childcount; ++i) {
- children[i] = new RData (); // NOTE: RData-ctor pre-initalizes these to empty. Thus, we're safe even if there is an error while fetching one of the children.
+ children[i] = new RData (); // NOTE: RData-ctor pre-initializes these to empty. Thus, we're safe even if there is an error while fetching one of the children.
}
if (do_env) {
diff --git a/rkward/rbackend/rkwarddevice/rkgraphicsdevice_protocol_shared.h b/rkward/rbackend/rkwarddevice/rkgraphicsdevice_protocol_shared.h
index b88654f..3cf8f63 100644
--- a/rkward/rbackend/rkwarddevice/rkgraphicsdevice_protocol_shared.h
+++ b/rkward/rbackend/rkwarddevice/rkgraphicsdevice_protocol_shared.h
@@ -44,7 +44,7 @@
*
*/
-/** This enum simply repeats R's line end definitions. It is used to ensure compatiblity, without the need to include
+/** This enum simply repeats R's line end definitions. It is used to ensure compatibility, without the need to include
* any R headers in the frontend. */
enum RKLineEndStyles {
RoundLineCap = 1,
@@ -52,7 +52,7 @@ enum RKLineEndStyles {
SquareLineCap = 3
};
-/** This enum simply repeats R's line join definitions. It is used to ensure compatiblity, without the need to include
+/** This enum simply repeats R's line join definitions. It is used to ensure compatibility, without the need to include
* any R headers in the frontend. */
enum RKLineJoinStyles {
RoundJoin = 1,
diff --git a/rkward/rbackend/rkwarddevice/rkgraphicsdevice_setup.cpp b/rkward/rbackend/rkwarddevice/rkgraphicsdevice_setup.cpp
index b174104..9a664da 100644
--- a/rkward/rbackend/rkwarddevice/rkgraphicsdevice_setup.cpp
+++ b/rkward/rbackend/rkwarddevice/rkgraphicsdevice_setup.cpp
@@ -84,7 +84,7 @@ void RKStartGraphicsDevice (double width, double height, double pointsize, const
desc = 0;
} else {
desc->devnum = 0; // graphics engine will send an Activate-event, before we were even
- // able to see our own devnum and call RKD_Create. Therefore, intialize
+ // able to see our own devnum and call RKD_Create. Therefore, initialize
// devnum to 0, so as not to confuse the frontend
pGEDevDesc gdd = GEcreateDevDesc (dev);
gdd->displayList = R_NilValue;
diff --git a/rkward/rbackend/rkwarddevice/rkgraphicsdevice_stubs.cpp b/rkward/rbackend/rkwarddevice/rkgraphicsdevice_stubs.cpp
index 5727475..8009fcf 100644
--- a/rkward/rbackend/rkwarddevice/rkgraphicsdevice_stubs.cpp
+++ b/rkward/rbackend/rkwarddevice/rkgraphicsdevice_stubs.cpp
@@ -391,7 +391,7 @@ static void RKD_Raster (unsigned int *raster, int w, int h, double x, double y,
RKGraphicsDataStreamWriteGuard wguard;
WRITE_HEADER (RKDRaster, dev);
- int *_raster = reinterpret_cast<int*> (raster); // shut up warning in WRITE_COLOR_BYTES. It's just four separete bytes, anyway
+ int *_raster = reinterpret_cast<int*> (raster); // shut up warning in WRITE_COLOR_BYTES. It's just four separate bytes, anyway
quint32 _w = qMin (w, 1 << 15); // skip stuff exceeding reasonable limits to keep protocol simple
RKD_OUT_STREAM << _w;
quint32 _h = qMin (h, 1 << 15);
diff --git a/rkward/rkconsole.cpp b/rkward/rkconsole.cpp
index 879d39e..13ae4a6 100644
--- a/rkward/rkconsole.cpp
+++ b/rkward/rkconsole.cpp
@@ -653,7 +653,7 @@ void RKConsole::newOutput (RCommand *, ROutput *output) {
if (RKSettingsModuleConsole::maxConsoleLines ()) {
uint c = (uint) doc->lines();
-// We remove the superflous lines in chunks of 20 while handling output for better performance. Later, in showPrompt(), we trim down to the correct size.
+// We remove the superfluous lines in chunks of 20 while handling output for better performance. Later, in showPrompt(), we trim down to the correct size.
if (c > (RKSettingsModuleConsole::maxConsoleLines () + 20)) {
// KDE4: does the setUpdatesEnabled (false) still affect performance?
view->setUpdatesEnabled (false); // major performance boost while removing lines!
diff --git a/rkward/rkward.desktop b/rkward/rkward.desktop
index 6ec34d2..0541221 100644
--- a/rkward/rkward.desktop
+++ b/rkward/rkward.desktop
@@ -24,6 +24,6 @@ Icon=rkward
Exec=rkward -caption "%c" %i
Terminal=false
Type=Application
-DocPath=rkward/index.html
+X-DocPath=rkward/index.html
Categories=Science;Math;NumericalAnalysis;
# vi: encoding=utf-8
diff --git a/rkward/rkward.h b/rkward/rkward.h
index dbcb69a..99d8228 100644
--- a/rkward/rkward.h
+++ b/rkward/rkward.h
@@ -32,7 +32,7 @@ class KSqueezedTextLabel;
class QAction;
/**
-The main class of rkward. This is where all strings are tied togther, controlls the initialization, and there are some of the most important slots for user actions. All real work is done elsewhere.
+The main class of rkward. This is where all strings are tied together, controls the initialization, and there are some of the most important slots for user actions. All real work is done elsewhere.
*/
class RKWardMainWindow : public KParts::MainWindow {
Q_OBJECT
@@ -76,7 +76,7 @@ protected:
signals:
void aboutToQuitRKWard ();
public slots:
- /** open a workspace. If the current workspace is not empty, ask wether to save first.
+ /** open a workspace. If the current workspace is not empty, ask whether to save first.
@see setNoAskSave ()
@see setWorkspaceMightBeModified () */
void askOpenWorkspace (const KUrl &url);
diff --git a/rkward/rkward_startup_wrapper.cpp b/rkward/rkward_startup_wrapper.cpp
index d667bb8..0307e7a 100644
--- a/rkward/rkward_startup_wrapper.cpp
+++ b/rkward/rkward_startup_wrapper.cpp
@@ -223,14 +223,14 @@ int main (int argc, char *argv[]) {
}
#ifdef Q_WS_WIN
- // Explicit initialization of KDE, in case Windows 7 asks for admin priviledges
+ // Explicit initialization of KDE, in case Windows 7 asks for admin privileges
if (kdeinit4_exe.isNull ()) {
kdeinit4_exe = findExeAtPath ("kdeinit4", QFileInfo (rkward_frontend_exe).absolutePath ());
}
if (!kdeinit4_exe.isNull ()) QProcess::execute (kdeinit4_exe, QStringList ());
#else
// Apparently on some systems an embedded R gets outsmarted somehow, and LC_NUMERIC is set to some dangerous value for the whole app (via SCIM)
-// To prevent this, set it here, explicitely. R does not work with wrong settings of LC_NUMERIC.
+// To prevent this, set it here, explicitly. R does not work with wrong settings of LC_NUMERIC.
// First, however, need to unset LC_ALL, if set. Instead we set LANG, so the default will be the same, where not overridden
QString lcall = qgetenv ("LC_ALL");
diff --git a/rkward/scriptbackends/qtscriptbackend.h b/rkward/scriptbackends/qtscriptbackend.h
index ca6e1ad..ff35a59 100644
--- a/rkward/scriptbackends/qtscriptbackend.h
+++ b/rkward/scriptbackends/qtscriptbackend.h
@@ -27,7 +27,7 @@ class RKMessageCatalog;
The script itself is run in a separate thread to ensure good performance even for complex scripts. This is especially important for spinboxes, where the value is changes many times in quick succession. Note that this is also the reason not to use Kross, which appears to be not thread safe.
-TODO: The code is currently based on the old PHPBackend. Once that is truely obsolete, there should be room for redesigning several aspects. */
+TODO: The code is currently based on the old PHPBackend. Once that is truly obsolete, there should be room for redesigning several aspects. */
class QtScriptBackend : public ScriptBackend {
Q_OBJECT
public:
diff --git a/rkward/windows/rkcommandeditorwindow.cpp b/rkward/windows/rkcommandeditorwindow.cpp
index ba34575..524372a 100644
--- a/rkward/windows/rkcommandeditorwindow.cpp
+++ b/rkward/windows/rkcommandeditorwindow.cpp
@@ -1257,7 +1257,7 @@ void RKCommandHighlighter::setHighlighting (KTextEditor::Document *doc, Highligh
QString mode_string = "R Script";
if (mode == RInteractiveSession) mode_string = "R interactive session";
- if (!(doc->setHighlightingMode (mode_string) && doc->setMode (mode_string))) RK_DEBUG (COMMANDEDITOR, DL_ERROR, "R syntax highlighting defintion ('%s')not found!", qPrintable (mode_string));
+ if (!(doc->setHighlightingMode (mode_string) && doc->setMode (mode_string))) RK_DEBUG (COMMANDEDITOR, DL_ERROR, "R syntax highlighting definition ('%s')not found!", qPrintable (mode_string));
}
void RKCommandHighlighter::copyLinesToOutput (KTextEditor::View *view, HighlightingMode mode) {
diff --git a/rkward/windows/rkdebugmessagewindow.cpp b/rkward/windows/rkdebugmessagewindow.cpp
index 9eded6a..23cb71f 100644
--- a/rkward/windows/rkdebugmessagewindow.cpp
+++ b/rkward/windows/rkdebugmessagewindow.cpp
@@ -76,7 +76,7 @@ void RKDebugMessageWindow::createWidget () {
if (first) {
KMessageBox::information (this, i18n ("<p>This window is used for displaying RKWard related debug messages. It is targetted primarily at (plugin) developers. It does <b>not</b> offer any features for debugging R code.</p>"
- "<p>Note that the list of messages is cleared everytime you close the window.</p><p>Type and severity level of messages can be controlled from Settings->Configure RKWard->Debug</p>"), i18n ("About this window"), "inforkdebugmessagewindow");
+ "<p>Note that the list of messages is cleared every time you close the window.</p><p>Type and severity level of messages can be controlled from Settings->Configure RKWard->Debug</p>"), i18n ("About this window"), "inforkdebugmessagewindow");
first = false;
}
}
diff --git a/rkward/windows/rktoolwindowbar.h b/rkward/windows/rktoolwindowbar.h
index 1f7665e..711c953 100644
--- a/rkward/windows/rktoolwindowbar.h
+++ b/rkward/windows/rktoolwindowbar.h
@@ -34,7 +34,7 @@ class RKMDIWindow;
/** This class represents one of the bar which tool windows can dock into (top, left, bottom, right). It contains heavy copying from Kate's katemdi SideBar class. I wish this was available as a library, but it isn't, yet.
-Some more would need to be copied for full functionality (session saving / restoring), but for now, I focussed on the bare essentials */
+Some more would need to be copied for full functionality (session saving / restoring), but for now, I focused on the bare essentials */
class RKToolWindowBar : public KMultiTabBar {
Q_OBJECT
public:
More information about the rkward-tracker
mailing list