aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGravatar un1versal2015-10-08 13:10:17 +0100
committerGravatar un1versal2015-10-08 17:39:57 +0100
commit02bf7911f3afe6e5960349e5e61329afb3a995a9 (patch)
treef2ba9133be0a95091e85cbbb8d75e485e8f59aa5 /src
parent[ci skip] various header files, typos corrections (diff)
downloadKVIrc-02bf7911f3afe6e5960349e5e61329afb3a995a9.tar.gz
KVIrc-02bf7911f3afe6e5960349e5e61329afb3a995a9.tar.bz2
KVIrc-02bf7911f3afe6e5960349e5e61329afb3a995a9.zip
[ci skip] no strings - cpp files - typo corrections
Diffstat (limited to 'src')
-rw-r--r--src/kvilib/ext/KviAnimatedPixmapCache.cpp6
-rw-r--r--src/kvilib/ext/KviCryptEngine.cpp2
-rw-r--r--src/kvirc/kernel/KviApplication.cpp4
-rw-r--r--src/kvirc/kernel/KviIrcContext.cpp2
-rw-r--r--src/kvirc/kvs/KviKvsCoreFunctions_af.cpp14
-rw-r--r--src/kvirc/kvs/parser/KviKvsParser.cpp74
-rw-r--r--src/kvirc/kvs/parser/KviKvsParser_specialCommands.cpp22
-rw-r--r--src/kvirc/sparser/KviIrcServerParser_ctcp.cpp12
-rw-r--r--src/kvirc/ui/KviChannelWindow.cpp2
-rw-r--r--src/kvirc/ui/KviIrcView_getTextLine.cpp50
-rw-r--r--src/modules/action/libkviaction.cpp10
-rw-r--r--src/modules/actioneditor/ActionEditor.cpp6
-rw-r--r--src/modules/chan/libkvichan.cpp2
-rw-r--r--src/modules/dcc/DccBroker.cpp2
-rw-r--r--src/modules/dcc/DccFileTransfer.cpp2
-rw-r--r--src/modules/dialog/libkvidialog.cpp4
-rw-r--r--src/modules/objects/KvsObject_dialog.cpp4
-rw-r--r--src/modules/objects/KvsObject_xmlreader.cpp2
18 files changed, 110 insertions, 110 deletions
diff --git a/src/kvilib/ext/KviAnimatedPixmapCache.cpp b/src/kvilib/ext/KviAnimatedPixmapCache.cpp
index 285945bab..dc436535e 100644
--- a/src/kvilib/ext/KviAnimatedPixmapCache.cpp
+++ b/src/kvilib/ext/KviAnimatedPixmapCache.cpp
@@ -183,10 +183,10 @@ void KviAnimatedPixmapCache::timeoutEvent()
{
/*
* We are adding 15msecs to the current time. This MAY lead to the situation,
- * when the current frame will be painted a bit earlier, then i should.
- * But we are just playing animated gifs, not a HDTV video. So it should be ok.
+ * when the current frame will be painted a bit earlier, then I should.
+ * But we are just playing animated gifs, not a HDTV video. So it should be OK.
*
- * But it makes good speedup if there will be event, sceduled in such order:
+ * But it makes good speedup if there will be event, scheduled in such order:
* 1 event at time X
* 3 events at time X+2msec
* 2 events at time X+6msec
diff --git a/src/kvilib/ext/KviCryptEngine.cpp b/src/kvilib/ext/KviCryptEngine.cpp
index b52b6565c..6ec745cbd 100644
--- a/src/kvilib/ext/KviCryptEngine.cpp
+++ b/src/kvilib/ext/KviCryptEngine.cpp
@@ -129,7 +129,7 @@
Well, there is no protocol actually, only the existing implementations, that
can be accessed by anyone that want to reproduce them. There are only some
points relating to the crypting engines that need to be cleared:[br]
- The crypted text must be suitable to be sent thru an IRC connection;
+ The crypted text must be suitable to be sent through an IRC connection;
this means that some characters can not appear in the crypted text (e.g. CR,LF,NULL....).
KVIrc solves it in a simple way: the crypted binary data is encoded,
either as hexadecimal numeric string or in base64.[br]
diff --git a/src/kvirc/kernel/KviApplication.cpp b/src/kvirc/kernel/KviApplication.cpp
index 6cc5918ad..d3ba96f0f 100644
--- a/src/kvirc/kernel/KviApplication.cpp
+++ b/src/kvirc/kernel/KviApplication.cpp
@@ -1069,11 +1069,11 @@ void KviApplication::checkSuggestRestoreDefaultScript()
switch(
QMessageBox::question(0,__tr2qs("Update default scripts"),
__tr2qs("<b>Hi!</b><br><br>" \
- "<b>It seems that you have just upgraded KVirc from a previous version.</b><br><br>" \
+ "<b>It seems that you have just upgraded KVIrc from a previous version.</b><br><br>" \
"The KVIrc default scripts needs to be updated too, to play nice with your fresh new KVIrc.<br>" \
"You may want to avoid this update if you plan to revert to a previous KVIrc version soon," \
"or if you have created a lot of custom scripts and want to stay safe and avoid any deletion or overwrite.<br>" \
- "If you want to update the default scripts, i can restore the new default script for you.<br>" \
+ "If you want to update the default scripts, I can restore the new default script for you.<br>" \
"<b>Do you want the default script to be restored?</b><br><br>"),
__tr2qs("No and Don't Ask Me Again"),__tr2qs("No"),__tr2qs("Yes"),1,1)
)
diff --git a/src/kvirc/kernel/KviIrcContext.cpp b/src/kvirc/kernel/KviIrcContext.cpp
index d77a6e4e0..14a3857c0 100644
--- a/src/kvirc/kernel/KviIrcContext.cpp
+++ b/src/kvirc/kernel/KviIrcContext.cpp
@@ -682,7 +682,7 @@ void KviIrcContext::connectionEstabilished()
{
//qDebug("context::connectionEstabilished");
//
- // The connection has been estabilished, the
+ // The connection has been established, the
// KviIrcConnection will attempt to login now
//
m_uConnectAttemptCount = 1;
diff --git a/src/kvirc/kvs/KviKvsCoreFunctions_af.cpp b/src/kvirc/kvs/KviKvsCoreFunctions_af.cpp
index ba45d8357..dc15d195a 100644
--- a/src/kvirc/kvs/KviKvsCoreFunctions_af.cpp
+++ b/src/kvirc/kvs/KviKvsCoreFunctions_af.cpp
@@ -647,14 +647,14 @@ namespace KviKvsCoreFunctions
@title:
$char
@short:
- Returns a character specified by unicode
+ Returns a character specified by Unicode
@syntax:
<string> $char(<unicode_value:integer>)
@description:
- Returns a character corresponding to the UNICODE code <unicode_value>.[br]
- This function can not return NUL character (UNICODE 0). Basically
+ Returns a character corresponding to the Unicode code <unicode_value>.[br]
+ This function can not return NUL character (Unicode 0). Basically
you should never need it: if you do, drop me a mail.[br]
- If the <unicode_code> is not a valid UNICODE code (or is 0), this function returns
+ If the <unicode_code> is not a valid Unicode code (or is 0), this function returns
an empty string.[br]
@seealso:
[fnc]$cr[/fnc], [fnc]$lf[/fnc], [fnc]$unicode[/fnc]
@@ -1168,7 +1168,7 @@ namespace KviKvsCoreFunctions
<string> $escape(<text:string>)
@description:
In KVS some characters in a string have special meanings: % marks the start of a variable name, $ the start of a function name, etc..[br]
- Sometimes you could need to escape them using a \ character to avoid kvirc from interpreting the special meaning of these characters:
+ Sometimes you could need to escape them using a \ character to avoid KVIrc from interpreting the special meaning of these characters:
this function will to the dirty job for you, returning a correctly kvs-escaped version of the string passed as a parameter.[br]
@seealso:
[cmd]eval[/cmd]
@@ -1242,7 +1242,7 @@ namespace KviKvsCoreFunctions
<array> $features()
<boolean> $features(<test_feature:string>)
@description:
- The parameterless form returns an array of feature descripton strings that this KVIrc executable supports.[br]
+ The parameterless form returns an array of feature description strings that this KVIrc executable supports.[br]
This function is useful when some part of your script depends on
an optional KVIrc feature (like SSL support or IPV6 support).[br]
The returned value may be assigned to a dictionary too: it will be used to simulate an array.[br]
@@ -1501,7 +1501,7 @@ namespace KviKvsCoreFunctions
to prevent the evaluation.[br]
You might also take a look at [doc:escape_sequences]the escape sequences documentation[/doc]
to learn more about how the links are implemented and how to create more powerful links (add
- right and middle button actions, use predefined kvirc links etc...). Also take a look at [fnc]$link[/fnc]
+ right and middle button actions, use predefined KVIrc links etc...). Also take a look at [fnc]$link[/fnc]
which has related functionality.
@seealso:
[cmd]echo[/cmd], [doc:escape_sequences]the escape sequences documentation[/doc], [fnc]$link[/fnc]
diff --git a/src/kvirc/kvs/parser/KviKvsParser.cpp b/src/kvirc/kvs/parser/KviKvsParser.cpp
index 5cb6e64a9..3c71c2cb0 100644
--- a/src/kvirc/kvs/parser/KviKvsParser.cpp
+++ b/src/kvirc/kvs/parser/KviKvsParser.cpp
@@ -370,7 +370,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const QChar * pBuffer
Placing an instruction per line does not require a terminating character,
placing more instructions in a single line require them to be separated by ';'.
The most common instructions in KVS are [b]commands[/b]. A command is basically
- a keyword followed by a list of space separater parameters.
+ a keyword followed by a list of space separator parameters.
The simplest (and the most useful) command in KVS is [cmd]echo[/cmd]; it prints
all its parameters to a KVIrc window.[br]
The following is an example of a valid script that uses only [cmd]echo[/cmd] commands.
@@ -590,7 +590,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const QChar * pBuffer
You can't escape newline characters in this case.
(or better: escape characters have no meaning in comments...
maybe one day I'll implement it).[br]
- Starting from version 3.0.0 kvirc supports also C++ single line and C multiline comments.[br]
+ Starting from version 3.0.0, KVIrc supports also C++ single line and C multiline comments.[br]
A C++ comment starts with two slashes '//' and terminates with a newline.
A multiline C comment starts with '/ *' and ends at the first '* /' encountered.
Since KVIrc has no pre-processor, the C/C++ comments usually can't be placed in the middle of a command:
@@ -605,7 +605,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const QChar * pBuffer
read your script). A good indenting practice is the first step to become a great programmer :)
[note]
Please note that the command parameters should be separated by
- space characters (ascii 32). Tabs are not granted to work as parameter separators.[br]
+ space characters (ASCII 32). Tabs are not granted to work as parameter separators.[br]
[/note]
[example]
{
@@ -645,7 +645,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const QChar * pBuffer
@body:
[big]Introduction[/big]
[p]
- Since you're here, you should already have readed about the [doc:kvs_basicconcepts]KVS basic concepts[/doc]
+ Since you're here, you should already have read about the [doc:kvs_basicconcepts]KVS basic concepts[/doc]
and have visited the [doc:commands]command index[/doc]. If you feel ready to take the next step
then read on.
[/p]
@@ -719,7 +719,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const QChar * pBuffer
[big]Aliases[/big][br]
- An alias is a user defined command. It can be used to rename the builtin kvirc commands or functions,
+ An alias is a user defined command. It can be used to rename the builtin KVIrc commands or functions,
to automate complex tasks or as a means for structured programming.
Aliases can be created or destroyed by using the scriptcenter (graphic interface)
or from the commandline (or script) by using the [cmd]alias[/cmd] command.
@@ -798,7 +798,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const QChar * pBuffer
[/example]
The example above will first check the validity of the <nickname> passed to kb -
if no nickname was passed, it will warn the user and stop.
- The next step will be the "ban <nickname>" call. Another enchancement is the "default reason" -
+ The next step will be the "ban <nickname>" call. Another enhancement is the "default reason" -
we first assign the remaining parameters ($1- means "from $1 to the end") to a temporary variable,
and if the variable is empty, a default kick reason is assigned.
Finally the "kick <nickname> <reason>" will be executed.
@@ -834,13 +834,13 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const QChar * pBuffer
%anothersum = $sum3(12,%somevalue,%anothervalue)
...
[/example]
- Oops.. I've used some variables without actually explaining them... hehe.. please forgive me and read on.
+ Ooops... I've used some variables without actually explaining them, hehe... please forgive me and read on.
This example is again really simple, but you might have more complex function-aliases.
- The function-aliases are also normal aliases.... you can use it as a command:
+ The function-aliases are also normal aliases... you can use it as a command:
[example]
/sum3 1 2 3
[/example]
- The above is a perfectly valid call.... however there will be no visible results
+ The above is a perfectly valid call, however there will be no visible results
(because a command call implies ignoring the return value.
In fact there is no difference at all between function-aliases and normal-aliases -
the caller makes the difference. By calling an alias as a command, the return value
@@ -868,7 +868,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const QChar * pBuffer
[example]
$0 evaluates to the 1st positional parameter
$0-4 evaluates to the parameters from first to 5th
- $41- evaluates to the parameters from 41st to the last avaiable
+ $41- evaluates to the parameters from 41st to the last available
[/example]
The function [b]$#[/b] evaluates to the number of positional parameters available.
The [b]positional parameter[/b] functions do not accept parameters.[br]
@@ -925,8 +925,8 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const QChar * pBuffer
KVIrc window structure and the window naming conventions
@body:
[big]Introduction[/big][br]
- Starting from the release 3.0.0 KVIrc window structure has
- grown in complexity. Older releases allowed one connetion
+ Starting from the release 3.0.0, KVIrc window structure has
+ grown in complexity. Older releases allowed one connection
per "frame window" and thus had a dedicated command parser
for each connection. Finding a window in that scenario
was quite easy: it was enough to designate it by "name"
@@ -1005,7 +1005,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const QChar * pBuffer
[/li]
[/ul]
[br]
- A naming convention has becomed necessary to resolve ambiguities.[br]
+ A naming convention has become necessary to resolve ambiguities.[br]
[big]Basic assumptions[/big]
Every KVIrc window has four main properties:[br]
-[b]an unique numeric identifier[/b][br]
@@ -1024,9 +1024,9 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const QChar * pBuffer
the logical name corresponds to the caption text. This will be discussed later.[br]
The [b]type identifier[/b] describes the properties of a certain window.
For channel windows the type identifier is "channel", for query windows is "query",
- for console windows it is "console", etc..[br]
+ for console windows it is "console", etc.[br]
- [big]Irc contexts[/big][br]
+ [big]IRC Contexts[/big][br]
The KVIrc frame windows are numbered starting from 0 and named
"frame_<number>". Each frame can contain an unlimited number of consoles.[br]
Each console is bound to an [b]IRC context[/b]. (The part "is bound to" could
@@ -1052,7 +1052,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const QChar * pBuffer
window or the "list" window. KVIrc takes care of making them
unique inside the [b]IRC context[/b] namespace.[br]
Each [b]IRC context[/b] has its own unique [b]IRC context ID[/b] (see [fnc]$context[/fnc]).[br]
- Since to a single [b]IRC context[/b] may correspond only a single irc connection,
+ Since to a single [b]IRC context[/b] may correspond only a single IRC connection,
when in connected state, the [b]IRC context[/b] may be referred also as [b]connection[/b]
or [b]connection context[/b], and the associated [b]IRC context Id[/b] can be
referred as [b]connection ID[/b] or [b]connection context ID[/b].[br]
@@ -1122,7 +1122,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const QChar * pBuffer
@short:
Aliases : user definable command sequences
@body:
- An alias is an user defined command. It can be used to rename the builtin kvirc commands or functions,
+ An alias is an user defined command. It can be used to rename the builtin KVIrc commands or functions,
to automatize complex tasks or as structured programming mean.
Aliases can be created or destroyed by using the scriptcenter (graphic interface)
or from the commandline (or script) by using the [cmd]alias[/cmd] command.
@@ -1201,7 +1201,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const QChar * pBuffer
[/example]
The example above will first check the validity of the <nickname> passed to kb:
if no nickname was passed, it will warn the user and stop.
- The next step will be the "ban <nickname>" call. Another enchancement is the "default reason":
+ The next step will be the "ban <nickname>" call. Another enhancement is the "default reason":
we first assign the remaining parameters ($1- means "from $1 to the end") to a temporary variable,
if the variable is empty, a default kick reason is assigned.
Finally the "kick <nickname> <reason>" will be executed.
@@ -1215,7 +1215,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const QChar * pBuffer
Aliases are the way of writing the common tasks: they are equivalent to the "procedures"
or "functions" in many high-level programming languages.
The alias as a procedure (subroutine or sub-task) has been shown in the "kb" example above:
- it might be commonly called from complexier scripts or other aliases in case that a
+ it might be commonly called from complexer scripts or other aliases in case that a
kick & ban action is needed.
[/p]
[p]
@@ -1237,19 +1237,19 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const QChar * pBuffer
%anothersum = $sum3(12,%somevalue,%anothervalue)
...
[/example]
- Ops.. I've used some variables without actually explaining them... hehe.. please forgive me and read on.
- This example is again really simple, but you might have complexier function-aliases.
- The function-aliases are also normal aliases.... you can use it as a command:
+ Ooops... I've used some variables without actually explaining them, hehe... please forgive me and read on.
+ This example is again really simple, but you might have complexer function-aliases.
+ The function-aliases are also normal aliases... you can use it as a command:
[example]
/sum3 1 2 3
[/example]
- Is a perfectly valid call.... it's just that it will have no visible results
+ Is a perfectly valid call... it's just that it will have no visible results
(just because a command call implies ignoring the return value.
In fact there is no difference al all between function-aliases and normal-aliases:
the caller makes the difference: by calling an alias as a command the return value
just disappears in hyperspace, by calling an alias as a function, the return value
is propagated (and in fact "used").
- (There are some "nice" exceptions to this rule...but you don't need to care about it, for now).
+ (There are some "nice" exceptions to this rule... but you don't need to care about it, for now).
If return is not called inside an alias body, the return value will be just a null value.
[/p]
[p]
@@ -1399,7 +1399,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const QChar * pBuffer
[/p]
[p]
The toplevel directory should be named with your addon name and version.
- Use no spaces in the directory entries (this will make the things simplier for
+ Use no spaces in the directory entries (this will make the things simpler for
people that want to use your addon).
[/p]
[p]
@@ -1568,7 +1568,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const QChar * pBuffer
[big]The real addon work[/big]
[p]
The real addon work is done by the scripts contained in the src directory.
- They will likely add aliases (maybe in a nice namespace named agains your addon),
+ They will likely add aliases (maybe in a nice namespace named against your addon),
register event handlers, create actions, timers, toolbars and object classes.
You should install all of this stuff from your addon source files.
Remember that your source files will NOT be parsed every time KVIrc starts up:
@@ -1606,7 +1606,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const QChar * pBuffer
These apply to programming in general, not only to KVIrc scripting.[br]
[br]
1. [b]Comment your code[/b][br]
- A well commented code is easy to mantain, and easy to read by others.[br]
+ A well commented code is easy to maintain, and easy to read by others.[br]
[br]
2. [b]Indent your code[/b][br]
Indentation increases the code readability; this is again for you and
@@ -1615,7 +1615,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const QChar * pBuffer
3. [b]Use TABS to indent your code[/b][br]
...and use ONLY TABS to indent.[br]
Tabs are better than space since most code editors allow you
- to set the tab sice and thus to have the indentation steps smaller or bigger.[br]
+ to set the tab since and thus to have the indentation steps smaller or bigger.[br]
This is really important since the indentation size is really a matter of personal taste.[br]
Mixing spaces and tabs is Evil (tm), since it makes the code look really
ugly in editors that have the tab size different than yours; in some cases the
@@ -1628,14 +1628,14 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const QChar * pBuffer
is getting large.[br]
Obviously using "thisIsACounterVariable" as name for a simple counter
is also a suicide.[br]
- A good convention on variable names can speed up writing, debugging and mantaining code.[br]
+ A good convention on variable names can speed up writing, debugging and maintaining code.[br]
Encoding the type of the variable in the variable name might be also a good idea,
but this is a matter of taste; personally I feel really well with that.[br]
Just as example, here go my fundamental convention rules for C++:[br]
[br]
- The type of the variable is encoded at the beginning of the variable name:[br]
[br]
- - b prefix for the boolean varables[br]
+ - b prefix for the boolean variables[br]
- i prefix for signed integers[br]
- u prefix for unsigned integers[br]
- f and d prefixes for floating point stuff[br]
@@ -1694,15 +1694,15 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const QChar * pBuffer
[/tr]
[tr]
[td]<space>[/td]
- [td]' '['\'<newline>][<space>] (Ascii space character)[/td]
+ [td]' '['\'<newline>][<space>] (ASCII space character)[/td]
[/tr]
[tr]
[td]<tab>[/td]
- [td]'\t' (Ascii horizontal tabulation character)[/td]
+ [td]'\t' (ASCII horizontal tabulation character)[/td]
[/tr]
[tr]
[td]<newline>[/td]
- [td]'\n' (Ascii line feed (LF) character)[/td]
+ [td]'\n' (ASCII line feed (LF) character)[/td]
[/tr]
[tr]
[td]<command block>[/td]
@@ -1827,7 +1827,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const QChar * pBuffer
@short:
Standard -r switch no longer supported
@body:
- Starting from version 3.0.0 the standard -r switch to commands is no longer supported.
+ Starting from version 3.0.0, the standard -r switch to commands is no longer supported.
You should rebind your command sequences with [cmd]rebind[/cmd]
*/
@@ -1837,8 +1837,8 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const QChar * pBuffer
language
@keyterms:
global variable, global variables, local variable, local variables,
- variables, variable, array, hash, dictionary, global variables, local variables,variable evaluation,
- associative arrays, scalars, data types, percent sign, extended scope
+ variables, variable, array, hash, dictionary, global variables, local variables, variable evaluation,
+ associative arrays, scalars, data types, percent sign and extended scope
@title:
Variables and Data types
@short:
@@ -1994,7 +1994,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const QChar * pBuffer
[p]
Be aware that by making such an assignment you implicitly consume some memory for
- all the preceeding array items (even if they are unset). This means that
+ all the preceding array items (even if they are unset). This means that
a simple instruction like the following may eat a huge amount of memory at once:
[/p]
diff --git a/src/kvirc/kvs/parser/KviKvsParser_specialCommands.cpp b/src/kvirc/kvs/parser/KviKvsParser_specialCommands.cpp
index 89d29fa57..3d512205a 100644
--- a/src/kvirc/kvs/parser/KviKvsParser_specialCommands.cpp
+++ b/src/kvirc/kvs/parser/KviKvsParser_specialCommands.cpp
@@ -202,7 +202,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandUnset()
@description:
Unsets the specified list of comma separated variables.
It is equivalent to assigning the default empty value
- to each variable on its own: just does it all at aonce.
+ to each variable on its own: just does it all at once.
Note that KVIrc automatically frees the local variable memory
when they go out of scope and the global variable memory
when KVIrc terminates.
@@ -272,9 +272,9 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandGlobal()
@description:
Declares a list of global variables.
Once a variable has been declared as global
- it refers to the global kvirc instance for the scope of the script.
+ it refers to the global KVIrc instance for the scope of the script.
Global variables are shared between scripts and keep their
- value until they are explicitly unset or kvirc quits.
+ value until they are explicitly unset or KVIrc quits.
This command can be used to override the default behaviour of
declaring global variables by starting them with an uppercase letter
and declaring local variables by starting them with a lowercase one.
@@ -351,7 +351,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandClass()
from [class:object]object[/class].[br]
Note:[br]
The keywords "function" and "event" that were used in KVIrc versions
- previous to 3.0.0 have been removed since "useless".[br]
+ previous to 3.0.0 have been removed since they are "useless".[br]
The function keyword, however, is still permitted.
The keyword "internal" is useful when you want to hide
certain function from the outside world. An internal function
@@ -366,15 +366,15 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandClass()
It's rather dangerous to use this command inside an object
function handler: if the class definition <class> was already
existing and it is a parent of the object's class, you might
- end up executing "inexistant" code.[br]
+ end up executing "inexistent" code.[br]
As a thumb rule, use this command only outside object function handlers.[br]
[br][br]
Only for the curious: implementing protected and private access
list on members would have a considerable runtime overhead because
of the strange nature of the KVS language. Object member calls
- are resolved completly at runtime (and that permits a lot of funny tricks
+ are resolved completely at runtime (and that permits a lot of funny tricks
like [cmd]privateimpl[/cmd]) but unfortunately this also forces us
- to check access lists at runtime. Ok, this would be a relatively small footprint for the "private"
+ to check access lists at runtime. OK, this would be a relatively small footprint for the "private"
keyword where we need to run UP the called object inheritance hierarchy
but would have a significant performance footprint for the "protected"
keyword where we would need to traverse the WHOLE inheritance tree of the called and calling
@@ -393,7 +393,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandClass()
destructor
{
- [cmd]echo[/cmd] Ops...being destroyed
+ [cmd]echo[/cmd] Ooops... being destroyed
}
sayHello(this function expects no parameters)
@@ -1324,7 +1324,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandSwitch()
Please note that <command> must be either a single instruction or an instruction block [b]enclosed in braces[/b].
During or after <command> execution, if a [cmd]break[/cmd] statement is encountered the execution of the switch
is terminated, otherwise the next label is evaluated.[br]
- If the -p (--passthrough) option is enabled, than the switch command will execute all the istructions blocks
+ If the -p (--passthrough) option is enabled, than the switch command will execute all the instructions blocks
until a [cmd]break[/cmd] statement is found.[br]
[b]match(<value>)[:]<command>[/b][br]
The <value> is expected to be a wildcard expression (wildcard characters being '*' and '?')
@@ -1355,7 +1355,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandSwitch()
break;
}
[/example]
- [comment]# A complexier example: change the 1 in 2 or 3[/comment]
+ [comment]# A complexer example: change the 1 in 2 or 3[/comment]
[example]
%tmp = 1
switch(%tmp)
@@ -1397,7 +1397,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandSwitch()
case(%tmp)
{
# do not break here
- echo "Yeah.. it's stupid.. \%tmp == \%tmp :D"
+ echo "Yeah... It's stupid... \%tmp == \%tmp :D"
}
match("*TEST"):
echo "Matched *TEST"
diff --git a/src/kvirc/sparser/KviIrcServerParser_ctcp.cpp b/src/kvirc/sparser/KviIrcServerParser_ctcp.cpp
index a3aaaaff4..38cb854d6 100644
--- a/src/kvirc/sparser/KviIrcServerParser_ctcp.cpp
+++ b/src/kvirc/sparser/KviIrcServerParser_ctcp.cpp
@@ -297,7 +297,7 @@ extern KVIRC_API KviCtcpPageDialog * g_pCtcpPageDialog;
[big]VERSION[/big][br]
[b]Syntax: <0x01>VERSION<0x01>[/b][br]
The VERSION request asks for information about another user's IRC client program.
- The reply should be sent thru a NOTICE with the following syntax:[br]
+ The reply should be sent through a NOTICE with the following syntax:[br]
<0x01>VERSION <client_version_data><0x01>[br]
The preferred form for <client_version_data> is
"<client_name>:<client_version>:<client_enviroinement>", but historically
@@ -308,7 +308,7 @@ extern KVIRC_API KviCtcpPageDialog * g_pCtcpPageDialog;
[big]USERINFO[/big][br]
[b]Syntax: <0x01>USERINFO<0x01>[/b][br]
The USERINFO request asks for information about another user.
- The reply should be sent thru a NOTICE with the following syntax:[br]
+ The reply should be sent through a NOTICE with the following syntax:[br]
<0x01>USERINFO <user_info_data><0x01>[br]
The <user_info_data> should be a human readable "user defined" string;
@@ -317,7 +317,7 @@ extern KVIRC_API KviCtcpPageDialog * g_pCtcpPageDialog;
The CLIENTINFO request asks for information about another user's IRC client program.
While VERSION requests the client program name and version, CLIENTINFO requests
information about CTCP capabilities.[br]
- The reply should be sent thru a NOTICE with the following syntax:[br]
+ The reply should be sent through a NOTICE with the following syntax:[br]
<0x01>CLIENTINFO <client_info_data><0x01>[br]
The <client_info_data> should contain a list of supported CTCP request tags.
The CLIENTINFO reply is intended to be human readable.
@@ -325,7 +325,7 @@ extern KVIRC_API KviCtcpPageDialog * g_pCtcpPageDialog;
[big]FINGER[/big][br]
[b]Syntax: <0x01>FINGER<0x01>[/b][br]
The FINGER request asks for information about another IRC user.
- The reply should be sent thru a NOTICE with the following syntax:[br]
+ The reply should be sent through a NOTICE with the following syntax:[br]
<0x01>FINGER <user_info_data><0x01>[br]
The <user_info_data> should be a human readable string containing
the system username and possibly the system idle time;
@@ -333,14 +333,14 @@ extern KVIRC_API KviCtcpPageDialog * g_pCtcpPageDialog;
[big]SOURCE[/big][br]
[b]Syntax: <0x01>SOURCE<0x01>[/b][br]
The SOURCE request asks for the client homepage or ftp site information.
- The reply should be sent thru a NOTICE with the following syntax:[br]
+ The reply should be sent through a NOTICE with the following syntax:[br]
<0x01>VERSION <homepage_url_data><0x01>[br]
This CTCP reply is intended to be human readable, so any form is accepted.
[big]TIME[/big][br]
[b]Syntax: <0x01>TIME<0x01>[/b][br]
The TIME request asks for the user local time.
- The reply should be sent thru a NOTICE with the following syntax:[br]
+ The reply should be sent through a NOTICE with the following syntax:[br]
<0x01>TIME <time and date string><0x01>[br]
This CTCP reply is intended to be human readable, so any form is accepted.
diff --git a/src/kvirc/ui/KviChannelWindow.cpp b/src/kvirc/ui/KviChannelWindow.cpp
index 28eea7b83..4ecbcff35 100644
--- a/src/kvirc/ui/KviChannelWindow.cpp
+++ b/src/kvirc/ui/KviChannelWindow.cpp
@@ -989,7 +989,7 @@ void KviChannelWindow::getWindowListTipText(QString & szBuffer)
szNum.setNum(s.uIrcOp);
szBuffer += szNum;
szBuffer += szHtmlBoldEnd;
- szBuffer += (s.uIrcOp == 1 ? __tr2qs("irc operator") : __tr2qs("irc operators"));
+ szBuffer += (s.uIrcOp == 1 ? __tr2qs("IRC operator") : __tr2qs("IRC operators"));
szBuffer += p10;
}
diff --git a/src/kvirc/ui/KviIrcView_getTextLine.cpp b/src/kvirc/ui/KviIrcView_getTextLine.cpp
index 50f2919f5..4440402cb 100644
--- a/src/kvirc/ui/KviIrcView_getTextLine.cpp
+++ b/src/kvirc/ui/KviIrcView_getTextLine.cpp
@@ -63,7 +63,7 @@ void kvi_appendWCharToQStringWithLength(QString * qstrptr,const kvi_wchar_t * pt
static const kvi_wchar_t * skip_to_end_of_url(const kvi_wchar_t * p)
{
- // p here points somewhere inside an url.
+ // p here points somewhere inside an URL.
// Now the question is what characters are and which aren't allowed inside an URL.
@@ -75,8 +75,8 @@ static const kvi_wchar_t * skip_to_end_of_url(const kvi_wchar_t * p)
// then the users will tend to write the links without the special encoding. ed2k links also use the | character
// and it's common for the file names to appear partially unencoded.
- // There is also a very common case of urls being enclosed inside parentheses: (http://url.here).
- // In this case the rightmost ')' is shouldn't be included in the url. On the other hand there are many links that
+ // There is also a very common case of URLs being enclosed inside parentheses: (http://url.here).
+ // In this case the rightmost ')' is shouldn't be included in the URL. On the other hand there are many links that
// actually contain the ')' character and have it exactly at the end. Wikipedia, for instance, has a lot of such links.
// So in the end, we just can't have an algorithm that pleases everybody. If we follow exactly the RFC1738
@@ -94,7 +94,7 @@ static const kvi_wchar_t * skip_to_end_of_url(const kvi_wchar_t * p)
return p; // no spaces and control characters below 32
if((*p == '{') || (*p == '}') || (*p == '<') || (*p == '>') || (*p == '"')) // || (*p == '\''))
- return p; // never valid inside an url
+ return p; // never valid inside an URL
if(*p == '[')
{
@@ -265,7 +265,7 @@ const kvi_wchar_t * KviIrcView::getTextLine(
/*
* Profane description: this adds a block of text of known length to a already created chunk inside this line.
- * text is hidden (eg: we want to display an emoticon instead of the ":)" text, so we insert it hidden)
+ * text is hidden (e.g. we want to display an emoticon instead of the ":)" text, so we insert it hidden)
*/
#define APPEND_LAST_TEXT_BLOCK_HIDDEN_FROM_NOW(__data_ptr,__data_len) \
@@ -300,18 +300,18 @@ const kvi_wchar_t * KviIrcView::getTextLine(
/*
* Some additional description for the profanes: we want a fast way to check the presence of "active objects we have to process" in lines of text;
- * such objects can be: EOF, urls, mirc control characters, emoticons, and so on. We implemented a jump table to accomplish this task very fast.
+ * such objects can be: EOF, URLs, mIRC control characters, emoticons, and so on. We implemented a jump table to accomplish this task very fast.
* This jump table is an array[256] containing label addresses (imagine them as functions). So something like "goto array[4];" is valid construct
- * in C, that equivals to a function call to a function that starts on that label's line of code.
- * Imagine to parse the input line one character at once and match it (as a switch can do) agains this big array. Every 1-byte character corresponds
- * to an ascii integer between 0 and 255. If the array value for that integer key is defined and !=0, we jump to the corrispective label address.
+ * in C, that is equivalent to a function call to a function that starts on that label's line of code.
+ * Imagine to parse the input line one character at once and match it (as a switch can do) against this big array. Every 1-byte character corresponds
+ * to an ASCII integer between 0 and 255. If the array value for that integer key is defined and !=0, we jump to the corresponding label address.
* Example, if we find a "H" (72) we'll "goto char_to_check_jump_table[72]", aka "goto check_http_url".
* There exists two different versions of this tricky code, we switch them depending on the compiler abilities to accept our bad code :)
*/
#ifdef COMPILE_USE_DYNAMIC_LABELS
- // Herezy :)
+ // Heresy :)
// This is not only usage of the *Evil Goto(tm)*
// This is also a *rather unclear* use of the *Really Evil Goto(tm)*
@@ -503,7 +503,7 @@ check_char_loop:
/*
* Profane description:
- * Here the two different approches to the jump table ends. Following there's the list of all the possible
+ * Here the two different approaches to the jump table ends. Following there's the list of all the possible
* codes found. The "check table" approach needs an additional switch to discriminate between different control codes,
* while the "jump table" approach directly jumps to the right case.
*/
@@ -740,15 +740,15 @@ check_http_url:
{
/*
* Profane description: we found an 'h' using the "jump/check table", now check for a 't' (we don't want to search directly for the
- * "http://" tag, it takes us more cpu time)
+ * "http://" tag, it takes us more CPU time)
*/
//
if((*p == 't') || (*p == 'T'))
{
/*
- * Profane description: we found it! now there's an high probability we're in front of an http url. Relax, rewind the last
- * character and try to match the complete url protocol tag
+ * Profane description: we found it! now there's an high probability we're in front of an http URL. Relax, rewind the last
+ * character and try to match the complete URL protocol tag
*/
p--;
@@ -979,22 +979,22 @@ check_spotify_url:
got_url:
- //Url highlighting block
+ //URL highlighting block
/*
- * Profane description: we just found a tag that we suppose to be the start of a url.
- * p is the address of the start of our text buffer, partLen the length of the tag (eg. http:// = 7)
+ * Profane description: we just found a tag that we suppose to be the start of a URL.
+ * p is the address of the start of our text buffer, partLen the length of the tag (e.g. http:// = 7)
* We want to check if it's valid and highlight it creating an ad-hoc chunk for it in this line.
- * The ascii value of the first character after the tag have to be >= 47, or we assume it as invalid
+ * The ASCII value of the first character after the tag have to be >= 47, or we assume it as invalid
*/
if(*(p + partLen) < 47)
{
- //invalid: append all the text up to the end of the false url tag
+ //invalid: append all the text up to the end of the false URL tag
p+=partLen;
APPEND_LAST_TEXT_BLOCK(data_ptr,p - data_ptr)
} else {
- //valid: append all the text before the start of the url tag
+ //valid: append all the text before the start of the URL tag
APPEND_LAST_TEXT_BLOCK(data_ptr,p - data_ptr)
//create a new chunk
NEW_LINE_CHUNK(KviControlCodes::Escape)
@@ -1002,7 +1002,7 @@ got_url:
// int urlLen = KVI_OPTION_STRING(KviOption_stringUrlLinkCommand).len() + 1;
- //write into null-terminated char* szPayload an 'u' that means that this chunk represents an url
+ //write into null-terminated char* szPayload an 'u' that means that this chunk represents an URL
line_ptr->pChunks[iCurChunk].szPayload = (kvi_wchar_t *)KviMemory::allocate(2 * sizeof(kvi_wchar_t));
line_ptr->pChunks[iCurChunk].szPayload[0] = 'u';
line_ptr->pChunks[iCurChunk].szPayload[1] = 0x0;
@@ -1021,7 +1021,7 @@ got_url:
KVS_TRIGGER_EVENT_1(KviEvent_OnURL,m_pKviWindow,tmp);
}
- //add all the text till the end of the url, then create a new "clean" chunk for the next cycle loop
+ //add all the text till the end of the URL, then create a new "clean" chunk for the next cycle loop
APPEND_LAST_TEXT_BLOCK(data_ptr,p - data_ptr)
NEW_LINE_CHUNK(KviControlCodes::UnEscape)
@@ -1098,10 +1098,10 @@ check_emoticon_char:
}
if(!*p || (*p == ' '))
{
- // ok! this is an emoticon (sequence) !
+ // OK! this is an emoticon (sequence) !
// We lookup simplified versions of the emoticons...
- // FIXME: this sould become UNICODE!!!
+ // FIXME: this should become UNICODE!!!
QString lookupstring;
kvi_wchar_t ng[3];
ng[0] = *begin;
@@ -1186,7 +1186,7 @@ void KviIrcView::reapplyMessageColors()
KviIrcViewLine * pLine = m_pFirstLine;
while(pLine)
{
- pLine->iMaxLineWidth = -1; // force recompuation of blocks
+ pLine->iMaxLineWidth = -1; // force recomputation of blocks
if(pLine->uChunkCount > 0) // always true?
{
diff --git a/src/modules/action/libkviaction.cpp b/src/modules/action/libkviaction.cpp
index 67a9f9366..df1f8c03f 100644
--- a/src/modules/action/libkviaction.cpp
+++ b/src/modules/action/libkviaction.cpp
@@ -289,7 +289,7 @@ static bool action_kvs_cmd_destroy(KviKvsModuleCommandCall * c)
!sw: -l | --enable-at-login
Specifies that the action needs to be enabled at login time, that is
- when a link to the server has been estabilished but the login
+ when a link to the server has been established but the login
operations haven't been carried out yet (and thus there is no real IRC connection).
This switch requires -c to work.
@@ -302,11 +302,11 @@ static bool action_kvs_cmd_destroy(KviKvsModuleCommandCall * c)
!sw: -s | --selected-only
Specifies that the action will be activated only if the active window
has selected users in the userlist. This switch requires -w with a combination
- of flags 'q','c' and 'x' (it doesn't work for dcc chat).
+ of flags 'q','c' and 'x' (it doesn't work for DCC chat).
!sw: -t=<category> | --category=<category>
Causes the action to belong to the specified category.
- <category> can be one of "irc","scripting","settings","gui","channel","tools" and "generic".
+ <category> can be one of "IRC","scripting","settings","GUI","channel","tools" and "generic".
If this switch is omitted the "generic" category is automatically assumed.
The actions failing in the "tools" category will appear in the "Tools" KVIrc menu too.
@@ -321,7 +321,7 @@ static bool action_kvs_cmd_destroy(KviKvsModuleCommandCall * c)
[/p]
[p]
Each action has an unique <name> that must not collide with any core action
- (i.e. don't use the "kvirc." prefix).
+ (i.e. don't use the "KVIrc." prefix).
At any time you can check [cmd]action.list[/cmd] to verify that no core action
is already using your <name>. If the <name> was already used for a script action
then this action is simply replaced by the new one.
@@ -350,7 +350,7 @@ static bool action_kvs_cmd_destroy(KviKvsModuleCommandCall * c)
[p]
<action body> is the callback code snippet that will be triggered when this action is activated
either by the means of [cmd]action.trigger[/cmd], a toolbar button or a menu item selection.
- An empty <action body> causes this command to behave like [cmd]action.destoy[/cmd] <name>.
+ An empty <action body> causes this command to behave like [cmd]action.destroy[/cmd] <name>.
[/p]
@seealso:
[cmd]action.destroy[/cmd], [cmd]action.trigger[/cmd]
diff --git a/src/modules/actioneditor/ActionEditor.cpp b/src/modules/actioneditor/ActionEditor.cpp
index 014ba1db4..6d66ad82e 100644
--- a/src/modules/actioneditor/ActionEditor.cpp
+++ b/src/modules/actioneditor/ActionEditor.cpp
@@ -195,7 +195,7 @@ SingleActionEditor::SingleActionEditor(QWidget * par,ActionEditor * ed)
m_pNeedsContextCheck = new QCheckBox(__tr2qs_ctx("Needs IRC Context","editor"),tab);
connect(m_pNeedsContextCheck,SIGNAL(toggled(bool)),this,SLOT(needsContextCheckToggled(bool)));
m_pNeedsContextCheck->setToolTip(__tr2qs_ctx("Check this option if this action should be enabled only when " \
- "the active window belongs to an irc context","editor"));
+ "the active window belongs to an IRC context","editor"));
gl->addWidget(m_pNeedsContextCheck,0,0,1,4);
@@ -216,7 +216,7 @@ SingleActionEditor::SingleActionEditor(QWidget * par,ActionEditor * ed)
m_pEnableAtLoginCheck = new QCheckBox(__tr2qs_ctx("Enable at Login","editor"),tab);
m_pEnableAtLoginCheck->setToolTip(__tr2qs_ctx("Check this option if this action should be enabled also during " \
- "the login operations (so when the logical IRC connection hasn't been estabilished yet)","editor"));
+ "the login operations (so when the logical IRC connection hasn't been established yet)","editor"));
gl->addWidget(m_pEnableAtLoginCheck,2,2,1,2);
m_pSpecificWindowsCheck = new QCheckBox(__tr2qs_ctx("Enable Only in Specified Windows","editor"),tab);
@@ -261,7 +261,7 @@ SingleActionEditor::SingleActionEditor(QWidget * par,ActionEditor * ed)
m_pWindowDccChatCheck = new QCheckBox(__tr2qs_ctx("Enable in DCC Chat Windows","editor"),tab);
m_pWindowDccChatCheck->setToolTip(__tr2qs_ctx("Check this option if this action should be enabled only when " \
- "the active window is a dcc chat","editor"));
+ "the active window is a DCC chat","editor"));
gl->addWidget(m_pWindowDccChatCheck,10,1,1,2);
l = new QLabel(tab);
diff --git a/src/modules/chan/libkvichan.cpp b/src/modules/chan/libkvichan.cpp
index 881c19fb2..4da273514 100644
--- a/src/modules/chan/libkvichan.cpp
+++ b/src/modules/chan/libkvichan.cpp
@@ -1090,7 +1090,7 @@ static bool chan_kvs_fnc_modeParam(KviKvsModuleFunctionCall * c)
[example]
[comment]# Get the nickname list[/comment]
%test[] = $chan.users
- [comment]# And loop thru the items[/comment]
+ [comment]# And loop through the items[/comment]
%i = 0
[comment]# %test[]# returns the number of elements in the array[/comment]
%count = %test[]#
diff --git a/src/modules/dcc/DccBroker.cpp b/src/modules/dcc/DccBroker.cpp
index 029eaa962..be7dea7fa 100644
--- a/src/modules/dcc/DccBroker.cpp
+++ b/src/modules/dcc/DccBroker.cpp
@@ -781,7 +781,7 @@ void DccBroker::renameOverwriteResume(DccDialog *box,DccDescriptor * dcc)
"and is larger than the offered one.<br>" \
"Do you wish to<br>" \
"<b>auto-rename</b> the new file, or<br>" \
- "<b>overwrite</b> the existing file ?" \
+ "<b>overwrite</b> the existing file?" \
,"dcc" \
).arg(dcc->szLocalFileName);
}
diff --git a/src/modules/dcc/DccFileTransfer.cpp b/src/modules/dcc/DccFileTransfer.cpp
index 468976ea1..ddd54ae5d 100644
--- a/src/modules/dcc/DccFileTransfer.cpp
+++ b/src/modules/dcc/DccFileTransfer.cpp
@@ -155,7 +155,7 @@ bool DccRecvThread::sendAck(int filePos,bool bTolerateErrors)
#ifdef COMPILE_SSL_SUPPORT
if(m_pSSL)
{
- // dropping ack when no serious ssl error occured
+ // dropping ack when no serious ssl error occurred
switch(m_pSSL->getProtocolError(iRet))
{
case KviSSL::ZeroReturn:
diff --git a/src/modules/dialog/libkvidialog.cpp b/src/modules/dialog/libkvidialog.cpp
index f9e39d386..82c7a8833 100644
--- a/src/modules/dialog/libkvidialog.cpp
+++ b/src/modules/dialog/libkvidialog.cpp
@@ -170,7 +170,7 @@ void KviKvsCallbackMessageBox::done(int code)
@examples:
[example]
[comment]# Just a warning dialog[/comment]
- dialog.message("Warning","You're being <b>warned</b>",warning,"Ok"){ echo The user clicked OK; }
+ dialog.message("Warning","You're being <b>warned</b>",warning,"OK"){ echo The user clicked OK; }
[comment]# A question[/comment]
dialog.message("And now ?","What do you want to do ?",information,"Go home","Watch TV","Scream")
{
@@ -468,7 +468,7 @@ void KviKvsCallbackTextInput::showEvent(QShowEvent *e)
@examples:
[example]
[comment]# We need a single line "reason"[/comment]
- dialog.textinput -d="Working !" (Away,<center>Please enter the <h1>away message</h1></center>,"Ok","Cancel")
+ dialog.textinput -d="Working!" (Away,<center>Please enter the <h1>away message</h1></center>,"OK","Cancel")
{
switch($0)
{
diff --git a/src/modules/objects/KvsObject_dialog.cpp b/src/modules/objects/KvsObject_dialog.cpp
index 3752490d9..8b5d30b27 100644
--- a/src/modules/objects/KvsObject_dialog.cpp
+++ b/src/modules/objects/KvsObject_dialog.cpp
@@ -44,10 +44,10 @@
[class]object[/class]
[class]widget[/class]
@description:
- Rappresents a dialog object. The class is really
+ Represents a dialog object. The class is really
similar to the widget class, it has only a couple of minor differences.
A dialog is always a top-level widget, but if it has a parent, its default
- location is centered on top of the parent. It will also share the parent's windowlist entry.
+ location is centered on top of the parent. It will also share the parent's window list entry.
!fn; setModal (<boolean>)
If you call $setModal(1) then the dialog will have non-blocking modal behaviour:
it will appear above its parent widget and block its input until it's closed.
diff --git a/src/modules/objects/KvsObject_xmlreader.cpp b/src/modules/objects/KvsObject_xmlreader.cpp
index 0038f1c01..f0f05528d 100644
--- a/src/modules/objects/KvsObject_xmlreader.cpp
+++ b/src/modules/objects/KvsObject_xmlreader.cpp
@@ -66,7 +66,7 @@
obtain a descriptive error message.
!fn: <string> $lastError()
- Returns the last error occured inside the parser.
+ Returns the last error occurred inside the parser.
You will typically call this function when $parse() above returns $false.
!fn: <boolean> $onDocumentStart()