From c8ba5d212c9da7d11f08684c5d244cfaad4d0032 Mon Sep 17 00:00:00 2001 From: Fabio Bas Date: Tue, 31 Aug 2010 09:10:41 +0000 Subject: applied typo fixes for the "file" and "config" modules (thank OmegaPhil) fixed fsf address in python/pythoncore modules fixed "space before comma" in documentation/coments/code regenerated translations git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@4954 17fca916-40b9-46aa-a4ea-0a15b648b75c --- src/kvilib/core/kvi_error.cpp | 2 +- src/kvilib/core/kvi_malloc.cpp | 2 +- src/kvilib/core/kvi_memmove.cpp | 14 ++-- src/kvilib/core/kvi_qstring.cpp | 10 +-- src/kvilib/core/kvi_strasm.h | 2 +- src/kvilib/core/kvi_string.cpp | 58 ++++++++-------- src/kvilib/core/kvi_string.h | 22 +++--- src/kvilib/ext/kvi_animatedpixmap.h | 3 +- src/kvilib/ext/kvi_config.cpp | 4 +- src/kvilib/ext/kvi_config.h | 6 +- src/kvilib/ext/kvi_crypt.cpp | 8 +-- src/kvilib/ext/kvi_crypt.h | 2 +- src/kvilib/ext/kvi_mediatype.cpp | 8 +-- src/kvilib/ext/kvi_msgtype.h | 2 +- src/kvilib/ext/kvi_proxydb.h | 2 +- src/kvilib/ext/kvi_regchan.cpp | 2 +- src/kvilib/ext/kvi_regusersdb.cpp | 6 +- src/kvilib/ext/kvi_regusersdb.h | 4 +- src/kvilib/ext/kvi_sharedfiles.cpp | 6 +- src/kvilib/file/kvi_fileutils.cpp | 4 +- src/kvilib/irc/kvi_avatar.cpp | 2 +- src/kvilib/irc/kvi_ircmask.cpp | 16 ++--- src/kvilib/irc/kvi_ircmask.h | 10 +-- src/kvilib/irc/kvi_ircserverdb.cpp | 2 +- src/kvilib/irc/kvi_mirccntrl.cpp | 20 +++--- src/kvilib/irc/kvi_mirccntrl.h | 8 +-- src/kvilib/irc/kvi_nickserv.cpp | 4 +- src/kvilib/net/kvi_dns.h | 4 +- src/kvilib/net/kvi_http.cpp | 4 +- src/kvilib/net/kvi_http.h | 2 +- src/kvilib/net/kvi_netutils.cpp | 2 +- src/kvilib/net/kvi_socket.h | 2 +- src/kvilib/net/kvi_ssl.h | 6 +- src/kvilib/system/kvi_env.cpp | 6 +- src/kvilib/system/kvi_locale.cpp | 8 +-- src/kvilib/system/kvi_locale.h | 4 +- src/kvilib/system/kvi_thread.cpp | 10 +-- src/kvilib/system/kvi_thread.h | 8 +-- src/kvilib/system/kvi_time.h | 2 +- src/kvirc/kernel/kvi_action.cpp | 2 +- src/kvirc/kernel/kvi_actionmanager.h | 2 +- src/kvirc/kernel/kvi_app.cpp | 6 +- src/kvirc/kernel/kvi_app.h | 2 +- src/kvirc/kernel/kvi_app_fs.cpp | 4 +- src/kvirc/kernel/kvi_app_setup.cpp | 12 ++-- src/kvirc/kernel/kvi_filetransfer.h | 2 +- src/kvirc/kernel/kvi_iconmanager.cpp | 2 +- src/kvirc/kernel/kvi_internalcmd.cpp | 2 +- src/kvirc/kernel/kvi_ircconnection.cpp | 6 +- .../kernel/kvi_ircconnectiontargetresolver.cpp | 4 +- src/kvirc/kernel/kvi_irccontext.cpp | 2 +- src/kvirc/kernel/kvi_irclink.cpp | 2 +- src/kvirc/kernel/kvi_ircsocket.cpp | 8 +-- src/kvirc/kernel/kvi_lagmeter.cpp | 6 +- src/kvirc/kernel/kvi_notifylist.cpp | 30 ++++----- src/kvirc/kernel/kvi_options.cpp | 20 +++--- src/kvirc/kernel/kvi_options.h | 2 +- src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp | 12 ++-- src/kvirc/kvs/kvi_kvs_corefunctions_gl.cpp | 2 +- src/kvirc/kvs/kvi_kvs_corefunctions_sz.cpp | 2 +- src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp | 14 ++-- src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp | 4 +- src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp | 12 ++-- src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp | 10 +-- src/kvirc/kvs/kvi_kvs_eventhandler.h | 2 +- src/kvirc/kvs/kvi_kvs_eventmanager.cpp | 4 +- src/kvirc/kvs/kvi_kvs_eventtable.cpp | 28 ++++---- src/kvirc/kvs/kvi_kvs_object.cpp | 4 +- src/kvirc/kvs/kvi_kvs_parser.cpp | 50 +++++++------- src/kvirc/kvs/kvi_kvs_parser_command.cpp | 4 +- src/kvirc/kvs/kvi_kvs_parser_comment.cpp | 2 +- src/kvirc/kvs/kvi_kvs_parser_expression.cpp | 2 +- src/kvirc/kvs/kvi_kvs_parser_lside.cpp | 2 +- src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp | 20 +++--- src/kvirc/kvs/kvi_kvs_popupmenu.h | 6 +- src/kvirc/kvs/kvi_kvs_treenode_data.cpp | 2 +- src/kvirc/module/kvi_mexserverimport.cpp | 2 +- src/kvirc/module/kvi_mextoolbar.cpp | 2 +- src/kvirc/module/kvi_mextoolbar.h | 2 +- src/kvirc/module/kvi_module.cpp | 2 +- src/kvirc/module/kvi_module.h | 2 +- src/kvirc/module/kvi_moduleextension.h | 2 +- src/kvirc/module/kvi_modulemanager.cpp | 2 +- src/kvirc/sparser/kvi_antispam.cpp | 4 +- src/kvirc/sparser/kvi_sp_ctcp.cpp | 2 +- src/kvirc/sparser/kvi_sp_literal.cpp | 14 ++-- src/kvirc/sparser/kvi_sp_numeric.cpp | 6 +- src/kvirc/ui/kvi_channel.cpp | 2 +- src/kvirc/ui/kvi_customtoolbar.cpp | 4 +- src/kvirc/ui/kvi_filedialog.cpp | 16 ++--- src/kvirc/ui/kvi_frame.cpp | 46 ++++++------- src/kvirc/ui/kvi_frame.h | 2 +- src/kvirc/ui/kvi_imagedialog.h | 2 +- src/kvirc/ui/kvi_input.cpp | 2 +- src/kvirc/ui/kvi_ipeditor.cpp | 8 +-- src/kvirc/ui/kvi_ipeditor.h | 2 +- src/kvirc/ui/kvi_ircview.cpp | 36 +++++----- src/kvirc/ui/kvi_ircview_events.cpp | 4 +- src/kvirc/ui/kvi_ircview_gettextline.cpp | 4 +- src/kvirc/ui/kvi_msgbox.h | 4 +- src/kvirc/ui/kvi_query.cpp | 2 +- src/kvirc/ui/kvi_selectors.cpp | 6 +- src/kvirc/ui/kvi_statusbarapplet.h | 2 +- src/kvirc/ui/kvi_topicw.h | 2 +- src/kvirc/ui/kvi_userlistview.cpp | 28 ++++---- src/kvirc/ui/kvi_window.cpp | 2 +- src/kvirc/ui/kvi_window.h | 2 +- src/kvirc/ui/kvi_windowlist.cpp | 2 +- src/kvirc/ui/kvi_windowlist.h | 2 +- src/kvirc/ui/kvi_windowlist_tree.cpp | 6 +- src/kvirc/ui/kvi_windowlist_tree.h | 2 +- src/modules/about/libkviabout.cpp | 2 +- src/modules/action/libkviaction.cpp | 2 +- src/modules/config/libkviconfig.cpp | 39 ++++++----- src/modules/dcc/broker.cpp | 2 +- src/modules/dcc/canvaswidget.h | 10 +-- src/modules/dcc/chat.h | 4 +- src/modules/dcc/descriptor.h | 2 +- src/modules/dcc/dialogs.cpp | 4 +- src/modules/dcc/dialogs.h | 4 +- src/modules/dcc/libkvidcc.cpp | 12 ++-- src/modules/dcc/marshal.cpp | 2 +- src/modules/dcc/requests.cpp | 4 +- src/modules/dcc/send.h | 2 +- src/modules/dcc/voice.cpp | 8 +-- src/modules/dcc/window.h | 2 +- src/modules/dialog/libkvidialog.cpp | 44 ++++++------ src/modules/file/libkvifile.cpp | 78 +++++++++++----------- .../filetransferwindow/filetransferwindow.cpp | 2 +- .../filetransferwindow/filetransferwindow.h | 2 +- src/modules/help/libkvihelp.cpp | 2 +- src/modules/iograph/libkviiograph.h | 2 +- src/modules/lamerizer/libkvilamerizer.cpp | 4 +- src/modules/links/linkswindow.cpp | 2 +- src/modules/logview/logviewmdiwindow.h | 2 +- src/modules/mediaplayer/libkvimediaplayer.cpp | 4 +- src/modules/mediaplayer/mp_interface.h | 2 +- src/modules/mediaplayer/mp_mp3.cpp | 2 +- src/modules/mediaplayer/mp_mprisinterface.cpp | 6 +- src/modules/mediaplayer/winamp.cpp | 2 +- src/modules/notifier/notifiersettings.h | 2 +- src/modules/objects/class_buttongroup.h | 2 +- src/modules/objects/class_ftp.cpp | 2 +- src/modules/objects/class_groupbox.cpp | 2 +- src/modules/objects/class_layout.cpp | 2 +- src/modules/objects/class_multilineedit.cpp | 18 ++--- src/modules/objects/class_socket.cpp | 18 ++--- src/modules/objects/class_sql.cpp | 2 +- src/modules/objects/class_widget.cpp | 14 ++-- src/modules/objects/class_workspace.cpp | 2 +- src/modules/options/instances.cpp | 2 +- src/modules/options/libkvioptions.cpp | 4 +- src/modules/popupeditor/popupeditor.h | 2 +- src/modules/python/libkvipython.cpp | 2 +- src/modules/pythoncore/kvircmodule.cpp | 2 +- src/modules/pythoncore/kvircmodule.h | 2 +- src/modules/pythoncore/libkvipythoncore.cpp | 2 +- src/modules/raweditor/raweditor.h | 2 +- src/modules/reguser/dialog.cpp | 2 +- src/modules/reguser/edituser.cpp | 2 +- src/modules/reguser/libkvireguser.cpp | 24 +++---- src/modules/rijndael/libkvirijndael.cpp | 4 +- src/modules/rijndael/libkvirijndael.h | 2 +- src/modules/rijndael/libkvirijndael_cryptopp.cpp | 4 +- src/modules/rijndael/rijndael.cpp | 2 +- src/modules/rijndael/rijndael.h | 10 +-- src/modules/rot13/libkvirot13.cpp | 4 +- src/modules/setup/libkvisetup.cpp | 2 +- src/modules/setup/setupwizard.cpp | 6 +- src/modules/sharedfile/libkvisharedfile.cpp | 2 +- .../sharedfileswindow/sharedfileswindow.cpp | 2 +- src/modules/sharedfileswindow/sharedfileswindow.h | 2 +- src/modules/snd/libkvisnd.cpp | 2 +- src/modules/socketspy/socketspywindow.cpp | 2 +- src/modules/str/libkvistr.cpp | 2 +- src/modules/system/libkvisystem.cpp | 2 +- src/modules/tip/libkvitip.cpp | 2 +- src/modules/torrent/tc_ktorrentdbusinterface.cpp | 6 +- src/modules/trayicon/libkvitrayicon.cpp | 46 ++++++------- src/modules/upnp/manager.cpp | 2 +- src/modules/upnp/service.cpp | 8 +-- src/modules/url/libkviurl.cpp | 2 +- src/modules/window/libkviwindow.cpp | 4 +- 183 files changed, 646 insertions(+), 646 deletions(-) (limited to 'src') diff --git a/src/kvilib/core/kvi_error.cpp b/src/kvilib/core/kvi_error.cpp index 6541778be..dacc6bf7b 100644 --- a/src/kvilib/core/kvi_error.cpp +++ b/src/kvilib/core/kvi_error.cpp @@ -151,7 +151,7 @@ const char * g_errorTable[KVI_NUM_ERRORS]= __tr_no_lookup("Unexpected end in expression"), __tr_no_lookup("Unexpected end in array index"), __tr_no_lookup("Connection thru HTTP proxy failed"), - __tr_no_lookup("Case , match , regexp , default or break keyword expected"), + __tr_no_lookup("Case, match, regexp, default or break keyword expected"), __tr_no_lookup("Access denied"), __tr_no_lookup("Address already in use"), __tr_no_lookup("Can't assign the requested address"), diff --git a/src/kvilib/core/kvi_malloc.cpp b/src/kvilib/core/kvi_malloc.cpp index 1b204ef4e..a554b2ede 100644 --- a/src/kvilib/core/kvi_malloc.cpp +++ b/src/kvilib/core/kvi_malloc.cpp @@ -25,7 +25,7 @@ //============================================================================= // C memory allocation routines // This stuff is rather unused, because in normal compilations -// kvi_malloc , kvi_free and kvi_realloc are macros (see kvi_malloc.h) +// kvi_malloc, kvi_free and kvi_realloc are macros (see kvi_malloc.h) //============================================================================= diff --git a/src/kvilib/core/kvi_memmove.cpp b/src/kvilib/core/kvi_memmove.cpp index 6c72f1542..46ba5844e 100644 --- a/src/kvilib/core/kvi_memmove.cpp +++ b/src/kvilib/core/kvi_memmove.cpp @@ -58,7 +58,7 @@ asm(" decl %edi"); // %edi--; (dst_ptr--); asm(" std"); // set direction flag (decrement esi and edi in movsb) // Optimization : check for non-odd len (1,3,5,7...) - asm(" shr $1,%ecx"); // %ecx >> 1 , shifted bit -> CF + asm(" shr $1,%ecx"); // %ecx >> 1, shifted bit -> CF asm(" jnc move_two_bytes_top_to_bottom_directly"); // if !carry (CF == 0) skip this move // Move the first byte (non-odd) asm(" movsb %ds:(%esi),%es:(%edi)"); // *dst-- = *src-- if DF else *dst++ = *src++ @@ -66,7 +66,7 @@ asm(" decl %esi"); // %esi--; (src_ptr--); asm(" decl %edi"); // %edi--; (dst_ptr--); asm("move_two_bytes_top_to_bottom:"); - asm(" shr $1,%ecx"); // %ecx >> 1 , shifted bit -> CF + asm(" shr $1,%ecx"); // %ecx >> 1, shifted bit -> CF asm(" jnc move_the_rest_top_to_bottom_directly"); // if !carry (CF == 0) skip this move // Move the next two bytes asm(" movsw %ds:(%esi),%es:(%edi)"); // *((word *)dst)-- = *((word)src)-- if DF else *((word *)dst)++ = *((word)src)++ @@ -78,13 +78,13 @@ asm("move_from_bottom_to_top:"); asm(" cld"); // clear direction flag (increment esi and edi in movsb) // Optimization : check for non-odd len (1,3,5,7...) - asm(" shr $1,%ecx"); // %ecx >> 1 , shifted bit -> CF + asm(" shr $1,%ecx"); // %ecx >> 1, shifted bit -> CF asm(" jnc move_two_bytes"); // if !carry (CF == 0) skip this move // Move the first byte (non-odd) asm(" movsb %ds:(%esi),%es:(%edi)"); // *dst-- = *src-- if DF else *dst++ = *src++ - // Optimization : pass 2 , check for %2 and %3 + // Optimization : pass 2, check for %2 and %3 asm("move_two_bytes:"); - asm(" shr $1,%ecx"); // %ecx >> 1 , shifted bit -> CF + asm(" shr $1,%ecx"); // %ecx >> 1, shifted bit -> CF asm(" jnc move_the_rest"); // if !carry (CF == 0) skip this move // Move the next two bytes asm(" movsw %ds:(%esi),%es:(%edi)"); // *((word *)dst)-- = *((word)src)-- if DF else *((word *)dst)++ = *((word)src)++ @@ -117,7 +117,7 @@ asm(" addl %ecx,%edi"); // %edi += %ecx (dst_ptr += len); asm(" std"); // set direction flag (decrement esi and edi in movsb) // start moving - asm(" shr $2,%ecx"); // %ecx >> 2 , last shifted bit -> CF + asm(" shr $2,%ecx"); // %ecx >> 2, last shifted bit -> CF asm(" jnc xmove_the_rest_top_to_bottom_directly"); // if !carry (CF == 0) skip this move // Move the next two bytes asm(" subl $2,%esi"); // %esi-=2; (src_ptr-=2); @@ -134,7 +134,7 @@ asm("xmove_from_bottom_to_top:"); asm(" cld"); // clear direction flag (increment esi and edi in movsb) // move it - asm(" shr $2,%ecx"); // %ecx >> 2 , last shifted bit -> CF + asm(" shr $2,%ecx"); // %ecx >> 2, last shifted bit -> CF asm(" jnc xmove_the_rest"); // if !carry (CF == 0) skip this move // Move the next two bytes asm(" movsw %ds:(%esi),%es:(%edi)"); // *((word *)dst)-- = *((word)src)-- if DF else *((word *)dst)++ = *((word)src)++ diff --git a/src/kvilib/core/kvi_qstring.cpp b/src/kvilib/core/kvi_qstring.cpp index 0035d1e65..57c1c6a5f 100644 --- a/src/kvilib/core/kvi_qstring.cpp +++ b/src/kvilib/core/kvi_qstring.cpp @@ -1030,7 +1030,7 @@ namespace KviQString pSavePos1 = ++pM1; if(!pSavePos1->unicode()) { - //last was a wildcard , matches everything ahead... + //last was a wildcard, matches everything ahead... return true; } //next return state for the second string @@ -1050,7 +1050,7 @@ namespace KviQString pM2++; if((!(pM1->unicode())) && pM2->unicode() && pSavePos1) { - //pM1 finished , but pM2 not yet and we have a savePosition for pM1 (there was a wildcard)... + //pM1 finished, but pM2 not yet and we have a savePosition for pM1 (there was a wildcard)... //retry matching the string following the * from the savePos2 (one char ahead last time) //back to char after wildcard pM1 = pSavePos1; @@ -1078,14 +1078,14 @@ namespace KviQString //...and again continue; } - // pM1 != pM2 , pM1 != * , pM2 != * + // pM1 != pM2, pM1 != *, pM2 != * if((pM1->unicode() == '?') || (pM2->unicode() == '?')) { pM1++; pM2++; if((!(pM1->unicode())) && pM2->unicode() && pSavePos1) { - //pM1 finished , but pM2 not yet and we have a savePosition for pM1 (there was a wildcard)... + //pM1 finished, but pM2 not yet and we have a savePosition for pM1 (there was a wildcard)... //retry matching the string following the * from the pSavePos2 (one char ahead last time) //back to char after wildcard pM1 = pSavePos1; @@ -1111,7 +1111,7 @@ namespace KviQString } } } - //pM1 surely finished , so for the match , pM2 must be finished too + //pM1 surely finished, so for the match, pM2 must be finished too return (!(pM2->unicode())); } diff --git a/src/kvilib/core/kvi_strasm.h b/src/kvilib/core/kvi_strasm.h index 1374531c8..c5e2de11e 100644 --- a/src/kvilib/core/kvi_strasm.h +++ b/src/kvilib/core/kvi_strasm.h @@ -37,7 +37,7 @@ extern inline bool kvi_strEqualCS(const char * pcStr1, const char * pcStr2) { // An instruction pattern is really useful in this case. // When inlining, GCC can optimize to load esi and edi - // directly with the strings , without pushing and getting it + // directly with the strings, without pushing and getting it // from the stack... register bool bEax; __asm__ __volatile__ ( diff --git a/src/kvilib/core/kvi_string.cpp b/src/kvilib/core/kvi_string.cpp index bff42ad25..256731bd0 100644 --- a/src/kvilib/core/kvi_string.cpp +++ b/src/kvilib/core/kvi_string.cpp @@ -427,7 +427,7 @@ bool kvi_matchWildExpr(register const char *m1,register const char *m2) { //Found a wildcard in m1 savePos1 = ++m1; //move to the next char and save the position...this is our jolly - if(!*savePos1)return true; //last was a wildcard , matches everything ahead... + if(!*savePos1)return true; //last was a wildcard, matches everything ahead... savePos2 = m2+1; //next return state for the second string continue; //and return } @@ -439,7 +439,7 @@ bool kvi_matchWildExpr(register const char *m1,register const char *m2) m2++; // if((!(*m1)) && *m2 && savePos1) { - //m1 finished , but m2 not yet and we have a savePosition for m1 (there was a wildcard)... + //m1 finished, but m2 not yet and we have a savePosition for m1 (there was a wildcard)... //retry matching the string following the * from the savePos2 (one char ahead last time) m1 = savePos1; //back to char after wildcard m2 = savePos2; //back to last savePos2 @@ -458,14 +458,14 @@ bool kvi_matchWildExpr(register const char *m1,register const char *m2) savePos2 = m2 + 1; //sync save pos2 continue; //...and again } - // m1 != m2 , m1 != * , m2 != * + // m1 != m2, m1 != *, m2 != * if((*m1 == '?') || (*m2 == '?')) { m1++; m2++; if((!(*m1)) && *m2 && savePos1) { - //m1 finished , but m2 not yet and we have a savePosition for m1 (there was a wildcard)... + //m1 finished, but m2 not yet and we have a savePosition for m1 (there was a wildcard)... //retry matching the string following the * from the savePos2 (one char ahead last time) m1 = savePos1; //back to char after wildcard m2 = savePos2; //back to last savePos2 @@ -482,7 +482,7 @@ bool kvi_matchWildExpr(register const char *m1,register const char *m2) } } } - return (!(*m2)); //m1 surely finished , so for the match , m2 must be finished too + return (!(*m2)); //m1 surely finished, so for the match, m2 must be finished too } @@ -500,7 +500,7 @@ bool kvi_matchWildExprCS(register const char *m1,register const char *m2) if(*m1=='*'){ //Found a wildcard in m1 savePos1 = ++m1; //move to the next char and save the position...this is our jolly - if(!*savePos1)return true; //last was a wildcard , matches everything ahead... + if(!*savePos1)return true; //last was a wildcard, matches everything ahead... savePos2 = m2+1; //next return state for the second string continue; //and return } @@ -510,7 +510,7 @@ bool kvi_matchWildExprCS(register const char *m1,register const char *m2) m1++; //Go ahead in the two strings m2++; // if((!(*m1)) && *m2 && savePos1){ - //m1 finished , but m2 not yet and we have a savePosition for m1 (there was a wildcard)... + //m1 finished, but m2 not yet and we have a savePosition for m1 (there was a wildcard)... //retry matching the string following the * from the savePos2 (one char ahead last time) m1 = savePos1; //back to char after wildcard m2 = savePos2; //back to last savePos2 @@ -535,7 +535,7 @@ bool kvi_matchWildExprCS(register const char *m1,register const char *m2) } else return false; //No previous wildcards...not matched! } } - return (!(*m2)); //m1 surely finished , so for the match , m2 must be finished too + return (!(*m2)); //m1 surely finished, so for the match, m2 must be finished too } */ @@ -560,7 +560,7 @@ bool kvi_matchWildExprWithTerminator(register const char *m1,register const char savePos1 = ++m1; //move to the next char and save the position...this is our jolly if(!NOT_AT_END(savePos1)) { - //last was a wildcard , matches everything ahead... + //last was a wildcard, matches everything ahead... while(NOT_AT_END(m2))m2++; *r1 = bSwapped ? m2 : m1; *r2 = bSwapped ? m1 : m2; @@ -577,7 +577,7 @@ bool kvi_matchWildExprWithTerminator(register const char *m1,register const char m2++; // if((!NOT_AT_END(m1)) && NOT_AT_END(m2) && savePos1) { - //m1 finished , but m2 not yet and we have a savePosition for m1 (there was a wildcard)... + //m1 finished, but m2 not yet and we have a savePosition for m1 (there was a wildcard)... //retry matching the string following the * from the savePos2 (one char ahead last time) m1 = savePos1; //back to char after wildcard m2 = savePos2; //back to last savePos2 @@ -597,14 +597,14 @@ bool kvi_matchWildExprWithTerminator(register const char *m1,register const char savePos2 = m2 + 1; //sync save pos2 continue; //...and again } - // m1 != m2 , m1 != * , m2 != * + // m1 != m2, m1 != *, m2 != * if((*m1 == '?') || (*m2 == '?')) { m1++; m2++; if((!NOT_AT_END(m1)) && NOT_AT_END(m2) && savePos1) { - //m1 finished , but m2 not yet and we have a savePosition for m1 (there was a wildcard)... + //m1 finished, but m2 not yet and we have a savePosition for m1 (there was a wildcard)... //retry matching the string following the * from the savePos2 (one char ahead last time) m1 = savePos1; //back to char after wildcard m2 = savePos2; //back to last savePos2 @@ -624,7 +624,7 @@ bool kvi_matchWildExprWithTerminator(register const char *m1,register const char *r1 = bSwapped ? m2 : m1; *r2 = bSwapped ? m1 : m2; - return (!NOT_AT_END(m2)); //m1 surely finished , so for the match , m2 must be finished too + return (!NOT_AT_END(m2)); //m1 surely finished, so for the match, m2 must be finished too #undef NOT_AT_END } @@ -1102,9 +1102,9 @@ KviStr::KviStr(KviFormatConstructorTag,const char *fmt,...) //check if we failed if(m_len < 0){ - //yes , failed.... + //yes, failed.... int dummy=256; - do{ //we failed , so retry with 256 more chars + do{ //we failed, so retry with 256 more chars dummy+=256; //realloc m_ptr=(char *)kvi_realloc(m_ptr,dummy); @@ -1461,7 +1461,7 @@ int KviStr::base64ToBuffer(char ** buffer,bool) newLen -= 2; } else { // Single padding, two digits here - *auxBuf++ = (char)((aux1 << 2) | (aux2 >> 4)); // >> 4 is a shr , not a ror! :) + *auxBuf++ = (char)((aux1 << 2) | (aux2 >> 4)); // >> 4 is a shr, not a ror! :) *auxBuf++ = (char)((aux2 << 4) | (aux3 >> 2)); newLen -= 1; } @@ -1473,7 +1473,7 @@ int KviStr::base64ToBuffer(char ** buffer,bool) *buffer = 0; return -1; } else { - // Ok , no padding, three digits here + // Ok, no padding, three digits here *auxBuf++ = (char)((aux1 << 2) | (aux2 >> 4)); *auxBuf++ = (char)((aux2 << 4) | (aux3 >> 2)); *auxBuf++ = (char)((aux3 << 6) | aux4); @@ -1570,7 +1570,7 @@ void KviStr::append(const char *str,int len) *(m_ptr + m_len)='\0'; } -void KviStr::append(KviFormatConstructorTag ,const char *fmt,...) +void KviStr::append(KviFormatConstructorTag,const char *fmt,...) { int auxLen; m_ptr=(char *)kvi_realloc(m_ptr,m_len + 256); @@ -1583,9 +1583,9 @@ void KviStr::append(KviFormatConstructorTag ,const char *fmt,...) //check if we failed if(auxLen < 0){ - //yes , failed.... + //yes, failed.... int dummy=256; - do{ //we failed , so retry with 256 more chars + do{ //we failed, so retry with 256 more chars dummy+=256; //realloc m_ptr=(char *)kvi_realloc(m_ptr,m_len + dummy); @@ -2450,7 +2450,7 @@ long KviStr::toLongExt(bool *bOk,int base) char * endptr; long result = strtol(m_ptr,&endptr,base); if(*endptr){ - // must be whitespaces , otherwise there is trailing garbage inside + // must be whitespaces, otherwise there is trailing garbage inside while(isspace(*endptr) && (*endptr))endptr++; if(*endptr){ // still not at the end @@ -2464,7 +2464,7 @@ long KviStr::toLongExt(bool *bOk,int base) } // -//working code , but unused in kvirc +//working code, but unused in kvirc // //unsigned long KviStr::toULongExt(bool *bOk = 0,int base = 0) //{ @@ -2696,9 +2696,9 @@ KviStr & KviStr::vsprintf(const char *fmt,kvi_va_list list) //check if we failed if(m_len < 0) { - //yes , failed.... + //yes, failed.... int dummy=256; - do { //we failed , so retry with 256 more chars + do { //we failed, so retry with 256 more chars dummy+=256; //realloc m_ptr=(char *)kvi_realloc(m_ptr,dummy); @@ -2726,9 +2726,9 @@ KviStr & KviStr::sprintf(const char *fmt,...) //check if we failed if(m_len < 0){ - //yes , failed.... + //yes, failed.... int dummy=256; - do{ //we failed , so retry with 256 more chars + do{ //we failed, so retry with 256 more chars dummy+=256; //realloc m_ptr=(char *)kvi_realloc(m_ptr,dummy); @@ -2862,7 +2862,7 @@ int KviStr::findLastIdx(char c) const register char *p=((m_ptr+m_len)-1); //go back until we find a match or we run to the first char in the string. while((*p != c) && (p > m_ptr))p--; - //if *p == c --> matched , else we are at the beginning of the string. + //if *p == c --> matched, else we are at the beginning of the string. return ((*p == c)? p-m_ptr : -1); } @@ -2926,7 +2926,7 @@ KviStr & KviStr::trimmed() // skip initial spaces while(isspace(*left))left++; if(*left){ - // valid string , left points to first non-space + // valid string, left points to first non-space while((right >= left) && isspace(*right))right--; // 0123456789 // abcd 0 @@ -2990,7 +2990,7 @@ KviStr & KviStr::stripSpace() // skip initial spaces while((*left == ' ') || (*left == '\t'))left++; if(*left){ - // valid string , left points to first non-space + // valid string, left points to first non-space while((right >= left) && ((*right == ' ') || (*right == '\t')))right--; // 0123456789 // abcd 0 diff --git a/src/kvilib/core/kvi_string.h b/src/kvilib/core/kvi_string.h index 5399227fb..3c56a6e14 100644 --- a/src/kvilib/core/kvi_string.h +++ b/src/kvilib/core/kvi_string.h @@ -84,7 +84,7 @@ __KVI_EXTERN KVILIB_API bool kvi_strEqualCI(const char *str1,const char *str2); // Note that if str1 or str2 are shorter than len characters then are considered as NOT equal! __KVI_EXTERN KVILIB_API bool kvi_strEqualCIN(const char *str1,const char *str2,int len); // My own implementations of strcmp and strncasecmp -// Once I wrote it , I KNOW what they do : ALWAYS :) +// Once I wrote it, I KNOW what they do : ALWAYS :) // Note that greater here means that comes AFTER in the alphabetic order. __KVI_EXTERN KVILIB_API int kvi_strcmpCI(const char *str1,const char *str2); //__KVI_EXTERN KVILIB_API int kvi_strcmpCIN(const char *str1,const char *str2,int len); @@ -115,7 +115,7 @@ public: // No particular reason for these two names... // It is just because I like it :) - enum KviFormatConstructorTag { Format , Sprintf }; + enum KviFormatConstructorTag { Format, Sprintf }; //============================================================================= // Constructors @@ -162,7 +162,7 @@ public: ~KviStr(); public: //yes...public..but think it as private...:) - char *m_ptr; // pointer to allocated buffer , do not change this! + char *m_ptr; // pointer to allocated buffer, do not change this! int m_len; // string data length not including the terminator public: @@ -204,7 +204,7 @@ public: KviStr upperISO88591() const; KviStr lowerISO88591() const; - // left , right & co. + // left, right & co. // all parameters are safety-checked KviStr left(int maxLen) const; KviStr right(int maxLen) const ; @@ -240,7 +240,7 @@ public: void append(const char *str,int len); // str CAN NOT be 0, and MUST be at least len chars long void append(KviFormatConstructorTag dummy,const char *fmt,...); - // prepend stuff , same as above + // prepend stuff, same as above void prepend(const KviStr &str); void prepend(const char *str); // str CAN be 0 void prepend(const char *str,int len); // str CAN NOT be 0, and MUST be at least len chars long @@ -257,7 +257,7 @@ public: // Assignment KviStr & operator=(const KviStr &str); // deep copy KviStr & operator=(const char *str); // str can be NULL here - KviStr & operator=(char c); // 2 bytes allocated ,m_len = 1 + KviStr & operator=(char c); // 2 bytes allocated,m_len = 1 KviStr & operator=(const QString &str); KviStr & operator=(const QByteArray &str); @@ -338,7 +338,7 @@ public: // Tokenize //============================================================================= - // Extracts (copy to str and remove) a token from this string ,
+ // Extracts (copy to str and remove) a token from this string,
// and returns true if there are more tokens to extract
// Does not strip initial separators!!
// str can NOT be this string. @@ -356,8 +356,8 @@ public: //KviStr ** splitToArray(const char * sep,int max,int * realCount) const; static void freeArray(KviStr ** strings); // joins the array to this string - // if sep is not 0 , it is inserted between the strings - // if bLastSep is true and sep is non 0 , then sep is also appended at the end + // if sep is not 0, it is inserted between the strings + // if bLastSep is true and sep is non 0, then sep is also appended at the end // of the buffer (after the last string) void joinFromArray(KviStr ** strings,const char * sep = 0,bool bLastSep = false); @@ -472,8 +472,8 @@ public: // Cool string parsing function. -// It will extract the first found token from the string aux_ptr , and return -// a pointer to the beginning of the next token , or end of the string. +// It will extract the first found token from the string aux_ptr, and return +// a pointer to the beginning of the next token, or end of the string. // It skips the initial sep characters! __KVI_EXTERN KVILIB_API const char * kvi_extractToken(KviStr &str,const char *aux_ptr,char sep =' '); // Does not skip the beginning separators! diff --git a/src/kvilib/ext/kvi_animatedpixmap.h b/src/kvilib/ext/kvi_animatedpixmap.h index b0f52748d..699b2c493 100644 --- a/src/kvilib/ext/kvi_animatedpixmap.h +++ b/src/kvilib/ext/kvi_animatedpixmap.h @@ -64,7 +64,8 @@ * This class owns all pixmaps. Do not store links to them. */ -class KVILIB_API KviAnimatedPixmap : public QObject , public KviAnimatedPixmapInterface{ +class KVILIB_API KviAnimatedPixmap : public QObject, public KviAnimatedPixmapInterface +{ Q_OBJECT protected: diff --git a/src/kvilib/ext/kvi_config.cpp b/src/kvilib/ext/kvi_config.cpp index 33c72bace..d8347e01d 100644 --- a/src/kvilib/ext/kvi_config.cpp +++ b/src/kvilib/ext/kvi_config.cpp @@ -195,7 +195,7 @@ bool KviConfig::load() } else { // just readed something but less than expected // check if the last readed char is a newline - // if it isn't , fake it + // if it isn't, fake it if(*(p + readedLen - 1) != '\n') { *(p + readedLen) = '\n'; @@ -378,7 +378,7 @@ bool KviConfig::load() switch(*(dataLine.ptr())) { case '#': - // just skip it , it is a comment + // just skip it, it is a comment break; case '[': { diff --git a/src/kvilib/ext/kvi_config.h b/src/kvilib/ext/kvi_config.h index 45ed61e1d..1b2e269f4 100644 --- a/src/kvilib/ext/kvi_config.h +++ b/src/kvilib/ext/kvi_config.h @@ -48,7 +48,7 @@ typedef KviPointerHashTableIterator KviConfigIterator; class KVILIB_API KviConfig : public KviHeapObject { public: - enum FileMode { Read = 1 , Write = 2 , ReadWrite = 3 }; + enum FileMode { Read = 1, Write = 2, ReadWrite = 3 }; public: KviConfig(const QString &filename,FileMode f/* = ReadWrite*/,bool bLocal8Bit = false); KviConfig(const char *filename,FileMode f/* = ReadWrite*/,bool bLocal8Bit = false); @@ -74,7 +74,7 @@ public: // If the group is not existing it will be effectively // created only at the first attempt to read from it or write to it. // With this flag set to true the KviConfig class will - // write down also the empty groups , and calls to setGroup() + // write down also the empty groups, and calls to setGroup() // will create the groups if not existing yet (and set the config data // as modified). // @@ -125,7 +125,7 @@ public: void writeEntry(const QString & szKey,const QRect &rct); QStringList readStringListEntry(const QString & szKey,const QStringList &list = QStringList()); void writeEntry(const QString & szKey,const QStringList &list); - QList readIntListEntry(const QString & ,const QList &list); + QList readIntListEntry(const QString &,const QList &list); void writeEntry(const QString & szKey,const QList &list); QString readQStringEntry(const QString & szKey,const QString &szDefault = QString()) { return readEntry(szKey,szDefault); }; diff --git a/src/kvilib/ext/kvi_crypt.cpp b/src/kvilib/ext/kvi_crypt.cpp index c5a78a284..4f6e81177 100644 --- a/src/kvilib/ext/kvi_crypt.cpp +++ b/src/kvilib/ext/kvi_crypt.cpp @@ -42,7 +42,7 @@ Crypt/text transformation engines and how to use them @body: [big]Introduction[/big][br] - Well , there is a concrete background noise about security around the net. + Well, there is a concrete background noise about security around the net. And I've thought that adding a little cryptography support to KVIrc wasn't a bad idea. So I've first comed out with the "crypt engines", that allowed to have secure conversations on channels, queries and dcc chats; @@ -83,8 +83,8 @@ [big]Yes, but why cryptography (on IRC) ?[/big][br] Because it MAY be useful. More than once people have asked me to add some - crypting support to the dcc chats. Yes , I know that there are other - "secure communication" tools , but actually I can't find one that is able to + crypting support to the dcc chats. Yes, I know that there are other + "secure communication" tools, but actually I can't find one that is able to implement a "secure real time conversation". And what about a MULTIPLE real time secure conversation ? This can be done on an IRC channel now.[br] @@ -125,7 +125,7 @@ and play with the CTRL+P escape.[br] [big]The protocol[/big][br] - Well, there is no protocol actually , only the existing implementations , that + 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; diff --git a/src/kvilib/ext/kvi_crypt.h b/src/kvilib/ext/kvi_crypt.h index f3ebfb047..4cd679895 100644 --- a/src/kvilib/ext/kvi_crypt.h +++ b/src/kvilib/ext/kvi_crypt.h @@ -32,7 +32,7 @@ // Base class for all IRC crypt engines // These intend to encrypt plain text into something // that can be sent through the IRC protocol... -// so it should not contain NULL, CR , LF and other +// so it should not contain NULL, CR, LF and other // similar stuff... // diff --git a/src/kvilib/ext/kvi_mediatype.cpp b/src/kvilib/ext/kvi_mediatype.cpp index a1fc7ced3..d0dafb3db 100644 --- a/src/kvilib/ext/kvi_mediatype.cpp +++ b/src/kvilib/ext/kvi_mediatype.cpp @@ -146,7 +146,7 @@ void KviMediaManager::insertMediaType(KviMediaType * m) int iNonWildCountExisting = mt->szFileMask.len() - iWildCountExisting; if(iNonWildCountExisting < iNonWildCount) { - // ok...the new one has more non-wildcards , insert + // ok...the new one has more non-wildcards, insert m_pMediaTypeList->insert(index,m); return; } else { @@ -250,7 +250,7 @@ KviMediaType * KviMediaManager::findMediaType(const char * filename,bool bCheckM szFile.cutToLast('/',true); - // first of all , lstat() the file + // first of all, lstat() the file #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) struct _stat st; if(_stat(szFullPath.ptr(),&st) != 0) @@ -262,10 +262,10 @@ KviMediaType * KviMediaManager::findMediaType(const char * filename,bool bCheckM //qDebug("Problems while stating file %s",szFullPath.ptr()); // We do just the pattern matching // it's better to avoid magic checks - // if the file is a device , we would be blocked while attempting to read data + // if the file is a device, we would be blocked while attempting to read data return findMediaTypeForRegularFile(szFullPath.ptr(),szFile.ptr(),false); } else { - // If it is a link , stat() the link target + // If it is a link, stat() the link target #if !defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MINGW) if(S_ISLNK(st.st_mode)) { diff --git a/src/kvilib/ext/kvi_msgtype.h b/src/kvilib/ext/kvi_msgtype.h index 11b0e95cb..15fd8c1e4 100644 --- a/src/kvilib/ext/kvi_msgtype.h +++ b/src/kvilib/ext/kvi_msgtype.h @@ -38,7 +38,7 @@ // 1 : Common activity // 2 : People talking -// 3 : Response messages (whois , dns) +// 3 : Response messages (whois, dns) // 4 : // 5 : Highlighted text diff --git a/src/kvilib/ext/kvi_proxydb.h b/src/kvilib/ext/kvi_proxydb.h index db91ef8ae..4f3583e04 100644 --- a/src/kvilib/ext/kvi_proxydb.h +++ b/src/kvilib/ext/kvi_proxydb.h @@ -34,7 +34,7 @@ class KVILIB_API KviProxy { public: - enum Protocol { Socks4 , Socks5 , Http }; + enum Protocol { Socks4, Socks5, Http }; KviProxy(); KviProxy(const KviProxy &prx); ~KviProxy(); diff --git a/src/kvilib/ext/kvi_regchan.cpp b/src/kvilib/ext/kvi_regchan.cpp index 6f764d199..4dc898917 100644 --- a/src/kvilib/ext/kvi_regchan.cpp +++ b/src/kvilib/ext/kvi_regchan.cpp @@ -193,7 +193,7 @@ void KviRegisteredChannelDataBase::add(KviRegisteredChannel * c) { if(rc->netMask().count(QChar('*')) > o) { - // the existing has more wildcards , insert here! + // the existing has more wildcards, insert here! l->insert(idx,c); return; } diff --git a/src/kvilib/ext/kvi_regusersdb.cpp b/src/kvilib/ext/kvi_regusersdb.cpp index 3a18e74a0..f687a0182 100644 --- a/src/kvilib/ext/kvi_regusersdb.cpp +++ b/src/kvilib/ext/kvi_regusersdb.cpp @@ -71,7 +71,7 @@ For this reason putting wildcards in nicknames could become a problem if not used carefully (but may also be used to achieve interesting tricks).[br] If you don't use wildcards in nicknames you are sure that - in a single irc connection , a mask will always refer to a single user.[br] + in a single irc connection, a mask will always refer to a single user.[br] You will commonly use the following format:[br] !*@*..[br] or[br] @@ -94,7 +94,7 @@ On the other hand, if you dislike the users with the nickname Eddie that come from .org and you're implementing an auto-kick system, the correct mask to register is "Eddie!*@*.org".[br] [br] - KVirc ties to be smart , and always find the most correct match for an user: + KVirc ties to be smart, and always find the most correct match for an user: If you have two masks registered: Pragma!*xor@*.myisp.it and *!*@*.myisp.it, kvirc will match Pragma!~xor@233-dyn.myisp.it with the first one even if the second one matches too; the firs one is a best match.[br] @@ -268,7 +268,7 @@ bool KviRegisteredUser::getBoolProperty(const QString & name,bool def) QString * pValue = m_pPropertyDict->find(name); if(pValue) { - // be flexible , allow more "true" values (pragma) + // be flexible, allow more "true" values (pragma) if(KviQString::equalCS(*pValue,"1"))return true; if(KviQString::equalCI(*pValue,"true"))return true; if(KviQString::equalCI(*pValue,"yes"))return true; diff --git a/src/kvilib/ext/kvi_regusersdb.h b/src/kvilib/ext/kvi_regusersdb.h index 77f0acbf7..6c915f220 100644 --- a/src/kvilib/ext/kvi_regusersdb.h +++ b/src/kvilib/ext/kvi_regusersdb.h @@ -130,8 +130,8 @@ private: class KVILIB_API KviRegisteredMask { private: - KviRegisteredUser * m_pUser; // pointer , not owned! - KviIrcMask * m_pMask; // pointer , not owned! + KviRegisteredUser * m_pUser; // pointer, not owned! + KviIrcMask * m_pMask; // pointer, not owned! int m_iMaskNonWildChars; public: KviRegisteredMask(KviRegisteredUser * u,KviIrcMask * m); diff --git a/src/kvilib/ext/kvi_sharedfiles.cpp b/src/kvilib/ext/kvi_sharedfiles.cpp index 2cd838fbe..897062ef7 100644 --- a/src/kvilib/ext/kvi_sharedfiles.cpp +++ b/src/kvilib/ext/kvi_sharedfiles.cpp @@ -49,14 +49,14 @@ @body: [big]What is this ?[/big] The "file offers" are a simple way to share your files with other IRC users.[br] - Basically , you setup an offer by selecting a local file, choosing a "visible name" for it. + Basically, you setup an offer by selecting a local file, choosing a "visible name" for it. Remote users will be able to request you the file and download it automatically by issuing a simple DCC GET request.[br] [big]Details[/big] Each offer refers to an existing file on one of your locally mounted file systems. The offer is given a visible name that the remote users will effectively request. To share the file /usr/arch/mp3/SonataArctica_SingInSilence_Live.mp3 you will add a file offer - with /usr/arch/mp3/SonataArctica_SingInSilence_Live.mp3 as real file path , something like + with /usr/arch/mp3/SonataArctica_SingInSilence_Live.mp3 as real file path, something like "SonataArctica_SingInSilence.mp3". A remote user will then request you a DCC GET SonataArctica_SingInSilence.mp3 and KVIrc will automatically send the file.[br] Each file offer has an "user mask" that the requesting remote users must match to @@ -177,7 +177,7 @@ void KviSharedFilesManager::doInsert(KviSharedFileList * l, KviSharedFile * o) // the ones with more non-wild chars go first... if(fo->nonWildcardCount() < o->nonWildcardCount()) { - // ok...the new one has more non-wildcards , insert + // ok...the new one has more non-wildcards, insert l->insert(index,o); return; } else { diff --git a/src/kvilib/file/kvi_fileutils.cpp b/src/kvilib/file/kvi_fileutils.cpp index 346e5fc86..eb1a23e7d 100644 --- a/src/kvilib/file/kvi_fileutils.cpp +++ b/src/kvilib/file/kvi_fileutils.cpp @@ -38,7 +38,7 @@ namespace KviFileUtils { - static char cHexChars[16] = { '0' , '1' , '2' , '3' , '4' , '5' , '6' , '7' , '8' , '9' , 'A' , 'B' , 'C' , 'D' , 'E' , 'F' }; + static char cHexChars[16] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' }; /* WORKING CODE BUT UNUSED FOR NOW @@ -92,7 +92,7 @@ namespace KviFileUtils { szBuffer.append('\n'); // readLine returned true...last char was a newline } - // readLine returned false , no ending newline encountered + // readLine returned false, no ending newline encountered return true; } */ diff --git a/src/kvilib/irc/kvi_avatar.cpp b/src/kvilib/irc/kvi_avatar.cpp index f5ff0003f..56a0d16f0 100644 --- a/src/kvilib/irc/kvi_avatar.cpp +++ b/src/kvilib/irc/kvi_avatar.cpp @@ -81,7 +81,7 @@ B may then reply with a standard DCC SEND or a DCC RSEND (kvirc's extension).[br] The implementation of the DCC GET protocol is defined by other documents here around :).[br] [br] - The CTCP AVATAR messages can be sent to a single user , a set of users or a channel: + The CTCP AVATAR messages can be sent to a single user, a set of users or a channel: this depends only on the source user and how many clients he wants to reach. [br] There should be a convention on the image sizes: not a protocol limit. diff --git a/src/kvilib/irc/kvi_ircmask.cpp b/src/kvilib/irc/kvi_ircmask.cpp index 3a34078af..403da3cb8 100644 --- a/src/kvilib/irc/kvi_ircmask.cpp +++ b/src/kvilib/irc/kvi_ircmask.cpp @@ -36,7 +36,7 @@ @short: Decription of the standard IRC masks @keyterms: - irc masks , nickname , username , hostname , wildcard + irc masks, nickname, username, hostname, wildcard @body: [big]Simple masks[/big][br] An irc mask is a string in a special format that identifies an user on irc.[br] @@ -51,7 +51,7 @@ Some IRC servers allow specifying this username inside the login messages and do not connect to the ident service at all.[br] The often has a special prefix character added by the irc server:[br] - this is rather server specific protocol , but the prefixes are somewhat standardized and + this is rather server specific protocol, but the prefixes are somewhat standardized and the common meanings of them are:[br] noprefix: I line with ident[br] ^: I line with OTHER type ident[br] @@ -79,12 +79,12 @@ In some contexts the irc-masks can contain '*' and '?' wildcards.[br] The wild masks are used to "match" an user within a set of them.[br] '*' matches any sequence (eventually empty) of characters and '?' matches a single character.[br] - Wildcards are allowed only in the , and part: so the + Wildcards are allowed only in the , and part: so the "wildest" mask possible is:[br] [b]*!*@*[/b][br] that designates "any nickname, any username on any host".[br] Here are some examples of wild masks:[br] - Pragma!*pragma@212.101.102.*: matches any user with nickname "Pragma" , username that ends with "pragma" and + Pragma!*pragma@212.101.102.*: matches any user with nickname "Pragma", username that ends with "pragma" and coming from any machine on the 212.101.102 network.[br] *!solo@*.starwars.org: matches any nick with username solo (no prefix!) coming from any machine in the starwars.org domain.[br] @@ -171,7 +171,7 @@ const char * KviIrcMask::setUserhostMask(const char *szMask) while(*p && ((*p=='*')||(*p=='=')||(*p=='+')||(*p=='-')) && (!isspace(*p)))p++; // check... if((!(*p)) || isspace(*p)){ - // ooops , finished or isspace + // ooops, finished or isspace setHost("*"); setUsername("*"); while(*p && isspace(*p))p++; @@ -315,7 +315,7 @@ bool KviIrcMask::hasNumericHost() const /** * Returns in szMask the specified (if possible) mask of this user.
-* If the host or username are not known , the mask may contain less information +* If the host or username are not known, the mask may contain less information * than requested.
* Mask types:
* 0 : nick!user@machine.host.top (nick!user@XXX.XXX.XXX.XXX) (default)
@@ -347,8 +347,8 @@ bool KviIrcMask::hasNumericHost() const * 24: *!~user@*.host.top (*!~user@XXX.XXX.*) * 25: nick!*user@*.host.top (nick!*user@XXX.XXX.*) * 26: *!*user@*.host.top (*!user@*XXX.XXX.*) -* If some data is missing , these types may change:
-* For example , if hostname is missing , the mask type 3 or 4 may be reduced to type 5 +* If some data is missing, these types may change:
+* For example, if hostname is missing, the mask type 3 or 4 may be reduced to type 5 */ /* diff --git a/src/kvilib/irc/kvi_ircmask.h b/src/kvilib/irc/kvi_ircmask.h index 127327778..215995ca0 100644 --- a/src/kvilib/irc/kvi_ircmask.h +++ b/src/kvilib/irc/kvi_ircmask.h @@ -154,13 +154,13 @@ public: */ void setHost(const QString &szHost){ m_szHost = szHost.isEmpty() ? m_szWild : szHost; }; - // Sets the host , nick and username extracting it from an irc mask: + // Sets the host, nick and username extracting it from an irc mask: // nick!user@host // The mask is terminated by end-of string null character or a character equal to c in the string. // Returns the pointer to the end of the mask in the szMask string.(c or null-terminator) //const char * setMask(const QString &szMask,char c=' '); - // Sets the host , nick and username extracting it from an userhost mask: + // Sets the host, nick and username extracting it from an userhost mask: // nick[*]=<+|->user@host // The mask is terminated by end-of string null char or a space character. // Returns the pointer to the next non-space char in the szMask string or to the null-terminator @@ -213,7 +213,7 @@ public: /** * \brief Returns in szMask the specified (if possible) mask of this user. * - * If the host or username are not known , the mask may contain less + * If the host or username are not known, the mask may contain less * information than requested. * \param szMask The mask of the user * \param eMaskType The mask type @@ -237,7 +237,7 @@ public: bool matches(const KviIrcMask & mask) const; /** - * \brief Fixed external matches (this is wild , external is fixed) + * \brief Fixed external matches (this is wild, external is fixed) * \param nick The nickname of the user * \param user The username of the user * \param host The hostname of the user @@ -247,7 +247,7 @@ public: //bool matchesFixed(const QString &szMask) const; /** - * \brief Fixed external matches (this is wild , external is fixed) + * \brief Fixed external matches (this is wild, external is fixed) * \param mask The make of the user * \return bool */ diff --git a/src/kvilib/irc/kvi_ircserverdb.cpp b/src/kvilib/irc/kvi_ircserverdb.cpp index 4dcf2785a..c0ea7221b 100644 --- a/src/kvilib/irc/kvi_ircserverdb.cpp +++ b/src/kvilib/irc/kvi_ircserverdb.cpp @@ -285,7 +285,7 @@ search_finished: } } - // a valid hostname or ip address , not found in list : add it and make it current + // a valid hostname or ip address, not found in list : add it and make it current r = m_pRecords->find(__tr2qs("Standalone Servers")); if(!r) diff --git a/src/kvilib/irc/kvi_mirccntrl.cpp b/src/kvilib/irc/kvi_mirccntrl.cpp index 64f7893e1..4a85e2fce 100644 --- a/src/kvilib/irc/kvi_mirccntrl.cpp +++ b/src/kvilib/irc/kvi_mirccntrl.cpp @@ -33,7 +33,7 @@ KVILIB_API const char * getColorBytes(const char *data_ptr,unsigned char *byte_1 // and fills the color values in the two bytes // - //First we can have a digit or a coma + //First we can have a digit or a comma if(((*data_ptr >= '0') && (*data_ptr <='9'))) { //Something interesting ok. @@ -44,7 +44,7 @@ KVILIB_API const char * getColorBytes(const char *data_ptr,unsigned char *byte_1 //Yes we can understand it if(*data_ptr==',') { - //A coma , need to check for background + //A comma, need to check for background data_ptr++; } else { //A number @@ -52,7 +52,7 @@ KVILIB_API const char * getColorBytes(const char *data_ptr,unsigned char *byte_1 data_ptr++; if(*data_ptr==',') { - //A coma , need to check for background + //A comma, need to check for background data_ptr++; } else { //Senseless return @@ -74,7 +74,7 @@ KVILIB_API const char * getColorBytes(const char *data_ptr,unsigned char *byte_1 if((*data_ptr >= '0') && (*data_ptr <='9')) { - //Background , a color code + //Background, a color code (*byte_2)=(*data_ptr)-'0'; data_ptr++; if((*data_ptr >= '0') && (*data_ptr <='9')) @@ -97,7 +97,7 @@ KVILIB_API const kvi_wchar_t * getColorBytesW(const kvi_wchar_t *data_ptr,unsign // and fills the color values in the two bytes // - //First we can have a digit or a coma + //First we can have a digit or a comma if(((*data_ptr >= '0') && (*data_ptr <='9'))) { //Something interesting ok. @@ -108,7 +108,7 @@ KVILIB_API const kvi_wchar_t * getColorBytesW(const kvi_wchar_t *data_ptr,unsign //Yes we can understand it if(*data_ptr==',') { - //A coma , need to check for background + //A comma, need to check for background data_ptr++; } else { //A number @@ -117,7 +117,7 @@ KVILIB_API const kvi_wchar_t * getColorBytesW(const kvi_wchar_t *data_ptr,unsign data_ptr++; if(*data_ptr==',') { - //A coma , need to check for background + //A comma, need to check for background data_ptr++; } else { //Senseless return @@ -139,7 +139,7 @@ KVILIB_API const kvi_wchar_t * getColorBytesW(const kvi_wchar_t *data_ptr,unsign if((*data_ptr >= '0') && (*data_ptr <='9')) { - //Background , a color code + //Background, a color code (*byte_2)=(*data_ptr)-'0'; data_ptr++; if((*data_ptr >= '0') && (*data_ptr <='9')) @@ -171,7 +171,7 @@ KVILIB_API unsigned int getUnicodeColorBytes(const QString &szData,unsigned int unsigned short c = szData[(int)charIdx].unicode(); - //First we can have a digit or a coma + //First we can have a digit or a comma if(((c < '0') || (c > '9'))) { // senseless : only a CTRL+K code @@ -233,7 +233,7 @@ KVILIB_API unsigned int getUnicodeColorBytes(const QString &szData,unsigned int return charIdx; } - //Background , a color code + //Background, a color code (*byte_2)=c-'0'; charIdx++; if(charIdx >= (unsigned int) szData.length())return charIdx; diff --git a/src/kvilib/irc/kvi_mirccntrl.h b/src/kvilib/irc/kvi_mirccntrl.h index 099fbfde6..c85c52714 100644 --- a/src/kvilib/irc/kvi_mirccntrl.h +++ b/src/kvilib/irc/kvi_mirccntrl.h @@ -98,19 +98,19 @@ // 013 CR Carriage return (Should not be assigned: terminal control) // 014 SO Shift out (Should not be assigned: terminal control) // 015 SI Shift in ( Resets Bold,Color,Underline and Reverse ) (Conflicting with terminal control) -// 016 DLE Data link escape (Decent , can be assigned) +// 016 DLE Data link escape (Decent, can be assigned) // 017 DC1 Device control 1 (Good to be assigned) // 018 DC2 Device control 2 (Good to be assigned) // 019 DC3 Device control 3 (Good to be assigned) // 020 DC4 Device control 4 (Good to be assigned) // 021 NAK Negative acknowledge (Not so good, but could be used as last resource) // 022 SYN Synchronous idle ( Reverse text ) -// 023 ETB End of transmission block (Decent , can be assigned) +// 023 ETB End of transmission block (Decent, can be assigned) // 024 CAN Cancel (Should not be assigned: terminal control) -// 025 EM End of medium (Decent , can be assigned) +// 025 EM End of medium (Decent, can be assigned) // 026 SUB Substitute (Should not be assigned: terminal control) // 027 ESC Escape (Should not be assigned: terminal control) -// 028 FS File separator (Excellent , should be used as first candidate) +// 028 FS File separator (Excellent, should be used as first candidate) // 029 GS Group separator ( ICONS Escape: beginning of a word ) // 030 RS Record separator ( CRYPT Escape: only beginning of the message ) // 031 US Unit separator ( Underline text ) diff --git a/src/kvilib/irc/kvi_nickserv.cpp b/src/kvilib/irc/kvi_nickserv.cpp index d0a51bf8f..20a9a7f6b 100644 --- a/src/kvilib/irc/kvi_nickserv.cpp +++ b/src/kvilib/irc/kvi_nickserv.cpp @@ -49,7 +49,7 @@ it from being stolen by others.[br] The NickServ protocol is not standardized (at the time that I'm writing this doc) and automatic authentication is a pure experimental protocol.[br] - Once you get on IRC with a registered nickname , the NickServ will + Once you get on IRC with a registered nickname, the NickServ will ask you for identification by sending you a NOTICE.[br] The message will look in a way similar to the following:[br] You're using a registered nickname: if this is your nick, @@ -63,7 +63,7 @@ */ -// FIXME: The doc above is a bit outdated , fix it +// FIXME: The doc above is a bit outdated, fix it KviNickServRuleSet::KviNickServRuleSet() : KviHeapObject() diff --git a/src/kvilib/net/kvi_dns.h b/src/kvilib/net/kvi_dns.h index 146cf4c86..421bbed07 100644 --- a/src/kvilib/net/kvi_dns.h +++ b/src/kvilib/net/kvi_dns.h @@ -71,8 +71,8 @@ public: KviDns(); ~KviDns(); public: - enum QueryType { IPv4 , IPv6 , Any }; - enum State { Idle , Busy , Failure , Success }; + enum QueryType { IPv4, IPv6, Any }; + enum State { Idle, Busy, Failure, Success }; protected: void * m_pAuxData; KviDnsThread * m_pSlaveThread; diff --git a/src/kvilib/net/kvi_http.cpp b/src/kvilib/net/kvi_http.cpp index e31304741..bf13754fe 100644 --- a/src/kvilib/net/kvi_http.cpp +++ b/src/kvilib/net/kvi_http.cpp @@ -609,7 +609,7 @@ bool KviHttpRequest::processHeader(KviStr &szHeader) if((uStatus != 200) && (uStatus != 206)) { // this is not "OK" and not "Partial content" - // Error , redirect or something confusing + // Error, redirect or something confusing // FIXME: Handle 30x codes by re-issuing the request with the new URI ? @@ -1076,7 +1076,7 @@ bool KviHttpRequestThread::connectToRemoteHost() { // Declare problems :) return failure(__tr_no_lookup("Unrecoverable SSL error during handshake")); - } // else can recover ? (EAGAIN , EINTR ?) ... should select for read or for write + } // else can recover ? (EAGAIN, EINTR ?) ... should select for read or for write } break; default: diff --git a/src/kvilib/net/kvi_http.h b/src/kvilib/net/kvi_http.h index 08bf40e88..cc662c549 100644 --- a/src/kvilib/net/kvi_http.h +++ b/src/kvilib/net/kvi_http.h @@ -169,7 +169,7 @@ class KviHttpRequestThread : public KviSensitiveThread { friend class KviHttpRequest; public: - enum RequestMethod { Post, Get , Head }; + enum RequestMethod { Post, Get, Head }; protected: KviHttpRequestThread(KviHttpRequest * r, const QString &szHost, diff --git a/src/kvilib/net/kvi_netutils.cpp b/src/kvilib/net/kvi_netutils.cpp index 4d54db8e7..0618ea64f 100644 --- a/src/kvilib/net/kvi_netutils.cpp +++ b/src/kvilib/net/kvi_netutils.cpp @@ -356,7 +356,7 @@ unsigned int fmt_ip6(char *s,const char ip[16]) unsigned int len; unsigned int i; unsigned int temp; - unsigned int compressing; // 0 not compressing , 1 compressing now , 2 already compressed once + unsigned int compressing; // 0 not compressing, 1 compressing now, 2 already compressed once len = 0; compressing = 0; diff --git a/src/kvilib/net/kvi_socket.h b/src/kvilib/net/kvi_socket.h index c0df31323..a0572cd70 100644 --- a/src/kvilib/net/kvi_socket.h +++ b/src/kvilib/net/kvi_socket.h @@ -99,7 +99,7 @@ // kvi_socket_create // kvi_socket_open // -// Open a socket of the specified protocol family , type and protocol +// Open a socket of the specified protocol family, type and protocol // You should always use the KVI_SOCKET_* constants as parameters // Returns KVI_INVALID_SOCKET if the socket creation has failed. // The returned socket is in blocking mode! diff --git a/src/kvilib/net/kvi_ssl.h b/src/kvilib/net/kvi_ssl.h index 267b7d111..5289f1bfe 100644 --- a/src/kvilib/net/kvi_ssl.h +++ b/src/kvilib/net/kvi_ssl.h @@ -144,9 +144,9 @@ public: class KVILIB_API KviSSL { public: - enum Method { Client , Server }; - enum Result { Success , NotInitialized , WantRead , WantWrite , ZeroReturn , FileIoError , - UnknownError , ObscureError , SSLError , SyscallError , RemoteEndClosedConnection }; + enum Method { Client, Server }; + enum Result { Success, NotInitialized, WantRead, WantWrite, ZeroReturn, FileIoError, + UnknownError, ObscureError, SSLError, SyscallError, RemoteEndClosedConnection }; public: KviSSL(); ~KviSSL(); diff --git a/src/kvilib/system/kvi_env.cpp b/src/kvilib/system/kvi_env.cpp index 6d72f460f..406a42d24 100644 --- a/src/kvilib/system/kvi_env.cpp +++ b/src/kvilib/system/kvi_env.cpp @@ -56,7 +56,7 @@ bool kvi_setenv(const char * name,const char * value) #else bool kvi_setenv(const char *,const char *) { - // no setenv , no putenv.. what the hell of system is this ? + // no setenv, no putenv.. what the hell of system is this ? return false; #endif #endif @@ -82,7 +82,7 @@ void kvi_unsetenv(const char * name) // hmmm if(kvi_getenv(name) == 0) { - // ok , the string is not in the environment + // ok, the string is not in the environment // we can free it kvi_free(buf); } // else this system sux @@ -90,7 +90,7 @@ void kvi_unsetenv(const char * name) #else void kvi_unsetenv(const char *) { - // no setenv , no putenv.. what the hell of system is this ? + // no setenv, no putenv.. what the hell of system is this ? #endif #endif } diff --git a/src/kvilib/system/kvi_locale.cpp b/src/kvilib/system/kvi_locale.cpp index 36babd25d..6cc880ceb 100644 --- a/src/kvilib/system/kvi_locale.cpp +++ b/src/kvilib/system/kvi_locale.cpp @@ -401,8 +401,8 @@ KviMessageCatalogue::KviMessageCatalogue() //m_uEncoding = 0; m_pTextCodec = QTextCodec::codecForLocale(); - //m_pMessages = new KviPointerHashTable(1123,true,false); // dictSize, case sensitive , don't copy keys - m_pMessages = new KviPointerHashTable(32,true,false); // dictSize, case sensitive , don't copy keys + //m_pMessages = new KviPointerHashTable(1123,true,false); // dictSize, case sensitive, don't copy keys + m_pMessages = new KviPointerHashTable(32,true,false); // dictSize, case sensitive, don't copy keys m_pMessages->setAutoDelete(true); } @@ -514,7 +514,7 @@ bool KviMessageCatalogue::load(const QString& name) int dictSize = kvi_getFirstBiggerPrime(numberOfStrings); if(m_pMessages) delete m_pMessages; - m_pMessages = new KviPointerHashTable(dictSize,true,false); // dictSize, case sensitive , don't copy keys + m_pMessages = new KviPointerHashTable(dictSize,true,false); // dictSize, case sensitive, don't copy keys m_pMessages->setAutoDelete(true); KviStr szHeader; @@ -551,7 +551,7 @@ bool KviMessageCatalogue::load(const QString& name) m_pTextCodec = 0; - // find out the text encoding , if possible + // find out the text encoding, if possible if(szHeader.hasData()) { // find "charset=*\n" diff --git a/src/kvilib/system/kvi_locale.h b/src/kvilib/system/kvi_locale.h index 0241b72ca..665628b27 100644 --- a/src/kvilib/system/kvi_locale.h +++ b/src/kvilib/system/kvi_locale.h @@ -70,13 +70,13 @@ public: QString * m_pQTranslation; public: KviTranslationEntry(char * keyptr,int keylen,char * trptr,int trlen) - : m_szKey(keyptr,keylen) , m_szEncodedTranslation(trptr,trlen) + : m_szKey(keyptr,keylen), m_szEncodedTranslation(trptr,trlen) { m_pQTranslation = 0; } KviTranslationEntry(const char * keyandtr) - : m_szKey(keyandtr) , m_szEncodedTranslation(keyandtr) + : m_szKey(keyandtr), m_szEncodedTranslation(keyandtr) { m_pQTranslation = 0; } diff --git a/src/kvilib/system/kvi_thread.cpp b/src/kvilib/system/kvi_thread.cpp index f96efecf7..bb5d37d40 100644 --- a/src/kvilib/system/kvi_thread.cpp +++ b/src/kvilib/system/kvi_thread.cpp @@ -56,7 +56,7 @@ static void kvi_threadIgnoreSigalarm() #if !defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MINGW) // Funky hack for some Solaris machines (maybe others ?) // For an obscure (at least to me) reason - // when using threads ,some part of the system + // when using threads,some part of the system // starts kidding us by sending a SIGALRM in apparently // "random" circumstances. (Xlib ?) (XServer ?) // The default action for SIGALRM is to exit the application. @@ -150,7 +150,7 @@ static void kvi_threadInitialize() #define KVI_THREAD_PIPE_SIDE_SLAVE 1 // the maximum length of the slave->master queue -// over this length , the slave is forced to usleep() +// over this length, the slave is forced to usleep() #define KVI_THREAD_MAX_EVENT_QUEUE_LENGTH 50 static KviThreadManager * g_pThreadManager = 0; @@ -308,7 +308,7 @@ void KviThreadManager::postSlaveEvent(QObject *o,QEvent *e) m_pMutex->lock(); - // if the queue gets too long , make this (slave) thread sleep + // if the queue gets too long, make this (slave) thread sleep // there is a special case where we can't stop the slaves posting events // it's when a thread-master-side is waiting for it's thread-slave-side @@ -401,7 +401,7 @@ void KviThreadManager::eventsPending(int fd) } } - // ok , job done.. can relax now + // ok, job done.. can relax now m_pMutex->unlock(); #endif @@ -525,7 +525,7 @@ void KviThread::wait() void KviThread::exit() { - // We're on the slave side thread here! (m_bRunning is true , m_bStartingUp is false) + // We're on the slave side thread here! (m_bRunning is true, m_bStartingUp is false) setRunning(false); kvi_threadExit(); } diff --git a/src/kvilib/system/kvi_thread.h b/src/kvilib/system/kvi_thread.h index a569e7668..0cad423d3 100644 --- a/src/kvilib/system/kvi_thread.h +++ b/src/kvilib/system/kvi_thread.h @@ -141,7 +141,7 @@ // We don't care about exit codes at all #define kvi_threadExit() thr_exit(0) #else -// FIXME: #warning "Missing a decent thread implementation: we're going to fail , sorry!" +// FIXME: #warning "Missing a decent thread implementation: we're going to fail, sorry!" #endif #endif #endif @@ -197,7 +197,7 @@ public: // Returns the state of the thread...safe to call from anywhere bool isRunning(); // Returns the state of the thread...safe to call from anywhere - bool isStartingUp(); // start() called , but not in run() yet... + bool isStartingUp(); // start() called, but not in run() yet... // Waits for the termination of this thread: call only from external threads!!! :) void wait(); // DO NOT TOUCH THIS ONE! @@ -269,11 +269,11 @@ protected: KviThread * m_pSender; public: KviThreadEvent(int evId,KviThread * sender = 0) - : QEvent((QEvent::Type)KVI_THREAD_EVENT) , m_eventId(evId) , m_pSender(sender) {}; + : QEvent((QEvent::Type)KVI_THREAD_EVENT), m_eventId(evId), m_pSender(sender) {}; virtual ~KviThreadEvent(){}; public: // This is the sender of the event - // WARNING : this MAY be null , threads CAN send anonymous events + // WARNING : this MAY be null, threads CAN send anonymous events KviThread * sender(){ return m_pSender; }; int id(){ return m_eventId; }; }; diff --git a/src/kvilib/system/kvi_time.h b/src/kvilib/system/kvi_time.h index 9fc812242..c5a7e490b 100644 --- a/src/kvilib/system/kvi_time.h +++ b/src/kvilib/system/kvi_time.h @@ -53,7 +53,7 @@ */ extern KVILIB_API void kvi_gettimeofday(struct timeval * tmv, struct timezone * tmz); #else - #include // gettimeofday() , struct timeval + #include // gettimeofday(), struct timeval /** * \brief Gets the time of the day diff --git a/src/kvirc/kernel/kvi_action.cpp b/src/kvirc/kernel/kvi_action.cpp index 74b885234..916dfb4ea 100644 --- a/src/kvirc/kernel/kvi_action.cpp +++ b/src/kvirc/kernel/kvi_action.cpp @@ -93,7 +93,7 @@ void KviAction::registerAccelerator() { if(!m_szKeySequence.isEmpty()) { - m_pAccel = new QShortcut(m_szKeySequence,g_pFrame,0 ,0 , Qt::ApplicationShortcut); + m_pAccel = new QShortcut(m_szKeySequence, g_pFrame, 0, 0, Qt::ApplicationShortcut); connect(m_pAccel,SIGNAL(activated()),this,SLOT(activate())); //no way to have Ctrl+Alt+Key events fired as no-ambiguous, probably qt bug connect(m_pAccel,SIGNAL(activatedAmbiguously()),this,SLOT(activate())); diff --git a/src/kvirc/kernel/kvi_actionmanager.h b/src/kvirc/kernel/kvi_actionmanager.h index 8c7d43d4e..387d9eae9 100644 --- a/src/kvirc/kernel/kvi_actionmanager.h +++ b/src/kvirc/kernel/kvi_actionmanager.h @@ -57,7 +57,7 @@ protected: static KviActionCategory * m_pCategoryGUI; static KviActionCategory * m_pCategoryChannel; static KviActionCategory * m_pCategoryTools; - // internal , current toolbar to be edited (only when customizing) + // internal, current toolbar to be edited (only when customizing) static KviCustomToolBar * m_pCurrentToolBar; bool m_bCoreActionsRegistered; public: diff --git a/src/kvirc/kernel/kvi_app.cpp b/src/kvirc/kernel/kvi_app.cpp index c6a649705..445deac37 100644 --- a/src/kvirc/kernel/kvi_app.cpp +++ b/src/kvirc/kernel/kvi_app.cpp @@ -547,7 +547,7 @@ void KviApp::setup() void KviApp::frameDestructorCallback() { - // here we should kill anything that depends on g_pFrame , g_pActiveWindow and related being non zero... + // here we should kill anything that depends on g_pFrame, g_pActiveWindow and related being non zero... // kill all the objects, while we have windows... if(KviKvsKernel::instance()) @@ -1494,7 +1494,7 @@ void KviApp::createFrame() if(m_szExecAfterStartup.hasData()) { - // FIXME , this should be a QString + // FIXME, this should be a QString KviKvsScript::run(m_szExecAfterStartup.ptr(),g_pFrame->firstConsole()); m_szExecAfterStartup = ""; } @@ -1950,7 +1950,7 @@ void KviApp::timerEvent(QTimerEvent * e) heartbeat(tNow); } -// qvariant.h uses this , and it is included by the qt generated moc file for Qt >= 3.0.0 +// qvariant.h uses this, and it is included by the qt generated moc file for Qt >= 3.0.0 #ifdef Bool #undef Bool #endif diff --git a/src/kvirc/kernel/kvi_app.h b/src/kvirc/kernel/kvi_app.h index 05476638c..5fd1b28c4 100644 --- a/src/kvirc/kernel/kvi_app.h +++ b/src/kvirc/kernel/kvi_app.h @@ -141,7 +141,7 @@ public: // FIXME: "Plugins" and "ConfigPlugins" should become "Modules" and "ConfigModules" enum KvircSubdir { - None, Pics, Config , + None, Pics, Config, Help, HelpEN, HelpNoIntl, Log, Incoming, Audio, Scripts, Plugins, ConfigPlugins, diff --git a/src/kvirc/kernel/kvi_app_fs.cpp b/src/kvirc/kernel/kvi_app_fs.cpp index f9dc6f445..3d40e19f8 100644 --- a/src/kvirc/kernel/kvi_app_fs.cpp +++ b/src/kvirc/kernel/kvi_app_fs.cpp @@ -328,8 +328,8 @@ bool KviApp::findImageInImageSearchPath(QString &szRetPath,const QString &filena return false; } -static KviApp::KvircSubdir pics_localsubdirs[2]={ KviApp::Pics , KviApp::Avatars }; -static KviApp::KvircSubdir pics_globalsubdirs[2]={ KviApp::Pics , KviApp::Avatars }; +static KviApp::KvircSubdir pics_localsubdirs[2]={ KviApp::Pics, KviApp::Avatars }; +static KviApp::KvircSubdir pics_globalsubdirs[2]={ KviApp::Pics, KviApp::Avatars }; /*bool KviApp::mapImageFile(KviStr &szRetPath,const char * filename) { diff --git a/src/kvirc/kernel/kvi_app_setup.cpp b/src/kvirc/kernel/kvi_app_setup.cpp index cb7e478a9..bec2dbc9b 100644 --- a/src/kvirc/kernel/kvi_app_setup.cpp +++ b/src/kvirc/kernel/kvi_app_setup.cpp @@ -65,7 +65,7 @@ static QLibrary * g_pSetupLibrary = 0; // Things launched at startup: // - Attempt to find the global Kvirc directory // - Attempt to find the local Kvirc directory -// and if it is not found , ask the user to choose one +// and if it is not found, ask the user to choose one // bool KviApp::checkGlobalKvircDirectory(const QString szDir) @@ -632,7 +632,7 @@ void KviApp::findGlobalKvircDirectory() // FAILED ? Check the usual way... #endif //COMPILE_WITH_KDE */ - // Non KDE compilation , or not found under $KDEDIR/share/apps/kvirc/$VERSION_BRANCH + // Non KDE compilation, or not found under $KDEDIR/share/apps/kvirc/$VERSION_BRANCH // Check for MacOS X Bundle compilation #ifdef COMPILE_ON_MAC @@ -657,7 +657,7 @@ void KviApp::findGlobalKvircDirectory() } } - //Last resource , try $HOME and $HOME/.kde + //Last resource, try $HOME and $HOME/.kde for(int k=0;usualKvircGlobalDir[k] != 0;k++){ m_szGlobalKvircDir = QDir::homePath(); m_szGlobalKvircDir+= usualKvircGlobalDir[k]; @@ -727,7 +727,7 @@ bool KviApp::findLocalKvircDirectory() if(uSourcesDate < KVI_SOURCES_DATE_NUMERIC_FORCE_SETUP) return false; // we force a setup anyway - // If we have it , ok...done + // If we have it, ok...done if(checkLocalKvircDirectory()) return true; } @@ -759,7 +759,7 @@ bool KviApp::findLocalKvircDirectory() szF += KVI_HOME_CONFIG_FILE_NAME; } - //If the file exists , read the first non empty line. + //If the file exists, read the first non empty line. KviConfig cfgx(szF,KviConfig::Read); cfgx.setGroup("Main"); @@ -769,7 +769,7 @@ bool KviApp::findLocalKvircDirectory() if(uSourcesDate < KVI_SOURCES_DATE_NUMERIC_FORCE_SETUP) return false; // we force a setup anyway - // If we have it , ok...done + // If we have it, ok...done return checkLocalKvircDirectory(); } diff --git a/src/kvirc/kernel/kvi_filetransfer.h b/src/kvirc/kernel/kvi_filetransfer.h index 685e3d5f8..4b88391be 100644 --- a/src/kvirc/kernel/kvi_filetransfer.h +++ b/src/kvirc/kernel/kvi_filetransfer.h @@ -94,7 +94,7 @@ public: KviFileTransferManager * manager(){ return KviFileTransferManager::instance(); }; // this returns the pointer to the transfer window : may be 0! KviWindow * transferWindow(){ return manager()->transferWindow(); }; - // this returns transferWindow() if not 0 , otherwise the application's active window + // this returns transferWindow() if not 0, otherwise the application's active window KviWindow * outputWindow(); // this may be called by the transfers to update the display when the state changes diff --git a/src/kvirc/kernel/kvi_iconmanager.cpp b/src/kvirc/kernel/kvi_iconmanager.cpp index 21b4cc797..596bffc61 100644 --- a/src/kvirc/kernel/kvi_iconmanager.cpp +++ b/src/kvirc/kernel/kvi_iconmanager.cpp @@ -620,7 +620,7 @@ void KviIconManager::iconWidgetClosed() In this last case KVIrc will look for the file in a predefined set of directories: First in the local "pics" directory (usually in ~/kvirc-version/pics/), then in the local "incoming" directory, - then in the global "pics" directory , then in the user home (~) + then in the global "pics" directory, then in the user home (~) and in the current directory.[br] */ diff --git a/src/kvirc/kernel/kvi_internalcmd.cpp b/src/kvirc/kernel/kvi_internalcmd.cpp index 30ebdd3ce..c66e9624f 100644 --- a/src/kvirc/kernel/kvi_internalcmd.cpp +++ b/src/kvirc/kernel/kvi_internalcmd.cpp @@ -49,7 +49,7 @@ static const char * internalCommandTable[KVI_NUM_INTERNAL_COMMANDS]= "dirbrowser.open", "ident.start", "ident.stop", - "tip.open" , + "tip.open", "openurl http://www.kvirc.net", "list.open", "if($option(boolShowChannelsJoinDialogAsToplevel))channelsjoin.open -t;else channelsjoin.open", diff --git a/src/kvirc/kernel/kvi_ircconnection.cpp b/src/kvirc/kernel/kvi_ircconnection.cpp index 5b61ed753..fb9e95ab0 100644 --- a/src/kvirc/kernel/kvi_ircconnection.cpp +++ b/src/kvirc/kernel/kvi_ircconnection.cpp @@ -735,7 +735,7 @@ void KviIrcConnection::resurrectDeadQueries() // 01234567890123456789012345678901234567890123456789 // 0123456789\r\n // -// We keep a list of data to send , and flush it as soon as we can. +// We keep a list of data to send, and flush it as soon as we can. // bool KviIrcConnection::sendFmtData(const char * pcFmt, ...) @@ -831,7 +831,7 @@ void KviIrcConnection::delayedStartNotifyList() // This delay is large enough to fire after the MOTD has been sent, // even on the weirdest network. // If there is no MOTD, this timer will fire after 15 secs, - // If there is a MOTD , restartNotifyList() will be triggered by RPL_ENDOFMOTD and + // If there is a MOTD, restartNotifyList() will be triggered by RPL_ENDOFMOTD and // will kill the timer before it has fired. } @@ -1630,7 +1630,7 @@ void KviIrcConnection::loginComplete(const QString & szNickName) void KviIrcConnection::incomingMessage(const char * pcMessage) { // A message has arrived from the current server - // First of all , notify the monitors + // First of all, notify the monitors if(KviPointerList * l = context()->monitorList()) { for(KviIrcDataStreamMonitor * m = l->first(); m; m = l->next()) diff --git a/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp b/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp index b9ca8937b..65a9adf86 100644 --- a/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp +++ b/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp @@ -513,7 +513,7 @@ void KviIrcConnectionTargetResolver::haveServerIp() { if(!validateLocalAddress(KVI_OPTION_STRING(KviOption_stringIPv6ConnectionBindAddress),bindAddress)) { - // if it is not an interface name , kill it for now and let the user correct the address + // if it is not an interface name, kill it for now and let the user correct the address if(KVI_OPTION_STRING(KviOption_stringIPv6ConnectionBindAddress).indexOf(':') != -1) { if(!_OUTPUT_MUTE) @@ -542,7 +542,7 @@ void KviIrcConnectionTargetResolver::haveServerIp() { if(!validateLocalAddress(KVI_OPTION_STRING(KviOption_stringIPv4ConnectionBindAddress),bindAddress)) { - // if it is not an interface name , kill it for now and let the user correct the address + // if it is not an interface name, kill it for now and let the user correct the address if(KVI_OPTION_STRING(KviOption_stringIPv4ConnectionBindAddress).indexOf(':') != -1) { if(!_OUTPUT_MUTE) diff --git a/src/kvirc/kernel/kvi_irccontext.cpp b/src/kvirc/kernel/kvi_irccontext.cpp index fe471a9b8..e4b5e9ac4 100644 --- a/src/kvirc/kernel/kvi_irccontext.cpp +++ b/src/kvirc/kernel/kvi_irccontext.cpp @@ -461,7 +461,7 @@ void KviIrcContext::connectToCurrentServer() } } else { // !m_pAsynchronousConnectionData->szServer.isEmpty() - // ok , have a server to look for in the db + // ok, have a server to look for in the db // FIXME: this is a bit ugly... could it be managed in some completly different and nicer way ? KviServerDefinition d; d.szServer = m_pAsynchronousConnectionData->szServer; diff --git a/src/kvirc/kernel/kvi_irclink.cpp b/src/kvirc/kernel/kvi_irclink.cpp index ab0ed4704..63e804df1 100644 --- a/src/kvirc/kernel/kvi_irclink.cpp +++ b/src/kvirc/kernel/kvi_irclink.cpp @@ -291,7 +291,7 @@ void KviIrcLink::processData(char * buffer, int iLen) //now *p == '\0' //beginOfCurData points to '\0' if we have - //no more stuff to parse , or points to something + //no more stuff to parse, or points to something //different than '\r' or '\n'... if(*cBeginOfCurData) { diff --git a/src/kvirc/kernel/kvi_ircsocket.cpp b/src/kvirc/kernel/kvi_ircsocket.cpp index 0dee2af29..1c2566a03 100644 --- a/src/kvirc/kernel/kvi_ircsocket.cpp +++ b/src/kvirc/kernel/kvi_ircsocket.cpp @@ -96,7 +96,7 @@ KviIrcSocket::KviIrcSocket(KviIrcLink * pLink) m_tAntiFloodLastMessageTime.tv_usec = 0; if(KVI_OPTION_UINT(KviOption_uintSocketQueueFlushTimeout) < 100) - KVI_OPTION_UINT(KviOption_uintSocketQueueFlushTimeout) = 100; // this is our minimum , we don't want to lag the app + KVI_OPTION_UINT(KviOption_uintSocketQueueFlushTimeout) = 100; // this is our minimum, we don't want to lag the app m_bInProcessData = false; @@ -1352,7 +1352,7 @@ void KviIrcSocket::doSSLHandshake(int) // Declare problems :) raiseError((iErr ? KviError::translateSystemError(iErr) : KviError_unknownError)); } else { - // can recover ? (EAGAIN , EINTR ?) + // can recover ? (EAGAIN, EINTR ?) m_pWsn = new QSocketNotifier((int)m_sock,QSocketNotifier::Write); QObject::connect(m_pWsn,SIGNAL(activated(int)),this,SLOT(doSSLHandshake(int))); m_pWsn->setEnabled(true); @@ -1579,7 +1579,7 @@ void KviIrcSocket::processData(char * buffer,int) //now *p == '\0' //beginOfCurData points to '\0' if we have - //no more stuff to parse , or points to something + //no more stuff to parse, or points to something //different than '\r' or '\n'... if(*beginOfCurData) { @@ -1702,7 +1702,7 @@ void KviIrcSocket::queue_removeAllMessages() void KviIrcSocket::flushSendQueue() { - // If we're called from the flush timer , stop it + // If we're called from the flush timer, stop it if(m_pFlushTimer->isActive()) m_pFlushTimer->stop(); diff --git a/src/kvirc/kernel/kvi_lagmeter.cpp b/src/kvirc/kernel/kvi_lagmeter.cpp index f7b7f8e4e..70577480a 100644 --- a/src/kvirc/kernel/kvi_lagmeter.cpp +++ b/src/kvirc/kernel/kvi_lagmeter.cpp @@ -96,19 +96,19 @@ void KviLagMeter::timerEvent(QTimerEvent *) { KVS_TRIGGER_EVENT_2_HALTED(KviEvent_OnLagAlarmTimeUp, m_pConnection->console(),m_pConnection->serverInfo()->name(),QString(szLag.ptr())); - if(bDeletionSignal)return; // killed , probably by a quit -f -u + if(bDeletionSignal)return; // killed, probably by a quit -f -u m_bOnAlarm = true; } else if(m_bOnAlarm) { KVS_TRIGGER_EVENT_2_HALTED(KviEvent_OnLagAlarmTimeDown, m_pConnection->console(),m_pConnection->serverInfo()->name(),QString(szLag.ptr())); - if(bDeletionSignal)return; // killed , probably by a quit -f -u + if(bDeletionSignal)return; // killed, probably by a quit -f -u m_bOnAlarm = false; } KVS_TRIGGER_EVENT_2_HALTED(KviEvent_OnLagCheck, m_pConnection->console(),m_pConnection->serverInfo()->name(),QString(szLag.ptr())); - if(bDeletionSignal)return; // killed , probably by a quit -f -u + if(bDeletionSignal)return; // killed, probably by a quit -f -u m_pDeletionSignal = 0; } diff --git a/src/kvirc/kernel/kvi_notifylist.cpp b/src/kvirc/kernel/kvi_notifylist.cpp index 08b30099b..cfa749f1f 100644 --- a/src/kvirc/kernel/kvi_notifylist.cpp +++ b/src/kvirc/kernel/kvi_notifylist.cpp @@ -80,7 +80,7 @@ In this way, once in a while, KVIrc will send to the server an ISON message with the nickname Pragma. If Szymon is online, you will be notified with a message:[br] "Pragma [someuser@somehost.it] is on IRC".[br] - If Szymon uses often "[Pragma]" as his secondary nickname , you can do the following:[br] + If Szymon uses often "[Pragma]" as his secondary nickname, you can do the following:[br] [example] [cmd:reguser.addmask]reguser.addmask[/cmd] Szymon [Pragma]*@*.it [cmd:reguser.setproperty]reguser.setproperty[/cmd] Szymon notify "Pragma [Pragma]" @@ -103,7 +103,7 @@ in the notify list, it might become slow and eventually cause a client to server flood.[br] So finally, the intelligent method is the default. If you have "flood" problems, - or if you think that the notify list is quite slow , try the "stupid" method: + or if you think that the notify list is quite slow, try the "stupid" method: it is not that bad after all.[br] The third notify list management method is the "WATCH method".[br] It uses a totally different (and better) approach to the notify lists management, @@ -328,7 +328,7 @@ void KviNotifyListManager::notifyOffLine(const QString &nick,const QString &user KviIsOnNotifyListManager::KviIsOnNotifyListManager(KviIrcConnection * pConnection) : KviNotifyListManager(pConnection) { - m_pRegUserDict = new KviPointerHashTable(17,false); // case insensitive , copy keys + m_pRegUserDict = new KviPointerHashTable(17,false); // case insensitive, copy keys m_pRegUserDict->setAutoDelete(true); m_pNotifyList = new KviPointerList; m_pNotifyList->setAutoDelete(true); @@ -551,7 +551,7 @@ bool KviIsOnNotifyListManager::handleIsOn(KviIrcMessage *msg) } } - // Ok...looks to be my ison (still not sure at 100% , but can't do better) + // Ok...looks to be my ison (still not sure at 100%, but can't do better) if(m_pConnection->lagMeter()) m_pConnection->lagMeter()->lagCheckComplete("@notify_ison"); @@ -562,7 +562,7 @@ bool KviIsOnNotifyListManager::handleIsOn(KviIrcMessage *msg) m_pIsOnList->setAutoDelete(false); // Ok...we have an IsOn reply here - // The nicks in the IsOnList that are also in the reply are online , and go to the OnlineList + // The nicks in the IsOnList that are also in the reply are online, and go to the OnlineList // the remaining in the IsOnList are offline QString * s; @@ -574,8 +574,8 @@ bool KviIsOnNotifyListManager::handleIsOn(KviIrcMessage *msg) } m_pIsOnList->setAutoDelete(true); - // Ok...all the users that are online , are on the OnlineList - // the remaining users are in the m_pIsOnList , and are no longer online + // Ok...all the users that are online, are on the OnlineList + // the remaining users are in the m_pIsOnList, and are no longer online // first the easy step: remove the users that have just left irc or have never been online // we're clearling the m_pIsOnList @@ -612,8 +612,8 @@ bool KviIsOnNotifyListManager::handleIsOn(KviIrcMessage *msg) // check if he is on some channels if(ent->globalData()->nRefs() > 1) { - // mmmh...we have more than one ref , so the user is at least in one query or channel - // look him up on channels , if we find his entry , we can be sure that he is + // mmmh...we have more than one ref, so the user is at least in one query or channel + // look him up on channels, if we find his entry, we can be sure that he is // still the right user KviPointerList * chlist = m_pConsole->connection()->channelList(); for(KviChannel * ch = chlist->first();ch;ch = chlist->next()) @@ -684,13 +684,13 @@ bool KviIsOnNotifyListManager::doMatchUser(const QString ¬ifyString,const Kvi if(!(m_pConsole->notifyListView()->findEntry(mask.nick()))) { notifyOnLine(mask.nick(),mask.user(),mask.host()); - } // else already online , and matching...all ok + } // else already online, and matching...all ok } else { // not matched.... has he been online before ? if(m_pConsole->notifyListView()->findEntry(mask.nick())) { - // has been online just a sec ago , but now the mask does not match - // either reguserdb has changed , or the user went offline and another one got his nick + // has been online just a sec ago, but now the mask does not match + // either reguserdb has changed, or the user went offline and another one got his nick // in the meantime... (ugly situation anyway) notifyOffLine(mask.nick(),mask.user(),mask.host(),__tr2qs("registration mask changed, or nickname is being used by someone else")); } else { @@ -853,7 +853,7 @@ bool KviIsOnNotifyListManager::handleUserhost(KviIrcMessage *msg) } } - // Ok...looks to be my usershot (still not sure at 100% , but can't do better) + // Ok...looks to be my usershot (still not sure at 100%, but can't do better) if(m_pConnection->lagMeter()) m_pConnection->lagMeter()->lagCheckComplete("@notify_userhost"); @@ -1178,7 +1178,7 @@ bool KviWatchNotifyListManager::doMatchUser(KviIrcMessage * msg,const QString &n { notifyOnLine(mask.nick(),mask.user(),mask.host(),"watch"); } else { - // else already online , and matching...all ok + // else already online, and matching...all ok if(msg->numeric() == RPL_NOWON) { // This is a reply to a /watch +something (should not happen, unless the user is messing) or to /watch l (user requested) @@ -1194,7 +1194,7 @@ bool KviWatchNotifyListManager::doMatchUser(KviIrcMessage * msg,const QString &n // not matched.... has he been online before ? if(m_pConsole->notifyListView()->findEntry(mask.nick())) { - // has been online just a sec ago , but now the mask does not match + // has been online just a sec ago, but now the mask does not match // prolly the reguserdb has been changed notifyOffLine(mask.nick(),mask.user(),mask.host(), __tr2qs("registration mask changed or desync with the watch service")); diff --git a/src/kvirc/kernel/kvi_options.cpp b/src/kvirc/kernel/kvi_options.cpp index ec5334a68..351ed4dba 100644 --- a/src/kvirc/kernel/kvi_options.cpp +++ b/src/kvirc/kernel/kvi_options.cpp @@ -61,7 +61,7 @@ extern KVIRC_API int g_iIdentDaemonRunningUsers; -#define RECT_OPTION(_txt,_val,_flags) KviRectOption(KVI_RECT_OPTIONS_PREFIX _txt, _val , _flags) +#define RECT_OPTION(_txt,_val,_flags) KviRectOption(KVI_RECT_OPTIONS_PREFIX _txt, _val, _flags) KviRectOption g_rectOptionsTable[KVI_NUM_RECT_OPTIONS]= { @@ -546,7 +546,7 @@ KviColorOption g_iccolorOptionsTable[KVI_NUM_ICCOLOR_OPTIONS]= #define PIXMAP_OPTION(_name,_flags) \ KviPixmapOption( \ - KVI_PIXMAP_OPTIONS_PREFIX _name , \ + KVI_PIXMAP_OPTIONS_PREFIX _name, \ KviPixmap(), \ _flags | KviOption_resetUpdateGui) @@ -566,8 +566,8 @@ KviPixmapOption g_pixmapOptionsTable[KVI_NUM_PIXMAP_OPTIONS]= //#define INT_OPTION(_name,_value,_flags) // { -// KVI_INT_OPTIONS_PREFIX _name , -// _value , +// KVI_INT_OPTIONS_PREFIX _name, +// _value, // _flags // } // @@ -580,8 +580,8 @@ KviPixmapOption g_pixmapOptionsTable[KVI_NUM_PIXMAP_OPTIONS]= #define UINT_OPTION(_name,_value,_flags) \ KviUIntOption( \ - KVI_UINT_OPTIONS_PREFIX _name , \ - _value , \ + KVI_UINT_OPTIONS_PREFIX _name, \ + _value, \ _flags \ ) @@ -670,8 +670,8 @@ KviUIntOption g_uintOptionsTable[KVI_NUM_UINT_OPTIONS]= #define FONT_OPTION(_name,_face,_size,_flags) \ KviFontOption( \ - KVI_FONT_OPTIONS_PREFIX _name , \ - QFont(_face,_size) , \ + KVI_FONT_OPTIONS_PREFIX _name, \ + QFont(_face,_size), \ _flags | KviOption_groupTheme \ ) @@ -704,14 +704,14 @@ KviFontOption g_fontOptionsTable[KVI_NUM_FONT_OPTIONS]= #define MSGTYPE_OPTION(_name,_text,_icon,_levl) \ KviMsgTypeOption( \ - KVI_MSGTYPE_OPTIONS_PREFIX _name , \ + KVI_MSGTYPE_OPTIONS_PREFIX _name, \ KviMsgType(_text,_icon,KVI_BLACK,KVI_TRANSPARENT,true,_levl), \ KviOption_sectFlagMsgType | KviOption_groupTheme \ ) #define MSGTYPE_OPTION_SPEC(_name,_text,_icon,_fore,_back,_levl) \ KviMsgTypeOption( \ - KVI_MSGTYPE_OPTIONS_PREFIX _name , \ + KVI_MSGTYPE_OPTIONS_PREFIX _name, \ KviMsgType(_text,_icon,_fore,_back,true,_levl), \ KviOption_sectFlagMsgType | KviOption_groupTheme \ ) diff --git a/src/kvirc/kernel/kvi_options.h b/src/kvirc/kernel/kvi_options.h index b5eecabf2..57cd3cf84 100644 --- a/src/kvirc/kernel/kvi_options.h +++ b/src/kvirc/kernel/kvi_options.h @@ -48,7 +48,7 @@ int flags; \ public: \ _cname(const QString &n,_type o,int f) \ - : name(n) , option(o) , flags(f) {}; \ + : name(n), option(o), flags(f) {}; \ ~_cname() {}; \ }; diff --git a/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp b/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp index 84aa829c2..41fa90a76 100644 --- a/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp +++ b/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp @@ -324,11 +324,11 @@ namespace KviKvsCoreCallbackCommands $8 = server that provided the information[br] $9 = away message (empty if user hasn't set an away message)[br] $10 = magic string evaluated at awhois call (may be empty)[br] - If the -i switch is specified , the whois message is sent to the server + If the -i switch is specified, the whois message is sent to the server that the user is connected to; in this way you will probably get the idle time of the user too.[br] If the server replies with a "No such nick/channel error message" the - will be still triggered , but will have all the parameters + will be still triggered, but will have all the parameters empty with the exception of $0.[br] If the connection gets interrupted before all the information have been received, the will never be triggered.[br] @@ -397,9 +397,9 @@ namespace KviKvsCoreCallbackCommands The will be executed as reaction to a button press.[br] [br] The "window" type button can be added only to the windows that have a button container: this - actually includes at least console , channels and queries.[br] + actually includes at least console, channels and queries.[br] The button is added to the current window; if you want to add it to a different - window , use the [doc:command_rebinding]standard -r command rebinding[/doc] switch.[br] + window, use the [doc:command_rebinding]standard -r command rebinding[/doc] switch.[br] The will be executed as reaction to a button press; the code execution will be bound to the window that the button is attacched to.[br] If a button with already exists in the current window, its parameters are changed @@ -408,7 +408,7 @@ namespace KviKvsCoreCallbackCommands Passing an empty removes the button.[br] The callback parameters $0 and $1 will contain the screen coordinates of the bottom-left corner of the button: this is useful for showing a popup menu in response to the click.[br] - If the -q switch is used , this command prints no warnings.[br] + If the -q switch is used, this command prints no warnings.[br] The -d switch causes the button to be disabled (grayed).[br] @examples: [example] @@ -1085,7 +1085,7 @@ namespace KviKvsCoreCallbackCommands %parameter = "some string value" echo "Before calling /timer \%parameter is \"%parameter\"" timer -s (test,1000,%parameter){ echo "inside the callback \%parameter is \"%parameter\" but \$0 is \"$0\""; } - [comment]# watch the timer running , and note the behaviour of the %parameter variable[/comment] + [comment]# watch the timer running, and note the behaviour of the %parameter variable[/comment] killtimer test [comment]# Use the extended scope timer variables[/comment] timer(test,1000) diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions_gl.cpp b/src/kvirc/kvs/kvi_kvs_corefunctions_gl.cpp index 531d75b19..2c97f809d 100644 --- a/src/kvirc/kvs/kvi_kvs_corefunctions_gl.cpp +++ b/src/kvirc/kvs/kvi_kvs_corefunctions_gl.cpp @@ -627,7 +627,7 @@ namespace KviKvsCoreFunctions $isSet() @description: Returns 1 if is actually set to some non-empty value - and 0 otherwise. If is a variable , then this function + and 0 otherwise. If is a variable, then this function simply checks if the variable is set. If is a constant then this function checks if the constant is non empty. Since KVIrc treats empty strings as "unset" values then diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions_sz.cpp b/src/kvirc/kvs/kvi_kvs_corefunctions_sz.cpp index 51e572e7c..fb21a7dc7 100644 --- a/src/kvirc/kvs/kvi_kvs_corefunctions_sz.cpp +++ b/src/kvirc/kvs/kvi_kvs_corefunctions_sz.cpp @@ -1137,7 +1137,7 @@ namespace KviKvsCoreFunctions has the specified .[br] If no window matches the specified , and invalid window id is returned (0).[br] - If no is specified , this function returns the id + If no is specified, this function returns the id of the current window.[br] restricts search in only one irc context. @examples: diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp index fa3e676cf..91490d7cf 100644 --- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp +++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp @@ -285,7 +285,7 @@ namespace KviKvsCoreSimpleCommands @description: Beeps (when possible :D)[br] ...[br] - No , really...[br] + No, really...[br] This command rings the bell on the keyboard (the PC speaker). The volume must be in range 0-100; the default is 100.[br] The pitch is specified in Hz and must be positive.[br] @@ -644,7 +644,7 @@ namespace KviKvsCoreSimpleCommands Sends a CTCP message @description: Sends a CTCP message to the specified .[br] - The target may be a nickname , a channel, or a comma separated list of nicknames.[br] + The target may be a nickname, a channel, or a comma separated list of nicknames.[br] The 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 @@ -1105,12 +1105,12 @@ namespace KviKvsCoreSimpleCommands Send the output to the debug window (takes precedence over -w) @description: Outputs the <text> to the current window.[br] - If the 'w' switch is present , outputs the <text> + If the 'w' switch is present, outputs the <text> to the specified window instead of the current one. The parameter is the [doc:window_naming_conventions]global ID[/doc] of the window that has to be used.[br] - If the 'i' switch is given , it uses the specified - icon scheme (icon and colors) , otherwise it uses + If the 'i' switch is given, it uses the specified + icon scheme (icon and colors), otherwise it uses the default one (0).[br] If the -d switch is used then the output is sent to a special window called "Debug" (the window is created if not existing yet). @@ -1222,8 +1222,8 @@ namespace KviKvsCoreSimpleCommands [doc:command_rebinding]-r rebinding switch[/doc]: -w causes the specified window to be used only for output, but the command parameters are evaluated in the current window.[br] - If the 'i' switch is given , it uses the specified - icon scheme (icon and colors) , otherwise it uses + If the 'i' switch is given, it uses the specified + icon scheme (icon and colors), otherwise it uses the default one (0).[br] If the -n switch is present then the highlighting rules are not applied.[br] diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp index 0532c71bd..71b4b61a8 100644 --- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp +++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp @@ -82,7 +82,7 @@ namespace KviKvsCoreSimpleCommands set the return value (use [cmd]setreturn[/cmd] for that) and in the event handlers this command may have additional semantics: refer to the specific event documentation for more info.[br] - In fact , this command should be used [b]only[/b] in the event handlers, + In fact, this command should be used [b]only[/b] in the event handlers, use [cmd]return[/cmd] in any other context.[br] */ @@ -111,7 +111,7 @@ namespace KviKvsCoreSimpleCommands Finds the first available help browser in the current frame then opens the specified [document]. If no [document] is specified it the documentation index is shown. - If no help browser is available , a new one is created. + If no help browser is available, a new one is created. [document] can be an absolute path or a relative one: in this case the document is searched in the KVIrc documentation directory.[br] If no document has been found using absolute and relative paths, diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp index 49aeb760e..6b4b31899 100644 --- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp +++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp @@ -465,7 +465,7 @@ namespace KviKvsCoreSimpleCommands [b]Color[/b]: must have the format #RRGGBB where R G and B are hex digits[br] [b]Font[/b]: is a comma separated list of font properties: ,,