diff options
| author | 2015-10-26 10:15:14 +0000 | |
|---|---|---|
| committer | 2015-11-04 03:16:03 +0000 | |
| commit | bfb0ad07790a6f4c7d9c45daba90a322d25c84f2 (patch) | |
| tree | 7a86763e694b916e3a7bf336cc536c0c5cad3987 /src | |
| parent | window: Fix autoraise not setting active window (diff) | |
| download | KVIrc-bfb0ad07790a6f4c7d9c45daba90a322d25c84f2.tar.gz KVIrc-bfb0ad07790a6f4c7d9c45daba90a322d25c84f2.tar.bz2 KVIrc-bfb0ad07790a6f4c7d9c45daba90a322d25c84f2.zip | |
KviKvsEvent*.cpp: typos and consistency fixes
Diffstat (limited to 'src')
29 files changed, 146 insertions, 146 deletions
diff --git a/src/kvirc/kvs/KviKvsAliasManager.cpp b/src/kvirc/kvs/KviKvsAliasManager.cpp index 3c0c94b11..6d42b6048 100644 --- a/src/kvirc/kvs/KviKvsAliasManager.cpp +++ b/src/kvirc/kvs/KviKvsAliasManager.cpp @@ -46,7 +46,7 @@ void KviKvsAliasManager::init() { if(KviKvsAliasManager::instance()) { - qDebug("WARNING: Trying to create the KviKvsAliasManager twice!"); + qDebug("WARNING: trying to create the KviKvsAliasManager twice!"); return; } (void)new KviKvsAliasManager(); @@ -56,7 +56,7 @@ void KviKvsAliasManager::done() { if(!KviKvsAliasManager::instance()) { - qDebug("WARNING: Trying to destroy the KviKvsAliasManager twice!"); + qDebug("WARNING: trying to destroy the KviKvsAliasManager twice!"); return; } delete KviKvsAliasManager::instance(); diff --git a/src/kvirc/kvs/KviKvsCoreCallbackCommands.cpp b/src/kvirc/kvs/KviKvsCoreCallbackCommands.cpp index 06059e995..23bc9d030 100644 --- a/src/kvirc/kvs/KviKvsCoreCallbackCommands.cpp +++ b/src/kvirc/kvs/KviKvsCoreCallbackCommands.cpp @@ -99,7 +99,7 @@ namespace KviKvsCoreCallbackCommands [cmd]echo[/cmd] "Lookup: "$0; if($1) { - [cmd]echo[/cmd] "Ip address: "$2; + [cmd]echo[/cmd] "IP address: "$2; [cmd]echo[/cmd] "Hostname: "$3; } else { [cmd]echo[/cmd] "Error: $2"; @@ -111,7 +111,7 @@ namespace KviKvsCoreCallbackCommands [cmd]echo[/cmd] "Magic: $3"; if($1) { - [cmd]echo[/cmd] "Ip address: "$2; + [cmd]echo[/cmd] "IP address: "$2; [cmd]echo[/cmd] "Hostname: "$3; } else { [cmd]echo[/cmd] "Error: $2"; @@ -123,7 +123,7 @@ namespace KviKvsCoreCallbackCommands [cmd]echo[/cmd] "Magic: $3"; if($1) { - [cmd]echo[/cmd] "Ip address: "$2; + [cmd]echo[/cmd] "IP address: "$2; [cmd]echo[/cmd] "Hostname: "$3; } else { [cmd]echo[/cmd] "Error: $2"; @@ -573,7 +573,7 @@ namespace KviKvsCoreCallbackCommands if(!KviKvsEventManager::instance()->removeScriptRawHandler(iNumber,szHandlerName)) { if(!KVSCCC_pSwitches->find('q',"quiet")) - KVSCCC_pContext->warning(__tr2qs_ctx("No handler '%Q' for raw numeric event '%d'","kvs"),&szHandlerName,iNumber); + KVSCCC_pContext->warning(__tr2qs_ctx("No handler '%Q' for RAW numeric event '%d'","kvs"),&szHandlerName,iNumber); } } else { if(!KviKvsEventManager::instance()->removeScriptAppHandler(iNumber,szHandlerName)) @@ -729,7 +729,7 @@ namespace KviKvsCoreCallbackCommands With the -b switch the events stdout and stderr are triggered once even if the process emits no output. The -s=<interpreter> switch may be used to specify the path of the command interpreter - that is "sh -c" by default on unix machines and "cmd.exe /c" on windows. + that is "sh -c" by default on UNIX machines and "cmd.exe /c" on Windows. The interpreter executable is searched on the system PATH. If the process can't be started then a warning message is printed in the current window unless the -q (quiet) flag is used.[br] @@ -753,7 +753,7 @@ namespace KviKvsCoreCallbackCommands exec -k=20000 -p=1000 -t ("cat") { if($0 == "ping")echo "[event:$0] Please wait while doing a huge computation ..." - else if($0 == "terminated")echo "[event:$0] Ok, done :)" + else if($0 == "terminated")echo "[event:$0] OK, done :)" } [comment]# Do the same but this time use the extended scope vars[/comment] [comment]# Use also a nicer syntax[/comment] @@ -775,7 +775,7 @@ namespace KviKvsCoreCallbackCommands break; case("terminated"): { - echo "Ok, done :)" + echo "OK, done :)" } break; } diff --git a/src/kvirc/kvs/KviKvsCoreFunctions_af.cpp b/src/kvirc/kvs/KviKvsCoreFunctions_af.cpp index dc15d195a..7c1fe40d8 100644 --- a/src/kvirc/kvs/KviKvsCoreFunctions_af.cpp +++ b/src/kvirc/kvs/KviKvsCoreFunctions_af.cpp @@ -175,7 +175,7 @@ namespace KviKvsCoreFunctions Encodes an ASCII string to its base64 encoded representation Please note that since KVS is UNICODE based, this function will first encode the string in UTF8 and then base64-encode. - This means that it is substantially only 7bit safe (ASCII codes below 128). + This means that it is substantially only 7-bit safe (ASCII codes below 128). @examples: [cmd]echo[/cmd] $asciiToBase64("Hello!") @seealso: diff --git a/src/kvirc/kvs/KviKvsCoreFunctions_gl.cpp b/src/kvirc/kvs/KviKvsCoreFunctions_gl.cpp index 5a7713946..6060f3ba3 100644 --- a/src/kvirc/kvs/KviKvsCoreFunctions_gl.cpp +++ b/src/kvirc/kvs/KviKvsCoreFunctions_gl.cpp @@ -152,7 +152,7 @@ KVSCF(gender) @syntax: <hash> $hash([<key:string>,<value:variant>,[<key:string>,<value:variant>]],...) @description: - Returns a hash with the specified items. Each <value> is indexed by the preceeding <key>. + Returns a hash with the specified items. Each <value> is indexed by the preceding <key>. This is just an explicit way of creating a hash with a defined set of items, useful for increasing readability. @examples: @@ -245,7 +245,7 @@ KVSCF(gender) The hostname is known if [fnc]$isWellKnown[/fnc] returns 1.[br] The hostname is generally known if the user is on a channel with you or has an open query with you.[br] - Detailed explaination:[br] + Detailed explanation:[br] KVIrc has an internal database of users that are currently visible by *this client*: this includes users on open channels and queries.[br] The other IRC users are NOT in the database: @@ -330,7 +330,7 @@ KVSCF(gender) @syntax: <float> $hptimestamp @description: - Returns a high precision timestamp as a floaint point value. + Returns a high precision timestamp as a floating point value. The timestamp represents the number of seconds elapsed since a certain moment in the past. The number of seconds contains a "high precision" fractional part. The "certain moment" definition @@ -1096,11 +1096,11 @@ KVSCF(gender) [li]nick link to a nickname[/li] [li]channel link to a channel name[/li] [li]host link to an host[/li] - [li]url (default) link to an url[/li] + [li]URL (default) link to an URL[/li] [/ul] Please note that the text you get as the output is valid only when interpreted locally. Sending this text to the server you can - get unpredictable results, depending on the irc client other people + get unpredictable results, depending on the IRC client other people is using. The returned string format is described by [doc:escape_sequences]the escape sequences documentation[/doc] and you might also take a look at [fnc]$fmtlink[/fnc] which has related functionality. diff --git a/src/kvirc/kvs/KviKvsCoreFunctions_mr.cpp b/src/kvirc/kvs/KviKvsCoreFunctions_mr.cpp index 1d8337982..d5c495fe3 100644 --- a/src/kvirc/kvs/KviKvsCoreFunctions_mr.cpp +++ b/src/kvirc/kvs/KviKvsCoreFunctions_mr.cpp @@ -93,8 +93,8 @@ namespace KviKvsCoreFunctions For example, if the hostname is missing, the mask type 3 or 4 may be reduced to type 5.[br] If the user with <nickname> is not found in the current IRC context user database, an empty string is returned.[br] - The masks 22-26 are the smart versions of the masks 17-21 that try take care of masked ip addresses - in the form xxx.xxx.INVALID-TOP-MASK. If a masked ip address is found then + The masks 22-26 are the smart versions of the masks 17-21 that try take care of masked IP addresses + in the form xxx.xxx.INVALID-TOP-MASK. If a masked IP address is found then the XXX.XXX.* or XXX.* host mask is returned instead of the (wrong) *.INVALID-TOP-MASK @examples: @seealso: diff --git a/src/kvirc/kvs/KviKvsCoreFunctions_sz.cpp b/src/kvirc/kvs/KviKvsCoreFunctions_sz.cpp index 31be1d4ed..e29dec441 100644 --- a/src/kvirc/kvs/KviKvsCoreFunctions_sz.cpp +++ b/src/kvirc/kvs/KviKvsCoreFunctions_sz.cpp @@ -639,7 +639,7 @@ namespace KviKvsCoreFunctions @title: $tr @short: - Translates an english string to the current language + Translates an English string to the current language @syntax: <string> $tr(<default_language_string:string>[,<catalogue:string>]) @description: @@ -648,11 +648,11 @@ namespace KviKvsCoreFunctions KVIrc translation file if <catalogue> is omitted.[br] If no translation is found then <english_string> is returned.[br] <default_language_string> is a string in your script default - language (which should probably be english since it is the - most common language spoken by the translators...).[br] + language (which should probably be English since it is the + most common language spoken by the translators).[br] If the <catalogue> is not loaded yet, KVIrc will attempt to load it, but only the first time that the catalogue is accessed (i.e. a load - failure will cause the catalogue to be ignored completly until [cmd]trunload[/cmd] + failure will cause the catalogue to be ignored completely until [cmd]trunload[/cmd] is explicitly used.[br] KVIrc will search the catalogue only in [fnc]$file.localdir[/fnc]/locale/ and in [fnc]$file.globaldir[/fnc]/locale/. If your catalogues are diff --git a/src/kvirc/kvs/KviKvsCoreSimpleCommands_af.cpp b/src/kvirc/kvs/KviKvsCoreSimpleCommands_af.cpp index 2e3c16c53..5df318e98 100644 --- a/src/kvirc/kvs/KviKvsCoreSimpleCommands_af.cpp +++ b/src/kvirc/kvs/KviKvsCoreSimpleCommands_af.cpp @@ -638,7 +638,7 @@ namespace KviKvsCoreSimpleCommands @type: command @title: - ctcp + CTCP @syntax: ctcp [-n] <target:string> <ctcp_data:string> @short: @@ -646,8 +646,8 @@ namespace KviKvsCoreSimpleCommands @description: Sends a CTCP message to the specified <target>.[br] The target may be a nickname, a channel, or a comma separated list of nicknames.[br] - The <ctcp_data> is a string containing the ctcp type followed by the ctcp parameters.[br] - For more info take a look at the [doc:ctcp_handling]ctcp protocol implementation notes[/doc].[br] + The <ctcp_data> is a string containing the CTCP type followed by the CTCP parameters.[br] + For more info take a look at the [doc:ctcp_handling]CTCP protocol implementation notes[/doc].[br] The CTCP message will be a request (sent through a PRIVMSG) unless the -n switch specified: in that case it will be a reply (sent through a NOTICE).[br] If <ctcp_data> is the single string "ping" then a trailing time string argument @@ -1135,7 +1135,7 @@ namespace KviKvsCoreSimpleCommands pWnd = g_pApp->findWindow(szWnd.toUtf8().data()); if(!pWnd) { - KVSCSC_pContext->warning(__tr2qs_ctx("The argument of the -w switch did not evaluate to a valid window id: using default","kvs")); + KVSCSC_pContext->warning(__tr2qs_ctx("The argument of the -w switch did not evaluate to a valid window ID: using default","kvs")); pWnd = KVSCSC_pContext->window(); } } @@ -1195,7 +1195,7 @@ namespace KviKvsCoreSimpleCommands Outputs a <text> to the current window in the privmsg format.[br] The <nick> <user> and <host> parameters are formatted as specified by the user preferences (for example - the nick may use smart colorisation). + the nick may use smart colorization). If you don't know the username and host then just use '*' for that parameters. The message will also get the highlighting rules applied. @@ -1511,7 +1511,7 @@ namespace KviKvsCoreSimpleCommands { if(!KviKvsEventManager::instance()->removeScriptRawHandler(iNumber,szHandlerName)) if(!KVSCSC_pSwitches->find('q',"quiet")) - KVSCSC_pContext->warning(__tr2qs_ctx("No handler '%Q' for raw numeric event '%d'","kvs"),&szHandlerName,iNumber); + KVSCSC_pContext->warning(__tr2qs_ctx("No handler '%Q' for RAW numeric event '%d'","kvs"),&szHandlerName,iNumber); } else { if(!KviKvsEventManager::instance()->removeScriptAppHandler(iNumber,szHandlerName)) if(!KVSCSC_pSwitches->find('q',"quiet")) @@ -1524,7 +1524,7 @@ namespace KviKvsCoreSimpleCommands { if(!KviKvsEventManager::instance()->enableScriptRawHandler(iNumber,szHandlerName,KVSCSC_pSwitches->find('e',"enable"))) if(!KVSCSC_pSwitches->find('q',"quiet")) - KVSCSC_pContext->warning(__tr2qs_ctx("No handler '%Q' for raw numeric event '%d'","kvs"),&szHandlerName,iNumber); + KVSCSC_pContext->warning(__tr2qs_ctx("No handler '%Q' for RAW numeric event '%d'","kvs"),&szHandlerName,iNumber); } else { if(!KviKvsEventManager::instance()->enableScriptAppHandler(iNumber,szHandlerName,KVSCSC_pSwitches->find('e',"enable"))) if(!KVSCSC_pSwitches->find('q',"quiet")) diff --git a/src/kvirc/kvs/KviKvsCoreSimpleCommands_gl.cpp b/src/kvirc/kvs/KviKvsCoreSimpleCommands_gl.cpp index adc57763b..cea110455 100644 --- a/src/kvirc/kvs/KviKvsCoreSimpleCommands_gl.cpp +++ b/src/kvirc/kvs/KviKvsCoreSimpleCommands_gl.cpp @@ -116,7 +116,7 @@ namespace KviKvsCoreSimpleCommands the document is searched in the KVIrc documentation directory.[br] If no document has been found using absolute and relative paths, the first document matching [document] in the help search database - is shown. Otherway, an error page is displayed.[br/] + is shown. Otherwise, an error page is displayed.[br/] The help browser has limited html browsing capabilities: you can use it to view simple html files on your filesystem.[br] This command is an alias for the [cmd]help.open[cmd] command exported @@ -185,7 +185,7 @@ namespace KviKvsCoreSimpleCommands The -i switch causes the command to execute in IPv6 mode (and lookup ONLY IPv6 hosts!).[br] The -a switch causes the command to run in "unspecified" mode - and return any available address: IPv4 or Ipv6.[br] + and return any available address: IPv4 or IPv6.[br] This command also performs reverse lookups (if you pass an IP address as <hostname>).[br] @examples: [example] diff --git a/src/kvirc/kvs/KviKvsCoreSimpleCommands_mr.cpp b/src/kvirc/kvs/KviKvsCoreSimpleCommands_mr.cpp index 8ba09509b..ee95cee9f 100644 --- a/src/kvirc/kvs/KviKvsCoreSimpleCommands_mr.cpp +++ b/src/kvirc/kvs/KviKvsCoreSimpleCommands_mr.cpp @@ -528,7 +528,7 @@ namespace KviKvsCoreSimpleCommands ("arial", "helvetica" etc..), <pointsize> is more or less the indicator of the size of the font (try sth like 12,14), <style> is an integer that indicates the font style (fixed for example), <charset> is an integer that indicates the charset of the font (maybe one day I'll document it better), - <weight> indicates the (ehm) weight of the font (50,100,150...matches Bold,DemiBold etc..), + <weight> indicates the (em) weight of the font (50,100,150...matches Bold,DemiBold etc..), <flags> is a combination of 'b','i','u','s,' and 'f' that match respectively bold,italic underline,strikeout and fixed.[br] [b]MessageType[/b]: <optValue> is a comma separated list of message type properties: @@ -1161,7 +1161,7 @@ namespace KviKvsCoreSimpleCommands @syntax: quote [-q] <raw command:string> @short: - Builtin alias for raw + Builtin alias for RAW @switches: !sw: -q | --quiet Be quiet: do echo the raw data. @@ -1214,9 +1214,9 @@ namespace KviKvsCoreSimpleCommands Sends raw data to the server @switches: !sw: -q | --quiet - Be quiet: do echo the raw data. + Be quiet: do echo the RAW data. @description: - Sends a raw data string to the server of the current [b]IRC context[/b].[br] + Sends a RAW data string to the server of the current [b]IRC context[/b].[br] If the -q switch (quiet) is specified, no output is printed. This command is [doc:connection_dependant_commands]connection dependant[/doc].[br] This command is equivalent to [cmd]quote[/cmd]. diff --git a/src/kvirc/kvs/KviKvsCoreSimpleCommands_sz.cpp b/src/kvirc/kvs/KviKvsCoreSimpleCommands_sz.cpp index b95aac47c..1cb96677b 100644 --- a/src/kvirc/kvs/KviKvsCoreSimpleCommands_sz.cpp +++ b/src/kvirc/kvs/KviKvsCoreSimpleCommands_sz.cpp @@ -984,7 +984,7 @@ namespace KviKvsCoreSimpleCommands @type: command @title: - who + WHO @syntax: who <filter> @short: @@ -998,7 +998,7 @@ namespace KviKvsCoreSimpleCommands a much more complex syntax: <mask1> <options> [<mask2>]. <mask1> is a comma separated list of filters that can contain wildcards (* and ?), <options> is a set of characters specifying what <mask1> is matching (nicknames, channel - names, user names, real names, ip addresses etc) and what kind of informations should be returned. + names, user names, real names, IP addresses etc) and what kind of informations should be returned. Look for the extended WHOX syntax on your favorite search engine.[br] If no parameter is specified at all, it requests a WHO information about the current channel.[br] @@ -1107,7 +1107,7 @@ namespace KviKvsCoreSimpleCommands @short: Requests user information @description: - Requests information about an irc user specified by <nickname>.[br] + Requests information about an IRC user specified by <nickname>.[br] Whowas requests "history" records. See [doc:rfc2812]RFC2812[/doc] for more info.[br] This command is [doc:connection_dependant_commands]connection dependant[/doc]. @examples: diff --git a/src/kvirc/kvs/KviKvsDnsManager.cpp b/src/kvirc/kvs/KviKvsDnsManager.cpp index 91ccdb974..ae907b6ab 100644 --- a/src/kvirc/kvs/KviKvsDnsManager.cpp +++ b/src/kvirc/kvs/KviKvsDnsManager.cpp @@ -77,7 +77,7 @@ void KviKvsDnsManager::init() { if(KviKvsDnsManager::m_pInstance) { - qDebug("Trying to double init() the dns manager!"); + qDebug("Trying to double init() the DNS manager!"); return; } KviKvsDnsManager::m_pInstance = new KviKvsDnsManager(); @@ -87,7 +87,7 @@ void KviKvsDnsManager::done() { if(!KviKvsDnsManager::m_pInstance) { - qDebug("Trying to call done() on a non existing dns manager!"); + qDebug("Trying to call done() on a non existing DNS manager!"); return; } delete KviKvsDnsManager::m_pInstance; diff --git a/src/kvirc/kvs/KviKvsPopupManager.cpp b/src/kvirc/kvs/KviKvsPopupManager.cpp index 6c5e550a0..a2d1caf0d 100644 --- a/src/kvirc/kvs/KviKvsPopupManager.cpp +++ b/src/kvirc/kvs/KviKvsPopupManager.cpp @@ -44,7 +44,7 @@ void KviKvsPopupManager::init() { if(KviKvsPopupManager::instance()) { - qDebug("WARNING: Trying to create the KviKvsPopupManager twice!"); + qDebug("WARNING: trying to create the KviKvsPopupManager twice!"); return; } (void)new KviKvsPopupManager(); @@ -54,7 +54,7 @@ void KviKvsPopupManager::done() { if(!KviKvsPopupManager::instance()) { - qDebug("WARNING: Trying to destroy the KviKvsPopupManager twice!"); + qDebug("WARNING: trying to destroy the KviKvsPopupManager twice!"); return; } delete KviKvsPopupManager::instance(); diff --git a/src/kvirc/kvs/KviKvsProcessManager.cpp b/src/kvirc/kvs/KviKvsProcessManager.cpp index bf553d627..8de112bbb 100644 --- a/src/kvirc/kvs/KviKvsProcessManager.cpp +++ b/src/kvirc/kvs/KviKvsProcessManager.cpp @@ -199,7 +199,7 @@ bool KviKvsProcessAsyncOperation::trigger(CallbackEvent e,const QString &szData) params.append(new KviKvsVariant(QString("ping"))); break; default: - qDebug("Ops... unknown trigger() CallbackEvent parameter in QProcessDescriptor::trigger()"); + qDebug("Oops! Unknown trigger() CallbackEvent parameter in QProcessDescriptor::trigger()"); return false; break; } diff --git a/src/kvirc/kvs/KviKvsReport.cpp b/src/kvirc/kvs/KviKvsReport.cpp index b3ee9a1e5..02b145fb0 100644 --- a/src/kvirc/kvs/KviKvsReport.cpp +++ b/src/kvirc/kvs/KviKvsReport.cpp @@ -189,7 +189,7 @@ void KviKvsReport::report(KviKvsReport * r,KviWindow * pOutput) break; case KviKvsReport::ParserError: out = KVI_OUT_PARSERERROR; - pOutput->output(out,__tr2qs_ctx("[KVS]%c Compilation Error: %Q","kvs"),KviControlCodes::Bold,&(r->message())); + pOutput->output(out,__tr2qs_ctx("[KVS]%c Compilation error: %Q","kvs"),KviControlCodes::Bold,&(r->message())); break; case KviKvsReport::RunTimeWarning: out = KVI_OUT_PARSERWARNING; @@ -197,7 +197,7 @@ void KviKvsReport::report(KviKvsReport * r,KviWindow * pOutput) break; case KviKvsReport::RunTimeError: out = KVI_OUT_PARSERERROR; - pOutput->output(out,__tr2qs_ctx("[KVS]%c Runtime Error: %Q","kvs"),KviControlCodes::Bold,&(r->message())); + pOutput->output(out,__tr2qs_ctx("[KVS]%c Runtime error: %Q","kvs"),KviControlCodes::Bold,&(r->message())); break; } diff --git a/src/kvirc/kvs/KviKvsScript.cpp b/src/kvirc/kvs/KviKvsScript.cpp index e4038ef1b..0f970e177 100644 --- a/src/kvirc/kvs/KviKvsScript.cpp +++ b/src/kvirc/kvs/KviKvsScript.cpp @@ -76,7 +76,7 @@ KviKvsScript::~KviKvsScript() { if(m_pData->m_uRefs < 2) { - if(m_pData->m_uLock)qDebug("WARNING: Destroying a locked KviKvsScript"); + if(m_pData->m_uLock)qDebug("WARNING: destroying a locked KviKvsScript"); if(m_pData->m_pTree)delete m_pData->m_pTree; delete m_pData; } else { @@ -240,7 +240,7 @@ bool KviKvsScript::parse(KviWindow * pOutput, int iRunFlags) if(m_pData->m_uLock) { // ops... someone is locked in THIS script object - qDebug("WARNING: Trying to reparse a locked KviKvsScript!"); + qDebug("WARNING: trying to reparse a locked KviKvsScript!"); return false; } if(m_pData->m_pTree) diff --git a/src/kvirc/kvs/KviKvsScriptAddonManager.cpp b/src/kvirc/kvs/KviKvsScriptAddonManager.cpp index c553d3594..c046b3358 100644 --- a/src/kvirc/kvs/KviKvsScriptAddonManager.cpp +++ b/src/kvirc/kvs/KviKvsScriptAddonManager.cpp @@ -265,7 +265,7 @@ void KviKvsScriptAddonManager::init() { if(KviKvsScriptAddonManager::instance()) { - qDebug("WARNING: Trying to create the KviKvsScriptAddonManager twice!"); + qDebug("WARNING: trying to create the KviKvsScriptAddonManager twice!"); return; } (void)new KviKvsScriptAddonManager(); @@ -275,7 +275,7 @@ void KviKvsScriptAddonManager::done() { if(!KviKvsScriptAddonManager::instance()) { - qDebug("WARNING: Trying to destroy the KviKvsScriptAddonManager twice!"); + qDebug("WARNING: trying to destroy the KviKvsScriptAddonManager twice!"); return; } delete KviKvsScriptAddonManager::instance(); diff --git a/src/kvirc/kvs/KviKvsTimerManager.cpp b/src/kvirc/kvs/KviKvsTimerManager.cpp index 2983d854e..fc7635d51 100644 --- a/src/kvirc/kvs/KviKvsTimerManager.cpp +++ b/src/kvirc/kvs/KviKvsTimerManager.cpp @@ -190,7 +190,7 @@ void KviKvsTimerManager::timerEvent(QTimerEvent *e) { if(!m_pKilledTimerList) { - qDebug("ops.. assassing timer with no victims ?"); + qDebug("Oops! Assassinating timer with no victims?"); } else { m_pKilledTimerList->clear(); } @@ -202,7 +202,7 @@ void KviKvsTimerManager::timerEvent(QTimerEvent *e) KviKvsTimer * t = m_pTimerDictById->find(iId); if(!t) { - qDebug("Internal error: got an nonexistant timer event"); + qDebug("Internal error: received a non existent timer event"); return; // HUH ? } diff --git a/src/kvirc/kvs/event/KviKvsEventManager.cpp b/src/kvirc/kvs/event/KviKvsEventManager.cpp index da056c77b..e65c87928 100644 --- a/src/kvirc/kvs/event/KviKvsEventManager.cpp +++ b/src/kvirc/kvs/event/KviKvsEventManager.cpp @@ -44,7 +44,7 @@ @short: Events: user reactions @body: - KVIrc triggers an event when a particular situation occurs (hehe :D).[br] + KVIrc triggers an event when a particular situation occurs.[br] You can define a set of event handlers for each event type.[br] An event handler is a snippet of user-defined code that gets executed when the event is triggered.[br] Event handlers can be created or destroyed by using the scriptcenter (graphic interface) @@ -63,7 +63,7 @@ Now try to connect to a server and you'll see that it joins automatically the three channels!.[br] You might also want to do some other actions just after the connection has been established, for example you might want to look immediately for a friend of yours by issuing a [cmd]whois[/cmd] - to the server (well.. you could use the notify list for that, but well, this is an example).[br] + to the server (you could use the notify list for that).[br] You can add the [cmd]whois[/cmd] request to the handler above or just create a new one:[br] [example] [cmd]event[/cmd](OnIRC,lookforfred) @@ -72,7 +72,7 @@ [cmd]whois[/cmd] fred } [/example] - (An even nicer idea would be to use the [cmd]awhois[/cmd] command...but that's left to the reader as exercise.[br] + (An even nicer idea would be to use the [cmd]awhois[/cmd] command, but that's left to the reader as an exercise.[br] To remove an event handler you still use the [cmd]event[/cmd] command, but with an empty code block:[br] [example] [cmd]event[/cmd](OnIRC,lookforfred){}[br] @@ -105,7 +105,7 @@ void KviKvsEventManager::init() { if(KviKvsEventManager::instance()) { - qDebug("WARNING: Trying to create KviKvsEventManager twice!"); + qDebug("WARNING: trying to create KviKvsEventManager twice!"); return; } (void) new KviKvsEventManager(); @@ -115,7 +115,7 @@ void KviKvsEventManager::done() { if(!KviKvsEventManager::instance()) { - qDebug("WARNING: Trying to destroy the KviKvsEventManager twice!"); + qDebug("WARNING: trying to destroy the KviKvsEventManager twice!"); return; } delete KviKvsEventManager::instance(); diff --git a/src/kvirc/kvs/event/KviKvsEventTable.cpp b/src/kvirc/kvs/event/KviKvsEventTable.cpp index 2f115dad1..786f9e27d 100644 --- a/src/kvirc/kvs/event/KviKvsEventTable.cpp +++ b/src/kvirc/kvs/event/KviKvsEventTable.cpp @@ -322,7 +322,7 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_KVS_NUM_APP_EVENTS]= is detected to be ON-Line.[br] The event is triggered in the console window or the active window of the IRC context depending on the user options.[br] - (Note: If you call [cmd]halt[/cmd] in this event, you will stop the "Nick is on irc" output, + (Note: If you call [cmd]halt[/cmd] in this event, you will stop the "Nick is on IRC" output, but this is rather a bad idea since KVIrc gives a lot of additional information to the user with some notify-methods).[br] This is a good place to play a sound or attract the user attention in some other way.[br] @@ -348,7 +348,7 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_KVS_NUM_APP_EVENTS]= has just left IRC.[br] The event is triggered in the console window or the active window of the IRC context depending on the user options.[br] - (Note: If you call [cmd]halt[/cmd] in this event, you will stop the "Nick has left irc" output, + (Note: If you call [cmd]halt[/cmd] in this event, you will stop the "Nick has left IRC" output, but this is rather a bad idea since KVIrc gives a lot of additional information to the user with some notify-methods).[br] This is a good place to play a sound or attract the user attention in some other way.[br] @@ -735,21 +735,21 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_KVS_NUM_APP_EVENTS]= A http.get command has terminated execution @parameters: $0 = status - $1 = remote url + $1 = remote URL $2 = local file $3 = magic identifier @window: Console @description: Triggered when a [cmd]http.get[/cmd] file download has terminated execution. - If the transfer has been succesfull then $0 will contain the value 1 (true), - otherwise will contain the value 0. $1 contains the remote url and $2 the local + If the transfer has been successful then $0 will contain the value 1 (true), + otherwise will contain the value 0. $1 contains the remote URL and $2 the local path on disk of the saved file. $3 contains the magic identifier passed to the http.get command by the means of the -i switch. */ EVENT("OnHTTPGetTerminated", \ "$0 = status\n" \ - "$1 = remote url\n" \ + "$1 = remote URL\n" \ "$2 = local file\n" \ "$3 = magic identifier"), @@ -932,10 +932,10 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_KVS_NUM_APP_EVENTS]= @description: Actual name is equal to the command name if command name is not null. Visible name is the link text (as it shown by user) - Command name is set if the visible name differs with the actual link target(probably contains mIRC colors,etc). It is equal to the actual target name. + Command name is set if the visible name differs with the actual link target (e.g. probably contains mIRC colors). It is equal to the actual target name. This event is triggered when an user has right clicked on an URL link in the text view. The double click link action is builtin and it causes KVIrc - to open the URL with a browser (tipically your OS default browser).[br] + to open the URL with a browser (typically your OS default browser).[br] This is a good place to show a [cmd]popup[/cmd] menu with some operations that can be performed with the URL, like bookmarking in some way or opening with a specific browser.[br] @@ -962,7 +962,7 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_KVS_NUM_APP_EVENTS]= @description: Actual name is equal to the command name if command name is not null. Visible name is the link text (as it shown by user) - Command name is set if the visible name differs with the actual link target(probably contains mIRC colors,etc). It is equal to the actual target name. + Command name is set if the visible name differs with the actual link target (e.g. probably contains mIRC colors). It is equal to the actual target name. This event is triggered when an user has right clicked on an server name link in the text view. The double click link action is builtin and it causes KVIrc to query the MOTD of the server.[br] @@ -994,13 +994,13 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_KVS_NUM_APP_EVENTS]= @description: Actual name is equal to the command name if command name is not null. Visible name is the link text (as it shown by user) - Command name is set if the visible name differs with the actual link target(probably contains mIRC colors,etc). It is equal to the actual target name. + Command name is set if the visible name differs with the actual link target (e.g. probably contains mIRC colors). It is equal to the actual target name. This event is triggered when an user has right clicked on an channel link in the text view. The double click link action is builtin and it causes KVIrc to join the channel (unless the user is already on).[br] This is a good place to show a [cmd]popup[/cmd] menu with some operations that can be performed with the channel name like bookmarking, joining with a password, - performing a [cmd]who[/cmd] etc... + performing a [cmd]who[/cmd] etc.. */ EVENT("OnChannelLinkPopupRequest", \ "$0 = actual name\n" \ @@ -1024,11 +1024,11 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_KVS_NUM_APP_EVENTS]= @description: Actual name is equal to the command name if command name is not null. Visible name is the link text (as it shown by user) - Command name is set if the visible name differs with the actual link target(probably contains mIRC colors,etc). It is equal to the actual target name. + Command name is set if the visible name differs with the actual link target (e.g. probably contains mIRC colors). It is equal to the actual target name. This event is triggered when an user has right clicked on an "unknown" nickname link in the text view.[br] This is a good place to show a [cmd]popup[/cmd] menu with some operations - that can be performed with the nickname like querying, sending a file by dcc or opening a dcc.chat. + that can be performed with the nickname like querying, sending a file by DCC or opening a dcc.chat. Please note that NOT ALL the nickname links will receive this event.[br] The nickname links that appear in the text view of the channel that they are actually in are handled by the [event:onchannelnickpopuprequest]OnChannelNickPopupRequest[/event] event.[br] @@ -1057,12 +1057,12 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_KVS_NUM_APP_EVENTS]= @description: Actual name is equal to the command name if command name is not null. Visible name is the link text (as it shown by user) - Command name is set if the visible name differs with the actual link target(probably contains mIRC colors,etc). It is equal to the actual target name. + Command name is set if the visible name differs with the actual link target (e.g. probably contains mIRC colors). It is equal to the actual target name. This event is triggered when an user has right clicked on a set of nicknames in the query target list.[br] This is a good place to show a [cmd]popup[/cmd] menu with some operations - that can be performed with the nickname like sending a file by dcc, opening a dcc.chat or - performing a whois.[br] + that can be performed with the nickname like sending a file by DCC, opening a dcc.chat or + performing a WHOIS.[br] */ EVENT("OnQueryNickPopupRequest", \ "$0 = actual name\n" \ @@ -1111,7 +1111,7 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_KVS_NUM_APP_EVENTS]= This event is triggered when an user has right clicked on a list of nicknames in the notify list (console window).[br] This is a good place to show a [cmd]popup[/cmd] with some actions that can be performed - on the nicknames like querying, performing a whois lookup or sth similar.[br] + on the nicknames like querying, performing a WHOIS lookup or something similar.[br] */ EVENT("OnNotifyListPopupRequest", \ "$0 = nickname list"), @@ -1476,8 +1476,8 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_KVS_NUM_APP_EVENTS]= Console @description: Triggered when the local user leaves the AWAY state.[br] - The $0 parameter contains the [b]unix time[/b] of the away status start.[br] - You can obtain the current [b]unix time[/b] from the function [fnc]$unixtime[/fnc].[br] + The $0 parameter contains the [b]UNIX time[/b] of the away status start.[br] + You can obtain the current [b]UNIX time[/b] from the function [fnc]$unixtime[/fnc].[br] Calling 'halt' in this event disables the server "You are no longer marked as being away" message.[br] @seealso: [event:onmeaway]OnMeAway[/event] @@ -1765,7 +1765,7 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_KVS_NUM_APP_EVENTS]= channel @description: Triggered when a channel mode has been changed, AFTER all the mode specific events - were triggered. $3 contains the unparsed mode flags (-o+b...) and $4 contains + were triggered. $3 contains the unparsed mode flags (-o+b) and $4 contains the unparsed mode parameter string (you need to split it!). */ EVENT("OnChannelModeChange", \ @@ -1890,7 +1890,7 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_KVS_NUM_APP_EVENTS]= @window: Channel @description: - Triggered when someone has set a -b flag that matches your mask (debans you) in the channel.[br] + Triggered when someone has set a -b flag that matches your mask (unbans you) in the channel.[br] @seealso: [event:onmeban]OnMeBan[/event] */ @@ -2400,7 +2400,7 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_KVS_NUM_APP_EVENTS]= @window: Channels window @description: - Triggered when someone sets a +a (has made Channel Administrator) flag on a user of the active channel. + Triggered when someone sets a +a (has made Channel administrator) flag on a user of the active channel. @seealso: [event:ondechanadmin]OnDeChanAdmin[/event] */ @@ -2475,7 +2475,7 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_KVS_NUM_APP_EVENTS]= @window: Channels window @description: - Triggered when someone sets a -a (has removed channel admin status) flag on the local user in the active channel. + Triggered when someone sets a -a (has removed channel administrator status) flag on the local user in the active channel. @seealso: [event:onmeop]OnMeOp[/event] */ @@ -3140,13 +3140,13 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_KVS_NUM_APP_EVENTS]= $1 = source user $2 = source host $3 = target - $4 = ctcp type - $5- = ctcp parameters + $4 = CTCP type + $5- = CTCP parameters @window: Console window @description: A CTCP request has been received.[br] - If you call [cmd]halt[/cmd] in this event, you will stop the further processing of the CTCP (thus, you can disable some of the KVIrc features).[br] + If you call [cmd]halt[/cmd] in this event, you will stop the further processing of the CTCP, thus, you can disable some of the KVIrc features.[br] Be careful when using this. @seealso: [event:onctcpreply]OnCTCPReply[/event] @@ -3156,8 +3156,8 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_KVS_NUM_APP_EVENTS]= "$1 = source user\n" \ "$2 = source host\n" \ "$3 = target\n" \ - "$4 = ctcp type\n" \ - "$5- = ctcp parameters"), + "$4 = CTCP type\n" \ + "$5- = CTCP parameters"), /* @doc: onctcpreply @@ -3172,13 +3172,13 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_KVS_NUM_APP_EVENTS]= $1 = source user $2 = source host $3 = target - $4 = ctcp type - $5- = ctcp parameters + $4 = CTCP type + $5- = CTCP parameters @window: Console window @description: A CTCP reply has been received.[br] - If you call [cmd]halt[/cmd] in this event, you will stop the further processing of the CTCP reply (thus, you can disable some of the KVIrc features).[br] + If you call [cmd]halt[/cmd] in this event, you will stop the further processing of the CTCP reply, thus, you can disable some of the KVIrc features.[br] Be careful when using this. @seealso: [event:onctcpreply]OnCTCPReply[/event] @@ -3188,8 +3188,8 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_KVS_NUM_APP_EVENTS]= "$1 = source user\n" \ "$2 = source host\n" \ "$3 = target\n" \ - "$4 = ctcp type\n" \ - "$5- = ctcp parameters"), + "$4 = CTCP type\n" \ + "$5- = CTCP parameters"), /* @doc: onctcpflood @@ -3204,8 +3204,8 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_KVS_NUM_APP_EVENTS]= $1 = source username $2 = source hostname $3 = target - $4 = ctcp type - $5- = ctcp parameters + $4 = CTCP type + $5- = CTCP parameters @window: Console window @description: @@ -3219,8 +3219,8 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_KVS_NUM_APP_EVENTS]= "$1 = source username\n" \ "$2 = source hostname\n" \ "$3 = target\n" \ - "$4 = ctcp type\n" \ - "$5- = ctcp parameters"), + "$4 = CTCP type\n" \ + "$5- = CTCP parameters"), /* @doc: ondccsessioncreated @@ -3629,7 +3629,7 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_KVS_NUM_APP_EVENTS]= @short: Triggered when user clicks on any URL link in any window @parameters: - $0 = url + $0 = URL @window: any @description: @@ -3637,7 +3637,7 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_KVS_NUM_APP_EVENTS]= It will be triggered only at the left mouse button click */ EVENT("OnURLLinkClick", \ - "$0 = url"), + "$0 = URL"), /* @doc: OnChannelLinkClick @@ -3694,9 +3694,9 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_KVS_NUM_APP_EVENTS]= @description: Actual name is equal to the command name if command name is not null. Visible name is the link text (as it shown by user). - Command name is set if the visible name differs with the actual link target (probably contains mIRC colors,etc). It is equal to the actual target name. + Command name is set if the visible name differs with the actual link target (e.g. probably contains mIRC colors). It is equal to the actual target name. This event is triggered when an user has double clicked on a text view and has not hit any link.[br] - I have no idea what you can do in this event....maybe some sort of channel-central dialog? :) + I have no idea what you can do in this event, maybe some sort of channel-central dialog? :) */ EVENT("OnTextViewDoubleClicked",""), @@ -3717,7 +3717,7 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_KVS_NUM_APP_EVENTS]= @description: Actual name is equal to the command name if command name is not null. Visible name is the link text (as it shown by user) - Command name is set if the visible name differs with the actual link target(probably contains mIRC colors,etc). It is equal to the actual target name. + Command name is set if the visible name differs with the actual link target (e.g. probably contains mIRC colors). It is equal to the actual target name. This event is triggered when an user has double clicked on a nickname link.[br] You should use this event to perform some significant action associated with the double click.[br] A good example might be a [cmd]whois[/cmd] or a [cmq]query[/cmd] call.[br] @@ -3767,11 +3767,11 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_KVS_NUM_APP_EVENTS]= @description: Actual name is equal to the command name if command name is not null. Visible name is the link text (as it shown by user) - Command name is set if the visible name differs with the actual link target(probably contains mIRC colors,etc). It is equal to the actual target name. + Command name is set if the visible name differs with the actual link target (e.g. probably contains mIRC colors). It is equal to the actual target name. This event is triggered when an user has double clicked on a nickname in the query target list.[br] You should use this event to do some significant action associated with the double click.[br] - A good example might be a [cmd]whois[/cmd] query or a [cmd]dcc.chat[/cmd] + A good example might be a [cmd]WHOIS[/cmd] query or a [cmd]dcc.chat[/cmd] */ EVENT("OnQueryNickDefaultActionRequest", \ "$0 = actual name\n" \ @@ -3814,7 +3814,7 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_KVS_NUM_APP_EVENTS]= Any window @description: This event is triggered when the user paste some text on the input bar.[br] - You can check the text, insert any other text and halt the orginal from being inserted in the input bar.[br] + You can check the text, insert any other text and halt the original from being inserted in the input bar.[br] Note that the text can contains binary data, end-of-line or other characters that could need a special treatment then parsed. @seealso: [cmd]window.insertInInputText[cmd] @@ -3872,7 +3872,7 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_KVS_NUM_APP_EVENTS]= Console window @description: A NOTICE directed to a special target has been received. - A special target is actually anything that kvirc couldn't + A special target is actually anything that KVIrc couldn't recognize: not the local user nor a channel. @seealso: [event:onservernotice]OnServerNotice[/event] @@ -3978,7 +3978,7 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_KVS_NUM_APP_EVENTS]= @window: Channel @description: - Triggered when someone has set a -q flag that matches your mask (quiet debans you) in the channel.[br] + Triggered when someone has set a -q flag that matches your mask (quiet unbans you) in the channel.[br] @seealso: [event:onmequietban]OnMeQuietBan[/event] */ diff --git a/src/kvirc/kvs/object/KviKvsObject.cpp b/src/kvirc/kvs/object/KviKvsObject.cpp index 20587ec70..c0c9f1864 100644 --- a/src/kvirc/kvs/object/KviKvsObject.cpp +++ b/src/kvirc/kvs/object/KviKvsObject.cpp @@ -208,7 +208,7 @@ Any object class (be patient... I'll explain classes in a while) identifier can be stored in any KVIrc variable: it is not possible to find out the object features by "examining" its identifier. This may make the usage of objects a bit "unclear"; - Howewer, with some experience you will be able to use the objects in a very powerful way. + However, with some experience you will be able to use the objects in a very powerful way. The type-safety can be also simulated by a careful usage of object names; in the above example, the %myobj object was created with the "userDescription" name. The storetofile alias could check the passed object's name and refuse to work @@ -280,7 +280,7 @@ In the parent destructor the children have been counted and listed.[br] Then the parent object is destroyed causing to:[br] - trigger the parent destructor.[br] - - destroy all the children (and conseguently trigger all the "individual" destructors).[br][br] + - destroy all the children (and consequently trigger all the "individual" destructors).[br][br] Not all the object functions must return a value: If a function does not return a meaningful value, or you just want to ignore it, you can call it in the following way:[br] @@ -326,7 +326,7 @@ function ipnumber() { find the nearest DNS server - make the dns call + make the DNS call wait for the response decode the response } @@ -618,7 +618,7 @@ Int, UInt, Bool and enumeration types.[br] For example, the widget's x coordinate can be retrieved by using the [classfnc]$x[/classfnc]() function or by calling $property(x).[br] - There are many properties that are available ony through the [classfnc]$property[/classfnc]() call:[br] + There are many properties that are available only through the [classfnc]$property[/classfnc]() call:[br] For example, you can find out if the widget accepts drops by calling [classfnc]$property[/classfnc](acceptDrops).[br] This function will be mainly useful in the [class]wrapper[/class] class. !fn: $setProperty(<Qt property>,<property value>) diff --git a/src/kvirc/kvs/object/KviKvsObjectClass.h b/src/kvirc/kvs/object/KviKvsObjectClass.h index 0845c1cb6..58048ccad 100644 --- a/src/kvirc/kvs/object/KviKvsObjectClass.h +++ b/src/kvirc/kvs/object/KviKvsObjectClass.h @@ -93,9 +93,9 @@ public: // registers an empty handler that returns "nothing" void registerStandardNothingReturnFunctionHandler(const QString & szFunc); - // retisters an empty handler that returns $true + // registers an empty handler that returns $true void registerStandardTrueReturnFunctionHandler(const QString & szFunc); - // retisters an empty handler that returns $false + // registers an empty handler that returns $false void registerStandardFalseReturnFunctionHandler(const QString & szFunc); KviKvsObjectFunctionHandler * lookupFunctionHandler(const QString & szFunc){ return m_pFunctionHandlers->find(szFunc); }; diff --git a/src/kvirc/kvs/object/KviKvsObjectController.cpp b/src/kvirc/kvs/object/KviKvsObjectController.cpp index af2957000..0b1fe052c 100644 --- a/src/kvirc/kvs/object/KviKvsObjectController.cpp +++ b/src/kvirc/kvs/object/KviKvsObjectController.cpp @@ -195,7 +195,7 @@ void KviKvsObjectController::flushUserClasses() if(c->save(szPath)) c->clearDirtyFlag(); else - qDebug("Oops.. failed to save the object class %s",c->name().toLatin1().data()); + qDebug("Oops! Failed to save the object class %s",c->name().toLatin1().data()); } } ++it; @@ -211,7 +211,7 @@ KviKvsObjectClass * KviKvsObjectController::lookupClass(const QString &szClass,b KviModule * pModule = g_pModuleManager->getModule("objects"); if(!pModule) { - qDebug("ops...something wrong with the libkviobjects module!"); + qDebug("Oops! something wrong with the libkviobjects module!"); return 0; } else pC = m_pClassDict->find(szClass); if(!pC) diff --git a/src/kvirc/kvs/parser/KviKvsParser.cpp b/src/kvirc/kvs/parser/KviKvsParser.cpp index 8b56777f5..afd791e03 100644 --- a/src/kvirc/kvs/parser/KviKvsParser.cpp +++ b/src/kvirc/kvs/parser/KviKvsParser.cpp @@ -356,7 +356,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const QChar * pBuffer directly in the command input window. You must remember that the command input window needs a leading slash ('/') character to recognize a script. - The command input window can also be put in multiline mode by clicking + The command input window can also be put in multi-line mode by clicking on the button on the right. Another alternative for testing scripts is the code tester window. You can access it by selecting "New code tester" from the Scripting menu @@ -462,7 +462,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const QChar * pBuffer [/example] The first example will print out with spaces simplified but the second not. The quotes are also a nice trick to embed spaces into a single parameter that - would be obviously splitted in two or more. + would be obviously split in two or more. [example] [cmd]echo[/cmd] Parameter1 Parameter2 "Parameter 3 ( with spaces )" Parameter4 [/example] @@ -622,7 +622,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const QChar * pBuffer while most text/code editors usually come with 8 characters as default. [/p] - [big]And now ?[/big] + [big]And now?[/big] [p] You're now ready to really start experimenting with KVS. You can take a look at the [doc:commands]command index[/doc] and start trying to use them @@ -823,7 +823,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const QChar * pBuffer [/example] This will add the alias "sum3" and make it available both as a command and a function. The "return" command sets the return value of a sequence of commands - (an alias is a sequence of commands...remember ?) and terminates the execution (by returning + (an alias is a sequence of commands...remember?) and terminates the execution (by returning the control to the caller). So return $($0 + $1 + $2); will set the return value of the alias to the value computed by $($0 + $1 + $2), which is the sum of the first three parameters passed. @@ -834,7 +834,7 @@ 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. + Oops! I've used some variables without actually explaining them, 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: [example] @@ -902,7 +902,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const QChar * pBuffer to the windows specified by <window_id>. It is useful to launch commands in windows that are not the current one. For example, you might want to say something in a specific channel while processing an event bound to - a console, or say something in all the channels bound to the current irc context. + a console, or say something in all the channels bound to the current IRC context. The examples below will make everything clear. @examples: [example] @@ -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 complexer scripts or other aliases in case that a + it might be commonly called from more complex scripts or other aliases in case that a kick & ban action is needed. [/p] [p] @@ -1226,7 +1226,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const QChar * pBuffer [/example] This will add the alias "sum3" and make it available both as a command and a function. The "return" command sets the return value of a sequence of commands - (an alias is a sequence of commands...remember ?) and terminates the execution (by returning + (an alias is a sequence of commands...remember?) and terminates the execution (by returning the control to the caller). So return $($0 + $1 + $2); will set the return value of the alias to the value computed by $($0 + $1 + $2) that actually is the sum of the first three parameters passed. @@ -1237,8 +1237,8 @@ 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. - This example is again really simple, but you might have complexer function-aliases. + Oops! 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: [example] /sum3 1 2 3 @@ -1404,7 +1404,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const QChar * pBuffer [/p] [p] Hint: Remember that your addon is going to be installed on different platforms - (at least linux, macosx and windows based). + (at least Linux, OS X and Windows based). The poor windows' notepad has serious problems with reading text files that contain only linefeeds as line separators. Keep it in mind... [/p] @@ -1550,7 +1550,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const QChar * pBuffer [/p] [p] The help callback will be invoked by KVIrc when the user will ask help for your addon (mainly - from the addon management dialog, but not necessairly). It should call [cmd]help.open[/cmd] + from the addon management dialog, but not necessarily). It should call [cmd]help.open[/cmd] with the name of your documentation index html file (it should be relative to the help language directory: help.open myaddon/index.html will automatically lookup the right language). If you provide no help callback, the buttons @@ -1560,7 +1560,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const QChar * pBuffer [p] The configuration callback will be invoked when the user will try to configure your addon from the addon management dialog. This callback is useful - mainly for complexier graphical scripts that can show up a dialog + mainly for more complex graphical scripts that can show up a dialog that allows configuring all of the addon features. To use this callback you will probably need some object scripting. [/p] @@ -2241,7 +2241,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const QChar * pBuffer [p] As stated above variables start their existence when you assign something to them. After a variable has been created it persists until it goes out of his scope (remember - about local and global variables ?) or you explicitly destroy it. You will usually + about local and global variables?) or you explicitly destroy it. You will usually not care about it and just leave the KVS engine to do his cleaning job but it's still worth knowing that you actually can force KVIrc to free the memory used by a variable. [/p] @@ -3365,7 +3365,7 @@ KviKvsTreeNodeData * KviKvsParser::parseArrayIndex() case 0: delete l; warning(pBegin,__tr2qs_ctx("Unterminated array index","kvs")); - error(KVSP_curCharPointer,__tr2qs_ctx("Unexpected end of script in array index (missing ']' character ?)","kvs")); + error(KVSP_curCharPointer,__tr2qs_ctx("Unexpected end of script in array index (missing ']' character?)","kvs")); return 0; break; case '\n': @@ -3384,7 +3384,7 @@ KviKvsTreeNodeData * KviKvsParser::parseArrayIndex() switch(KVSP_curCharUnicode) { case 0: - error(KVSP_curCharPointer,__tr2qs_ctx("Unexpected end of script in array index (missing ']' character ?)","kvs")); + error(KVSP_curCharPointer,__tr2qs_ctx("Unexpected end of script in array index (missing ']' character?)","kvs")); break; case '\n': error(KVSP_curCharPointer,__tr2qs_ctx("Unexpected end of line in array index (missing ']' character or unescaped newline)","kvs")); @@ -3474,7 +3474,7 @@ KviKvsTreeNodeData * KviKvsParser::parseHashKey() case 0: delete l; warning(pBegin,__tr2qs_ctx("Unterminated hash key","kvs")); - error(KVSP_curCharPointer,__tr2qs_ctx("Unexpected end of script in hash key (missing '}' character ?)","kvs")); + error(KVSP_curCharPointer,__tr2qs_ctx("Unexpected end of script in hash key (missing '}' character?)","kvs")); return 0; break; case '\r': @@ -3760,7 +3760,7 @@ KviKvsTreeNodeData * KviKvsParser::parseStringParameter() case 0: delete l; warning(pBegin,__tr2qs_ctx("Unterminated string constant","kvs")); - error(KVSP_curCharPointer,__tr2qs_ctx("Unexpected end of script in string constant (missing \" character ?)","kvs")); + error(KVSP_curCharPointer,__tr2qs_ctx("Unexpected end of script in string constant (missing \" character?)","kvs")); return 0; break; case '\r': diff --git a/src/kvirc/kvs/parser/KviKvsParser_comment.cpp b/src/kvirc/kvs/parser/KviKvsParser_comment.cpp index a048a1a07..13e9b0bf6 100644 --- a/src/kvirc/kvs/parser/KviKvsParser_comment.cpp +++ b/src/kvirc/kvs/parser/KviKvsParser_comment.cpp @@ -56,8 +56,8 @@ KviKvsTreeNode * KviKvsParser::parseComment() switch(KVSP_curCharUnicode) { case 0: - warning(pBegin,__tr2qs_ctx("Unterminated c-style multiline comment","kvs")); - error(KVSP_curCharPointer,__tr2qs_ctx("Unexpected end of script in multiline comment","kvs")); + warning(pBegin,__tr2qs_ctx("Unterminated c-style multi-line comment","kvs")); + error(KVSP_curCharPointer,__tr2qs_ctx("Unexpected end of script in multi-line comment","kvs")); return 0; break; case '*': diff --git a/src/kvirc/kvs/parser/KviKvsParser_dollar.cpp b/src/kvirc/kvs/parser/KviKvsParser_dollar.cpp index 462cc1471..e7c644d49 100644 --- a/src/kvirc/kvs/parser/KviKvsParser_dollar.cpp +++ b/src/kvirc/kvs/parser/KviKvsParser_dollar.cpp @@ -116,7 +116,7 @@ KviKvsTreeNodeData * KviKvsParser::parseDollar(bool bInObjScope) QString szNum1(pBegin,KVSP_curCharPointer - pBegin); bool bOk; int iNum1 = szNum1.toInt(&bOk); - if(!bOk)qDebug("Ops... a non-number made by numbers ?"); + if(!bOk)qDebug("Oops! A non-number made by numbers?"); if(KVSP_curCharUnicode != '-') { @@ -146,7 +146,7 @@ KviKvsTreeNodeData * KviKvsParser::parseDollar(bool bInObjScope) QString szNum2(pBegin,KVSP_curCharPointer - pBegin); int iNum2 = szNum2.toInt(&bOk); - if(!bOk)qDebug("Ops... a non-number made by numbers (2) ?"); + if(!bOk)qDebug("Oops! A non-number made by numbers (2)?"); if(iNum1 < iNum2)return new KviKvsTreeNodeMultipleParameterIdentifier(pDollarBegin,iNum1,iNum2); else { diff --git a/src/kvirc/kvs/parser/KviKvsParser_specialCommands.cpp b/src/kvirc/kvs/parser/KviKvsParser_specialCommands.cpp index 40480d6d0..d75fb77ac 100644 --- a/src/kvirc/kvs/parser/KviKvsParser_specialCommands.cpp +++ b/src/kvirc/kvs/parser/KviKvsParser_specialCommands.cpp @@ -1355,7 +1355,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandSwitch() break; } [/example] - [comment]# A complexer example: change the 1 in 2 or 3[/comment] + [comment]# A more complex example: change the 1 in 2 or 3[/comment] [example] %tmp = 1 switch(%tmp) diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeAliasSimpleCommand.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeAliasSimpleCommand.cpp index 6ab9c19e6..3e9d02680 100644 --- a/src/kvirc/kvs/tree/KviKvsTreeNodeAliasSimpleCommand.cpp +++ b/src/kvirc/kvs/tree/KviKvsTreeNodeAliasSimpleCommand.cpp @@ -99,7 +99,7 @@ bool KviKvsTreeNodeAliasSimpleCommand::execute(KviKvsRunTimeContext * c) c->window()->output(KVI_OUT_RAW,__tr2qs_ctx("[RAW]: %Q","kvs"),&szAll); return true; no_way_to_send_as_raw: - c->warning(this,__tr2qs_ctx("Failed to send an unknown command as /raw","kvs")); + c->warning(this,__tr2qs_ctx("Failed to send an unknown command as /RAW","kvs")); c->error(this,__tr2qs_ctx("Call to undefined command '%Q'","kvs"),&m_szCmdName); return false; } else { diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandDefpopup.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandDefpopup.cpp index bb7a66b08..7e69ba1e5 100644 --- a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandDefpopup.cpp +++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandDefpopup.cpp @@ -33,7 +33,7 @@ void KviKvsTreeNodeSpecialCommandDefpopupLabelExtpopup::contextDescription(QString &szBuffer) { - szBuffer = "Label \"extpopup\" For Special Command \"defpopup\""; + szBuffer = "Label \"extpopup\" for Special Command \"defpopup\""; } void KviKvsTreeNodeSpecialCommandDefpopupLabelExtpopup::dump(const char * prefix) @@ -68,7 +68,7 @@ bool KviKvsTreeNodeSpecialCommandDefpopupLabelExtpopup::execute(KviKvsRunTimeCon void KviKvsTreeNodeSpecialCommandDefpopupLabelItem::contextDescription(QString &szBuffer) { - szBuffer = "Label \"item\" For Special Command \"defpopup\""; + szBuffer = "Label \"item\" for Special Command \"defpopup\""; } @@ -103,7 +103,7 @@ bool KviKvsTreeNodeSpecialCommandDefpopupLabelItem::execute(KviKvsRunTimeContext void KviKvsTreeNodeSpecialCommandDefpopupLabelLabel::contextDescription(QString &szBuffer) { - szBuffer = "Label \"label\" For Special Command \"defpopup\""; + szBuffer = "Label \"label\" for Special Command \"defpopup\""; } @@ -134,7 +134,7 @@ bool KviKvsTreeNodeSpecialCommandDefpopupLabelLabel::execute(KviKvsRunTimeContex void KviKvsTreeNodeSpecialCommandDefpopupLabelSeparator::contextDescription(QString &szBuffer) { - szBuffer = "Label \"separator\" For Special Command \"defpopup\""; + szBuffer = "Label \"separator\" for Special Command \"defpopup\""; } @@ -155,7 +155,7 @@ bool KviKvsTreeNodeSpecialCommandDefpopupLabelSeparator::execute(KviKvsRunTimeCo void KviKvsTreeNodeSpecialCommandDefpopupLabelEpilogue::contextDescription(QString &szBuffer) { - szBuffer = "Label \"epilogue\" For Special Command \"defpopup\""; + szBuffer = "Label \"epilogue\" for Special Command \"defpopup\""; } @@ -177,7 +177,7 @@ bool KviKvsTreeNodeSpecialCommandDefpopupLabelEpilogue::execute(KviKvsRunTimeCon void KviKvsTreeNodeSpecialCommandDefpopupLabelPrologue::contextDescription(QString &szBuffer) { - szBuffer = "Label \"prologue\" For Special Command \"defpopup\""; + szBuffer = "Label \"prologue\" for Special Command \"defpopup\""; } void KviKvsTreeNodeSpecialCommandDefpopupLabelPrologue::dump(const char * prefix) @@ -210,7 +210,7 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup::~KviKvsTreeNodeSpecialCommandDef void KviKvsTreeNodeSpecialCommandDefpopupLabelPopup::contextDescription(QString &szBuffer) { - szBuffer = "Label \"popup\" For Special Command \"defpopup\""; + szBuffer = "Label \"popup\" for Special Command \"defpopup\""; } diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandSwitch.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandSwitch.cpp index a0c246347..34327951e 100644 --- a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandSwitch.cpp +++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandSwitch.cpp @@ -70,7 +70,7 @@ KviKvsTreeNodeSpecialCommandSwitchLabelCase::~KviKvsTreeNodeSpecialCommandSwitch void KviKvsTreeNodeSpecialCommandSwitchLabelCase::contextDescription(QString &szBuffer) { - szBuffer = "Label \"case\" For Special Command \"switch\""; + szBuffer = "Label \"case\" for Special Command \"switch\""; } void KviKvsTreeNodeSpecialCommandSwitchLabelCase::dump(const char * prefix) @@ -111,7 +111,7 @@ bool KviKvsTreeNodeSpecialCommandSwitchLabelCase::execute(KviKvsRunTimeContext * } } } else { - // string comparision, case insensitive + // string comparison, case insensitive QString reg; v.asString(reg); @@ -148,7 +148,7 @@ KviKvsTreeNodeSpecialCommandSwitchLabelMatch::~KviKvsTreeNodeSpecialCommandSwitc void KviKvsTreeNodeSpecialCommandSwitchLabelMatch::contextDescription(QString &szBuffer) { - szBuffer = "Label \"match\" For Special Command \"switch\""; + szBuffer = "Label \"match\" for Special Command \"switch\""; } void KviKvsTreeNodeSpecialCommandSwitchLabelMatch::dump(const char * prefix) @@ -204,7 +204,7 @@ KviKvsTreeNodeSpecialCommandSwitchLabelRegexp::~KviKvsTreeNodeSpecialCommandSwit void KviKvsTreeNodeSpecialCommandSwitchLabelRegexp::contextDescription(QString &szBuffer) { - szBuffer = "Label \"regexp\" For Special Command \"switch\""; + szBuffer = "Label \"regexp\" for Special Command \"switch\""; } void KviKvsTreeNodeSpecialCommandSwitchLabelRegexp::dump(const char * prefix) @@ -260,7 +260,7 @@ KviKvsTreeNodeSpecialCommandSwitchLabelDefault::~KviKvsTreeNodeSpecialCommandSwi void KviKvsTreeNodeSpecialCommandSwitchLabelDefault::contextDescription(QString &szBuffer) { - szBuffer = "Label \"default\" For Special Command \"switch\""; + szBuffer = "Label \"default\" for Special Command \"switch\""; } void KviKvsTreeNodeSpecialCommandSwitchLabelDefault::dump(const char * prefix) |
