diff options
253 files changed, 2835 insertions, 3263 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5b0b735be..a4562ead5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -313,11 +313,11 @@ ENDIF() # We require at least Qt 4.5.x FIND_PACKAGE(Qt4 4.5.0 REQUIRED) IF(QT4_FOUND) - SET(QT_USE_QTSQL true) - SET(QT_USE_QTXML true) - SET(QT_USE_QTNETWORK true) + SET(QT_USE_QTSQL true) + SET(QT_USE_QTXML true) + SET(QT_USE_QTNETWORK true) - # Qt-DBus support + # Qt-DBus support OPTION(WANT_QTDBUS "Whether to compile Qt-DBus support" ON) IF(WITHOUT_QTDBUS) SET(WANT_QTDBUS OFF) @@ -30,7 +30,7 @@ 25 July 2009 [CtrlAltCa] - - Replaced win32 icon with a hi-res vista/win7 capable one + - Replaced win32 icon with a hi-res vista/win7 capable one 19 July 2009 [CtrlAltCa] @@ -80,7 +80,7 @@ 02 June 2009 [Curan] - - Added system.runcmd: runs the specified command in a terminal + - Added system.runcmd: runs the specified command in a terminal 31 May 2009 [Kebianizao] @@ -291,7 +291,7 @@ buh :) - 16 August 2008 [Alexey] - Configurable avatar scaling on load - Human-redable file sized on dcc transfers - + 12 Mar 2007 [Alexey] - Added support for remote dns on socks5 proxy @@ -306,17 +306,17 @@ buh :) - 16 August 2008 26 Feb 2007 [Alexey] - Added Export/Import feature to channel list module - + 25 Feb 2007 [Alexey] - Repainted reuser list - Added search field for mask editors - + 24 Feb 2007 [Noldor] - New QT4 win compiling projects: still unusable... kvilib and kvirc compile but only in release; you need to compile qt libraries by yourself then try to compile kvilib and kvirc (use COMPILE_USE_QT4 in kvi_wincfg.h). - Some module compile without problem... others need to be ported. + Some module compile without problem... others need to be ported. 20 Feb 2007 [Alexey] @@ -335,7 +335,7 @@ buh :) - 16 August 2008 the list. - I'm thinking about qmake support (as suggested by Matteo Catanese some time ago) ... will require some work ... what do you think about it ? - + 18 Feb 2007 [Alexey] - Fixed dns resolver under win32 @@ -380,7 +380,7 @@ buh :) - 16 August 2008 30 Jan 2007 [Alexey] - Introduced option "using identd only on connect" - + 29 Jan 2007 [Alexey] - Introduced search in log files @@ -469,7 +469,7 @@ buh :) - 16 August 2008 27 Dec 2006 [Noldor] - - Alias editor module: + - Alias editor module: added the possibility to save a selection of aliases in separated files (every file will have the alias name); fixed search function; - Script editor module: @@ -478,7 +478,7 @@ buh :) - 16 August 2008 - Objects module: added objects.classes, objects.variables, objects.classAllHandlers; fixed crash in listviewitem class; - fixed little bug in multilinnedit class (function $setWordWrap); + fixed little bug in multilinnedit class (function $setWordWrap); 19 Dec 2006 @@ -512,17 +512,17 @@ buh :) - 16 August 2008 - More work on the options dialogs - Removed the duplicated kvc_ icon. -19 Nov 2006 +19 Nov 2006 [Alexey] - New function - $chan.getUrl - NickServ identity can now accept masks in nick field -16 Nov 2006 +16 Nov 2006 [Alexey] - Added a simple browser-like address bar to console - Clicking on nick in channel ircview now selects it in the userlist - Avatar dcc send rejected if avatar size greater, then max filesize, setted in options - + 15 Nov 2006 [HelLViS69] - Added a checkbox on AwayIndicator applet popup to choose to go away @@ -588,7 +588,7 @@ Oct 2006 - Fixed crash after first run wizard on *nix - Make possible installation on USB removable drives (WIN32). KVIrc can store settings in program folder - Make pathes in configs system-independent - + 23 Sep 2006 [Zerg] (commited by Alexey) - Change dock icon size to 22x22 on KDE. Fixed style of icon @@ -598,7 +598,7 @@ Oct 2006 18 Sep 2006 [Noldor] - - Added alphablend in objects.blend + - Added alphablend in objects.blend - Added doc to class image and function setOpacity() ... now we can create some weird, cool effect :=D @@ -740,19 +740,19 @@ Oct 2006 13 May 2006 [Alexey] - Added search and document index to the help system - + 10 May 2006 [Alexey] - Added texticon module to manage text icon collection - Added detection if the KVIrc running to the win32 insatll script (patch contributed by Zerg) - + 02 May 2006 - Improved win32 insatll script (patch contributed by Zerg) 22 Apr 2006 [Alexey] - Now user can define position and/or tiling methood of backgrounds - + 22 Apr 2006 [Alexey] - Added visual effects to the tree taskbar @@ -761,7 +761,7 @@ Oct 2006 [Alexey] - [WIN32] Added installer script for NSIS installer (nsis.sf.net). It can properly uninstall local data dir, automatically install Winamp plugin - Added ability to bind sounds on some events via options dialog - + 18 Apr 2006 [Alexey] - !KVIrc now can run from localized folder (generally WIN32 fix)! @@ -787,8 +787,8 @@ Oct 2006 01 Apr 2006 [Alexey] - changed KVS_PT_STRINGLIST type to QStringList - - added option to set default ban mask - - added options to set maximum width of classic taskbar button + - added option to set default ban mask + - added options to set maximum width of classic taskbar button 17 Mar 2006 [Alexey] @@ -842,15 +842,15 @@ Oct 2006 - improved nick colorization in KViIrcView: now registered nicks are colorised as in the userlist - now it is possible to assign a comment to the registered user. Comment will be shown it tooltip and WATCH join/quit messages - added option for colorizing own nick in different color - + 21 Feb 2006 [Alexey] - added option to disable avatar scaling if it less that required size - + 20 Feb 2006 - registered users can be organazid into groups - some fixes in maskeditor - + 13 Feb 2006 [Ahinu] - regchan.list -> regchan.showlist, added $regchan.list @@ -869,7 +869,7 @@ Oct 2006 03 Feb 2006 - Improved maskedior. Now it can edit masks;) - Fixed issues with [] symbols in Wildcard expressions - + 02 Feb 2006 [Pragma] - Added zero port request handling also for DCC CHAT. @@ -897,11 +897,11 @@ Oct 2006 - Fixed and optimized objects.blend command: now it is very cool and you can create some eyes candy effect very easily =)(more new graphic commands will come in the near future) - The porting of the module object is near to finish: only class socket is missing. - + 14 Jan 2006 [Grifisx & Noldor] - Added the new class object named "image": at this moment it is in alpha state and without docs; - - Added command objects.blend. + - Added command objects.blend. [Pragma] - Added the math.* module - Fixed comparison of variables in KVS @@ -973,17 +973,17 @@ Oct 2006 - [Kernel] New theme package format. Now theme s\is a king of addon - [KVS] Fixed crash while calling $tr("") in new KVS - [Kernel] Other bugfixes - + [Pragma] - [Kernel] Fixed crashbugs in KVS kernel - + 09 Dec 2005 [Alexey] - [Kernel] Fixed bugs in handling modes. Now it is case sensivity - [UI] Fixed bug with deleting selected text from input line or topic editor - [UI] Pressing a key in userlist now selects the first nick with first letter, equal to the pressed key - [UI] Now options splitted into 3 categories: for novice,normal and experienced users. Newbies should see really simple configuration dialog - + 07 Dec 2005 [Alexey] - [Kernel] KVirc *hopefelly* supports now localized file names and file pathes! (but it really partially support it now:))) @@ -995,10 +995,10 @@ Oct 2006 05 Dec 2005 [Alexey] - - [Kernel] Added soma additional checks to KviRegisteredUser class. + - [Kernel] Added soma additional checks to KviRegisteredUser class. - [Kernel] Mode work on filesystem interfave - [Kernel] Much better filenames encoding function from internationalization point of view. Logfile names becomes not so ugly:) - + 01 Dec 2005 [Alexey] - [UI] Fixed bug with nick completion @@ -1010,7 +1010,7 @@ Oct 2006 [Alexey] - [Kernel] Fixed crashes in action and toolbar modules under windows - [Kernel] Added trick to resolve unmasked local hostname from 001 server message, even when you using +x mode - + 26 Nov 2005 [Alexey] - [UI] Fixed bug with non-latin search in ircview. Now it works:) @@ -1018,11 +1018,11 @@ Oct 2006 - [UI] Improved smart nick and channel highlighting. - [UI] Escape hotkey (minimize window) replaced with Ctrl+Esc hotkey. - [UI] Better code highlighting and code completion in scripteditor. - + 25 Nov 2005 [Alexey] - [UI] Added smart nick and channel highlighting. Now most of channel names and nicknames are recognized and you can click on it by mouse:) - + 24 Nov 2005 [Alexey] - [KVS] config module ported @@ -1032,7 +1032,7 @@ Oct 2006 23 Nov 2005 [Alexey] - [Kernel] Added ability to choose proxy server in irc server's preferences. You can choose different proxyes for different servers - + 22 Nov 2005 [Alexey] - [KVS] Removed ugly $insertInInput function, added commands window.setInputText,window.insertInInputText and function $windos.inputText @@ -1040,7 +1040,7 @@ Oct 2006 - [Kernel] Added support for RPL_ADMINME, RPL_ADMINLOC1, RPL_ADMINLOC2, RPL_ADMINEMAIL, RPL_COMMANDSYNTAX, RPL_INVITING, RPL_INFO, RPL_INFOSTART, RPL_ENDOFINFO, RPL_TIME, ERR_NOSUCHSERVER, ERR_NOSUCHCHANNEL, ERR_CANNOTSENDTOCHAN, ERR_NOCOLORSONCHAN server messages - [Kernel] Added support for gzipping logs and viewing gzipped logs [Pragma] - - First step for the implementation of namespaces in aliases (new KVS only) + - First step for the implementation of namespaces in aliases (new KVS only) 21 Nov 2005 [Alexey] @@ -1072,14 +1072,14 @@ Oct 2006 - [Kernel] Fixed click vs double click bug - [Kernel] Added parsing of 703(WeNet) and 020 messages - [UI] New topic editor - - [Misc] Fixed some other bugs + - [Misc] Fixed some other bugs - [UI] Fixed permission on topiceditor and mode editors(for ircOps and halfops) - [Kernel] Fixed bug when message, that have raw event handlers decode 2 times - [Modules] Fixed internationalization issues in avatar module - [KVS] Window,reguser,url,term,toolbareditor,regchan modules are ported.. - [KVS] Log module ported, porting logging system from KviStr to QString - [kernel] Some fixes for COMPILE_ONLY_NEW_KVS - + [Pragma] - More work on the KVS engine - avatar module ported... @@ -1093,7 +1093,7 @@ Oct 2006 - started dcc module porting from KviStr to QString - resolved lot of internatiolization problems in DCC module - improved defscript - + 26 Oct 2005 [Alexey] - Added Ctrl+A shortcut for select all @@ -1114,15 +1114,15 @@ Oct 2006 [Pragma] - A quick fix for the connect button handling - A fix for a crash in the listview KVS class (new parser) - - More KVS all around + - More KVS all around 19 Jun 2005 [Grifisx/Noldor] - code improvements in the editor(...stil a work in progress): added code completition (shift+insert keys), added a dynamic help: move over a command/function. - then right button and "help command/function" (... its in beta status, need some workaround :D) : + then right button and "help command/function" (... its in beta status, need some workaround :D) : an help window will appear. - - added some options to hide graphic elements in the gui to build a very "minimalist" KVIrc. + - added some options to hide graphic elements in the gui to build a very "minimalist" KVIrc. 15 Jun 2005 [Grifisx/Noldor] @@ -1180,7 +1180,7 @@ Oct 2006 08 Mar 2005 [Grifisx/Noldor] - - Fixed CTRL+K, CTRL+B, CTRL+U, CTRL+I...escapes in the topic widget + - Fixed CTRL+K, CTRL+B, CTRL+U, CTRL+I...escapes in the topic widget 27 Feb 2005 [Pragma] @@ -1257,7 +1257,7 @@ Oct 2006 at once in a query or channel. The warning can be obviously disabled forever by answering "Always". - Added the XIM "hot spot" handling for the input window. - + 01 Feb 2005: [Pragma] @@ -1276,7 +1276,7 @@ Oct 2006 29 Jan 2005: [Iakko] - - Added Notifier 2.0 in a more stable and usable version, now tabs and + - Added Notifier 2.0 in a more stable and usable version, now tabs and "blinking onFocusOut/showing" are working. The Notifier is still on Beta version. - Some kvi_sp_literal.cpp and kvi_sp_ctcp.cpp (under kvirccvs/kvirc/src/kvirc/sparser) changes needed for notifier to work. A core recompilation is suggested even if @@ -1312,7 +1312,7 @@ Oct 2006 - Fixed a couple of bugs related to the mask handling - Fixed a possible bug related to acknowledges in the DCC send code - Other small fixes all around as usual. - + 27 Jan 2005: [Noldor/Grifisx] @@ -1448,7 +1448,7 @@ Oct 2006 1 Aug 2004: [Juanjo] - Added an autopackage dir with two (very initial) apsepc files to build a - .autopackage autoinstaller. + .autopackage autoinstaller. If you have not checked autopackage (http://autopackage.org) DO IT NOW :) is the real solution for Linux third party software installation across distributions @@ -1762,7 +1762,7 @@ Oct 2006 - Classic taskbar now limits number of rows (when horizontal). - KviChannel API change: banMask(), etc. removed in favour of setMask(). - Mask editor requests new list when opened after a mode change. - * Fixes problem with CR ircd where -b messages may not match bans in list due to stupid inconsistent hostmasking. + * Fixes problem with CR ircd where -b messages may not match bans in list due to stupid inconsistent hostmasking. 12 Mar 2004: [Trisk] @@ -1832,7 +1832,7 @@ Oct 2006 - Added support for changing the order of option items in the options dialog tree display. Most common options should go at the top. - Random fixes around :) - + 14 Feb 2004: [Trisk] - Changed 005 numeric parser output a bit, fixes issues with skipping to @@ -1845,7 +1845,7 @@ Oct 2006 - Fixed a miscompilation --without-info-tips - Added the lag to the irc context indicator tooltip. - Make the irc context indicator a little bigger (but the correct way - would be to make it resize itself depending on the inside text size). + would be to make it resize itself depending on the inside text size). 06 Feb 2004: [Pragma] @@ -1865,7 +1865,7 @@ Oct 2006 23 Jan 2004: [Pragma] - More work on the KVS engine : popups almost ready - - Fixed a regusers bug that didn't allow to register channels with a '@' + - Fixed a regusers bug that didn't allow to register channels with a '@' character in it - More windows port: kvilib, kvirc and several modules are already working - Fixed an expression parser bug related to string/number comparisons @@ -1921,7 +1921,7 @@ Oct 2006 /- echo "This is the new parser's version of echo" /- echo $window this is the new parser's version of echo \$window ... - - Added four ways of painting the user list view grid. It is user selectable + - Added four ways of painting the user list view grid. It is user selectable now. Please tell me which is the best one (to choose the default) @@ -1996,7 +1996,7 @@ New Years Eve, 2003: [Pragma] - Added avatar caching - - Reworked the code that remembers the last irc server connected in each + - Reworked the code that remembers the last irc server connected in each console now it doesn't break the servers dialog. After the commit I've discovered that it collided with the Trisk's solution: merged the two solutions in something yet better. @@ -2056,9 +2056,9 @@ Christmas Eve (Western Hemisphere) 2003: 21 Oct 2003: [Crissi] - - 'Always highlight messages with my nick on them' added: Check + - 'Always highlight messages with my nick on them' added: Check irc::output::highlight tab on options. - - 'Hightlight only at normal msg' added: Check irc::output::highlight + - 'Hightlight only at normal msg' added: Check irc::output::highlight tab on options. - 'Highlight at highlight msg too' added: Check irc::output::highlight tab on options. @@ -2080,20 +2080,20 @@ Christmas Eve (Western Hemisphere) 2003: 11 Oct 2003: [Crissi] - - Channels can now stored for each server and then auto join them if - successfully connected to the server. Look into advanced server info, + - Channels can now stored for each server and then auto join them if + successfully connected to the server. Look into advanced server info, 'After login join channels' tab. Simply check the channels (from history) - you want to join. Also you can add a new channel (current bug: after + you want to join. Also you can add a new channel (current bug: after adding close/reopen the dialog for showing new channel in list). - - Minimize console after successful login. Look into Preferences - Options - + - Minimize console after successful login. Look into Preferences - Options - Connection. 12 Aug 2003: [Crissi] - - 'Minimize all windows' and 'Restore all windows' added. Check Menu - + - 'Minimize all windows' and 'Restore all windows' added. Check Menu - Window and window action toolbar. - -01 Aug 2003: + +01 Aug 2003: [Juanjo] - I'm back, ahhh nothing like vacations to do some free software ;) - The channel completion will also complete on the list of recent channels. @@ -2102,7 +2102,7 @@ Christmas Eve (Western Hemisphere) 2003: 18 Apr 2003: [Crissi] - - exec module added. Check kvirccvs/modules/exec/README for more info. + - exec module added. Check kvirccvs/modules/exec/README for more info. 26 Mar 2003: [Crissi] @@ -2122,7 +2122,7 @@ Christmas Eve (Western Hemisphere) 2003: 28 Feb 2003: [Crissi] - The width of the taskbar entries is now custoumizable. - - GUI option 'Minimal width of taskbar buttons' added. + - GUI option 'Minimal width of taskbar buttons' added. 25 Feb 2003: [Istari] @@ -2131,8 +2131,8 @@ Christmas Eve (Western Hemisphere) 2003: 25 Feb 2003: [Crissi] - GUI options for symbols on taskbar and disabling global who added. - - Try to show emoticons with start not with : correctly (not from me...)... - tell me if you got problems with this... + - Try to show emoticons with start not with : correctly (not from me...)... + tell me if you got problems with this... 25 Feb 2003: [Pragma] @@ -2140,7 +2140,7 @@ Christmas Eve (Western Hemisphere) 2003: 21 Feb 2003: [Crissi] - - Fixed text on first setup page, Translation possibility for buttons in + - Fixed text on first setup page, Translation possibility for buttons in wizard added. 20 Feb 2003: @@ -2153,12 +2153,12 @@ Christmas Eve (Western Hemisphere) 2003: 18 Feb 2003: [Crissi] - - Size of toolbar icon fixed. Right size s now selected if toolbar size if + - Size of toolbar icon fixed. Right size s now selected if toolbar size if changed. 18 Feb 2003: [Pragma] - - Support for broken filename RESUME requests (mIrc's file.ext) added. + - Support for broken filename RESUME requests (mIrc's file.ext) added. 15 Feb 2003: [Crissi] @@ -2181,7 +2181,7 @@ Christmas Eve (Western Hemisphere) 2003: - $mp3player.getmp3tag_tracknumber => get the track number - $mp3player.getmp3tag_version => get MPEG version - A example script was added (kvirccvs/kvirc/doc/scriptexamples/mp3info.kvs) - + 4 November 2002: [Juanjo] - Added widgets to the identity an server dialogs to set a default user mode @@ -2196,8 +2196,8 @@ Christmas Eve (Western Hemisphere) 2003: [Juanjo] - Added the alias 'lag' to the default script (it just returns the lag using $lag.lag()). - - Added the event 'OnLagCheck' that get triggered every time there is a - new lag data. This should help scripters to write their own lagmeters + - Added the event 'OnLagCheck' that get triggered every time there is a + new lag data. This should help scripters to write their own lagmeters without having to poll KVIrc. - Added an option to display the lag on the IRC context indicator, making all those changes actually useful for the final user :) @@ -2205,9 +2205,9 @@ Christmas Eve (Western Hemisphere) 2003: 18 Oct 2002: [Juanjo] - Added a new (and very simple) Lagmeter (see the new 'lag' module - commands and functions), the 'Lag Options' dialog in the options/irc + commands and functions), the 'Lag Options' dialog in the options/irc window and the 'OnLagAlarmTimeUp' and 'OnLagAlarmTimeDown' events. I'll - add an applet displaying the lag to the lag module as soon as I figure + add an applet displaying the lag to the lag module as soon as I figure how to do it :) - Added the OnPong event. - Fixed bug 200210130200522026 @@ -2237,8 +2237,8 @@ Christmas Eve (Western Hemisphere) 2003: [Pragma] - More SSL support - A lot of bugfixes (see bugtrack.kvirc.omnikron.net) - - Arrays support in the whole user parser (uh...this was huge , but - necessary) a huge set of functions has been moved to the new array + - Arrays support in the whole user parser (uh...this was huge , but + necessary) a huge set of functions has been moved to the new array interface WARNING: the dictionaries have a new syntax now! %dict{key} %something[id] is now reserved to arrays (with numeric id).[br] - FOR command added @@ -2258,8 +2258,8 @@ Christmas Eve (Western Hemisphere) 2003: 21 May 2002: [Juanjo] - - Using Pragma's support for text icons, added the option to substitute - some icons (currently ':)', ':D', ':-)', ':-D' and ':-O') in the irc view + - Using Pragma's support for text icons, added the option to substitute + some icons (currently ':)', ':D', ':-)', ':-D' and ':-O') in the irc view (Options -> Look & Feel -> Irc View). Still not finished. 18-21 May 2002: @@ -2317,15 +2317,15 @@ Christmas Eve (Western Hemisphere) 2003: - Minor fixes around - Fix for the KDE style toolbars - Fixes for the liquid KDE theme (transparency). - not everything works... some label stuff must be fixed in the theme + not everything works... some label stuff must be fixed in the theme engine... - Query user list view invisible by default (also saved in the window state) - Same for the channel double view - - Removed /tbutton and /wbutton and added generic /button and /buttonctl + - Removed /tbutton and /wbutton and added generic /button and /buttonctl instead updated the example scripts accordingly - Merged the libtool update patch and added more fixes for this - Fixes for --with-local-8bit compilation - - Added kvi_list.h and the compatibility KviPtrList defines to work both + - Added kvi_list.h and the compatibility KviPtrList defines to work both with qt2 and qt3 31 Mar 2002: @@ -2341,7 +2341,7 @@ Christmas Eve (Western Hemisphere) 2003: - Added the beginning of the offer list window - Preliminary window properties saving... now handling defaults too - Minor utility-functions in the window popup menus - - Preliminary rearrangements of code for KviConsole.... the header is + - Preliminary rearrangements of code for KviConsole.... the header is becoming a mess need to order the code syntactically and then maybe extract some code to be put in external classes. KviIrcConnection could be an idea. - Beginning of code for the toolbar button management... need a module ? @@ -2356,7 +2356,7 @@ Christmas Eve (Western Hemisphere) 2003: 28 Feb 2002: [Juanjo] - - Pragma branded str module optimizations, docs for all the implemented + - Pragma branded str module optimizations, docs for all the implemented functions. 26 Feb 2002: @@ -2406,8 +2406,8 @@ Christmas Eve (Western Hemisphere) 2003: 20 Jan 2002: [Juanjo] - Added the config widget for the create query on server notice option. - - Events and events doc: OnDCCChatConnected, OnDCCChatMessage, - OnDCCSendTransferComplete, OnDCCGetTransferComplete, OnCTCPFlood, + - Events and events doc: OnDCCChatConnected, OnDCCChatMessage, + OnDCCSendTransferComplete, OnDCCGetTransferComplete, OnCTCPFlood, OnServerNotice, OnChannelNotice... 19 Jan 2002: @@ -2424,7 +2424,7 @@ Christmas Eve (Western Hemisphere) 2003: - updated po file - anti idle script changed... but pragma's syntax he gave me is not working yet :p - + [Juanjo, which is alive] - Added the 'recent servers' Qlist to the servers dialog - Added the 'Show after connecting to server' checkbox to the channelsjoin @@ -2451,7 +2451,7 @@ Christmas Eve (Western Hemisphere) 2003: 18 Nov 2001: [Juanjo] - - Added a 'Connect to servers' dialog (serversjoin.open) -> update: + - Added a 'Connect to servers' dialog (serversjoin.open) -> update: serversconnec.open - Added scripted buttons for the channels and servers dialogs. - Added $anyConsoleConnected() function. @@ -2463,15 +2463,15 @@ Christmas Eve (Western Hemisphere) 2003: 10 Nov 2001: [Juanjo] - - Now it has all the functionality ;) - + - Now it has all the functionality ;) + [YaP] - IPv6 porting from Win XP to Win 2000 (Preprocessor definition: WIN2K) - + 8 Nov 2001: [Juanjo] - Added a 'Join Channels' widget. It still don't have all the - funcionality. + funcionality. 4 Nov 2001: [Juanjo] @@ -2484,7 +2484,7 @@ Christmas Eve (Western Hemisphere) 2003: [Kristoff] - Made Dcc Voice completely configurable, options dialog also added - Volume slider for dcc voice added - - Fixed a bug in alt+arrows switching (sigsegv when window had no context + - Fixed a bug in alt+arrows switching (sigsegv when window had no context assigned) 23 Sep 2001: @@ -2497,14 +2497,14 @@ Christmas Eve (Western Hemisphere) 2003: 12 Sep 2001: [Kristoff] - - Text selected in Help Browser window is now automagically copied into the - clipboard and can be pasted (Balboy's request). - - Pressing Enter in Help Browser's lineedit starts search. When the search + - Text selected in Help Browser window is now automagically copied into the + clipboard and can be pasted (Balboy's request). + - Pressing Enter in Help Browser's lineedit starts search. When the search starts the cursor changes into waitCursor (cosmetical improvement :)) - 22 Mar - 12 Sep... man... - - biff module added - not functional at all - adding some code not to mess + - biff module added - not functional at all - adding some code not to mess with makefiles anymore - + 12 Sep 2001: [Balboy] - updated the changelog :p @@ -2517,7 +2517,7 @@ Christmas Eve (Western Hemisphere) 2003: 22 Mar 2001: [Kristoff] - combobox object added - + 17 Mar 2001: [Pragma]: - A lot of unreported changes again @@ -2525,8 +2525,8 @@ Christmas Eve (Western Hemisphere) 2003: 17 Feb 2001: [Pragma] - - A lot of changes: removed the libkvigui, it was rather useless, and it is - better to have all the GUI code into the core executable...(for many + - A lot of changes: removed the libkvigui, it was rather useless, and it is + better to have all the GUI code into the core executable...(for many reasons). - Added the first "shy" icq module. @@ -2538,10 +2538,10 @@ Christmas Eve (Western Hemisphere) 2003: 05 Dec 2000: [Number1] - - Cleaned up the about dialog, added some new entries and fixed the + - Cleaned up the about dialog, added some new entries and fixed the background bug. Note: Could people start using this log again please? ;) - + 12 Sep 2000: [Kristoff] - started this ChangeLog (to avoid confusion: newset entries go above @@ -3,8 +3,8 @@ Mantain TODO file as clear as possible - Events, events, events. There are lots of them pending (see TODO.Events). - /timer as a module -- It would be cool if KVIrc could to delete old log files automatically - (configurable, of course), to avoid disk ocupation. For example, delete (or +- It would be cool if KVIrc could to delete old log files automatically + (configurable, of course), to avoid disk ocupation. For example, delete (or move to trash) 15-days old log files automatically (configurable by user). - html colored logs (with icons ? configurable with an option) SHould get the available modes from RPL_ISUPPORT and show them in the box diff --git a/admin/convert.sh b/admin/convert.sh index c959dd39c..aafc32efa 100755 --- a/admin/convert.sh +++ b/admin/convert.sh @@ -1,5 +1,5 @@ #!/bin/bash for aa in $*; do file $aa -dos2unix $aa +dos2unix $aa done diff --git a/admin/convert2unix.sh b/admin/convert2unix.sh index 975f89cc9..0b376a537 100755 --- a/admin/convert2unix.sh +++ b/admin/convert2unix.sh @@ -1,4 +1,4 @@ #!/bin/bash admin/convert.sh `find -name "*.h"` admin/convert.sh `find -name "*.cpp"` -admin/convert.sh `find -name "*.cc"`
\ No newline at end of file +admin/convert.sh `find -name "*.cc"`
\ No newline at end of file diff --git a/admin/gendoc.pl b/admin/gendoc.pl index 008da2714..89f809523 100755 --- a/admin/gendoc.pl +++ b/admin/gendoc.pl @@ -121,7 +121,7 @@ sub print_header print $g_filehandle "<title>$_[0]</title>\n"; print $g_filehandle "<style type=\"text/css\">\n"; - print $g_filehandle "body {\n"; + print $g_filehandle "body {\n"; print $g_filehandle " font-size: 11pt;\n"; print $g_filehandle " margin-left: 8px;\n"; print $g_filehandle " margin-right: 8px;\n"; @@ -591,7 +591,7 @@ sub process_body_line $_[0] =~ s/\[i\]/\<i\>/g; $_[0] =~ s/\[\/i\]/\<\/i\>/g; $_[0] =~ s/\[ul\]/\<ul\>/g; - $_[0] =~ s/\[\/ul\]/\<\/ul\>/g; + $_[0] =~ s/\[\/ul\]/\<\/ul\>/g; $_[0] =~ s/\[li\]/\<li\>/g; $_[0] =~ s/\[\/li\]/\<\/li\>/g; $_[0] =~ s/\[table\]/\<table bgcolor=\"$g_internaltablecolor\" width=\"100\%\"\>/g; @@ -1103,7 +1103,7 @@ sub generate_indexes if(open(CMDINDEX,">$g_directory/doc_$category\_index_all$g_fileextension")) { $g_filehandle=CMDINDEX; - + print_header("$doctitle: All"); print_tablestart(); print_title("$doctitle: All",""); @@ -1114,7 +1114,7 @@ sub generate_indexes print_tableend(); print_tablestart(); - + $i=0; while($i < $count) @@ -1124,7 +1124,7 @@ sub generate_indexes print_twocolumnbody("<a href=\"$link\">$cmd</a>",$short); $i++; } - + print_tableend(); print_tablestart(); @@ -1132,7 +1132,7 @@ sub generate_indexes print_tableend(); print_footer(); - + close(CMDINDEX); } else { print "Can't open $g_directory/doc_$category\_index_all$g_fileextension for writing\n"; @@ -1152,7 +1152,7 @@ sub generate_indexes $g_filehandle=CMDINDEX; - + print_header("$doctitle: $_"); print_tablestart(); print_title("$doctitle: $_",""); @@ -1163,7 +1163,7 @@ sub generate_indexes print_tableend(); print_tablestart(); - + $i=0; $j=0; if($number > 0) @@ -1217,7 +1217,7 @@ sub generate_indexes print_tableend(); print_footer(); - + close(CMDINDEX); } else { print "Can't open $g_directory/doc_$category\_alphabetic_$_$g_fileextension for writing\n"; @@ -1296,7 +1296,7 @@ if(open(DOCINDEX,">$g_directory/index$g_fileextension")) print_twocolumnsubtitle("Fundamentals"); print_twocolumnbody("<a href=\"doc_ircintro$g_fileextension\">Introduction to IRC</a>","A \"must read\" for beginners"); print_twocolumnbody("<a href=\"doc_kvircintro$g_fileextension\">Introduction to KVIrc</a>","A couple of words about KVIrc"); - + print_twocolumnsubtitle("Scripting Concepts: The KVS Manual"); print_twocolumnbody("<a href=\"doc_kvs_introduction$g_fileextension\">Introduction to KVS</a>","Introduction to the KVIrc Scripting Language"); print_twocolumnbody("<a href=\"doc_kvs_basicconcepts$g_fileextension\">Basic KVS Concepts</a>","The first steps in the KVS world"); diff --git a/cmake/Doxyfile.cmake b/cmake/Doxyfile.cmake index 15ca4b4fd..6d66fb25e 100644 --- a/cmake/Doxyfile.cmake +++ b/cmake/Doxyfile.cmake @@ -14,198 +14,198 @@ # Project related configuration options #--------------------------------------------------------------------------- -# This tag specifies the encoding used for all characters in the config file that -# follow. The default is UTF-8 which is also the encoding used for all text before -# the first occurrence of this tag. Doxygen uses libiconv (or the iconv built into -# libc) for the transcoding. See http://www.gnu.org/software/libiconv for the list of +# This tag specifies the encoding used for all characters in the config file that +# follow. The default is UTF-8 which is also the encoding used for all text before +# the first occurrence of this tag. Doxygen uses libiconv (or the iconv built into +# libc) for the transcoding. See http://www.gnu.org/software/libiconv for the list of # possible encodings. DOXYFILE_ENCODING = UTF-8 -# The PROJECT_NAME tag is a single word (or a sequence of words surrounded +# The PROJECT_NAME tag is a single word (or a sequence of words surrounded # by quotes) that should identify the project. PROJECT_NAME = @NICENAME@ -# The PROJECT_NUMBER tag can be used to enter a project or revision number. -# This could be handy for archiving the generated documentation or +# The PROJECT_NUMBER tag can be used to enter a project or revision number. +# This could be handy for archiving the generated documentation or # if some version control system is used. PROJECT_NUMBER = @VERSION_RELEASE@ -# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) -# base path where the generated documentation will be put. -# If a relative path is entered, it will be relative to the location +# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) +# base path where the generated documentation will be put. +# If a relative path is entered, it will be relative to the location # where doxygen was started. If left blank the current directory will be used. OUTPUT_DIRECTORY = @CMAKE_BINARY_DIR@/doc/api/ -# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create -# 4096 sub-directories (in 2 levels) under the output directory of each output -# format and will distribute the generated files over these directories. -# Enabling this option can be useful when feeding doxygen a huge amount of -# source files, where putting all generated files in the same directory would +# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create +# 4096 sub-directories (in 2 levels) under the output directory of each output +# format and will distribute the generated files over these directories. +# Enabling this option can be useful when feeding doxygen a huge amount of +# source files, where putting all generated files in the same directory would # otherwise cause performance problems for the file system. CREATE_SUBDIRS = NO -# The OUTPUT_LANGUAGE tag is used to specify the language in which all -# documentation generated by doxygen is written. Doxygen will use this -# information to generate all constant output in the proper language. -# The default language is English, other supported languages are: -# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, -# Croatian, Czech, Danish, Dutch, Finnish, French, German, Greek, Hungarian, -# Italian, Japanese, Japanese-en (Japanese with English messages), Korean, -# Korean-en, Lithuanian, Norwegian, Polish, Portuguese, Romanian, Russian, +# The OUTPUT_LANGUAGE tag is used to specify the language in which all +# documentation generated by doxygen is written. Doxygen will use this +# information to generate all constant output in the proper language. +# The default language is English, other supported languages are: +# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, +# Croatian, Czech, Danish, Dutch, Finnish, French, German, Greek, Hungarian, +# Italian, Japanese, Japanese-en (Japanese with English messages), Korean, +# Korean-en, Lithuanian, Norwegian, Polish, Portuguese, Romanian, Russian, # Serbian, Slovak, Slovene, Spanish, Swedish, and Ukrainian. OUTPUT_LANGUAGE = English -# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will -# include brief member descriptions after the members that are listed in -# the file and class documentation (similar to JavaDoc). +# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will +# include brief member descriptions after the members that are listed in +# the file and class documentation (similar to JavaDoc). # Set to NO to disable this. BRIEF_MEMBER_DESC = YES -# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend -# the brief description of a member or function before the detailed description. -# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the +# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend +# the brief description of a member or function before the detailed description. +# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the # brief descriptions will be completely suppressed. REPEAT_BRIEF = YES -# This tag implements a quasi-intelligent brief description abbreviator -# that is used to form the text in various listings. Each string -# in this list, if found as the leading text of the brief description, will be -# stripped from the text and the result after processing the whole list, is -# used as the annotated text. Otherwise, the brief description is used as-is. -# If left blank, the following values are used ("$name" is automatically -# replaced with the name of the entity): "The $name class" "The $name widget" -# "The $name file" "is" "provides" "specifies" "contains" +# This tag implements a quasi-intelligent brief description abbreviator +# that is used to form the text in various listings. Each string +# in this list, if found as the leading text of the brief description, will be +# stripped from the text and the result after processing the whole list, is +# used as the annotated text. Otherwise, the brief description is used as-is. +# If left blank, the following values are used ("$name" is automatically +# replaced with the name of the entity): "The $name class" "The $name widget" +# "The $name file" "is" "provides" "specifies" "contains" # "represents" "a" "an" "the" -ABBREVIATE_BRIEF = +ABBREVIATE_BRIEF = -# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then -# Doxygen will generate a detailed section even if there is only a brief +# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then +# Doxygen will generate a detailed section even if there is only a brief # description. ALWAYS_DETAILED_SEC = NO -# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all -# inherited members of a class in the documentation of that class as if those -# members were ordinary class members. Constructors, destructors and assignment +# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all +# inherited members of a class in the documentation of that class as if those +# members were ordinary class members. Constructors, destructors and assignment # operators of the base classes will not be shown. INLINE_INHERITED_MEMB = NO -# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full -# path before files name in the file list and in the header files. If set +# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full +# path before files name in the file list and in the header files. If set # to NO the shortest path that makes the file name unique will be used. FULL_PATH_NAMES = YES -# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag -# can be used to strip a user-defined part of the path. Stripping is -# only done if one of the specified strings matches the left-hand part of -# the path. The tag can be used to show relative paths in the file list. -# If left blank the directory from which doxygen is run is used as the +# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag +# can be used to strip a user-defined part of the path. Stripping is +# only done if one of the specified strings matches the left-hand part of +# the path. The tag can be used to show relative paths in the file list. +# If left blank the directory from which doxygen is run is used as the # path to strip. -STRIP_FROM_PATH = +STRIP_FROM_PATH = -# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of -# the path mentioned in the documentation of a class, which tells -# the reader which header file to include in order to use a class. -# If left blank only the name of the header file containing the class -# definition is used. Otherwise one should specify the include paths that +# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of +# the path mentioned in the documentation of a class, which tells +# the reader which header file to include in order to use a class. +# If left blank only the name of the header file containing the class +# definition is used. Otherwise one should specify the include paths that # are normally passed to the compiler using the -I flag. -STRIP_FROM_INC_PATH = +STRIP_FROM_INC_PATH = -# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter -# (but less readable) file names. This can be useful is your file systems +# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter +# (but less readable) file names. This can be useful is your file systems # doesn't support long names like on DOS, Mac, or CD-ROM. SHORT_NAMES = NO -# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen -# will interpret the first line (until the first dot) of a JavaDoc-style -# comment as the brief description. If set to NO, the JavaDoc -# comments will behave just like regular Qt-style comments +# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen +# will interpret the first line (until the first dot) of a JavaDoc-style +# comment as the brief description. If set to NO, the JavaDoc +# comments will behave just like regular Qt-style comments # (thus requiring an explicit @brief command for a brief description.) JAVADOC_AUTOBRIEF = NO -# If the QT_AUTOBRIEF tag is set to YES then Doxygen will -# interpret the first line (until the first dot) of a Qt-style -# comment as the brief description. If set to NO, the comments -# will behave just like regular Qt-style comments (thus requiring +# If the QT_AUTOBRIEF tag is set to YES then Doxygen will +# interpret the first line (until the first dot) of a Qt-style +# comment as the brief description. If set to NO, the comments +# will behave just like regular Qt-style comments (thus requiring # an explicit \brief command for a brief description.) QT_AUTOBRIEF = NO -# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen -# treat a multi-line C++ special comment block (i.e. a block of //! or /// -# comments) as a brief description. This used to be the default behaviour. -# The new default is to treat a multi-line C++ comment block as a detailed +# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen +# treat a multi-line C++ special comment block (i.e. a block of //! or /// +# comments) as a brief description. This used to be the default behaviour. +# The new default is to treat a multi-line C++ comment block as a detailed # description. Set this tag to YES if you prefer the old behaviour instead. MULTILINE_CPP_IS_BRIEF = NO -# If the DETAILS_AT_TOP tag is set to YES then Doxygen +# If the DETAILS_AT_TOP tag is set to YES then Doxygen # will output the detailed description near the top, like JavaDoc. -# If set to NO, the detailed description appears after the member +# If set to NO, the detailed description appears after the member # documentation. DETAILS_AT_TOP = NO -# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented -# member inherits the documentation from any documented member that it +# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented +# member inherits the documentation from any documented member that it # re-implements. INHERIT_DOCS = YES -# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce -# a new page for each member. If set to NO, the documentation of a member will +# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce +# a new page for each member. If set to NO, the documentation of a member will # be part of the file/class/namespace that contains it. SEPARATE_MEMBER_PAGES = NO -# The TAB_SIZE tag can be used to set the number of spaces in a tab. +# The TAB_SIZE tag can be used to set the number of spaces in a tab. # Doxygen uses this value to replace tabs by spaces in code fragments. TAB_SIZE = 8 -# This tag can be used to specify a number of aliases that acts -# as commands in the documentation. An alias has the form "name=value". -# For example adding "sideeffect=\par Side Effects:\n" will allow you to -# put the command \sideeffect (or @sideeffect) in the documentation, which -# will result in a user-defined paragraph with heading "Side Effects:". +# This tag can be used to specify a number of aliases that acts +# as commands in the documentation. An alias has the form "name=value". +# For example adding "sideeffect=\par Side Effects:\n" will allow you to +# put the command \sideeffect (or @sideeffect) in the documentation, which +# will result in a user-defined paragraph with heading "Side Effects:". # You can put \n's in the value part of an alias to insert newlines. -ALIASES = +ALIASES = -# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C -# sources only. Doxygen will then generate output that is more tailored for C. -# For instance, some of the names that are used will be different. The list +# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C +# sources only. Doxygen will then generate output that is more tailored for C. +# For instance, some of the names that are used will be different. The list # of all members will be omitted, etc. OPTIMIZE_OUTPUT_FOR_C = NO -# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java -# sources only. Doxygen will then generate output that is more tailored for Java. -# For instance, namespaces will be presented as packages, qualified scopes +# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java +# sources only. Doxygen will then generate output that is more tailored for Java. +# For instance, namespaces will be presented as packages, qualified scopes # will look different, etc. OPTIMIZE_OUTPUT_JAVA = NO -# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want to -# include (a tag file for) the STL sources as input, then you should -# set this tag to YES in order to let doxygen match functions declarations and -# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. -# func(std::string) {}). This also make the inheritance and collaboration +# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want to +# include (a tag file for) the STL sources as input, then you should +# set this tag to YES in order to let doxygen match functions declarations and +# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. +# func(std::string) {}). This also make the inheritance and collaboration # diagrams that involve STL classes more complete and accurate. BUILTIN_STL_SUPPORT = NO @@ -215,33 +215,33 @@ BUILTIN_STL_SUPPORT = NO CPP_CLI_SUPPORT = NO -# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. -# Doxygen will parse them like normal C++ but will assume all classes use public +# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. +# Doxygen will parse them like normal C++ but will assume all classes use public # instead of private inheritance when no explicit protection keyword is present. SIP_SUPPORT = NO -# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC -# tag is set to YES, then doxygen will reuse the documentation of the first -# member in the group (if any) for the other members of the group. By default +# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC +# tag is set to YES, then doxygen will reuse the documentation of the first +# member in the group (if any) for the other members of the group. By default # all members of a group must be documented explicitly. DISTRIBUTE_GROUP_DOC = NO -# Set the SUBGROUPING tag to YES (the default) to allow class member groups of -# the same type (for instance a group of public functions) to be put as a -# subgroup of that type (e.g. under the Public Functions section). Set it to -# NO to prevent subgrouping. Alternatively, this can be done per class using +# Set the SUBGROUPING tag to YES (the default) to allow class member groups of +# the same type (for instance a group of public functions) to be put as a +# subgroup of that type (e.g. under the Public Functions section). Set it to +# NO to prevent subgrouping. Alternatively, this can be done per class using # the \nosubgrouping command. SUBGROUPING = YES -# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct (or union) is -# documented as struct with the name of the typedef. So -# typedef struct TypeS {} TypeT, will appear in the documentation as a struct -# with name TypeT. When disabled the typedef will appear as a member of a file, -# namespace, or class. And the struct will be named TypeS. This can typically -# be useful for C code where the coding convention is that all structs are +# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct (or union) is +# documented as struct with the name of the typedef. So +# typedef struct TypeS {} TypeT, will appear in the documentation as a struct +# with name TypeT. When disabled the typedef will appear as a member of a file, +# namespace, or class. And the struct will be named TypeS. This can typically +# be useful for C code where the coding convention is that all structs are # typedef'ed and only the typedef is referenced never the struct's name. TYPEDEF_HIDES_STRUCT = NO @@ -250,349 +250,349 @@ TYPEDEF_HIDES_STRUCT = NO # Build related configuration options #--------------------------------------------------------------------------- -# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in -# documentation are documented, even if no documentation was available. -# Private class members and static file members will be hidden unless +# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in +# documentation are documented, even if no documentation was available. +# Private class members and static file members will be hidden unless # the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES EXTRACT_ALL = YES -# If the EXTRACT_PRIVATE tag is set to YES all private members of a class +# If the EXTRACT_PRIVATE tag is set to YES all private members of a class # will be included in the documentation. EXTRACT_PRIVATE = YES -# If the EXTRACT_STATIC tag is set to YES all static members of a file +# If the EXTRACT_STATIC tag is set to YES all static members of a file # will be included in the documentation. EXTRACT_STATIC = YES -# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) -# defined locally in source files will be included in the documentation. +# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) +# defined locally in source files will be included in the documentation. # If set to NO only classes defined in header files are included. EXTRACT_LOCAL_CLASSES = YES -# This flag is only useful for Objective-C code. When set to YES local -# methods, which are defined in the implementation section but not in -# the interface are included in the documentation. +# This flag is only useful for Objective-C code. When set to YES local +# methods, which are defined in the implementation section but not in +# the interface are included in the documentation. # If set to NO (the default) only methods in the interface are included. EXTRACT_LOCAL_METHODS = YES -# If this flag is set to YES, the members of anonymous namespaces will be extracted -# and appear in the documentation as a namespace called 'anonymous_namespace{file}', -# where file will be replaced with the base name of the file that contains the anonymous +# If this flag is set to YES, the members of anonymous namespaces will be extracted +# and appear in the documentation as a namespace called 'anonymous_namespace{file}', +# where file will be replaced with the base name of the file that contains the anonymous # namespace. By default anonymous namespace are hidden. EXTRACT_ANON_NSPACES = NO -# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all -# undocumented members of documented classes, files or namespaces. -# If set to NO (the default) these members will be included in the -# various overviews, but no documentation section is generated. +# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all +# undocumented members of documented classes, files or namespaces. +# If set to NO (the default) these members will be included in the +# various overviews, but no documentation section is generated. # This option has no effect if EXTRACT_ALL is enabled. HIDE_UNDOC_MEMBERS = NO -# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all -# undocumented classes that are normally visible in the class hierarchy. -# If set to NO (the default) these classes will be included in the various +# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all +# undocumented classes that are normally visible in the class hierarchy. +# If set to NO (the default) these classes will be included in the various # overviews. This option has no effect if EXTRACT_ALL is enabled. HIDE_UNDOC_CLASSES = NO -# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all -# friend (class|struct|union) declarations. -# If set to NO (the default) these declarations will be included in the +# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all +# friend (class|struct|union) declarations. +# If set to NO (the default) these declarations will be included in the # documentation. HIDE_FRIEND_COMPOUNDS = NO -# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any -# documentation blocks found inside the body of a function. -# If set to NO (the default) these blocks will be appended to the +# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any +# documentation blocks found inside the body of a function. +# If set to NO (the default) these blocks will be appended to the # function's detailed documentation block. HIDE_IN_BODY_DOCS = NO -# The INTERNAL_DOCS tag determines if documentation -# that is typed after a \internal command is included. If the tag is set -# to NO (the default) then the documentation will be excluded. +# The INTERNAL_DOCS tag determines if documentation +# that is typed after a \internal command is included. If the tag is set +# to NO (the default) then the documentation will be excluded. # Set it to YES to include the internal documentation. INTERNAL_DOCS = NO -# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate -# file names in lower-case letters. If set to YES upper-case letters are also -# allowed. This is useful if you have classes or files whose names only differ -# in case and if your file system supports case sensitive file names. Windows +# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate +# file names in lower-case letters. If set to YES upper-case letters are also +# allowed. This is useful if you have classes or files whose names only differ +# in case and if your file system supports case sensitive file names. Windows # and Mac users are advised to set this option to NO. CASE_SENSE_NAMES = YES -# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen -# will show members with their full class and namespace scopes in the +# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen +# will show members with their full class and namespace scopes in the # documentation. If set to YES the scope will be hidden. HIDE_SCOPE_NAMES = NO -# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen -# will put a list of the files that are included by a file in the documentation +# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen +# will put a list of the files that are included by a file in the documentation # of that file. SHOW_INCLUDE_FILES = YES -# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] +# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] # is inserted in the documentation for inline members. INLINE_INFO = YES -# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen -# will sort the (detailed) documentation of file and class members -# alphabetically by member name. If set to NO the members will appear in +# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen +# will sort the (detailed) documentation of file and class members +# alphabetically by member name. If set to NO the members will appear in # declaration order. SORT_MEMBER_DOCS = YES -# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the -# brief documentation of file, namespace and class members alphabetically -# by member name. If set to NO (the default) the members will appear in +# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the +# brief documentation of file, namespace and class members alphabetically +# by member name. If set to NO (the default) the members will appear in # declaration order. SORT_BRIEF_DOCS = YES -# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be -# sorted by fully-qualified names, including namespaces. If set to -# NO (the default), the class list will be sorted only by class name, -# not including the namespace part. +# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be +# sorted by fully-qualified names, including namespaces. If set to +# NO (the default), the class list will be sorted only by class name, +# not including the namespace part. # Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. -# Note: This option applies only to the class list, not to the +# Note: This option applies only to the class list, not to the # alphabetical list. SORT_BY_SCOPE_NAME = NO -# The GENERATE_TODOLIST tag can be used to enable (YES) or -# disable (NO) the todo list. This list is created by putting \todo +# The GENERATE_TODOLIST tag can be used to enable (YES) or +# disable (NO) the todo list. This list is created by putting \todo # commands in the documentation. GENERATE_TODOLIST = YES -# The GENERATE_TESTLIST tag can be used to enable (YES) or -# disable (NO) the test list. This list is created by putting \test +# The GENERATE_TESTLIST tag can be used to enable (YES) or +# disable (NO) the test list. This list is created by putting \test # commands in the documentation. GENERATE_TESTLIST = YES -# The GENERATE_BUGLIST tag can be used to enable (YES) or -# disable (NO) the bug list. This list is created by putting \bug +# The GENERATE_BUGLIST tag can be used to enable (YES) or +# disable (NO) the bug list. This list is created by putting \bug # commands in the documentation. GENERATE_BUGLIST = YES -# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or -# disable (NO) the deprecated list. This list is created by putting +# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or +# disable (NO) the deprecated list. This list is created by putting # \deprecated commands in the documentation. GENERATE_DEPRECATEDLIST= YES -# The ENABLED_SECTIONS tag can be used to enable conditional +# The ENABLED_SECTIONS tag can be used to enable conditional # documentation sections, marked by \if sectionname ... \endif. -ENABLED_SECTIONS = +ENABLED_SECTIONS = -# The MAX_INITIALIZER_LINES tag determines the maximum number of lines -# the initial value of a variable or define consists of for it to appear in -# the documentation. If the initializer consists of more lines than specified -# here it will be hidden. Use a value of 0 to hide initializers completely. -# The appearance of the initializer of individual variables and defines in the -# documentation can be controlled using \showinitializer or \hideinitializer +# The MAX_INITIALIZER_LINES tag determines the maximum number of lines +# the initial value of a variable or define consists of for it to appear in +# the documentation. If the initializer consists of more lines than specified +# here it will be hidden. Use a value of 0 to hide initializers completely. +# The appearance of the initializer of individual variables and defines in the +# documentation can be controlled using \showinitializer or \hideinitializer # command in the documentation regardless of this setting. MAX_INITIALIZER_LINES = 30 -# Set the SHOW_USED_FILES tag to NO to disable the list of files generated -# at the bottom of the documentation of classes and structs. If set to YES the +# Set the SHOW_USED_FILES tag to NO to disable the list of files generated +# at the bottom of the documentation of classes and structs. If set to YES the # list will mention the files that were used to generate the documentation. SHOW_USED_FILES = YES -# If the sources in your project are distributed over multiple directories -# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy +# If the sources in your project are distributed over multiple directories +# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy # in the documentation. The default is NO. SHOW_DIRECTORIES = NO -# The FILE_VERSION_FILTER tag can be used to specify a program or script that -# doxygen should invoke to get the current version for each file (typically from the -# version control system). Doxygen will invoke the program by executing (via -# popen()) the command <command> <input-file>, where <command> is the value of -# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file -# provided by doxygen. Whatever the program writes to standard output +# The FILE_VERSION_FILTER tag can be used to specify a program or script that +# doxygen should invoke to get the current version for each file (typically from the +# version control system). Doxygen will invoke the program by executing (via +# popen()) the command <command> <input-file>, where <command> is the value of +# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file +# provided by doxygen. Whatever the program writes to standard output # is used as the file version. See the manual for examples. -FILE_VERSION_FILTER = +FILE_VERSION_FILTER = #--------------------------------------------------------------------------- # configuration options related to warning and progress messages #--------------------------------------------------------------------------- -# The QUIET tag can be used to turn on/off the messages that are generated +# The QUIET tag can be used to turn on/off the messages that are generated # by doxygen. Possible values are YES and NO. If left blank NO is used. QUIET = NO -# The WARNINGS tag can be used to turn on/off the warning messages that are -# generated by doxygen. Possible values are YES and NO. If left blank +# The WARNINGS tag can be used to turn on/off the warning messages that are +# generated by doxygen. Possible values are YES and NO. If left blank # NO is used. WARNINGS = YES -# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings -# for undocumented members. If EXTRACT_ALL is set to YES then this flag will +# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings +# for undocumented members. If EXTRACT_ALL is set to YES then this flag will # automatically be disabled. WARN_IF_UNDOCUMENTED = YES -# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for -# potential errors in the documentation, such as not documenting some -# parameters in a documented function, or documenting parameters that +# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for +# potential errors in the documentation, such as not documenting some +# parameters in a documented function, or documenting parameters that # don't exist or using markup commands wrongly. WARN_IF_DOC_ERROR = YES -# This WARN_NO_PARAMDOC option can be abled to get warnings for -# functions that are documented, but have no documentation for their parameters -# or return value. If set to NO (the default) doxygen will only warn about -# wrong or incomplete parameter documentation, but not about the absence of +# This WARN_NO_PARAMDOC option can be abled to get warnings for +# functions that are documented, but have no documentation for their parameters +# or return value. If set to NO (the default) doxygen will only warn about +# wrong or incomplete parameter documentation, but not about the absence of # documentation. WARN_NO_PARAMDOC = NO -# The WARN_FORMAT tag determines the format of the warning messages that -# doxygen can produce. The string should contain the $file, $line, and $text -# tags, which will be replaced by the file and line number from which the -# warning originated and the warning text. Optionally the format may contain -# $version, which will be replaced by the version of the file (if it could +# The WARN_FORMAT tag determines the format of the warning messages that +# doxygen can produce. The string should contain the $file, $line, and $text +# tags, which will be replaced by the file and line number from which the +# warning originated and the warning text. Optionally the format may contain +# $version, which will be replaced by the version of the file (if it could # be obtained via FILE_VERSION_FILTER) WARN_FORMAT = "$file:$line: $text " -# The WARN_LOGFILE tag can be used to specify a file to which warning -# and error messages should be written. If left blank the output is written +# The WARN_LOGFILE tag can be used to specify a file to which warning +# and error messages should be written. If left blank the output is written # to stderr. -WARN_LOGFILE = +WARN_LOGFILE = #--------------------------------------------------------------------------- # configuration options related to the input files #--------------------------------------------------------------------------- -# The INPUT tag can be used to specify the files and/or directories that contain -# documented source files. You may enter file names like "myfile.cpp" or -# directories like "/usr/src/myproject". Separate the files or directories +# The INPUT tag can be used to specify the files and/or directories that contain +# documented source files. You may enter file names like "myfile.cpp" or +# directories like "/usr/src/myproject". Separate the files or directories # with spaces. INPUT = @CMAKE_SOURCE_DIR@/src/ -# This tag can be used to specify the character encoding of the source files that -# doxygen parses. Internally doxygen uses the UTF-8 encoding, which is also the default -# input encoding. Doxygen uses libiconv (or the iconv built into libc) for the transcoding. +# This tag can be used to specify the character encoding of the source files that +# doxygen parses. Internally doxygen uses the UTF-8 encoding, which is also the default +# input encoding. Doxygen uses libiconv (or the iconv built into libc) for the transcoding. # See http://www.gnu.org/software/libiconv for the list of possible encodings. INPUT_ENCODING = UTF-8 -# If the value of the INPUT tag contains directories, you can use the -# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp -# and *.h) to filter out the source-files in the directories. If left -# blank the following patterns are tested: -# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx +# If the value of the INPUT tag contains directories, you can use the +# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left +# blank the following patterns are tested: +# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx # *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90 FILE_PATTERNS = kvi*.h \ kvi*.cpp -# The RECURSIVE tag can be used to turn specify whether or not subdirectories -# should be searched for input files as well. Possible values are YES and NO. +# The RECURSIVE tag can be used to turn specify whether or not subdirectories +# should be searched for input files as well. Possible values are YES and NO. # If left blank NO is used. RECURSIVE = YES -# The EXCLUDE tag can be used to specify files and/or directories that should -# excluded from the INPUT source files. This way you can easily exclude a +# The EXCLUDE tag can be used to specify files and/or directories that should +# excluded from the INPUT source files. This way you can easily exclude a # subdirectory from a directory tree whose root is specified with the INPUT tag. EXCLUDE = @CMAKE_SOURCE_DIR@/src/kvilib/include \ @CMAKE_SOURCE_DIR@/src/kvirc/include -# The EXCLUDE_SYMLINKS tag can be used select whether or not files or -# directories that are symbolic links (a Unix filesystem feature) are excluded +# The EXCLUDE_SYMLINKS tag can be used select whether or not files or +# directories that are symbolic links (a Unix filesystem feature) are excluded # from the input. EXCLUDE_SYMLINKS = NO -# If the value of the INPUT tag contains directories, you can use the -# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude -# certain files from those directories. Note that the wildcards are matched -# against the file with absolute path, so to exclude all test directories +# If the value of the INPUT tag contains directories, you can use the +# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude +# certain files from those directories. Note that the wildcards are matched +# against the file with absolute path, so to exclude all test directories # for example use the pattern */test/* -EXCLUDE_PATTERNS = +EXCLUDE_PATTERNS = -# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names -# (namespaces, classes, functions, etc.) that should be excluded from the output. -# The symbol name can be a fully qualified name, a word, or if the wildcard * is used, +# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names +# (namespaces, classes, functions, etc.) that should be excluded from the output. +# The symbol name can be a fully qualified name, a word, or if the wildcard * is used, # a substring. Examples: ANamespace, AClass, AClass::ANamespace, ANamespace::*Test -EXCLUDE_SYMBOLS = +EXCLUDE_SYMBOLS = -# The EXAMPLE_PATH tag can be used to specify one or more files or -# directories that contain example code fragments that are included (see +# The EXAMPLE_PATH tag can be used to specify one or more files or +# directories that contain example code fragments that are included (see # the \include command). -EXAMPLE_PATH = +EXAMPLE_PATH = -# If the value of the EXAMPLE_PATH tag contains directories, you can use the -# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp -# and *.h) to filter out the source-files in the directories. If left +# If the value of the EXAMPLE_PATH tag contains directories, you can use the +# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left # blank all files are included. -EXAMPLE_PATTERNS = +EXAMPLE_PATTERNS = -# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be -# searched for input files to be used with the \include or \dontinclude -# commands irrespective of the value of the RECURSIVE tag. +# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be +# searched for input files to be used with the \include or \dontinclude +# commands irrespective of the value of the RECURSIVE tag. # Possible values are YES and NO. If left blank NO is used. EXAMPLE_RECURSIVE = NO -# The IMAGE_PATH tag can be used to specify one or more files or -# directories that contain image that are included in the documentation (see +# The IMAGE_PATH tag can be used to specify one or more files or +# directories that contain image that are included in the documentation (see # the \image command). -IMAGE_PATH = +IMAGE_PATH = -# The INPUT_FILTER tag can be used to specify a program that doxygen should -# invoke to filter for each input file. Doxygen will invoke the filter program -# by executing (via popen()) the command <filter> <input-file>, where <filter> -# is the value of the INPUT_FILTER tag, and <input-file> is the name of an -# input file. Doxygen will then use the output that the filter program writes -# to standard output. If FILTER_PATTERNS is specified, this tag will be +# The INPUT_FILTER tag can be used to specify a program that doxygen should +# invoke to filter for each input file. Doxygen will invoke the filter program +# by executing (via popen()) the command <filter> <input-file>, where <filter> +# is the value of the INPUT_FILTER tag, and <input-file> is the name of an +# input file. Doxygen will then use the output that the filter program writes +# to standard output. If FILTER_PATTERNS is specified, this tag will be # ignored. -INPUT_FILTER = +INPUT_FILTER = -# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern -# basis. Doxygen will compare the file name with each pattern and apply the -# filter if there is a match. The filters are a list of the form: -# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further -# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER +# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern +# basis. Doxygen will compare the file name with each pattern and apply the +# filter if there is a match. The filters are a list of the form: +# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further +# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER # is applied to all files. -FILTER_PATTERNS = +FILTER_PATTERNS = -# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using -# INPUT_FILTER) will be used to filter the input files when producing source +# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using +# INPUT_FILTER) will be used to filter the input files when producing source # files to browse (i.e. when SOURCE_BROWSER is set to YES). FILTER_SOURCE_FILES = NO @@ -601,34 +601,34 @@ FILTER_SOURCE_FILES = NO # configuration options related to source browsing #--------------------------------------------------------------------------- -# If the SOURCE_BROWSER tag is set to YES then a list of source files will -# be generated. Documented entities will be cross-referenced with these sources. -# Note: To get rid of all source code in the generated output, make sure also -# VERBATIM_HEADERS is set to NO. If you have enabled CALL_GRAPH or CALLER_GRAPH -# then you must also enable this option. If you don't then doxygen will produce +# If the SOURCE_BROWSER tag is set to YES then a list of source files will +# be generated. Documented entities will be cross-referenced with these sources. +# Note: To get rid of all source code in the generated output, make sure also +# VERBATIM_HEADERS is set to NO. If you have enabled CALL_GRAPH or CALLER_GRAPH +# then you must also enable this option. If you don't then doxygen will produce # a warning and turn it on anyway SOURCE_BROWSER = NO -# Setting the INLINE_SOURCES tag to YES will include the body +# Setting the INLINE_SOURCES tag to YES will include the body # of functions and classes directly in the documentation. INLINE_SOURCES = NO -# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct -# doxygen to hide any special comment blocks from generated source code +# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct +# doxygen to hide any special comment blocks from generated source code # fragments. Normal C and C++ comments will always remain visible. STRIP_CODE_COMMENTS = YES -# If the REFERENCED_BY_RELATION tag is set to YES (the default) -# then for each documented function all documented +# If the REFERENCED_BY_RELATION tag is set to YES (the default) +# then for each documented function all documented # functions referencing it will be listed. REFERENCED_BY_RELATION = YES -# If the REFERENCES_RELATION tag is set to YES (the default) -# then for each documented function all documented entities +# If the REFERENCES_RELATION tag is set to YES (the default) +# then for each documented function all documented entities # called/used by that function will be listed. REFERENCES_RELATION = YES @@ -640,16 +640,16 @@ REFERENCES_RELATION = YES REFERENCES_LINK_SOURCE = YES -# If the USE_HTAGS tag is set to YES then the references to source code -# will point to the HTML generated by the htags(1) tool instead of doxygen -# built-in source browser. The htags tool is part of GNU's global source -# tagging system (see http://www.gnu.org/software/global/global.html). You +# If the USE_HTAGS tag is set to YES then the references to source code +# will point to the HTML generated by the htags(1) tool instead of doxygen +# built-in source browser. The htags tool is part of GNU's global source +# tagging system (see http://www.gnu.org/software/global/global.html). You # will need version 4.8.6 or higher. USE_HTAGS = NO -# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen -# will generate a verbatim copy of the header file for each class for +# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen +# will generate a verbatim copy of the header file for each class for # which an include is specified. Set to NO to disable this. VERBATIM_HEADERS = YES @@ -658,141 +658,141 @@ VERBATIM_HEADERS = YES # configuration options related to the alphabetical class index #--------------------------------------------------------------------------- -# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index -# of all compounds will be generated. Enable this if the project +# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index +# of all compounds will be generated. Enable this if the project # contains a lot of classes, structs, unions or interfaces. ALPHABETICAL_INDEX = NO -# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then -# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns +# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then +# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns # in which this list will be split (can be a number in the range [1..20]) COLS_IN_ALPHA_INDEX = 5 -# In case all classes in a project start with a common prefix, all -# classes will be put under the same header in the alphabetical index. -# The IGNORE_PREFIX tag can be used to specify one or more prefixes that +# In case all classes in a project start with a common prefix, all +# classes will be put under the same header in the alphabetical index. +# The IGNORE_PREFIX tag can be used to specify one or more prefixes that # should be ignored while generating the index headers. -IGNORE_PREFIX = +IGNORE_PREFIX = #--------------------------------------------------------------------------- # configuration options related to the HTML output #--------------------------------------------------------------------------- -# If the GENERATE_HTML tag is set to YES (the default) Doxygen will +# If the GENERATE_HTML tag is set to YES (the default) Doxygen will # generate HTML output. GENERATE_HTML = YES -# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be # put in front of it. If left blank `html' will be used as the default path. HTML_OUTPUT = html -# The HTML_FILE_EXTENSION tag can be used to specify the file extension for -# each generated HTML page (for example: .htm,.php,.asp). If it is left blank +# The HTML_FILE_EXTENSION tag can be used to specify the file extension for +# each generated HTML page (for example: .htm,.php,.asp). If it is left blank # doxygen will generate files with .html extension. HTML_FILE_EXTENSION = .html -# The HTML_HEADER tag can be used to specify a personal HTML header for -# each generated HTML page. If it is left blank doxygen will generate a +# The HTML_HEADER tag can be used to specify a personal HTML header for +# each generated HTML page. If it is left blank doxygen will generate a # standard header. -HTML_HEADER = +HTML_HEADER = -# The HTML_FOOTER tag can be used to specify a personal HTML footer for -# each generated HTML page. If it is left blank doxygen will generate a +# The HTML_FOOTER tag can be used to specify a personal HTML footer for +# each generated HTML page. If it is left blank doxygen will generate a # standard footer. -HTML_FOOTER = +HTML_FOOTER = -# The HTML_STYLESHEET tag can be used to specify a user-defined cascading -# style sheet that is used by each HTML page. It can be used to -# fine-tune the look of the HTML output. If the tag is left blank doxygen -# will generate a default style sheet. Note that doxygen will try to copy -# the style sheet file to the HTML output directory, so don't put your own +# The HTML_STYLESHEET tag can be used to specify a user-defined cascading +# style sheet that is used by each HTML page. It can be used to +# fine-tune the look of the HTML output. If the tag is left blank doxygen +# will generate a default style sheet. Note that doxygen will try to copy +# the style sheet file to the HTML output directory, so don't put your own # stylesheet in the HTML output directory as well, or it will be erased! -HTML_STYLESHEET = +HTML_STYLESHEET = -# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, -# files or namespaces will be aligned in HTML using tables. If set to +# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, +# files or namespaces will be aligned in HTML using tables. If set to # NO a bullet list will be used. HTML_ALIGN_MEMBERS = YES -# If the GENERATE_HTMLHELP tag is set to YES, additional index files -# will be generated that can be used as input for tools like the -# Microsoft HTML help workshop to generate a compressed HTML help file (.chm) +# If the GENERATE_HTMLHELP tag is set to YES, additional index files +# will be generated that can be used as input for tools like the +# Microsoft HTML help workshop to generate a compressed HTML help file (.chm) # of the generated HTML documentation. GENERATE_HTMLHELP = NO -# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML -# documentation will contain sections that can be hidden and shown after the -# page has loaded. For this to work a browser that supports -# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox +# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML +# documentation will contain sections that can be hidden and shown after the +# page has loaded. For this to work a browser that supports +# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox # Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari). HTML_DYNAMIC_SECTIONS = NO -# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can -# be used to specify the file name of the resulting .chm file. You -# can add a path in front of the file if the result should not be +# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can +# be used to specify the file name of the resulting .chm file. You +# can add a path in front of the file if the result should not be # written to the html output directory. -CHM_FILE = +CHM_FILE = -# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can -# be used to specify the location (absolute path including file name) of -# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run +# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can +# be used to specify the location (absolute path including file name) of +# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run # the HTML help compiler on the generated index.hhp. -HHC_LOCATION = +HHC_LOCATION = -# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag -# controls if a separate .chi index file is generated (YES) or that +# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag +# controls if a separate .chi index file is generated (YES) or that # it should be included in the master .chm file (NO). GENERATE_CHI = NO -# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag -# controls whether a binary table of contents is generated (YES) or a +# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag +# controls whether a binary table of contents is generated (YES) or a # normal table of contents (NO) in the .chm file. BINARY_TOC = NO -# The TOC_EXPAND flag can be set to YES to add extra items for group members +# The TOC_EXPAND flag can be set to YES to add extra items for group members # to the contents of the HTML help documentation and to the tree view. TOC_EXPAND = NO -# The DISABLE_INDEX tag can be used to turn on/off the condensed index at -# top of each HTML page. The value NO (the default) enables the index and +# The DISABLE_INDEX tag can be used to turn on/off the condensed index at +# top of each HTML page. The value NO (the default) enables the index and # the value YES disables it. DISABLE_INDEX = NO -# This tag can be used to set the number of enum values (range [1..20]) +# This tag can be used to set the number of enum values (range [1..20]) # that doxygen will group on one line in the generated HTML documentation. ENUM_VALUES_PER_LINE = 4 # If the GENERATE_TREEVIEW tag is set to YES, a side panel will be -# generated containing a tree-like index structure (just like the one that -# is generated for HTML Help). For this to work a browser that supports -# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, -# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are +# generated containing a tree-like index structure (just like the one that +# is generated for HTML Help). For this to work a browser that supports +# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, +# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are # probably better off using the HTML help feature. GENERATE_TREEVIEW = NO -# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be -# used to set the initial width (in pixels) of the frame in which the tree +# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be +# used to set the initial width (in pixels) of the frame in which the tree # is shown. TREEVIEW_WIDTH = 250 @@ -801,74 +801,74 @@ TREEVIEW_WIDTH = 250 # configuration options related to the LaTeX output #--------------------------------------------------------------------------- -# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will +# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will # generate Latex output. GENERATE_LATEX = NO -# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be # put in front of it. If left blank `latex' will be used as the default path. LATEX_OUTPUT = latex -# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be +# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be # invoked. If left blank `latex' will be used as the default command name. LATEX_CMD_NAME = latex -# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to -# generate index for LaTeX. If left blank `makeindex' will be used as the +# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to +# generate index for LaTeX. If left blank `makeindex' will be used as the # default command name. MAKEINDEX_CMD_NAME = makeindex -# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact -# LaTeX documents. This may be useful for small projects and may help to +# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact +# LaTeX documents. This may be useful for small projects and may help to # save some trees in general. COMPACT_LATEX = NO -# The PAPER_TYPE tag can be used to set the paper type that is used -# by the printer. Possible values are: a4, a4wide, letter, legal and +# The PAPER_TYPE tag can be used to set the paper type that is used +# by the printer. Possible values are: a4, a4wide, letter, legal and # executive. If left blank a4wide will be used. PAPER_TYPE = a4wide -# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX +# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX # packages that should be included in the LaTeX output. -EXTRA_PACKAGES = +EXTRA_PACKAGES = -# The LATEX_HEADER tag can be used to specify a personal LaTeX header for -# the generated latex document. The header should contain everything until -# the first chapter. If it is left blank doxygen will generate a +# The LATEX_HEADER tag can be used to specify a personal LaTeX header for +# the generated latex document. The header should contain everything until +# the first chapter. If it is left blank doxygen will generate a # standard header. Notice: only use this tag if you know what you are doing! -LATEX_HEADER = +LATEX_HEADER = -# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated -# is prepared for conversion to pdf (using ps2pdf). The pdf file will -# contain links (just like the HTML output) instead of page references +# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated +# is prepared for conversion to pdf (using ps2pdf). The pdf file will +# contain links (just like the HTML output) instead of page references # This makes the output suitable for online browsing using a pdf viewer. PDF_HYPERLINKS = NO -# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of -# plain latex in the generated Makefile. Set this option to YES to get a +# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of +# plain latex in the generated Makefile. Set this option to YES to get a # higher quality PDF documentation. USE_PDFLATEX = NO -# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. -# command to the generated LaTeX files. This will instruct LaTeX to keep -# running if errors occur, instead of asking the user for help. +# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. +# command to the generated LaTeX files. This will instruct LaTeX to keep +# running if errors occur, instead of asking the user for help. # This option is also used when generating formulas in HTML. LATEX_BATCHMODE = NO -# If LATEX_HIDE_INDICES is set to YES then doxygen will not -# include the index chapters (such as File Index, Compound Index, etc.) +# If LATEX_HIDE_INDICES is set to YES then doxygen will not +# include the index chapters (such as File Index, Compound Index, etc.) # in the output. LATEX_HIDE_INDICES = NO @@ -877,68 +877,68 @@ LATEX_HIDE_INDICES = NO # configuration options related to the RTF output #--------------------------------------------------------------------------- -# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output -# The RTF output is optimized for Word 97 and may not look very pretty with +# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output +# The RTF output is optimized for Word 97 and may not look very pretty with # other RTF readers or editors. GENERATE_RTF = NO -# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be # put in front of it. If left blank `rtf' will be used as the default path. RTF_OUTPUT = rtf -# If the COMPACT_RTF tag is set to YES Doxygen generates more compact -# RTF documents. This may be useful for small projects and may help to +# If the COMPACT_RTF tag is set to YES Doxygen generates more compact +# RTF documents. This may be useful for small projects and may help to # save some trees in general. COMPACT_RTF = NO -# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated -# will contain hyperlink fields. The RTF file will -# contain links (just like the HTML output) instead of page references. -# This makes the output suitable for online browsing using WORD or other -# programs which support those fields. +# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated +# will contain hyperlink fields. The RTF file will +# contain links (just like the HTML output) instead of page references. +# This makes the output suitable for online browsing using WORD or other +# programs which support those fields. # Note: wordpad (write) and others do not support links. RTF_HYPERLINKS = NO -# Load stylesheet definitions from file. Syntax is similar to doxygen's -# config file, i.e. a series of assignments. You only have to provide +# Load stylesheet definitions from file. Syntax is similar to doxygen's +# config file, i.e. a series of assignments. You only have to provide # replacements, missing definitions are set to their default value. -RTF_STYLESHEET_FILE = +RTF_STYLESHEET_FILE = -# Set optional variables used in the generation of an rtf document. +# Set optional variables used in the generation of an rtf document. # Syntax is similar to doxygen's config file. -RTF_EXTENSIONS_FILE = +RTF_EXTENSIONS_FILE = #--------------------------------------------------------------------------- # configuration options related to the man page output #--------------------------------------------------------------------------- -# If the GENERATE_MAN tag is set to YES (the default) Doxygen will +# If the GENERATE_MAN tag is set to YES (the default) Doxygen will # generate man pages GENERATE_MAN = NO -# The MAN_OUTPUT tag is used to specify where the man pages will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# The MAN_OUTPUT tag is used to specify where the man pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be # put in front of it. If left blank `man' will be used as the default path. MAN_OUTPUT = man -# The MAN_EXTENSION tag determines the extension that is added to +# The MAN_EXTENSION tag determines the extension that is added to # the generated man pages (default is the subroutine's section .3) MAN_EXTENSION = .3 -# If the MAN_LINKS tag is set to YES and Doxygen generates man output, -# then it will generate one additional man file for each entity -# documented in the real man page(s). These additional files -# only source the real man page, but without them the man command +# If the MAN_LINKS tag is set to YES and Doxygen generates man output, +# then it will generate one additional man file for each entity +# documented in the real man page(s). These additional files +# only source the real man page, but without them the man command # would be unable to find the correct page. The default is NO. MAN_LINKS = NO @@ -947,33 +947,33 @@ MAN_LINKS = NO # configuration options related to the XML output #--------------------------------------------------------------------------- -# If the GENERATE_XML tag is set to YES Doxygen will -# generate an XML file that captures the structure of +# If the GENERATE_XML tag is set to YES Doxygen will +# generate an XML file that captures the structure of # the code including all documentation. GENERATE_XML = NO -# The XML_OUTPUT tag is used to specify where the XML pages will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# The XML_OUTPUT tag is used to specify where the XML pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be # put in front of it. If left blank `xml' will be used as the default path. XML_OUTPUT = xml -# The XML_SCHEMA tag can be used to specify an XML schema, -# which can be used by a validating XML parser to check the +# The XML_SCHEMA tag can be used to specify an XML schema, +# which can be used by a validating XML parser to check the # syntax of the XML files. -XML_SCHEMA = +XML_SCHEMA = -# The XML_DTD tag can be used to specify an XML DTD, -# which can be used by a validating XML parser to check the +# The XML_DTD tag can be used to specify an XML DTD, +# which can be used by a validating XML parser to check the # syntax of the XML files. -XML_DTD = +XML_DTD = -# If the XML_PROGRAMLISTING tag is set to YES Doxygen will -# dump the program listings (including syntax highlighting -# and cross-referencing information) to the XML output. Note that +# If the XML_PROGRAMLISTING tag is set to YES Doxygen will +# dump the program listings (including syntax highlighting +# and cross-referencing information) to the XML output. Note that # enabling this will significantly increase the size of the XML output. XML_PROGRAMLISTING = YES @@ -982,10 +982,10 @@ XML_PROGRAMLISTING = YES # configuration options for the AutoGen Definitions output #--------------------------------------------------------------------------- -# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will -# generate an AutoGen Definitions (see autogen.sf.net) file -# that captures the structure of the code including all -# documentation. Note that this feature is still experimental +# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will +# generate an AutoGen Definitions (see autogen.sf.net) file +# that captures the structure of the code including all +# documentation. Note that this feature is still experimental # and incomplete at the moment. GENERATE_AUTOGEN_DEF = NO @@ -994,319 +994,319 @@ GENERATE_AUTOGEN_DEF = NO # configuration options related to the Perl module output #--------------------------------------------------------------------------- -# If the GENERATE_PERLMOD tag is set to YES Doxygen will -# generate a Perl module file that captures the structure of -# the code including all documentation. Note that this -# feature is still experimental and incomplete at the +# If the GENERATE_PERLMOD tag is set to YES Doxygen will +# generate a Perl module file that captures the structure of +# the code including all documentation. Note that this +# feature is still experimental and incomplete at the # moment. GENERATE_PERLMOD = NO -# If the PERLMOD_LATEX tag is set to YES Doxygen will generate -# the necessary Makefile rules, Perl scripts and LaTeX code to be able +# If the PERLMOD_LATEX tag is set to YES Doxygen will generate +# the necessary Makefile rules, Perl scripts and LaTeX code to be able # to generate PDF and DVI output from the Perl module output. PERLMOD_LATEX = NO -# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be -# nicely formatted so it can be parsed by a human reader. This is useful -# if you want to understand what is going on. On the other hand, if this -# tag is set to NO the size of the Perl module output will be much smaller +# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be +# nicely formatted so it can be parsed by a human reader. This is useful +# if you want to understand what is going on. On the other hand, if this +# tag is set to NO the size of the Perl module output will be much smaller # and Perl will parse it just the same. PERLMOD_PRETTY = YES -# The names of the make variables in the generated doxyrules.make file -# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. -# This is useful so different doxyrules.make files included by the same +# The names of the make variables in the generated doxyrules.make file +# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. +# This is useful so different doxyrules.make files included by the same # Makefile don't overwrite each other's variables. -PERLMOD_MAKEVAR_PREFIX = +PERLMOD_MAKEVAR_PREFIX = #--------------------------------------------------------------------------- -# Configuration options related to the preprocessor +# Configuration options related to the preprocessor #--------------------------------------------------------------------------- -# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will -# evaluate all C-preprocessor directives found in the sources and include +# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will +# evaluate all C-preprocessor directives found in the sources and include # files. ENABLE_PREPROCESSING = YES -# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro -# names in the source code. If set to NO (the default) only conditional -# compilation will be performed. Macro expansion can be done in a controlled +# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro +# names in the source code. If set to NO (the default) only conditional +# compilation will be performed. Macro expansion can be done in a controlled # way by setting EXPAND_ONLY_PREDEF to YES. MACRO_EXPANSION = NO -# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES -# then the macro expansion is limited to the macros specified with the +# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES +# then the macro expansion is limited to the macros specified with the # PREDEFINED and EXPAND_AS_DEFINED tags. EXPAND_ONLY_PREDEF = NO -# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files +# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files # in the INCLUDE_PATH (see below) will be search if a #include is found. SEARCH_INCLUDES = YES -# The INCLUDE_PATH tag can be used to specify one or more directories that -# contain include files that are not input files but should be processed by +# The INCLUDE_PATH tag can be used to specify one or more directories that +# contain include files that are not input files but should be processed by # the preprocessor. -INCLUDE_PATH = +INCLUDE_PATH = -# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard -# patterns (like *.h and *.hpp) to filter out the header-files in the -# directories. If left blank, the patterns specified with FILE_PATTERNS will +# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard +# patterns (like *.h and *.hpp) to filter out the header-files in the +# directories. If left blank, the patterns specified with FILE_PATTERNS will # be used. -INCLUDE_FILE_PATTERNS = +INCLUDE_FILE_PATTERNS = -# The PREDEFINED tag can be used to specify one or more macro names that -# are defined before the preprocessor is started (similar to the -D option of -# gcc). The argument of the tag is a list of macros of the form: name -# or name=definition (no spaces). If the definition and the = are -# omitted =1 is assumed. To prevent a macro definition from being -# undefined via #undef or recursively expanded use the := operator +# The PREDEFINED tag can be used to specify one or more macro names that +# are defined before the preprocessor is started (similar to the -D option of +# gcc). The argument of the tag is a list of macros of the form: name +# or name=definition (no spaces). If the definition and the = are +# omitted =1 is assumed. To prevent a macro definition from being +# undefined via #undef or recursively expanded use the := operator # instead of the = operator. -PREDEFINED = +PREDEFINED = -# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then -# this tag can be used to specify a list of macro names that should be expanded. -# The macro definition that is found in the sources will be used. +# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then +# this tag can be used to specify a list of macro names that should be expanded. +# The macro definition that is found in the sources will be used. # Use the PREDEFINED tag if you want to use a different macro definition. -EXPAND_AS_DEFINED = +EXPAND_AS_DEFINED = -# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then -# doxygen's preprocessor will remove all function-like macros that are alone -# on a line, have an all uppercase name, and do not end with a semicolon. Such -# function macros are typically used for boiler-plate code, and will confuse +# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then +# doxygen's preprocessor will remove all function-like macros that are alone +# on a line, have an all uppercase name, and do not end with a semicolon. Such +# function macros are typically used for boiler-plate code, and will confuse # the parser if not removed. SKIP_FUNCTION_MACROS = YES #--------------------------------------------------------------------------- -# Configuration::additions related to external references +# Configuration::additions related to external references #--------------------------------------------------------------------------- -# The TAGFILES option can be used to specify one or more tagfiles. -# Optionally an initial location of the external documentation -# can be added for each tagfile. The format of a tag file without -# this location is as follows: -# TAGFILES = file1 file2 ... -# Adding location for the tag files is done as follows: -# TAGFILES = file1=loc1 "file2 = loc2" ... -# where "loc1" and "loc2" can be relative or absolute paths or -# URLs. If a location is present for each tag, the installdox tool +# The TAGFILES option can be used to specify one or more tagfiles. +# Optionally an initial location of the external documentation +# can be added for each tagfile. The format of a tag file without +# this location is as follows: +# TAGFILES = file1 file2 ... +# Adding location for the tag files is done as follows: +# TAGFILES = file1=loc1 "file2 = loc2" ... +# where "loc1" and "loc2" can be relative or absolute paths or +# URLs. If a location is present for each tag, the installdox tool # does not have to be run to correct the links. # Note that each tag file must have a unique name # (where the name does NOT include the path) -# If a tag file is not located in the directory in which doxygen +# If a tag file is not located in the directory in which doxygen # is run, you must also specify the path to the tagfile here. -TAGFILES = +TAGFILES = -# When a file name is specified after GENERATE_TAGFILE, doxygen will create +# When a file name is specified after GENERATE_TAGFILE, doxygen will create # a tag file that is based on the input files it reads. -GENERATE_TAGFILE = +GENERATE_TAGFILE = -# If the ALLEXTERNALS tag is set to YES all external classes will be listed -# in the class index. If set to NO only the inherited external classes +# If the ALLEXTERNALS tag is set to YES all external classes will be listed +# in the class index. If set to NO only the inherited external classes # will be listed. ALLEXTERNALS = NO -# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed -# in the modules index. If set to NO, only the current project's groups will +# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed +# in the modules index. If set to NO, only the current project's groups will # be listed. EXTERNAL_GROUPS = YES -# The PERL_PATH should be the absolute path and name of the perl script +# The PERL_PATH should be the absolute path and name of the perl script # interpreter (i.e. the result of `which perl'). PERL_PATH = /usr/bin/perl #--------------------------------------------------------------------------- -# Configuration options related to the dot tool +# Configuration options related to the dot tool #--------------------------------------------------------------------------- -# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will -# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base -# or super classes. Setting the tag to NO turns the diagrams off. Note that -# this option is superseded by the HAVE_DOT option below. This is only a -# fallback. It is recommended to install and use dot, since it yields more +# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will +# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base +# or super classes. Setting the tag to NO turns the diagrams off. Note that +# this option is superseded by the HAVE_DOT option below. This is only a +# fallback. It is recommended to install and use dot, since it yields more # powerful graphs. CLASS_DIAGRAMS = YES -# You can define message sequence charts within doxygen comments using the \msc -# command. Doxygen will then run the mscgen tool (see http://www.mcternan.me.uk/mscgen/) to -# produce the chart and insert it in the documentation. The MSCGEN_PATH tag allows you to -# specify the directory where the mscgen tool resides. If left empty the tool is assumed to +# You can define message sequence charts within doxygen comments using the \msc +# command. Doxygen will then run the mscgen tool (see http://www.mcternan.me.uk/mscgen/) to +# produce the chart and insert it in the documentation. The MSCGEN_PATH tag allows you to +# specify the directory where the mscgen tool resides. If left empty the tool is assumed to # be found in the default search path. -MSCGEN_PATH = +MSCGEN_PATH = -# If set to YES, the inheritance and collaboration graphs will hide -# inheritance and usage relations if the target is undocumented +# If set to YES, the inheritance and collaboration graphs will hide +# inheritance and usage relations if the target is undocumented # or is not a class. HIDE_UNDOC_RELATIONS = YES -# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is -# available from the path. This tool is part of Graphviz, a graph visualization -# toolkit from AT&T and Lucent Bell Labs. The other options in this section +# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is +# available from the path. This tool is part of Graphviz, a graph visualization +# toolkit from AT&T and Lucent Bell Labs. The other options in this section # have no effect if this option is set to NO (the default) HAVE_DOT = NO -# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for each documented class showing the direct and -# indirect inheritance relations. Setting this tag to YES will force the +# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for each documented class showing the direct and +# indirect inheritance relations. Setting this tag to YES will force the # the CLASS_DIAGRAMS tag to NO. CLASS_GRAPH = YES -# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for each documented class showing the direct and -# indirect implementation dependencies (inheritance, containment, and +# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for each documented class showing the direct and +# indirect implementation dependencies (inheritance, containment, and # class references variables) of the class with other documented classes. COLLABORATION_GRAPH = YES -# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen +# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen # will generate a graph for groups, showing the direct groups dependencies GROUP_GRAPHS = YES -# If the UML_LOOK tag is set to YES doxygen will generate inheritance and -# collaboration diagrams in a style similar to the OMG's Unified Modeling +# If the UML_LOOK tag is set to YES doxygen will generate inheritance and +# collaboration diagrams in a style similar to the OMG's Unified Modeling # Language. UML_LOOK = NO -# If set to YES, the inheritance and collaboration graphs will show the +# If set to YES, the inheritance and collaboration graphs will show the # relations between templates and their instances. TEMPLATE_RELATIONS = NO -# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT -# tags are set to YES then doxygen will generate a graph for each documented -# file showing the direct and indirect include dependencies of the file with +# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT +# tags are set to YES then doxygen will generate a graph for each documented +# file showing the direct and indirect include dependencies of the file with # other documented files. INCLUDE_GRAPH = YES -# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and -# HAVE_DOT tags are set to YES then doxygen will generate a graph for each -# documented header file showing the documented files that directly or +# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and +# HAVE_DOT tags are set to YES then doxygen will generate a graph for each +# documented header file showing the documented files that directly or # indirectly include this file. INCLUDED_BY_GRAPH = YES -# If the CALL_GRAPH, SOURCE_BROWSER and HAVE_DOT tags are set to YES then doxygen will -# generate a call dependency graph for every global function or class method. -# Note that enabling this option will significantly increase the time of a run. -# So in most cases it will be better to enable call graphs for selected +# If the CALL_GRAPH, SOURCE_BROWSER and HAVE_DOT tags are set to YES then doxygen will +# generate a call dependency graph for every global function or class method. +# Note that enabling this option will significantly increase the time of a run. +# So in most cases it will be better to enable call graphs for selected # functions only using the \callgraph command. CALL_GRAPH = NO -# If the CALLER_GRAPH, SOURCE_BROWSER and HAVE_DOT tags are set to YES then doxygen will -# generate a caller dependency graph for every global function or class method. -# Note that enabling this option will significantly increase the time of a run. -# So in most cases it will be better to enable caller graphs for selected +# If the CALLER_GRAPH, SOURCE_BROWSER and HAVE_DOT tags are set to YES then doxygen will +# generate a caller dependency graph for every global function or class method. +# Note that enabling this option will significantly increase the time of a run. +# So in most cases it will be better to enable caller graphs for selected # functions only using the \callergraph command. CALLER_GRAPH = NO -# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen +# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen # will graphical hierarchy of all classes instead of a textual one. GRAPHICAL_HIERARCHY = YES -# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES -# then doxygen will show the dependencies a directory has on other directories +# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES +# then doxygen will show the dependencies a directory has on other directories # in a graphical way. The dependency relations are determined by the #include # relations between the files in the directories. DIRECTORY_GRAPH = YES -# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images +# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images # generated by dot. Possible values are png, jpg, or gif # If left blank png will be used. DOT_IMAGE_FORMAT = png -# The tag DOT_PATH can be used to specify the path where the dot tool can be +# The tag DOT_PATH can be used to specify the path where the dot tool can be # found. If left blank, it is assumed the dot tool can be found in the path. -DOT_PATH = +DOT_PATH = -# The DOTFILE_DIRS tag can be used to specify one or more directories that -# contain dot files that are included in the documentation (see the +# The DOTFILE_DIRS tag can be used to specify one or more directories that +# contain dot files that are included in the documentation (see the # \dotfile command). -DOTFILE_DIRS = +DOTFILE_DIRS = -# The MAX_DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of -# nodes that will be shown in the graph. If the number of nodes in a graph -# becomes larger than this value, doxygen will truncate the graph, which is -# visualized by representing a node as a red box. Note that doxygen if the number -# of direct children of the root node in a graph is already larger than -# MAX_DOT_GRAPH_NOTES then the graph will not be shown at all. Also note +# The MAX_DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of +# nodes that will be shown in the graph. If the number of nodes in a graph +# becomes larger than this value, doxygen will truncate the graph, which is +# visualized by representing a node as a red box. Note that doxygen if the number +# of direct children of the root node in a graph is already larger than +# MAX_DOT_GRAPH_NOTES then the graph will not be shown at all. Also note # that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH. DOT_GRAPH_MAX_NODES = 50 -# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the -# graphs generated by dot. A depth value of 3 means that only nodes reachable -# from the root by following a path via at most 3 edges will be shown. Nodes -# that lay further from the root node will be omitted. Note that setting this -# option to 1 or 2 may greatly reduce the computation time needed for large -# code bases. Also note that the size of a graph can be further restricted by +# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the +# graphs generated by dot. A depth value of 3 means that only nodes reachable +# from the root by following a path via at most 3 edges will be shown. Nodes +# that lay further from the root node will be omitted. Note that setting this +# option to 1 or 2 may greatly reduce the computation time needed for large +# code bases. Also note that the size of a graph can be further restricted by # DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction. MAX_DOT_GRAPH_DEPTH = 0 -# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent -# background. This is disabled by default, which results in a white background. -# Warning: Depending on the platform used, enabling this option may lead to -# badly anti-aliased labels on the edges of a graph (i.e. they become hard to +# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent +# background. This is disabled by default, which results in a white background. +# Warning: Depending on the platform used, enabling this option may lead to +# badly anti-aliased labels on the edges of a graph (i.e. they become hard to # read). DOT_TRANSPARENT = NO -# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output -# files in one run (i.e. multiple -o and -T options on the command line). This -# makes dot run faster, but since only newer versions of dot (>1.8.10) +# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output +# files in one run (i.e. multiple -o and -T options on the command line). This +# makes dot run faster, but since only newer versions of dot (>1.8.10) # support this, this feature is disabled by default. DOT_MULTI_TARGETS = NO -# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will -# generate a legend page explaining the meaning of the various boxes and +# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will +# generate a legend page explaining the meaning of the various boxes and # arrows in the dot generated graphs. GENERATE_LEGEND = YES -# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will -# remove the intermediate dot files that are used to generate +# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will +# remove the intermediate dot files that are used to generate # the various graphs. DOT_CLEANUP = YES #--------------------------------------------------------------------------- -# Configuration::additions related to the search engine +# Configuration::additions related to the search engine #--------------------------------------------------------------------------- -# The SEARCHENGINE tag specifies whether or not a search engine should be +# The SEARCHENGINE tag specifies whether or not a search engine should be # used. If set to NO the values of all tags below this one will be ignored. SEARCHENGINE = NO diff --git a/data/config/serverdb.kvc b/data/config/serverdb.kvc index ebbf3ebc4..d25220bb1 100644 --- a/data/config/serverdb.kvc +++ b/data/config/serverdb.kvc @@ -827,7 +827,7 @@ NServers=3 5_Description=RealROOT%20Server 6_Hostname=irc.datacomm.ch 6_Description=Datacomm%20Server -7_Hostname=irc.osanet.cz +7_Hostname=irc.osanet.cz 7_Description=OSANET%20Server 8_Hostname=irc.i.cz 8_Description=ICZ%20Server @@ -1385,6 +1385,10 @@ NServers=3 0_Hostname=irc.spamnet.org 0_Description=Spamnet:%20Random%20server NServers=1 +[SpotChat] +0_Hostname=irc.spotchat.org +0_Description=SpotChat:%20Random%20server +NServers=1 [StarChat] 0_Hostname=irc.starchat.net 0_Description=StarChat:%20Random%20server diff --git a/data/defscript/aliases.kvs b/data/defscript/aliases.kvs index d12809a25..6f0bfd15c 100644 --- a/data/defscript/aliases.kvs +++ b/data/defscript/aliases.kvs @@ -92,7 +92,7 @@ alias(ms) alias(gnotice) { # Global notice - + # Check channel validity %szChan = $0 if(!%szChan) @@ -107,7 +107,7 @@ alias(gnotice) echo $tr("-q: quiet mode") halt } - + # Check the message validity %szMsg = $1- if($str.length(%szMsg) == 0) @@ -116,21 +116,21 @@ alias(gnotice) echo $tr("Type /gnotice for help") halt } - + # Detect message type if($sw(m,message)) %szCmd = "msg" else %szCmd = "notice" - + # Check for quiet message if($sw(q,quiet)) %szCmd = $str.append(%szCmd," -q") - + # Check null switches if((!$sw(w,owners)) && (!$sw(a,admins)) && (!$sw(o,ops)) && (!$sw(h,halfops)) && (!$sw(v,voices))) { eval %szCmd %szChan %szMsg halt } - + # Check switches passed if($sw(w,owners)) eval %szCmd \~%szChan %szMsg if($sw(a,admins)) eval %szCmd \!%szChan %szMsg diff --git a/data/defscript/classes.kvs b/data/defscript/classes.kvs index 88ce2a3ef..9d397c114 100644 --- a/data/defscript/classes.kvs +++ b/data/defscript/classes.kvs @@ -7,7 +7,7 @@ class(installer,object) { $$->%iNumFiles = 0 } - + copyFiles($0 = source dir, $1 = file regexp, $2 = target dir) { if($0 == "") @@ -15,19 +15,19 @@ class(installer,object) echo "[Installer] Error: the first argument of copyFiles must be a source directory" halt } - + if($1 == "") { echo "[Installer] Error: the second argument of copyFiles must be a file name or file regexp" halt } - + if($2 == "") { echo "[Installer] Error: the third argument of copyFiles must be a destination directory" halt } - + if($file.exists($0)) { %files[] = $file.ls($0,f,$1) @@ -43,7 +43,7 @@ class(installer,object) } } } - + generateUninstallAlias($0 = alias name) { %c = "alias($0)$lf" diff --git a/data/defscript/popups.kvs b/data/defscript/popups.kvs index 33b91cc78..6fd04c41d 100644 --- a/data/defscript/popups.kvs +++ b/data/defscript/popups.kvs @@ -101,7 +101,7 @@ defpopup(ignore) %:inIgnoreList = $reguser.isIgnoreEnabled(%:regName); if(%:inIgnoreList) %:ignLabelText << $tr("is being ignored") else %:ignLabelText << $tr("is not being ignored") - + %:ignLabelText << "</p>" } else { %:ignLabelText << $tr("is not being ignored")"</p>" @@ -620,7 +620,7 @@ defpopup(channel) } } separator - + item($tr("Configure ban mask..."),20) { options.edit KviChannelAdvancedOptionsWidget @@ -685,7 +685,7 @@ defpopup(channelpopup) { str.toClipboard $chan.getUrl($0) } - + } defpopup(channels) @@ -756,7 +756,7 @@ defpopup(channeltextview) { str.toClipboard $chan.getUrl } - + item($tr("Clear Buffer"),121) { clear; @@ -949,7 +949,7 @@ defpopup(dcc) { dcc.send $0 } - + item($tr("Secure send to") $0,79) { dcc.send -s $0 @@ -959,7 +959,7 @@ defpopup(dcc) { dcc.rsend -z $0 } - + item($tr("Secure Reverse Send to") $0,79) { dcc.rsend -z -s $0 diff --git a/data/defscript/theme-install.kvs b/data/defscript/theme-install.kvs index febbbbc07..606ec43c0 100644 --- a/data/defscript/theme-install.kvs +++ b/data/defscript/theme-install.kvs @@ -1,7 +1,7 @@ addon.register("Theme: @THEMENAME@","@THEMEVERSION@",$tr("@THEMENAME@"),$tr("@THEMEDESCRIPTION@"),"3.2.0.99") { # This is our uninstall callback: it will be called by KVIrc when addon.uninstall is invoked - + # This is an automatically generated alias that will erase the installed files @ALIASNAME@_uninstallfiles file.rmdir $file.localdir("themes/@SUBDIR@") diff --git a/data/man/kvirc.de.UTF-8.1 b/data/man/kvirc.de.1 index d6fbbcf35..ecef424c0 100644 --- a/data/man/kvirc.de.UTF-8.1 +++ b/data/man/kvirc.de.1 @@ -1,4 +1,4 @@ -.TH KVIRC 1 "14/09/2008" Version 4.0.0 +.TH KVIRC 1 "02/09/2009" Version 4.0.0 .SH NAME KVIrc - ein Internet-Relay-Chat-Client. .SH SYNOPSIS @@ -31,21 +31,21 @@ Erstelle \fI<Datei>\fP, falls sie nicht existiert. Eine neue KVIrc-Sitzung erzwingen, selbst wenn bereits ein laufende vorhanden ist. .TP 8 .B \-e \fI<Befehle>\fP -Wenn bereits eine KVIrc-Sitzung ausgeführt wird, führe die \fI<Befehle>\fP in dieser +Wenn bereits eine KVIrc-Sitzung ausgeführt wird, führe die \fI<Befehle>\fP in dieser aus, anderenfalls starte normal und führe die \fI<Befehle>\fP aus. \fI<Befehle>\fP muss ein einzelner Shell-Token sein. Diese Option kann mehrfach angegeben werden. .TP 8 .B \-x \fI<commands>\fP -Wenn bereits eine KVIrc-Sitzung ausgeführt wird, führe die \fI<Befehle>\fP in dieser +Wenn bereits eine KVIrc-Sitzung ausgeführt wird, führe die \fI<Befehle>\fP in dieser aus, anderenfalls tue nichts und breche ab. -\fI<Befehle>\fP muss ein einzelner Shell-Token sein. +\fI<Befehle>\fP muss ein einzelner Shell-Token sein. Diese Option kann mehrfach angegeben werden. .TP 8 .B \-r \fI<commands>\fP -Wenn bereits eine KVIrc-Sitzung ausgeführt wird, führe \fI<Befehle>\fP in dieser aus, -anderenfalls starte normal (und führe \fI<Befehle>\fP NICHT aus). -\fI<Befehle>\fP muss ein einzelner Shell-Token sein. +Wenn bereits eine KVIrc-Sitzung ausgeführt wird, führe \fI<Befehle>\fP in dieser aus, +anderenfalls starte normal (und führe \fI<Befehle>\fP NICHT aus). +\fI<Befehle>\fP muss ein einzelner Shell-Token sein. Diese Option kann mehrfach angegeben werden. .TP 8 .B \-m @@ -116,10 +116,10 @@ Permission to use, copy, modify, and distribute this software and its documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in -supporting documentation. +supporting documentation. .SH VERBESSERUNGSVORSCHLÄGE UND FEHLER (BUGS) -Alle gefundenen Bugs und Verbesserungsvorschläge sollten unter +Alle gefundenen Bugs und Verbesserungsvorschläge sollten unter \fI<https://svn.kvirc.de/kvirc/>\fP berichtet werden. .SH OFFIZIELLE WEBSEITE @@ -130,8 +130,8 @@ http://www.kvirc.net Szymon 'Pragma' Stefanek \fI<pragma at kvirc dot net>\fP Code, Fehlerbehebungen, neue Features und vieles mehr von -Alessandro 'Noldor@freenode' Carbone, Elvio 'HelLViS69@freenode' Basello, -Fabio 'CtrlAltCa@freenode' Bas, Alexey 'Alexey@freenode' Uzhva, +Alessandro 'Noldor@freenode' Carbone, Elvio 'HelLViS69@freenode' Basello, +Fabio 'CtrlAltCa@freenode' Bas, Alexey 'Alexey@freenode' Uzhva, Voker57@freenode Alte Autoren: @@ -146,5 +146,5 @@ Andrew 'Drosha@ircnet' Frolov, MalboroLi@ircnet, munehiro@ircnet Diese Ãœbersetzung der Handbuchseite wurde von Kai Wasserbäch <debian@carbon-project.org> für das Debian-Projekt angefertigt, darf aber auch von anderen unter den selben Bediungen wie KVIrc -verwandt werden. +verwandt werden. Aktualisiert von Markus Rennings <kvirc@mrmx.de>. diff --git a/data/man/kvirc.de.ISO8859-1.1 b/data/man/kvirc.de.ISO8859-1.1 deleted file mode 100644 index 449d4dc7a..000000000 --- a/data/man/kvirc.de.ISO8859-1.1 +++ /dev/null @@ -1,150 +0,0 @@ -.TH KVIRC 1 "14/09/2008" Version 4.0.0 -.SH NAME -KVIrc - ein Internet-Relay-Chat-Client. -.SH SYNOPSIS -.B kvirc [Optionen] [Server [Port]] [ircurl [ircurl [...]]] - -.SH BESCHREIBUNG -.PP -KVIrc ist ein auf der Qt-Bibliothek basierender IRC Client mit grafischer Oberfläche. -.PP -KVIrc stellt eine benutzerfreundliche Schnittstelle zum IRC-Protokoll (siehe \fIRFC1459\fP) -und seinen Erweiterungen dar. -.SH OPTIONEN -\fIKVIrc\fP akzeptiert die folgenden Optionen: -.TP 8 -.B \-h, \-\-help -Gibt eine Liste aller Befehlszeilenoptionen aus und beendet das Programm. -.TP 8 -.B \-v, \-\-version -Zeigt die Versionsinformationen an. -.TP 8 -.B \-c \fI<Datei>\fP -\fI<Datei>\fP statt ~/.kvirc.rc als Konfigruationsdatei verwenden. Wenn \fI<Datei>\fP -nicht existiert, wird $HOME/.kvirc.rc genutzt. -.TP 8 -.B \-n \fI<Datei>\fP -\fI<Datei>\fP statt ~/.kvirc.rc als Konfigruationsdatei verwenden. -Erstelle \fI<Datei>\fP, falls sie nicht existiert. -.TP 8 -.B \-f -Eine neue KVIrc-Sitzung erzwingen, selbst wenn bereits ein laufende vorhanden ist. -.TP 8 -.B \-e \fI<Befehle>\fP -Wenn bereits eine KVIrc-Sitzung ausgeführt wird, führe die \fI<Befehle>\fP in dieser -aus, anderenfalls starte normal und führe die \fI<Befehle>\fP aus. -\fI<Befehle>\fP muss ein einzelner Shell-Token sein. -Diese Option kann mehrfach angegeben werden. -.TP 8 -.B \-x \fI<commands>\fP -Wenn bereits eine KVIrc-Sitzung ausgeführt wird, führe die \fI<Befehle>\fP in dieser -aus, anderenfalls tue nichts und breche ab. -\fI<Befehle>\fP muss ein einzelner Shell-Token sein. -Diese Option kann mehrfach angegeben werden. -.TP 8 -.B \-r \fI<commands>\fP -Wenn bereits eine KVIrc-Sitzung ausgeführt wird, führe \fI<Befehle>\fP in dieser aus, -anderenfalls starte normal (und führe \fI<Befehle>\fP NICHT aus). -\fI<Befehle>\fP muss ein einzelner Shell-Token sein. -Diese Option kann mehrfach angegeben werden. -.TP 8 -.B \-m -Sollte bereits eine Sitzung laufen, zeige einen darüber informierenden -Popup-Dialog an, anstatt die Meldung auf einer Konsole auszugeben. -Dies ist besonders dann hilfreich, wenn KVIrc mittels eines grafischen -Buttons in der Taskleise gestartet wird. -.TP 8 -.B \-\-nosplash -Den Begrüßungsbildschirm (splash screen) nicht anzeigen. -.TP 8 -.B [Server] -Nach dem Start zu diesem Server verbinden. -.TP 8 -.B [port] -Zum zuvor zwingend anzugebenden Server zu diesem Ports verbinden. -.TP 8 -.B [ircurl] -Eine URL der Form - - irc[6]://<Server>[:<Port>][/<Kanal>[?<Passwort>]] - -Für jede auf der Befehlszeile angegebene URL einen neuen IRC-Kontext -erstellen und versuchen, zu <Server> auf <Port> zu verbinden. -Der optionale Parameter <Kanal> gibt den nach dem Verbinden automatisch zu -betretenen Kanal an. - -.SH UMGEBUNG -.PP -.TP 8 -.B KVIRC_LANG -Spracheinstellung. -Wenn nicht gesetzt, wird KVIrc $LANG nutzen. -.TP 8 -.B LANG -Spracheinstellung. -Falls nicht angegeben (oder falls auf »en«, »POSIX« oder »C« gesetzt), wird KVIrc die -Standardsprache (Englisch) verwenden. -.TP 8 - -.SH DATEIEN - -\fB$PREFIX\fP/share/kvirc/\fBVERSION\fP/* -Verzeichnis welches die globalen KVIrc-Einstellungen, Module usw. enthält. - -\fB$HOME\fP/.kvirc.rc KVIrc sucht zuerst nach dieser Datei. -Sollte der »-c«-Parameter übergeben worden sein, wird die damit angegebene Datei -statt dieser verwandt. -Sollte die Datei gefunden werden, wird die erste nicht leere Zeile als -Pfadangabe zum \fILokalen KVIrc-Verzeichnis\fP interpretiert. -Sollte entweder diese Datei nicht gefunden werden oder das -\fILokale KVIrc-Verzeichnis\fP nicht existieren, startet KVIrc im -Setup-Modus und erlaubt die Auswahl eines neuen -\fILokalen KVIrc-Verzeichnisses\fP. - -\fBLokales KVIrc-Verzeichnis\fP/* -Verzeichnis, welches die lokalen (benutzerspezifischen) KVIrc-Einstellungen -enthält. -Ähnelt dem globalen Verzeichnis. - -.SH SIEHE AUCH -.BR X (1) -.BR talk (1) -.SH COPYRIGHT -Copyright \(co 1999-2009 Szymon Stefanek und The KVIrc Development Team - -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, -provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in -supporting documentation. - -.SH VERBESSERUNGSVORSCHLÄGE UND FEHLER (BUGS) -Alle gefundenen Bugs und Verbesserungsvorschläge sollten unter -\fI<https://svn.kvirc.de/kvirc/>\fP berichtet werden. - -.SH OFFIZIELLE WEBSEITE - -http://www.kvirc.net - -.SH AUTOREN -Szymon 'Pragma' Stefanek \fI<pragma at kvirc dot net>\fP - -Code, Fehlerbehebungen, neue Features und vieles mehr von -Alessandro 'Noldor@freenode' Carbone, Elvio 'HelLViS69@freenode' Basello, -Fabio 'CtrlAltCa@freenode' Bas, Alexey 'Alexey@freenode' Uzhva, -Voker57@freenode - -Alte Autoren: - -Mit Patches, Fehlerbereinigungen, Erweiterugen und mehr von: -[Anodine]@efnet, Till 'BuTi@ircnet' Busch, Fritz 'KNFritz@ircnet' Elfert, RAD Kade 1 - -Mit vielen Hilfen (Bug-Suche, scharfem Nachdenken, im IRC verbrachten Nächten, -großartigen Ideen von vielen Leuten aus dem Internet, unter anderem: -Paul 'infected@ircnet' Boehm, Olle 'Crocodile@ircnet' H\[:a]lln\[:a]s, Diablo@ircnet, -Andrew 'Drosha@ircnet' Frolov, MalboroLi@ircnet, munehiro@ircnet - -Diese Übersetzung der Handbuchseite wurde von Kai Wasserbäch <debian@carbon-project.org> für das -Debian-Projekt angefertigt, darf aber auch von anderen unter den selben Bediungen wie KVIrc -verwandt werden. -Aktualisiert von Markus Rennings <kvirc@mrmx.de>. diff --git a/data/man/kvirc.en.1 b/data/man/kvirc.en.1 index a612be0e1..b80326736 100644 --- a/data/man/kvirc.en.1 +++ b/data/man/kvirc.en.1 @@ -1,4 +1,4 @@ -.TH KVIRC 1 "25/06/2009" Version 4.0.0 +.TH KVIRC 1 "02/09/2009" Version 4.0.0 .SH NAME KVIrc - an Internet Relay Chat client. .SH SYNOPSIS @@ -113,10 +113,10 @@ Permission to use, copy, modify, and distribute this software and its documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in -supporting documentation. +supporting documentation. .SH SUGGESTIONS AND BUG REPORTS -Any bugs found (and feature requests) should be reported to the tracker +Any bugs found (and feature requests) should be reported to the tracker at: \fI<https://svn.kvirc.de/>\fP diff --git a/data/man/kvirc.it.1 b/data/man/kvirc.it.1 index 29ca3b812..d6701c4af 100644 --- a/data/man/kvirc.it.1 +++ b/data/man/kvirc.it.1 @@ -1,4 +1,4 @@ -.TH KVIRC 1 "25/06/2009" Version 4.0.0 +.TH KVIRC 1 "02/09/2009" Version 4.0.0 .SH NAME KVIrc - un client Internet Relay Chat. .SH SYNOPSIS diff --git a/data/man/kvirc.it.ISO8859-1.1 b/data/man/kvirc.it.ISO8859-1.1 deleted file mode 100644 index 76e892a6a..000000000 --- a/data/man/kvirc.it.ISO8859-1.1 +++ /dev/null @@ -1,141 +0,0 @@ -.TH KVIRC 1 "25/06/2009" Version 4.0.0 -.SH NAME -KVIrc - un client Internet Relay Chat. -.SH SYNOPSIS -.B kvirc [opzioni] [server [porta]] [ircurl [ircurl [...]]] - -.SH DESCRIZIONE -.PP -KVIrc è un client Internet Relay Chat visuale basato sulla libreria Qt. -.PP -E' inteso come un'interfaccia "amichevole" al protocollo IRC (vedi \fIRFC1459\fP) e le sue estensioni. -.SH OPZIONI -\fIKVIrc\fP accetta le seguenti opzioni: -.TP 8 -.B \-h, \-\-help -Visualizza tutte le opzioni da riga di comando ed esce. -.TP 8 -.B \-v, \-\-version -Visualizza le informazioni sulla versione. -.TP 8 -.B \-c \fI<file>\fP -Usa \fI<file>\fP come file di configurazione invece di ~/.kvirc.rc . -Cerca $HOME/.kvirc.rc se \fI<file>\fP non esiste. -.TP 8 -.B \-n \fI<file>\fP -Usa \fI<file>\fP come file di configurazione invece di ~/.kvirc.rc . -Crea \fI<file>\fP se non esiste. -.TP 8 -.B \-f -Forza una nuova sessione di KVIrc, anche se ne esiste già un'altra. -.TP 8 -.B \-e \fI<comandi>\fP -Se una sessione di KVIrc è già avviata, esegue i \fI<comandi>\fP in quella -sessione, altrimenti avvia normalmente ed esegue \fI<comandi>\fP. -\fI<comandi>\fP deve essere una singola stringa. -Puoi eventualmente usare questo switch più di una volta. -.TP 8 -.B \-x \fI<comandi>\fP -Se una sessione di KVIrc è già avviata, esegue i \fI<comandi>\fP in quella -sessione, altrimenti non fa nulla ed esce. -\fI<comandi>\fP deve essere una singola stringa. -Puoi eventualmente usare questo switch più di una volta. -.TP 8 -.B \-r \fI<comandi>\fP -Se una sessione di KVIrc è già avviata, esegue i \fI<comandi>\fP in quella -sessione, altrimenti avvia normalmente (non esegue). -\fI<comandi>\fP deve essere una singola stringa. -Puoi eventualmente usare questo switch più di una volta. -.TP 8 -.B \-m -Se una sessione di KVIrc è già avviata, mostra un pannello informativo -invece di scrivere sulla console. -Questo è utile quando si avvia KVIrc da un bottone grafico. -.TP 8 -.B \-\-nosplash -Non mostra lo splash screen all'avvio -.TP 8 -.B [server] -Connette a questo server dopo l'avvio. -.TP 8 -.B [port] -Usa questa porta per la connessione. -Quest'opzione richiede anche il nome del server. -.TP 8 -.B [ircurl] -Un url nella seguente forma: - - irc[6]://<server>[:<porta>][/<canale>[?<password>]] - -Per ogni url nella riga di comando crea un nuovo contesto irc -e tenta di connettere al <server> su quella specificata <porta>. -Il <canale> opzionale viene aperto appena dopo che la connessione -viene stabilita. - -.SH AMBIENTE -.PP -.TP 8 -.B KVIRC_LANG -Impostazione della lingua. -Se non è settata KVIrc controllerà $LANG -.TP 8 -.B LANG -Impostazione della lingua. -Se non è settata (o settata su 'EN','POSIX' o 'C') KVIrc userà la lingua -predefinita (inglese). -.TP 8 - -.SH FILE - -\fB$PREFIX\fP/share/kvirc/\fBVERSIONE\fP/* -Directory con le impostazioni globali di KVIrc, i moduli etc... - -\fB$HOME\fP/.kvirc.rc . Questo è il primo file che KVIrc cercherà. -Se l'opzione da riga di comando \-c viene specificata, verrà usato -il file passato come parametro invece di questo. -Se il file viene trovato, KVIrc leggerà la prima riga non vuota e -la tratterà come percorso alla \fIdirectory Locale di KVIrc\fP. -Se il file non può essere trovato o la \fIdirectory Locale di KVIrc\fP -non esiste, KVIrc avvierà il wizard di configurazione e permetterà -di scegliere una nuova \fIdirectory Locale di KVIrc\fP. - -\fIdirectory Locale di KVIrc\fP/* -Directory con le impostazioni locali (per utente) di KVIrc. -Simile a quella globale. - -.SH VEDI ANCHE -.BR X (1) -.BR talk (1) -.SH COPYRIGHT -Copyright \(co 1999-2009 Szymon Stefanek and The KVIrc Development Team - -Il permesso di usare, copiare, modificare e distribuire questo software -e la sua documentazione per qualsiasi scopo senza lucro è garantita, -detto questo la nota di copyright appare in tutte le copie ed entrambe le -note del copyright e questo permesso appare nella documentazione di supporto. - -.SH SUGGERIMENTI E REPORT DEI BUG -Qualsiasi bug trovato (e richieste di nuove funzionalità) vanno riportate -al tracker all'indirizzo: -\fI<https://svn.kvirc.de/>\fP - -.SH SITO WWW UFFICIALE - -http://www.kvirc.net -In russo - http://www.kvirc.net.ru - -.SH AUTORI -Szymon 'Pragma' Stefanek \fI<pragma at kvirc dot net>\fP - -Codice, fix, nuove funzionalità e molto altro da -Alessandro 'Noldor@freenode' Carbone, Elvio 'HelLViS69@freenode' Basello, Fabio 'CtrlAltCa@freenode' Bas, Alexey 'Alexey@freenode' Uzhva, Voker57@freenode - -Vecchi autori - -Con patch, fix, estensioni e altro da -[Anodine]@efnet, Till 'BuTi@ircnet' Busch, Fritz 'KNFritz@ircnet' Elfert, RAD Kade 1 - -Con caccia ai bug, pensieri impegnativi, consumo di occhi, notti spese su IRC, -grandi suggerimenti e altro da molta gente da tutto il mondo, inclusi e non limitati a -Paul 'infected@ircnet' Boehm, Olle 'Crocodile@ircnet' H\[:a]lln\[:a]s, Diablo@ircnet, -Andrew 'Drosha@ircnet' Frolov, MalboroLi@ircnet, munehiro@ircnet diff --git a/data/man/kvirc.it.UTF-8.1 b/data/man/kvirc.it.UTF-8.1 deleted file mode 100644 index d2b72f30e..000000000 --- a/data/man/kvirc.it.UTF-8.1 +++ /dev/null @@ -1,141 +0,0 @@ -.TH KVIRC 1 "25/06/2009" Version 4.0.0 -.SH NAME -KVIrc - un client Internet Relay Chat. -.SH SYNOPSIS -.B kvirc [opzioni] [server [porta]] [ircurl [ircurl [...]]] - -.SH DESCRIZIONE -.PP -KVIrc è un client Internet Relay Chat visuale basato sulla libreria Qt. -.PP -E' inteso come un'interfaccia "amichevole" al protocollo IRC (vedi \fIRFC1459\fP) e le sue estensioni. -.SH OPZIONI -\fIKVIrc\fP accetta le seguenti opzioni: -.TP 8 -.B \-h, \-\-help -Visualizza tutte le opzioni da riga di comando ed esce. -.TP 8 -.B \-v, \-\-version -Visualizza le informazioni sulla versione. -.TP 8 -.B \-c \fI<file>\fP -Usa \fI<file>\fP come file di configurazione invece di ~/.kvirc.rc . -Cerca $HOME/.kvirc.rc se \fI<file>\fP non esiste. -.TP 8 -.B \-n \fI<file>\fP -Usa \fI<file>\fP come file di configurazione invece di ~/.kvirc.rc . -Crea \fI<file>\fP se non esiste. -.TP 8 -.B \-f -Forza una nuova sessione di KVIrc, anche se ne esiste già un'altra. -.TP 8 -.B \-e \fI<comandi>\fP -Se una sessione di KVIrc è già avviata, esegue i \fI<comandi>\fP in quella -sessione, altrimenti avvia normalmente ed esegue \fI<comandi>\fP. -\fI<comandi>\fP deve essere una singola stringa. -Puoi eventualmente usare questo switch più di una volta. -.TP 8 -.B \-x \fI<comandi>\fP -Se una sessione di KVIrc è già avviata, esegue i \fI<comandi>\fP in quella -sessione, altrimenti non fa nulla ed esce. -\fI<comandi>\fP deve essere una singola stringa. -Puoi eventualmente usare questo switch più di una volta. -.TP 8 -.B \-r \fI<comandi>\fP -Se una sessione di KVIrc è già avviata, esegue i \fI<comandi>\fP in quella -sessione, altrimenti avvia normalmente (non esegue). -\fI<comandi>\fP deve essere una singola stringa. -Puoi eventualmente usare questo switch più di una volta. -.TP 8 -.B \-m -Se una sessione di KVIrc è già avviata, mostra un pannello informativo -invece di scrivere sulla console. -Questo è utile quando si avvia KVIrc da un bottone grafico. -.TP 8 -.B \-\-nosplash -Non mostra lo splash screen all'avvio -.TP 8 -.B [server] -Connette a questo server dopo l'avvio. -.TP 8 -.B [port] -Usa questa porta per la connessione. -Quest'opzione richiede anche il nome del server. -.TP 8 -.B [ircurl] -Un url nella seguente forma: - - irc[6]://<server>[:<porta>][/<canale>[?<password>]] - -Per ogni url nella riga di comando crea un nuovo contesto irc -e tenta di connettere al <server> su quella specificata <porta>. -Il <canale> opzionale viene aperto appena dopo che la connessione -viene stabilita. - -.SH AMBIENTE -.PP -.TP 8 -.B KVIRC_LANG -Impostazione della lingua. -Se non è settata KVIrc controllerà $LANG -.TP 8 -.B LANG -Impostazione della lingua. -Se non è settata (o settata su 'EN','POSIX' o 'C') KVIrc userà la lingua -predefinita (inglese). -.TP 8 - -.SH FILE - -\fB$PREFIX\fP/share/kvirc/\fBVERSIONE\fP/* -Directory con le impostazioni globali di KVIrc, i moduli etc... - -\fB$HOME\fP/.kvirc.rc . Questo è il primo file che KVIrc cercherà . -Se l'opzione da riga di comando \-c viene specificata, verrà usato -il file passato come parametro invece di questo. -Se il file viene trovato, KVIrc leggerà la prima riga non vuota e -la tratterà come percorso alla \fIdirectory Locale di KVIrc\fP. -Se il file non può essere trovato o la \fIdirectory Locale di KVIrc\fP -non esiste, KVIrc avvierà il wizard di configurazione e permetterà -di scegliere una nuova \fIdirectory Locale di KVIrc\fP. - -\fIdirectory Locale di KVIrc\fP/* -Directory con le impostazioni locali (per utente) di KVIrc. -Simile a quella globale. - -.SH VEDI ANCHE -.BR X (1) -.BR talk (1) -.SH COPYRIGHT -Copyright \(co 1999-2009 Szymon Stefanek and The KVIrc Development Team - -Il permesso di usare, copiare, modificare e distribuire questo software -e la sua documentazione per qualsiasi scopo senza lucro è garantita, -detto questo la nota di copyright appare in tutte le copie ed entrambe le -note del copyright e questo permesso appare nella documentazione di supporto. - -.SH SUGGERIMENTI E REPORT DEI BUG -Qualsiasi bug trovato (e richieste di nuove funzionalità ) vanno riportate -al tracker all'indirizzo: -\fI<https://svn.kvirc.de/>\fP - -.SH SITO WWW UFFICIALE - -http://www.kvirc.net -In russo - http://www.kvirc.net.ru - -.SH AUTORI -Szymon 'Pragma' Stefanek \fI<pragma at kvirc dot net>\fP - -Codice, fix, nuove funzionalità e molto altro da -Alessandro 'Noldor@freenode' Carbone, Elvio 'HelLViS69@freenode' Basello, Fabio 'CtrlAltCa@freenode' Bas, Alexey 'Alexey@freenode' Uzhva, Voker57@freenode - -Vecchi autori - -Con patch, fix, estensioni e altro da -[Anodine]@efnet, Till 'BuTi@ircnet' Busch, Fritz 'KNFritz@ircnet' Elfert, RAD Kade 1 - -Con caccia ai bug, pensieri impegnativi, consumo di occhi, notti spese su IRC, -grandi suggerimenti e altro da molta gente da tutto il mondo, inclusi e non limitati a -Paul 'infected@ircnet' Boehm, Olle 'Crocodile@ircnet' H\[:a]lln\[:a]s, Diablo@ircnet, -Andrew 'Drosha@ircnet' Frolov, MalboroLi@ircnet, munehiro@ircnet diff --git a/data/mimetypes/CMakeLists.txt b/data/mimetypes/CMakeLists.txt index 43a70d27b..ad2e333d1 100644 --- a/data/mimetypes/CMakeLists.txt +++ b/data/mimetypes/CMakeLists.txt @@ -1,18 +1,18 @@ IF(KDE4_FOUND) include(MacroEnsureVersion) - macro_ensure_version("4.2.0" ${KDE_VERSION} KDE_4_2_FOUND) + macro_ensure_version("4.2.0" ${KDE_VERSION} KDE_4_2_FOUND) # for KDE 4.2 we require at least version 0.23 - IF(KDE_4_2_FOUND) - set(SHARED_MIME_INFO_MINIMUM_VERSION "0.23") - ENDIF(KDE_4_2_FOUND) + IF(KDE_4_2_FOUND) + set(SHARED_MIME_INFO_MINIMUM_VERSION "0.23") + ENDIF(KDE_4_2_FOUND) - # now to shared mime info - find_package(SharedMimeInfo) + # now to shared mime info + find_package(SharedMimeInfo) - IF(SHARED_MIME_INFO_FOUND AND IS_DIRECTORY ${XDG_MIME_INSTALL_DIR}) - install(FILES kvirc.xml DESTINATION ${XDG_MIME_INSTALL_DIR}) - update_xdg_mimetypes(${XDG_MIME_INSTALL_DIR}) + IF(SHARED_MIME_INFO_FOUND AND IS_DIRECTORY ${XDG_MIME_INSTALL_DIR}) + install(FILES kvirc.xml DESTINATION ${XDG_MIME_INSTALL_DIR}) + update_xdg_mimetypes(${XDG_MIME_INSTALL_DIR}) ENDIF(SHARED_MIME_INFO_FOUND AND IS_DIRECTORY ${XDG_MIME_INSTALL_DIR}) ENDIF(KDE4_FOUND) diff --git a/data/resources_win32/auto-generated/kvilib-resource.h b/data/resources_win32/auto-generated/kvilib-resource.h index 6be388f45..d190890c2 100644 --- a/data/resources_win32/auto-generated/kvilib-resource.h +++ b/data/resources_win32/auto-generated/kvilib-resource.h @@ -3,7 +3,7 @@ // Used by kvilib.rc // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 101 diff --git a/data/resources_win32/auto-generated/kvilib.rc b/data/resources_win32/auto-generated/kvilib.rc index 144354f2a..d8853c43e 100644 --- a/data/resources_win32/auto-generated/kvilib.rc +++ b/data/resources_win32/auto-generated/kvilib.rc @@ -27,18 +27,18 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT // TEXTINCLUDE // -1 TEXTINCLUDE +1 TEXTINCLUDE BEGIN "resource.h\0" END -2 TEXTINCLUDE +2 TEXTINCLUDE BEGIN "#include ""afxres.h""\r\n" "\0" END -3 TEXTINCLUDE +3 TEXTINCLUDE BEGIN "\r\n" "\0" diff --git a/data/resources_win32/auto-generated/kvirc-auto-resource.h b/data/resources_win32/auto-generated/kvirc-auto-resource.h index 07c9fff89..314774581 100644 --- a/data/resources_win32/auto-generated/kvirc-auto-resource.h +++ b/data/resources_win32/auto-generated/kvirc-auto-resource.h @@ -4,7 +4,7 @@ // // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 101 diff --git a/data/resources_win32/auto-generated/kvirc-auto.rc b/data/resources_win32/auto-generated/kvirc-auto.rc index 94d30755a..0cae8f1c5 100644 --- a/data/resources_win32/auto-generated/kvirc-auto.rc +++ b/data/resources_win32/auto-generated/kvirc-auto.rc @@ -27,18 +27,18 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT // TEXTINCLUDE // -1 TEXTINCLUDE +1 TEXTINCLUDE BEGIN "resource1.h\0" END -2 TEXTINCLUDE +2 TEXTINCLUDE BEGIN "#include ""afxres.h""\r\n" "\0" END -3 TEXTINCLUDE +3 TEXTINCLUDE BEGIN "\r\n" "\0" diff --git a/data/resources_win32/auto-generated/modules/resource.h b/data/resources_win32/auto-generated/modules/resource.h index 9dc5eca1e..065b16bae 100644 --- a/data/resources_win32/auto-generated/modules/resource.h +++ b/data/resources_win32/auto-generated/modules/resource.h @@ -4,7 +4,7 @@ // // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 101 diff --git a/data/resources_win32/auto-generated/modules/winamp-resource.h b/data/resources_win32/auto-generated/modules/winamp-resource.h index 6be388f45..d190890c2 100644 --- a/data/resources_win32/auto-generated/modules/winamp-resource.h +++ b/data/resources_win32/auto-generated/modules/winamp-resource.h @@ -3,7 +3,7 @@ // Used by kvilib.rc // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 101 diff --git a/data/resources_win32/auto-generated/modules/winamp.rc b/data/resources_win32/auto-generated/modules/winamp.rc index eece9c44e..6095877d8 100644 --- a/data/resources_win32/auto-generated/modules/winamp.rc +++ b/data/resources_win32/auto-generated/modules/winamp.rc @@ -27,18 +27,18 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT // TEXTINCLUDE // -1 TEXTINCLUDE +1 TEXTINCLUDE BEGIN "resource.h\0" END -2 TEXTINCLUDE +2 TEXTINCLUDE BEGIN "#include ""afxres.h""\r\n" "\0" END -3 TEXTINCLUDE +3 TEXTINCLUDE BEGIN "\r\n" "\0" diff --git a/data/resources_win32/kvirc.rc b/data/resources_win32/kvirc.rc index 85c11aa4e..3232417a0 100644 --- a/data/resources_win32/kvirc.rc +++ b/data/resources_win32/kvirc.rc @@ -17,12 +17,12 @@ IDD_ICON5 ICON DISCARDABLE "kva.ico" // TEXTINCLUDE
//
-1 TEXTINCLUDE DISCARDABLE
+1 TEXTINCLUDE DISCARDABLE
BEGIN
"resource.h\0"
END
-2 TEXTINCLUDE DISCARDABLE
+2 TEXTINCLUDE DISCARDABLE
BEGIN
"\r\n"
"\0"
diff --git a/data/resources_win32/resource.h b/data/resources_win32/resource.h index 87135009f..92e486eac 100644 --- a/data/resources_win32/resource.h +++ b/data/resources_win32/resource.h @@ -9,7 +9,7 @@ #define IDD_ICON5 104 // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 101 @@ -4,7 +4,7 @@ 1.2 Why KVIrc is not totally integrated in KDE ? -2. COMPILATION +2. COMPILATION 2.1 I can't compile kvirc from svn, what's wrong? 2.2 Internal Compiler Errors ? @@ -13,7 +13,7 @@ 2.4 I got 'amarokInterface.cpp:29:31: amarokInterface.moc: No such file or directory'. Whats going wrong? -3. INSTALLATION +3. INSTALLATION 3.1 There is a problem during package installation/creation file /usr/share/services/irc.protocol from install @@ -271,7 +271,7 @@ is almost nothing you can do about that... UTF-8 is the best encoding we can get on IRC. Try to convince - other people to use it :) + other people to use it :) 4.5 I can't connect to an IPV6 server, what's wrong ? @@ -284,7 +284,7 @@ Is the IPV6 support enabled in your kvirc executable ? To find it out , try - /echo $features + /echo $features in the KVIrc commandline. You should get a comma separated list of features compiled in the executable. If the list contains "IPv6" then @@ -353,7 +353,7 @@ only once in a while. If you really need to see the logs in real time then you can explicitly flush the log files by scripting. Just add a script like this to your OnKVIrcStartup event: - + timer(flushlogfiles,30000) { foreach(%x,$window.list(all,any)) @@ -365,7 +365,7 @@ } } } - + The script above will flush all the log files every 30 seconds. You may remove the echo statement if you're annoyed by the output :) @@ -390,7 +390,7 @@ Use /server -s <servername> It should work also over IPV6. If it doesn't work then your executable might have no SSL support compiled in. - To find it out type + To find it out type /echo $features @@ -437,9 +437,9 @@ of text transformation engines. You can access the list of the engines by clicking the button with the yellow lock in the upper right corner of the window. In the pane that will appear select "use text transformation" - and then choose one of the available engines. - The Mircryption engine is an implementation of the mircryption protocol and - supports both ECB and CBC mode. There is also a wide variety of Rijndael based encryption + and then choose one of the available engines. + The Mircryption engine is an implementation of the mircryption protocol and + supports both ECB and CBC mode. There is also a wide variety of Rijndael based encryption engies as well as some funky other text transform tricks. Most of the engines will need a pair of keys to encrypt and decrypt text and in most cases you will use the same key for both encrypting and @@ -496,7 +496,7 @@ To keep the channels and queries open you just need to select the relative options in the "Connection" page of the options dialog (on unexpected disconnect: "Keep channels open" an/or "Keep queries open"). - + Then you might also select "Automatically reconnect", "Rejoin channels after reconnect" and "Reopen queries after reconnect" to bring your "dead windows" to life again :) @@ -561,7 +561,7 @@ When transferring files to other KVIrc clients you may also try the DCC RSEND protocol instead of DCC SEND. It will ask the remote end to listen instead. - + ------------------------------------------------------------------------------- 6. APPAREANCE ------------------------------------------------------------------------------- @@ -583,13 +583,13 @@ KVIrc should be able to detect such situations and automatically suggest the re-installation of the default script. -6.3 Does KVIrc support Themes? +6.3 Does KVIrc support Themes? Yes, KVIrc has introduced a Theme Manager. You can find it in the Option dialog. - From there you can change the way KVIrc looks: fonts, colors, windows behaviour, - icons, taskbars, and so on. - Once you have changed the theme, you can export it and share with your friends, - or send it to the KVIrc staff to see it published on the web site. + From there you can change the way KVIrc looks: fonts, colors, windows behaviour, + icons, taskbars, and so on. + Once you have changed the theme, you can export it and share with your friends, + or send it to the KVIrc staff to see it published on the web site. 6.4 I hate all that colors, what can I do about it ? diff --git a/doc/INSTALL-Win32.txt b/doc/INSTALL-Win32.txt index ec46d75b5..56a82c81f 100644 --- a/doc/INSTALL-Win32.txt +++ b/doc/INSTALL-Win32.txt @@ -75,7 +75,7 @@ Requisites: [Installer packages creator; needed if you want to create an installer package for kvirc] Get it at http://nsis.sourceforge.net/Download ; the package you want is called "nsis-2.45-setup.exe" (version numbers may vary). Please note that the kvirc nsis script doesn't support -DCOEXISTENCE cmake flag by now, so you'll need to disable it before compiling if you want to create an installer package. - + Further reccomended download if you plan to develop KVIrc: - GNU Debugger (gdb) for Win32: @@ -96,7 +96,7 @@ Then install the rest of the packages. Remember to write down the installation p Now you have to define some environmental variable: CMAKE_INCLUDE_PATH - Set it to the include subdirectories of the paths where you installed mingw, zlib and openssl. Example: + Set it to the include subdirectories of the paths where you installed mingw, zlib and openssl. Example: C:\ZLIB\INCLUDE;C:\MINGW\INCLUDE;C:\openssl\include CMAKE_LIBRARY_PATH @@ -164,7 +164,7 @@ Getting phonon to work with mplayer frontend VideoLAN: you need to use svn version; more info at http://www.videolan.org/ (untested with kvirc) Please note that to use the mplayer backend you have to install smplayer to C:\Program Files\SMPlayer\ . If your are using a not-english localized version of windows, you'll probably need to change the proposed path to this one during installation. - Get latest phonon-vlc-mplayer source from svn -- This frontend wants to install the mingwm10.dll library in its binary output directory; you'll probably need to fit the default path in trunk/CMakelists.txt from +- This frontend wants to install the mingwm10.dll library in its binary output directory; you'll probably need to fit the default path in trunk/CMakelists.txt from install(FILES C:/mingw/bin/mingwm10.dll DESTINATION ${BIN_INSTALL_DIR}) to the right path where you have installed mingw in your system. - go to /trunk/build/ and run: diff --git a/doc/README b/doc/README index 2b8a54219..18c5677e3 100644 --- a/doc/README +++ b/doc/README @@ -11,7 +11,7 @@ Notable new features of this release include: - A port of the system to the new qt4 libraries, that includes a better support for native-looking widgets under unix, windows and macosx; - a totally rewritten MDI subsystem, with the look and feel of your os; -- Compatibility to recent technologies: dbus for inter process communications, +- Compatibility to recent technologies: dbus for inter process communications, mpris for media players control and info reporting, phonon for direct media playback, and support for specific environments like kde4; - a new upnp module to control and remotely map your router ports for dcc; @@ -295,7 +295,7 @@ This release was possible thanks to the contribution of many people. The list includes but is not limited to: Triskelios, Jan Wagner (spion), Juanjo Alvarez (Kane), Andrea Parrella (Yap), Luk De Ketelaere (Balboy), Sara D'Alia (Sbrokka), Ted Podgurski (alch3m1st), Ciro Guariglia (d3vah), -Christoph Thielecke (Crissi), Eva Schaller (Penny), Niklas Luerßen (Tequila) +Christoph Thielecke (Crissi), Eva Schaller (Penny), Niklas Luer�en (Tequila) Olle Hallnas (Crocodile), Francesco Meloni (Princo), Alessandro Rossini (Aronnax), Alex Grijalba Martinez (SuD), SuperbepS, Thilo Schulz (Thilo), Dworf, Jorma Tuomainen (Wiza), Michele Pinassi (O-Zone), Paolo Sammicheli (XDatap1), diff --git a/doc/hackers.guide.txt b/doc/hackers.guide.txt index 9a29950b1..e13ed0618 100644 --- a/doc/hackers.guide.txt +++ b/doc/hackers.guide.txt @@ -303,12 +303,12 @@ exception of the first one) but it is highly appreciated. - INDENT WITH TABS (the only MANDATORY rule) Go back to the line above and read it again. - + INDENT, TABS. Tabs can be assigned any number of spaces in any decent source code editor. - + Actually 95% of the KVIrc code is indented in BSD/Allman style but the K&R style is also tolerated. @@ -317,7 +317,7 @@ exception of the first one) but it is highly appreciated. g_* : global variables m_* : member variables no prefix : any other scope - + [prefix]pName : pointer to something named Name [prefix]iName : integer (signed) variable named Name [prefix]uName : unsigned integer @@ -331,7 +331,7 @@ exception of the first one) but it is highly appreciated. Do NOT name a member or global variable i. So finally: - + g_pApp is a global pointer to the application object m_pData is a member variable pointer to some data object m_szName is a string member variable named Name @@ -361,11 +361,11 @@ exception of the first one) but it is highly appreciated. The class names start with an upper case letter. In most cases there is a Kvi prefix and the rest follows the rule for function names. KviApp, KviConsole, KviWindow, KviStr, KviConfig, KviUserParser ... - + If possible, do not use "shortcut" names. Actually KviCommand is preferred over KviCmd unless the KviCmd class is REALLY widely used across the source (like KviStr for example). - + This helps a lot in remembering the class names: with the shortcuts you're often forced to open the corresponding header file to look up which letters have been left off... @@ -427,7 +427,7 @@ This is the list of the various string types used in KVIrc. (const) char * The classic C null terminated string. - + KviStr The basic KVIrc string class. It has been first implemented as a hack around various bugs of the original QString class (the NOT unicode one @@ -452,7 +452,7 @@ QString is not an issue, you must take care when passing QString objects between concurrent threads. -(const) QChar * +(const) QChar * The array of Qt chars. This is usually obtained by callling KviQString::nullTerminatedArray() which itself is a hack... This array is used in some functions that were written for @@ -628,12 +628,12 @@ KviServerParser * g_pServerParser; The one and only server parser Declared in "kvi_sparser.h" Almost always set (critical phases at early startup and late shutdown) - + KviFrame * g_pFrame; The one and only main window Declared in "kvi_frame.h" Almost always set (critical phases at early startup and late shutdown) - + KviWindow * g_pActiveWindow; The one and only active window Declared in "kvi_window.h" @@ -720,7 +720,7 @@ Rule for safe text output ------------------------------------------------------------------------------- If the format string you're going to output is not constant (i.e. it -comes from the server) you MUST use KviWindow::outputNoFmt() instead +comes from the server) you MUST use KviWindow::outputNoFmt() instead of KviWindow::output(). BAD: diff --git a/doc/scriptexamples/class1.kvs b/doc/scriptexamples/class1.kvs index 6098000dd..0d4e8fc08 100644 --- a/doc/scriptexamples/class1.kvs +++ b/doc/scriptexamples/class1.kvs @@ -32,7 +32,7 @@ class (B,A) class (C,B) { - # Derived from B : inherits $B::virtual and + # Derived from B : inherits $B::virtual and # overrides $B::function (that is $A::function) function { diff --git a/doc/scriptexamples/exprtest.kvs b/doc/scriptexamples/exprtest.kvs index c07d199d5..893631f59 100644 --- a/doc/scriptexamples/exprtest.kvs +++ b/doc/scriptexamples/exprtest.kvs @@ -2,7 +2,7 @@ alias(exprtest) { - %txt = "Testing expression:" $0; + %txt = "Testing expression:" $0; %ret = ${ eval "return \$(" $0 ")"; } if(%ret != $1) diff --git a/doc/scriptexamples/mail.kvs b/doc/scriptexamples/mail.kvs index 94fb70e23..13ab836a6 100644 --- a/doc/scriptexamples/mail.kvs +++ b/doc/scriptexamples/mail.kvs @@ -33,14 +33,14 @@ exec -x -k=60000 -t -e ("telnet my.mail.server.com 25") # Returning an empty string does not write to stdin return } - + if($0 == "stderr") { # This is our stderr handler.. just in case something goes wrong echo "[stderr] $1" return } - + if($0 == "terminated") { echo "[process terminated]" diff --git a/doc/scriptexamples/minesweeper.kvs b/doc/scriptexamples/minesweeper.kvs index 24f3b0cb0..467bda862 100644 --- a/doc/scriptexamples/minesweeper.kvs +++ b/doc/scriptexamples/minesweeper.kvs @@ -61,7 +61,7 @@ class(minesweeper,widget) { %row = $rand($($$->%rows - 1)) %col = $rand($($$->%cols - 1)) - } + } $$->%label{%row,%col}->%bIsMine = 1 # increase the mine count for the adiacent cells if(%row > 0) @@ -127,5 +127,5 @@ alias(mines) { %m = $new(minesweeper) %m->$show() - + } diff --git a/doc/scriptexamples/mp3_kdemediaplayers.kvs b/doc/scriptexamples/mp3_kdemediaplayers.kvs index 98be29e93..c46a08ade 100644 --- a/doc/scriptexamples/mp3_kdemediaplayers.kvs +++ b/doc/scriptexamples/mp3_kdemediaplayers.kvs @@ -18,7 +18,7 @@ %Mtime++ %Stime-=60 } - + %Htime=0 while(%Mtime > 59) { @@ -36,32 +36,32 @@ } - + if (%Htime > 0) - %Ctime = $str.append %Htime:%Mtime:%Stime - - + %Ctime = $str.append %Htime:%Mtime:%Stime + + - if (%Mtime > 0 && %Htime < 1) + if (%Mtime > 0 && %Htime < 1) %Ctime = $str.append %Mtime:%Stime - - - - if (%Mtime < 1 && %Htime < 1) + + + + if (%Mtime < 1 && %Htime < 1) %Ctime = %Stime - + me muckelt grad [$mp3player.gettitle @ %Xmms_play - $($mp3player.getrate/1000) kbps - $($mp3player.getfreq/1000) kHz - seit: %Ctime (h:m:s)] - } + } else if(%Postfix == %Cda_postfix) { me muckelt grad [$mp3player.gettitle - Audio CD] - } + } + - else { - + if ($mp3player.getchannels == 2) %Channels = Stereo else @@ -82,9 +82,9 @@ %size = $file.size("$mp3player.getfilename") %msize = $(%size / (1024*1024)) %ksize = $((%size - ((%size / (1024*1024)) * 1024 * 1024) - (%size % 1024)) / 1024) - + %bsize = $(%size % 1024) - + if(%msize > 0) { %size = "%msize MByte %ksize KByte" @@ -97,7 +97,7 @@ } } if ($mp3player.isplaying){ - + if($mp3player.getmp3tag_artist != ""){ %outartist= $mp3player.getmp3tag_artist } @@ -116,41 +116,41 @@ else { if (%outtitle == ""){ %outartisttitle="["%outartist"]" - } + } else { %outartisttitle="["%outtitle"]" } } - - if (mp3player.getmp3tag_album !=""){ + + if (mp3player.getmp3tag_album !=""){ %outalbum =" - [Album: "$mp3player.getmp3tag_album"]" - } + } else { %outalbum ="" - } - - if (mp3player.getmp3tag_genre !=""){ + } + + if (mp3player.getmp3tag_genre !=""){ %outgenre =" - [Genre: "$mp3player.getmp3tag_genre"]" - } + } else { %outgenre ="" - } - + } + - if ($mp3player.getmp3tag_comment !=""){ + if ($mp3player.getmp3tag_comment !=""){ %outcomment =" - [Comment: "$mp3player.getmp3tag_comment"]" } else { %outcomment="" } - if ($mp3player.getmp3tag_version != ""){ + if ($mp3player.getmp3tag_version != ""){ %outmp3tagversion = "MPEG"$mp3player.getmp3tag_version } else { %outmp3tagversion="" } - if ($mp3player.getmp3tag_layer != ""){ + if ($mp3player.getmp3tag_layer != ""){ %outmp3taglayer = "Layer"$mp3player.getmp3tag_layer } else { @@ -169,35 +169,35 @@ } } - - + + %rate = $($mp3player.getrate/1000) - if (%rate != 0){ + if (%rate != 0){ %outrate=" - ["%rate KBps"]" } else { %outrate="" } - if (%Frequ2 != 0){ + if (%Frequ2 != 0){ %outfrequ2=" - ["%Frequ2 KHz"]" - } + } else { %outfrequ2="" } - if (%Channels != 0){ + if (%Channels != 0){ %outchannels = " - ["%Channels"]" } else { %outchannels="" } - if (%size != 0){ + if (%size != 0){ %outsize = " - ["%size"]" } else { %outsize="" } - me muckelt grad %outartisttitle %outalbum %outgenre %outcomment %outmp3tagversionlayer %outrate %outfrequ2 - [%mins:%secs1%secs2 min of %tmins:%tsecs1%tsecs2 min] - [Player: $mp3player.getplayer ] + me muckelt grad %outartisttitle %outalbum %outgenre %outcomment %outmp3tagversionlayer %outrate %outfrequ2 - [%mins:%secs1%secs2 min of %tmins:%tsecs1%tsecs2 min] - [Player: $mp3player.getplayer ] } } if (!$mp3player.isplaying){ diff --git a/doc/scriptexamples/mp3info.kvs b/doc/scriptexamples/mp3info.kvs index b53241456..d32dcbf38 100644 --- a/doc/scriptexamples/mp3info.kvs +++ b/doc/scriptexamples/mp3info.kvs @@ -16,7 +16,7 @@ %Mtime++ %Stime-=60 } - + %Htime=0 while(%Mtime > 59) { @@ -34,20 +34,20 @@ } - + if (%Htime > 0) - %Ctime = $str.append %Htime:%Mtime:%Stime - - + %Ctime = $str.append %Htime:%Mtime:%Stime + - if (%Mtime > 0 && %Htime < 1) + + if (%Mtime > 0 && %Htime < 1) %Ctime = $str.append %Mtime:%Stime - - - - if (%Mtime < 1 && %Htime < 1) + + + + if (%Mtime < 1 && %Htime < 1) %Ctime = %Stime - + me has currently [$mp3player.gettitle @ %Xmms_play - $($mp3player.getrate/1000) kbps - $($mp3player.getfreq/1000) kHz - seit: %Ctime (h:m:s)] @@ -55,13 +55,13 @@ else if(%Postfix == %Cda_postfix) { - %Xmms_play=$mp3player.getfilename; + %Xmms_play=$mp3player.getfilename; } - + else { - + if ($mp3player.getchannels == 2) { %Channels = Stereo } @@ -84,9 +84,9 @@ %size = $file.size("$mp3player.getfilename") %msize = $(%size / (1024*1024)) %ksize = $((%size - ((%size / (1024*1024)) * 1024 * 1024) - (%size % 1024)) / 1024) - + %bsize = $(%size % 1024) - + if(%msize > 0){ %size = "%msize MByte %ksize KByte" diff --git a/doc/scriptexamples/objectsdumptree.kvs b/doc/scriptexamples/objectsdumptree.kvs index 336bfdf12..a74cad825 100644 --- a/doc/scriptexamples/objectsdumptree.kvs +++ b/doc/scriptexamples/objectsdumptree.kvs @@ -3,8 +3,8 @@ alias(dump) # Objects Tree Dump script # Written by Noldor & Grifisx (2005) # This script allow you to see all kvirc's interface objects in a listview. - # It's just an alias, install it and "/dump" =) EnjoY! - + # It's just an alias, install it and "/dump" =) EnjoY! + class (mylistview,listview) { constructor @@ -32,7 +32,7 @@ alias(dump) %tmp_property=$new(listviewitem,$$->$parent->%property) $$->$parent->%property->$setTooltip(%gerarchia) %ger=$str.replace(%gerarchia,",","->") - eval \%Wrapper\=\$new\(wrapper,0,test,%ger\) + eval \%Wrapper\=\$new\(wrapper,0,test,%ger\) $$->$parent->%line_ger->$setText(%ger) if (!%Wrapper) { @@ -64,7 +64,7 @@ alias(dump) @%list_name[%i]->$setRenameEnabled(2) %i++; } - + } killPropertyChildren() { @@ -82,21 +82,21 @@ alias(dump) %value=$2 eval \%Wrapper\-\>\$setProperty\(%property\,%value\) } - + } class (dump,widget) { constructor - { + { %Flag=0 @$resize(800,600) @%tree[]=$str.split("\|",$objects.dump(0)) - @$setCaption("Kvir Objects Dump") + @$setCaption("Kvir Objects Dump") @%lay=$new(layout,$$) @%dump=$new(mylistview,$$) - @%tree=$new(object) + @%tree=$new(object) @%property=$new(listview,$$) - + privateimpl(@%property,itemRenamedEvent) { $$->$parent->%dump->$itemRenamed($0,$1,$2) @@ -107,7 +107,7 @@ alias(dump) @%dump->$addcolumn("Kvirc Widget Objects Tree",300) @%dump->$setRootIsDecorated(1) @%lay->$addwidget(@%dump,0,0) - @%lay->$addwidget(@%property,0,1) + @%lay->$addwidget(@%property,0,1) @%line_find=$new(lineedit,$$) @%line_ger=$new(lineedit,$$) @%lay->$addwidget(@%line_find,1,0) diff --git a/doc/themes.howto.txt b/doc/themes.howto.txt index ac04de35c..be6cad6e0 100644 --- a/doc/themes.howto.txt +++ b/doc/themes.howto.txt @@ -21,7 +21,7 @@ you can edit it manually if you want to make some changes. (The %20 strings are url-encoded spaces, KVirc will accept also plain spaces). themedata.kvc contains the visual settings. It looks more or less like this: - + .... uintGlobalTransparencyParentFadeFactor=10 boolObtainGlobalBackgroundFromKde=false @@ -35,7 +35,7 @@ themedata.kvc contains the visual settings. It looks more or less like this: iccolor2=0,0,200 mirccolor13=200,0,200 .... - + You can *carefully* edit it by hand, if you wish. Each option starts with a prefix that defines the "type" of that option. @@ -69,7 +69,7 @@ following simple rules: the images will look bad - the image format must be *.png: it is the only format granted to be loaded by all the versions of KVIrc. - + If you don't want to "override" an image (and thus you want to leave the "default" one) you can delete it from the theme directory. KVIrc will fallback to the default image shipped in the distribution. @@ -84,7 +84,7 @@ Hints: you should reflect it when painting. This small script will show you the associations between the icons and their names: - + %i = 0 do { %name = $iconname(%i) @@ -92,13 +92,13 @@ Hints: %i++ } while(%name != "") - - The id's of the icons are just their ZERO_BASED indexes. + - The id's of the icons are just their ZERO_BASED indexes. The kvi_smallicon_<number>.png files are numbered in increasing order and contain 16 images each one. kvi_smallicon_00.png contains images from 0 to 15, kvi_smallicon_01.png contains images 16 to 31 etc... Thus the third icon in kvi_smallicon_02.png has id (2*16)+(3)-1 = 34. - + diff --git a/doc/translations.howto.txt b/doc/translations.howto.txt index 3964187e2..caf1700bc 100644 --- a/doc/translations.howto.txt +++ b/doc/translations.howto.txt @@ -5,7 +5,7 @@ Step 0: Getting the right sources. First of all you need the SVN version of kvirc. To obtain the SVN version you can follow the instructions on http://www.kvirc.net/?id=svn - + The translation stuff is in kvirc/po/kvirc . @@ -119,7 +119,7 @@ similar sentences have been translated in the KDE *.po files: there should be a hungarian translation file for KDE available on the KDE svn. Since many of the modules have their own translation files then -the procedure above may (but not must) be repeated for the po/modules/*/ +the procedure above may (but not must) be repeated for the po/modules/*/ subdirectories. When you're satisfied with your translation you may send your *.po files to diff --git a/po/msgcheckformat.c b/po/msgcheckformat.c index 29bbe7bd6..23b86ac88 100644 --- a/po/msgcheckformat.c +++ b/po/msgcheckformat.c @@ -102,7 +102,7 @@ static void process_message(po_message_t m) } } } - + if(*p || *q) { print_error(m,msgid,msgstr,"Mismatched number of format characters"); @@ -110,7 +110,7 @@ static void process_message(po_message_t m) } static void process_messages(po_message_iterator_t it) -{ +{ po_message_t m = po_next_message(it); while(m) { diff --git a/src/kvilib/config/kvi_defaults.h b/src/kvilib/config/kvi_defaults.h index 2ddc2843f..b5ce87c9b 100644 --- a/src/kvilib/config/kvi_defaults.h +++ b/src/kvilib/config/kvi_defaults.h @@ -55,7 +55,7 @@ #include "kvi_settings.h" -#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) +#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) #define KVI_HOME_CONFIG_FILE_NAME "kvirc4.ini" #else #define KVI_HOME_CONFIG_FILE_NAME ".kvirc4.rc" diff --git a/src/kvilib/config/kvi_settings.h b/src/kvilib/config/kvi_settings.h index 63f1e3295..93fda5040 100644 --- a/src/kvilib/config/kvi_settings.h +++ b/src/kvilib/config/kvi_settings.h @@ -72,7 +72,7 @@ #else #define KVILIB_API __declspec(dllimport) #endif - + #ifdef __KVIRC__ #define KVIRC_API __declspec(dllexport) #else diff --git a/src/kvilib/core/kvi_malloc.h b/src/kvilib/core/kvi_malloc.h index 9b04fb6c7..cc5f1a4a4 100644 --- a/src/kvilib/core/kvi_malloc.h +++ b/src/kvilib/core/kvi_malloc.h @@ -35,7 +35,7 @@ #ifdef COMPILE_MEMORY_PROFILE - #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) + #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) #error "This stuff should be never compiled on Windows" #endif @@ -60,7 +60,7 @@ // Want to check all the pointers #define kvi_malloc(__size_) kvi_safe_malloc(__size_) #define kvi_realloc(__ptr_,__size_) kvi_safe_realloc((void *)__ptr_,__size_) - + #ifndef _KVI_MALLOC_CPP_ extern void outOfMemory(); #endif diff --git a/src/kvilib/core/kvi_pointerhashtable.h b/src/kvilib/core/kvi_pointerhashtable.h index 0ddaf614e..61c5bd0bd 100644 --- a/src/kvilib/core/kvi_pointerhashtable.h +++ b/src/kvilib/core/kvi_pointerhashtable.h @@ -363,7 +363,7 @@ public: } return 0; } - + /** * \brief Returns the item associated to the key hKey * @@ -512,7 +512,7 @@ public: return true; } } - } + } } return false; } @@ -643,7 +643,7 @@ public: } return 0; } - + /** * \brief Returns the key pointed by the hash table iterator. * @@ -868,7 +868,7 @@ public: } return bRet; } - + /** * \brief Moves the iterator to the last element of the hash table. * @@ -936,7 +936,7 @@ public: } return bRet; } - + /** * \brief Moves the iterator to the next element of the hash table. * @@ -949,7 +949,7 @@ public: { return moveNext(); } - + /** * \brief Moves the iterator to the previous element of the hash table. * @@ -1026,7 +1026,7 @@ public: { return m_pIterator ? m_pIterator->current()->data() : NULL; } - + /** * \brief Returs the key pointed by the iterator * @@ -1065,7 +1065,7 @@ public: m_pIterator = NULL; moveFirst(); } - + /** * \brief Destroys the iterator */ diff --git a/src/kvilib/core/kvi_pointerlist.h b/src/kvilib/core/kvi_pointerlist.h index d13d27346..5f9c48730 100644 --- a/src/kvilib/core/kvi_pointerlist.h +++ b/src/kvilib/core/kvi_pointerlist.h @@ -210,7 +210,7 @@ public: m_pNode = m_pList->m_pHead; return m_pNode != NULL; } - + /** * \brief Moves the iterator to the last element of the list. * @@ -477,7 +477,7 @@ public: { // our element is greater, n->m_pData goes first KviPointerListNode * pNext = n->m_pNext; - n->m_pPrev = m_pAux->m_pPrev; // his prev becomes + n->m_pPrev = m_pAux->m_pPrev; // his prev becomes n->m_pNext = m_pAux; if(m_pAux->m_pPrev) m_pAux->m_pPrev->m_pNext = n; @@ -509,7 +509,7 @@ public: src->m_pTail = NULL; src->m_uCount = 0; } - + /** * \brief Swap the lists * \param src The list to swap with @@ -549,7 +549,7 @@ public: do { carry.grabFirstAndPrepend(this); - + for(counter = &tmp[0];counter != fill && !counter->isEmpty();++counter) { counter->merge(&carry); diff --git a/src/kvilib/core/kvi_strasm.h b/src/kvilib/core/kvi_strasm.h index e8fb8577e..0060ac0fa 100644 --- a/src/kvilib/core/kvi_strasm.h +++ b/src/kvilib/core/kvi_strasm.h @@ -59,7 +59,7 @@ extern inline bool kvi_strEqualCS(const char * str1,const char * str2) return eax; } -extern inline bool kvi_strEqualCSN(const char * str1,const char * str2,int len) +extern inline bool kvi_strEqualCSN(const char * str1,const char * str2,int len) { register bool eax; __asm__ __volatile__ ( @@ -88,7 +88,7 @@ extern inline bool kvi_strEqualCSN(const char * str1,const char * str2,int len) // OPTIMIZATION // The following two functions are used to compare a variable string with one in that // only A-Z<->a-z case insensivity is significant. -// For example +// For example // kvi_strEqualNoLocalCI("a string that does not contain any strange char",str2) // will always give the correct result // These will NOT work with localizable characters: diff --git a/src/kvilib/core/kvi_string.h b/src/kvilib/core/kvi_string.h index 9f61ad288..6b32c2f8f 100644 --- a/src/kvilib/core/kvi_string.h +++ b/src/kvilib/core/kvi_string.h @@ -315,7 +315,7 @@ public: KviStr & replaceAll(const char c,const char *str); //same as above but with a string KviStr & replaceAll(const char *toFind,const char *str,bool bCaseS = true); - + KviStr & transliterate(const char * szToFind,const char * szReplacement); // Strips whitespace characters from beginning of this string. @@ -446,7 +446,7 @@ public: // returns an empty string... // this if often useful! static KviStr & emptyString(); - + //============================================================================= // Dead interface //============================================================================= diff --git a/src/kvilib/ext/kvi_msgtype.h b/src/kvilib/ext/kvi_msgtype.h index 275935d74..11b0e95cb 100644 --- a/src/kvilib/ext/kvi_msgtype.h +++ b/src/kvilib/ext/kvi_msgtype.h @@ -39,7 +39,7 @@ // 1 : Common activity // 2 : People talking // 3 : Response messages (whois , dns) -// 4 : +// 4 : // 5 : Highlighted text // FIXME: Check the message ranges!!! diff --git a/src/kvilib/ext/kvi_stringconversion.h b/src/kvilib/ext/kvi_stringconversion.h index 81e42abc7..2c2ecf443 100644 --- a/src/kvilib/ext/kvi_stringconversion.h +++ b/src/kvilib/ext/kvi_stringconversion.h @@ -37,7 +37,7 @@ #include <QString> -namespace KviStringConversion +namespace KviStringConversion { extern KVILIB_API void init(const QString& szGlobalDir,const QString& szLocalDir); @@ -47,7 +47,7 @@ namespace KviStringConversion extern KVILIB_API void encodePath(QStringList& buffer); extern KVILIB_API void decodePath(QStringList& buffer); - // bool <-> + // bool <-> extern KVILIB_API void toString(const bool bValue,QString &buffer); extern KVILIB_API bool fromString(const QString &szValue,bool &buffer); diff --git a/src/kvilib/ext/kvi_xlib.h b/src/kvilib/ext/kvi_xlib.h index 641de592d..7048fc673 100644 --- a/src/kvilib/ext/kvi_xlib.h +++ b/src/kvilib/ext/kvi_xlib.h @@ -33,7 +33,7 @@ // Someone has defined Bool ? #undef Bool #endif - + #include <X11/Xlib.h> // Too bad that X11/Xlib.h defines Bool, Error and Success... this basically diff --git a/src/kvilib/file/kvi_packagefile.h b/src/kvilib/file/kvi_packagefile.h index b7a6bba24..4da2a9c8e 100644 --- a/src/kvilib/file/kvi_packagefile.h +++ b/src/kvilib/file/kvi_packagefile.h @@ -156,7 +156,7 @@ public: * \return KviPackageWriter */ KviPackageWriter(); - + /** * \brief Destroys the object */ @@ -295,7 +295,7 @@ public: * \return KviPackageReader */ KviPackageReader(); - + /** * \brief Destroys the object */ diff --git a/src/kvilib/net/kvi_ssl.h b/src/kvilib/net/kvi_ssl.h index 9b92d1d84..c8fd4e5c5 100644 --- a/src/kvilib/net/kvi_ssl.h +++ b/src/kvilib/net/kvi_ssl.h @@ -72,7 +72,7 @@ public: const char * subjectOrganization(){ return dictEntry(m_pSubject,"O"); }; const char * subjectOrganizationalUnit(){ return dictEntry(m_pSubject,"OU"); }; const char * subjectCommonName(){ return dictEntry(m_pSubject,"CN"); }; - + const char * issuerCountry(){ return dictEntry(m_pIssuer,"C"); }; const char * issuerStateOrProvince(){ return dictEntry(m_pIssuer,"ST"); }; const char * issuerLocality(){ return dictEntry(m_pIssuer,"L"); }; diff --git a/src/kvilib/system/kvi_byteorder.h b/src/kvilib/system/kvi_byteorder.h index 8b0c2c3d4..b6b75b140 100644 --- a/src/kvilib/system/kvi_byteorder.h +++ b/src/kvilib/system/kvi_byteorder.h @@ -40,7 +40,7 @@ // Intel Stuff uses Little Endian // PPC is Big Endian // Universal binaries on MacOSX use both Big and Little Endian -// +// #ifdef BIG_ENDIAN_MACHINE_BYTE_ORDER #define kvi_localCpuToLittleEndian16(u) kvi_swap16((kvi_u16_t)(u)) diff --git a/src/kvilib/system/kvi_thread.h b/src/kvilib/system/kvi_thread.h index e7baae8df..a569e7668 100644 --- a/src/kvilib/system/kvi_thread.h +++ b/src/kvilib/system/kvi_thread.h @@ -78,7 +78,7 @@ #include <pthread.h> #include <errno.h> // for EBUSY - + // Mutex stuff #define kvi_mutex_t pthread_mutex_t #define kvi_threadMutexInit(_pMutex_t) pthread_mutex_init(_pMutex_t,0) @@ -91,23 +91,23 @@ } // Actually unused // #define kvi_threadMutexTryLock(_pMutex_t) pthread_mutex_trylock(_pMutex_t) - + // Thread stuff #define kvi_thread_t pthread_t - + inline bool kvi_threadCreate(kvi_thread_t *t,void * (*start_routine)(void *),void * arg) { pthread_attr_t a; pthread_attr_init(&a); pthread_attr_setinheritsched(&a,PTHREAD_INHERIT_SCHED); pthread_attr_setdetachstate(&a,PTHREAD_CREATE_DETACHED); - + int ret = pthread_create(t,&a,start_routine,arg); - + pthread_attr_destroy(&a); return (ret == 0); } - + // We don't care about exit codes at all #define kvi_threadExit() pthread_exit(0) #else @@ -129,23 +129,23 @@ }; // Actually unused // #define kvi_threadMutexTryLock(_pMutex_t) mutex_trylock(_pMutex_t) - + // Thread stuff #define kvi_thread_t thread_t - + inline bool kvi_threadCreate(kvi_thread_t *t,void * (*start_routine)(void *),void *arg) { return (thr_create(0,0,start_routine,arg,THR_DETACHED,t) == 0); } - + // 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!" #endif #endif -#endif - +#endif + class KVILIB_API KviMutex : public KviHeapObject { private: diff --git a/src/kvilib/tal/kvi_tal_listwidget.h b/src/kvilib/tal/kvi_tal_listwidget.h index c2a843e19..e3243f72d 100644 --- a/src/kvilib/tal/kvi_tal_listwidget.h +++ b/src/kvilib/tal/kvi_tal_listwidget.h @@ -50,7 +50,7 @@ signals: }; -class KVILIB_API KviTalListWidgetItem : public QListWidgetItem +class KVILIB_API KviTalListWidgetItem : public QListWidgetItem { public: KviTalListWidgetItem() @@ -70,10 +70,10 @@ public: KviTalListWidgetText(KviTalListWidget* listbox, const QString & text=QString()); KviTalListWidgetText(const QString & text=QString()); ~KviTalListWidgetText(); - + int height(const KviTalListWidget *) const; int width(const KviTalListWidget *) const; - + int rtti() const; enum { RTTI = 1 }; @@ -93,12 +93,12 @@ public: KviTalListWidgetPixmap(KviTalListWidget* listbox, const QPixmap &, const QString&); KviTalListWidgetPixmap(const QPixmap &, const QString&); ~KviTalListWidgetPixmap(); - + const QPixmap *pixmap() const { return ± } - + int height(const KviTalListWidget *) const; int width(const KviTalListWidget *) const; - + int rtti() const; enum { RTTI = 2 }; diff --git a/src/kvilib/tal/kvi_tal_windowstate.h b/src/kvilib/tal/kvi_tal_windowstate.h index 07a1f8775..7b2c1f177 100644 --- a/src/kvilib/tal/kvi_tal_windowstate.h +++ b/src/kvilib/tal/kvi_tal_windowstate.h @@ -28,7 +28,7 @@ #include "kvi_settings.h" #define QT_WINDOWSTATE_FLAGS Qt::WindowState - + #define QT_WINDOWSTATE_MAXIMIZED Qt::WindowMaximized #define QT_WINDOWSTATE_MINIMIZED Qt::WindowMinimized diff --git a/src/kvirc/kernel/kvi_actionmanager.cpp b/src/kvirc/kernel/kvi_actionmanager.cpp index 269c8b132..77108763a 100644 --- a/src/kvirc/kernel/kvi_actionmanager.cpp +++ b/src/kvirc/kernel/kvi_actionmanager.cpp @@ -87,14 +87,14 @@ KviActionManager::~KviActionManager() ++it; } delete m_pActions; - + delete m_pCategories; } void KviActionManager::load(const QString &szFileName) { KviConfig cfg(szFileName,KviConfig::Read); - + KviConfigIterator it(*(cfg.dict())); while(it.current()) { @@ -110,7 +110,7 @@ void KviActionManager::save(const QString &szFileName) { KviConfig cfg(szFileName,KviConfig::Write); cfg.clear(); - + KviPointerHashTableIterator<QString,KviAction> it(*m_pActions); while(KviAction * a = it.current()) { @@ -137,7 +137,7 @@ void KviActionManager::killAllKvsUserActions() } ++it; } - + dying.clear(); // bye :) } diff --git a/src/kvirc/kernel/kvi_actionmanager.h b/src/kvirc/kernel/kvi_actionmanager.h index 79fbccee4..8c7d43d4e 100644 --- a/src/kvirc/kernel/kvi_actionmanager.h +++ b/src/kvirc/kernel/kvi_actionmanager.h @@ -48,7 +48,7 @@ protected: KviPointerHashTable<QString,KviAction> * m_pActions; KviPointerHashTable<QString,KviActionCategory> * m_pCategories; static bool m_bCustomizingToolBars; - + // action categories static KviActionCategory * m_pCategoryIrc; static KviActionCategory * m_pCategoryGeneric; @@ -73,11 +73,11 @@ public: static KviActionCategory * categoryGUI(){ return m_pCategoryGUI; }; static KviActionCategory * categoryChannel(){ return m_pCategoryChannel; }; static KviActionCategory * categoryTools(){ return m_pCategoryTools; }; - + KviPointerHashTable<QString,KviAction> * actions(){ return m_pActions; }; KviActionCategory * category(const QString &szName); KviPointerHashTable<QString,KviActionCategory> * categories(){ return m_pCategories; }; - + void killAllKvsUserActions(); static KviCustomToolBar * currentToolBar(){ return m_pCurrentToolBar; }; diff --git a/src/kvirc/kernel/kvi_app.h b/src/kvirc/kernel/kvi_app.h index b4995064e..b836025e3 100644 --- a/src/kvirc/kernel/kvi_app.h +++ b/src/kvirc/kernel/kvi_app.h @@ -257,7 +257,7 @@ public: void fillRecentServersPopup(KviTalPopupMenu * m); void fillRecentNicknamesPopup(KviTalPopupMenu * m,KviConsole * pConsole); void fillRecentChannelsPopup(KviTalPopupMenu * m,KviConsole * pConsole); -// +// void autoConnectToServers(); void checkSuggestRestoreDefaultScript(); diff --git a/src/kvirc/kernel/kvi_asynchronousconnectiondata.h b/src/kvirc/kernel/kvi_asynchronousconnectiondata.h index 33039cf4d..d32788f4b 100644 --- a/src/kvirc/kernel/kvi_asynchronousconnectiondata.h +++ b/src/kvirc/kernel/kvi_asynchronousconnectiondata.h @@ -36,7 +36,7 @@ public: KviAsynchronousConnectionData(); ~KviAsynchronousConnectionData(); public: - QString szServer; + QString szServer; bool bUseLastServerInContext; // this is checked ONLY if szServer is empty kvi_u32_t uPort; bool bPortIsOk; diff --git a/src/kvirc/kernel/kvi_ircconnectionserverinfo.h b/src/kvirc/kernel/kvi_ircconnectionserverinfo.h index c763cb4ba..460373561 100644 --- a/src/kvirc/kernel/kvi_ircconnectionserverinfo.h +++ b/src/kvirc/kernel/kvi_ircconnectionserverinfo.h @@ -94,7 +94,7 @@ private: bool m_bSupportsCodePages; // supports the /CODEPAGE command ? int m_iMaxTopicLen; int m_iMaxModeChanges; - QString m_szListModes; + QString m_szListModes; QString m_szPlainModes; public: char registerModeChar() { return m_pServInfo ? m_pServInfo->getRegisterModeChar() : 0; }; @@ -112,12 +112,12 @@ public: int maxTopicLen() { return m_iMaxTopicLen; }; int maxModeChanges() { return m_iMaxModeChanges; }; - + void setServerVersion(const QString & version); - + const QString & getChannelModeDescription(QChar mode) { return m_pServInfo->getChannelModeDescription(mode); }; const QString & getUserModeDescription(QChar mode) { return m_pServInfo->getUserModeDescription(mode); }; - + bool isSupportedModePrefix(QChar c); bool isSupportedModeFlag(QChar c); QChar modePrefixChar(kvi_u32_t flag); diff --git a/src/kvirc/kernel/kvi_ircconnectionstatedata.h b/src/kvirc/kernel/kvi_ircconnectionstatedata.h index 372347248..790456740 100644 --- a/src/kvirc/kernel/kvi_ircconnectionstatedata.h +++ b/src/kvirc/kernel/kvi_ircconnectionstatedata.h @@ -58,22 +58,22 @@ public: bool sentQuit(){ return m_bSentQuit; }; void setSentQuit(){ m_bSentQuit = true; }; - + kvi_time_t lastReceivedChannelWhoReply(){ return m_tLastReceivedChannelWhoReply; }; void setLastReceivedChannelWhoReply(kvi_time_t tTime){ m_tLastReceivedChannelWhoReply = tTime; }; - + kvi_time_t lastSentChannelWhoRequest(){ return m_tLastSentChannelWhoRequest; }; - void setLastSentChannelWhoRequest(kvi_time_t tTime){ m_tLastSentChannelWhoRequest = tTime; }; + void setLastSentChannelWhoRequest(kvi_time_t tTime){ m_tLastSentChannelWhoRequest = tTime; }; kvi_time_t lastReceivedWhoisReply(){ return m_tLastReceivedWhoisReply; }; void setLastReceivedWhoisReply(kvi_time_t tTime){ m_tLastReceivedWhoisReply = tTime; }; - + bool simulateUnexpectedDisconnect(){ return m_bSimulateUnexpectedDisconnect; }; void setSimulateUnexpectedDisconnect(){ m_bSimulateUnexpectedDisconnect = true; }; unsigned int loginNickIndex(){ return m_uLoginNickIndex; }; void setLoginNickIndex(unsigned int uNickIdx){ m_uLoginNickIndex = uNickIdx; }; - + const QString & commandToExecAfterConnect(){ return m_szCommandToExecAfterConnect; }; void setCommandToExecAfterConnect(const QString &szCmd){ m_szCommandToExecAfterConnect = szCmd; }; }; diff --git a/src/kvirc/kernel/kvi_ircconnectiontargetresolver.h b/src/kvirc/kernel/kvi_ircconnectiontargetresolver.h index 4dfee4a4c..9908535d1 100644 --- a/src/kvirc/kernel/kvi_ircconnectiontargetresolver.h +++ b/src/kvirc/kernel/kvi_ircconnectiontargetresolver.h @@ -57,11 +57,11 @@ private: QTimer * m_pStartTimer; // timer used to start the connection KviDns * m_pProxyDns; // the dns object for the proxy hostnames KviDns * m_pServerDns; // the dns object for the server hostnames - + char * m_pReadBuffer; unsigned int m_uReadBufferLen; unsigned int m_uReadPackets; - + int m_iLastError; public: void start(KviIrcConnectionTarget * t); diff --git a/src/kvirc/kernel/kvi_ircurl.cpp b/src/kvirc/kernel/kvi_ircurl.cpp index 5f1071970..2018af1be 100644 --- a/src/kvirc/kernel/kvi_ircurl.cpp +++ b/src/kvirc/kernel/kvi_ircurl.cpp @@ -154,7 +154,7 @@ void KviIrcUrl::split(QString url, KviIrcUrlParts& result) result.iError=0; int iProtoLen = url.indexOf("://"); - if(iProtoLen!=-1) { + if(iProtoLen!=-1) { if(KviQString::equalCIN(url,"irc",3)) { // OK, seems to be a valid proto; url = url.right(url.length()-3); @@ -215,9 +215,9 @@ void KviIrcUrl::split(QString url, KviIrcUrlParts& result) void KviIrcUrl::join(QString &uri, KviServer* server) { if(server) - { + { uri="irc"; - + if(server->useSSL()) uri.append("s"); if(server->isIPv6()) uri.append("6"); @@ -233,9 +233,9 @@ void KviIrcUrl::makeJoinCmd(const QStringList& chans, QString& szJoinCommand) QString szChannels,szProtectedChannels,szPasswords,szCurPass,szCurChan; if(chans.count()!=0) { - + for ( QStringList::ConstIterator it = chans.begin(); it != chans.end(); ++it ) { - + szCurPass=(*it).section('?',1); if(szCurPass.isEmpty()) { @@ -272,7 +272,7 @@ int KviIrcUrl::run(const QString& text,int contextSpec,KviConsole* pConsole) KviIrcUrlParts parts; KviIrcUrl::split(text,parts); QString cmdBuffer; - + if( (contextSpec & CurrentContext) && !pConsole) { contextSpec = FirstFreeContext; } @@ -300,7 +300,7 @@ int KviIrcUrl::run(const QString& text,int contextSpec,KviConsole* pConsole) if(!(parts.iError & KviIrcUrl::InvalidProtocol)) { g_pApp->addRecentUrl(text); - + QString szJoinCommand; makeJoinCmd(parts.chanList,szJoinCommand); QString szCommand("server "); @@ -354,7 +354,7 @@ int KviIrcUrl::run(const QString& text,int contextSpec,KviConsole* pConsole) pConsole->connection()->sendData(pConsole->connection()->encodeText(szJoinCommand).data()); } return parts.iError; - } + } } // New server KviKvsScript::run(szCommand,pConsole); diff --git a/src/kvirc/kernel/kvi_ircurl.h b/src/kvirc/kernel/kvi_ircurl.h index e84185260..5e604bc11 100644 --- a/src/kvirc/kernel/kvi_ircurl.h +++ b/src/kvirc/kernel/kvi_ircurl.h @@ -52,13 +52,13 @@ typedef struct _KviIrcUrlParts { namespace KviIrcUrl { - enum KviIrcUrlParserError { + enum KviIrcUrlParserError { InvalidProtocol = 1, InvalidPort = 2, NeedNewContext = 4 }; - enum KviIrcUrlContextSpec { + enum KviIrcUrlContextSpec { FirstFreeContext = 1, NewContext = 2, CurrentContext = 4, @@ -68,7 +68,7 @@ namespace KviIrcUrl }; extern KVIRC_API bool parse(const char * url,KviStr &cmdBuffer,int contextSpec = KVI_IRCURL_CONTEXT_FIRSTFREE); - + extern KVIRC_API int run(const QString& url,int contextSpec = FirstFreeContext,KviConsole* pConsole = 0); extern KVIRC_API void split(QString url, KviIrcUrlParts& parts); diff --git a/src/kvirc/kernel/kvi_main.cpp b/src/kvirc/kernel/kvi_main.cpp index fb85600e7..2838f8185 100644 --- a/src/kvirc/kernel/kvi_main.cpp +++ b/src/kvirc/kernel/kvi_main.cpp @@ -376,7 +376,7 @@ int main(int argc,char ** argv) XVisualInfo *xvi = XGetVisualInfo(dpy, VisualScreenMask | VisualDepthMask | VisualClassMask, &templ, &nvi); - + for (int i = 0; i < nvi; ++i) { XRenderPictFormat *format = XRenderFindVisualFormat(dpy, xvi[i].visual); diff --git a/src/kvirc/kernel/kvi_notifylist.cpp b/src/kvirc/kernel/kvi_notifylist.cpp index 403103c43..ec7ae1641 100644 --- a/src/kvirc/kernel/kvi_notifylist.cpp +++ b/src/kvirc/kernel/kvi_notifylist.cpp @@ -111,7 +111,7 @@ KVIrc will attempt to guess if the server you're currently using supports the WATCH command and eventually use this last method.[br] The WATCH method uses the "notify" property to get the nicknames that have to be - sent to the server in the /WATCH commands. + sent to the server in the /WATCH commands. */ // Basic NotifyListManager: this does completely nothing @@ -166,11 +166,11 @@ void KviNotifyListManager::notifyOnLine(const QString &nick,const QString &user, KviQString::sprintf(szWho,"\r!n\r%Q\r [%Q@\r!h\r%Q\r]",&nick,&user,&host); else KviQString::sprintf(szWho,"\r!n\r%Q\r",&nick); - + KviPointerHashTable<QString,KviRegisteredUser> * d = g_pRegisteredUserDataBase->userDict(); KviPointerHashTableIterator<QString,KviRegisteredUser> it(*d); QString szNotify; - + while(KviRegisteredUser * u = it.current()) { QString prop=u->getProperty("notify"); @@ -189,10 +189,10 @@ void KviNotifyListManager::notifyOnLine(const QString &nick,const QString &user, ++it; } QString szFmt = __tr2qs("%Q is on IRC"); - + if(szMsg.isEmpty()) KviQString::sprintf(szMsg,szFmt,&szWho); - + if((!szReason.isEmpty()) && (_OUTPUT_VERBOSE)) { szMsg += "("; @@ -223,18 +223,18 @@ void KviNotifyListManager::notifyOffLine(const QString &nick,const QString &user if(!KVS_TRIGGER_EVENT_1_HALTED(KviEvent_OnNotifyOffLine,out,nick)) { QString szWho; - + if(!(user.isEmpty() || host.isEmpty())) KviQString::sprintf(szWho,"\r!n\r%Q\r [%Q@\r!h\r%Q\r]",&nick,&user,&host); else KviQString::sprintf(szWho,"\r!n\r%Q\r",&nick); - + QString szMsg; - + KviPointerHashTable<QString,KviRegisteredUser> * d = g_pRegisteredUserDataBase->userDict(); KviPointerHashTableIterator<QString,KviRegisteredUser> it(*d); QString szNotify; - + while(KviRegisteredUser * u = it.current()) { QString prop=u->getProperty("notify"); @@ -252,17 +252,17 @@ void KviNotifyListManager::notifyOffLine(const QString &nick,const QString &user } ++it; } - + if(szMsg.isEmpty()) KviQString::sprintf(szMsg,__tr2qs("%Q has left IRC"),&szWho); - + if((!szReason.isEmpty()) && (_OUTPUT_VERBOSE)) { szMsg += "("; szMsg += szReason; szMsg += ")"; } - + out->outputNoFmt(KVI_OUT_NOTIFYOFFLINE,szMsg); } @@ -317,7 +317,7 @@ void KviNotifyListManager::notifyOffLine(const QString &nick,const QString &user // buildUserhostList() | // | | // m_pUserhostList->isEmpty() ? - YES --->+ -// | ^^^ | +// | ^^^ | // | (unexpected!)||| | // NO | // | | @@ -408,7 +408,7 @@ void KviIsOnNotifyListManager::buildRegUserDict() } } ++it; - } + } } void KviIsOnNotifyListManager::delayedNotifySession() @@ -566,7 +566,7 @@ bool KviIsOnNotifyListManager::handleIsOn(KviIrcMessage *msg) // the remaining in the IsOnList are offline QString * s; - + for(s = tmplist.first();s;s = tmplist.next()) { m_pIsOnList->removeRef(s); @@ -822,23 +822,23 @@ bool KviIsOnNotifyListManager::handleUserhost(KviIrcMessage *msg) user = "*"; host = nk; } - + bool bGotIt = false; QString szNick = m_pConnection->decodeText(nick.ptr()); QString szUser = m_pConnection->decodeText(user.ptr()); QString szHost = m_pConnection->decodeText(host.ptr()); - + for(QString * s = m_pUserhostList->first();s && (!bGotIt);s = m_pUserhostList->next()) { if(KviQString::equalCI(*s,szNick)) { - KviIrcMask * mk = new KviIrcMask(szNick,szUser,szHost); + KviIrcMask * mk = new KviIrcMask(szNick,szUser,szHost); tmplist.append(mk); bGotIt = true; m_pUserhostList->removeRef(s); } } - + if(!bGotIt) { // ops...not my userhost! @@ -875,7 +875,7 @@ bool KviIsOnNotifyListManager::handleUserhost(KviIrcMessage *msg) m_pConsole->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Notify list: \r!n\r%Q\r appears to have gone offline before USERHOST reply was received, will recheck in the next loop"),s); m_pUserhostList->removeFirst(); } - + } if(m_pOnlineList->isEmpty()) @@ -1243,7 +1243,7 @@ bool KviWatchNotifyListManager::handleWatchReply(KviIrcMessage *msg) const char * nk = msg->safeParam(1); const char * us = msg->safeParam(2); const char * ho = msg->safeParam(3); - QString dnk = m_pConnection->decodeText(nk); + QString dnk = m_pConnection->decodeText(nk); QString dus = m_pConnection->decodeText(us); QString dho = m_pConnection->decodeText(ho); diff --git a/src/kvirc/kernel/kvi_theme.h b/src/kvirc/kernel/kvi_theme.h index 83eafa722..f9266b2e5 100644 --- a/src/kvirc/kernel/kvi_theme.h +++ b/src/kvirc/kernel/kvi_theme.h @@ -68,9 +68,9 @@ protected: QString m_szDate; //< theme creation date QString m_szApplication; //< theme creation (KVIrc) version QString m_szThemeEngineVersion; //< the theme engine version that saved this theme - + QString m_szLastError; //< reported when some function fails - + QPixmap m_pixScreenshotLarge; //< the large screenshot pixmap QPixmap m_pixScreenshotMedium; //< the medium screenshot pixmap QPixmap m_pixScreenshotSmall; //< the small screenshot pixmap @@ -83,7 +83,7 @@ public: /// save the currently defined theme configuration in the specified file /// bool save(const QString &szThemeFileName); - + const QString & lastError(){ return m_szLastError; }; void setLastError(const QString &szLastError){ m_szLastError = szLastError; }; const QString & name(){ return m_szName; }; diff --git a/src/kvirc/kernel/kvi_userinput.cpp b/src/kvirc/kernel/kvi_userinput.cpp index af27d8c5c..524c1d727 100644 --- a/src/kvirc/kernel/kvi_userinput.cpp +++ b/src/kvirc/kernel/kvi_userinput.cpp @@ -40,12 +40,12 @@ namespace KviUserInput const QChar * b = KviQString::nullTerminatedArray(szData); const QChar * c = b; if(!c)return true; // empty - + while(c->isSpace()) c++; if(!c->unicode()) return true; // empty - + if(c->unicode() == '\\') { c++; @@ -68,14 +68,14 @@ namespace KviUserInput if(KVS_TRIGGER_EVENT_1_HALTED(KviEvent_OnTextInput,pWindow,szData)) return true; // halted - + if(c != b) szData.remove(0,c-b); parseNonCommand(szData,pWindow); return true; } - + bool parseCommand(const QString & szData, KviWindow * pWindow, const QString & szContext, bool bUserFriendlyCommandline) { if(bUserFriendlyCommandline) @@ -102,7 +102,7 @@ namespace KviUserInput return (kvs.run(pWindow,0,0/*,KviKvsScript::AssumeLocals*/) != KviKvsScript::Error); } } - + void parseNonCommand(QString & szData, KviWindow * pWindow) { const QChar * aux = KviQString::nullTerminatedArray(szData); @@ -110,7 +110,7 @@ namespace KviUserInput if(!beg) return; // empty - + while(aux->unicode()) { while(aux->unicode() && (aux->unicode() != '\n')) @@ -120,10 +120,10 @@ namespace KviUserInput if(aux->unicode() == '\n') aux++; beg = aux; - + if(buf.isEmpty()) buf = " "; // avoid "No text to send" (d3vah) - + switch(pWindow->type()) { case KVI_WINDOW_TYPE_CONSOLE: diff --git a/src/kvirc/kvs/kvi_kvs.cpp b/src/kvirc/kvs/kvi_kvs.cpp index b3b3318b0..ae54bf877 100644 --- a/src/kvirc/kvs/kvi_kvs.cpp +++ b/src/kvirc/kvs/kvi_kvs.cpp @@ -63,7 +63,7 @@ namespace KviKvs { KviKvsPopupManager::instance()->load(szFileName); } - + void savePopups(const QString &szFileName) { KviKvsPopupManager::instance()->save(szFileName); @@ -78,7 +78,7 @@ namespace KviKvs { KviKvsAliasManager::instance()->load(szFileName); } - + void saveAliases(const QString &szFileName) { KviKvsAliasManager::instance()->save(szFileName); @@ -88,22 +88,22 @@ namespace KviKvs { KviKvsAliasManager::instance()->clear(); } - + void loadAppEvents(const QString &szFileName) { KviKvsEventManager::instance()->loadAppEvents(szFileName); } - + void saveAppEvents(const QString &szFileName) { KviKvsEventManager::instance()->saveAppEvents(szFileName); } - + void clearAppEvents() { KviKvsEventManager::instance()->removeAllScriptAppHandlers(); } - + void loadRawEvents(const QString &szFileName) { KviKvsEventManager::instance()->loadRawEvents(szFileName); @@ -113,27 +113,27 @@ namespace KviKvs { KviKvsEventManager::instance()->saveRawEvents(szFileName); } - + void clearRawEvents() { KviKvsEventManager::instance()->removeAllScriptRawHandlers(); } - + void loadScriptAddons(const QString &szFileName) { KviKvsScriptAddonManager::instance()->load(szFileName); } - + void saveScriptAddons(const QString &szFileName) { KviKvsScriptAddonManager::instance()->save(szFileName); } - + void clearScriptAddons() { KviKvsScriptAddonManager::instance()->clear(); } - + void flushUserClasses() { KviKvsKernel::instance()->objectController()->flushUserClasses(); diff --git a/src/kvirc/kvs/kvi_kvs.h b/src/kvirc/kvs/kvi_kvs.h index 69ef1634f..1c34d321d 100644 --- a/src/kvirc/kvs/kvi_kvs.h +++ b/src/kvirc/kvs/kvi_kvs.h @@ -35,23 +35,23 @@ namespace KviKvs void loadAliases(const QString &szFileName); void saveAliases(const QString &szFileName); void clearAliases(); - + void loadPopups(const QString &szFileName); void savePopups(const QString &szFileName); void clearPopups(); - + void loadAppEvents(const QString &szFileName); void saveAppEvents(const QString &szFileName); void clearAppEvents(); - + void loadRawEvents(const QString &szFileName); void saveRawEvents(const QString &szFileName); void clearRawEvents(); - + void loadScriptAddons(const QString &szFileName); void saveScriptAddons(const QString &szFileName); void clearScriptAddons(); - + void flushUserClasses(); }; diff --git a/src/kvirc/kvs/kvi_kvs_array.cpp b/src/kvirc/kvs/kvi_kvs_array.cpp index 0f72709f6..7a68eb088 100644 --- a/src/kvirc/kvs/kvi_kvs_array.cpp +++ b/src/kvirc/kvs/kvi_kvs_array.cpp @@ -127,7 +127,7 @@ void KviKvsArray::findNewSize() m_uSize = 0; } // need to shrink ? - + if((m_uAllocSize - m_uSize) > KVI_KVS_ARRAY_ALLOC_CHUNK) { m_uAllocSize = m_uSize; diff --git a/src/kvirc/kvs/kvi_kvs_asyncdnsoperation.cpp b/src/kvirc/kvs/kvi_kvs_asyncdnsoperation.cpp index 2ad52d6e4..e9c4155b8 100644 --- a/src/kvirc/kvs/kvi_kvs_asyncdnsoperation.cpp +++ b/src/kvirc/kvs/kvi_kvs_asyncdnsoperation.cpp @@ -66,7 +66,7 @@ void KviKvsAsyncDnsOperation::lookupTerminated(KviDns *) { KviWindow * pWnd = window(); if(!g_pApp->windowExists(pWnd))pWnd = g_pActiveWindow; - + if(m_pCallback) { KviKvsVariantList params; @@ -90,11 +90,11 @@ void KviKvsAsyncDnsOperation::lookupTerminated(KviDns *) } m_pCallback->run(pWnd,¶ms,0,KviKvsScript::PreserveParams); - + delete this; return; } - + // we have no callback : output the results QString szQuery = m_pDns->query(); pWnd->output(KVI_OUT_HOSTLOOKUP,__tr2qs_ctx("DNS Lookup result for query \"%Q\"","kvs"),&szQuery); diff --git a/src/kvirc/kvs/kvi_kvs_callbackobject.cpp b/src/kvirc/kvs/kvi_kvs_callbackobject.cpp index d5ef722b2..010cff221 100644 --- a/src/kvirc/kvs/kvi_kvs_callbackobject.cpp +++ b/src/kvirc/kvs/kvi_kvs_callbackobject.cpp @@ -86,14 +86,14 @@ KviKvsCallbackObject::CallbackStatus KviKvsCallbackObject::execute(KviKvsVariant KviKvsVariantList params; params.setAutoDelete(false); KviKvsVariant * v; - + if(pParams) for(v = pParams->first();v;v = pParams->next()) params.append(v); for(v = m_pMagicParams->first();v;v = m_pMagicParams->next()) params.append(v); - + unsigned int uRet = m_pScript->run(m_pTargetWindow,¶ms,pRetVal,KviKvsScript::PreserveParams); if(uRet) @@ -102,7 +102,7 @@ KviKvsCallbackObject::CallbackStatus KviKvsCallbackObject::execute(KviKvsVariant return HaltEncountered; return Success; } - + // ooops... error return Error; } diff --git a/src/kvirc/kvs/kvi_kvs_callbackobject.h b/src/kvirc/kvs/kvi_kvs_callbackobject.h index b2ec39d20..da60ee333 100644 --- a/src/kvirc/kvs/kvi_kvs_callbackobject.h +++ b/src/kvirc/kvs/kvi_kvs_callbackobject.h @@ -47,7 +47,7 @@ public: // Execute the callback only if the target window exists // If this flag is not used then if the target window dies // the callback is executed in another window (the associated console, if possible, otherwise the first available console) - OnlyIfWindowExists = 1 + OnlyIfWindowExists = 1 }; enum CallbackStatus { // succesfull execution diff --git a/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp b/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp index b1c1e0079..e89598bd2 100644 --- a/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp +++ b/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp @@ -102,7 +102,7 @@ namespace KviKvsCoreCallbackCommands [cmd]echo[/cmd] "Ip address: "$2; [cmd]echo[/cmd] "Hostname: "$3; } else { - [cmd]echo[/cmd] "Error: $2"; + [cmd]echo[/cmd] "Error: $2"; } } ahost -i ("irc.flashnet.it","Hello :)") @@ -114,7 +114,7 @@ namespace KviKvsCoreCallbackCommands [cmd]echo[/cmd] "Ip address: "$2; [cmd]echo[/cmd] "Hostname: "$3; } else { - [cmd]echo[/cmd] "Error: $2"; + [cmd]echo[/cmd] "Error: $2"; } } ahost -a ("cafe:babe::dead:beef") @@ -126,7 +126,7 @@ namespace KviKvsCoreCallbackCommands [cmd]echo[/cmd] "Ip address: "$2; [cmd]echo[/cmd] "Hostname: "$3; } else { - [cmd]echo[/cmd] "Error: $2"; + [cmd]echo[/cmd] "Error: $2"; } } [/example] @@ -254,7 +254,7 @@ namespace KviKvsCoreCallbackCommands KVSCCC_pContext->error(__tr2qs_ctx("Alias names can contain only letters, digits, underscores and '::' namespace separators","kvs")); return false; } - + // make sure that we have only doubled "::" and not ":" or ":::..." QString tmp = szName; tmp.replace("::","@"); // @ is not allowed by the rule above @@ -415,7 +415,7 @@ namespace KviKvsCoreCallbackCommands button(w,test,-1,Test button){ echo Test!; } button(w,test){} [/example] - + */ KVSCCC(button) @@ -450,7 +450,7 @@ namespace KviKvsCoreCallbackCommands } return true; } - + if(!pButton) { pButton = new KviWindowScriptButton(KVSCCC_pWindow->buttonContainer(),KVSCCC_pWindow,szName.toUtf8().data()); @@ -477,9 +477,9 @@ namespace KviKvsCoreCallbackCommands KVSCCC_pContext->warning(__tr2qs_ctx("Can't find the icon '%Q'","kvs"),&szIcon); } } - + pButton->setEnabled(!(KVSCCC_pSwitches->find('d',"disabled"))); - + return true; } @@ -521,11 +521,11 @@ namespace KviKvsCoreCallbackCommands KVSCCC_PARAMETER("event_name",KVS_PT_NONEMPTYSTRING,0,szEventName) KVSCCC_PARAMETER("handler_name",KVS_PT_NONEMPTYSTRING,0,szHandlerName) KVSCCC_PARAMETERS_END - + bool bOk; int iNumber = szEventName.toInt(&bOk); bool bIsRaw = (bOk && (iNumber >= 0) && (iNumber < 1000)); - + if(bIsRaw) { if(!KviKvsEventManager::instance()->isValidRawEvent(iNumber)) @@ -543,7 +543,7 @@ namespace KviKvsCoreCallbackCommands return true; } } - + if(KVSCCC_pCallback->code().isEmpty()) { if(bIsRaw) @@ -674,7 +674,7 @@ namespace KviKvsCoreCallbackCommands it you must use the -n switch. $0 contains the string "stdout". If the -b switch is not used then $1 contains a single line of process output with the trailing carriage return and/or line feed stripped. - If -b is used then $1 contains the whole process output + If -b is used then $1 contains the whole process output block (eventually empty) with all the cr/lf pairs.[br] [br] [b]Stderr data event[/b][br] @@ -797,21 +797,21 @@ namespace KviKvsCoreCallbackCommands [comment]# Returning an empty string does not write to stdin[/comment] return } - + if($1 == "stderr") { echo "[stderr] $1" return } - + if($1 == "terminated") { echo "[process terminated]" return } - + echo "[stdout] $1" - + switch(%:state) { case(0): @@ -915,7 +915,7 @@ namespace KviKvsCoreCallbackCommands KVSCCC_PARAMETERS_END int f = 0; - + if(KVSCCC_pSwitches->find('t',"trigger-termination") != 0)f |= KVI_KVS_PROCESSDESCRIPTOR_TRIGGERTERMINATED; if(KVSCCC_pSwitches->find('n',"no-stdout") == 0)f |= KVI_KVS_PROCESSDESCRIPTOR_TRIGGERSTDOUT; if(KVSCCC_pSwitches->find('e',"trigger-stderr") != 0)f |= KVI_KVS_PROCESSDESCRIPTOR_TRIGGERSTDERR; @@ -926,7 +926,7 @@ namespace KviKvsCoreCallbackCommands QString szShell; KVSCCC_pSwitches->getAsStringIfExisting('s',"shell",szShell); - + kvs_int_t iPingTime = 0; kvs_int_t iMaxRunTime = 0; @@ -949,9 +949,9 @@ namespace KviKvsCoreCallbackCommands iMaxRunTime = 0; } } - + KviKvsProcessDescriptorData * d = new KviKvsProcessDescriptorData; - + d->szCommandline = szCommandline; d->szShell = szShell; d->pWnd = KVSCCC_pContext->window(); @@ -960,14 +960,14 @@ namespace KviKvsCoreCallbackCommands d->pCallback = new KviKvsScript(*KVSCCC_pCallback); d->iMaxRunTime = iMaxRunTime; d->iPingTimeout = iPingTime; - + KviKvsProcessAsyncOperation * op = new KviKvsProcessAsyncOperation(d); if(!op->start()) { if(KVSCCC_pSwitches->find('q',"quiet") == 0)KVSCCC_pContext->warning(__tr2qs_ctx("Failed to start the process","kvs")); delete op; } - + return true; } @@ -1169,7 +1169,7 @@ namespace KviKvsCoreCallbackCommands r->proc = KVI_PTR2MEMBER(KviKvsCoreCallbackCommands::__routine); \ pKern->registerCoreCallbackCommandExecRoutine(QString(__cmdName),r); \ } - + _REGCMD("ahost",ahost); _REGCMD("awhois",awhois); _REGCMD("alias",alias); diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions.cpp b/src/kvirc/kvs/kvi_kvs_corefunctions.cpp index d9a817017..edde29e99 100644 --- a/src/kvirc/kvs/kvi_kvs_corefunctions.cpp +++ b/src/kvirc/kvs/kvi_kvs_corefunctions.cpp @@ -41,7 +41,7 @@ namespace KviKvsCoreFunctions r->proc = KVI_PTR2MEMBER(KviKvsCoreFunctions::__routine); \ pKern->registerCoreFunctionExecRoutine(QString(__fncName),r); \ } - + // a_f _REGFNC("active",active) _REGFNC("array",array) @@ -141,7 +141,7 @@ namespace KviKvsCoreFunctions KVSCF_pRetBuffer->setString(g_szStaticStrayConstantAt); return true; } - + KVSCF(mightBeStrayAtOrThis) { KviKvsObject * o = KVSCF_pContext->thisObject(); diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions_sz.cpp b/src/kvirc/kvs/kvi_kvs_corefunctions_sz.cpp index c3459a905..d9889f04b 100644 --- a/src/kvirc/kvs/kvi_kvs_corefunctions_sz.cpp +++ b/src/kvirc/kvs/kvi_kvs_corefunctions_sz.cpp @@ -296,7 +296,7 @@ namespace KviKvsCoreFunctions } ///////////////////////////////////////////////////////////////////////////////////////////// - + /* @doc: string @type: @@ -395,7 +395,7 @@ namespace KviKvsCoreFunctions } KviKvsVariant * v; - + if(szSwitch.length() > 1) { diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands.cpp index fd5a3fbd8..4f2e37ccb 100644 --- a/src/kvirc/kvs/kvi_kvs_coresimplecommands.cpp +++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands.cpp @@ -153,7 +153,7 @@ namespace KviKvsCoreSimpleCommands } QStringList sl = szTokens.split(QRegExp("[, ]+"),QString::SkipEmptyParts); - + QByteArray szFlags; QByteArray szTarget = KVSCSC_pConnection->encodeText(KVSCSC_pWindow->windowName()); QByteArray szMessage; diff --git a/src/kvirc/kvs/kvi_kvs_dnsmanager.cpp b/src/kvirc/kvs/kvi_kvs_dnsmanager.cpp index e2199940f..ef7224876 100644 --- a/src/kvirc/kvs/kvi_kvs_dnsmanager.cpp +++ b/src/kvirc/kvs/kvi_kvs_dnsmanager.cpp @@ -154,7 +154,7 @@ void KviKvsDnsManager::dnsLookupTerminated(KviDns * pDns) } else { QString szQuery = o->dns()->query(); o->window()->output(KVI_OUT_HOSTLOOKUP,__tr2qs_ctx("DNS Lookup result for query \"%Q\"","kvs"),&szQuery); - + if(o->dns()->state() == KviDns::Failure) { QString szErr = KviError::getDescription(o->dns()->error()); diff --git a/src/kvirc/kvs/kvi_kvs_eventhandler.h b/src/kvirc/kvs/kvi_kvs_eventhandler.h index 5b31c8d91..ba367cdc4 100644 --- a/src/kvirc/kvs/kvi_kvs_eventhandler.h +++ b/src/kvirc/kvs/kvi_kvs_eventhandler.h @@ -61,7 +61,7 @@ public: bool isEnabled(){ return m_bEnabled; }; void setEnabled(bool bEnabled){ m_bEnabled = bEnabled; }; - + // Static allocator function. // This MUST be used by the modules to allocate event structures // instead of the new operator. diff --git a/src/kvirc/kvs/kvi_kvs_eventmanager.cpp b/src/kvirc/kvs/kvi_kvs_eventmanager.cpp index f309f18d2..249e65960 100644 --- a/src/kvirc/kvs/kvi_kvs_eventmanager.cpp +++ b/src/kvirc/kvs/kvi_kvs_eventmanager.cpp @@ -265,7 +265,7 @@ void KviKvsEventManager::removeAllModuleAppHandlers(KviKvsModuleInterface *pIfac for(unsigned int i =0;i< KVI_KVS_NUM_APP_EVENTS;i++) { if(!m_appEventTable[i].handlers())continue; - + KviPointerList<KviKvsEventHandler> l; l.setAutoDelete(false); for(h = m_appEventTable[i].handlers()->first();h;h = m_appEventTable[i].handlers()->next()) @@ -288,7 +288,7 @@ void KviKvsEventManager::removeAllModuleAppHandlers(KviKvsModuleInterface *pIfac } */ // END COMPAT - + } for(h = l.first();h;h = l.next())m_appEventTable[i].removeHandler(h); } @@ -437,7 +437,7 @@ void KviKvsEventManager::removeAllScriptRawHandlers() { if(e->type() == KviKvsEventHandler::Script)dl.append(e); } - + for(e = dl.first();e;e = dl.next()) { m_rawEventTable[i]->removeRef(e); diff --git a/src/kvirc/kvs/kvi_kvs_eventmanager.h b/src/kvirc/kvs/kvi_kvs_eventmanager.h index f3174d35e..a108d76b0 100644 --- a/src/kvirc/kvs/kvi_kvs_eventmanager.h +++ b/src/kvirc/kvs/kvi_kvs_eventmanager.h @@ -56,7 +56,7 @@ public: bool hasAppHandlers(unsigned int uEvIdx){ return m_appEventTable[uEvIdx].hasHandlers(); }; KviPointerList<KviKvsEventHandler> * appHandlers(unsigned int uEvIdx){ return m_appEventTable[uEvIdx].handlers(); }; - + bool hasRawHandlers(unsigned int uEvIdx){ return m_rawEventTable[uEvIdx]; }; KviPointerList<KviKvsEventHandler> * rawHandlers(unsigned int uEvIdx){ return m_rawEventTable[uEvIdx]; }; @@ -68,19 +68,19 @@ public: bool addAppHandler(unsigned int uEvIdx,KviKvsEventHandler * h); bool addRawHandler(unsigned int uRawIdx,KviKvsEventHandler * h); - + bool removeScriptAppHandler(unsigned int uEvIdx,const QString &szName); bool removeScriptRawHandler(unsigned int uEvIdx,const QString &szName); - + bool enableScriptAppHandler(unsigned int uEvIdx,const QString &szName,bool bEnable); bool enableScriptRawHandler(unsigned int uEvIdx,const QString &szName,bool bEnable); - + bool removeModuleAppHandler(unsigned int uEvIdx,KviKvsModuleInterface *i); bool removeModuleRawHandler(unsigned int uRawIdx,KviKvsModuleInterface *i); - + void removeAllModuleAppHandlers(KviKvsModuleInterface *i); void removeAllModuleRawHandlers(KviKvsModuleInterface *i); - + void removeAllModuleHandlers(KviKvsModuleInterface * i); KviKvsScriptEventHandler * findScriptRawHandler(unsigned int uEvIdx,const QString &szName); @@ -93,7 +93,7 @@ public: { return triggerHandlers(m_appEventTable[uEvIdx].handlers(),pWnd,pParams); }; bool triggerRaw(unsigned int uEvIdx,KviWindow *pWnd,KviKvsVariantList * pParams) { return triggerHandlers(m_rawEventTable[uEvIdx],pWnd,pParams); }; - + // this is the only that takes parameter ownership and deletes them bool triggerDeleteParams(unsigned int uEvIdx,KviWindow * pWnd,KviKvsVariantList * pParams) { diff --git a/src/kvirc/kvs/kvi_kvs_eventtable.cpp b/src/kvirc/kvs/kvi_kvs_eventtable.cpp index ff1a778b2..9f0da70ed 100644 --- a/src/kvirc/kvs/kvi_kvs_eventtable.cpp +++ b/src/kvirc/kvs/kvi_kvs_eventtable.cpp @@ -268,7 +268,7 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_KVS_NUM_APP_EVENTS]= (thus, KVIrc assumes that YOU have provided the necessary output and feedback to the user).[br] A common error here is to call halt and re-echo the unmodified output; [b]this can cause another OnHighlight event to be triggered and create an infinite loop![/b]. - [cmd]echoprivmsg[/cmd] [b]-n[/b] is the command you probably want. + [cmd]echoprivmsg[/cmd] [b]-n[/b] is the command you probably want. */ EVENT("OnHighlight", \ "$0 = source nick\n" \ diff --git a/src/kvirc/kvs/kvi_kvs_eventtriggers.h b/src/kvirc/kvs/kvi_kvs_eventtriggers.h index 2079cca72..3a2a8b89d 100644 --- a/src/kvirc/kvs/kvi_kvs_eventtriggers.h +++ b/src/kvirc/kvs/kvi_kvs_eventtriggers.h @@ -48,7 +48,7 @@ #define KVS_TRIGGER_EVENT(__idx,__wnd,__parms) \ if(KviKvsEventManager::instance()->hasAppHandlers(__idx)) \ KviKvsEventManager::instance()->trigger(__idx,__wnd,__parms); - + #define KVS_TRIGGER_EVENT_HALTED(__idx,__wnd,__parms) \ (KviKvsEventManager::instance()->hasAppHandlers(__idx) ? \ KviKvsEventManager::instance()->trigger(__idx,__wnd,__parms) : false) diff --git a/src/kvirc/kvs/kvi_kvs_hash.cpp b/src/kvirc/kvs/kvi_kvs_hash.cpp index 8c31f6083..c1f4ee73d 100644 --- a/src/kvirc/kvs/kvi_kvs_hash.cpp +++ b/src/kvirc/kvs/kvi_kvs_hash.cpp @@ -72,7 +72,7 @@ void KviKvsHash::serialize(QString& result) { if(bNeedComma)result.append(','); else bNeedComma = true; - + tmpBuffer = it.currentKey(); KviKvsVariant::serializeString(tmpBuffer); result.append(tmpBuffer); diff --git a/src/kvirc/kvs/kvi_kvs_hash.h b/src/kvirc/kvs/kvi_kvs_hash.h index 5a8458d21..1242df054 100644 --- a/src/kvirc/kvs/kvi_kvs_hash.h +++ b/src/kvirc/kvs/kvi_kvs_hash.h @@ -55,7 +55,7 @@ public: kvs_uint_t size() const { return m_pDict->count(); }; void appendAsString(QString &szBuffer) const; - + const KviPointerHashTable<QString,KviKvsVariant> * dict(){ return m_pDict; }; void serialize(QString& result); diff --git a/src/kvirc/kvs/kvi_kvs_kernel.h b/src/kvirc/kvs/kvi_kvs_kernel.h index b1396b769..a0b59be0b 100644 --- a/src/kvirc/kvs/kvi_kvs_kernel.h +++ b/src/kvirc/kvs/kvi_kvs_kernel.h @@ -77,27 +77,27 @@ private: static KviKvsKernel * m_pKvsKernel; // global kernel object KviPointerHashTable<QString,KviKvsSpecialCommandParsingRoutine> * m_pSpecialCommandParsingRoutineDict; - + KviPointerHashTable<QString,KviKvsCoreSimpleCommandExecRoutine> * m_pCoreSimpleCommandExecRoutineDict; KviPointerHashTable<QString,KviKvsCoreCallbackCommandExecRoutine> * m_pCoreCallbackCommandExecRoutineDict; KviPointerHashTable<QString,KviKvsCoreFunctionExecRoutine> * m_pCoreFunctionExecRoutineDict; - + KviKvsHash * m_pGlobalVariables; KviKvsVariantList * m_pEmptyParameterList; - + KviKvsObjectController * m_pObjectController; KviKvsAsyncOperationManager * m_pAsyncOperationManager; public: static void init(); static void done(); static KviKvsKernel * instance(){ return m_pKvsKernel; }; - + KviKvsVariantList * emptyParameterList(){ return m_pEmptyParameterList; }; KviKvsHash * globalVariables(){ return m_pGlobalVariables; }; - + KviKvsObjectController * objectController(){ return m_pObjectController; }; - + KviKvsAsyncOperationManager * asyncOperationManager(){ return m_pAsyncOperationManager; }; void registerSpecialCommandParsingRoutine(const QString &szCmdName,KviKvsSpecialCommandParsingRoutine * r) @@ -132,7 +132,7 @@ public: completeCommand(szCommandBegin,p); return p; } - + KviPointerList<QString> * completeFunctionAllocateResult(const QString &szFunctionBegin) { KviPointerList<QString> *p=new KviPointerList<QString>; diff --git a/src/kvirc/kvs/kvi_kvs_moduleinterface.h b/src/kvirc/kvs/kvi_kvs_moduleinterface.h index b19cef96c..a4211bec4 100644 --- a/src/kvirc/kvs/kvi_kvs_moduleinterface.h +++ b/src/kvirc/kvs/kvi_kvs_moduleinterface.h @@ -48,7 +48,7 @@ public: KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) : KviKvsRunTimeCall(pContext,pParams), m_pModule(pModule) {} - ~KviKvsModuleRunTimeCall(){}; + ~KviKvsModuleRunTimeCall(){}; public: KviModule * module(){ return m_pModule; }; }; @@ -77,7 +77,7 @@ public: public: KviKvsSwitchList * switches(){ return m_pSwitchList; }; KviKvsSwitchList * switchList(){ return m_pSwitchList; }; - + // forwarders for the switch list bool hasSwitch(unsigned short u,const QString &szSwitch){ return (m_pSwitchList->find(u,szSwitch) != 0); }; KviKvsVariant * getSwitch(unsigned short u,const QString &szSwitch){ return m_pSwitchList->find(u,szSwitch); }; diff --git a/src/kvirc/kvs/kvi_kvs_object.h b/src/kvirc/kvs/kvi_kvs_object.h index 698c7b0af..ae88259fd 100644 --- a/src/kvirc/kvs/kvi_kvs_object.h +++ b/src/kvirc/kvs/kvi_kvs_object.h @@ -71,7 +71,7 @@ protected: KviPointerHashTable<QString,KviKvsObjectConnectionList> * m_pSignalDict; // our signals connected to other object functions KviKvsObjectConnectionList * m_pConnectionList; // signals connected to this object functions - + // this is valid when processing one of our slots kvs_hobject_t m_hSignalSender; QString m_szSignalName; @@ -98,7 +98,7 @@ public: bool disconnectSignal(const QString &sigName,KviKvsObjectConnection * con); bool disconnectSignal(const QString &sigName,KviKvsObject * target,const QString & slotName); - // Emits a signal by calling all the attacched slots in an unspecified order. + // Emits a signal by calling all the attacched slots in an unspecified order. // Returns the number of slots called (may be 0, if no slot is connected) // The parameters are preserved. // this is intended to be called from other function calls (the parameters are copied from pOuterCall) @@ -128,7 +128,7 @@ public: // The function may or may not be already registered in the class // If szCode is empty the the private implementation is removed instead void registerPrivateImplementation(const QString &szFunctionName,const QString &szCode); - + // ONLY pCaller can be zero here! // please use one of the wrappers, if possible bool callFunction( @@ -150,10 +150,10 @@ protected: bool unregisterConnection(KviKvsObjectConnection * con); virtual bool init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams); - + void registerChild(KviKvsObject * c); void unregisterChild(KviKvsObject *c); - + virtual bool eventFilter(QObject *o,QEvent *e); //necessary ? virtual void timerEvent(QTimerEvent *e); protected: diff --git a/src/kvirc/kvs/kvi_kvs_object_class.cpp b/src/kvirc/kvs/kvi_kvs_object_class.cpp index f78cf21ad..3425b7b54 100644 --- a/src/kvirc/kvs/kvi_kvs_object_class.cpp +++ b/src/kvirc/kvs/kvi_kvs_object_class.cpp @@ -177,9 +177,9 @@ bool KviKvsObjectClass::save(const QString &szFileName) "class(\"%Q\",\"%Q\")\n" \ "{\n", &m_szName,&szParentName); - + KviPointerHashTableIterator<QString,KviKvsObjectFunctionHandler> it(*m_pFunctionHandlers); - + while(KviKvsObjectFunctionHandler * h = it.current()) { if(h->isScriptHandler()) @@ -198,16 +198,16 @@ bool KviKvsObjectClass::save(const QString &szFileName) } ++it; } - + szBuffer += "}\n"; - + return KviFileUtils::writeFile(szFileName,szBuffer); } void KviKvsObjectClass::getFunctionCode(QString &szCode,KviKvsObjectFunctionHandler &h) { szCode=h.scriptHandlerCode(); } - + bool KviKvsObjectClass::load(const QString &szFileName) diff --git a/src/kvirc/kvs/kvi_kvs_object_class.h b/src/kvirc/kvs/kvi_kvs_object_class.h index e6e66adf4..83b22bff5 100644 --- a/src/kvirc/kvs/kvi_kvs_object_class.h +++ b/src/kvirc/kvs/kvi_kvs_object_class.h @@ -64,7 +64,7 @@ protected: QString m_szName; // the class name bool m_bBuiltin; // is this a builtin or script based class ? KviPointerHashTable<QString,KviKvsObjectFunctionHandler> * m_pFunctionHandlers; // all our function handlers - KviPointerList<KviKvsObjectClass> * m_pChildClasses; // + KviPointerList<KviKvsObjectClass> * m_pChildClasses; // KviKvsObjectAllocateInstanceProc m_allocProc; bool m_bDirty; // not yet flushed to disk (only for not builtin classes) protected: diff --git a/src/kvirc/kvs/kvi_kvs_parameterprocessor.cpp b/src/kvirc/kvs/kvi_kvs_parameterprocessor.cpp index 1dddcb896..c2a123a0d 100644 --- a/src/kvirc/kvs/kvi_kvs_parameterprocessor.cpp +++ b/src/kvirc/kvs/kvi_kvs_parameterprocessor.cpp @@ -103,11 +103,11 @@ namespace KviKvsParameterProcessor return true; // empty optional } } - + QString szError; KviQString::sprintf(szError,__tr2qs_ctx("Invalid data type for parameter \"%s\"","kvs"),pFmtArray->szName); szError += ": "; - + if(v->isString()) { QString tmp = v->string(); @@ -130,11 +130,11 @@ namespace KviKvsParameterProcessor pContext->error(szError); return false; } - + bool process(KviKvsVariantList * pVariantList,KviKvsRunTimeContext * pContext,KviKvsParameterProcessor::ParameterFormat * pFmtArray) { KviKvsVariant * v = pVariantList->first(); - + while(pFmtArray->szName) { if(!v) diff --git a/src/kvirc/kvs/kvi_kvs_parameterprocessor.h b/src/kvirc/kvs/kvi_kvs_parameterprocessor.h index d0677a8e9..18d0e28b3 100644 --- a/src/kvirc/kvs/kvi_kvs_parameterprocessor.h +++ b/src/kvirc/kvs/kvi_kvs_parameterprocessor.h @@ -39,7 +39,7 @@ // Default: 0 #define KVS_PT_INT 2 #define KVS_PT_INTEGER 2 - + // Data type: kvs_uint_t // Default: 0 #define KVS_PT_UINT 3 @@ -49,12 +49,12 @@ // default: 0.0 #define KVS_PT_DOUBLE 4 #define KVS_PT_REAL 4 - + // Data type: bool // default: false #define KVS_PT_BOOL 5 #define KVS_PT_BOOLEAN 5 - + // Data type: KviKvsHash * // default: 0 #define KVS_PT_HASH 6 diff --git a/src/kvirc/kvs/kvi_kvs_parser.h b/src/kvirc/kvs/kvi_kvs_parser.h index f6c6796df..f3dd7bf59 100644 --- a/src/kvirc/kvs/kvi_kvs_parser.h +++ b/src/kvirc/kvs/kvi_kvs_parser.h @@ -98,7 +98,7 @@ private: // returns 0 only in case of error // starts on the first char of a buffer // stops at the first null char encountered - KviKvsTreeNodeInstruction * parseInstructionList(); + KviKvsTreeNodeInstruction * parseInstructionList(); // may return 0 (empty instruction), check error() for error conditions // starts on the first character of an instruction // if the first char is ';' '\n' or null it just returns 0 without error @@ -169,11 +169,11 @@ private: KviKvsTreeNodeData * parseHashKey(); // never returns 0 KviKvsTreeNodeConstantData * parseHashKeyLiteralParameter(); - + // // kvi_kvs_parser_specialcommands.cpp // - + // return 0 only in case of error // starts at the leading '(' of the if command (after the switches) // and stops after the end of the else block @@ -188,12 +188,12 @@ private: // returns 0 only in case of error // starts at the leading '(' of the while command (after the switches) // and stops after the end of the command block - // if the first character is not '(' then this function fails with an error + // if the first character is not '(' then this function fails with an error KviKvsTreeNodeCommand * parseSpecialCommandWhile(); // returns 0 only in case of error // starts at the leading '(' of the while command (after the switches) // and stops after the end of the command block - // if the first character is not '(' then this function fails with an error + // if the first character is not '(' then this function fails with an error KviKvsTreeNodeCommand * parseSpecialCommandDo(); // returns 0 only in case of error // and stops after the end of the break command @@ -287,7 +287,7 @@ private: // // kvi_kvs_parser_expression.cpp // - + // returns 0 only in case of error // starts AFTER the leading char of the expression // ends afer the first terminator found diff --git a/src/kvirc/kvs/kvi_kvs_parser_command.cpp b/src/kvirc/kvs/kvi_kvs_parser_command.cpp index 017eb0467..5c84ce488 100644 --- a/src/kvirc/kvs/kvi_kvs_parser_command.cpp +++ b/src/kvirc/kvs/kvi_kvs_parser_command.cpp @@ -45,7 +45,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseCommand() const QChar * pSecondPart = 0; int iSecondPartLen = 0; - + bool bHasNamespaceSoMustBeAlias = false; if(KVSP_curCharUnicode == '.') @@ -190,12 +190,12 @@ KviKvsTreeNodeCommand * KviKvsParser::parseCommand() // is this a special command ? // Here theoretically we could also lookup special commands composed of two parts but we actually don't need it. - + // Looking up only the first part if there is a second part, instead, // is dangerous since it may generate infinite loops (help.open vs help) KviKvsSpecialCommandParsingRoutine * ccpr = KviKvsKernel::instance()->findSpecialCommandParsingRoutine(szIdentifier); - + if(ccpr) { cmd = (this->*(ccpr->proc))(); @@ -222,7 +222,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseCommand() // is it a callback command ? if(KVSP_curCharUnicode == '(') - { + { // core callback command // module callback command KviKvsTreeNodeDataList * dl = parseCommaSeparatedParameterList(); @@ -239,9 +239,9 @@ KviKvsTreeNodeCommand * KviKvsParser::parseCommand() delete dl; return 0; } - + const QChar * pClbkBegin = KVSP_curCharPointer; - + KviKvsTreeNodeInstruction * ins = parseInstruction(); if(!ins) { @@ -254,13 +254,13 @@ KviKvsTreeNodeCommand * KviKvsParser::parseCommand() // actually we need empty callbacks (for alias() at least) // the single command implementations should take care of checking it /*else { - + warning(pIdentifier,__tr2qs_ctx("Callback command called with an empty callback instruction","kvs")); error(KVSP_curCharPointer,__tr2qs_ctx("Callback commands must have a callback instruction","kvs")); if(sw)delete sw; delete dl; return 0; - + }*/ } else { delete ins; // in fact we don't need it, it will be reparsed the first time it is called @@ -270,15 +270,15 @@ KviKvsTreeNodeCommand * KviKvsParser::parseCommand() // The locals of this context are NOT the same as the locals // of the other context. } - + QString szCallbackName = szIdentifier; szCallbackName += " callback"; - + QString szBlock(pClbkBegin,KVSP_curCharPointer - pClbkBegin); KviCommandFormatter::bufferFromBlock(szBlock); - + KviKvsScript * clbk = new KviKvsScript(szCallbackName,szBlock); - + if(pSecondPart) { cmd = new KviKvsTreeNodeModuleCallbackCommand(pIdentifier,szIdentifier,QString(pSecondPart,iSecondPartLen),dl,clbk); @@ -296,14 +296,14 @@ KviKvsTreeNodeCommand * KviKvsParser::parseCommand() return 0; } } - + if(sw) { cmd->setSwitchList(sw); // cmd becomes child of the rebinding switch if(pRebindData)return new KviKvsTreeNodeRebindingSwitch(pRebindData->location(),pRebindData,cmd); } - + return cmd; } } diff --git a/src/kvirc/kvs/kvi_kvs_parser_expression.cpp b/src/kvirc/kvs/kvi_kvs_parser_expression.cpp index f9d3811eb..0eddc2a88 100644 --- a/src/kvirc/kvs/kvi_kvs_parser_expression.cpp +++ b/src/kvirc/kvs/kvi_kvs_parser_expression.cpp @@ -218,53 +218,53 @@ KviKvsTreeNodeExpressionBinaryOperator * KviKvsParser::parseExpressionBinaryOper static unsigned char binary_operator_initial_char[256]= { - // 000 001 002 003 004 005 006 007 008 009 010 011 012 013 014 015 + // 000 001 002 003 004 005 006 007 008 009 010 011 012 013 014 015 // NUL SOH STX ETX EOT ENQ ACK BEL BS HT LF VT FF CR SO SI 0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 , - // 016 017 018 019 020 021 022 023 024 025 026 027 028 029 030 031 + // 016 017 018 019 020 021 022 023 024 025 026 027 028 029 030 031 // DLE DC1 DC2 DC3 DC4 NAK SYN ETB CAN EM SUB ESC FS GS RS US 0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 , - // 032 033 034 035 036 037 038 039 040 041 042 043 044 045 046 047 - // ! " # $ % & ' ( ) * + , - . / + // 032 033 034 035 036 037 038 039 040 041 042 043 044 045 046 047 + // ! " # $ % & ' ( ) * + , - . / 0 ,1 ,0 ,0 ,0 ,1 ,1 ,0 ,0 ,0 ,1 ,1 ,0 ,1 ,0 ,1 , - // 048 049 050 051 052 053 054 055 056 057 058 059 060 061 062 063 - // 0 1 2 3 4 5 6 7 8 9 : ; < = > ? + // 048 049 050 051 052 053 054 055 056 057 058 059 060 061 062 063 + // 0 1 2 3 4 5 6 7 8 9 : ; < = > ? 0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,1 ,1 ,1 ,0 , - // 064 065 066 067 068 069 070 071 072 073 074 075 076 077 078 079 - // @ A B C D E F G H I J K L M N O + // 064 065 066 067 068 069 070 071 072 073 074 075 076 077 078 079 + // @ A B C D E F G H I J K L M N O 0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 , - // 080 081 082 083 084 085 086 087 088 089 090 091 092 093 094 095 - // P Q R S T U V W X Y Z [ \ ] ^ _ + // 080 081 082 083 084 085 086 087 088 089 090 091 092 093 094 095 + // P Q R S T U V W X Y Z [ \ ] ^ _ 0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,1 ,0 , - // 096 097 098 099 100 101 102 103 104 105 106 107 108 109 110 111 - // ` a b c d e f g h i j k l m n o + // 096 097 098 099 100 101 102 103 104 105 106 107 108 109 110 111 + // ` a b c d e f g h i j k l m n o 0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 , - // 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 - // p q r s t u v w x y z { | } ~ + // 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 + // p q r s t u v w x y z { | } ~ 0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,1 ,0 ,0 ,0 , - // 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 - // + // 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 + // 0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 , - // 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 - // + // 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 + // 0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 , - // 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 - // + // 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 + // 0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 , - // 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 - // + // 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 + // 0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 , - // 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 - // � � � � � � � � � � � � � � � � + // 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 + // � � � � � � � � � � � � � � � � 0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 , - // 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 - // � � � � � � � � � � � � � � � � + // 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 + // � � � � � � � � � � � � � � � � 0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 , - // 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 - // � � � � � � � � � � � � � � � � + // 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 + // � � � � � � � � � � � � � � � � 0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 , - // 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 - // � � � � � � � � + // 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 + // � � � � � � � � 0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 }; @@ -349,7 +349,7 @@ KviKvsTreeNodeExpression * KviKvsParser::parseExpressionOperandCore(char termina pDataList->setAutoDelete(true); static QString szStaticSingleSpace(" "); - + const QChar * pOperandBegin = KVSP_curCharPointer; bool bHaveVariable = false; @@ -522,7 +522,7 @@ KviKvsTreeNodeExpression * KviKvsParser::parseExpression(char terminator) // Now curTopOperator has the left subtree (one node) set // and it points to the TOP (=ROOT) node // Evaluate the rest - + KviKvsTreeNodeExpression * operand; KviKvsTreeNodeExpression * incompleteOperator = curTopOperator; KviKvsTreeNodeExpression * auxOperator; @@ -530,7 +530,7 @@ KviKvsTreeNodeExpression * KviKvsParser::parseExpression(char terminator) for(;;) { skipSpaces(); - + operand = parseExpressionOperand(terminator); if(!operand) { @@ -538,9 +538,9 @@ KviKvsTreeNodeExpression * KviKvsParser::parseExpression(char terminator) return 0; } operand->contextDescription(sz); - + skipSpaces(); - + if(KVSP_curCharUnicode == terminator) { KVSP_skipChar; @@ -590,8 +590,8 @@ KviKvsTreeNodeExpression * KviKvsParser::parseExpression(char terminator) return 0; //newer here /* - - + + KviKvsTreeNodeExpression * right = parseExpression(terminator); if(!right) { @@ -600,9 +600,9 @@ KviKvsTreeNodeExpression * KviKvsParser::parseExpression(char terminator) } // left * a + b - + // * - // left + + // left + // a b */ @@ -611,7 +611,7 @@ KviKvsTreeNodeExpression * KviKvsParser::parseExpression(char terminator) // the right side might be a single operand or a sequence of operations if(right->isOperator()) { - // if the operator has lower precedence than op then + // if the operator has lower precedence than op then if(right->precedence() < op->precedence()) { right->attachHighPrecedenceOperator(op); diff --git a/src/kvirc/kvs/kvi_kvs_parser_lside.cpp b/src/kvirc/kvs/kvi_kvs_parser_lside.cpp index c24e8c37f..eabf96baf 100644 --- a/src/kvirc/kvs/kvi_kvs_parser_lside.cpp +++ b/src/kvirc/kvs/kvi_kvs_parser_lside.cpp @@ -232,7 +232,7 @@ Now %var is unset.[br] Reset it with a comma separated list of items [example] - %var = Pragma,Diabl0,Arter|o + %var = Pragma,Diabl0,Arter|o %var <, MalboroLi [/example] %var now contains "Pragma,Diabl0,Arter|o,MalboroLi"[br] @@ -265,7 +265,7 @@ KviKvsTreeNodeData * KviKvsParser::parseOperationRightSide(bool bPreferNumeric) l->setAutoDelete(true); const QChar * pBegin = KVSP_curCharPointer; - + for(;;) { switch(KVSP_curCharUnicode) @@ -810,13 +810,13 @@ KviKvsTreeNodeOperation * KviKvsParser::parseBindingOperation() // t or tr or y // s const QChar * pBegin = KVSP_curCharPointer; - + while(KVSP_curCharIsLetter)KVSP_skipChar; - + QString szOp = QString(pBegin,KVSP_curCharPointer - pBegin).toLower(); skipSpaces(); - + if(KVSP_curCharUnicode != '/') { error(KVSP_curCharPointer,__tr2qs_ctx("Found character '%q' (unicode %x) where a slash '/' was expected","kvs"),KVSP_curCharPointer,KVSP_curCharUnicode); @@ -827,7 +827,7 @@ KviKvsTreeNodeOperation * KviKvsParser::parseBindingOperation() KviKvsTreeNodeData * pFirst = parseBindingOperationParameter(); if(!pFirst)return 0; - + if(KVSP_curCharIsEndOfCommand) { error(KVSP_curCharPointer,__tr2qs_ctx("Unexpected end of command in binding operation, at least two slashes are missing","kvs")); @@ -866,7 +866,7 @@ KviKvsTreeNodeOperation * KviKvsParser::parseBindingOperation() } KVSP_skipChar; - + KviKvsTreeNodeData * pThird = parseCommandParameter(); if(!pThird) { @@ -879,7 +879,7 @@ KviKvsTreeNodeOperation * KviKvsParser::parseBindingOperation() pThird = new KviKvsTreeNodeConstantData(KVSP_curCharPointer,new KviKvsVariant(QString(""))); } - + while(!KVSP_curCharIsEndOfCommand)KVSP_skipChar; if(!KVSP_curCharIsEndOfBuffer)KVSP_skipChar; @@ -892,7 +892,7 @@ KviKvsTreeNodeOperation * KviKvsParser::parseBindingOperation() // regexp substitution s/szFirst/szSecond/szFlags return new KviKvsTreeNodeOperationStringSubstitution(pBegin,pFirst,pSecond,pThird); } - + error(KVSP_curCharPointer,__tr2qs_ctx("Unknown binding operation '%Q'","kvs"),&szOp); return 0; } @@ -902,7 +902,7 @@ KviKvsTreeNodeOperation * KviKvsParser::parseOperation() { // find the operator const QChar * pBegin = KVSP_curCharPointer; - + switch(KVSP_curCharUnicode) { case '=': diff --git a/src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp b/src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp index 17f0a01a1..f5588a180 100644 --- a/src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp +++ b/src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp @@ -151,7 +151,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandBreak() { warning(KVSP_curCharPointer,__tr2qs_ctx("Trailing garbage at the end of the break command: ignored","kvs")); } - + while(!KVSP_curCharIsEndOfCommand)KVSP_skipChar; if(!KVSP_curCharIsEndOfBuffer)KVSP_skipChar; return new KviKvsTreeNodeSpecialCommandBreak(pBegin); @@ -179,7 +179,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandContinue() { warning(KVSP_curCharPointer,__tr2qs_ctx("Trailing garbage at the end of the continue command: ignored","kvs")); } - + while(!KVSP_curCharIsEndOfCommand)KVSP_skipChar; if(!KVSP_curCharIsEndOfBuffer)KVSP_skipChar; return new KviKvsTreeNodeSpecialCommandContinue(pBegin); @@ -220,7 +220,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandUnset() KviPointerList<KviKvsTreeNodeVariable> * pVarList = new KviPointerList<KviKvsTreeNodeVariable>; pVarList->setAutoDelete(true); - + while(KVSP_curCharUnicode == '%') { KviKvsTreeNodeVariable * d = parsePercent(); @@ -229,7 +229,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandUnset() pVarList->append(d); skipSpaces(); - + if(KVSP_curCharUnicode == ',') { KVSP_skipChar; @@ -286,7 +286,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandGlobal() KVSP_skipChar; const QChar * pBegin = KVSP_curCharPointer; - + while((KVSP_curCharIsLetterOrNumber) || (KVSP_curCharUnicode == '_'))KVSP_skipChar; QString szIdentifier(pBegin,KVSP_curCharPointer - pBegin); @@ -297,9 +297,9 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandGlobal() m_pGlobals->setAutoDelete(true); } m_pGlobals->replace(szIdentifier,new QString()); - + skipSpaces(); - + if(KVSP_curCharUnicode == ',') { KVSP_skipChar; @@ -345,7 +345,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandClass() If an implementation of that class was already existing it is removed with all the derived classes (and all the instances of this class and the derived ones are destroyed). - <base_class_name> is the name of the class that the + <base_class_name> is the name of the class that the new class has to inherit from.[br] If <base_class_name> is omitted, the new class inherits automatically from [class:object]object[/class].[br] @@ -364,7 +364,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandClass() meaning in KVIrc scripting. The <parameter reminder> respects the syntax of an expression, so it is terminated by a closed parenthesis. It's rather dangerous to use this command inside an object - function handler: if the class definition <class> was already + function handler: if the class definition <class> was already existing and it is a parent of the object's class, you might end up executing "inexisting" code.[br] As a thumb rule, use this command only outside object function handlers.[br] @@ -482,7 +482,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandClass() } QString szLabel(pLabelBegin,KVSP_curCharPointer - pLabelBegin); - + unsigned int uHandlerFlags = 0; if(szLabel.toLower() == "internal") @@ -492,16 +492,16 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandClass() if(KVSP_curCharUnicode != '(') { pLabelBegin = KVSP_curCharPointer; - + while(KVSP_curCharIsLetterOrNumber)KVSP_skipChar; - + if(KVSP_curCharIsEndOfBuffer) { error(KVSP_curCharPointer,__tr2qs_ctx("Unexpected end of buffer in class definition","kvs")); delete pClass; return 0; } - + if(KVSP_curCharPointer == pLabelBegin) { error(KVSP_curCharPointer,__tr2qs_ctx("Found character %q (unicode %x) where a function name was expected","kvs"),KVSP_curCharPointer,KVSP_curCharUnicode); @@ -519,16 +519,16 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandClass() if(KVSP_curCharUnicode != '(') { pLabelBegin = KVSP_curCharPointer; - + while(KVSP_curCharIsLetterOrNumber)KVSP_skipChar; - + if(KVSP_curCharIsEndOfBuffer) { error(KVSP_curCharPointer,__tr2qs_ctx("Unexpected end of buffer in class definition","kvs")); delete pClass; return 0; } - + if(KVSP_curCharPointer == pLabelBegin) { error(KVSP_curCharPointer,__tr2qs_ctx("Found character %q (unicode %x) where a function name was expected","kvs"),KVSP_curCharPointer,KVSP_curCharUnicode); @@ -538,7 +538,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandClass() szLabel = QString(pLabelBegin,KVSP_curCharPointer - pLabelBegin); } } - + if(!skipSpacesAndNewlines()) { delete pClass; @@ -549,14 +549,14 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandClass() { while((!(KVSP_curCharIsEndOfBuffer)) && (KVSP_curCharUnicode != ')')) KVSP_skipChar; - + if(KVSP_curCharIsEndOfBuffer) { error(KVSP_curCharPointer,__tr2qs_ctx("Unexpected end of buffer in function parameter list reminder","kvs")); delete pClass; return 0; } - + KVSP_skipChar; if(!skipSpacesAndNewlines()) @@ -779,7 +779,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandDo() } else j++; KVSP_skipChar; } - + if(!skipSpacesAndNewlines()) { if(i)delete i; @@ -811,7 +811,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandDo() warning(KVSP_curCharPointer,__tr2qs_ctx("Garbage string after the expression in 'do' command: ignored","kvs")); while(!KVSP_curCharIsEndOfCommand)KVSP_skipChar; } - + if(!KVSP_curCharIsEndOfBuffer)KVSP_skipChar; return new KviKvsTreeNodeSpecialCommandDo(pBegin,e,i); @@ -1086,7 +1086,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandFor() } } - + // HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK // KVSP_curCharPointer is const! // we shouldn't be able to modify it @@ -1115,7 +1115,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandFor() } // else just empty instruction skipSpaces(); - + if(KVSP_curCharUnicode != ')') { error(KVSP_curCharPointer,__tr2qs_ctx("Found char %q (unicode %x) while looking for the terminating ')' in 'for' command","kvs"),KVSP_curCharPointer,KVSP_curCharUnicode); @@ -1145,7 +1145,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandFor() if(i2)delete i2; return 0; } - + if((!i1) && (!e) && (!i2)) { error(pForBegin,__tr2qs_ctx("Empty infinite 'for' loop: fix the script","kvs")); @@ -1155,7 +1155,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandFor() return 0; } } // else just an empty instruction - + return new KviKvsTreeNodeSpecialCommandFor(pForBegin,i1,e,i2,loop); } @@ -1226,7 +1226,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandForeach() KviKvsTreeNodeData * d = parsePercentOrDollar(); if(!d)return 0; - + if(d->isFunctionCall() || d->isReadOnly()) { warning(KVSP_curCharPointer,__tr2qs_ctx("The 'foreach' command expects a writeable iteration variable as first parameter","kvs")); @@ -1570,7 +1570,7 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * pPopup = new KviKvsTreeNodeSpecialCommandDefpopupLabelPopup(KVSP_curCharPointer); KVSP_skipChar; - + if(!skipSpacesAndNewlines()) { delete pPopup; @@ -1601,7 +1601,7 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma QString szLabelLow = szLabel.toLower(); KviPointerList<QString> * pParameters = 0; - + QString szCondition; @@ -1758,7 +1758,7 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma delete pPopup; return 0; } - + pSubPopup->setCondition(szCondition); pSubPopup->setText(*pText); pSubPopup->setItemName(pItemName ? *pItemName : QString()); @@ -1983,7 +1983,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandHelp() { // again not a fully special command: this routine just returns // a CoreSimpleCommand but parses the parameters as constants - + // we handle a single big parameter, with whitespace stripped // This is because we want the identifiers to be preserved // as unevaluated (i.e $function). @@ -1992,9 +1992,9 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandHelp() const QChar * pBegin = KVSP_curCharPointer; while(!KVSP_curCharIsEndOfCommand)KVSP_skipChar; - + if(!KVSP_curCharIsEndOfBuffer)KVSP_skipChar; - + QString tmp(pBegin,KVSP_curCharPointer - pBegin); tmp.trimmed(); @@ -2005,6 +2005,6 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandHelp() KviKvsTreeNodeDataList * p = new KviKvsTreeNodeDataList(pBegin); p->addItem(new KviKvsTreeNodeConstantData(pBegin,new KviKvsVariant(tmp))); - + return new KviKvsTreeNodeCoreSimpleCommand(pBegin,szHelpName,p,r); } diff --git a/src/kvirc/kvs/kvi_kvs_runtimecall.h b/src/kvirc/kvs/kvi_kvs_runtimecall.h index 879c59edc..171fc8d17 100644 --- a/src/kvirc/kvs/kvi_kvs_runtimecall.h +++ b/src/kvirc/kvs/kvi_kvs_runtimecall.h @@ -43,9 +43,9 @@ public: public: // the script runtime context, never zero KviKvsRunTimeContext * context(){ return m_pContext; }; - + KviWindow * window(){ return m_pContext->window(); }; - + // parameter list access & helpers.. almost unused // because of the KVSM_PARAMETER macros KviKvsVariantList * parameterList(){ return m_pParams; }; @@ -54,7 +54,7 @@ public: unsigned int parameterCount(){ return m_pParams->count(); }; KviKvsVariant * firstParam(){ return m_pParams->first(); }; KviKvsVariant * nextParam(){ return m_pParams->next(); }; - + // This is virtual and returns false by default // only few derived classes allow the parameter code to be // extracted. This is mainly useful in module callback commands @@ -73,7 +73,7 @@ public: // it means that something rather critical happened and the script // execution cannot continue bool leaveBlockingSection(){ return m_pContext->leaveBlockingSection(); }; - + // forwarders for context: they ease the porting void warning(const QString &szFmt,...); bool error(const QString &szFmt,...); // this ALWAYS returns false diff --git a/src/kvirc/kvs/kvi_kvs_runtimecontext.cpp b/src/kvirc/kvs/kvi_kvs_runtimecontext.cpp index ffe779832..394573ebd 100644 --- a/src/kvirc/kvs/kvi_kvs_runtimecontext.cpp +++ b/src/kvirc/kvs/kvi_kvs_runtimecontext.cpp @@ -100,17 +100,17 @@ void KviKvsRunTimeContext::report(bool bError,KviKvsTreeNode * pNode,const QStri { pCodeListing = new KviPointerList<QString>; pCodeListing->setAutoDelete(true); - + int iLine,iCol; - + KviKvsReport::findLineColAndListing(m_pScript->buffer(),pNode->location(),iLine,iCol,pCodeListing); - + KviQString::sprintf(szLocation,__tr2qs_ctx("line %d, near character %d","kvs"),iLine,iCol); } - + // create the call stack int iFrame = 0; - + pCallStack = new KviPointerList<QString>; pCallStack->setAutoDelete(true); diff --git a/src/kvirc/kvs/kvi_kvs_runtimecontext.h b/src/kvirc/kvs/kvi_kvs_runtimecontext.h index 256912590..54f46f775 100644 --- a/src/kvirc/kvs/kvi_kvs_runtimecontext.h +++ b/src/kvirc/kvs/kvi_kvs_runtimecontext.h @@ -123,7 +123,7 @@ protected: enum RunTimeFlags { BreakPending = 1, ContinuePending = 2, HaltCalled = 4, DisableReporting = 8 }; unsigned int m_uRunTimeFlags; // a combination of RunTimeFlags - + KviKvsExtendedRunTimeData * m_pExtendedData; // shallow, may be 0 // error handling @@ -158,7 +158,7 @@ public: KviKvsVariant * returnValue() { return m_pReturnValue; }; - + // this is the default error reporting location // it is also used by rfc2812wrapper to find out the current command name! KviKvsTreeNode * defaultReportLocation() @@ -207,7 +207,7 @@ public: // returns the old pointer KviKvsVariant * swapReturnValuePointer(KviKvsVariant * pNewPointer); // the old pointer MUST be reset! - + // this is called by the parser when a break is encountered // the parser calls setBreakPending() and returns false // the contexts that can handle a break should check breakPending() @@ -242,7 +242,7 @@ public: { m_uRunTimeFlags |= HaltCalled; }; bool haltCalled() { return (m_uRunTimeFlags & HaltCalled); }; - + // this is used by KviKvsScript to disable reporting when the Quiet flag is used void disableReporting() { m_uRunTimeFlags |= DisableReporting; }; diff --git a/src/kvirc/kvs/kvi_kvs_scriptaddonmanager.cpp b/src/kvirc/kvs/kvi_kvs_scriptaddonmanager.cpp index 869f577c5..3a6114705 100644 --- a/src/kvirc/kvs/kvi_kvs_scriptaddonmanager.cpp +++ b/src/kvirc/kvs/kvi_kvs_scriptaddonmanager.cpp @@ -290,7 +290,7 @@ void KviKvsScriptAddonManager::save(const QString &szFileName) cfg.clear(); KviPointerHashTableIterator<QString,KviKvsScriptAddon> it(*m_pAddonDict); - + while(KviKvsScriptAddon * a = it.current()) { cfg.setGroup(a->name()); @@ -312,7 +312,7 @@ void KviKvsScriptAddonManager::delayedLoad() KviPointerHashTable<QString,KviConfigGroup> * d = cfg.dict(); if(!d)return; - + KviPointerHashTableIterator<QString,KviConfigGroup> it(*d); while(it.current()) { diff --git a/src/kvirc/kvs/kvi_kvs_switchlist.cpp b/src/kvirc/kvs/kvi_kvs_switchlist.cpp index b9fe62866..7d8e0358f 100644 --- a/src/kvirc/kvs/kvi_kvs_switchlist.cpp +++ b/src/kvirc/kvs/kvi_kvs_switchlist.cpp @@ -32,7 +32,7 @@ KviKvsSwitchList::KviKvsSwitchList() m_pLongSwitchDict = 0; } - + KviKvsSwitchList::~KviKvsSwitchList() { if(m_pShortSwitchDict)delete m_pShortSwitchDict; diff --git a/src/kvirc/kvs/kvi_kvs_switchlist.h b/src/kvirc/kvs/kvi_kvs_switchlist.h index 780a4e774..c1e0367be 100644 --- a/src/kvirc/kvs/kvi_kvs_switchlist.h +++ b/src/kvirc/kvs/kvi_kvs_switchlist.h @@ -55,7 +55,7 @@ public: { return m_pShortSwitchDict ? m_pShortSwitchDict->find((int)uShortKey) : 0; }; - + KviKvsVariant * find(const QString &szLongKey) { return m_pLongSwitchDict ? m_pLongSwitchDict->find(szLongKey) : 0; @@ -71,7 +71,7 @@ public: } return m_pShortSwitchDict ? m_pShortSwitchDict->find((int)uShortKey) : 0; }; - + bool getAsStringIfExisting(unsigned short uShortKey,const QString &szLongKey,QString &szBuffer) { KviKvsVariant * v = find(uShortKey,szLongKey); diff --git a/src/kvirc/kvs/kvi_kvs_treenode.h b/src/kvirc/kvs/kvi_kvs_treenode.h index 324551fad..b45fe7d64 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode.h +++ b/src/kvirc/kvs/kvi_kvs_treenode.h @@ -214,7 +214,7 @@ // | | // | +--SingleParameterIdentifier(OK) this is $n // | | canEvaluateToObjectReference() = true -// | | +// | | // | +--MultipleParameterIdentifier(OK) this is $n-[n] // | | // | +--CommandEvaluation(OK) this is ${ ... } @@ -300,7 +300,7 @@ // | | | +--ExpressionBinaryOperatorEqualTo(OK) (evaluate and result ok) // | | | | // | | | +--ExpressionBinaryOperatorNotEqualTo(OK) (evaluate and result ok) -// | | | +// | | | // | | +--ExpressionUnaryOperator(OK) (never instantiated) // | | | // | | +--ExpressionUnaryOperatorNegate(OK) (evaluate and result ok) @@ -360,7 +360,7 @@ // | // +--SpecialCommandDefpopupLabelLabel(OK) // -// +// // diff --git a/src/kvirc/kvs/kvi_kvs_treenode_aliasfunctioncall.cpp b/src/kvirc/kvs/kvi_kvs_treenode_aliasfunctioncall.cpp index 3727329c9..6c7ccbe5a 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_aliasfunctioncall.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_aliasfunctioncall.cpp @@ -55,7 +55,7 @@ bool KviKvsTreeNodeAliasFunctionCall::evaluateReadOnly(KviKvsRunTimeContext * c, KviKvsVariantList l; if(!m_pParams->evaluate(c,&l)) return false; - + pBuffer->setNothing(); const KviKvsScript * s = KviKvsAliasManager::instance()->lookup(m_szFunctionName); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_aliassimplecommand.cpp b/src/kvirc/kvs/kvi_kvs_treenode_aliassimplecommand.cpp index 88cca8f9f..da1207bc7 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_aliassimplecommand.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_aliassimplecommand.cpp @@ -77,7 +77,7 @@ bool KviKvsTreeNodeAliasSimpleCommand::execute(KviKvsRunTimeContext * c) { QString szAll; l.allAsString(szAll); - + if(!szAll.isEmpty()) szAll.prepend(" "); szAll.prepend(m_szCmdName); @@ -92,10 +92,10 @@ bool KviKvsTreeNodeAliasSimpleCommand::execute(KviKvsRunTimeContext * c) szData = c->window()->connection()->encodeText(szAll); if(!szData.data()) szData = ""; - + if(!c->window()->connection()->sendData(szData.data())) goto no_way_to_send_as_raw; - + c->window()->output(KVI_OUT_RAW,__tr2qs_ctx("[RAW]: %Q","kvs"),&szAll); return true; no_way_to_send_as_raw: diff --git a/src/kvirc/kvs/kvi_kvs_treenode_arrayreferenceassert.cpp b/src/kvirc/kvs/kvi_kvs_treenode_arrayreferenceassert.cpp index 6cafd3735..0e2a5c7ff 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_arrayreferenceassert.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_arrayreferenceassert.cpp @@ -61,7 +61,7 @@ bool KviKvsTreeNodeArrayReferenceAssert::evaluateReadOnlyInObjectScope(KviKvsObj } else { if(!m_pSource->evaluateReadOnly(c,pBuffer))return false; } - + if(!pBuffer->isArray()) { if(!pBuffer->isNothing()) diff --git a/src/kvirc/kvs/kvi_kvs_treenode_compositedata.cpp b/src/kvirc/kvs/kvi_kvs_treenode_compositedata.cpp index e6ec992bf..e2a83757b 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_compositedata.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_compositedata.cpp @@ -50,12 +50,12 @@ bool KviKvsTreeNodeCompositeData::evaluateReadOnly(KviKvsRunTimeContext * c,KviK QString * pS = new QString(); pBuffer->setString(pS); - + KviKvsVariant res; // we need to use an iterator to accomodate recursion KviPointerListIterator<KviKvsTreeNodeData> it(*m_pSubData); - + while(KviKvsTreeNodeData * d = it.current()) { if(!d->evaluateReadOnly(c,&res))return false; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_constantdata.h b/src/kvirc/kvs/kvi_kvs_treenode_constantdata.h index df331172f..f8b6930e5 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_constantdata.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_constantdata.h @@ -40,9 +40,9 @@ public: virtual void contextDescription(QString &szBuffer); virtual void dump(const char * prefix); - + virtual bool convertStringConstantToNumeric(); - + KviKvsVariant * value(){ return m_pValue; }; }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_data.h b/src/kvirc/kvs/kvi_kvs_treenode_data.h index a8ced77af..1fea7f766 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_data.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_data.h @@ -55,7 +55,7 @@ public: virtual bool canEvaluateToObjectReference(); // no by default virtual bool isFunctionCall(); // no by default virtual bool canEvaluateInObjectScope(); // no by default - + virtual bool convertStringConstantToNumeric(); // this does nothing by default and is reimplemented only by KviKvsTreeNodeConstantData }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_hashreferenceassert.cpp b/src/kvirc/kvs/kvi_kvs_treenode_hashreferenceassert.cpp index 4805fce5a..942de3cb3 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_hashreferenceassert.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_hashreferenceassert.cpp @@ -60,7 +60,7 @@ bool KviKvsTreeNodeHashReferenceAssert::evaluateReadOnlyInObjectScope(KviKvsObje } else { if(!m_pSource->evaluateReadOnly(c,pBuffer))return false; } - + if(!pBuffer->isHash()) { if(!pBuffer->isNothing()) diff --git a/src/kvirc/kvs/kvi_kvs_treenode_instruction.h b/src/kvirc/kvs/kvi_kvs_treenode_instruction.h index 53903d066..2f2a1f4d2 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_instruction.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_instruction.h @@ -68,7 +68,7 @@ public: * \return void */ virtual void dump(const char * prefix); - + /** * \brief This is the main entry point to the tree visit * diff --git a/src/kvirc/kvs/kvi_kvs_treenode_instructionblock.h b/src/kvirc/kvs/kvi_kvs_treenode_instructionblock.h index eed204cf2..f0fe6cd39 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_instructionblock.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_instructionblock.h @@ -46,9 +46,9 @@ public: KviKvsTreeNodeInstruction * releaseFirst(); virtual void contextDescription(QString &szBuffer); virtual void dump(const char * prefix); - + virtual bool execute(KviKvsRunTimeContext * c); - + }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_modulecallbackcommand.cpp b/src/kvirc/kvs/kvi_kvs_treenode_modulecallbackcommand.cpp index ff394f99d..76dd9503a 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_modulecallbackcommand.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_modulecallbackcommand.cpp @@ -79,7 +79,7 @@ bool KviKvsTreeNodeModuleCallbackCommand::execute(KviKvsRunTimeContext * c) KviKvsVariantList l; l.setAutoDelete(true); if(!(m_pParams->evaluate(c,&l)))return false; - + KviKvsSwitchList swl; if(m_pSwitches) { @@ -87,7 +87,7 @@ bool KviKvsTreeNodeModuleCallbackCommand::execute(KviKvsRunTimeContext * c) } c->setDefaultReportLocation(this); - + KviKvsModuleCallbackCommandCall call(m,c,&l,&swl,m_pCallback,m_pParams); return (*proc)(&call); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_modulefunctioncall.cpp b/src/kvirc/kvs/kvi_kvs_treenode_modulefunctioncall.cpp index ba52d4c53..833666801 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_modulefunctioncall.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_modulefunctioncall.cpp @@ -74,7 +74,7 @@ bool KviKvsTreeNodeModuleFunctionCall::evaluateReadOnly(KviKvsRunTimeContext * c c->error(this,__tr2qs_ctx("Module function call failed: the module '%Q' doesn't export a function named '%Q'","kvs"),&m_szModuleName,&m_szFunctionName); return false; } - + KviKvsVariantList l; if(!m_pParams->evaluate(c,&l))return false; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_scopeoperator.h b/src/kvirc/kvs/kvi_kvs_treenode_scopeoperator.h index 338a8ecc1..03407745b 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_scopeoperator.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_scopeoperator.h @@ -45,7 +45,7 @@ public: virtual bool isFunctionCall(); // gets the m_pRightSide result virtual bool canEvaluateInObjectScope(); // gets the m_pObjectReference result //virtual bool canReleaseResult(); // gets the m_pRightSide result - + virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); virtual KviKvsRWEvaluationResult * evaluateReadWrite(KviKvsRunTimeContext * c); virtual bool evaluateReadOnlyInObjectScope(KviKvsObject * o,KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); diff --git a/src/kvirc/kvs/kvi_kvs_treenode_singleparameteridentifier.h b/src/kvirc/kvs/kvi_kvs_treenode_singleparameteridentifier.h index e8b4ed8fb..792d76288 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_singleparameteridentifier.h +++ b/src/kvirc/kvs/kvi_kvs_treenode_singleparameteridentifier.h @@ -41,7 +41,7 @@ protected: public: virtual void contextDescription(QString &szBuffer); virtual void dump(const char * prefix); - + virtual bool canEvaluateToObjectReference(); virtual bool evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer); }; diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandclass.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandclass.cpp index 94b9d908e..e0694cb5c 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandclass.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandclass.cpp @@ -109,7 +109,7 @@ bool KviKvsTreeNodeSpecialCommandClass::execute(KviKvsRunTimeContext * c) c->error(this,__tr2qs_ctx("Missing class name","kvs")); return false; } - + if(szBaseClassName.isEmpty())szBaseClassName = "object"; // avoid infinite recursion in loading the base class @@ -125,7 +125,7 @@ bool KviKvsTreeNodeSpecialCommandClass::execute(KviKvsRunTimeContext * c) c->error(this,__tr2qs_ctx("Couln't find base class named '%Q'","kvs"),&szBaseClassName); return false; } - + // walk the inheritance tree of the base class in order to detect loops KviKvsObjectClass * pClass = pBaseClass; while(pClass) @@ -137,7 +137,7 @@ bool KviKvsTreeNodeSpecialCommandClass::execute(KviKvsRunTimeContext * c) } pClass = pClass->parentClass(); } - + KviKvsObjectClass * pActualClass = KviKvsKernel::instance()->objectController()->lookupClass(szClassName,true); if(pActualClass) { diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandfor.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandfor.cpp index 37619c3aa..53c31238d 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandfor.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandfor.cpp @@ -92,7 +92,7 @@ bool KviKvsTreeNodeSpecialCommandFor::execute(KviKvsRunTimeContext * c) if(!m_pCondition->evaluateReadOnly(c,&v))return false; if(!v.asBoolean())return true; } - + if(m_pLoop) { if(!m_pLoop->execute(c)) @@ -111,7 +111,7 @@ bool KviKvsTreeNodeSpecialCommandFor::execute(KviKvsRunTimeContext * c) return false; // propagate false ret value } } - + if(m_pUpdate) { if(!m_pUpdate->execute(c)) diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandforeach.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandforeach.cpp index 5d27ecae0..07138ba9f 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandforeach.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandforeach.cpp @@ -101,7 +101,7 @@ bool KviKvsTreeNodeSpecialCommandForeach::execute(KviKvsRunTimeContext * c) } else { v->result()->setNothing(); } - + if(!m_pLoop->execute(c)) { if(c->error()) @@ -128,7 +128,7 @@ bool KviKvsTreeNodeSpecialCommandForeach::execute(KviKvsRunTimeContext * c) delete v; return false; // propagate the false return value } - + idx++; } } diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandif.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandif.cpp index 73091940f..a09188b37 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandif.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandif.cpp @@ -59,7 +59,7 @@ bool KviKvsTreeNodeSpecialCommandIf::execute(KviKvsRunTimeContext * c) { KviKvsVariant v; if(!m_pExpression->evaluateReadOnly(c,&v))return false; - + if(v.asBoolean()) { if(m_pIfInstruction) diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandwhile.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandwhile.cpp index 55866e4ae..3567e76b7 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandwhile.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandwhile.cpp @@ -58,7 +58,7 @@ bool KviKvsTreeNodeSpecialCommandWhile::execute(KviKvsRunTimeContext * c) { KviKvsVariant v; if(!m_pExpression->evaluateReadOnly(c,&v))return false; - + if(!v.asBoolean())break; if(m_pInstruction) diff --git a/src/kvirc/kvs/kvi_kvs_treenode_switchlist.cpp b/src/kvirc/kvs/kvi_kvs_treenode_switchlist.cpp index f282124d8..f17ea2a5f 100644 --- a/src/kvirc/kvs/kvi_kvs_treenode_switchlist.cpp +++ b/src/kvirc/kvs/kvi_kvs_treenode_switchlist.cpp @@ -113,7 +113,7 @@ bool KviKvsTreeNodeSwitchList::evaluate(KviKvsRunTimeContext * c,KviKvsSwitchLis KviKvsVariant * v = new KviKvsVariant(); if(!d->evaluateReadOnly(c,v)) { - delete v; + delete v; return false; } pSwList->addShort(it.currentKey(),v); @@ -128,7 +128,7 @@ bool KviKvsTreeNodeSwitchList::evaluate(KviKvsRunTimeContext * c,KviKvsSwitchLis KviKvsVariant * v = new KviKvsVariant(); if(!d->evaluateReadOnly(c,v)) { - delete v; + delete v; return false; } pSwList->addLong(it.currentKey(),v); diff --git a/src/kvirc/kvs/kvi_kvs_useraction.cpp b/src/kvirc/kvs/kvi_kvs_useraction.cpp index e409cffc3..e37895aef 100644 --- a/src/kvirc/kvs/kvi_kvs_useraction.cpp +++ b/src/kvirc/kvs/kvi_kvs_useraction.cpp @@ -225,15 +225,15 @@ bool KviKvsUserAction::load(KviConfig * cfg) szKvsName += m_szName; QString szTmp = szKvsName; szTmp += "::label"; - + if(m_pVisibleNameScript)delete m_pVisibleNameScript; m_pVisibleNameScript = new KviKvsScript(szTmp,m_szVisibleName,KviKvsScript::Parameter); - + if(m_szVisibleName.isEmpty())return false; m_szDescription = cfg->readQStringEntry("Description"); szTmp = szKvsName; szTmp += "::description"; - + if(m_pDescriptionScript)delete m_pDescriptionScript; m_pDescriptionScript = new KviKvsScript(szTmp,m_szDescription,KviKvsScript::Parameter); @@ -247,7 +247,7 @@ bool KviKvsUserAction::load(KviConfig * cfg) QString szCode = cfg->readQStringEntry("Code"); if(szCode.isEmpty())return false; - + if(m_pScript)delete m_pScript; QString tmp = KVI_KVS_ACTION_SCRIPT_NAME_PREFIX; tmp += m_szName; diff --git a/src/kvirc/kvs/kvi_kvs_variant.h b/src/kvirc/kvs/kvi_kvs_variant.h index 9aa55d4e9..ffc505e41 100644 --- a/src/kvirc/kvs/kvi_kvs_variant.h +++ b/src/kvirc/kvs/kvi_kvs_variant.h @@ -132,12 +132,12 @@ public: bool isHash() const { return m_pData ? (m_pData->m_eType == KviKvsVariantData::Hash) : false; }; bool isBoolean() const { return m_pData ? (m_pData->m_eType == KviKvsVariantData::Boolean) : false; }; bool isHObject() const { return m_pData ? (m_pData->m_eType == KviKvsVariantData::HObject) : false; }; - + bool isEmpty() const; - + // returns true if this variant is nothing, false, null, 0 or an empty string bool isEqualToNothing() const; - + // evaluates Integer, Real and String rappresenting an Integer bool asInteger(kvs_int_t &iVal) const; // evaluates Real, Integer and String rappresenting a Real @@ -173,14 +173,14 @@ public: void copyFrom(const KviKvsVariant & v); void takeFrom(KviKvsVariant * v); void takeFrom(KviKvsVariant &v); - + void dump(const char * prefix) const; - + // returns -1 if this variant is greater than the other, 0 if are equal, 1 if the other is greater // if bPreferNumeric is true then when comparing strings a conversion to a numeric format // is first attempted. int compare(const KviKvsVariant * pOther,bool bPreferNumeric = false) const; - + void operator = (const KviKvsVariant &v){ copyFrom(v); }; //JSON serialization diff --git a/src/kvirc/kvs/kvi_kvs_variantlist.h b/src/kvirc/kvs/kvi_kvs_variantlist.h index 017369498..ceecaeb21 100644 --- a/src/kvirc/kvs/kvi_kvs_variantlist.h +++ b/src/kvirc/kvs/kvi_kvs_variantlist.h @@ -55,7 +55,7 @@ public: KviKvsVariant * next(){ return m_pList->next(); }; KviKvsVariant * at(int iIdx){ return m_pList->at(iIdx); }; unsigned int count(){ return m_pList->count(); }; - + void clear(){ m_pList->clear(); }; void append(const QString &szParam){ m_pList->append(new KviKvsVariant(szParam)); }; @@ -68,7 +68,7 @@ public: void append(KviKvsVariant * v){ m_pList->append(v); }; void prepend(KviKvsVariant * v){ m_pList->prepend(v); }; - + void setAutoDelete(bool bAutoDelete); // this is TRUE by default void allAsString(QString &szBuffer); diff --git a/src/kvirc/module/kvi_moduleextension.h b/src/kvirc/module/kvi_moduleextension.h index 3ec7d32f4..407fbfcaf 100644 --- a/src/kvirc/module/kvi_moduleextension.h +++ b/src/kvirc/module/kvi_moduleextension.h @@ -89,7 +89,7 @@ public: void setVisibleName(const KviStr &szVisibleName){ m_szVisibleName = szVisibleName; }; void setFlags(int iFlags){ m_iFlags = iFlags; }; void setIcon(const QPixmap &pix); - + protected: void registerObject(KviModuleExtension * e); void unregisterObject(KviModuleExtension * e); diff --git a/src/kvirc/sparser/kvi_ircmessage.cpp b/src/kvirc/sparser/kvi_ircmessage.cpp index d28ccb2e7..babf088fa 100644 --- a/src/kvirc/sparser/kvi_ircmessage.cpp +++ b/src/kvirc/sparser/kvi_ircmessage.cpp @@ -42,7 +42,7 @@ KviIrcMessage::KviIrcMessage(const char * message,KviIrcConnection * pConnection //m_pcParams = new KviPointerList<QCString>; //m_pcParams->setAutoDelete(true); - + while(*m_ptr == ' ')++m_ptr; const char * allParams = m_ptr; // just to be sure if(*m_ptr) diff --git a/src/kvirc/sparser/kvi_ircmessage.h b/src/kvirc/sparser/kvi_ircmessage.h index 696af100b..fc00cef6e 100644 --- a/src/kvirc/sparser/kvi_ircmessage.h +++ b/src/kvirc/sparser/kvi_ircmessage.h @@ -79,9 +79,9 @@ public: int paramCount(){ return m_pParams->count(); }; const char * param(unsigned int idx){ return (idx < m_pParams->count()) ? m_pParams->at(idx)->ptr() : 0; }; - + const char * safeParam(unsigned int idx){ return (idx < m_pParams->count()) ? m_pParams->at(idx)->ptr() : KviStr::emptyString().ptr(); }; - + KviStr * paramString(unsigned int idx){ return m_pParams->at(idx); }; const char * trailing(){ KviStr * tr = m_pParams->last(); return tr ? tr->ptr() : 0; }; @@ -98,7 +98,7 @@ public: bool haltOutput(){ return (m_iFlags & KVI_IRCMSG_FLAG_HALTOUTPUT); }; void setUnrecognized(){ m_iFlags |= KVI_IRCMSG_FLAG_UNRECOGNIZED; }; bool unrecognized(){ return (m_iFlags & KVI_IRCMSG_FLAG_UNRECOGNIZED); }; - + void decodeAndSplitPrefix(QString &szNick,QString &szUser,QString &szHost); void decodeAndSplitMask(char * mask,QString &szNick,QString &szUser,QString &szHost); }; diff --git a/src/kvirc/sparser/kvi_numeric.h b/src/kvirc/sparser/kvi_numeric.h index 6e06aa1e1..f88ac5285 100644 --- a/src/kvirc/sparser/kvi_numeric.h +++ b/src/kvirc/sparser/kvi_numeric.h @@ -19,7 +19,7 @@ // along with this program. If not, write to the Free Software Foundation, // Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -// Revisited by Szymon Stefanek 07 Jul 1998 (pragma at kvirc dot net) +// Revisited by Szymon Stefanek 07 Jul 1998 (pragma at kvirc dot net) // Re-revisited again on 11 Feb 1999 (pragma at kvirc dot net) // Updated FSF address on 07 May 2009 (ctrlaltca at libero dot it) @@ -101,7 +101,7 @@ #define RPL_STATSQLINE 217 /* [I,E,U,D] */ #define RPL_STATSYLINE 218 /* [I,E,U,D] */ #define RPL_ENDOFSTATS 219 // [I,E,U,D] */ -// #define RPL_???? 220 +// #define RPL_???? 220 #define RPL_UMODEIS 221 /* <nick> <mode> [I,E,U,D] # */ #define RPL_STATSBLINE 222 /* [E] */ #define RPL_SQLINE_NICK 222 /* [D] */ @@ -424,8 +424,8 @@ ///* 241 */ RPL_STATSLLINE, "%c %s * %s %d %d", ///* 242 */ RPL_STATSUPTIME, ":Server Up %d days, %d:%02d:%02d", ///* 243 */ RPL_STATSOLINE, "%c %s * %s %d %d", -///* 244 */ RPL_STATSHLINE, "%c %s * %s %d %d", -///* 245 */ RPL_STATSSLINE, "%c %s * %s %d %d", +///* 244 */ RPL_STATSHLINE, "%c %s * %s %d %d", +///* 245 */ RPL_STATSSLINE, "%c %s * %s %d %d", ///* 250 */ RPL_STATSCONN,":Highest connection count: %d (%d clients)" ///* 261 */ RPL_TRACELOG, "File %s %d", ///* 262 */ RPL_ENDOFTRACE, "%s :End of TRACE", diff --git a/src/kvirc/sparser/kvi_sp_ctcp.cpp b/src/kvirc/sparser/kvi_sp_ctcp.cpp index 4f0b351fb..f466fe72b 100644 --- a/src/kvirc/sparser/kvi_sp_ctcp.cpp +++ b/src/kvirc/sparser/kvi_sp_ctcp.cpp @@ -1416,7 +1416,7 @@ void KviServerParser::parseCtcpRequestAction(KviCtcpMessage *msg) pOut = KVI_OPTION_BOOL(KviOption_boolExternalMessagesToActiveWindow) ? msg->msg->console()->activeWindow() : msg->msg->console(); } - //see bug ticket #220 + //see bug ticket #220 if(KVI_OPTION_BOOL(KviOption_boolStripMircColorsInUserMessages)) szData = KviMircCntrl::stripControlBytes(szData); diff --git a/src/kvirc/sparser/kvi_sp_literal.cpp b/src/kvirc/sparser/kvi_sp_literal.cpp index 75cd0a78f..3369488fc 100644 --- a/src/kvirc/sparser/kvi_sp_literal.cpp +++ b/src/kvirc/sparser/kvi_sp_literal.cpp @@ -1326,7 +1326,7 @@ void KviServerParser::parseLiteralNotice(KviIrcMessage *msg) pOut->output(KVI_OUT_SERVERNOTICE,"[\r!s\r%Q\r]: %Q",&szNick,&szMsgText); } return; - } else { + } else { //UNKNOWN NOTICE TYPE if(!msg->haltOutput()) { diff --git a/src/kvirc/sparser/kvi_sparser.cpp b/src/kvirc/sparser/kvi_sparser.cpp index d673efd5e..a0143786a 100644 --- a/src/kvirc/sparser/kvi_sparser.cpp +++ b/src/kvirc/sparser/kvi_sparser.cpp @@ -23,7 +23,7 @@ //============================================================================= #define _KVI_SPARSER_CPP_ - + #include "kvi_sparser.h" #include "kvi_window.h" #include "kvi_out.h" @@ -59,14 +59,14 @@ void KviServerParser::parseMessage(const char * message,KviIrcConnection * pConn KviKvsVariantList parms; parms.append(pConnection->decodeText(msg.safePrefix())); parms.append(pConnection->decodeText(msg.command())); - + for(KviStr * str = msg.firstParam();str;str = msg.nextParam()) parms.append(pConnection->console()->decodeText(str->ptr())); if(KviKvsEventManager::instance()->triggerRaw(msg.numeric(),pConnection->console(),&parms)) msg.setHaltOutput(); } - + messageParseProc proc = m_numericParseProcTable[msg.numeric()]; if(proc) { @@ -87,7 +87,7 @@ void KviServerParser::parseMessage(const char * message,KviIrcConnection * pConn if(msg.paramCount() >= 3) // might look like :prefix RPL_WHOIS* <target> <nick> [?] :<something> { kvi_time_t tNow = kvi_unixTime(); - + if((tNow - pConnection->stateData()->lastReceivedWhoisReply()) < 10) { // we're in the middle of a RPL_WHOIS* sequence and haven't @@ -106,22 +106,22 @@ void KviServerParser::parseMessage(const char * message,KviIrcConnection * pConn if(!msg.unrecognized())return; // parsed } } - - + + if(KviKvsEventManager::instance()->hasAppHandlers(KviEvent_OnUnhandledLiteral)) { KviKvsVariantList parms; parms.append(pConnection->decodeText(msg.safePrefix())); parms.append(pConnection->decodeText(msg.command())); - + for(KviStr * str = msg.firstParam();str;str = msg.nextParam()) parms.append(pConnection->console()->decodeText(str->ptr())); - + if(KviKvsEventManager::instance()->trigger(KviEvent_OnUnhandledLiteral,pConnection->console(),&parms)) msg.setHaltOutput(); } } - + // unhandled || unrecognized if(!msg.haltOutput() && !_OUTPUT_MUTE) { diff --git a/src/kvirc/sparser/kvi_sparser.h b/src/kvirc/sparser/kvi_sparser.h index 46f5b6d4d..57470d41a 100644 --- a/src/kvirc/sparser/kvi_sparser.h +++ b/src/kvirc/sparser/kvi_sparser.h @@ -204,7 +204,7 @@ private: void parseCommandHelp(KviIrcMessage *msg); void parseCommandEndOfHelp(KviIrcMessage *msg); void parseChannelHelp(KviIrcMessage *msg); - + void parseLiteralPing(KviIrcMessage *msg); void parseLiteralJoin(KviIrcMessage *msg); void parseLiteralTopic(KviIrcMessage *msg); diff --git a/src/kvirc/ui/kvi_actiondrawer.cpp b/src/kvirc/ui/kvi_actiondrawer.cpp index c6b1c9e39..3258bb01e 100644 --- a/src/kvirc/ui/kvi_actiondrawer.cpp +++ b/src/kvirc/ui/kvi_actiondrawer.cpp @@ -92,7 +92,7 @@ KviActionDrawerPage::KviActionDrawerPage(QWidget * pParent, const QString & szDe : QWidget(pParent) { QGridLayout * pLayout = new QGridLayout(this); - + QString szDesc = "<b>" + szDescription + "</b>"; QLabel * pLabel = new QLabel(szDesc,this); pLayout->addWidget(pLabel,0,0); diff --git a/src/kvirc/ui/kvi_ctcppagedialog.cpp b/src/kvirc/ui/kvi_ctcppagedialog.cpp index d002bae29..3400d0074 100644 --- a/src/kvirc/ui/kvi_ctcppagedialog.cpp +++ b/src/kvirc/ui/kvi_ctcppagedialog.cpp @@ -53,7 +53,7 @@ KviCtcpPageDialog::KviCtcpPageDialog() g->addWidget(m_pTabBar,1,0); g->setRowStretch(0,1); - g->addItem(new QSpacerItem(0, 15), 2, 0); + g->addItem(new QSpacerItem(0, 15), 2, 0); m_pCloseButton = new QPushButton(__tr2qs("Close"),this); connect(m_pCloseButton,SIGNAL(clicked()),this,SLOT(die())); diff --git a/src/kvirc/ui/kvi_htmldialog.cpp b/src/kvirc/ui/kvi_htmldialog.cpp index a0b1b8edc..f42715175 100644 --- a/src/kvirc/ui/kvi_htmldialog.cpp +++ b/src/kvirc/ui/kvi_htmldialog.cpp @@ -41,16 +41,16 @@ KviHtmlDialog::KviHtmlDialog(QWidget * pParent,KviHtmlDialogData * pData) setWindowTitle("KVIrc"); else setWindowTitle(pData->szCaption); - + if(!pData->pixIcon.isNull()) setWindowIcon(QIcon(pData->pixIcon)); QGridLayout * g = new QGridLayout(this); - + QLabel * l; KviTextBrowser * te; QPushButton * pb; - + int iUp = 0; int iDown = 2; @@ -121,7 +121,7 @@ KviHtmlDialog::KviHtmlDialog(QWidget * pParent,KviHtmlDialogData * pData) KviHtmlDialog::~KviHtmlDialog() { - + } void KviHtmlDialog::button1Pressed() diff --git a/src/kvirc/ui/kvi_htmldialog.h b/src/kvirc/ui/kvi_htmldialog.h index 882b2833c..33149e4a0 100644 --- a/src/kvirc/ui/kvi_htmldialog.h +++ b/src/kvirc/ui/kvi_htmldialog.h @@ -40,7 +40,7 @@ class KviHtmlDialogData { public: - KviHtmlDialogData() { + KviHtmlDialogData() { m_pDoc=new QTextDocument(); }; ~KviHtmlDialogData(){delete m_pDoc;}; @@ -57,16 +57,16 @@ public: { htmlResource.insert(key,value); } - + // input - + // mandatory fields enum Flags { ForceMinimumSize = 1 }; int iFlags; // da flags :) int iDefaultButton; // the button to use when Enter is pressed (1,2 or 3) int iCancelButton; // the button to use when Esc is pressed (1,2 or 3) QString szHtmlText; // Shouldn't be empty :D - + // optional fields QString szCaption; // KVIrc is used when this is empty QString szUpperLabelText; // no label is shown if this is empty @@ -91,19 +91,19 @@ public: KviTextBrowser(QWidget *par,KviHtmlDialogData *ht) : QTextBrowser(par), m_pHt(ht){}; ~KviTextBrowser(){}; - virtual QVariant loadResource ( int type, const QUrl & name ) + virtual QVariant loadResource ( int type, const QUrl & name ) { QString p=m_pHt->htmlResource.value(name.path()); debug("resource %s type %d and page %s",name.path().toUtf8().data(),type,p.toUtf8().data()); if (!p.isEmpty()) return QVariant(p); else return QVariant(); - - + + //return QTextBrowser::loadResource(type,name); } protected: KviHtmlDialogData *m_pHt; - + }; class KVIRC_API KviHtmlDialog : public QDialog diff --git a/src/kvirc/ui/kvi_imagedialog.h b/src/kvirc/ui/kvi_imagedialog.h index 7c02c1840..4921f12ce 100644 --- a/src/kvirc/ui/kvi_imagedialog.h +++ b/src/kvirc/ui/kvi_imagedialog.h @@ -81,7 +81,7 @@ protected: QString m_szJobPath; QStringList m_lJobFileList; - + int m_iJobIndexHelper; QString m_szSelectedImage; diff --git a/src/kvirc/ui/kvi_ircviewtools.h b/src/kvirc/ui/kvi_ircviewtools.h index cb29838f5..cf9410b56 100644 --- a/src/kvirc/ui/kvi_ircviewtools.h +++ b/src/kvirc/ui/kvi_ircviewtools.h @@ -120,5 +120,5 @@ protected: virtual void mouseMoveEvent(QMouseEvent *); virtual void mousePressEvent(QMouseEvent *); }; - + #endif //!_KVI_IRCVIEWTOOLS_H_ diff --git a/src/kvirc/ui/kvi_mdimanager.h b/src/kvirc/ui/kvi_mdimanager.h index d56fa082e..6e2a8c827 100644 --- a/src/kvirc/ui/kvi_mdimanager.h +++ b/src/kvirc/ui/kvi_mdimanager.h @@ -212,7 +212,7 @@ protected: * \deprecated Was used by old MDI system */ void childMoved(KviMdiChild * lpC); - + /** * \brief Open the window popup menu */ diff --git a/src/kvirc/ui/kvi_modew.h b/src/kvirc/ui/kvi_modew.h index 07a694aac..5c4495189 100644 --- a/src/kvirc/ui/kvi_modew.h +++ b/src/kvirc/ui/kvi_modew.h @@ -33,10 +33,10 @@ class KviChannel; -class KVIRC_API KviModeWidget : public QFrame +class KVIRC_API KviModeWidget : public QFrame { Q_OBJECT - + public: KviModeWidget(QWidget * par,KviChannel* chan,const char * name=0); ~KviModeWidget(); diff --git a/src/kvirc/ui/kvi_msgbox.cpp b/src/kvirc/ui/kvi_msgbox.cpp index 560e56f06..f91a88d5c 100644 --- a/src/kvirc/ui/kvi_msgbox.cpp +++ b/src/kvirc/ui/kvi_msgbox.cpp @@ -51,7 +51,7 @@ namespace KviMessageBox QMessageBox::warning(0,"KVIrc",s); #endif } - + void information(const QString &fmt,...) { kvi_va_list list; @@ -65,7 +65,7 @@ namespace KviMessageBox QMessageBox::information(0,"KVIrc",s); #endif } - + bool yesNo(const QString &caption,const QString &fmt,...) { kvi_va_list list; diff --git a/src/kvirc/ui/kvi_optionswidget.cpp b/src/kvirc/ui/kvi_optionswidget.cpp index 9d1ee2301..726302998 100644 --- a/src/kvirc/ui/kvi_optionswidget.cpp +++ b/src/kvirc/ui/kvi_optionswidget.cpp @@ -49,7 +49,7 @@ KviOptionsWidget::KviOptionsWidget(QWidget * parent,const char * name,bool) m_szBasicTipStart += __tr2qs("This option is also available as"); m_szBasicTipStart += "<br><nobr>/option <b> "; m_szBasicTipEnd = "</b></nobr></font></center>"; - + } // FIXME: The bSunken value is ignored! //if(bSunken)setFrameStyle(QFrame::StyledPanel | QFrame::Sunken); @@ -597,18 +597,18 @@ KviFontSelector * KviOptionsWidget::addFontSelector(QWidget * pParent,const QStr return d; } -//#define DECLARE_COMMIT_FUNCTION(__fnc,__class,__classString) -// void KviOptionsWidget::__fnc() -// { -// QObjectList * l = queryList(__classString); -// if(!l)return; -// QObjectListIt it(*l); -// while(it.current()) -// { -// ((__class *)it.current())->commit(); -// ++it; -// } -// delete l; +//#define DECLARE_COMMIT_FUNCTION(__fnc,__class,__classString) +// void KviOptionsWidget::__fnc() +// { +// QObjectList * l = queryList(__classString); +// if(!l)return; +// QObjectListIt it(*l); +// while(it.current()) +// { +// ((__class *)it.current())->commit(); +// ++it; +// } +// delete l; // } //DECLARE_COMMIT_FUNCTION(commitBoolSelectors,KviBoolSelector,"KviBoolSelector") diff --git a/src/kvirc/ui/kvi_optionswidget.h b/src/kvirc/ui/kvi_optionswidget.h index cdb2ae9eb..98f579722 100644 --- a/src/kvirc/ui/kvi_optionswidget.h +++ b/src/kvirc/ui/kvi_optionswidget.h @@ -105,7 +105,7 @@ public: KviPasswordSelector * addPasswordSelector(QWidget * pParent,const QString & txt,QString * pOption,bool bEnabled = true); KviPasswordSelector * addPasswordSelector(int x1,int y1,int x2,int y2,const QString & txt,int optId,bool bEnabled = true); KviPasswordSelector * addPasswordSelector(QWidget * pParent,const QString & txt,int optId,bool bEnabled = true); - + KviPixmapSelector * addPixmapSelector(int x1,int y1,int x2,int y2,const QString & txt,int optId,bool bEnabled = true); KviPixmapSelector * addPixmapSelector(int x1,int y1,int x2,int y2,const QString & txt,KviPixmap * pOption,bool bEnabled = true); diff --git a/src/kvirc/ui/kvi_splash.cpp b/src/kvirc/ui/kvi_splash.cpp index d7a7e1dfe..be41002b1 100644 --- a/src/kvirc/ui/kvi_splash.cpp +++ b/src/kvirc/ui/kvi_splash.cpp @@ -90,7 +90,7 @@ KviSplashScreen::KviSplashScreen() // dummy image pix = new QPixmap(300,200); } - + if(g_pApp->findImage(szPix,"kvi_splash_overlay.png")) { m_pOverlay = new QPixmap(szPix); @@ -98,7 +98,7 @@ KviSplashScreen::KviSplashScreen() m_pOverlay = new QPixmap(300,20); } } - + setPixmap(*pix); m_pTimer = new QTimer(this); connect(m_pTimer,SIGNAL(timeout()),this,SLOT(suicide())); diff --git a/src/kvirc/ui/kvi_statusbar.cpp b/src/kvirc/ui/kvi_statusbar.cpp index dcba8c895..cce77c7e7 100644 --- a/src/kvirc/ui/kvi_statusbar.cpp +++ b/src/kvirc/ui/kvi_statusbar.cpp @@ -603,7 +603,7 @@ void KviStatusBar::queueMessage(KviStatusBarMessage * pMsg) m_pMessageQueue->prepend(pMsg); else m_pMessageQueue->append(pMsg); - } else + } else m_pMessageQueue->append(pMsg); if(!m_pMessageTimer) diff --git a/src/kvirc/ui/kvi_statusbar.h b/src/kvirc/ui/kvi_statusbar.h index b00e4bec0..b4035844d 100644 --- a/src/kvirc/ui/kvi_statusbar.h +++ b/src/kvirc/ui/kvi_statusbar.h @@ -32,7 +32,7 @@ * \def VMARGIN Vertical margin * \def HMARGIN Horizontal margin * \def SPACING Spacing between applets -* \def RICHTEXTLABELTRICK +* \def RICHTEXTLABELTRICK */ #include "kvi_settings.h" diff --git a/src/kvirc/ui/kvi_statusbarapplet.cpp b/src/kvirc/ui/kvi_statusbarapplet.cpp index d6704ca31..0ed59478a 100644 --- a/src/kvirc/ui/kvi_statusbarapplet.cpp +++ b/src/kvirc/ui/kvi_statusbarapplet.cpp @@ -202,7 +202,7 @@ KviStatusBarApplet * CreateStatusBarAwayIndicator(KviStatusBar * pBar, KviStatus { KviStatusBarApplet * pApplet = new KviStatusBarAwayIndicator(pBar,pDescriptor); pApplet->setIndex(pBar->insertPermanentWidgetAtTheEnd(pApplet)); - + return pApplet; } @@ -480,7 +480,7 @@ void KviStatusBarClock::fillContextPopup(KviTalPopupMenu * p) QMenu * pMenu = new QMenu(p); QAction * pAction = pMenu->addAction("hh:mm:ss"); pAction->setData(QVariant(KviStatusBarClock::HMS)); - + pAction = pMenu->addAction("hh:mm"); pAction->setData(QVariant(KviStatusBarClock::HM)); connect(pMenu,SIGNAL(triggered(QAction *)),this,SLOT(changeFormat(QAction *))); diff --git a/src/kvirc/ui/kvi_statusbarapplet.h b/src/kvirc/ui/kvi_statusbarapplet.h index be0d3f60c..5230218a2 100644 --- a/src/kvirc/ui/kvi_statusbarapplet.h +++ b/src/kvirc/ui/kvi_statusbarapplet.h @@ -103,7 +103,7 @@ public: bool isSelected(){ return m_bSelected; }; protected: virtual void paintEvent(QPaintEvent * e); - + virtual void fillContextPopup(KviTalPopupMenu *){}; virtual void loadState(const char *, KviConfig *){}; virtual void saveState(const char *, KviConfig *){}; @@ -127,7 +127,7 @@ public: protected: virtual void fillContextPopup(KviTalPopupMenu * p); virtual void timerEvent(QTimerEvent * e); - + virtual void loadState(const char * pcPrefix, KviConfig * pCfg); virtual void saveState(const char * pcPrefix, KviConfig * pCfg); protected slots: diff --git a/src/kvirc/ui/kvi_texticonwin.cpp b/src/kvirc/ui/kvi_texticonwin.cpp index 8f92357eb..bb79f7aa8 100644 --- a/src/kvirc/ui/kvi_texticonwin.cpp +++ b/src/kvirc/ui/kvi_texticonwin.cpp @@ -76,7 +76,7 @@ void KviTextIconWindow::fill() KviPointerHashTable<QString,KviTextIcon> * pDict = g_pTextIconManager->textIconDict(); KviPointerHashTableIterator<QString,KviTextIcon> it(*pDict); - + int iCol = KVI_TEXTICON_COLUMNS; QLabel* newItem; while(KviTextIcon * pIcon = it.current()) diff --git a/src/kvirc/ui/kvi_themedlabel.cpp b/src/kvirc/ui/kvi_themedlabel.cpp index 50a9e472c..b17ed8275 100644 --- a/src/kvirc/ui/kvi_themedlabel.cpp +++ b/src/kvirc/ui/kvi_themedlabel.cpp @@ -121,7 +121,7 @@ void KviThemedLabel::paintEvent ( QPaintEvent * event ) r.setLeft(r.left() + 2); // some margin p.setPen(KVI_OPTION_COLOR(KviOption_colorLabelForeground)); - + p.drawText(r,Qt::AlignLeft | Qt::AlignVCenter,m_szText); } diff --git a/src/kvirc/ui/kvi_themedlabel.h b/src/kvirc/ui/kvi_themedlabel.h index a8fd30bd0..6ec93bba4 100644 --- a/src/kvirc/ui/kvi_themedlabel.h +++ b/src/kvirc/ui/kvi_themedlabel.h @@ -49,7 +49,7 @@ public: QString text() { return m_szText; }; void setAutoHeight(bool value) { m_bAutoHeight=value; }; void applyOptions(); - + // QSize sizeHint(); signals: void doubleClicked(); diff --git a/src/kvirc/ui/kvi_toolbar.cpp b/src/kvirc/ui/kvi_toolbar.cpp index 1fd58c5eb..2eaac7950 100644 --- a/src/kvirc/ui/kvi_toolbar.cpp +++ b/src/kvirc/ui/kvi_toolbar.cpp @@ -67,7 +67,7 @@ void KviToolBar::mousePressEvent(QMouseEvent * e) KviTalToolBar::mousePressEvent(e); return; } - + if(!g_pToolBarContextPopup) g_pToolBarContextPopup = new KviTalPopupMenu(); if(!g_pToolBarIconSizesPopup) diff --git a/src/modules/about/libkviabout.h b/src/modules/about/libkviabout.h index 1b4df4fde..e302d5f4b 100644 --- a/src/modules/about/libkviabout.h +++ b/src/modules/about/libkviabout.h @@ -30,7 +30,7 @@ #include <qtimer.h> #include <qscrollview.h> #include <qpixmap.h> -#include <qlabel.h> +#include <qlabel.h> class KviDlgAbout; @@ -81,7 +81,7 @@ private slots: void close(); private: virtual void closeEvent(QCloseEvent *); - + QLabel * m_pPicLabel; QLabel * m_pTextLabel; QPushButton * m_pButton; diff --git a/src/modules/addon/managementdialog.cpp b/src/modules/addon/managementdialog.cpp index 24841d5f8..b5e57554b 100644 --- a/src/modules/addon/managementdialog.cpp +++ b/src/modules/addon/managementdialog.cpp @@ -125,7 +125,7 @@ KviScriptManagementDialog::KviScriptManagementDialog(QWidget * p) sep = new QFrame(hb); sep->setFrameStyle(QFrame::VLine | QFrame::Sunken); sep->setMinimumWidth(12); - + m_pPackButton = new QToolButton(hb); m_pPackButton->setIcon(*(g_pIconManager->getBigIcon(KVI_BIGICON_PACK))); m_pPackButton->setIconSize(QSize(32,32)); @@ -162,7 +162,7 @@ KviScriptManagementDialog::KviScriptManagementDialog(QWidget * p) g->addWidget(m_pListWidget,1,0); fillListView(); - + currentChanged(0,0); connect(m_pListWidget,SIGNAL(currentItemChanged(QListWidgetItem *,QListWidgetItem *)),this,SLOT(currentChanged(QListWidgetItem *,QListWidgetItem *))); m_pListWidget->setCurrentItem(m_pListWidget->item(0)); @@ -252,12 +252,12 @@ void KviScriptManagementDialog::uninstallScript() QString txt = "<p>"; txt += __tr2qs("Do you really want to uninstall the addon \"%1\" ?").arg(it->addon()->visibleName()); txt += "</p>"; - + if(QMessageBox::question(this, __tr2qs("Confirm addon uninstallation"),txt,__tr2qs("&Yes"),__tr2qs("&No"),0,1) != 0)return; KviKvsScriptAddonManager::instance()->unregisterAddon(it->addon()->name(),g_pActiveWindow); - + fillListView(); currentChanged(0,0); } @@ -282,7 +282,7 @@ void KviScriptManagementDialog::installScript() QString szCmd = "parse \""; szCmd += szFileName; szCmd += "\""; - + KviKvsScript::run(szCmd,g_pActiveWindow); } else if(szFileName.endsWith(".kva")){ qDebug("Addon file .kva"); diff --git a/src/modules/addon/packaddondialog.cpp b/src/modules/addon/packaddondialog.cpp index 1a2e5f8a5..242cef58c 100644 --- a/src/modules/addon/packaddondialog.cpp +++ b/src/modules/addon/packaddondialog.cpp @@ -67,7 +67,7 @@ KviPackAddonDialog::KviPackAddonDialog(QWidget * pParent) // Welcome page QWidget * pPage = new QWidget(this); QGridLayout * pLayout = new QGridLayout(pPage); - + QLabel * pLabel = new QLabel(pPage); QString szText = "<p>"; szText += __tr2qs_ctx("This procedure allows you to export the selected addon to a single package. It is useful when you want to distribute your addon to the public.","addon"); @@ -76,11 +76,11 @@ KviPackAddonDialog::KviPackAddonDialog(QWidget * pParent) szText += "</p><p>"; szText += __tr2qs_ctx("Hit the \"Next\" button to begin.","addon"); szText += "<p>"; - + pLabel->setText(szText); pLayout->addWidget(pLabel,0,0); pLayout->setRowStretch(1,1); - + addPage(pPage,__tr2qs_ctx("Welcome","addon")); setBackEnabled(pPage,false); @@ -274,7 +274,7 @@ KviPackAddonCreateInfoPackageWidget::KviPackAddonCreateInfoPackageWidget(KviPack pLabel = new QLabel(this); pLabel->setText(__tr2qs_ctx("Package Author:","addon")); pLayout->addWidget(pLabel,1,0); - + m_pAuthorNameEdit = new QLineEdit(this); m_pAuthorNameEdit->setText(szPackageAuthor); pLayout->addWidget(m_pAuthorNameEdit,1,1); @@ -282,7 +282,7 @@ KviPackAddonCreateInfoPackageWidget::KviPackAddonCreateInfoPackageWidget(KviPack pLabel = new QLabel(this); pLabel->setText(__tr2qs_ctx("Package Name:","addon")); pLayout->addWidget(pLabel,2,0); - + m_pPackageNameEdit = new QLineEdit(this); m_pPackageNameEdit->setText(szPackageName); pLayout->addWidget(m_pPackageNameEdit,2,1); @@ -290,7 +290,7 @@ KviPackAddonCreateInfoPackageWidget::KviPackAddonCreateInfoPackageWidget(KviPack pLabel = new QLabel(this); pLabel->setText(__tr2qs_ctx("Package Version:","addon")); pLayout->addWidget(pLabel,3,0); - + m_pPackageVersionEdit = new QLineEdit(this); m_pPackageVersionEdit->setText(szPackageVersion); pLayout->addWidget(m_pPackageVersionEdit,3,1); @@ -298,7 +298,7 @@ KviPackAddonCreateInfoPackageWidget::KviPackAddonCreateInfoPackageWidget(KviPack pLabel = new QLabel(this); pLabel->setText(__tr2qs_ctx("Package Description:","addon")); pLayout->addWidget(pLabel,4,0); - + m_pPackageDescriptionEdit = new KviTalTextEdit(this); m_pPackageDescriptionEdit->setBackgroundRole(QPalette::Window); m_pPackageDescriptionEdit->setText(szPackageDescription); @@ -318,7 +318,7 @@ KviPackAddonFileSelectionWidget::KviPackAddonFileSelectionWidget(KviPackAddonDia // Select installer script m_pInstallPathSelector = new KviFileSelector(this,__tr2qs_ctx("Select installer script:","addon"),&szInstallPath,true,0,"*.kvs"); pLayout->addWidget(m_pInstallPathSelector,1,0); - + // Select script dir m_pSourcePathSelector = new KviDirectorySelector(this,__tr2qs_ctx("Select scripts directory:","addon"),&szSourcePath,true); pLayout->addWidget(m_pSourcePathSelector,2,0); diff --git a/src/modules/dcc/adpcmcodec.cpp b/src/modules/dcc/adpcmcodec.cpp index 1afff6ebc..28f35f948 100644 --- a/src/modules/dcc/adpcmcodec.cpp +++ b/src/modules/dcc/adpcmcodec.cpp @@ -25,10 +25,10 @@ // Copyright 1992 by Stichting Mathematisch Centrum, Amsterdam, The Netherlands. // All Rights Reserved // -// Permission to use, copy, modify, and distribute this software and its -// documentation for any purpose and without fee is hereby granted, +// Permission to use, copy, modify, and distribute this software and its +// documentation for any purpose and without fee is hereby granted, // provided that the above copyright notice appear in all copies and that -// both that copyright notice and this permission notice appear in +// both that copyright notice and this permission notice appear in // supporting documentation, and that the names of Stichting Mathematisch // Centrum or CWI not be used in advertising or publicity pertaining to // distribution of the software without specific, written prior permission. @@ -97,10 +97,10 @@ void ADPCM_compress(short indata[],char outdata[],int len,ADPCM_state *state) int index; /* Current step change index */ int outputbuffer = 0; /* place to keep previous 4-bit value */ int bufferstep; /* toggle between outputbuffer/output */ - + lpOut = (signed char *)outdata; lpIn = indata; - + valpred = state->valprev; index = state->index; step = stepsizeTable[index]; @@ -113,7 +113,7 @@ void ADPCM_compress(short indata[],char outdata[],int len,ADPCM_state *state) diff = val - valpred; sign = (diff < 0) ? 8 : 0; if(sign)diff=(-diff); - // Step 2 - Divide and clamp + // Step 2 - Divide and clamp // Note: // This code *approximately* computes: // delta = diff*4/step; @@ -147,7 +147,7 @@ void ADPCM_compress(short indata[],char outdata[],int len,ADPCM_state *state) if ( valpred > 32767 )valpred = 32767; else if ( valpred < -32768 )valpred = -32768; // Step 5 - Assemble value, update index and step values - delta |= sign; + delta |= sign; index += indexTable[delta]; if ( index < 0 ) index = 0; if ( index > 88 ) index = 88; @@ -175,10 +175,10 @@ void ADPCM_uncompress(char indata[],short outdata[],int len,ADPCM_state *state) int index; /* Current step change index */ int inputbuffer=0; /* place to keep next 4-bit value */ int bufferstep; /* toggle between inputbuffer/input */ - + outp = outdata; inp = (signed char *)indata; - + valpred = state->valprev; index = state->index; step = stepsizeTable[index]; @@ -226,7 +226,7 @@ void ADPCM_uncompress(char indata[],short outdata[],int len,ADPCM_state *state) /* Step 7 - Output value */ *outp++ = valpred; } - + state->valprev = valpred; state->index = index; } diff --git a/src/modules/dcc/canvas.cpp b/src/modules/dcc/canvas.cpp index a67edd315..4c17ae666 100644 --- a/src/modules/dcc/canvas.cpp +++ b/src/modules/dcc/canvas.cpp @@ -31,7 +31,7 @@ #include "dialogs.h" #include "marshal.h" #include "canvaswidget.h" - + #define _KVI_DEBUG_CHECK_RANGE_ #include "kvi_debug.h" #include "kvi_options.h" @@ -51,29 +51,29 @@ #include "kvi_settings.h" #include "kvi_themedlabel.h" #include "kvi_ircconnection.h" - + #include <QSplitter> - + extern KviDccBroker * g_pDccBroker; - - + + KviDccCanvas::KviDccCanvas(KviFrame *pFrm,KviDccDescriptor * dcc,const char * name) : KviDccWindow(KVI_WINDOW_TYPE_DCCCANVAS,pFrm,name,dcc) { m_pSplitter = new QSplitter(QSplitter::Vertical,this,"splitter"); - + m_pCanvas = new KviCanvasWidget(m_pSplitter); - + m_pIrcView = new KviIrcView(m_pSplitter,pFrm,this); m_pInput = new KviInput(this); - + // setFocusHandler(m_pInput,this); - + m_pMarshal = new KviDccMarshal(this); connect(m_pMarshal,SIGNAL(error(int)),this,SLOT(handleMarshalError(int))); connect(m_pMarshal,SIGNAL(connected()),this,SLOT(connected())); - - + + if(!(m_pDescriptor->bActive)) { // PASSIVE CONNECTION @@ -81,10 +81,10 @@ int ret = m_pMarshal->dccListen(dcc->szListenIp,dcc->szListenPort,m_pDescriptor->bDoTimeout); if(ret != KviError_success)handleMarshalError(ret); else { - + output(KVI_OUT_DCCMSG,__tr2qs_ctx("Listening on interface %Q port %Q","dcc"), &(m_pMarshal->localIp()),&(m_pMarshal->localPort())); - + if(dcc->bSendRequest) { QString ip = !dcc->szFakeIp.isEmpty() ? dcc->szFakeIp : dcc->szListenIp; @@ -108,10 +108,10 @@ if(ret != KviError_success)handleMarshalError(ret); else output(KVI_OUT_DCCMSG,__tr2qs_ctx("Contacting host %Q on port %Q","dcc"),&(dcc->szIp),&(dcc->szPort)); } - + // m_pSlaveThread = 0; } - + KviDccCanvas::~KviDccCanvas() { g_pDccBroker->unregisterDccWindow(this); @@ -125,7 +125,7 @@ // delete m_pDescriptor; // delete m_pMarshal; } - + const QString & KviDccCanvas::target() { // This may change on the fly... @@ -133,20 +133,20 @@ m_pDescriptor->szNick.toUtf8().data(),m_pDescriptor->szIp.toUtf8().data(),m_pDescriptor->szPort.toUtf8().data()); return m_szTarget; } - + void KviDccCanvas::fillCaptionBuffers() { KviStr tmp(KviStr::Format,"DCC Canvas %s@%s:%s", m_pDescriptor->szNick.toUtf8().data(),m_pDescriptor->szIp.toUtf8().data(),m_pDescriptor->szPort.toUtf8().data()); - + m_szPlainTextCaption = tmp; - + m_szHtmlActiveCaption.sprintf("<nobr><font color=\"%s\"><b>%s</b></font></nobr>", KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name().ascii(),tmp.ptr()); m_szHtmlInactiveCaption.sprintf("<nobr><font color=\"%s\"><b>%s</b></font></nobr>", KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name().ascii(),tmp.ptr()); } - + QPixmap * KviDccCanvas::myIconPtr() { return g_pIconManager->getSmallIcon(KVI_SMALLICON_CANVAS); @@ -165,14 +165,14 @@ m_pDescriptor->szLocalNick.toUtf8().data(),m_pDescriptor->szLocalUser.toUtf8().data(), m_pDescriptor->szLocalHost.toUtf8().data(),text); } - + void KviDccCanvas::ownAction(const char * text) { KviStr buf(KviStr::Format,"%cACTION %s%c\r\n",text); // m_pSlaveThread->sendRawData(buf.ptr(),buf.len()); output(KVI_OUT_ACTION,"%Q %s",&(m_pDescriptor->szLocalNick),text); } - + bool KviDccCanvas::event(QEvent *e) { // if(e->type() == KVI_THREAD_EVENT) @@ -255,7 +255,7 @@ // } return KviWindow::event(e); } - + void KviDccCanvas::resizeEvent(QResizeEvent *e) { int hght = m_pInput->heightHint(); @@ -264,20 +264,20 @@ m_pSplitter->setGeometry(0,0,width(),height() - hght); m_pInput->setGeometry(0,height() - hght,width(),hght); } - + QSize KviDccCanvas::sizeHint() const { QSize ret(m_pIrcView->sizeHint().width(), m_pIrcView->sizeHint().height() + m_pInput->heightHint()); return ret; } - + void KviDccCanvas::handleMarshalError(int err) { QString sss = KviError::getDescription(err); output(KVI_OUT_DCCERROR,__tr2qs_ctx("DCC Failed: %Q","dcc"),&sss); } - + void KviDccCanvas::connected() { output(KVI_OUT_DCCMSG,__tr2qs_ctx("Connected to %Q:%Q","dcc"), @@ -295,6 +295,6 @@ // m_pSlaveThread = new KviDccCanvasThread(this,m_pMarshal->releaseSocket()); // m_pSlaveThread->start(); } - + #include "m_canvas.moc" #endif diff --git a/src/modules/dcc/canvas.h b/src/modules/dcc/canvas.h index 6cc1fc134..3853a33c2 100644 --- a/src/modules/dcc/canvas.h +++ b/src/modules/dcc/canvas.h @@ -30,15 +30,15 @@ #include "descriptor.h" #include "window.h" #include "thread.h" - + #include "kvi_window.h" #include "kvi_string.h" #include "kvi_pointerlist.h" - + class KviDccMarshal; class KviCanvasWidget; class QSplitter; - + class KviDccCanvas : public KviDccWindow { Q_OBJECT diff --git a/src/modules/dcc/canvaswidget.cpp b/src/modules/dcc/canvaswidget.cpp index 69d6e7155..94cc5446b 100644 --- a/src/modules/dcc/canvaswidget.cpp +++ b/src/modules/dcc/canvaswidget.cpp @@ -28,31 +28,31 @@ #include "kvi_string.h" #include "kvi_locale.h" #include "kvi_tal_popupmenu.h" - + #include <QCursor> #include <QPainter> #include <QTextDocument> #include <QLineEdit> #include <QComboBox> #include <QValidator> - + #include <math.h> #include <stdlib.h> - + ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // // KviCanvasRectangleItem // - + KviCanvasRectangleItem::KviCanvasRectangleItem(QCanvas * c,int x,int y,int w,int h) : QCanvasRectangle(x,y,w,h,c) { } - + KviCanvasRectangleItem::~KviCanvasRectangleItem() { } - + void KviCanvasRectangleItem::drawSelection(QPainter &p) { p.setRasterOp(NotROP); @@ -61,7 +61,7 @@ p.drawRect((int)x(),(int)y(),width(),height()); p.setRasterOp(CopyROP); } - + void KviCanvasRectangleItem::setProperty(const QString &property,const QVariant &val) { if(m_properties[property].isValid()) @@ -71,8 +71,8 @@ show(); } } - - + + ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // // KviCanvasPolygon @@ -82,34 +82,34 @@ { m_properties.insert("clrForeground",QVariant(QColor(0,0,0))); m_properties.insert("uLineWidth",QVariant((unsigned int)0)); - + m_properties.insert("clrBackground",QVariant(QColor(0,0,0))); m_properties.insert("bHasBackground",QVariant(false,1)); - + m_dScaleFactor = dScaleFactor; m_points = pnts; - + resetPoints(); move(x,y); } - + KviCanvasPolygon::~KviCanvasPolygon() { } - + void KviCanvasPolygon::setScaleFactor(double dScaleFactor) { m_dScaleFactor = dScaleFactor; resetPoints(); } - + void KviCanvasPolygon::setInternalPoints(const QPointArray &pnts) { m_points = pnts; resetPoints(); - + } - + void KviCanvasPolygon::resetPoints() { QPointArray scaled(m_points.size()); @@ -124,12 +124,12 @@ } setPoints(scaled); } - + int KviCanvasPolygon::rtti() const { return KVI_CANVAS_RTTI_POLYGON; } - + void KviCanvasPolygon::setProperty(const QString &property,const QVariant &val) { if(m_properties[property].isValid()) @@ -149,7 +149,7 @@ } } } - + void KviCanvasPolygon::draw(QPainter &p) { if(isEnabled()) @@ -158,7 +158,7 @@ p.setPen(pen()); p.drawPolygon(areaPoints()); } - + if(isSelected()) { p.setRasterOp(NotROP); @@ -173,29 +173,29 @@ canvas()->setChanged(QRect((int)(x() - dVal),(int)(y() - dVal),(int)(dVal * 4),(int)(dVal * 4))); } } - + ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // // KviCanvasEllipticItem // - + KviCanvasEllipticItem::KviCanvasEllipticItem(QCanvas * c,int x,int y,int w,int h) : KviCanvasRectangleItem(c,x,y,w,h) { m_properties.insert("clrForeground",QVariant(QColor(0,0,0))); m_properties.insert("uLineWidth",QVariant((unsigned int)0)); - + m_properties.insert("clrBackground",QVariant(QColor(0,0,0))); m_properties.insert("bHasBackground",QVariant(false,1)); - + // m_properties.insert("iStartAngle",QVariant(0)); // m_properties.insert("iEndAngle",QVariant(360)); } - + KviCanvasEllipticItem::~KviCanvasEllipticItem() { } - + void KviCanvasEllipticItem::draw(QPainter &p) { if(isEnabled()) @@ -207,14 +207,14 @@ drawContent(p); p.setBrush(b); } - + if(isSelected())drawSelection(p); } - + void KviCanvasEllipticItem::drawContent(QPainter &p) { } - + void KviCanvasEllipticItem::setProperty(const QString & property,const QVariant &val) { if(m_properties[property].isValid()) @@ -228,68 +228,68 @@ } } } - + int KviCanvasEllipticItem::rtti() const { return KVI_CANVAS_RTTI_ELLIPSE; } - - + + ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // // KviCanvasEllipse // - - + + KviCanvasEllipse::KviCanvasEllipse(QCanvas * c,int x,int y,int w,int h) : KviCanvasEllipticItem(c,x,y,w,h) { } - + KviCanvasEllipse::~KviCanvasEllipse() { } - + int KviCanvasEllipse::rtti() const { return KVI_CANVAS_RTTI_ELLIPSE; } - + void KviCanvasEllipse::drawContent(QPainter &p) { p.drawEllipse((int)x(),(int)y(),width(),height()); } - + ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // // KviCanvasPie // - - + + KviCanvasPie::KviCanvasPie(QCanvas * c,int x,int y,int w,int h) : KviCanvasEllipticItem(c,x,y,w,h) { m_properties.insert("iStartAngle",QVariant((int)0)); m_properties.insert("iExtensionAngle",QVariant((int)360)); } - + KviCanvasPie::~KviCanvasPie() { } - + int KviCanvasPie::rtti() const { return KVI_CANVAS_RTTI_PIE; } - + void KviCanvasPie::drawContent(QPainter &p) { int iStartAngle = m_properties["iStartAngle"].asInt() * 16; int iEndAngle = m_properties["iExtensionAngle"].asInt() * 16; p.drawPie((int)x(),(int)y(),width(),height(),iStartAngle,iEndAngle); } - - + + ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // // KviCanvasChord @@ -300,23 +300,23 @@ m_properties.insert("iStartAngle",QVariant((int)0)); m_properties.insert("iExtensionAngle",QVariant((int)360)); } - + KviCanvasChord::~KviCanvasChord() { } - + int KviCanvasChord::rtti() const { return KVI_CANVAS_RTTI_CHORD; } - + void KviCanvasChord::drawContent(QPainter &p) { int iStartAngle = m_properties["iStartAngle"].asInt() * 16; int iEndAngle = m_properties["iExtensionAngle"].asInt() * 16; p.drawChord((int)x(),(int)y(),width(),height(),iStartAngle,iEndAngle); } - + ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // // KviCanvasRectangle @@ -326,20 +326,20 @@ { m_properties.insert("clrForeground",QVariant(QColor(0,0,0))); m_properties.insert("uLineWidth",QVariant((unsigned int)0)); - + m_properties.insert("clrBackground",QVariant(QColor(0,0,0))); m_properties.insert("bHasBackground",QVariant(false,1)); } - + KviCanvasRectangle::~KviCanvasRectangle() { } - + int KviCanvasRectangle::rtti() const { return KVI_CANVAS_RTTI_RECTANGLE; } - + void KviCanvasRectangle::setProperty(const QString &property,const QVariant &val) { if(m_properties[property].isValid()) @@ -353,7 +353,7 @@ } } } - + void KviCanvasRectangle::draw(QPainter & p) { if(isEnabled()) @@ -365,10 +365,10 @@ p.setPen(pen()); p.drawRect((int)x(),(int)y(),width(),height()); } - + if(isSelected())drawSelection(p); } - + ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // // KviCanvasRichText @@ -382,16 +382,16 @@ m_properties.insert("szText",QVariant(QString("<center>Insert here your <font color=\"#FF0000\"><b>RICH TEXT</b></font></center>"))); m_properties.insert("fntDefault",QVariant(f)); } - + KviCanvasRichText::~KviCanvasRichText() { } - + int KviCanvasRichText::rtti() const { return KVI_CANVAS_RTTI_RICHTEXT; } - + void KviCanvasRichText::draw(QPainter & p) { if(isEnabled()) @@ -401,11 +401,11 @@ text.setWidth(width()); text.draw(&p,(int)x() + 1,(int)y() + 1,QRegion(QRect((int)x() + 1,(int)y() + 1,width(),height())),QColorGroup()); } - + if(isSelected())drawSelection(p); } - - + + ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // // KviCanvasLine @@ -417,11 +417,11 @@ m_properties.insert("uLineWidth",QVariant((unsigned int)0)); m_properties.insert("clrForeground",QVariant(QColor())); } - + KviCanvasLine::~KviCanvasLine() { } - + void KviCanvasLine::setProperty(const QString &property,const QVariant &val) { m_properties.replace(property,val); @@ -430,12 +430,12 @@ setPen(QPen(m_properties["clrForeground"].asColor(),m_properties["uLineWidth"].toInt())); } } - + int KviCanvasLine::rtti() const { return KVI_CANVAS_RTTI_LINE; } - + void KviCanvasLine::draw(QPainter &p) { if(isEnabled()) @@ -443,7 +443,7 @@ p.setPen(pen()); p.drawLine(startPoint(),endPoint()); } - + if(isSelected()) { p.setRasterOp(NotROP); @@ -452,7 +452,7 @@ p.setRasterOp(CopyROP); } } - + ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // // KviCanvasView @@ -466,85 +466,85 @@ m_pSelectedItem = 0; viewport()->setMouseTracking(true); } - + KviCanvasView::~KviCanvasView() { } - + void KviCanvasView::insertRectangle() { m_state = SelectOrigin; setCursor(crossCursor); m_objectToInsert = Rectangle; } - + void KviCanvasView::insertRichText() { m_state = SelectOrigin; setCursor(crossCursor); m_objectToInsert = RichText; } - + void KviCanvasView::insertLine() { m_state = SelectOrigin; setCursor(crossCursor); m_objectToInsert = Line; } - + void KviCanvasView::insertEllipse() { m_state = SelectOrigin; setCursor(crossCursor); m_objectToInsert = Ellipse; } - + void KviCanvasView::insertPie() { m_state = SelectOrigin; setCursor(crossCursor); m_objectToInsert = Pie; } - + void KviCanvasView::insertChord() { m_state = SelectOrigin; setCursor(crossCursor); m_objectToInsert = Chord; } - + void KviCanvasView::insertPolygonTriangle() { m_state = SelectOrigin; setCursor(crossCursor); m_objectToInsert = PolygonTriangle; } - + void KviCanvasView::insertPolygonRectangle() { m_state = SelectOrigin; setCursor(crossCursor); m_objectToInsert = PolygonRectangle; } - + void KviCanvasView::insertPolygonPentagon() { m_state = SelectOrigin; setCursor(crossCursor); m_objectToInsert = PolygonPentagon; } - + void KviCanvasView::insertPolygonHexagon() { m_state = SelectOrigin; setCursor(crossCursor); m_objectToInsert = PolygonPentagon; } - + #ifndef M_PI #define M_PI 3.14159265358979323846 #endif - + static void calcPolygonPoints(QPointArray &pnts,unsigned int nVertices) { double dDelta = (2 * M_PI) / nVertices; @@ -556,11 +556,11 @@ pnts.setPoint(i,(int)theX,(int)theY); } } - + void KviCanvasView::insertObjectAt(const QPoint & pnt,ObjectType o) { QCanvasItem * r = 0; - + switch(o) { case Rectangle: @@ -615,14 +615,14 @@ } break; } - + if(r) { setItemSelected(r); r->setEnabled(true); r->show(); } - + switch(KVI_CANVAS_RTTI_CONTROL_TYPE(r)) { case KVI_CANVAS_RTTI_CONTROL_TYPE_RECTANGLE: @@ -635,19 +635,19 @@ // beginDragPolygon((KviCanvasPolygon *)r,pnt,true); // break; } - + // canvas()->update(); } - + void KviCanvasView::setItemSelected(QCanvasItem * it) { clearSelection(); it->setSelected(true); m_pSelectedItem = it; m_pCanvasWidget->m_pPropertiesWidget->editItem(it); - + } - + void KviCanvasView::clearSelection() { if(!m_pSelectedItem)return; @@ -655,27 +655,27 @@ m_pSelectedItem = 0; m_pCanvasWidget->m_pPropertiesWidget->editItem(0); } - + void KviCanvasView::beginDragLine(KviCanvasLine * it,const QPoint &p,bool bInitial) { QPoint sp = it->startPoint(); - + m_dragBegin = p - sp; - + if(bInitial) { m_dragMode = Bottom; setCursor(sizeAllCursor); return; } - + if((abs(p.x() - sp.x()) < 3) && (abs(p.y() - sp.y()) < 3)) { m_dragMode = Top; setCursor(sizeAllCursor); return; } - + sp = it->endPoint(); if((abs(p.x() - sp.x()) < 3) && (abs(p.y() - sp.y()) < 3)) { @@ -683,11 +683,11 @@ setCursor(sizeAllCursor); return; } - + m_dragMode = All; setCursor(pointingHandCursor); } - + void KviCanvasView::dragLine(KviCanvasLine * it,const QPoint &p) { switch(m_dragMode) @@ -716,7 +716,7 @@ } canvas()->update(); } - + static double ssm_2d_rotationAngleFromXAxis(double dx,double dy) { // @@ -724,24 +724,24 @@ //acos(---------) = acos(-----------------) = acos(---------) // |v1||v2| |(dx,dy)| * 1 |(dx,dy)| // - + //double dVal = hypot(dx,dy); double dVal = sqrt((dx * dx) + (dy * dy)); - + if(dVal == 0.0)return 0; // ??? - + dVal = acos(dx / dVal); - + return (dy > 0.0) ? dVal : -dVal; } - + static double ssm_2d_rotationAngle(double drefx,double drefy,double drotatedx,double drotatedy) { double dRefAngle = ssm_2d_rotationAngleFromXAxis(drefx,drefy); double dRotAngle = ssm_2d_rotationAngleFromXAxis(drotatedx,drotatedy); return dRotAngle - dRefAngle; } - + static void ssm_2d_rotate(double &dx,double &dy,double dAngle) { // Rotation matrix: @@ -749,28 +749,28 @@ // | cos(x) sin(x) | // | | // | -sin(x) cos(x) | - + double s = sin(dAngle); double c = cos(dAngle); - + double tmpX = (dx * c) - (dy * s); double tmpY = (dx * s) + (dy * c); - + dx = tmpX; dy = tmpY; } - + static double ssm_hypot(double a,double b) { return sqrt((a * a) + (b * b)); } - + void KviCanvasView::beginDragPolygon(KviCanvasPolygon * it,const QPoint &p,bool bShift,bool bCtrl) { m_dragBegin = QPoint((int)(p.x() - it->x()),(int)(p.y() - it->y())); - + QPointArray pa = it->areaPoints(); - + for(unsigned int i=0;i<pa.size();i++) { QPoint pnt = pa.point(i); @@ -786,7 +786,7 @@ return; } } - + if(bShift) { m_dragMode = Scale; @@ -794,7 +794,7 @@ setCursor(sizeAllCursor); return; } - + if(bCtrl) { m_dragMode = Rotate; @@ -803,11 +803,11 @@ setCursor(sizeHorCursor); return; } - + m_dragMode = All; setCursor(pointingHandCursor); } - + void KviCanvasView::dragPolygon(KviCanvasPolygon * it,const QPoint &p) { switch(m_dragMode) @@ -853,11 +853,11 @@ } canvas()->update(); } - + void KviCanvasView::beginDragRectangle(KviCanvasRectangleItem * it,const QPoint & p,bool bInitial) { m_dragBegin = QPoint((int)(p.x() - it->x()),(int)(p.y() - it->y())); - + if(bInitial) { // Right bottom @@ -865,7 +865,7 @@ setCursor(sizeFDiagCursor); return; } - + if(p.x() < (((int)it->x()) + 2)) { // Left edge @@ -887,7 +887,7 @@ setCursor(sizeHorCursor); return; } - + if(p.x() > (it->right() - 2)) { // Right edge @@ -909,7 +909,7 @@ setCursor(sizeHorCursor); return; } - + // Somewhere in the middle if(p.y() < (((int)it->y()) + 2)) { @@ -925,16 +925,16 @@ setCursor(sizeVerCursor); return; } - + m_dragMode = All; setCursor(pointingHandCursor); } - + void KviCanvasView::dragRectangle(KviCanvasRectangleItem * it,const QPoint & p) { - + int aux1,aux2,aux3,aux4; - + switch(m_dragMode) { case All: @@ -1026,10 +1026,10 @@ default: break; } - + canvas()->update(); } - + void KviCanvasView::contentsMouseMoveEvent(QMouseEvent *e) { // QPoint p = inverseWorldMatrix().map(e->pos()); @@ -1058,7 +1058,7 @@ { QCanvasItemList l = canvas()->collisions(p); QCanvasItemList::Iterator it = l.begin(); - + if(it != l.end()) { // Got an item @@ -1086,7 +1086,7 @@ } } } - + void KviCanvasView::contentsMouseReleaseEvent(QMouseEvent *e) { if(m_dragMode != None) @@ -1101,14 +1101,14 @@ } } } - + void KviCanvasView::contentsMousePressEvent(QMouseEvent *e) { if(e->button() & Qt::LeftButton) { // QPoint p = inverseWorldMatrix().map(e->pos()); QPoint p = e->pos(); - + switch(m_state) { case SelectOrigin: @@ -1118,12 +1118,12 @@ insertObjectAt(p,m_objectToInsert); canvas()->update(); break; - + case Idle: { QCanvasItemList l = canvas()->collisions(p); QCanvasItemList::Iterator it = l.begin(); - + if(it != l.end()) { // Got an item @@ -1157,11 +1157,11 @@ } } } - + void KviCanvasView::propertyChanged(const QString &s,const QVariant &v) { if(!m_pSelectedItem)return; - + switch(KVI_CANVAS_RTTI_CONTROL_TYPE(m_pSelectedItem)) { case KVI_CANVAS_RTTI_CONTROL_TYPE_RECTANGLE: @@ -1174,11 +1174,11 @@ ((KviCanvasPolygon *)m_pSelectedItem)->setProperty(s,v); break; } - + canvas()->update(); } - - + + ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // // KviVariantTableItem @@ -1188,11 +1188,11 @@ { m_property = property; } - + KviVariantTableItem::~KviVariantTableItem() { } - + QWidget * KviVariantTableItem::createEditor() const { switch(m_property.type()) @@ -1268,7 +1268,7 @@ b->insertItem(tmpDefault + ", 40"); b->insertItem(tmpDefault + ", 48"); b->insertItem(f.family() + ", 12"); - b->setCurrentItem(0); + b->setCurrentItem(0); b->setCurrentItem(m_property.toBool() ? 1 : 0); return b; } @@ -1278,7 +1278,7 @@ } return 0; } - + void KviVariantTableItem::setContentFromEditor(QWidget * w) { switch(m_property.type()) @@ -1320,11 +1320,11 @@ break; } } - + void KviVariantTableItem::paint(QPainter *p,const QColorGroup &cg,const QRect &cr,bool) { p->fillRect(0,0,cr.width(),cr.height(),cg.base()); - + if(m_property.type() == QVariant::Color) { p->fillRect(3,3,cr.width() - 6,cr.height() - 6,m_property.asColor()); @@ -1356,8 +1356,8 @@ p->drawText(0,0,cr.width(),cr.height(),Qt::AlignLeft | Qt::AlignTop,sz); } } - - + + ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // // KviCanvasItemPropertiesWidget @@ -1375,11 +1375,11 @@ verticalHeader()->hide(); connect(this,SIGNAL(valueChanged(int,int)),this,SLOT(cellEdited(int,int))); } - + KviCanvasItemPropertiesWidget::~KviCanvasItemPropertiesWidget() { } - + void KviCanvasItemPropertiesWidget::cellEdited(int row,int) { QTableItem * it = item(row,0); @@ -1389,7 +1389,7 @@ if(!it)return; emit propertyChanged(szName,((KviVariantTableItem *)it)->property()); } - + void KviCanvasItemPropertiesWidget::editItem(QCanvasItem * it) { if(!it) @@ -1403,9 +1403,9 @@ setNumRows(0); return; } - + QMap<QString,QVariant> * m = 0; - + switch(KVI_CANVAS_RTTI_CONTROL_TYPE(it)) { case KVI_CANVAS_RTTI_CONTROL_TYPE_RECTANGLE: @@ -1418,26 +1418,26 @@ m = ((KviCanvasPolygon *)it)->properties(); break; } - + if(!m) { editItem(0); return; } - + for(int i=0;i<numRows();i++) { clearCell(i,0); clearCell(i,1); clearCellWidget(i,1); } - + setNumRows(m->count()); - + QTableItem * item; - + int idx = 0; - + for(QMap<QString,QVariant>::ConstIterator iter = m->begin();iter != m->end();++iter) { item = new QTableItem(this,QTableItem::Never,iter.key().toUtf8().data()); @@ -1446,9 +1446,9 @@ setItem(idx,1,item); idx++; } - + } - + ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // // KviCanvasWidget @@ -1468,9 +1468,9 @@ l.append(80); l.append(20); m_pSplitter->setSizes(l); - + connect(m_pPropertiesWidget,SIGNAL(propertyChanged(const QString &,const QVariant &)),m_pCanvasView,SLOT(propertyChanged(const QString &,const QVariant &))); - + KviTalPopupMenu * add = new KviTalPopupMenu(m_pMenuBar); KviTalPopupMenu * shapes = new KviTalPopupMenu(add); KviTalPopupMenu * polygons = new KviTalPopupMenu(add); @@ -1480,25 +1480,25 @@ shapes->insertItem(__tr2qs_ctx("&Ellipse","dcc"),m_pCanvasView,SLOT(insertEllipse())); shapes->insertItem(__tr2qs_ctx("&Pie","dcc"),m_pCanvasView,SLOT(insertPie())); shapes->insertItem(__tr2qs_ctx("&Chord","dcc"),m_pCanvasView,SLOT(insertChord())); - + items->insertItem(__tr2qs_ctx("&Rich text (html)","dcc"),m_pCanvasView,SLOT(insertRichText())); - + polygons->insertItem(__tr2qs_ctx("&Triangle","dcc"),m_pCanvasView,SLOT(insertPolygonTriangle())); polygons->insertItem(__tr2qs_ctx("&Rectangle","dcc"),m_pCanvasView,SLOT(insertPolygonRectangle())); polygons->insertItem(__tr2qs_ctx("&Pentagon","dcc"),m_pCanvasView,SLOT(insertPolygonPentagon())); polygons->insertItem(__tr2qs_ctx("&Hexagon","dcc"),m_pCanvasView,SLOT(insertPolygonHexagon())); - + add->insertItem(__tr2qs_ctx("&Shape","dcc"),shapes); add->insertItem(__tr2qs_ctx("&Item","dcc"),items); add->insertItem(__tr2qs_ctx("&Polygons","dcc"),polygons); - + m_pMenuBar->insertItem(__tr2qs_ctx("&Insert","dcc"),add); } - + KviCanvasWidget::~KviCanvasWidget() { } - + void KviCanvasWidget::resizeEvent(QResizeEvent *) { int h = m_pMenuBar->sizeHint().height(); @@ -1507,6 +1507,6 @@ m_pStatusLabel->setGeometry(0,height() - h2,width(),h2); m_pSplitter->setGeometry(0,h,width(),height() - (h + h2)); } - + #include "m_canvaswidget.moc" #endif diff --git a/src/modules/dcc/canvaswidget.h b/src/modules/dcc/canvaswidget.h index f3da02409..84eee1c41 100644 --- a/src/modules/dcc/canvaswidget.h +++ b/src/modules/dcc/canvaswidget.h @@ -34,15 +34,15 @@ #include <QVariant> #include <QTable> #include <QSplitter> - + class KviCanvasWidget; - + #define KVI_CANVAS_RTTI_CONTROL_TYPE_RECTANGLE 1 #define KVI_CANVAS_RTTI_CONTROL_TYPE_LINE 2 #define KVI_CANVAS_RTTI_CONTROL_TYPE_POLYGON 4 - + #define KVI_CANVAS_RTTI_CONTROL_TYPE_MASK 255 - + #define KVI_CANVAS_RTTI_RECTANGLE (KVI_CANVAS_RTTI_CONTROL_TYPE_RECTANGLE | (1 << 8)) #define KVI_CANVAS_RTTI_RICHTEXT (KVI_CANVAS_RTTI_CONTROL_TYPE_RECTANGLE | (2 << 8)) #define KVI_CANVAS_RTTI_LINE (KVI_CANVAS_RTTI_CONTROL_TYPE_LINE | (3 << 8)) @@ -50,11 +50,11 @@ #define KVI_CANVAS_RTTI_CHORD (KVI_CANVAS_RTTI_CONTROL_TYPE_RECTANGLE | (5 << 8)) #define KVI_CANVAS_RTTI_PIE (KVI_CANVAS_RTTI_CONTROL_TYPE_RECTANGLE | (6 << 8)) #define KVI_CANVAS_RTTI_POLYGON (KVI_CANVAS_RTTI_CONTROL_TYPE_POLYGON | (7 << 8)) - + #define KVI_CANVAS_RTTI_CONTROL_TYPE(__item) (__item->rtti() & KVI_CANVAS_RTTI_CONTROL_TYPE_MASK) - - - + + + class KviCanvasPolygon : public QCanvasPolygon { public: @@ -75,8 +75,8 @@ virtual void setProperty(const QString &property,const QVariant &val); virtual int rtti() const; }; - - + + class KviCanvasRectangleItem : public QCanvasRectangle { friend class KviCanvasRectangle; @@ -97,8 +97,8 @@ protected: void drawSelection(QPainter &p); }; - - + + class KviCanvasEllipticItem : public KviCanvasRectangleItem { friend class KviCanvasEllipse; @@ -113,8 +113,8 @@ virtual void drawContent(QPainter & p); virtual int rtti() const; }; - - + + class KviCanvasEllipse : public KviCanvasEllipticItem { public: @@ -124,8 +124,8 @@ virtual void drawContent(QPainter & p); virtual int rtti() const; }; - - + + class KviCanvasPie : public KviCanvasEllipticItem { public: @@ -135,8 +135,8 @@ virtual void drawContent(QPainter & p); virtual int rtti() const; }; - - + + class KviCanvasChord : public KviCanvasEllipticItem { public: @@ -146,8 +146,8 @@ virtual void drawContent(QPainter & p); virtual int rtti() const; }; - - + + class KviCanvasLine : public QCanvasLine { public: @@ -162,8 +162,8 @@ virtual void draw(QPainter & p); virtual int rtti() const; }; - - + + class KviCanvasRectangle : public KviCanvasRectangleItem { public: @@ -174,8 +174,8 @@ virtual void setProperty(const QString &property,const QVariant &val); virtual int rtti() const; }; - - + + class KviCanvasRichText : public KviCanvasRectangleItem { public: @@ -185,8 +185,8 @@ virtual void draw(QPainter & p); virtual int rtti() const; }; - - + + class KviCanvasView : public QCanvasView { Q_OBJECT @@ -206,14 +206,14 @@ }; protected: KviCanvasWidget * m_pCanvasWidget; - + // Insertion of objects State m_state; ObjectType m_objectToInsert; - + // Selected item QCanvasItem * m_pSelectedItem; - + DragMode m_dragMode; QPoint m_dragBegin; double m_dragScaleFactor; @@ -222,13 +222,13 @@ protected: void beginDragRectangle(KviCanvasRectangleItem * it,const QPoint &p,bool bInitial = false); void dragRectangle(KviCanvasRectangleItem * it,const QPoint & p); - + void beginDragLine(KviCanvasLine * it,const QPoint &p,bool bInitial = false); void dragLine(KviCanvasLine * it,const QPoint &p); - + void beginDragPolygon(KviCanvasPolygon * it,const QPoint &p,bool bShift = false,bool bCtrl = false); void dragPolygon(KviCanvasPolygon * it,const QPoint &p); - + void setItemSelected(QCanvasItem * it); void clearSelection(); void insertObjectAt(const QPoint & pnt,ObjectType o); @@ -248,7 +248,7 @@ void insertPolygonHexagon(); void propertyChanged(const QString &s,const QVariant &v); }; - + class KviVariantTableItem : public QTableItem { @@ -263,8 +263,8 @@ QVariant & property(){ return m_property; }; virtual void paint(QPainter *p,const QColorGroup &cg,const QRect &cr,bool selected); }; - - + + class KviCanvasItemPropertiesWidget : public QTable { Q_OBJECT @@ -278,8 +278,8 @@ signals: void propertyChanged(const QString &s,const QVariant &v); }; - - + + class KviCanvasWidget : public QWidget { friend class KviCanvasView; diff --git a/src/modules/dcc/descriptor.cpp b/src/modules/dcc/descriptor.cpp index f8d98b987..46ed03a21 100644 --- a/src/modules/dcc/descriptor.cpp +++ b/src/modules/dcc/descriptor.cpp @@ -52,9 +52,9 @@ KviDccDescriptor::KviDccDescriptor(KviConsole * pConsole) m_uId = g_uNextDescriptorId; g_uNextDescriptorId++; - + m_szId.setNum(m_uId); - + if(!g_pDescriptorDict) { g_pDescriptorDict = new KviPointerHashTable<int,KviDccDescriptor>; @@ -102,7 +102,7 @@ KviDccDescriptor::~KviDccDescriptor() else { if(!(g_pApp->windowExists(pEventWindow)))pEventWindow = g_pApp->activeConsole(); } - + if(pEventWindow) { // recheck it again... @@ -150,7 +150,7 @@ KviDccDescriptor * KviDccDescriptor::find(unsigned int uId) void KviDccDescriptor::copyFrom(const KviDccDescriptor &src) { m_uId = g_uNextDescriptorId; - g_uNextDescriptorId++; + g_uNextDescriptorId++; m_szId.setNum(m_uId); if(!g_pDescriptorDict) diff --git a/src/modules/dcc/descriptor.h b/src/modules/dcc/descriptor.h index a735d5223..ac4eadb22 100644 --- a/src/modules/dcc/descriptor.h +++ b/src/modules/dcc/descriptor.h @@ -45,10 +45,10 @@ protected: unsigned int m_uId; // this dcc session ID QString m_szId; - + KviDccWindow * m_pDccWindow; // 0 if it has no window KviDccFileTransfer * m_pDccTransfer; // 0 if it is not a transfer - + bool m_bCreationEventTriggered; public: // A console that this DCC is bound to (might be replaced while we wait for user acknowledge in dialogs) @@ -57,7 +57,7 @@ public: KviDccWindow * window() const { return m_pDccWindow; }; void setWindow(KviDccWindow * w){ m_pDccWindow = w; }; - + KviDccFileTransfer * transfer() const { return m_pDccTransfer; }; void setTransfer(KviDccFileTransfer * t){ m_pDccTransfer = t; }; diff --git a/src/modules/dcc/dialogs.cpp b/src/modules/dcc/dialogs.cpp index 041064569..d6b0b073e 100644 --- a/src/modules/dcc/dialogs.cpp +++ b/src/modules/dcc/dialogs.cpp @@ -140,7 +140,7 @@ KviDccRenameBox::KviDccRenameBox(KviDccBroker * br,KviDccDescriptor * dcc,const //QHBoxLayout *hb = new QHBoxLayout(4); QHBoxLayout *hb = new QHBoxLayout(); hb->setSpacing(4); - vb->addLayout(hb,Qt::AlignCenter); + vb->addLayout(hb,Qt::AlignCenter); QPushButton * btn = new QPushButton(__tr2qs_ctx("&Rename","dcc"),this); hb->addWidget(btn); diff --git a/src/modules/dcc/gsmcodec.cpp b/src/modules/dcc/gsmcodec.cpp index ee0689eb0..4b9bf2f45 100644 --- a/src/modules/dcc/gsmcodec.cpp +++ b/src/modules/dcc/gsmcodec.cpp @@ -28,30 +28,30 @@ #ifdef COMPILE_USE_GSM #include <dlfcn.h> - + #define GSM_PACKED_FRAME_SIZE_IN_BYTES 33 #define GSM_UNPACKED_FRAME_SIZE_IN_BYTES 320 #define GSM_UNPACKED_FRAME_SIZE_IN_SHORTS 160 - + void * (*gsm_session_create)() = 0; void (*gsm_session_destroy)(void *) = 0; void (*gsm_session_encode)(void *,short *,unsigned char *) = 0; int (*gsm_session_decode)(void *,unsigned char *,short *) = 0; - + void * g_pGSMCodecLibraryHandle = 0; - + bool kvi_gsm_codec_init() { if(g_pGSMCodecLibraryHandle)return true; // Already initialized - + g_pGSMCodecLibraryHandle = dlopen("libgsm.so",RTLD_NOW | RTLD_GLOBAL); if(!g_pGSMCodecLibraryHandle)return false; // no way to open it - + gsm_session_create = (void * (*)()) dlsym(g_pGSMCodecLibraryHandle,"gsm_create"); gsm_session_destroy = (void (*)(void *)) dlsym(g_pGSMCodecLibraryHandle,"gsm_destroy"); gsm_session_encode = (void (*)(void *,short *,unsigned char *)) dlsym(g_pGSMCodecLibraryHandle,"gsm_encode"); gsm_session_decode = (int (*)(void *,unsigned char *,short *)) dlsym(g_pGSMCodecLibraryHandle,"gsm_decode"); - + if(! (gsm_session_create && gsm_session_destroy && gsm_session_encode && gsm_session_decode)) { dlclose(g_pGSMCodecLibraryHandle); @@ -60,7 +60,7 @@ } return true; } - + void kvi_gsm_codec_done() { if(g_pGSMCodecLibraryHandle) @@ -69,8 +69,8 @@ g_pGSMCodecLibraryHandle = 0; } } - - + + KviDccVoiceGsmCodec::KviDccVoiceGsmCodec() : KviDccVoiceCodec() { @@ -78,26 +78,26 @@ m_pDecodeState = gsm_session_create(); m_szName = "gsm (compression 33:320)"; } - + KviDccVoiceGsmCodec::~KviDccVoiceGsmCodec() { gsm_session_destroy(m_pEncodeState); gsm_session_destroy(m_pDecodeState); } - + void KviDccVoiceGsmCodec::encode(KviDataBuffer * signal,KviDataBuffer * stream) { if(signal->size() < GSM_UNPACKED_FRAME_SIZE_IN_BYTES)return; // nothing to encode - + unsigned char * ptr = signal->data(); - + int uFrames = signal->size() / GSM_UNPACKED_FRAME_SIZE_IN_BYTES; int uTotalDataCompressed = uFrames * GSM_UNPACKED_FRAME_SIZE_IN_BYTES; int uFrameOffset = stream->size(); unsigned char * endPtr = ptr + uTotalDataCompressed; - + stream->addSize(GSM_PACKED_FRAME_SIZE_IN_BYTES * uFrames); - + while(ptr != endPtr) { gsm_session_encode(m_pEncodeState,(short *)ptr,stream->data() + uFrameOffset); @@ -106,21 +106,21 @@ } signal->remove(uTotalDataCompressed); } - + void KviDccVoiceGsmCodec::decode(KviDataBuffer * stream,KviDataBuffer * signal) { if(stream->size() < GSM_PACKED_FRAME_SIZE_IN_BYTES)return; // nothing to decode - + unsigned char * ptr = stream->data(); - + // Gsm codec int uFrames = stream->size() / GSM_PACKED_FRAME_SIZE_IN_BYTES; int uTotalDataDecompressed = uFrames * GSM_PACKED_FRAME_SIZE_IN_BYTES; int uSignalOffset = signal->size(); unsigned char * endPtr = ptr + (uTotalDataDecompressed); - + signal->addSize(GSM_UNPACKED_FRAME_SIZE_IN_BYTES * uFrames); - + while(ptr != endPtr) { // We don't check the return value here @@ -134,12 +134,12 @@ } stream->remove(uTotalDataDecompressed); } - + int KviDccVoiceGsmCodec::encodedFrameSize() { return GSM_PACKED_FRAME_SIZE_IN_BYTES; } - + int KviDccVoiceGsmCodec::decodedFrameSize() { return GSM_UNPACKED_FRAME_SIZE_IN_BYTES; diff --git a/src/modules/dcc/marshal.cpp b/src/modules/dcc/marshal.cpp index 3a2a098a6..499828f02 100644 --- a/src/modules/dcc/marshal.cpp +++ b/src/modules/dcc/marshal.cpp @@ -115,7 +115,7 @@ int KviDccMarshal::dccListen(const QString &ip,const QString &port,bool bUseTime m_bOutgoing = false; m_bUseTimeout = bUseTimeout; - + if(m_pTimeoutTimer) { delete m_pTimeoutTimer; diff --git a/src/modules/dcc/send.h b/src/modules/dcc/send.h index 02520b37d..282cab123 100644 --- a/src/modules/dcc/send.h +++ b/src/modules/dcc/send.h @@ -192,10 +192,10 @@ private: kvi_time_t m_tTransferEndTime; // cached stats unsigned long m_uTotalFileSize; // total file size to transfer - + unsigned int m_uMaxBandwidth; KviDccFileTransferBandwidthDialog * m_pBandwidthDialog; - + QTimer * m_pResumeTimer; // used to signal resume timeout public: bool resumeAccepted(const char * filename,const char * port,const char *szZeroPortTag); @@ -221,12 +221,12 @@ public: virtual bool active(); virtual QString tipText(); virtual QString localFileName(); - + bool isFileUpload(){ return m_pDescriptor->isFileUpload(); }; unsigned int averageSpeed(); unsigned int transferredBytes(); - + int bandwidthLimit(); void setBandwidthLimit(int iVal); protected: diff --git a/src/modules/ident/libkviident.cpp b/src/modules/ident/libkviident.cpp index 8eda1ac8a..99631e424 100644 --- a/src/modules/ident/libkviident.cpp +++ b/src/modules/ident/libkviident.cpp @@ -274,7 +274,7 @@ void KviIdentDaemon::run() #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) /* * under windows, ipv6 hosts behind an ipv4 NAT can use Teredo to be reachable from the outer internet using their - * ipv6 address; the default protection level doesn't permit this, so we need to set this socket option + * ipv6 address; the default protection level doesn't permit this, so we need to set this socket option * see bug ticket #393 */ int iPlu = KVI_PROTECTION_LEVEL_UNRESTRICTED; diff --git a/src/modules/language/detector.cpp b/src/modules/language/detector.cpp index fed2d4d9e..bf4bf35e4 100644 --- a/src/modules/language/detector.cpp +++ b/src/modules/language/detector.cpp @@ -19064,7 +19064,7 @@ void detect_language_and_encoding(const char * data,LanguageAndEncodingResult * match[i] = 0; } retBuffer->dAccuracy = 0.0; - + int utf8 = utf8score((const unsigned char *)data); i=0; while(i<NUM_DESCRIPTORS) diff --git a/src/modules/mediaplayer/mp_amipinterface.cpp b/src/modules/mediaplayer/mp_amipinterface.cpp index 52d71cba0..c81dd745a 100644 --- a/src/modules/mediaplayer/mp_amipinterface.cpp +++ b/src/modules/mediaplayer/mp_amipinterface.cpp @@ -81,7 +81,7 @@ static bool loadAmipDll() { amip_dll = LoadLibrary("ac.dll"); if (!amip_dll) return false; - + MP_AC_FUNC(ac_init); MP_AC_FUNC(ac_uninit); MP_AC_FUNC(ac_getDestHost); @@ -89,15 +89,15 @@ static bool loadAmipDll() MP_AC_FUNC(ac_pingServer); MP_AC_FUNC(ac_eval); MP_AC_FUNC(ac_exec); - + return true; }; static QTextCodec * mediaplayer_get_codec() { - QTextCodec * c= QTextCodec::codecForName(KVI_OPTION_STRING(KviOption_stringWinampTextEncoding).toAscii()); + QTextCodec * c= QTextCodec::codecForName(KVI_OPTION_STRING(KviOption_stringWinampTextEncoding).toAscii()); if(!c) - c = QTextCodec::codecForLocale(); + c = QTextCodec::codecForLocale(); return c; } @@ -241,7 +241,7 @@ QString KviAmipInterface::mrl() else ret=fn; if(!ret.startsWith("http://",Qt::CaseInsensitive)) ret.prepend("file://"); - + return ret; } diff --git a/src/modules/mediaplayer/mp_amipinterface.h b/src/modules/mediaplayer/mp_amipinterface.h index e7e962a2a..df0dacf04 100644 --- a/src/modules/mediaplayer/mp_amipinterface.h +++ b/src/modules/mediaplayer/mp_amipinterface.h @@ -73,7 +73,7 @@ virtual QString amipEval(const QString &cmd); virtual KviMediaPlayerInterface::PlayerStatus status(); }; - + MP_DECLARE_DESCRIPTOR(KviAmipInterface) #endif //COMPILE_ON_WINDOWS diff --git a/src/modules/mediaplayer/mp_mp3.h b/src/modules/mediaplayer/mp_mp3.h index 6a1584732..95a0660f3 100644 --- a/src/modules/mediaplayer/mp_mp3.h +++ b/src/modules/mediaplayer/mp_mp3.h @@ -30,7 +30,7 @@ // This file is based in part on: // // * MP3Info 0.5 by Ricardo Cerqueira <rmc@rccn.net> -// * MP3Stat 0.9 by Ed Sweetman <safemode@voicenet.com> and +// * MP3Stat 0.9 by Ed Sweetman <safemode@voicenet.com> and // Johannes Overmann <overmann@iname.com> // // There has been also a remarkable work by Cristopher Tieckle (Crissi) diff --git a/src/modules/mediaplayer/mp_winampinterface.cpp b/src/modules/mediaplayer/mp_winampinterface.cpp index 2ed11f2a5..4cafce127 100644 --- a/src/modules/mediaplayer/mp_winampinterface.cpp +++ b/src/modules/mediaplayer/mp_winampinterface.cpp @@ -46,14 +46,14 @@ #define IPC_JUMPTOTIME 106 // ** SendMessage(hwnd_winamp,WM_WA_IPC,ms,IPC_JUMPTOTIME); -// ** IPC_JUMPTOTIME sets the position in milliseconds of the +// ** IPC_JUMPTOTIME sets the position in milliseconds of the // ** current song (approximately). #define IPC_SETPLAYLISTPOS 121 // ** SendMessage(hwnd_winamp,WM_WA_IPC,position,IPC_SETPLAYLISTPOS) // ** IPC_SETPLAYLISTPOS sets the playlsit position to 'position'. -#define IPC_SETVOLUME 122 +#define IPC_SETVOLUME 122 // ** SendMessage(hwnd_winamp,WM_WA_IPC,volume,IPC_SETVOLUME); // ** IPC_SETVOLUME sets the volume of Winamp (from 0-255). @@ -62,9 +62,9 @@ // ** IPC_GETLISTLENGTH returns the length of the current playlist, in // ** tracks. -#define IPC_GETEQDATA 127 +#define IPC_GETEQDATA 127 // ** int data=SendMessage(hwnd_winamp,WM_WA_IPC,pos,IPC_GETEQDATA); -// ** IPC_GETEQDATA queries the status of the EQ. +// ** IPC_GETEQDATA queries the status of the EQ. // ** The value returned depends on what 'pos' is set to: // ** Value Meaning // ** ------------------ @@ -169,8 +169,8 @@ static QTextCodec * mediaplayer_get_codec() { - QTextCodec * c= QTextCodec::codecForName(KVI_OPTION_STRING(KviOption_stringWinampTextEncoding).toAscii()); - if(!c)c = QTextCodec::codecForLocale(); + QTextCodec * c= QTextCodec::codecForName(KVI_OPTION_STRING(KviOption_stringWinampTextEncoding).toAscii()); + if(!c)c = QTextCodec::codecForLocale(); return c; } @@ -362,7 +362,7 @@ QString KviWinampInterface::nowPlaying() szBuffer[i] = SendMessage(hWinamp,WM_USER,KVIRC_WM_USER,KVIRC_WM_USER_TRANSFER + i); } szBuffer[ len ] = '\0'; - + QTextCodec *c=mediaplayer_get_codec(); if (c) ret = c->toUnicode(szBuffer); else ret=szBuffer; diff --git a/src/modules/mediaplayer/mp_winampinterface.h b/src/modules/mediaplayer/mp_winampinterface.h index 9107038e3..1b3fb2403 100644 --- a/src/modules/mediaplayer/mp_winampinterface.h +++ b/src/modules/mediaplayer/mp_winampinterface.h @@ -68,9 +68,9 @@ virtual bool setShuffle(bool &bVal); virtual KviMediaPlayerInterface::PlayerStatus status(); }; - + MP_DECLARE_DESCRIPTOR(KviWinampInterface) - + #endif //COMPILE_ON_WINDOWS #endif //!_MP_WINAMPINTERFACE_H_ diff --git a/src/modules/mediaplayer/winamp.cpp b/src/modules/mediaplayer/winamp.cpp index 5d4695993..81bbdeda6 100644 --- a/src/modules/mediaplayer/winamp.cpp +++ b/src/modules/mediaplayer/winamp.cpp @@ -114,7 +114,7 @@ LRESULT CALLBACK WndProc(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam) char * szTitle = (char *)SendMessage(hwnd,WM_USER,idx,IPC_GETPLAYLISTFILE); strcpy(szBuffer,szTitle); return strlen(szBuffer); - } + } } else if((lParam >= KVIRC_WM_USER_TRANSFER) && (lParam < (KVIRC_WM_USER_TRANSFER + 4096))) { return (LRESULT) szBuffer[lParam - KVIRC_WM_USER_TRANSFER]; diff --git a/src/modules/my/idle_mac.cpp b/src/modules/my/idle_mac.cpp index a111a7cbd..520f5f420 100644 --- a/src/modules/my/idle_mac.cpp +++ b/src/modules/my/idle_mac.cpp @@ -22,21 +22,21 @@ #include "idle.h" #include <Carbon/Carbon.h> - + // Why does Apple have to make this so complicated? static OSStatus LoadFrameworkBundle(CFStringRef framework, CFBundleRef *bundlePtr) { OSStatus err; FSRef frameworksFolderRef; CFURLRef baseURL; CFURLRef bundleURL; - + if ( bundlePtr == nil ) return( -1 ); - + *bundlePtr = nil; - + baseURL = nil; bundleURL = nil; - + err = FSFindFolder(kOnAppropriateDisk, kFrameworksFolderType, true, &frameworksFolderRef); if (err == noErr) { baseURL = CFURLCreateFromFSRef(kCFAllocatorSystemDefault, &frameworksFolderRef); @@ -61,7 +61,7 @@ err = coreFoundationUnknownErr; } } - + // Clean up. if (err != noErr && *bundlePtr != nil) { CFRelease(*bundlePtr); @@ -69,27 +69,27 @@ } if (bundleURL != nil) { CFRelease(bundleURL); - } + } if (baseURL != nil) { CFRelease(baseURL); - } - + } + return err; } - - + + class IdlePlatform::Private { public: EventLoopTimerRef mTimerRef; int mSecondsIdle; - + Private() : mTimerRef(0), mSecondsIdle(0) {} - + static pascal void IdleTimerAction(EventLoopTimerRef, EventLoopIdleTimerMessage inState, void* inUserData); - + }; - - + + pascal void IdlePlatform::Private::IdleTimerAction(EventLoopTimerRef, EventLoopIdleTimerMessage inState, void* inUserData) { switch (inState) { case kEventLoopIdleTimerStarted: @@ -104,18 +104,18 @@ break; } } - - + + IdlePlatform::IdlePlatform() { d = new Private(); } - + IdlePlatform::~IdlePlatform() { RemoveEventLoopTimer(d->mTimerRef); delete d; } - - + + // Typedef for the function we're getting back from CFBundleGetFunctionPointerForName. typedef OSStatus (*InstallEventLoopIdleTimerPtr)(EventLoopRef inEventLoop, EventTimerInterval inFireDelay, @@ -123,39 +123,39 @@ EventLoopIdleTimerUPP inTimerProc, void * inTimerData, EventLoopTimerRef * outTimer); - - + + bool IdlePlatform::init() { // May already be init'ed. if (d->mTimerRef) { return true; } - + // According to the docs, InstallEventLoopIdleTimer is new in 10.2. // According to the headers, it has been around since 10.0. // One of them is lying. We'll play it safe and weak-link the function. - + // Load the "Carbon.framework" bundle. CFBundleRef carbonBundle; if (LoadFrameworkBundle( CFSTR("Carbon.framework"), &carbonBundle ) != noErr) { return false; } - + // Load the Mach-O function pointers for the routine we will be using. InstallEventLoopIdleTimerPtr myInstallEventLoopIdleTimer = (InstallEventLoopIdleTimerPtr)CFBundleGetFunctionPointerForName(carbonBundle, CFSTR("InstallEventLoopIdleTimer")); if (myInstallEventLoopIdleTimer == 0) { return false; } - + EventLoopIdleTimerUPP timerUPP = NewEventLoopIdleTimerUPP(Private::IdleTimerAction); if ((*myInstallEventLoopIdleTimer)(GetMainEventLoop(), kEventDurationSecond, kEventDurationSecond, timerUPP, 0, &d->mTimerRef)) { return true; } - + return false; } - - + + int IdlePlatform::secondsIdle() { return d->mSecondsIdle; } diff --git a/src/modules/my/idle_win.cpp b/src/modules/my/idle_win.cpp index c304ee4ed..3a1469928 100644 --- a/src/modules/my/idle_win.cpp +++ b/src/modules/my/idle_win.cpp @@ -20,15 +20,15 @@ #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) #include "idle.h" - + #include <QLibrary> #include< windows.h> - + typedef struct tagLASTINPUTINFO { UINT cbSize; DWORD dwTime; } LASTINPUTINFO, *PLASTINPUTINFO; - + class IdlePlatform::Private { public: @@ -38,29 +38,29 @@ IdleUIGetLastInputTime = 0; lib = 0; } - + BOOL (__stdcall * GetLastInputInfo)(PLASTINPUTINFO); DWORD (__stdcall * IdleUIGetLastInputTime)(void); QLibrary *lib; }; - + IdlePlatform::IdlePlatform() { d = new Private; } - + IdlePlatform::~IdlePlatform() { delete d->lib; delete d; } - + bool IdlePlatform::init() { if(d->lib) return true; void *p; - + // try to find the built-in Windows 2000 function d->lib = new QLibrary("user32"); if(d->lib->load() && (p = d->lib->resolve("GetLastInputInfo"))) { @@ -71,7 +71,7 @@ delete d->lib; d->lib = 0; } - + // fall back on idleui d->lib = new QLibrary("idleui"); if(d->lib->load() && (p = d->lib->resolve("IdleUIGetLastInputTime"))) { @@ -82,10 +82,10 @@ delete d->lib; d->lib = 0; } - + return false; } - + int IdlePlatform::secondsIdle() { int i; @@ -102,7 +102,7 @@ } else return 0; - + return (GetTickCount() - i) / 1000; } diff --git a/src/modules/my/idle_x11.cpp b/src/modules/my/idle_x11.cpp index 6d11e0b7d..4bb6cecdb 100644 --- a/src/modules/my/idle_x11.cpp +++ b/src/modules/my/idle_x11.cpp @@ -31,34 +31,34 @@ #include <QApplication> #include <QDesktopWidget> #include <QX11Info> - + #include <X11/Xlib.h> #include <X11/Xutil.h> #include <X11/extensions/scrnsaver.h> - + static XErrorHandler old_handler = 0; extern "C" int xerrhandler(Display* dpy, XErrorEvent* err) { if(err->error_code == BadDrawable) return 0; - + return (*old_handler)(dpy, err); } - + class IdlePlatform::Private { public: Private() {} - + XScreenSaverInfo *ss_info; }; - + IdlePlatform::IdlePlatform() { d = new Private; d->ss_info = 0; } - + IdlePlatform::~IdlePlatform() { if(d->ss_info) @@ -69,14 +69,14 @@ } delete d; } - + bool IdlePlatform::init() { if(d->ss_info) return true; - + old_handler = XSetErrorHandler(xerrhandler); - + int event_base, error_base; if(XScreenSaverQueryExtension(QApplication::desktop()->screen()->x11Display(), &event_base, &error_base)) { d->ss_info = XScreenSaverAllocInfo(); @@ -84,7 +84,7 @@ } return false; } - + int IdlePlatform::secondsIdle() { if(!d->ss_info) return 0; diff --git a/src/modules/notifier/notifierwindowborder.cpp b/src/modules/notifier/notifierwindowborder.cpp index 10ca68014..8dd2fb99e 100644 --- a/src/modules/notifier/notifierwindowborder.cpp +++ b/src/modules/notifier/notifierwindowborder.cpp @@ -61,7 +61,7 @@ void KviNotifierWindowBorder::loadImages() m_pixCaptionDX_N = *p; if((p = g_pIconManager->getPixmap("notifier_pix_caption_bkg.png"))) m_pixCaptionBKG_N = *p; - + if((p = g_pIconManager->getPixmap("notifier_icon_close_out.png"))) m_pixIconClose_out_N = *p; if((p = g_pIconManager->getPixmap("notifier_icon_close_over.png"))) @@ -87,17 +87,17 @@ void KviNotifierWindowBorder::loadImages() m_pixCaptionDX_HL = *p; if((p = g_pIconManager->getPixmap("notifier_pix_caption_bkg_hl.png"))) m_pixCaptionBKG_HL = *p; - + if((p = g_pIconManager->getPixmap("notifier_icon_close_out_hl.png"))) m_pixIconClose_out_HL = *p; if((p = g_pIconManager->getPixmap("notifier_icon_close_over_hl.png"))) m_pixIconClose_over_HL = *p; if((p = g_pIconManager->getPixmap("notifier_icon_close_clicked_hl.png"))) m_pixIconClose_clicked_HL = *p; - + setPics(); setCloseIcon(WDG_ICON_OUT); - + if ( m_pixCaptionDX->height()==m_pixCaptionSX->height() && m_pixCaptionDX->height()==m_pixCaptionBKG->height()) // just to be sure that the height is fitting m_captionRect.setHeight(m_pixCaptionDX->height()); @@ -154,10 +154,10 @@ void KviNotifierWindowBorder::recalculatePositions() m_closeIconRect.setY(2); m_closeIconRect.setWidth(m_pixIconClose->width()); m_closeIconRect.setHeight(m_pixIconClose->height()); - + m_captionRect.setTopLeft( m_rct.topLeft() ); m_captionRect.setSize( QSize(m_rct.width(),m_pixCaptionDX->height()) ); - + m_bodyRect.setTopLeft( QPoint(m_pixCaptionDX->width(),m_captionRect.height()) ); m_bodyRect.setSize( QSize(m_captionRect.width()-(2*m_pixCaptionDX->width()),m_rct.height()-m_captionRect.height()-m_pixDWN->height()) ); @@ -185,21 +185,21 @@ void KviNotifierWindowBorder::draw(QPainter * p, bool b) { setPics(b); setCloseIcon(m_eIconState); - + // Draw the caption p->drawPixmap(m_captionRect.x(), m_captionRect.y(), *m_pixCaptionSX); p->drawTiledPixmap(m_pixCaptionSX->width(), 0, m_captionRect.width() - (m_pixCaptionSX->width() + m_pixCaptionDX->width()), m_captionRect.height(), *m_pixCaptionBKG); p->drawPixmap(m_captionRect.width() - m_pixCaptionDX->width(), 0, *m_pixCaptionDX); - + // Draw the tiled borders p->drawTiledPixmap(0, m_captionRect.height(), m_pixSX->width(), m_bodyRect.height(), *m_pixSX); p->drawTiledPixmap(m_bodyRect.width() + m_bodyRect.x(), m_captionRect.height(), m_pixDX->width(), m_bodyRect.height(), *m_pixDX); p->drawTiledPixmap(m_pixDWNSX->width(), m_captionRect.height() + m_bodyRect.height(), m_bodyRect.width() + 1, m_pixDWN->height(), *m_pixDWN); - + // Draw down corners p->drawPixmap(0, m_captionRect.height() + m_bodyRect.height(), *m_pixDWNSX); p->drawPixmap(m_bodyRect.width() + m_bodyRect.x(), m_captionRect.height() + m_bodyRect.height(), *m_pixDWNDX); - + //Drawing icons p->drawPixmap(m_closeIconRect.x(), m_closeIconRect.y(), *m_pixIconClose); } diff --git a/src/modules/notifier/notifierwindowborder.h b/src/modules/notifier/notifierwindowborder.h index ba46d9962..f933a90fa 100644 --- a/src/modules/notifier/notifierwindowborder.h +++ b/src/modules/notifier/notifierwindowborder.h @@ -46,7 +46,7 @@ private: QPoint m_pnt; QRect m_closeIconRect; - + QRect m_captionRect; QRect m_bodyRect; QRect m_titleRect; @@ -64,7 +64,7 @@ private: QPixmap * m_pixIconClose_over; QPixmap * m_pixIconClose_clicked; QPixmap * m_pixIconClose; - + QPixmap m_pixSX_N; QPixmap m_pixDX_N; QPixmap m_pixDWN_N; @@ -76,7 +76,7 @@ private: QPixmap m_pixIconClose_out_N; QPixmap m_pixIconClose_over_N; QPixmap m_pixIconClose_clicked_N; - + QPixmap m_pixSX_HL; QPixmap m_pixDX_HL; QPixmap m_pixDWN_HL; @@ -104,13 +104,13 @@ public: void resize(QSize r) { setWidth(r.width()); setHeight(r.height()); }; void setGeometry(QRect r) { r.topLeft(); r.size(); /*debug("x,y: %d,%d", r.x(), r.y()); debug("w,h: %d,%d", r.width(), r.height());*/ }; void setGeometry(QPoint p, QSize s) { setPoint (p.x(), p.y()); setWidth (s.width()); setHeight (s.height()); }; - + void setPoint(int x, int y) { m_pnt.setX(x); m_pnt.setY(y); m_rct.setX(x); m_rct.setY(y); }; - + void setCloseIcon(int state); void resetIcons(); - // writing methods... + // writing methods... inline int x() const { return m_pnt.x(); }; inline int y() const { return m_pnt.y(); }; inline int width() const { return m_rct.width(); }; @@ -122,7 +122,7 @@ public: inline QRect rect() { return m_rct; }; inline QRect closeRect() { return m_closeIconRect; }; inline QRect titleRect() { return m_titleRect; }; - + void draw(QPainter *, bool b = false); void setPics(bool b = false); }; diff --git a/src/modules/objects/class_combobox.h b/src/modules/objects/class_combobox.h index 5f40f1f93..9a88ead32 100644 --- a/src/modules/objects/class_combobox.h +++ b/src/modules/objects/class_combobox.h @@ -40,7 +40,7 @@ public: QWidget * widget() { return (QWidget *)object(); }; protected: virtual bool init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams); - + bool insertItem(KviKvsObjectFunctionCall *c); bool changeItem(KviKvsObjectFunctionCall *c); bool removeItem(KviKvsObjectFunctionCall *c); diff --git a/src/modules/objects/class_dockwindow.h b/src/modules/objects/class_dockwindow.h index 98ba85a75..74f784a8b 100644 --- a/src/modules/objects/class_dockwindow.h +++ b/src/modules/objects/class_dockwindow.h @@ -35,7 +35,7 @@ public: KVSO_DECLARE_OBJECT(KviKvsObject_dockwindow) protected: virtual bool init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams); - + bool addWidget(KviKvsObjectFunctionCall *c); bool orientation(KviKvsObjectFunctionCall *c); bool setOrientation(KviKvsObjectFunctionCall *c); diff --git a/src/modules/objects/class_file.h b/src/modules/objects/class_file.h index a2ee75427..0a9337402 100644 --- a/src/modules/objects/class_file.h +++ b/src/modules/objects/class_file.h @@ -47,7 +47,7 @@ public: bool close(KviKvsObjectFunctionCall *c); bool flush(KviKvsObjectFunctionCall *c); bool size(KviKvsObjectFunctionCall *c); - + bool atEnd(KviKvsObjectFunctionCall *c); // int QFile at() const bool where(KviKvsObjectFunctionCall *c); @@ -56,7 +56,7 @@ public: bool putch(KviKvsObjectFunctionCall *c); bool getch(KviKvsObjectFunctionCall *c); bool unGetch(KviKvsObjectFunctionCall *c); - + bool readBlock(KviKvsObjectFunctionCall *c); bool writeBlock(KviKvsObjectFunctionCall *c); diff --git a/src/modules/objects/class_groupbox.h b/src/modules/objects/class_groupbox.h index 31d809858..34f9258dc 100644 --- a/src/modules/objects/class_groupbox.h +++ b/src/modules/objects/class_groupbox.h @@ -40,7 +40,7 @@ public: protected: virtual bool init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams); - + bool setTitle(KviKvsObjectFunctionCall *c); bool title(KviKvsObjectFunctionCall *c); bool setFlat(KviKvsObjectFunctionCall *c); diff --git a/src/modules/objects/class_http.cpp b/src/modules/objects/class_http.cpp index 19eab2336..155e9bd27 100644 --- a/src/modules/objects/class_http.cpp +++ b/src/modules/objects/class_http.cpp @@ -77,11 +77,11 @@ const char * const ssl_errors_tbl[] = { This class provides a standard HTTP functionality.[br] @functions: !fn: <id:integer>$get(<remote_path:string>,<local_file: string>) - + !fn: <id:integer>$post(<remote_path:string>,<post_data:string>,<local_file: string>) !fn: $abort() !fn: <id:integer>$setHost(<host:string>,<remote_port:unsigned_integer>) - + !fn: <id:integer>$currentId() !fn: $setProxy(<host:string>,<port:integer>,[<user:string>,<password:string>]) !fn: $setUser(<user:string>,<password:string>) diff --git a/src/modules/objects/class_http.h b/src/modules/objects/class_http.h index 2ab73d69a..70c2bb691 100644 --- a/src/modules/objects/class_http.h +++ b/src/modules/objects/class_http.h @@ -65,7 +65,7 @@ protected: bool functionFollowRedirect(KviKvsObjectFunctionCall *c); bool functionCurrentId(KviKvsObjectFunctionCall *c); void redirect(QString &file,const QHttpResponseHeader &r); - + #ifndef QT_NO_OPENSSL bool functionIgnoreSslErrors(KviKvsObjectFunctionCall *c); bool functionSslErrorsEvent(KviKvsObjectFunctionCall *c); diff --git a/src/modules/objects/class_lineedit.cpp b/src/modules/objects/class_lineedit.cpp index c50b989f0..153bd23f4 100644 --- a/src/modules/objects/class_lineedit.cpp +++ b/src/modules/objects/class_lineedit.cpp @@ -454,7 +454,7 @@ KVSO_CLASS_FUNCTION(lineedit,setCompleter) CHECK_INTERNAL_POINTER(widget()) QStringList szCompletionList; QString szMode; - KVSO_PARAMETERS_BEGIN(c) + KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("mode",KVS_PT_STRING,KVS_PF_OPTIONAL,szMode) KVSO_PARAMETER("completion_list",KVS_PT_STRINGLIST,0,szCompletionList) KVSO_PARAMETERS_END(c) diff --git a/src/modules/objects/class_listwidget.h b/src/modules/objects/class_listwidget.h index 78fffcc36..8b0f6fbfc 100644 --- a/src/modules/objects/class_listwidget.h +++ b/src/modules/objects/class_listwidget.h @@ -38,7 +38,7 @@ public: QWidget * widget() { return (QWidget *)object(); };
protected:
virtual bool init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams);
-
+
bool insertItem(KviKvsObjectFunctionCall *c);
bool changeItem(KviKvsObjectFunctionCall *c);
diff --git a/src/modules/objects/class_memorybuffer.cpp b/src/modules/objects/class_memorybuffer.cpp index 103cc1d64..58e93488a 100644 --- a/src/modules/objects/class_memorybuffer.cpp +++ b/src/modules/objects/class_memorybuffer.cpp @@ -54,7 +54,7 @@ Load into memorybuffer the <file_name> file. !fn: $saveToFile(<file_name:string>) Save the memorybuffer to <file_name> file. - + */ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_memorybuffer,"memorybuffer","object") diff --git a/src/modules/objects/class_multilineedit.cpp b/src/modules/objects/class_multilineedit.cpp index f2f5b2d3e..0f2ef158c 100644 --- a/src/modules/objects/class_multilineedit.cpp +++ b/src/modules/objects/class_multilineedit.cpp @@ -250,14 +250,14 @@ KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"addwidget", functionAddWidget) /* KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"insertLine", functionInsertLine) KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"removeLine", functionRemoveLine) KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"insertAt", functionInsertAt) - + KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"setCursorPosition", functionSetCursorPosition) KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"setWordWrap", functionSetWordWrap) KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"wordWrap", functionWordWrap) KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"length", functionLength); KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"indent", functionundoDepth) - + */ KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"atEnd", functionAtEnd) KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"numLines", functionNumLines) @@ -284,7 +284,7 @@ KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"addwidget", functionAddWidget) //->Zoom In, Out, To KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"zoomIn", functionzoomIn) KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"zoomOut", functionzoomOut) - + //->Undo & Redo KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"undo", functionundo) KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"redo", functionredo) @@ -297,7 +297,7 @@ KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"addwidget", functionAddWidget) //->Text color & others KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"setText", functionsetText) /* - + KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"setColor", functionsetColor) KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"setModified" , functionsetModified) KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"setLinkUnderline" , functionsetLinkUnderline) @@ -320,10 +320,10 @@ KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"addwidget", functionAddWidget) KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"paragraphLength" , functionparagraphLength) KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"insertParagraph" , functioninsertParagraph) KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"removeParagraph" , functionremoveParagraph) - - + + KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"linesOfParagraph" , functionlinesOfParagraph) - + */ KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"lineOfChar" , functionlineOfChar) KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"lines" ,functionlines) @@ -526,7 +526,7 @@ bool KviKvsObject_textedit::functionsetWrapPolicy(KviKvsObjectFunctionCall * c) else if(KviQString::equalCI(szPolicy,"AtWordBoundaryOrAnywhere")) ((QTextEdit *)widget())->setWordWrapMode(QTextOption::WrapAtWordBoundaryOrAnywhere); else c->warning(__tr2qs_ctx("Unknown wrap policy'%Q'","objects"),&szPolicy); -*/ +*/ return true; } diff --git a/src/modules/objects/class_multilineedit.h b/src/modules/objects/class_multilineedit.h index 721b36438..f595ad304 100644 --- a/src/modules/objects/class_multilineedit.h +++ b/src/modules/objects/class_multilineedit.h @@ -59,7 +59,7 @@ protected: bool functionCopy(KviKvsObjectFunctionCall *c); bool functionPaste(KviKvsObjectFunctionCall *c); bool functionCut(KviKvsObjectFunctionCall *c); -// |-G&N add-| +// |-G&N add-| bool functionsetItalic(KviKvsObjectFunctionCall *c); bool functionitalic(KviKvsObjectFunctionCall *c); bool functionsetBold(KviKvsObjectFunctionCall *c); @@ -75,12 +75,12 @@ protected: bool functionindent(KviKvsObjectFunctionCall *c); bool functionsetUndoRedoEnabled(KviKvsObjectFunctionCall *c); bool functionisUndoRedoEnabled(KviKvsObjectFunctionCall *c); - + bool functionsetText(KviKvsObjectFunctionCall *c); bool functionsetHtmlText(KviKvsObjectFunctionCall *c); bool functionsetPlainText(KviKvsObjectFunctionCall *c); - - + + bool functionsetPointSize(KviKvsObjectFunctionCall *c); bool functionsetColor(KviKvsObjectFunctionCall *c); bool functionisUndoAvailable(KviKvsObjectFunctionCall *c); diff --git a/src/modules/objects/class_painter.cpp b/src/modules/objects/class_painter.cpp index 8bdbae9fd..e78990906 100644 --- a/src/modules/objects/class_painter.cpp +++ b/src/modules/objects/class_painter.cpp @@ -462,7 +462,7 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_painter,"painter","object") KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,translate) KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,reset) - + // ?? KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,setOpacity) @@ -471,7 +471,7 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_painter,"painter","object") KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,setSmoothPixmapTransform) KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,setBackGroundMode) - + // QPainterPath stuff KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,drawPath) @@ -479,7 +479,7 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_painter,"painter","object") KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,pathAddText) KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,pathMoveTo) KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,pathLineTo) - + // Pen KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,setPenJoinStyle) KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,setPenCapStyle) @@ -1018,7 +1018,7 @@ KVSO_CLASS_FUNCTION(painter,fontMetricsHeight) CHECK_INTERNAL_POINTER(m_pPainter) if (m_pPainter->isActive()) c->returnValue()->setInteger(m_pPainter->fontMetrics().height()); - else + else c->warning(__tr2qs_ctx("$fontMetricsHeight: the painter is not active!","objects")); return true; } diff --git a/src/modules/objects/class_painter.h b/src/modules/objects/class_painter.h index 173ecba8e..4177423d0 100644 --- a/src/modules/objects/class_painter.h +++ b/src/modules/objects/class_painter.h @@ -48,7 +48,7 @@ protected: public: bool setFont(KviKvsObjectFunctionCall *c); bool setFontSize(KviKvsObjectFunctionCall *c); - + bool fontAscent(KviKvsObjectFunctionCall *c); bool fontDescent(KviKvsObjectFunctionCall *c); bool fontMetricsWidth(KviKvsObjectFunctionCall *c); @@ -69,7 +69,7 @@ public: bool drawText(KviKvsObjectFunctionCall *c); bool drawPixmap(KviKvsObjectFunctionCall *c); - + bool begin(KviKvsObjectFunctionCall *c); bool end(KviKvsObjectFunctionCall *c); @@ -111,7 +111,7 @@ public: bool resetPath(KviKvsObjectFunctionCall *c); bool beginPdf(KviKvsObjectFunctionCall *c); - + bool painterDeviceWidth(KviKvsObjectFunctionCall *c); bool painterDeviceHeight(KviKvsObjectFunctionCall *c); diff --git a/src/modules/objects/class_socket.h b/src/modules/objects/class_socket.h index 49838eca5..b05e7c40b 100644 --- a/src/modules/objects/class_socket.h +++ b/src/modules/objects/class_socket.h @@ -47,7 +47,7 @@ class KviKvsObject_socket : public KviKvsObject public: KVSO_DECLARE_OBJECT(KviKvsObject_socket) protected: - bool m_bUdp; + bool m_bUdp; kvi_socket_t m_sock; int m_iStatus; QString m_szRemoteIp; diff --git a/src/modules/objects/class_spinbox.h b/src/modules/objects/class_spinbox.h index f2fc57f14..0c96eb90e 100644 --- a/src/modules/objects/class_spinbox.h +++ b/src/modules/objects/class_spinbox.h @@ -54,9 +54,9 @@ protected: bool lineStep(KviKvsObjectFunctionCall *c); bool setSpecialValueText(KviKvsObjectFunctionCall *c); bool specialValueText(KviKvsObjectFunctionCall *c); - + bool valueChangedEvent(KviKvsObjectFunctionCall *c); - + protected slots: void valueChanged(int); }; diff --git a/src/modules/objects/class_sql.cpp b/src/modules/objects/class_sql.cpp index b6a29b8cb..a08e88868 100644 --- a/src/modules/objects/class_sql.cpp +++ b/src/modules/objects/class_sql.cpp @@ -424,7 +424,7 @@ KVSO_CLASS_FUNCTION(sql,queryBindValue) KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("bindName",KVS_PT_STRING,0,szFieldName) KVSO_PARAMETER("value",KVS_PT_VARIANT,0,v) - KVSO_PARAMETERS_END(c) + KVSO_PARAMETERS_END(c) QString szType; v->getTypeName(szType); if (v->isString()|| v->isNothing()) diff --git a/src/modules/objects/class_vbox.cpp b/src/modules/objects/class_vbox.cpp index 1319778d2..587e31f34 100644 --- a/src/modules/objects/class_vbox.cpp +++ b/src/modules/objects/class_vbox.cpp @@ -34,7 +34,7 @@ // Tables used in $setAlignment & $alignment const char * const align_tbl[] = { - "Left", + "Left", "Right", "HCenter", "VCenter", @@ -82,8 +82,8 @@ const int align_cod[] = { !fn: $addStretch(<stretch:integer>) Adds a stretchable space with zero minimum size and stretch factor stretch to the end of this box layout. !fn: $setAlignment(<flag1:string>, <flag2:string>, ...) - Sets the alignment for widget w to flags, given as parameters. - Valid flags are:Right,Left,Top,Bottom,HCenter,VCenter,Center + Sets the alignment for widget w to flags, given as parameters. + Valid flags are:Right,Left,Top,Bottom,HCenter,VCenter,Center */ @@ -184,7 +184,7 @@ KVSO_CLASS_FUNCTION(vbox,setAlignment) int align,sum=0; for ( QStringList::Iterator it = alignment.begin(); it != alignment.end(); ++it ) { - + align = 0; for(unsigned int j = 0; j < align_num; j++) { @@ -198,7 +198,7 @@ KVSO_CLASS_FUNCTION(vbox,setAlignment) sum = sum | align; else c->warning(__tr2qs_ctx("Unknown alignment: '%Q'","objects"),&(*it)); - + } if (widget()) ((KviTalHBox *)widget())->setAlignment(((QWidget *)(pObject->object())),(Qt::Alignment)sum); return true; diff --git a/src/modules/objects/class_widget.cpp b/src/modules/objects/class_widget.cpp index 5d7623b3f..168524764 100644 --- a/src/modules/objects/class_widget.cpp +++ b/src/modules/objects/class_widget.cpp @@ -1228,7 +1228,7 @@ KVSO_CLASS_FUNCTION(widget,setPaletteForeground) } else { - QColor color; + QColor color; if (c->params()->count()==1) { if(pColArray->isString()) @@ -1239,7 +1239,7 @@ KVSO_CLASS_FUNCTION(widget,setPaletteForeground) color.setNamedColor(szColor); if (!color.isValid()) { - // itsn't a color name: let try with an hex triplette + // itsn't a color name: let try with an hex triplette color.setNamedColor("#"+szColor); if (!color.isValid()) { @@ -1251,7 +1251,7 @@ KVSO_CLASS_FUNCTION(widget,setPaletteForeground) else { c->warning(__tr2qs_ctx("Not a valid color !","objects")); return true; - } + } QPalette p = widget()->palette(); p.setColor(widget()->foregroundRole(), color); widget()->setPalette(p); @@ -1310,7 +1310,7 @@ KVSO_CLASS_FUNCTION(widget,setBackgroundColor) } else { - QColor color; + QColor color; if (c->params()->count()==1) { if(pColArray->isString()) @@ -1321,7 +1321,7 @@ KVSO_CLASS_FUNCTION(widget,setBackgroundColor) color.setNamedColor(szColor); if (!color.isValid()) { - // itsn't a color name: let try with an hex triplette + // itsn't a color name: let try with an hex triplette color.setNamedColor("#"+szColor); if (!color.isValid()) { @@ -1333,7 +1333,7 @@ KVSO_CLASS_FUNCTION(widget,setBackgroundColor) else { c->warning(__tr2qs_ctx("Not a valid color !","objects")); return true; - } + } QPalette p = widget()->palette(); p.setColor(widget()->backgroundRole(), color); widget()->setPalette(p); diff --git a/src/modules/objects/class_widget.h b/src/modules/objects/class_widget.h index cf173a90c..036b581a5 100644 --- a/src/modules/objects/class_widget.h +++ b/src/modules/objects/class_widget.h @@ -57,7 +57,7 @@ protected: // setEnabled.. // ... etc // so the name of the C++ function matches exactly the name of the KVS function at this point - + // let's also try to keep alphabetic order for the functions here.. so one can find them quickly bool addWidgetToWrappedLayout(KviKvsObjectFunctionCall *c); @@ -133,7 +133,7 @@ class KviKvsWidget : public QWidget Q_PROPERTY(QSize sizeHint READ sizeHint) public: KviKvsWidget(KviKvsObject_widget * ob,QWidget * par); - + virtual ~KviKvsWidget(); protected: diff --git a/src/modules/objects/class_xmlreader.h b/src/modules/objects/class_xmlreader.h index 340dee907..ea2d9cafc 100644 --- a/src/modules/objects/class_xmlreader.h +++ b/src/modules/objects/class_xmlreader.h @@ -36,10 +36,10 @@ public: public: bool parse(KviKvsObjectFunctionCall *c); bool lastError(KviKvsObjectFunctionCall *c); - + void fatalError(const QString &szError); protected: - QString m_szLastError; + QString m_szLastError; }; #endif //!_CLASS_XMLREADER_H_ diff --git a/src/modules/objects/object_macros.h b/src/modules/objects/object_macros.h index 35a2bbc9b..4ef19acbd 100644 --- a/src/modules/objects/object_macros.h +++ b/src/modules/objects/object_macros.h @@ -35,12 +35,12 @@ ~__className(); \ static void registerSelf(); \ static void unregisterSelf(); - + #define SET_OBJECT(__className) \ __className *obj=new __className(parentScriptWidget()); \ obj->setObjectName(getName()); \ setObject(obj,true); - + #define KVSO_REGISTER_HANDLER(__className,__szName,__proc) \ g_pKvs##__className##Class->registerFunctionHandler(__szName,(KviKvsObjectFunctionHandlerProc)(KVI_PTR2MEMBER(__className::__proc))); diff --git a/src/modules/options/optw_avatar.cpp b/src/modules/options/optw_avatar.cpp index a13c4014c..3bd908a04 100644 --- a/src/modules/options/optw_avatar.cpp +++ b/src/modules/options/optw_avatar.cpp @@ -46,7 +46,7 @@ KviAvatarAdvancedOptionsWidget::KviAvatarAdvancedOptionsWidget(QWidget * parent) "constraints set below. Better keep this option on. :)</center>","options")); addBoolSelector(g,__tr2qs_ctx("Do not scale avatar if it is less than required size","options"),KviOption_boolDoNotStretchAvatars); - + KviUIntSelector *u = addUIntSelector(g,__tr2qs_ctx("Image width:","options"),KviOption_uintAvatarScaleWidth,0,512,80,KVI_OPTION_BOOL(KviOption_boolScaleAvatars)); connect(b,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool))); u = addUIntSelector(g,__tr2qs_ctx("Image height:","options"),KviOption_uintAvatarScaleHeight,0,512,80,KVI_OPTION_BOOL(KviOption_boolScaleAvatars)); @@ -55,7 +55,7 @@ KviAvatarAdvancedOptionsWidget::KviAvatarAdvancedOptionsWidget(QWidget * parent) //2nd g = addGroupBox(0,1,0,1,Qt::Horizontal,__tr2qs_ctx("Scaling on load (and in user tooltips)","options")); b = addBoolSelector(g,__tr2qs_ctx("Scale avatar images on image load","options"),KviOption_boolScaleAvatarsOnLoad); - + u = addUIntSelector(g,__tr2qs_ctx("Image width:","options"),KviOption_uintScaleAvatarsOnLoadWidth,0,1280,80,KVI_OPTION_BOOL(KviOption_boolScaleAvatarsOnLoad)); connect(b,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool))); u = addUIntSelector(g,__tr2qs_ctx("Image height:","options"),KviOption_uintScaleAvatarsOnLoadHeight,0,1280,80,KVI_OPTION_BOOL(KviOption_boolScaleAvatarsOnLoad)); diff --git a/src/modules/options/optw_away.cpp b/src/modules/options/optw_away.cpp index 6dfd53869..e3fdca9e0 100644 --- a/src/modules/options/optw_away.cpp +++ b/src/modules/options/optw_away.cpp @@ -41,13 +41,13 @@ KviAwayOptionsWidget::KviAwayOptionsWidget(QWidget * parent) addBoolSelector(0,1,0,1, __tr2qs_ctx("User input exits away mode","options"), KviOption_boolExitAwayOnInput); KviTalGroupBox *g = addGroupBox(0,2,0,2,Qt::Horizontal,__tr2qs_ctx("Away Nickname","options")); - m_pEnableAwayNick = addBoolSelector(g,__tr2qs_ctx("Change nickname on away","options"),KviOption_boolChangeNickAway); + m_pEnableAwayNick = addBoolSelector(g,__tr2qs_ctx("Change nickname on away","options"),KviOption_boolChangeNickAway); connect(m_pEnableAwayNick,SIGNAL(toggled(bool)),this,SLOT(enableCustomAwayText(bool))); - + m_pEnableCustomAwayNick = addBoolSelector(g,__tr2qs_ctx("Use automatic nickname ([5 letters]AWAY)","options"),KviOption_boolAutoGeneratedAwayNick,KVI_OPTION_BOOL(KviOption_boolChangeNickAway)); connect(m_pEnableAwayNick,SIGNAL(toggled(bool)),m_pEnableCustomAwayNick,SLOT(setEnabled(bool))); connect(m_pEnableCustomAwayNick,SIGNAL(toggled(bool)),this,SLOT(enableCustomAwayText(bool))); - + // m_p <-- stands for pointer // m_sz <-- stands for a string :) // m_szCustomAwayNick = addStringSelector(0,4,0,4,__tr2qs_ctx("Custom away nick","options"),KviOption_stringCustomAwayNick,KVI_OPTION_BOOL(KviOption_boolChangeNickAway) && !(KVI_OPTION_BOOL(KviOption_boolAutoGeneratedAwayNick))); diff --git a/src/modules/options/optw_away.h b/src/modules/options/optw_away.h index 0ddf1a745..77e8afbc0 100644 --- a/src/modules/options/optw_away.h +++ b/src/modules/options/optw_away.h @@ -36,7 +36,7 @@ class KviAwayOptionsWidget : public KviOptionsWidget public: KviAwayOptionsWidget(QWidget * parent); ~KviAwayOptionsWidget(); -protected: +protected: KviBoolSelector * m_pEnableAwayNick; KviBoolSelector * m_pEnableCustomAwayNick; KviStringSelector * m_pCustomAwayNick; diff --git a/src/modules/options/optw_connection.cpp b/src/modules/options/optw_connection.cpp index 7c8326b61..41779fabf 100644 --- a/src/modules/options/optw_connection.cpp +++ b/src/modules/options/optw_connection.cpp @@ -56,7 +56,7 @@ KviConnectionOptionsWidget::KviConnectionOptionsWidget(QWidget * parent) b1 = addBoolSelector(gbox,__tr2qs_ctx("Rejoin channels after reconnect","options"),KviOption_boolRejoinChannelsAfterReconnect,KVI_OPTION_BOOL(KviOption_boolAutoReconnectOnUnexpectedDisconnect)); mergeTip(b1,__tr2qs_ctx("<center>This option will cause KVIrc to rejoin channels after a successful reconnect attempt.</center>","options")); - + b1 = addBoolSelector(gbox,__tr2qs_ctx("Reopen queries after reconnect","options"),KviOption_boolReopenQueriesAfterReconnect,KVI_OPTION_BOOL(KviOption_boolAutoReconnectOnUnexpectedDisconnect)); mergeTip(b1,__tr2qs_ctx("<center>This option will cause KVIrc to reopen query windows after a successful reconnect attempt.</center>","options")); @@ -143,7 +143,7 @@ KviTransportOptionsWidget::KviTransportOptionsWidget(QWidget * parent) setObjectName("transport_options_widget"); createLayout(); KviUIntSelector * u; - + KviTalGroupBox * g = addGroupBox(0,0,0,0,Qt::Horizontal,__tr2qs_ctx("Timeout Values","options"),this); u = addUIntSelector(g,__tr2qs_ctx("Connect timeout:","options"),KviOption_uintIrcSocketTimeout,5,6000,60); u->setSuffix(__tr2qs_ctx(" sec","options")); @@ -157,7 +157,7 @@ KviTransportOptionsWidget::KviTransportOptionsWidget(QWidget * parent) connect(b,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool))); g = addGroupBox(0,3,0,3,Qt::Horizontal,__tr2qs_ctx("Network Interfaces","options")); - + b = addBoolSelector(g,__tr2qs_ctx("Bind IPv4 connections to:","options"),KviOption_boolBindIrcIPv4ConnectionsToSpecifiedAddress); KviStringSelector * s = addStringSelector(g,"",KviOption_stringIPv4ConnectionBindAddress,KVI_OPTION_BOOL(KviOption_boolBindIrcIPv4ConnectionsToSpecifiedAddress)); connect(b,SIGNAL(toggled(bool)),s,SLOT(setEnabled(bool))); @@ -215,14 +215,14 @@ KviIdentOptionsWidget::KviIdentOptionsWidget(QWidget * parent) } gbox = addGroupBox(0,2,0,2,Qt::Horizontal,__tr2qs_ctx("Configuration","options"),KVI_OPTION_BOOL(KviOption_boolUseIdentService)); - + KviBoolSelector *b = addBoolSelector(gbox,__tr2qs_ctx("Enable ident service only while connecting to server","options"),KviOption_boolUseIdentServiceOnlyOnConnect); connect(m_pEnableIdent,SIGNAL(toggled(bool)),b,SLOT(setEnabled(bool))); KviStringSelector * s = addStringSelector(gbox,__tr2qs_ctx("Ident username:","options"), KviOption_stringIdentdUser,KVI_OPTION_BOOL(KviOption_boolUseIdentService)); connect(m_pEnableIdent,SIGNAL(toggled(bool)),s,SLOT(setEnabled(bool))); - + KviUIntSelector * u = addUIntSelector(gbox,__tr2qs_ctx("Service port:","options"), KviOption_uintIdentdPort,0,65535,113,KVI_OPTION_BOOL(KviOption_boolUseIdentService)); connect(m_pEnableIdent,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool))); diff --git a/src/modules/options/optw_ctcpfloodprotection.cpp b/src/modules/options/optw_ctcpfloodprotection.cpp index 1ffad69c3..e4dd2d4f8 100644 --- a/src/modules/options/optw_ctcpfloodprotection.cpp +++ b/src/modules/options/optw_ctcpfloodprotection.cpp @@ -87,7 +87,7 @@ KviCtcpFloodProtectionOptionsWidget::KviCtcpFloodProtectionOptionsWidget(QWidget u->setSuffix(__tr2qs_ctx(" requests","options")); mergeTip(u,__tr2qs_ctx("<center>Minimum value: <b>0 requests</b><br>Maximum value: <b>10000 requests</b></center>","options")); connect(b,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool))); - + u = addUIntSelector(1,1,1,1,__tr2qs_ctx("within:","options"),KviOption_uintCtcpFloodCheckInterval,1,3600,6,KVI_OPTION_BOOL(KviOption_boolUseCtcpFloodProtection)); u->setSuffix(__tr2qs_ctx(" sec","options")); mergeTip(u,__tr2qs_ctx("<center>Minimum value: <b>1 sec</b><br>Maximum value: <b>3600 sec</b></center>","options")); diff --git a/src/modules/options/optw_dcc.cpp b/src/modules/options/optw_dcc.cpp index b497b0b73..4f5b7d75f 100644 --- a/src/modules/options/optw_dcc.cpp +++ b/src/modules/options/optw_dcc.cpp @@ -70,7 +70,7 @@ KviDccAdvancedOptionsWidget::KviDccAdvancedOptionsWidget(QWidget * parent) createLayout(); KviTalGroupBox * g = addGroupBox(0,0,0,0,Qt::Horizontal,__tr2qs_ctx("Network Properties","options")); - + KviBoolSelector * b = addBoolSelector(g,__tr2qs_ctx("Use user-defined address or network interface","options"),KviOption_boolDccListenOnSpecifiedInterfaceByDefault); @@ -121,7 +121,7 @@ KviDccAdvancedOptionsWidget::KviDccAdvancedOptionsWidget(QWidget * parent) mergeTip(b,__tr2qs_ctx("<center>When you're behind a dialup router and also tunneling through a psyBNC bouncer, " \ "you can use a bug in the bouncer to force KVIrc to bind the DCC connections to the dialup router's address.<br>" \ "It's an ugly hack - use it only if nothing else works.</center>","options")); - + connect(b2,SIGNAL(toggled(bool)),b,SLOT(setEnabled(bool))); b = addBoolSelector(0,1,1,1,__tr2qs_ctx("Notify failed DCC handshakes to the remote end","options"),KviOption_boolNotifyFailedDccHandshakes); @@ -234,7 +234,7 @@ KviDccSendAdvancedOptionsWidget::KviDccSendAdvancedOptionsWidget(QWidget * paren KviUIntSelector * u = addUIntSelector(hb,"",KviOption_uintMaxDccSendSpeed,0,0xffffff1,1024,KVI_OPTION_BOOL(KviOption_boolLimitDccSendSpeed)); u->setSuffix(" " + __tr2qs_ctx("bytes/sec","options")); connect(b,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool))); - + hb = new KviTalHBox(g); b = addBoolSelector(hb,__tr2qs_ctx("Limit download bandwidth to","options"),KviOption_boolLimitDccRecvSpeed); u = addUIntSelector(hb,"",KviOption_uintMaxDccRecvSpeed,0,0xffffff1,1024,KVI_OPTION_BOOL(KviOption_boolLimitDccRecvSpeed)); @@ -266,7 +266,7 @@ KviDccSendAdvancedOptionsWidget::KviDccSendAdvancedOptionsWidget(QWidget * paren u = addUIntSelector(hb,"",KviOption_uintDccSendIdleStepInMSec,1,65536,30,KVI_OPTION_BOOL(KviOption_boolDccSendForceIdleStep)); connect(b,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool))); u->setSuffix(__tr2qs_ctx(" msec","options")); - + mergeTip(u, __tr2qs_ctx("<center>This parameter controls the average delay between two packets sent or received.<br>" \ "A smaller interval will cause you to send data faster but will also " \ diff --git a/src/modules/options/optw_highlighting.cpp b/src/modules/options/optw_highlighting.cpp index 64a267661..86bfa9c9e 100644 --- a/src/modules/options/optw_highlighting.cpp +++ b/src/modules/options/optw_highlighting.cpp @@ -62,8 +62,8 @@ KviHighlightingOptionsWidget::KviHighlightingOptionsWidget(QWidget * parent) SIGNAL(toggled(bool)), addStringSelector(0,3,0,3,__tr2qs_ctx("Highlight only whole words using these word splitters:","options"),KviOption_stringWordSplitters,!KVI_OPTION_BOOL(KviOption_boolUseFullWordHighlighting)), SLOT(setDisabled(bool))); - - + + // This can be used even without Word highlighting b = addBoolSelector(0,4,0,4,__tr2qs_ctx("Highlight messages containing my nickname","options"),KviOption_boolAlwaysHighlightNick); mergeTip(b,__tr2qs_ctx("<center>If this option is enabled, KVIrc will highlight any user message containing your current nickname</center>","options")); diff --git a/src/modules/options/optw_identity.cpp b/src/modules/options/optw_identity.cpp index 042a700bb..b567ffe31 100644 --- a/src/modules/options/optw_identity.cpp +++ b/src/modules/options/optw_identity.cpp @@ -912,7 +912,7 @@ KviIdentityProfileEditor::KviIdentityProfileEditor(QWidget * pParent) connect(m_pBtnOk,SIGNAL(clicked()),this,SLOT(okPressed())); pLayout->setColumnStretch(1,1); - + setMinimumWidth(250); } @@ -961,7 +961,7 @@ void KviIdentityProfileEditor::toggleButton(const QString & szText) (szText.isEmpty()) ) bEnabled = false; - + m_pBtnOk->setEnabled(bEnabled); } diff --git a/src/modules/options/optw_input.cpp b/src/modules/options/optw_input.cpp index 66df2bfa9..fdeb5a44b 100644 --- a/src/modules/options/optw_input.cpp +++ b/src/modules/options/optw_input.cpp @@ -48,21 +48,21 @@ KviInputLookOptionsWidget::KviInputLookOptionsWidget(QWidget * parent) addLabel(0,8,0,8,__tr2qs_ctx("Horizontal align:","options")); m_pHorizontalAlign=new QComboBox(this); addWidgetToLayout(m_pHorizontalAlign,1,8,1,8); - + addLabel(0,9,0,9,__tr2qs_ctx("Vertical align:","options")); m_pVerticalAlign=new QComboBox(this); addWidgetToLayout(m_pVerticalAlign,1,9,1,9); - + m_pHorizontalAlign->addItem(__tr2qs_ctx("Tile","options")); m_pHorizontalAlign->addItem(__tr2qs_ctx("Left","options")); m_pHorizontalAlign->addItem(__tr2qs_ctx("Right","options")); m_pHorizontalAlign->addItem(__tr2qs_ctx("Center","options")); - + m_pVerticalAlign->addItem(__tr2qs_ctx("Tile","options")); m_pVerticalAlign->addItem(__tr2qs_ctx("Top","options")); m_pVerticalAlign->addItem(__tr2qs_ctx("Bottom","options")); m_pVerticalAlign->addItem(__tr2qs_ctx("Center","options")); - + switch( KVI_OPTION_UINT(KviOption_uintInputPixmapAlign) & Qt::AlignHorizontal_Mask) { case Qt::AlignLeft: @@ -77,7 +77,7 @@ KviInputLookOptionsWidget::KviInputLookOptionsWidget(QWidget * parent) default: m_pHorizontalAlign->setCurrentIndex(0); } - + switch( KVI_OPTION_UINT(KviOption_uintInputPixmapAlign) & Qt::AlignVertical_Mask) { case Qt::AlignTop: @@ -128,7 +128,7 @@ void KviInputLookOptionsWidget::commit() iFlags|=Qt::AlignVCenter; break; } - + KVI_OPTION_UINT(KviOption_uintInputPixmapAlign)=iFlags; KviOptionsWidget::commit(); } diff --git a/src/modules/options/optw_input.h b/src/modules/options/optw_input.h index 87ab1a91a..0d3fc38f3 100644 --- a/src/modules/options/optw_input.h +++ b/src/modules/options/optw_input.h @@ -43,7 +43,7 @@ private: public: KviInputLookOptionsWidget(QWidget * parent); ~KviInputLookOptionsWidget(); - + virtual void commit(); }; diff --git a/src/modules/options/optw_interfacefeatures.cpp b/src/modules/options/optw_interfacefeatures.cpp index eecb1b26c..9a05f0a09 100644 --- a/src/modules/options/optw_interfacefeatures.cpp +++ b/src/modules/options/optw_interfacefeatures.cpp @@ -51,10 +51,10 @@ KviInterfaceFeaturesOptionsWidget::KviInterfaceFeaturesOptionsWidget(QWidget * p m_pDisableSplash = new QCheckBox(__tr2qs_ctx("Disable splash screen","options"),this); addWidgetToLayout(m_pDisableSplash,0,3,0,3); m_pDisableSplash->setChecked(bDisableSplash); - + addBoolSelector(0,4,0,4,__tr2qs_ctx("Enable visual effects","options"),KviOption_boolEnableVisualEffects); addBoolSelector(0,5,0,5,__tr2qs_ctx("Hide Channel window tool buttons by default","options"),KviOption_boolHideWindowToolButtons); - + KviTalGroupBox * g = addGroupBox(0,6,0,6,Qt::Horizontal,__tr2qs_ctx("Open Dialog Window For","options")); addBoolSelector(g,__tr2qs_ctx("Preferences","options"),KviOption_boolShowGeneralOptionsDialogAsToplevel); addBoolSelector(g,__tr2qs_ctx("Registered Users","options"),KviOption_boolShowRegisteredUsersDialogAsToplevel); @@ -83,7 +83,7 @@ void KviInterfaceFeaturesOptionsWidget::commit() if(KviFileUtils::fileExists(szSplashDisableFile)) KviFileUtils::removeFile(szSplashDisableFile); } - + } #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/optw_interfacelookglobal.cpp b/src/modules/options/optw_interfacelookglobal.cpp index 63539a00d..6e08dc8bb 100644 --- a/src/modules/options/optw_interfacelookglobal.cpp +++ b/src/modules/options/optw_interfacelookglobal.cpp @@ -174,9 +174,9 @@ KviThemeToolBarAppletsOptionsWidget::KviThemeToolBarAppletsOptionsWidget(QWidget : KviOptionsWidget(parent) { createLayout(); - + addFontSelector(0,0,0,0,__tr2qs_ctx("Font","options"),KviOption_fontIrcToolBarApplet); - + addColorSelector(0,1,0,1,__tr2qs_ctx("Background","options"),KviOption_colorIrcToolBarAppletBackground); addColorSelector(0,2,0,2,__tr2qs_ctx("Low-Contrast Foreground","options"),KviOption_colorIrcToolBarAppletForegroundLowContrast); addColorSelector(0,3,0,3,__tr2qs_ctx("Mid-Contrast Foreground","options"),KviOption_colorIrcToolBarAppletForegroundMidContrast); diff --git a/src/modules/options/optw_irc.cpp b/src/modules/options/optw_irc.cpp index 2abc75903..cd32fd5fe 100644 --- a/src/modules/options/optw_irc.cpp +++ b/src/modules/options/optw_irc.cpp @@ -66,7 +66,7 @@ KviIrcAdvancedOptionsWidget::KviIrcAdvancedOptionsWidget(QWidget * parent) { setObjectName("irc_advanced_options_widget"); createLayout(); - KviBoolSelector *b = addBoolSelector(0,0,0,0,__tr2qs_ctx("Force immediate quit","options"),KviOption_boolForceBrutalQuit); + KviBoolSelector *b = addBoolSelector(0,0,0,0,__tr2qs_ctx("Force immediate quit","options"),KviOption_boolForceBrutalQuit); mergeTip(b, __tr2qs_ctx("<center>This option causes KVIrc to close " \ "the connection immediately after sending the QUIT message.<br>" \ diff --git a/src/modules/options/optw_ircoutput.cpp b/src/modules/options/optw_ircoutput.cpp index ab6bafdcf..777356b2e 100644 --- a/src/modules/options/optw_ircoutput.cpp +++ b/src/modules/options/optw_ircoutput.cpp @@ -45,7 +45,7 @@ KviIrcOutputOptionsWidget::KviIrcOutputOptionsWidget(QWidget * parent) m_pVerbosityCombo = new QComboBox(this); addWidgetToLayout(m_pVerbosityCombo,1,0,1,0); - + m_pVerbosityCombo->addItem(__tr2qs_ctx("Mute","options")); m_pVerbosityCombo->addItem(__tr2qs_ctx("Quiet","options")); m_pVerbosityCombo->addItem(__tr2qs_ctx("Normal","options")); @@ -85,7 +85,7 @@ KviIrcOutputOptionsWidget::~KviIrcOutputOptionsWidget() void KviIrcOutputOptionsWidget::commit() { KviOptionsWidget::commit(); - + int i = m_pVerbosityCombo->currentIndex(); if((i < 0) || (i > KVI_VERBOSITY_LEVEL_PARANOIC))i = KVI_VERBOSITY_LEVEL_NORMAL; KVI_OPTION_UINT(KviOption_uintOutputVerbosityLevel) = i; diff --git a/src/modules/options/optw_lag.cpp b/src/modules/options/optw_lag.cpp index 7a447a279..9bc5e8619 100644 --- a/src/modules/options/optw_lag.cpp +++ b/src/modules/options/optw_lag.cpp @@ -51,7 +51,7 @@ KviLagOptionsWidget::KviLagOptionsWidget(QWidget * parent) "the pings (if any) will be sent really less often. " \ "5000 is a reasonable value.</center>","options")); connect(pUse,SIGNAL(toggled(bool)),pInterval,SLOT(setEnabled(bool))); - + KviUIntSelector * pAlarm = addUIntSelector(g, __tr2qs_ctx("Trigger event if lag exceeds:","options"), KviOption_uintLagAlarmTime,5000,1000000,30000, KVI_OPTION_BOOL(KviOption_boolUseLagMeterEngine)); pAlarm->setSuffix(__tr2qs_ctx(" msec","options")); mergeTip(pAlarm,__tr2qs_ctx("<center>This option controls the threshold for the " \ @@ -59,7 +59,7 @@ KviLagOptionsWidget::KviLagOptionsWidget(QWidget * parent) "the threshold OnLagAlarmTimeUp will be triggered and when the lag falls " \ "back below the threshold then OnLagAlarmTimeDown will be triggered</center>","options")); connect(pUse,SIGNAL(toggled(bool)),pAlarm,SLOT(setEnabled(bool))); - + KviBoolSelector * pShow = addBoolSelector(g, __tr2qs_ctx("Show lag in IRC context display","options"), KviOption_boolShowLagOnContextDisplay, KVI_OPTION_BOOL(KviOption_boolUseLagMeterEngine)); mergeTip(pShow,__tr2qs_ctx("<center>This makes the IRC context display applet show the current lag after the user's nickname (in seconds)</center>","options")); diff --git a/src/modules/options/optw_nickserv.cpp b/src/modules/options/optw_nickserv.cpp index ba89368cd..dfa6b7994 100644 --- a/src/modules/options/optw_nickserv.cpp +++ b/src/modules/options/optw_nickserv.cpp @@ -51,18 +51,18 @@ KviNickServRuleEditor::KviNickServRuleEditor(QWidget * par,bool bUseServerMaskFi QString html_center_end = "</center>"; QGridLayout * gl = new QGridLayout(this);//,bUseServerMaskField ? 7 : 6,4,10,5); - + QLabel * l = new QLabel(__tr2qs_ctx("Registered NickName","options"),this); gl->addWidget(l,0,0); - + m_pRegisteredNickEdit = new QLineEdit(this); KviTalToolTip::add(m_pRegisteredNickEdit,html_center_begin + __tr2qs_ctx("Put here the nickname that you have registered with NickServ","options") + html_center_end); gl->addWidget(m_pRegisteredNickEdit,0,1,1,3); // gl->addMultiCellWidget(m_pRegisteredNickEdit,0,0,1,3); - + l = new QLabel(__tr2qs_ctx("NickServ Mask","options"),this); gl->addWidget(l,1,0); - + m_pNickServMaskEdit = new QLineEdit(this); KviTalToolTip::add(m_pNickServMaskEdit, html_center_begin + __tr2qs_ctx("This is the mask that NickServ must match to be correctly identified as the NickServ service. " \ @@ -72,7 +72,7 @@ KviNickServRuleEditor::KviNickServRuleEditor(QWidget * par,bool bUseServerMaskFi "the mask <b>NickServ!*@*</b> may be safe to use in this field.","options") + html_center_end); gl->addWidget(m_pNickServMaskEdit,1,1,1,3); // gl->addMultiCellWidget(m_pNickServMaskEdit,1,1,1,3); - + l = new QLabel(__tr2qs_ctx("Message Regexp","options"),this); gl->addWidget(l,2,0); @@ -105,7 +105,7 @@ KviNickServRuleEditor::KviNickServRuleEditor(QWidget * par,bool bUseServerMaskFi { l = new QLabel(__tr2qs_ctx("Server mask","options"),this); gl->addWidget(l,4,0); - + m_pServerMaskEdit = new QLineEdit(this); KviTalToolTip::add(m_pServerMaskEdit, html_center_begin + __tr2qs_ctx("This is the mask that the current server must match in order " \ @@ -138,7 +138,7 @@ KviNickServRuleEditor::KviNickServRuleEditor(QWidget * par,bool bUseServerMaskFi gl->setColumnStretch(1,1); gl->setRowStretch(bUseServerMaskField ? 5 : 4,1); - + setMinimumWidth(250); } @@ -149,24 +149,24 @@ KviNickServRuleEditor::~KviNickServRuleEditor() bool KviNickServRuleEditor::validate() { QString s = m_pRegisteredNickEdit->text(); - + QString m = __tr2qs_ctx("Invalid NickServ Rule","options"); QString o = __tr2qs_ctx("OK","options"); - + if(s.isEmpty()) { QMessageBox::warning(this,m,__tr2qs_ctx("The Nickname field can't be empty!","options"),o); return false; } - + if(s.indexOf(QChar(' ')) != -1) { QMessageBox::warning(this,m,__tr2qs_ctx("The Nickname field can't contain spaces!","options"),o); return false; } - + s = m_pNickServMaskEdit->text(); - + if(s.isEmpty()) { QMessageBox::warning(this,m,__tr2qs_ctx("The NickServ mask can't be empty!<br>You must put at least * there.","options"),o); @@ -174,7 +174,7 @@ bool KviNickServRuleEditor::validate() } s = m_pMessageRegexpEdit->text(); - + if(s.isEmpty()) { QMessageBox::warning(this,m,__tr2qs_ctx("The Message Regexp can't be empty!<br>You must put at least * there.","options"),o); @@ -182,13 +182,13 @@ bool KviNickServRuleEditor::validate() } s = m_pIdentifyCommandEdit->text(); - + if(s.isEmpty()) { QMessageBox::warning(this,m,__tr2qs_ctx("The Identify Command can't be empty!","options"),o); return false; } - + return true; } @@ -223,7 +223,7 @@ KviNickServOptionsWidget::KviNickServOptionsWidget(QWidget * parent) { createLayout(); setObjectName("nickserv_options_widget"); - + QGridLayout * gl = layout(); KviNickServRuleSet * rs = g_pNickServRuleSet; @@ -239,7 +239,7 @@ KviNickServOptionsWidget::KviNickServOptionsWidget(QWidget * parent) m_pNickServTreeWidget->setSelectionMode(QAbstractItemView::SingleSelection); m_pNickServTreeWidget->setAllColumnsShowFocus(true); QStringList columnLabels; - + columnLabels.append(__tr2qs_ctx("Nickname","options")); columnLabels.append(__tr2qs_ctx("Server mask","options")); columnLabels.append(__tr2qs_ctx("NickServ Mask","options")); diff --git a/src/modules/options/optw_sound.cpp b/src/modules/options/optw_sound.cpp index c8079976f..6dc85013e 100644 --- a/src/modules/options/optw_sound.cpp +++ b/src/modules/options/optw_sound.cpp @@ -103,7 +103,7 @@ KviSoundGeneralOptionsWidget::KviSoundGeneralOptionsWidget(QWidget * parent) int i = 0; int iMatch = 0; - + KviLocale::EncodingDescription * d = KviLocale::encodingDescription(i); while(d->szName) { @@ -122,11 +122,11 @@ KviSoundGeneralOptionsWidget::KviSoundGeneralOptionsWidget(QWidget * parent) h = new KviTalHBox(g); m_pWinampEncodingCombo = new QComboBox(h); - + m_pWinampEncodingCombo->addItem(__tr2qs_ctx("Use Language Encoding","options")); i = 0; iMatch = 0; - + d = KviLocale::encodingDescription(i); while(d->szName) { @@ -253,7 +253,7 @@ void KviSoundGeneralOptionsWidget::commit() KviOptionsWidget::commit(); KVI_OPTION_STRING(KviOption_stringSoundSystem) = m_pSoundSystemBox->currentText(); KVI_OPTION_STRING(KviOption_stringPreferredMediaPlayer) = m_pMediaPlayerBox->currentText(); - + int idx = m_pTagsEncodingCombo->currentIndex(); if(idx <= 0) { @@ -283,18 +283,18 @@ KviSoundsOptionsWidget::KviSoundsOptionsWidget(QWidget * parent) createLayout(); addLabel(0,0,0,0,__tr2qs_ctx("New Query opened","options")); addSoundSelector(1,0,1,0,"",KviOption_stringOnNewQueryOpenedSound); - + addLabel(0,1,0,1,__tr2qs_ctx("New message in inactive query","options")); addSoundSelector(1,1,1,1,"",KviOption_stringOnQueryMessageSound); - + addLabel(0,2,0,2,__tr2qs_ctx("Highlighted message in inactive window","options")); addSoundSelector(1,2,1,2,"",KviOption_stringOnHighlightedMessageSound); - + addLabel(0,3,0,3,__tr2qs_ctx("Me have been kicked","options")); addSoundSelector(1,3,1,3,"",KviOption_stringOnMeKickedSound); - + addRowSpacer(0,4,1,4); - + } KviSoundsOptionsWidget::~KviSoundsOptionsWidget() diff --git a/src/modules/options/optw_textencoding.cpp b/src/modules/options/optw_textencoding.cpp index 3dee0ea09..9b38a6af6 100644 --- a/src/modules/options/optw_textencoding.cpp +++ b/src/modules/options/optw_textencoding.cpp @@ -74,19 +74,19 @@ KviTextEncodingOptionsWidget::KviTextEncodingOptionsWidget(QWidget * parent) m_pTextEncodingCombo->setCurrentIndex(iTextMatch); m_pSrvEncodingCombo->setCurrentIndex(iSrvMatch); - + addLabel(0,2,0,2,__tr2qs_ctx("Force language:","options")); - + m_pForcedLocaleCombo = new QComboBox(this); - + addWidgetToLayout(m_pForcedLocaleCombo,1,2,1,2); - + QLabel * l = new QLabel(__tr2qs_ctx("<b>Note:</b> You need to restart KVirc to apply a language changing","options"),this); addWidgetToLayout(l,0,3,1,3); - + m_pForcedLocaleCombo->addItem(__tr2qs_ctx("Automatic detection","options")); m_pForcedLocaleCombo->addItem(__tr2qs_ctx("en","options")); - + QString szLangFile=QString("%1/.kvirc_force_locale").arg(QDir::homePath()); bool bIsDefaultLocale = !KviFileUtils::fileExists(szLangFile); @@ -97,15 +97,15 @@ KviTextEncodingOptionsWidget::KviTextEncodingOptionsWidget(QWidget * parent) } else { m_szLanguage=KviLocale::localeName(); } - + QString szLocaleDir; g_pApp->getGlobalKvircDirectory(szLocaleDir,KviApp::Locale); QStringList list=QDir(szLocaleDir).entryList(QStringList("kvirc_*.mo"),QDir::Files); - + i = 0; int iMatch = 0; - + for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it ) { QString szTmp=*it; szTmp.replace("kvirc_",""); @@ -147,7 +147,7 @@ void KviTextEncodingOptionsWidget::commit() } else { KVI_OPTION_STRING(KviOption_stringDefaultSrvEncoding) = m_pSrvEncodingCombo->itemText(idx); } - + idx=m_pForcedLocaleCombo->currentIndex(); QString szLangFile=QString("%1/.kvirc_force_locale").arg(QDir::homePath()); if(idx==0) { diff --git a/src/modules/options/optw_topiclabel.cpp b/src/modules/options/optw_topiclabel.cpp index bfc237237..8f0fdbecf 100644 --- a/src/modules/options/optw_topiclabel.cpp +++ b/src/modules/options/optw_topiclabel.cpp @@ -37,7 +37,7 @@ KviTopicLabelLookOptionsWidget::KviTopicLabelLookOptionsWidget(QWidget *p):KviOp addColorSelector(0, 1, 0, 1, __tr2qs_ctx("Foreground color","options"), KviOption_colorLabelForeground); addColorSelector(0, 2, 0, 2, __tr2qs_ctx("Background color","options"), KviOption_colorLabelBackground); addPixmapSelector(0, 3, 0, 3, __tr2qs_ctx("Background image","options"), KviOption_pixmapLabelBackground); - + layout()->setRowStretch(3, 1); } diff --git a/src/modules/options/optw_urlhandlers.cpp b/src/modules/options/optw_urlhandlers.cpp index 75bad4124..8e01b1862 100644 --- a/src/modules/options/optw_urlhandlers.cpp +++ b/src/modules/options/optw_urlhandlers.cpp @@ -136,7 +136,7 @@ void KviUrlHandlersOptionsWidget::commit() KVI_OPTION_STRING(KviOption_stringUrlUnknownCommand).replace("\\\\","@MAGIC@"); KVI_OPTION_STRING(KviOption_stringUrlUnknownCommand).replace("\\","\\\\"); KVI_OPTION_STRING(KviOption_stringUrlUnknownCommand).replace("@MAGIC@","\\\\"); - + //Check for escaped " in url handler ( \" ) KVI_OPTION_STRING(KviOption_stringUrlHttpCommand).replace("\\\\\"","\\\""); KVI_OPTION_STRING(KviOption_stringUrlHttpsCommand).replace("\\\\\"","\\\""); diff --git a/src/modules/options/optw_windowlist.cpp b/src/modules/options/optw_windowlist.cpp index 0d4b93f3b..e9f7160ad 100644 --- a/src/modules/options/optw_windowlist.cpp +++ b/src/modules/options/optw_windowlist.cpp @@ -82,9 +82,9 @@ KviTreeWindowListForegroundOptionsWidget::KviTreeWindowListForegroundOptionsWidg createLayout(); addFontSelector(0,0,0,0,__tr2qs_ctx("Font:","options"),KviOption_fontTreeWindowList); - + KviTalGroupBox *g = addGroupBox(0,1,0,1,Qt::Horizontal,__tr2qs_ctx("Text/Alert Colors","options")); - + addColorSelector(g,__tr2qs_ctx("Normal:","options"),KviOption_colorTreeWindowListForeground); addColorSelector(g,__tr2qs_ctx("Selected:","options"),KviOption_colorTreeWindowListActiveForeground); addColorSelector(g,__tr2qs_ctx("Alert Level 1:","options"),KviOption_colorTreeWindowListHighlight1Foreground); @@ -114,7 +114,7 @@ KviTreeWindowListBackgroundOptionsWidget::KviTreeWindowListBackgroundOptionsWidg setObjectName("treewindowlist_options_widget"); createLayout(); - + KviTalGroupBox * g = addGroupBox(0,0,1,0,Qt::Horizontal,__tr2qs_ctx("Background Colors","options")); addColorSelector(g,__tr2qs_ctx("Normal:","options"),KviOption_colorTreeWindowListBackground); addColorSelector(g,__tr2qs_ctx("Selected:","options"),KviOption_colorTreeWindowListActiveBackground); @@ -124,21 +124,21 @@ KviTreeWindowListBackgroundOptionsWidget::KviTreeWindowListBackgroundOptionsWidg addLabel(0,2,0,2,__tr2qs_ctx("Horizontal align:","options")); m_pHorizontalAlign=new QComboBox(this); addWidgetToLayout(m_pHorizontalAlign,1,2,1,2); - + addLabel(0,3,0,3,__tr2qs_ctx("Vertical align:","options")); m_pVerticalAlign=new QComboBox(this); addWidgetToLayout(m_pVerticalAlign,1,3,1,3); - + m_pHorizontalAlign->addItem(__tr2qs_ctx("Tile","options")); m_pHorizontalAlign->addItem(__tr2qs_ctx("Left","options")); m_pHorizontalAlign->addItem(__tr2qs_ctx("Right","options")); m_pHorizontalAlign->addItem(__tr2qs_ctx("Center","options")); - + m_pVerticalAlign->addItem(__tr2qs_ctx("Tile","options")); m_pVerticalAlign->addItem(__tr2qs_ctx("Top","options")); m_pVerticalAlign->addItem(__tr2qs_ctx("Bottom","options")); m_pVerticalAlign->addItem(__tr2qs_ctx("Center","options")); - + switch( KVI_OPTION_UINT(KviOption_uintTreeWindowListPixmapAlign) & Qt::AlignHorizontal_Mask) { case Qt::AlignLeft: @@ -153,7 +153,7 @@ KviTreeWindowListBackgroundOptionsWidget::KviTreeWindowListBackgroundOptionsWidg default: m_pHorizontalAlign->setCurrentIndex(0); } - + switch( KVI_OPTION_UINT(KviOption_uintTreeWindowListPixmapAlign) & Qt::AlignVertical_Mask) { case Qt::AlignTop: @@ -206,7 +206,7 @@ void KviTreeWindowListBackgroundOptionsWidget::commit() iFlags|=Qt::AlignVCenter; break; } - + KVI_OPTION_UINT(KviOption_uintTreeWindowListPixmapAlign)=iFlags; } @@ -218,7 +218,7 @@ KviTreeWindowListFeaturesOptionsWidget::KviTreeWindowListFeaturesOptionsWidget(Q setObjectName("treewindowlist_options_widget"); createLayout(); - + addUIntSelector(0,1,0,1,__tr2qs_ctx("Minimum width:","options"),KviOption_uintTreeWindowListMinimumWidth,24,1024,125); addUIntSelector(0,2,0,2,__tr2qs_ctx("Maximum width:","options"),KviOption_uintTreeWindowListMaximumWidth,24,9999,125); diff --git a/src/modules/options/optw_windowlist.h b/src/modules/options/optw_windowlist.h index 4e0b5cc7d..43ee60141 100644 --- a/src/modules/options/optw_windowlist.h +++ b/src/modules/options/optw_windowlist.h @@ -90,7 +90,7 @@ private: public: KviTreeWindowListBackgroundOptionsWidget(QWidget * parent); ~KviTreeWindowListBackgroundOptionsWidget(); - + virtual void commit(); }; diff --git a/src/modules/perl/libkviperl.cpp b/src/modules/perl/libkviperl.cpp index fd7c63105..2e956bfc5 100644 --- a/src/modules/perl/libkviperl.cpp +++ b/src/modules/perl/libkviperl.cpp @@ -77,7 +77,7 @@ This feature is present only if a working perl installation has been found at ./configure time.[br] [br] - + [big]Using perl from KVS[/big][br] Using perl from KVIrc is really easy: just enclose your perl code snippet inside [cmd]perl.begin[/cmd] and [cmd]perl.end[/cmd]. @@ -101,7 +101,7 @@ If you have already encountered the KVIrc's [cmd]eval[/cmd] command that you probably also know how to execute a perl code snippet from a file :)[br] [br] - + [big]Using KVS from perl[/big][br] KVIrc exports several commands to the perl namespace that allow you to invoke KVIrc's functions from inside the perl code snippet.[br] @@ -119,7 +119,7 @@ is the equivalent of the -w option. Both <colorset> and <windowid> can be omitted (in this case KVIrc will use a default colorset and the current window).[br] [br] - + [big]Perl execution contexts[/big][br] The perl code snippets are executed by the means of a perl interpreter. Each perl interpreter has its own context and thus it's own variables, @@ -170,7 +170,7 @@ If you just execute occasional perl code snippets and don't need to keep persistent variables then just use the nameless temporary context provided by [cmd]perl.begin[/cmd]("").[br] [br] - + [big]Passing parameters to the perl script[/big][br] The easiest way to pass parameters to the perl code snippet is to put them as [cmd]perl.begin[/cmd] arguments. @@ -185,7 +185,7 @@ [cmd]perl.end[/cmd] [/example] [br] - + [big]Accessing the KVIrc scripting context from perl[/big][br] KVIrc exposes the following functions that manipulate the variables of the KVIrc's current KVS execution context.[br] @@ -287,7 +287,7 @@ In this way you can write perl aliases that return values without doing any variable passing equilibrism.[br] [br] - + [big]Executing perl scripts from files[/big][br] [example] [cmd]alias[/cmd](perlexec) @@ -328,7 +328,7 @@ [cmd]perl.end[/cmd] [/example] [br] - + [big]Curiosity[/big][br] The perl support in KVIrc is implemented as a master-slave module pair. The perl.* module is the master while perlcore is the slave. @@ -453,7 +453,7 @@ static bool perl_kvs_cmd_begin(KviKvsModuleCommandCall * c) ex.lArgs.append(tmp); } ex.bQuiet = c->switches()->find('q',"quiet"); - + if(!g_pPerlCoreModule->ctrl(KVI_PERLCORECTRLCOMMAND_EXECUTE,&ex)) { if(!c->switches()->find('q',"quiet")) @@ -471,7 +471,7 @@ static bool perl_kvs_cmd_begin(KviKvsModuleCommandCall * c) { if(!c->switches()->find('q',"quiet")) { - + if(c->switches()->find('f',"fail-on-error")) { c->warning(__tr2qs_ctx("Perl execution error:","perl")); @@ -527,7 +527,7 @@ static bool perl_kvs_cmd_destroy(KviKvsModuleCommandCall * c) KviPerlCoreCtrlCommand_destroy ex; ex.uSize = sizeof(KviPerlCoreCtrlCommand_destroy); ex.szContext = szContext; - + if(!g_pPerlCoreModule->ctrl(KVI_PERLCORECTRLCOMMAND_DESTROY,&ex)) { if(!c->switches()->find('q',"quiet")) @@ -569,7 +569,7 @@ static bool perl_module_init(KviModule * m) // register the command anyway KVSM_REGISTER_SIMPLE_COMMAND(m,"begin",perl_kvs_cmd_begin); KVSM_REGISTER_SIMPLE_COMMAND(m,"destroy",perl_kvs_cmd_destroy); - + KVSM_REGISTER_FUNCTION(m,"isAvailable",perl_kvs_fnc_isAvailable); // FIXME: perl.isSupported() diff --git a/src/modules/perlcore/KVIrc.xs b/src/modules/perlcore/KVIrc.xs index 37b040cf8..af05dcb0b 100644 --- a/src/modules/perlcore/KVIrc.xs +++ b/src/modules/perlcore/KVIrc.xs @@ -1,5 +1,5 @@ MODULE = KVIrc PACKAGE = KVIrc - + void echo(text,colorset = 0,windowid = 0) char * text int colorset @@ -17,7 +17,7 @@ void echo(text,colorset = 0,windowid = 0) } pWnd->outputNoFmt(colorset,QString::fromUtf8(text)); } - + void say(text,windowid = 0) char * text char * windowid diff --git a/src/modules/perlcore/ppport.h b/src/modules/perlcore/ppport.h index 2a8021323..e0f8de2bf 100644 --- a/src/modules/perlcore/ppport.h +++ b/src/modules/perlcore/ppport.h @@ -1,7 +1,7 @@ -/* ppport.h -- Perl/Pollution/Portability Version 2.0002 +/* ppport.h -- Perl/Pollution/Portability Version 2.0002 * - * Automatically Created by Devel::PPPort on Tue Jul 13 13:16:39 2004 + * Automatically Created by Devel::PPPort on Tue Jul 13 13:16:39 2004 * * Do NOT edit this file directly! -- Edit PPPort.pm instead. * @@ -9,7 +9,7 @@ * Version 1.x, Copyright (C) 1999, Kenneth Albanowski. * This code may be used and distributed under the same license as any * version of Perl. - * + * * This version of ppport.h is designed to support operation with Perl * installations back to 5.004, and has been tested up to 5.8.0. * @@ -35,7 +35,7 @@ * * For the latest version of this code, please retreive the Devel::PPPort * module from CPAN. - * + * */ /* @@ -53,29 +53,29 @@ * for a static include, or use the GLOBAL request in a single module to * produce a global definition that can be referenced from the other * modules. - * + * * Function: Static define: Extern define: * newCONSTSUB() NEED_newCONSTSUB NEED_newCONSTSUB_GLOBAL * */ - + /* To verify whether ppport.h is needed for your module, and whether any * special defines should be used, ppport.h can be run through Perl to check * your source code. Simply say: - * + * * perl -x ppport.h *.c *.h *.xs foo/bar*.c [etc] - * + * * The result will be a list of patches suggesting changes that should at * least be acceptable, if not necessarily the most efficient solution, or a * fix for all possible problems. It won't catch where dTHR is needed, and * doesn't attempt to account for global macro or function definitions, * nested includes, typemaps, etc. - * + * * In order to test for the need of dTHR, please try your module under a * recent version of Perl that has threading compiled-in. * - */ + */ /* @@ -133,7 +133,7 @@ foreach $filename (map(glob($_),@ARGV)) { $need_include = 1; } } - + if (scalar(keys %add_func) or $need_include != $has_include) { if (!$has_include) { $inc = join('',map("#define NEED_$_\n", sort keys %add_func)). @@ -149,7 +149,7 @@ foreach $filename (map(glob($_),@ARGV)) { } $changes++; } - + if ($changes) { open(OUT,">/tmp/ppport.h.$$"); print OUT $c; @@ -184,7 +184,7 @@ __DATA__ #define PERL_BCDVERSION ((PERL_REVISION * 0x1000000L) + (PERL_VERSION * 0x1000L) + PERL_SUBVERSION) -/* It is very unlikely that anyone will try to use this with Perl 6 +/* It is very unlikely that anyone will try to use this with Perl 6 (or greater), but who knows. */ #if PERL_REVISION != 5 @@ -247,7 +247,7 @@ __DATA__ # define pTHX_ # define aTHX # define aTHX_ -#endif +#endif #ifndef UVSIZE # define UVSIZE IVSIZE @@ -282,7 +282,7 @@ typedef NVTYPE NV; #if PTRSIZE == LONGSIZE # define PTR2ul(p) (unsigned long)(p) #else -# define PTR2ul(p) INT2PTR(unsigned long,p) +# define PTR2ul(p) INT2PTR(unsigned long,p) #endif #endif /* !INT2PTR */ @@ -326,9 +326,9 @@ typedef NVTYPE NV; # if defined(USE_THREADS) static SV * newRV_noinc (SV * sv) { - SV *nsv = (SV*)newRV(sv); - SvREFCNT_dec(sv); - return nsv; + SV *nsv = (SV*)newRV(sv); + SvREFCNT_dec(sv); + return nsv; } # else # define newRV_noinc(sv) \ @@ -478,7 +478,7 @@ SV *sv; #define aMY_CXT_ #define _aMY_CXT -#endif +#endif #endif /* START_MY_CXT */ @@ -502,7 +502,7 @@ SV *sv; #ifndef NVef # if defined(USE_LONG_DOUBLE) && defined(HAS_LONG_DOUBLE) && \ - defined(PERL_PRIfldbl) /* Not very likely, but let's try anyway. */ + defined(PERL_PRIfldbl) /* Not very likely, but let's try anyway. */ # define NVef PERL_PRIeldbl # define NVff PERL_PRIfldbl # define NVgf PERL_PRIgldbl @@ -526,7 +526,7 @@ SV *sv; ? ((lp = SvCUR(sv)), SvPVX(sv)) : my_sv_2pvbyte(aTHX_ sv, &lp)) static char * my_sv_2pvbyte(pTHX_ register SV *sv, STRLEN *lp) - { + { sv_utf8_downgrade(sv,0); return SvPV(sv,*lp); } diff --git a/src/modules/perlcore/typemap b/src/modules/perlcore/typemap index 1124eb648..193b54883 100644 --- a/src/modules/perlcore/typemap +++ b/src/modules/perlcore/typemap @@ -264,7 +264,7 @@ T_PACKED XS_pack_$ntype($arg, $var); T_PACKEDARRAY XS_pack_$ntype($arg, $var, count_$ntype); -T_DATAUNIT +T_DATAUNIT sv_setpvn($arg, $var.chp(), $var.size()); T_CALLBACK sv_setpvn($arg, $var.context.value().chp(), diff --git a/src/modules/python/libkvipython.cpp b/src/modules/python/libkvipython.cpp index ee1d68ea8..60a22b239 100644 --- a/src/modules/python/libkvipython.cpp +++ b/src/modules/python/libkvipython.cpp @@ -106,7 +106,7 @@ static bool python_kvs_cmd_destroy(KviKvsModuleCommandCall * c) KviPerlCoreCtrlCommand_destroy ex; ex.uSize = sizeof(KviPerlCoreCtrlCommand_destroy); ex.szContext = szContext; - + if(!g_pPerlCoreModule->ctrl(KVI_PERLCORECTRLCOMMAND_DESTROY,&ex)) { if(!c->switches()->find('q',"quiet")) @@ -148,7 +148,7 @@ static bool python_module_init(KviModule * m) // register the command anyway KVSM_REGISTER_SIMPLE_COMMAND(m,"begin",python_kvs_cmd_begin); KVSM_REGISTER_SIMPLE_COMMAND(m,"destroy",python_kvs_cmd_destroy); - + KVSM_REGISTER_FUNCTION(m,"isAvailable",python_kvs_fnc_isAvailable); #ifdef COMPILE_PYTHON_SUPPORT g_pPythonCoreModule = g_pModuleManager->getModule("pythoncore"); diff --git a/src/modules/reguser/wizard.cpp b/src/modules/reguser/wizard.cpp index 9f8156136..a7d75d409 100644 --- a/src/modules/reguser/wizard.cpp +++ b/src/modules/reguser/wizard.cpp @@ -51,9 +51,9 @@ KviRegistrationWizard::KviRegistrationWizard(const QString &startMask,KviRegiste : KviTalWizard(par) { m_pDb = db; - + setModal(bModal); - + m_bModal = bModal; KviIrcMask mask(!startMask.isEmpty() ? startMask.toUtf8().data() : "*!*@*"); @@ -73,14 +73,14 @@ KviRegistrationWizard::KviRegistrationWizard(const QString &startMask,KviRegiste QFrame * f; -// resize( 490, 456 ); +// resize( 490, 456 ); setWindowTitle(__tr2qs_ctx("User Registration Wizard - KVIrc","register")); setWindowIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_LINUX))); setSizeGripEnabled( TRUE ); m_pPage1 = new QWidget(this); - m_pPage1Layout = new QGridLayout(m_pPage1); + m_pPage1Layout = new QGridLayout(m_pPage1); m_pPage1Layout->setSpacing(4); m_pPage1Layout->setMargin(8); @@ -104,7 +104,7 @@ KviRegistrationWizard::KviRegistrationWizard(const QString &startMask,KviRegiste m_pPage2 = new QWidget(this); - m_pPage2Layout = new QGridLayout( m_pPage2 ); + m_pPage2Layout = new QGridLayout( m_pPage2 ); m_pPage2Layout->setSpacing( 4 ); m_pPage2Layout->setMargin( 8 ); @@ -175,7 +175,7 @@ KviRegistrationWizard::KviRegistrationWizard(const QString &startMask,KviRegiste m_pPage3 = new QWidget(this); - m_pPage3Layout = new QGridLayout(m_pPage3); + m_pPage3Layout = new QGridLayout(m_pPage3); m_pPage3Layout->setSpacing(4); m_pPage3Layout->setMargin(8); @@ -200,7 +200,7 @@ KviRegistrationWizard::KviRegistrationWizard(const QString &startMask,KviRegiste m_pPage4 = new QWidget(this); - m_pPage4Layout = new QGridLayout(m_pPage4); + m_pPage4Layout = new QGridLayout(m_pPage4); m_pPage4Layout->setSpacing(4); m_pPage4Layout->setMargin(8); @@ -246,7 +246,7 @@ KviRegistrationWizard::KviRegistrationWizard(const QString &startMask,KviRegiste m_pPage5 = new QWidget(this); - m_pPage5Layout = new QGridLayout(m_pPage5); + m_pPage5Layout = new QGridLayout(m_pPage5); m_pPage5Layout->setSpacing(4); m_pPage5Layout->setMargin(8); @@ -375,7 +375,7 @@ void KviRegistrationWizard::accept() m1.append(' '); m1.append(m2); } - + if(!m1.isEmpty()) { u->setProperty("notify",m1); @@ -414,7 +414,7 @@ void KviRegistrationWizard::maskChanged(const QString &) setNextEnabled(m_pPage2,false); return; } - + if(tmp2.isEmpty()) { setNextEnabled(m_pPage2,false); diff --git a/src/modules/rijndael/ablowfish.cpp b/src/modules/rijndael/ablowfish.cpp index 329da8bc8..914a51f5c 100644 --- a/src/modules/rijndael/ablowfish.cpp +++ b/src/modules/rijndael/ablowfish.cpp @@ -311,8 +311,8 @@ BlowFish::BlowFish(unsigned char* ucKey, unsigned int keysize, const SBlock& roC if(keysize<1) // throw exception("Incorrect key length"); return; - - + + //Check the Key - the key length should be between 1 and 56 bytes if(keysize>56) keysize = 56; @@ -338,7 +338,7 @@ BlowFish::BlowFish(unsigned char* ucKey, unsigned int keysize, const SBlock& roC iCount++; if(iCount == ((int)keysize)) { - //All bytes used, so recycle bytes + //All bytes used, so recycle bytes iCount = 0; p = aucLocalKey; } diff --git a/src/modules/rijndael/ablowfish.h b/src/modules/rijndael/ablowfish.h index f3595cc6e..9710dcba3 100644 --- a/src/modules/rijndael/ablowfish.h +++ b/src/modules/rijndael/ablowfish.h @@ -41,7 +41,7 @@ // // BLOWFISH ENCRYPTION ALGORITHM // -// Implementation of Bruce Schneier's BLOWFISH algorithm from "Applied +// Implementation of Bruce Schneier's BLOWFISH algorithm from "Applied // Cryptography", Second Edition. // // Encryption and Decryption of Byte Strings using the Blowfish Encryption Algorithm. diff --git a/src/modules/rijndael/libkvirijndael.cpp b/src/modules/rijndael/libkvirijndael.cpp index 3c2d25f97..965bd37f6 100644 --- a/src/modules/rijndael/libkvirijndael.cpp +++ b/src/modules/rijndael/libkvirijndael.cpp @@ -103,7 +103,7 @@ { decKey = encKey; decKeyLen = encKeyLen; - } // else all + } // else all } else { // no encrypt key specified... if(decKey && decKeyLen) @@ -183,7 +183,7 @@ } int len = (int)kvi_strLen(plainText); char * buf = (char *)kvi_malloc(len + 16); - + int retVal = m_pEncryptCipher->padEncrypt((const unsigned char *)plainText,len,(unsigned char *)buf); if(retVal < 0) { @@ -226,7 +226,7 @@ } inBuffer++; - + if(!*inBuffer) { plainText = inBuffer; @@ -239,7 +239,7 @@ if(!asciiToBinary(inBuffer,&len,&binary))return KviCryptEngine::DecryptError; char * buf = (char *)kvi_malloc(len + 1); - + int retVal = m_pDecryptCipher->padDecrypt((const unsigned char *)binary,len,(unsigned char *)buf); kvi_free(binary); @@ -355,12 +355,12 @@ { g_pEngineList->append(this); } - + KviMircryptionEngine::~KviMircryptionEngine() { g_pEngineList->removeRef(this); } - + bool KviMircryptionEngine::init(const char * encKey,int encKeyLen,const char * decKey,int decKeyLen) { if(encKey && (encKeyLen > 0)) @@ -369,7 +369,7 @@ { decKey = encKey; decKeyLen = encKeyLen; - } // else all + } // else all } else { // no encrypt key specified... if(decKey && decKeyLen) @@ -394,7 +394,7 @@ m_bDecryptCBC = false; return true; } - + KviCryptEngine::EncryptResult KviMircryptionEngine::encrypt(const char * plainText,KviStr &outBuffer) { KviStr szPlain = plainText; @@ -420,7 +420,7 @@ //outBuffer += MCPS2_ENDTAG; return KviCryptEngine::Encrypted; } - + KviCryptEngine::DecryptResult KviMircryptionEngine::decrypt(const char * inBuffer,KviStr &plainText) { plainText = ""; @@ -453,7 +453,7 @@ if(idx > 0) // a non encrypted block plainText += szIn.left(idx); szIn.cutLeft(idx + len1); - + idx = szIn.findFirstIdx(MCPS2_ENDTAG); if(idx != -1) { @@ -464,7 +464,7 @@ } */ } - + static unsigned char fake_base64[]="./0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"; unsigned int fake_base64dec(unsigned char c) @@ -472,7 +472,7 @@ static char base64unmap[255]; static bool didinit=false; int i; - + if(!didinit) { // initialize base64unmap @@ -483,7 +483,7 @@ return base64unmap[c]; } - + static void byteswap_buffer(unsigned char * p,int len) { while(len > 0) @@ -514,7 +514,7 @@ //byteswap_buffer((unsigned char *)plain.ptr(),plain.len()); unsigned char * out =(unsigned char *)kvi_malloc(plain.len()); // we use this to avoid endiannes problems - + BlowFish bf((unsigned char *)m_szEncryptKey.ptr(),m_szEncryptKey.len()); bf.ResetChain(); bf.Encrypt((unsigned char *)plain.ptr(),out,plain.len(),BlowFish::ECB); @@ -542,7 +542,7 @@ *p++ = fake_base64[*dd2 & 0x3f]; *dd2 >>= 6; *p++ = fake_base64[*dd2 & 0x3f]; *dd2 >>= 6; *p++ = fake_base64[*dd2 & 0x3f]; - + *p++ = fake_base64[*dd1 & 0x3f]; *dd1 >>= 6; *p++ = fake_base64[*dd1 & 0x3f]; *dd1 >>= 6; *p++ = fake_base64[*dd1 & 0x3f]; *dd1 >>= 6; @@ -571,7 +571,7 @@ // a fake base64 decoding algo, use a different character set // and stuff 6 bytes at a time into a 32 bit long... int ll = (encoded.len() * 2) / 3; - + unsigned char * buf = (unsigned char *)kvi_malloc(ll); unsigned char * p = (unsigned char *)encoded.ptr(); unsigned char * e = p + encoded.len(); @@ -621,9 +621,9 @@ // choose an IV static bool bDidInit = false; - + int t = (int)kvi_unixTime(); - + if(!bDidInit) { srand(t); diff --git a/src/modules/rijndael/rijndael.cpp b/src/modules/rijndael/rijndael.cpp index f9ee461df..61eab2084 100644 --- a/src/modules/rijndael/rijndael.cpp +++ b/src/modules/rijndael/rijndael.cpp @@ -66,566 +66,566 @@ static UINT8 S[256]= { - 99, 124, 119, 123, 242, 107, 111, 197, 48, 1, 103, 43, 254, 215, 171, 118, - 202, 130, 201, 125, 250, 89, 71, 240, 173, 212, 162, 175, 156, 164, 114, 192, - 183, 253, 147, 38, 54, 63, 247, 204, 52, 165, 229, 241, 113, 216, 49, 21, - 4, 199, 35, 195, 24, 150, 5, 154, 7, 18, 128, 226, 235, 39, 178, 117, - 9, 131, 44, 26, 27, 110, 90, 160, 82, 59, 214, 179, 41, 227, 47, 132, - 83, 209, 0, 237, 32, 252, 177, 91, 106, 203, 190, 57, 74, 76, 88, 207, - 208, 239, 170, 251, 67, 77, 51, 133, 69, 249, 2, 127, 80, 60, 159, 168, - 81, 163, 64, 143, 146, 157, 56, 245, 188, 182, 218, 33, 16, 255, 243, 210, - 205, 12, 19, 236, 95, 151, 68, 23, 196, 167, 126, 61, 100, 93, 25, 115, - 96, 129, 79, 220, 34, 42, 144, 136, 70, 238, 184, 20, 222, 94, 11, 219, - 224, 50, 58, 10, 73, 6, 36, 92, 194, 211, 172, 98, 145, 149, 228, 121, - 231, 200, 55, 109, 141, 213, 78, 169, 108, 86, 244, 234, 101, 122, 174, 8, - 186, 120, 37, 46, 28, 166, 180, 198, 232, 221, 116, 31, 75, 189, 139, 138, - 112, 62, 181, 102, 72, 3, 246, 14, 97, 53, 87, 185, 134, 193, 29, 158, - 225, 248, 152, 17, 105, 217, 142, 148, 155, 30, 135, 233, 206, 85, 40, 223, + 99, 124, 119, 123, 242, 107, 111, 197, 48, 1, 103, 43, 254, 215, 171, 118, + 202, 130, 201, 125, 250, 89, 71, 240, 173, 212, 162, 175, 156, 164, 114, 192, + 183, 253, 147, 38, 54, 63, 247, 204, 52, 165, 229, 241, 113, 216, 49, 21, + 4, 199, 35, 195, 24, 150, 5, 154, 7, 18, 128, 226, 235, 39, 178, 117, + 9, 131, 44, 26, 27, 110, 90, 160, 82, 59, 214, 179, 41, 227, 47, 132, + 83, 209, 0, 237, 32, 252, 177, 91, 106, 203, 190, 57, 74, 76, 88, 207, + 208, 239, 170, 251, 67, 77, 51, 133, 69, 249, 2, 127, 80, 60, 159, 168, + 81, 163, 64, 143, 146, 157, 56, 245, 188, 182, 218, 33, 16, 255, 243, 210, + 205, 12, 19, 236, 95, 151, 68, 23, 196, 167, 126, 61, 100, 93, 25, 115, + 96, 129, 79, 220, 34, 42, 144, 136, 70, 238, 184, 20, 222, 94, 11, 219, + 224, 50, 58, 10, 73, 6, 36, 92, 194, 211, 172, 98, 145, 149, 228, 121, + 231, 200, 55, 109, 141, 213, 78, 169, 108, 86, 244, 234, 101, 122, 174, 8, + 186, 120, 37, 46, 28, 166, 180, 198, 232, 221, 116, 31, 75, 189, 139, 138, + 112, 62, 181, 102, 72, 3, 246, 14, 97, 53, 87, 185, 134, 193, 29, 158, + 225, 248, 152, 17, 105, 217, 142, 148, 155, 30, 135, 233, 206, 85, 40, 223, 140, 161, 137, 13, 191, 230, 66, 104, 65, 153, 45, 15, 176, 84, 187, 22 }; static UINT8 T1[256][4]= { - {0xc6,0x63,0x63,0xa5}, {0xf8,0x7c,0x7c,0x84}, {0xee,0x77,0x77,0x99}, {0xf6,0x7b,0x7b,0x8d}, - {0xff,0xf2,0xf2,0x0d}, {0xd6,0x6b,0x6b,0xbd}, {0xde,0x6f,0x6f,0xb1}, {0x91,0xc5,0xc5,0x54}, - {0x60,0x30,0x30,0x50}, {0x02,0x01,0x01,0x03}, {0xce,0x67,0x67,0xa9}, {0x56,0x2b,0x2b,0x7d}, - {0xe7,0xfe,0xfe,0x19}, {0xb5,0xd7,0xd7,0x62}, {0x4d,0xab,0xab,0xe6}, {0xec,0x76,0x76,0x9a}, - {0x8f,0xca,0xca,0x45}, {0x1f,0x82,0x82,0x9d}, {0x89,0xc9,0xc9,0x40}, {0xfa,0x7d,0x7d,0x87}, - {0xef,0xfa,0xfa,0x15}, {0xb2,0x59,0x59,0xeb}, {0x8e,0x47,0x47,0xc9}, {0xfb,0xf0,0xf0,0x0b}, - {0x41,0xad,0xad,0xec}, {0xb3,0xd4,0xd4,0x67}, {0x5f,0xa2,0xa2,0xfd}, {0x45,0xaf,0xaf,0xea}, - {0x23,0x9c,0x9c,0xbf}, {0x53,0xa4,0xa4,0xf7}, {0xe4,0x72,0x72,0x96}, {0x9b,0xc0,0xc0,0x5b}, - {0x75,0xb7,0xb7,0xc2}, {0xe1,0xfd,0xfd,0x1c}, {0x3d,0x93,0x93,0xae}, {0x4c,0x26,0x26,0x6a}, - {0x6c,0x36,0x36,0x5a}, {0x7e,0x3f,0x3f,0x41}, {0xf5,0xf7,0xf7,0x02}, {0x83,0xcc,0xcc,0x4f}, - {0x68,0x34,0x34,0x5c}, {0x51,0xa5,0xa5,0xf4}, {0xd1,0xe5,0xe5,0x34}, {0xf9,0xf1,0xf1,0x08}, - {0xe2,0x71,0x71,0x93}, {0xab,0xd8,0xd8,0x73}, {0x62,0x31,0x31,0x53}, {0x2a,0x15,0x15,0x3f}, - {0x08,0x04,0x04,0x0c}, {0x95,0xc7,0xc7,0x52}, {0x46,0x23,0x23,0x65}, {0x9d,0xc3,0xc3,0x5e}, - {0x30,0x18,0x18,0x28}, {0x37,0x96,0x96,0xa1}, {0x0a,0x05,0x05,0x0f}, {0x2f,0x9a,0x9a,0xb5}, - {0x0e,0x07,0x07,0x09}, {0x24,0x12,0x12,0x36}, {0x1b,0x80,0x80,0x9b}, {0xdf,0xe2,0xe2,0x3d}, - {0xcd,0xeb,0xeb,0x26}, {0x4e,0x27,0x27,0x69}, {0x7f,0xb2,0xb2,0xcd}, {0xea,0x75,0x75,0x9f}, - {0x12,0x09,0x09,0x1b}, {0x1d,0x83,0x83,0x9e}, {0x58,0x2c,0x2c,0x74}, {0x34,0x1a,0x1a,0x2e}, - {0x36,0x1b,0x1b,0x2d}, {0xdc,0x6e,0x6e,0xb2}, {0xb4,0x5a,0x5a,0xee}, {0x5b,0xa0,0xa0,0xfb}, - {0xa4,0x52,0x52,0xf6}, {0x76,0x3b,0x3b,0x4d}, {0xb7,0xd6,0xd6,0x61}, {0x7d,0xb3,0xb3,0xce}, - {0x52,0x29,0x29,0x7b}, {0xdd,0xe3,0xe3,0x3e}, {0x5e,0x2f,0x2f,0x71}, {0x13,0x84,0x84,0x97}, - {0xa6,0x53,0x53,0xf5}, {0xb9,0xd1,0xd1,0x68}, {0x00,0x00,0x00,0x00}, {0xc1,0xed,0xed,0x2c}, - {0x40,0x20,0x20,0x60}, {0xe3,0xfc,0xfc,0x1f}, {0x79,0xb1,0xb1,0xc8}, {0xb6,0x5b,0x5b,0xed}, - {0xd4,0x6a,0x6a,0xbe}, {0x8d,0xcb,0xcb,0x46}, {0x67,0xbe,0xbe,0xd9}, {0x72,0x39,0x39,0x4b}, - {0x94,0x4a,0x4a,0xde}, {0x98,0x4c,0x4c,0xd4}, {0xb0,0x58,0x58,0xe8}, {0x85,0xcf,0xcf,0x4a}, - {0xbb,0xd0,0xd0,0x6b}, {0xc5,0xef,0xef,0x2a}, {0x4f,0xaa,0xaa,0xe5}, {0xed,0xfb,0xfb,0x16}, - {0x86,0x43,0x43,0xc5}, {0x9a,0x4d,0x4d,0xd7}, {0x66,0x33,0x33,0x55}, {0x11,0x85,0x85,0x94}, - {0x8a,0x45,0x45,0xcf}, {0xe9,0xf9,0xf9,0x10}, {0x04,0x02,0x02,0x06}, {0xfe,0x7f,0x7f,0x81}, - {0xa0,0x50,0x50,0xf0}, {0x78,0x3c,0x3c,0x44}, {0x25,0x9f,0x9f,0xba}, {0x4b,0xa8,0xa8,0xe3}, - {0xa2,0x51,0x51,0xf3}, {0x5d,0xa3,0xa3,0xfe}, {0x80,0x40,0x40,0xc0}, {0x05,0x8f,0x8f,0x8a}, - {0x3f,0x92,0x92,0xad}, {0x21,0x9d,0x9d,0xbc}, {0x70,0x38,0x38,0x48}, {0xf1,0xf5,0xf5,0x04}, - {0x63,0xbc,0xbc,0xdf}, {0x77,0xb6,0xb6,0xc1}, {0xaf,0xda,0xda,0x75}, {0x42,0x21,0x21,0x63}, - {0x20,0x10,0x10,0x30}, {0xe5,0xff,0xff,0x1a}, {0xfd,0xf3,0xf3,0x0e}, {0xbf,0xd2,0xd2,0x6d}, - {0x81,0xcd,0xcd,0x4c}, {0x18,0x0c,0x0c,0x14}, {0x26,0x13,0x13,0x35}, {0xc3,0xec,0xec,0x2f}, - {0xbe,0x5f,0x5f,0xe1}, {0x35,0x97,0x97,0xa2}, {0x88,0x44,0x44,0xcc}, {0x2e,0x17,0x17,0x39}, - {0x93,0xc4,0xc4,0x57}, {0x55,0xa7,0xa7,0xf2}, {0xfc,0x7e,0x7e,0x82}, {0x7a,0x3d,0x3d,0x47}, - {0xc8,0x64,0x64,0xac}, {0xba,0x5d,0x5d,0xe7}, {0x32,0x19,0x19,0x2b}, {0xe6,0x73,0x73,0x95}, - {0xc0,0x60,0x60,0xa0}, {0x19,0x81,0x81,0x98}, {0x9e,0x4f,0x4f,0xd1}, {0xa3,0xdc,0xdc,0x7f}, - {0x44,0x22,0x22,0x66}, {0x54,0x2a,0x2a,0x7e}, {0x3b,0x90,0x90,0xab}, {0x0b,0x88,0x88,0x83}, - {0x8c,0x46,0x46,0xca}, {0xc7,0xee,0xee,0x29}, {0x6b,0xb8,0xb8,0xd3}, {0x28,0x14,0x14,0x3c}, - {0xa7,0xde,0xde,0x79}, {0xbc,0x5e,0x5e,0xe2}, {0x16,0x0b,0x0b,0x1d}, {0xad,0xdb,0xdb,0x76}, - {0xdb,0xe0,0xe0,0x3b}, {0x64,0x32,0x32,0x56}, {0x74,0x3a,0x3a,0x4e}, {0x14,0x0a,0x0a,0x1e}, - {0x92,0x49,0x49,0xdb}, {0x0c,0x06,0x06,0x0a}, {0x48,0x24,0x24,0x6c}, {0xb8,0x5c,0x5c,0xe4}, - {0x9f,0xc2,0xc2,0x5d}, {0xbd,0xd3,0xd3,0x6e}, {0x43,0xac,0xac,0xef}, {0xc4,0x62,0x62,0xa6}, - {0x39,0x91,0x91,0xa8}, {0x31,0x95,0x95,0xa4}, {0xd3,0xe4,0xe4,0x37}, {0xf2,0x79,0x79,0x8b}, - {0xd5,0xe7,0xe7,0x32}, {0x8b,0xc8,0xc8,0x43}, {0x6e,0x37,0x37,0x59}, {0xda,0x6d,0x6d,0xb7}, - {0x01,0x8d,0x8d,0x8c}, {0xb1,0xd5,0xd5,0x64}, {0x9c,0x4e,0x4e,0xd2}, {0x49,0xa9,0xa9,0xe0}, - {0xd8,0x6c,0x6c,0xb4}, {0xac,0x56,0x56,0xfa}, {0xf3,0xf4,0xf4,0x07}, {0xcf,0xea,0xea,0x25}, - {0xca,0x65,0x65,0xaf}, {0xf4,0x7a,0x7a,0x8e}, {0x47,0xae,0xae,0xe9}, {0x10,0x08,0x08,0x18}, - {0x6f,0xba,0xba,0xd5}, {0xf0,0x78,0x78,0x88}, {0x4a,0x25,0x25,0x6f}, {0x5c,0x2e,0x2e,0x72}, - {0x38,0x1c,0x1c,0x24}, {0x57,0xa6,0xa6,0xf1}, {0x73,0xb4,0xb4,0xc7}, {0x97,0xc6,0xc6,0x51}, - {0xcb,0xe8,0xe8,0x23}, {0xa1,0xdd,0xdd,0x7c}, {0xe8,0x74,0x74,0x9c}, {0x3e,0x1f,0x1f,0x21}, - {0x96,0x4b,0x4b,0xdd}, {0x61,0xbd,0xbd,0xdc}, {0x0d,0x8b,0x8b,0x86}, {0x0f,0x8a,0x8a,0x85}, - {0xe0,0x70,0x70,0x90}, {0x7c,0x3e,0x3e,0x42}, {0x71,0xb5,0xb5,0xc4}, {0xcc,0x66,0x66,0xaa}, - {0x90,0x48,0x48,0xd8}, {0x06,0x03,0x03,0x05}, {0xf7,0xf6,0xf6,0x01}, {0x1c,0x0e,0x0e,0x12}, - {0xc2,0x61,0x61,0xa3}, {0x6a,0x35,0x35,0x5f}, {0xae,0x57,0x57,0xf9}, {0x69,0xb9,0xb9,0xd0}, - {0x17,0x86,0x86,0x91}, {0x99,0xc1,0xc1,0x58}, {0x3a,0x1d,0x1d,0x27}, {0x27,0x9e,0x9e,0xb9}, - {0xd9,0xe1,0xe1,0x38}, {0xeb,0xf8,0xf8,0x13}, {0x2b,0x98,0x98,0xb3}, {0x22,0x11,0x11,0x33}, - {0xd2,0x69,0x69,0xbb}, {0xa9,0xd9,0xd9,0x70}, {0x07,0x8e,0x8e,0x89}, {0x33,0x94,0x94,0xa7}, - {0x2d,0x9b,0x9b,0xb6}, {0x3c,0x1e,0x1e,0x22}, {0x15,0x87,0x87,0x92}, {0xc9,0xe9,0xe9,0x20}, - {0x87,0xce,0xce,0x49}, {0xaa,0x55,0x55,0xff}, {0x50,0x28,0x28,0x78}, {0xa5,0xdf,0xdf,0x7a}, - {0x03,0x8c,0x8c,0x8f}, {0x59,0xa1,0xa1,0xf8}, {0x09,0x89,0x89,0x80}, {0x1a,0x0d,0x0d,0x17}, - {0x65,0xbf,0xbf,0xda}, {0xd7,0xe6,0xe6,0x31}, {0x84,0x42,0x42,0xc6}, {0xd0,0x68,0x68,0xb8}, - {0x82,0x41,0x41,0xc3}, {0x29,0x99,0x99,0xb0}, {0x5a,0x2d,0x2d,0x77}, {0x1e,0x0f,0x0f,0x11}, + {0xc6,0x63,0x63,0xa5}, {0xf8,0x7c,0x7c,0x84}, {0xee,0x77,0x77,0x99}, {0xf6,0x7b,0x7b,0x8d}, + {0xff,0xf2,0xf2,0x0d}, {0xd6,0x6b,0x6b,0xbd}, {0xde,0x6f,0x6f,0xb1}, {0x91,0xc5,0xc5,0x54}, + {0x60,0x30,0x30,0x50}, {0x02,0x01,0x01,0x03}, {0xce,0x67,0x67,0xa9}, {0x56,0x2b,0x2b,0x7d}, + {0xe7,0xfe,0xfe,0x19}, {0xb5,0xd7,0xd7,0x62}, {0x4d,0xab,0xab,0xe6}, {0xec,0x76,0x76,0x9a}, + {0x8f,0xca,0xca,0x45}, {0x1f,0x82,0x82,0x9d}, {0x89,0xc9,0xc9,0x40}, {0xfa,0x7d,0x7d,0x87}, + {0xef,0xfa,0xfa,0x15}, {0xb2,0x59,0x59,0xeb}, {0x8e,0x47,0x47,0xc9}, {0xfb,0xf0,0xf0,0x0b}, + {0x41,0xad,0xad,0xec}, {0xb3,0xd4,0xd4,0x67}, {0x5f,0xa2,0xa2,0xfd}, {0x45,0xaf,0xaf,0xea}, + {0x23,0x9c,0x9c,0xbf}, {0x53,0xa4,0xa4,0xf7}, {0xe4,0x72,0x72,0x96}, {0x9b,0xc0,0xc0,0x5b}, + {0x75,0xb7,0xb7,0xc2}, {0xe1,0xfd,0xfd,0x1c}, {0x3d,0x93,0x93,0xae}, {0x4c,0x26,0x26,0x6a}, + {0x6c,0x36,0x36,0x5a}, {0x7e,0x3f,0x3f,0x41}, {0xf5,0xf7,0xf7,0x02}, {0x83,0xcc,0xcc,0x4f}, + {0x68,0x34,0x34,0x5c}, {0x51,0xa5,0xa5,0xf4}, {0xd1,0xe5,0xe5,0x34}, {0xf9,0xf1,0xf1,0x08}, + {0xe2,0x71,0x71,0x93}, {0xab,0xd8,0xd8,0x73}, {0x62,0x31,0x31,0x53}, {0x2a,0x15,0x15,0x3f}, + {0x08,0x04,0x04,0x0c}, {0x95,0xc7,0xc7,0x52}, {0x46,0x23,0x23,0x65}, {0x9d,0xc3,0xc3,0x5e}, + {0x30,0x18,0x18,0x28}, {0x37,0x96,0x96,0xa1}, {0x0a,0x05,0x05,0x0f}, {0x2f,0x9a,0x9a,0xb5}, + {0x0e,0x07,0x07,0x09}, {0x24,0x12,0x12,0x36}, {0x1b,0x80,0x80,0x9b}, {0xdf,0xe2,0xe2,0x3d}, + {0xcd,0xeb,0xeb,0x26}, {0x4e,0x27,0x27,0x69}, {0x7f,0xb2,0xb2,0xcd}, {0xea,0x75,0x75,0x9f}, + {0x12,0x09,0x09,0x1b}, {0x1d,0x83,0x83,0x9e}, {0x58,0x2c,0x2c,0x74}, {0x34,0x1a,0x1a,0x2e}, + {0x36,0x1b,0x1b,0x2d}, {0xdc,0x6e,0x6e,0xb2}, {0xb4,0x5a,0x5a,0xee}, {0x5b,0xa0,0xa0,0xfb}, + {0xa4,0x52,0x52,0xf6}, {0x76,0x3b,0x3b,0x4d}, {0xb7,0xd6,0xd6,0x61}, {0x7d,0xb3,0xb3,0xce}, + {0x52,0x29,0x29,0x7b}, {0xdd,0xe3,0xe3,0x3e}, {0x5e,0x2f,0x2f,0x71}, {0x13,0x84,0x84,0x97}, + {0xa6,0x53,0x53,0xf5}, {0xb9,0xd1,0xd1,0x68}, {0x00,0x00,0x00,0x00}, {0xc1,0xed,0xed,0x2c}, + {0x40,0x20,0x20,0x60}, {0xe3,0xfc,0xfc,0x1f}, {0x79,0xb1,0xb1,0xc8}, {0xb6,0x5b,0x5b,0xed}, + {0xd4,0x6a,0x6a,0xbe}, {0x8d,0xcb,0xcb,0x46}, {0x67,0xbe,0xbe,0xd9}, {0x72,0x39,0x39,0x4b}, + {0x94,0x4a,0x4a,0xde}, {0x98,0x4c,0x4c,0xd4}, {0xb0,0x58,0x58,0xe8}, {0x85,0xcf,0xcf,0x4a}, + {0xbb,0xd0,0xd0,0x6b}, {0xc5,0xef,0xef,0x2a}, {0x4f,0xaa,0xaa,0xe5}, {0xed,0xfb,0xfb,0x16}, + {0x86,0x43,0x43,0xc5}, {0x9a,0x4d,0x4d,0xd7}, {0x66,0x33,0x33,0x55}, {0x11,0x85,0x85,0x94}, + {0x8a,0x45,0x45,0xcf}, {0xe9,0xf9,0xf9,0x10}, {0x04,0x02,0x02,0x06}, {0xfe,0x7f,0x7f,0x81}, + {0xa0,0x50,0x50,0xf0}, {0x78,0x3c,0x3c,0x44}, {0x25,0x9f,0x9f,0xba}, {0x4b,0xa8,0xa8,0xe3}, + {0xa2,0x51,0x51,0xf3}, {0x5d,0xa3,0xa3,0xfe}, {0x80,0x40,0x40,0xc0}, {0x05,0x8f,0x8f,0x8a}, + {0x3f,0x92,0x92,0xad}, {0x21,0x9d,0x9d,0xbc}, {0x70,0x38,0x38,0x48}, {0xf1,0xf5,0xf5,0x04}, + {0x63,0xbc,0xbc,0xdf}, {0x77,0xb6,0xb6,0xc1}, {0xaf,0xda,0xda,0x75}, {0x42,0x21,0x21,0x63}, + {0x20,0x10,0x10,0x30}, {0xe5,0xff,0xff,0x1a}, {0xfd,0xf3,0xf3,0x0e}, {0xbf,0xd2,0xd2,0x6d}, + {0x81,0xcd,0xcd,0x4c}, {0x18,0x0c,0x0c,0x14}, {0x26,0x13,0x13,0x35}, {0xc3,0xec,0xec,0x2f}, + {0xbe,0x5f,0x5f,0xe1}, {0x35,0x97,0x97,0xa2}, {0x88,0x44,0x44,0xcc}, {0x2e,0x17,0x17,0x39}, + {0x93,0xc4,0xc4,0x57}, {0x55,0xa7,0xa7,0xf2}, {0xfc,0x7e,0x7e,0x82}, {0x7a,0x3d,0x3d,0x47}, + {0xc8,0x64,0x64,0xac}, {0xba,0x5d,0x5d,0xe7}, {0x32,0x19,0x19,0x2b}, {0xe6,0x73,0x73,0x95}, + {0xc0,0x60,0x60,0xa0}, {0x19,0x81,0x81,0x98}, {0x9e,0x4f,0x4f,0xd1}, {0xa3,0xdc,0xdc,0x7f}, + {0x44,0x22,0x22,0x66}, {0x54,0x2a,0x2a,0x7e}, {0x3b,0x90,0x90,0xab}, {0x0b,0x88,0x88,0x83}, + {0x8c,0x46,0x46,0xca}, {0xc7,0xee,0xee,0x29}, {0x6b,0xb8,0xb8,0xd3}, {0x28,0x14,0x14,0x3c}, + {0xa7,0xde,0xde,0x79}, {0xbc,0x5e,0x5e,0xe2}, {0x16,0x0b,0x0b,0x1d}, {0xad,0xdb,0xdb,0x76}, + {0xdb,0xe0,0xe0,0x3b}, {0x64,0x32,0x32,0x56}, {0x74,0x3a,0x3a,0x4e}, {0x14,0x0a,0x0a,0x1e}, + {0x92,0x49,0x49,0xdb}, {0x0c,0x06,0x06,0x0a}, {0x48,0x24,0x24,0x6c}, {0xb8,0x5c,0x5c,0xe4}, + {0x9f,0xc2,0xc2,0x5d}, {0xbd,0xd3,0xd3,0x6e}, {0x43,0xac,0xac,0xef}, {0xc4,0x62,0x62,0xa6}, + {0x39,0x91,0x91,0xa8}, {0x31,0x95,0x95,0xa4}, {0xd3,0xe4,0xe4,0x37}, {0xf2,0x79,0x79,0x8b}, + {0xd5,0xe7,0xe7,0x32}, {0x8b,0xc8,0xc8,0x43}, {0x6e,0x37,0x37,0x59}, {0xda,0x6d,0x6d,0xb7}, + {0x01,0x8d,0x8d,0x8c}, {0xb1,0xd5,0xd5,0x64}, {0x9c,0x4e,0x4e,0xd2}, {0x49,0xa9,0xa9,0xe0}, + {0xd8,0x6c,0x6c,0xb4}, {0xac,0x56,0x56,0xfa}, {0xf3,0xf4,0xf4,0x07}, {0xcf,0xea,0xea,0x25}, + {0xca,0x65,0x65,0xaf}, {0xf4,0x7a,0x7a,0x8e}, {0x47,0xae,0xae,0xe9}, {0x10,0x08,0x08,0x18}, + {0x6f,0xba,0xba,0xd5}, {0xf0,0x78,0x78,0x88}, {0x4a,0x25,0x25,0x6f}, {0x5c,0x2e,0x2e,0x72}, + {0x38,0x1c,0x1c,0x24}, {0x57,0xa6,0xa6,0xf1}, {0x73,0xb4,0xb4,0xc7}, {0x97,0xc6,0xc6,0x51}, + {0xcb,0xe8,0xe8,0x23}, {0xa1,0xdd,0xdd,0x7c}, {0xe8,0x74,0x74,0x9c}, {0x3e,0x1f,0x1f,0x21}, + {0x96,0x4b,0x4b,0xdd}, {0x61,0xbd,0xbd,0xdc}, {0x0d,0x8b,0x8b,0x86}, {0x0f,0x8a,0x8a,0x85}, + {0xe0,0x70,0x70,0x90}, {0x7c,0x3e,0x3e,0x42}, {0x71,0xb5,0xb5,0xc4}, {0xcc,0x66,0x66,0xaa}, + {0x90,0x48,0x48,0xd8}, {0x06,0x03,0x03,0x05}, {0xf7,0xf6,0xf6,0x01}, {0x1c,0x0e,0x0e,0x12}, + {0xc2,0x61,0x61,0xa3}, {0x6a,0x35,0x35,0x5f}, {0xae,0x57,0x57,0xf9}, {0x69,0xb9,0xb9,0xd0}, + {0x17,0x86,0x86,0x91}, {0x99,0xc1,0xc1,0x58}, {0x3a,0x1d,0x1d,0x27}, {0x27,0x9e,0x9e,0xb9}, + {0xd9,0xe1,0xe1,0x38}, {0xeb,0xf8,0xf8,0x13}, {0x2b,0x98,0x98,0xb3}, {0x22,0x11,0x11,0x33}, + {0xd2,0x69,0x69,0xbb}, {0xa9,0xd9,0xd9,0x70}, {0x07,0x8e,0x8e,0x89}, {0x33,0x94,0x94,0xa7}, + {0x2d,0x9b,0x9b,0xb6}, {0x3c,0x1e,0x1e,0x22}, {0x15,0x87,0x87,0x92}, {0xc9,0xe9,0xe9,0x20}, + {0x87,0xce,0xce,0x49}, {0xaa,0x55,0x55,0xff}, {0x50,0x28,0x28,0x78}, {0xa5,0xdf,0xdf,0x7a}, + {0x03,0x8c,0x8c,0x8f}, {0x59,0xa1,0xa1,0xf8}, {0x09,0x89,0x89,0x80}, {0x1a,0x0d,0x0d,0x17}, + {0x65,0xbf,0xbf,0xda}, {0xd7,0xe6,0xe6,0x31}, {0x84,0x42,0x42,0xc6}, {0xd0,0x68,0x68,0xb8}, + {0x82,0x41,0x41,0xc3}, {0x29,0x99,0x99,0xb0}, {0x5a,0x2d,0x2d,0x77}, {0x1e,0x0f,0x0f,0x11}, {0x7b,0xb0,0xb0,0xcb}, {0xa8,0x54,0x54,0xfc}, {0x6d,0xbb,0xbb,0xd6}, {0x2c,0x16,0x16,0x3a} }; - + static UINT8 T2[256][4]= { - {0xa5,0xc6,0x63,0x63}, {0x84,0xf8,0x7c,0x7c}, {0x99,0xee,0x77,0x77}, {0x8d,0xf6,0x7b,0x7b}, - {0x0d,0xff,0xf2,0xf2}, {0xbd,0xd6,0x6b,0x6b}, {0xb1,0xde,0x6f,0x6f}, {0x54,0x91,0xc5,0xc5}, - {0x50,0x60,0x30,0x30}, {0x03,0x02,0x01,0x01}, {0xa9,0xce,0x67,0x67}, {0x7d,0x56,0x2b,0x2b}, - {0x19,0xe7,0xfe,0xfe}, {0x62,0xb5,0xd7,0xd7}, {0xe6,0x4d,0xab,0xab}, {0x9a,0xec,0x76,0x76}, - {0x45,0x8f,0xca,0xca}, {0x9d,0x1f,0x82,0x82}, {0x40,0x89,0xc9,0xc9}, {0x87,0xfa,0x7d,0x7d}, - {0x15,0xef,0xfa,0xfa}, {0xeb,0xb2,0x59,0x59}, {0xc9,0x8e,0x47,0x47}, {0x0b,0xfb,0xf0,0xf0}, - {0xec,0x41,0xad,0xad}, {0x67,0xb3,0xd4,0xd4}, {0xfd,0x5f,0xa2,0xa2}, {0xea,0x45,0xaf,0xaf}, - {0xbf,0x23,0x9c,0x9c}, {0xf7,0x53,0xa4,0xa4}, {0x96,0xe4,0x72,0x72}, {0x5b,0x9b,0xc0,0xc0}, - {0xc2,0x75,0xb7,0xb7}, {0x1c,0xe1,0xfd,0xfd}, {0xae,0x3d,0x93,0x93}, {0x6a,0x4c,0x26,0x26}, - {0x5a,0x6c,0x36,0x36}, {0x41,0x7e,0x3f,0x3f}, {0x02,0xf5,0xf7,0xf7}, {0x4f,0x83,0xcc,0xcc}, - {0x5c,0x68,0x34,0x34}, {0xf4,0x51,0xa5,0xa5}, {0x34,0xd1,0xe5,0xe5}, {0x08,0xf9,0xf1,0xf1}, - {0x93,0xe2,0x71,0x71}, {0x73,0xab,0xd8,0xd8}, {0x53,0x62,0x31,0x31}, {0x3f,0x2a,0x15,0x15}, - {0x0c,0x08,0x04,0x04}, {0x52,0x95,0xc7,0xc7}, {0x65,0x46,0x23,0x23}, {0x5e,0x9d,0xc3,0xc3}, - {0x28,0x30,0x18,0x18}, {0xa1,0x37,0x96,0x96}, {0x0f,0x0a,0x05,0x05}, {0xb5,0x2f,0x9a,0x9a}, - {0x09,0x0e,0x07,0x07}, {0x36,0x24,0x12,0x12}, {0x9b,0x1b,0x80,0x80}, {0x3d,0xdf,0xe2,0xe2}, - {0x26,0xcd,0xeb,0xeb}, {0x69,0x4e,0x27,0x27}, {0xcd,0x7f,0xb2,0xb2}, {0x9f,0xea,0x75,0x75}, - {0x1b,0x12,0x09,0x09}, {0x9e,0x1d,0x83,0x83}, {0x74,0x58,0x2c,0x2c}, {0x2e,0x34,0x1a,0x1a}, - {0x2d,0x36,0x1b,0x1b}, {0xb2,0xdc,0x6e,0x6e}, {0xee,0xb4,0x5a,0x5a}, {0xfb,0x5b,0xa0,0xa0}, - {0xf6,0xa4,0x52,0x52}, {0x4d,0x76,0x3b,0x3b}, {0x61,0xb7,0xd6,0xd6}, {0xce,0x7d,0xb3,0xb3}, - {0x7b,0x52,0x29,0x29}, {0x3e,0xdd,0xe3,0xe3}, {0x71,0x5e,0x2f,0x2f}, {0x97,0x13,0x84,0x84}, - {0xf5,0xa6,0x53,0x53}, {0x68,0xb9,0xd1,0xd1}, {0x00,0x00,0x00,0x00}, {0x2c,0xc1,0xed,0xed}, - {0x60,0x40,0x20,0x20}, {0x1f,0xe3,0xfc,0xfc}, {0xc8,0x79,0xb1,0xb1}, {0xed,0xb6,0x5b,0x5b}, - {0xbe,0xd4,0x6a,0x6a}, {0x46,0x8d,0xcb,0xcb}, {0xd9,0x67,0xbe,0xbe}, {0x4b,0x72,0x39,0x39}, - {0xde,0x94,0x4a,0x4a}, {0xd4,0x98,0x4c,0x4c}, {0xe8,0xb0,0x58,0x58}, {0x4a,0x85,0xcf,0xcf}, - {0x6b,0xbb,0xd0,0xd0}, {0x2a,0xc5,0xef,0xef}, {0xe5,0x4f,0xaa,0xaa}, {0x16,0xed,0xfb,0xfb}, - {0xc5,0x86,0x43,0x43}, {0xd7,0x9a,0x4d,0x4d}, {0x55,0x66,0x33,0x33}, {0x94,0x11,0x85,0x85}, - {0xcf,0x8a,0x45,0x45}, {0x10,0xe9,0xf9,0xf9}, {0x06,0x04,0x02,0x02}, {0x81,0xfe,0x7f,0x7f}, - {0xf0,0xa0,0x50,0x50}, {0x44,0x78,0x3c,0x3c}, {0xba,0x25,0x9f,0x9f}, {0xe3,0x4b,0xa8,0xa8}, - {0xf3,0xa2,0x51,0x51}, {0xfe,0x5d,0xa3,0xa3}, {0xc0,0x80,0x40,0x40}, {0x8a,0x05,0x8f,0x8f}, - {0xad,0x3f,0x92,0x92}, {0xbc,0x21,0x9d,0x9d}, {0x48,0x70,0x38,0x38}, {0x04,0xf1,0xf5,0xf5}, - {0xdf,0x63,0xbc,0xbc}, {0xc1,0x77,0xb6,0xb6}, {0x75,0xaf,0xda,0xda}, {0x63,0x42,0x21,0x21}, - {0x30,0x20,0x10,0x10}, {0x1a,0xe5,0xff,0xff}, {0x0e,0xfd,0xf3,0xf3}, {0x6d,0xbf,0xd2,0xd2}, - {0x4c,0x81,0xcd,0xcd}, {0x14,0x18,0x0c,0x0c}, {0x35,0x26,0x13,0x13}, {0x2f,0xc3,0xec,0xec}, - {0xe1,0xbe,0x5f,0x5f}, {0xa2,0x35,0x97,0x97}, {0xcc,0x88,0x44,0x44}, {0x39,0x2e,0x17,0x17}, - {0x57,0x93,0xc4,0xc4}, {0xf2,0x55,0xa7,0xa7}, {0x82,0xfc,0x7e,0x7e}, {0x47,0x7a,0x3d,0x3d}, - {0xac,0xc8,0x64,0x64}, {0xe7,0xba,0x5d,0x5d}, {0x2b,0x32,0x19,0x19}, {0x95,0xe6,0x73,0x73}, - {0xa0,0xc0,0x60,0x60}, {0x98,0x19,0x81,0x81}, {0xd1,0x9e,0x4f,0x4f}, {0x7f,0xa3,0xdc,0xdc}, - {0x66,0x44,0x22,0x22}, {0x7e,0x54,0x2a,0x2a}, {0xab,0x3b,0x90,0x90}, {0x83,0x0b,0x88,0x88}, - {0xca,0x8c,0x46,0x46}, {0x29,0xc7,0xee,0xee}, {0xd3,0x6b,0xb8,0xb8}, {0x3c,0x28,0x14,0x14}, - {0x79,0xa7,0xde,0xde}, {0xe2,0xbc,0x5e,0x5e}, {0x1d,0x16,0x0b,0x0b}, {0x76,0xad,0xdb,0xdb}, - {0x3b,0xdb,0xe0,0xe0}, {0x56,0x64,0x32,0x32}, {0x4e,0x74,0x3a,0x3a}, {0x1e,0x14,0x0a,0x0a}, - {0xdb,0x92,0x49,0x49}, {0x0a,0x0c,0x06,0x06}, {0x6c,0x48,0x24,0x24}, {0xe4,0xb8,0x5c,0x5c}, - {0x5d,0x9f,0xc2,0xc2}, {0x6e,0xbd,0xd3,0xd3}, {0xef,0x43,0xac,0xac}, {0xa6,0xc4,0x62,0x62}, - {0xa8,0x39,0x91,0x91}, {0xa4,0x31,0x95,0x95}, {0x37,0xd3,0xe4,0xe4}, {0x8b,0xf2,0x79,0x79}, - {0x32,0xd5,0xe7,0xe7}, {0x43,0x8b,0xc8,0xc8}, {0x59,0x6e,0x37,0x37}, {0xb7,0xda,0x6d,0x6d}, - {0x8c,0x01,0x8d,0x8d}, {0x64,0xb1,0xd5,0xd5}, {0xd2,0x9c,0x4e,0x4e}, {0xe0,0x49,0xa9,0xa9}, - {0xb4,0xd8,0x6c,0x6c}, {0xfa,0xac,0x56,0x56}, {0x07,0xf3,0xf4,0xf4}, {0x25,0xcf,0xea,0xea}, - {0xaf,0xca,0x65,0x65}, {0x8e,0xf4,0x7a,0x7a}, {0xe9,0x47,0xae,0xae}, {0x18,0x10,0x08,0x08}, - {0xd5,0x6f,0xba,0xba}, {0x88,0xf0,0x78,0x78}, {0x6f,0x4a,0x25,0x25}, {0x72,0x5c,0x2e,0x2e}, - {0x24,0x38,0x1c,0x1c}, {0xf1,0x57,0xa6,0xa6}, {0xc7,0x73,0xb4,0xb4}, {0x51,0x97,0xc6,0xc6}, - {0x23,0xcb,0xe8,0xe8}, {0x7c,0xa1,0xdd,0xdd}, {0x9c,0xe8,0x74,0x74}, {0x21,0x3e,0x1f,0x1f}, - {0xdd,0x96,0x4b,0x4b}, {0xdc,0x61,0xbd,0xbd}, {0x86,0x0d,0x8b,0x8b}, {0x85,0x0f,0x8a,0x8a}, - {0x90,0xe0,0x70,0x70}, {0x42,0x7c,0x3e,0x3e}, {0xc4,0x71,0xb5,0xb5}, {0xaa,0xcc,0x66,0x66}, - {0xd8,0x90,0x48,0x48}, {0x05,0x06,0x03,0x03}, {0x01,0xf7,0xf6,0xf6}, {0x12,0x1c,0x0e,0x0e}, - {0xa3,0xc2,0x61,0x61}, {0x5f,0x6a,0x35,0x35}, {0xf9,0xae,0x57,0x57}, {0xd0,0x69,0xb9,0xb9}, - {0x91,0x17,0x86,0x86}, {0x58,0x99,0xc1,0xc1}, {0x27,0x3a,0x1d,0x1d}, {0xb9,0x27,0x9e,0x9e}, - {0x38,0xd9,0xe1,0xe1}, {0x13,0xeb,0xf8,0xf8}, {0xb3,0x2b,0x98,0x98}, {0x33,0x22,0x11,0x11}, - {0xbb,0xd2,0x69,0x69}, {0x70,0xa9,0xd9,0xd9}, {0x89,0x07,0x8e,0x8e}, {0xa7,0x33,0x94,0x94}, - {0xb6,0x2d,0x9b,0x9b}, {0x22,0x3c,0x1e,0x1e}, {0x92,0x15,0x87,0x87}, {0x20,0xc9,0xe9,0xe9}, - {0x49,0x87,0xce,0xce}, {0xff,0xaa,0x55,0x55}, {0x78,0x50,0x28,0x28}, {0x7a,0xa5,0xdf,0xdf}, - {0x8f,0x03,0x8c,0x8c}, {0xf8,0x59,0xa1,0xa1}, {0x80,0x09,0x89,0x89}, {0x17,0x1a,0x0d,0x0d}, - {0xda,0x65,0xbf,0xbf}, {0x31,0xd7,0xe6,0xe6}, {0xc6,0x84,0x42,0x42}, {0xb8,0xd0,0x68,0x68}, - {0xc3,0x82,0x41,0x41}, {0xb0,0x29,0x99,0x99}, {0x77,0x5a,0x2d,0x2d}, {0x11,0x1e,0x0f,0x0f}, + {0xa5,0xc6,0x63,0x63}, {0x84,0xf8,0x7c,0x7c}, {0x99,0xee,0x77,0x77}, {0x8d,0xf6,0x7b,0x7b}, + {0x0d,0xff,0xf2,0xf2}, {0xbd,0xd6,0x6b,0x6b}, {0xb1,0xde,0x6f,0x6f}, {0x54,0x91,0xc5,0xc5}, + {0x50,0x60,0x30,0x30}, {0x03,0x02,0x01,0x01}, {0xa9,0xce,0x67,0x67}, {0x7d,0x56,0x2b,0x2b}, + {0x19,0xe7,0xfe,0xfe}, {0x62,0xb5,0xd7,0xd7}, {0xe6,0x4d,0xab,0xab}, {0x9a,0xec,0x76,0x76}, + {0x45,0x8f,0xca,0xca}, {0x9d,0x1f,0x82,0x82}, {0x40,0x89,0xc9,0xc9}, {0x87,0xfa,0x7d,0x7d}, + {0x15,0xef,0xfa,0xfa}, {0xeb,0xb2,0x59,0x59}, {0xc9,0x8e,0x47,0x47}, {0x0b,0xfb,0xf0,0xf0}, + {0xec,0x41,0xad,0xad}, {0x67,0xb3,0xd4,0xd4}, {0xfd,0x5f,0xa2,0xa2}, {0xea,0x45,0xaf,0xaf}, + {0xbf,0x23,0x9c,0x9c}, {0xf7,0x53,0xa4,0xa4}, {0x96,0xe4,0x72,0x72}, {0x5b,0x9b,0xc0,0xc0}, + {0xc2,0x75,0xb7,0xb7}, {0x1c,0xe1,0xfd,0xfd}, {0xae,0x3d,0x93,0x93}, {0x6a,0x4c,0x26,0x26}, + {0x5a,0x6c,0x36,0x36}, {0x41,0x7e,0x3f,0x3f}, {0x02,0xf5,0xf7,0xf7}, {0x4f,0x83,0xcc,0xcc}, + {0x5c,0x68,0x34,0x34}, {0xf4,0x51,0xa5,0xa5}, {0x34,0xd1,0xe5,0xe5}, {0x08,0xf9,0xf1,0xf1}, + {0x93,0xe2,0x71,0x71}, {0x73,0xab,0xd8,0xd8}, {0x53,0x62,0x31,0x31}, {0x3f,0x2a,0x15,0x15}, + {0x0c,0x08,0x04,0x04}, {0x52,0x95,0xc7,0xc7}, {0x65,0x46,0x23,0x23}, {0x5e,0x9d,0xc3,0xc3}, + {0x28,0x30,0x18,0x18}, {0xa1,0x37,0x96,0x96}, {0x0f,0x0a,0x05,0x05}, {0xb5,0x2f,0x9a,0x9a}, + {0x09,0x0e,0x07,0x07}, {0x36,0x24,0x12,0x12}, {0x9b,0x1b,0x80,0x80}, {0x3d,0xdf,0xe2,0xe2}, + {0x26,0xcd,0xeb,0xeb}, {0x69,0x4e,0x27,0x27}, {0xcd,0x7f,0xb2,0xb2}, {0x9f,0xea,0x75,0x75}, + {0x1b,0x12,0x09,0x09}, {0x9e,0x1d,0x83,0x83}, {0x74,0x58,0x2c,0x2c}, {0x2e,0x34,0x1a,0x1a}, + {0x2d,0x36,0x1b,0x1b}, {0xb2,0xdc,0x6e,0x6e}, {0xee,0xb4,0x5a,0x5a}, {0xfb,0x5b,0xa0,0xa0}, + {0xf6,0xa4,0x52,0x52}, {0x4d,0x76,0x3b,0x3b}, {0x61,0xb7,0xd6,0xd6}, {0xce,0x7d,0xb3,0xb3}, + {0x7b,0x52,0x29,0x29}, {0x3e,0xdd,0xe3,0xe3}, {0x71,0x5e,0x2f,0x2f}, {0x97,0x13,0x84,0x84}, + {0xf5,0xa6,0x53,0x53}, {0x68,0xb9,0xd1,0xd1}, {0x00,0x00,0x00,0x00}, {0x2c,0xc1,0xed,0xed}, + {0x60,0x40,0x20,0x20}, {0x1f,0xe3,0xfc,0xfc}, {0xc8,0x79,0xb1,0xb1}, {0xed,0xb6,0x5b,0x5b}, + {0xbe,0xd4,0x6a,0x6a}, {0x46,0x8d,0xcb,0xcb}, {0xd9,0x67,0xbe,0xbe}, {0x4b,0x72,0x39,0x39}, + {0xde,0x94,0x4a,0x4a}, {0xd4,0x98,0x4c,0x4c}, {0xe8,0xb0,0x58,0x58}, {0x4a,0x85,0xcf,0xcf}, + {0x6b,0xbb,0xd0,0xd0}, {0x2a,0xc5,0xef,0xef}, {0xe5,0x4f,0xaa,0xaa}, {0x16,0xed,0xfb,0xfb}, + {0xc5,0x86,0x43,0x43}, {0xd7,0x9a,0x4d,0x4d}, {0x55,0x66,0x33,0x33}, {0x94,0x11,0x85,0x85}, + {0xcf,0x8a,0x45,0x45}, {0x10,0xe9,0xf9,0xf9}, {0x06,0x04,0x02,0x02}, {0x81,0xfe,0x7f,0x7f}, + {0xf0,0xa0,0x50,0x50}, {0x44,0x78,0x3c,0x3c}, {0xba,0x25,0x9f,0x9f}, {0xe3,0x4b,0xa8,0xa8}, + {0xf3,0xa2,0x51,0x51}, {0xfe,0x5d,0xa3,0xa3}, {0xc0,0x80,0x40,0x40}, {0x8a,0x05,0x8f,0x8f}, + {0xad,0x3f,0x92,0x92}, {0xbc,0x21,0x9d,0x9d}, {0x48,0x70,0x38,0x38}, {0x04,0xf1,0xf5,0xf5}, + {0xdf,0x63,0xbc,0xbc}, {0xc1,0x77,0xb6,0xb6}, {0x75,0xaf,0xda,0xda}, {0x63,0x42,0x21,0x21}, + {0x30,0x20,0x10,0x10}, {0x1a,0xe5,0xff,0xff}, {0x0e,0xfd,0xf3,0xf3}, {0x6d,0xbf,0xd2,0xd2}, + {0x4c,0x81,0xcd,0xcd}, {0x14,0x18,0x0c,0x0c}, {0x35,0x26,0x13,0x13}, {0x2f,0xc3,0xec,0xec}, + {0xe1,0xbe,0x5f,0x5f}, {0xa2,0x35,0x97,0x97}, {0xcc,0x88,0x44,0x44}, {0x39,0x2e,0x17,0x17}, + {0x57,0x93,0xc4,0xc4}, {0xf2,0x55,0xa7,0xa7}, {0x82,0xfc,0x7e,0x7e}, {0x47,0x7a,0x3d,0x3d}, + {0xac,0xc8,0x64,0x64}, {0xe7,0xba,0x5d,0x5d}, {0x2b,0x32,0x19,0x19}, {0x95,0xe6,0x73,0x73}, + {0xa0,0xc0,0x60,0x60}, {0x98,0x19,0x81,0x81}, {0xd1,0x9e,0x4f,0x4f}, {0x7f,0xa3,0xdc,0xdc}, + {0x66,0x44,0x22,0x22}, {0x7e,0x54,0x2a,0x2a}, {0xab,0x3b,0x90,0x90}, {0x83,0x0b,0x88,0x88}, + {0xca,0x8c,0x46,0x46}, {0x29,0xc7,0xee,0xee}, {0xd3,0x6b,0xb8,0xb8}, {0x3c,0x28,0x14,0x14}, + {0x79,0xa7,0xde,0xde}, {0xe2,0xbc,0x5e,0x5e}, {0x1d,0x16,0x0b,0x0b}, {0x76,0xad,0xdb,0xdb}, + {0x3b,0xdb,0xe0,0xe0}, {0x56,0x64,0x32,0x32}, {0x4e,0x74,0x3a,0x3a}, {0x1e,0x14,0x0a,0x0a}, + {0xdb,0x92,0x49,0x49}, {0x0a,0x0c,0x06,0x06}, {0x6c,0x48,0x24,0x24}, {0xe4,0xb8,0x5c,0x5c}, + {0x5d,0x9f,0xc2,0xc2}, {0x6e,0xbd,0xd3,0xd3}, {0xef,0x43,0xac,0xac}, {0xa6,0xc4,0x62,0x62}, + {0xa8,0x39,0x91,0x91}, {0xa4,0x31,0x95,0x95}, {0x37,0xd3,0xe4,0xe4}, {0x8b,0xf2,0x79,0x79}, + {0x32,0xd5,0xe7,0xe7}, {0x43,0x8b,0xc8,0xc8}, {0x59,0x6e,0x37,0x37}, {0xb7,0xda,0x6d,0x6d}, + {0x8c,0x01,0x8d,0x8d}, {0x64,0xb1,0xd5,0xd5}, {0xd2,0x9c,0x4e,0x4e}, {0xe0,0x49,0xa9,0xa9}, + {0xb4,0xd8,0x6c,0x6c}, {0xfa,0xac,0x56,0x56}, {0x07,0xf3,0xf4,0xf4}, {0x25,0xcf,0xea,0xea}, + {0xaf,0xca,0x65,0x65}, {0x8e,0xf4,0x7a,0x7a}, {0xe9,0x47,0xae,0xae}, {0x18,0x10,0x08,0x08}, + {0xd5,0x6f,0xba,0xba}, {0x88,0xf0,0x78,0x78}, {0x6f,0x4a,0x25,0x25}, {0x72,0x5c,0x2e,0x2e}, + {0x24,0x38,0x1c,0x1c}, {0xf1,0x57,0xa6,0xa6}, {0xc7,0x73,0xb4,0xb4}, {0x51,0x97,0xc6,0xc6}, + {0x23,0xcb,0xe8,0xe8}, {0x7c,0xa1,0xdd,0xdd}, {0x9c,0xe8,0x74,0x74}, {0x21,0x3e,0x1f,0x1f}, + {0xdd,0x96,0x4b,0x4b}, {0xdc,0x61,0xbd,0xbd}, {0x86,0x0d,0x8b,0x8b}, {0x85,0x0f,0x8a,0x8a}, + {0x90,0xe0,0x70,0x70}, {0x42,0x7c,0x3e,0x3e}, {0xc4,0x71,0xb5,0xb5}, {0xaa,0xcc,0x66,0x66}, + {0xd8,0x90,0x48,0x48}, {0x05,0x06,0x03,0x03}, {0x01,0xf7,0xf6,0xf6}, {0x12,0x1c,0x0e,0x0e}, + {0xa3,0xc2,0x61,0x61}, {0x5f,0x6a,0x35,0x35}, {0xf9,0xae,0x57,0x57}, {0xd0,0x69,0xb9,0xb9}, + {0x91,0x17,0x86,0x86}, {0x58,0x99,0xc1,0xc1}, {0x27,0x3a,0x1d,0x1d}, {0xb9,0x27,0x9e,0x9e}, + {0x38,0xd9,0xe1,0xe1}, {0x13,0xeb,0xf8,0xf8}, {0xb3,0x2b,0x98,0x98}, {0x33,0x22,0x11,0x11}, + {0xbb,0xd2,0x69,0x69}, {0x70,0xa9,0xd9,0xd9}, {0x89,0x07,0x8e,0x8e}, {0xa7,0x33,0x94,0x94}, + {0xb6,0x2d,0x9b,0x9b}, {0x22,0x3c,0x1e,0x1e}, {0x92,0x15,0x87,0x87}, {0x20,0xc9,0xe9,0xe9}, + {0x49,0x87,0xce,0xce}, {0xff,0xaa,0x55,0x55}, {0x78,0x50,0x28,0x28}, {0x7a,0xa5,0xdf,0xdf}, + {0x8f,0x03,0x8c,0x8c}, {0xf8,0x59,0xa1,0xa1}, {0x80,0x09,0x89,0x89}, {0x17,0x1a,0x0d,0x0d}, + {0xda,0x65,0xbf,0xbf}, {0x31,0xd7,0xe6,0xe6}, {0xc6,0x84,0x42,0x42}, {0xb8,0xd0,0x68,0x68}, + {0xc3,0x82,0x41,0x41}, {0xb0,0x29,0x99,0x99}, {0x77,0x5a,0x2d,0x2d}, {0x11,0x1e,0x0f,0x0f}, {0xcb,0x7b,0xb0,0xb0}, {0xfc,0xa8,0x54,0x54}, {0xd6,0x6d,0xbb,0xbb}, {0x3a,0x2c,0x16,0x16} }; static UINT8 T3[256][4]= { - {0x63,0xa5,0xc6,0x63}, {0x7c,0x84,0xf8,0x7c}, {0x77,0x99,0xee,0x77}, {0x7b,0x8d,0xf6,0x7b}, - {0xf2,0x0d,0xff,0xf2}, {0x6b,0xbd,0xd6,0x6b}, {0x6f,0xb1,0xde,0x6f}, {0xc5,0x54,0x91,0xc5}, - {0x30,0x50,0x60,0x30}, {0x01,0x03,0x02,0x01}, {0x67,0xa9,0xce,0x67}, {0x2b,0x7d,0x56,0x2b}, - {0xfe,0x19,0xe7,0xfe}, {0xd7,0x62,0xb5,0xd7}, {0xab,0xe6,0x4d,0xab}, {0x76,0x9a,0xec,0x76}, - {0xca,0x45,0x8f,0xca}, {0x82,0x9d,0x1f,0x82}, {0xc9,0x40,0x89,0xc9}, {0x7d,0x87,0xfa,0x7d}, - {0xfa,0x15,0xef,0xfa}, {0x59,0xeb,0xb2,0x59}, {0x47,0xc9,0x8e,0x47}, {0xf0,0x0b,0xfb,0xf0}, - {0xad,0xec,0x41,0xad}, {0xd4,0x67,0xb3,0xd4}, {0xa2,0xfd,0x5f,0xa2}, {0xaf,0xea,0x45,0xaf}, - {0x9c,0xbf,0x23,0x9c}, {0xa4,0xf7,0x53,0xa4}, {0x72,0x96,0xe4,0x72}, {0xc0,0x5b,0x9b,0xc0}, - {0xb7,0xc2,0x75,0xb7}, {0xfd,0x1c,0xe1,0xfd}, {0x93,0xae,0x3d,0x93}, {0x26,0x6a,0x4c,0x26}, - {0x36,0x5a,0x6c,0x36}, {0x3f,0x41,0x7e,0x3f}, {0xf7,0x02,0xf5,0xf7}, {0xcc,0x4f,0x83,0xcc}, - {0x34,0x5c,0x68,0x34}, {0xa5,0xf4,0x51,0xa5}, {0xe5,0x34,0xd1,0xe5}, {0xf1,0x08,0xf9,0xf1}, - {0x71,0x93,0xe2,0x71}, {0xd8,0x73,0xab,0xd8}, {0x31,0x53,0x62,0x31}, {0x15,0x3f,0x2a,0x15}, - {0x04,0x0c,0x08,0x04}, {0xc7,0x52,0x95,0xc7}, {0x23,0x65,0x46,0x23}, {0xc3,0x5e,0x9d,0xc3}, - {0x18,0x28,0x30,0x18}, {0x96,0xa1,0x37,0x96}, {0x05,0x0f,0x0a,0x05}, {0x9a,0xb5,0x2f,0x9a}, - {0x07,0x09,0x0e,0x07}, {0x12,0x36,0x24,0x12}, {0x80,0x9b,0x1b,0x80}, {0xe2,0x3d,0xdf,0xe2}, - {0xeb,0x26,0xcd,0xeb}, {0x27,0x69,0x4e,0x27}, {0xb2,0xcd,0x7f,0xb2}, {0x75,0x9f,0xea,0x75}, - {0x09,0x1b,0x12,0x09}, {0x83,0x9e,0x1d,0x83}, {0x2c,0x74,0x58,0x2c}, {0x1a,0x2e,0x34,0x1a}, - {0x1b,0x2d,0x36,0x1b}, {0x6e,0xb2,0xdc,0x6e}, {0x5a,0xee,0xb4,0x5a}, {0xa0,0xfb,0x5b,0xa0}, - {0x52,0xf6,0xa4,0x52}, {0x3b,0x4d,0x76,0x3b}, {0xd6,0x61,0xb7,0xd6}, {0xb3,0xce,0x7d,0xb3}, - {0x29,0x7b,0x52,0x29}, {0xe3,0x3e,0xdd,0xe3}, {0x2f,0x71,0x5e,0x2f}, {0x84,0x97,0x13,0x84}, - {0x53,0xf5,0xa6,0x53}, {0xd1,0x68,0xb9,0xd1}, {0x00,0x00,0x00,0x00}, {0xed,0x2c,0xc1,0xed}, - {0x20,0x60,0x40,0x20}, {0xfc,0x1f,0xe3,0xfc}, {0xb1,0xc8,0x79,0xb1}, {0x5b,0xed,0xb6,0x5b}, - {0x6a,0xbe,0xd4,0x6a}, {0xcb,0x46,0x8d,0xcb}, {0xbe,0xd9,0x67,0xbe}, {0x39,0x4b,0x72,0x39}, - {0x4a,0xde,0x94,0x4a}, {0x4c,0xd4,0x98,0x4c}, {0x58,0xe8,0xb0,0x58}, {0xcf,0x4a,0x85,0xcf}, - {0xd0,0x6b,0xbb,0xd0}, {0xef,0x2a,0xc5,0xef}, {0xaa,0xe5,0x4f,0xaa}, {0xfb,0x16,0xed,0xfb}, - {0x43,0xc5,0x86,0x43}, {0x4d,0xd7,0x9a,0x4d}, {0x33,0x55,0x66,0x33}, {0x85,0x94,0x11,0x85}, - {0x45,0xcf,0x8a,0x45}, {0xf9,0x10,0xe9,0xf9}, {0x02,0x06,0x04,0x02}, {0x7f,0x81,0xfe,0x7f}, - {0x50,0xf0,0xa0,0x50}, {0x3c,0x44,0x78,0x3c}, {0x9f,0xba,0x25,0x9f}, {0xa8,0xe3,0x4b,0xa8}, - {0x51,0xf3,0xa2,0x51}, {0xa3,0xfe,0x5d,0xa3}, {0x40,0xc0,0x80,0x40}, {0x8f,0x8a,0x05,0x8f}, - {0x92,0xad,0x3f,0x92}, {0x9d,0xbc,0x21,0x9d}, {0x38,0x48,0x70,0x38}, {0xf5,0x04,0xf1,0xf5}, - {0xbc,0xdf,0x63,0xbc}, {0xb6,0xc1,0x77,0xb6}, {0xda,0x75,0xaf,0xda}, {0x21,0x63,0x42,0x21}, - {0x10,0x30,0x20,0x10}, {0xff,0x1a,0xe5,0xff}, {0xf3,0x0e,0xfd,0xf3}, {0xd2,0x6d,0xbf,0xd2}, - {0xcd,0x4c,0x81,0xcd}, {0x0c,0x14,0x18,0x0c}, {0x13,0x35,0x26,0x13}, {0xec,0x2f,0xc3,0xec}, - {0x5f,0xe1,0xbe,0x5f}, {0x97,0xa2,0x35,0x97}, {0x44,0xcc,0x88,0x44}, {0x17,0x39,0x2e,0x17}, - {0xc4,0x57,0x93,0xc4}, {0xa7,0xf2,0x55,0xa7}, {0x7e,0x82,0xfc,0x7e}, {0x3d,0x47,0x7a,0x3d}, - {0x64,0xac,0xc8,0x64}, {0x5d,0xe7,0xba,0x5d}, {0x19,0x2b,0x32,0x19}, {0x73,0x95,0xe6,0x73}, - {0x60,0xa0,0xc0,0x60}, {0x81,0x98,0x19,0x81}, {0x4f,0xd1,0x9e,0x4f}, {0xdc,0x7f,0xa3,0xdc}, - {0x22,0x66,0x44,0x22}, {0x2a,0x7e,0x54,0x2a}, {0x90,0xab,0x3b,0x90}, {0x88,0x83,0x0b,0x88}, - {0x46,0xca,0x8c,0x46}, {0xee,0x29,0xc7,0xee}, {0xb8,0xd3,0x6b,0xb8}, {0x14,0x3c,0x28,0x14}, - {0xde,0x79,0xa7,0xde}, {0x5e,0xe2,0xbc,0x5e}, {0x0b,0x1d,0x16,0x0b}, {0xdb,0x76,0xad,0xdb}, - {0xe0,0x3b,0xdb,0xe0}, {0x32,0x56,0x64,0x32}, {0x3a,0x4e,0x74,0x3a}, {0x0a,0x1e,0x14,0x0a}, - {0x49,0xdb,0x92,0x49}, {0x06,0x0a,0x0c,0x06}, {0x24,0x6c,0x48,0x24}, {0x5c,0xe4,0xb8,0x5c}, - {0xc2,0x5d,0x9f,0xc2}, {0xd3,0x6e,0xbd,0xd3}, {0xac,0xef,0x43,0xac}, {0x62,0xa6,0xc4,0x62}, - {0x91,0xa8,0x39,0x91}, {0x95,0xa4,0x31,0x95}, {0xe4,0x37,0xd3,0xe4}, {0x79,0x8b,0xf2,0x79}, - {0xe7,0x32,0xd5,0xe7}, {0xc8,0x43,0x8b,0xc8}, {0x37,0x59,0x6e,0x37}, {0x6d,0xb7,0xda,0x6d}, - {0x8d,0x8c,0x01,0x8d}, {0xd5,0x64,0xb1,0xd5}, {0x4e,0xd2,0x9c,0x4e}, {0xa9,0xe0,0x49,0xa9}, - {0x6c,0xb4,0xd8,0x6c}, {0x56,0xfa,0xac,0x56}, {0xf4,0x07,0xf3,0xf4}, {0xea,0x25,0xcf,0xea}, - {0x65,0xaf,0xca,0x65}, {0x7a,0x8e,0xf4,0x7a}, {0xae,0xe9,0x47,0xae}, {0x08,0x18,0x10,0x08}, - {0xba,0xd5,0x6f,0xba}, {0x78,0x88,0xf0,0x78}, {0x25,0x6f,0x4a,0x25}, {0x2e,0x72,0x5c,0x2e}, - {0x1c,0x24,0x38,0x1c}, {0xa6,0xf1,0x57,0xa6}, {0xb4,0xc7,0x73,0xb4}, {0xc6,0x51,0x97,0xc6}, - {0xe8,0x23,0xcb,0xe8}, {0xdd,0x7c,0xa1,0xdd}, {0x74,0x9c,0xe8,0x74}, {0x1f,0x21,0x3e,0x1f}, - {0x4b,0xdd,0x96,0x4b}, {0xbd,0xdc,0x61,0xbd}, {0x8b,0x86,0x0d,0x8b}, {0x8a,0x85,0x0f,0x8a}, - {0x70,0x90,0xe0,0x70}, {0x3e,0x42,0x7c,0x3e}, {0xb5,0xc4,0x71,0xb5}, {0x66,0xaa,0xcc,0x66}, - {0x48,0xd8,0x90,0x48}, {0x03,0x05,0x06,0x03}, {0xf6,0x01,0xf7,0xf6}, {0x0e,0x12,0x1c,0x0e}, - {0x61,0xa3,0xc2,0x61}, {0x35,0x5f,0x6a,0x35}, {0x57,0xf9,0xae,0x57}, {0xb9,0xd0,0x69,0xb9}, - {0x86,0x91,0x17,0x86}, {0xc1,0x58,0x99,0xc1}, {0x1d,0x27,0x3a,0x1d}, {0x9e,0xb9,0x27,0x9e}, - {0xe1,0x38,0xd9,0xe1}, {0xf8,0x13,0xeb,0xf8}, {0x98,0xb3,0x2b,0x98}, {0x11,0x33,0x22,0x11}, - {0x69,0xbb,0xd2,0x69}, {0xd9,0x70,0xa9,0xd9}, {0x8e,0x89,0x07,0x8e}, {0x94,0xa7,0x33,0x94}, - {0x9b,0xb6,0x2d,0x9b}, {0x1e,0x22,0x3c,0x1e}, {0x87,0x92,0x15,0x87}, {0xe9,0x20,0xc9,0xe9}, - {0xce,0x49,0x87,0xce}, {0x55,0xff,0xaa,0x55}, {0x28,0x78,0x50,0x28}, {0xdf,0x7a,0xa5,0xdf}, - {0x8c,0x8f,0x03,0x8c}, {0xa1,0xf8,0x59,0xa1}, {0x89,0x80,0x09,0x89}, {0x0d,0x17,0x1a,0x0d}, - {0xbf,0xda,0x65,0xbf}, {0xe6,0x31,0xd7,0xe6}, {0x42,0xc6,0x84,0x42}, {0x68,0xb8,0xd0,0x68}, - {0x41,0xc3,0x82,0x41}, {0x99,0xb0,0x29,0x99}, {0x2d,0x77,0x5a,0x2d}, {0x0f,0x11,0x1e,0x0f}, + {0x63,0xa5,0xc6,0x63}, {0x7c,0x84,0xf8,0x7c}, {0x77,0x99,0xee,0x77}, {0x7b,0x8d,0xf6,0x7b}, + {0xf2,0x0d,0xff,0xf2}, {0x6b,0xbd,0xd6,0x6b}, {0x6f,0xb1,0xde,0x6f}, {0xc5,0x54,0x91,0xc5}, + {0x30,0x50,0x60,0x30}, {0x01,0x03,0x02,0x01}, {0x67,0xa9,0xce,0x67}, {0x2b,0x7d,0x56,0x2b}, + {0xfe,0x19,0xe7,0xfe}, {0xd7,0x62,0xb5,0xd7}, {0xab,0xe6,0x4d,0xab}, {0x76,0x9a,0xec,0x76}, + {0xca,0x45,0x8f,0xca}, {0x82,0x9d,0x1f,0x82}, {0xc9,0x40,0x89,0xc9}, {0x7d,0x87,0xfa,0x7d}, + {0xfa,0x15,0xef,0xfa}, {0x59,0xeb,0xb2,0x59}, {0x47,0xc9,0x8e,0x47}, {0xf0,0x0b,0xfb,0xf0}, + {0xad,0xec,0x41,0xad}, {0xd4,0x67,0xb3,0xd4}, {0xa2,0xfd,0x5f,0xa2}, {0xaf,0xea,0x45,0xaf}, + {0x9c,0xbf,0x23,0x9c}, {0xa4,0xf7,0x53,0xa4}, {0x72,0x96,0xe4,0x72}, {0xc0,0x5b,0x9b,0xc0}, + {0xb7,0xc2,0x75,0xb7}, {0xfd,0x1c,0xe1,0xfd}, {0x93,0xae,0x3d,0x93}, {0x26,0x6a,0x4c,0x26}, + {0x36,0x5a,0x6c,0x36}, {0x3f,0x41,0x7e,0x3f}, {0xf7,0x02,0xf5,0xf7}, {0xcc,0x4f,0x83,0xcc}, + {0x34,0x5c,0x68,0x34}, {0xa5,0xf4,0x51,0xa5}, {0xe5,0x34,0xd1,0xe5}, {0xf1,0x08,0xf9,0xf1}, + {0x71,0x93,0xe2,0x71}, {0xd8,0x73,0xab,0xd8}, {0x31,0x53,0x62,0x31}, {0x15,0x3f,0x2a,0x15}, + {0x04,0x0c,0x08,0x04}, {0xc7,0x52,0x95,0xc7}, {0x23,0x65,0x46,0x23}, {0xc3,0x5e,0x9d,0xc3}, + {0x18,0x28,0x30,0x18}, {0x96,0xa1,0x37,0x96}, {0x05,0x0f,0x0a,0x05}, {0x9a,0xb5,0x2f,0x9a}, + {0x07,0x09,0x0e,0x07}, {0x12,0x36,0x24,0x12}, {0x80,0x9b,0x1b,0x80}, {0xe2,0x3d,0xdf,0xe2}, + {0xeb,0x26,0xcd,0xeb}, {0x27,0x69,0x4e,0x27}, {0xb2,0xcd,0x7f,0xb2}, {0x75,0x9f,0xea,0x75}, + {0x09,0x1b,0x12,0x09}, {0x83,0x9e,0x1d,0x83}, {0x2c,0x74,0x58,0x2c}, {0x1a,0x2e,0x34,0x1a}, + {0x1b,0x2d,0x36,0x1b}, {0x6e,0xb2,0xdc,0x6e}, {0x5a,0xee,0xb4,0x5a}, {0xa0,0xfb,0x5b,0xa0}, + {0x52,0xf6,0xa4,0x52}, {0x3b,0x4d,0x76,0x3b}, {0xd6,0x61,0xb7,0xd6}, {0xb3,0xce,0x7d,0xb3}, + {0x29,0x7b,0x52,0x29}, {0xe3,0x3e,0xdd,0xe3}, {0x2f,0x71,0x5e,0x2f}, {0x84,0x97,0x13,0x84}, + {0x53,0xf5,0xa6,0x53}, {0xd1,0x68,0xb9,0xd1}, {0x00,0x00,0x00,0x00}, {0xed,0x2c,0xc1,0xed}, + {0x20,0x60,0x40,0x20}, {0xfc,0x1f,0xe3,0xfc}, {0xb1,0xc8,0x79,0xb1}, {0x5b,0xed,0xb6,0x5b}, + {0x6a,0xbe,0xd4,0x6a}, {0xcb,0x46,0x8d,0xcb}, {0xbe,0xd9,0x67,0xbe}, {0x39,0x4b,0x72,0x39}, + {0x4a,0xde,0x94,0x4a}, {0x4c,0xd4,0x98,0x4c}, {0x58,0xe8,0xb0,0x58}, {0xcf,0x4a,0x85,0xcf}, + {0xd0,0x6b,0xbb,0xd0}, {0xef,0x2a,0xc5,0xef}, {0xaa,0xe5,0x4f,0xaa}, {0xfb,0x16,0xed,0xfb}, + {0x43,0xc5,0x86,0x43}, {0x4d,0xd7,0x9a,0x4d}, {0x33,0x55,0x66,0x33}, {0x85,0x94,0x11,0x85}, + {0x45,0xcf,0x8a,0x45}, {0xf9,0x10,0xe9,0xf9}, {0x02,0x06,0x04,0x02}, {0x7f,0x81,0xfe,0x7f}, + {0x50,0xf0,0xa0,0x50}, {0x3c,0x44,0x78,0x3c}, {0x9f,0xba,0x25,0x9f}, {0xa8,0xe3,0x4b,0xa8}, + {0x51,0xf3,0xa2,0x51}, {0xa3,0xfe,0x5d,0xa3}, {0x40,0xc0,0x80,0x40}, {0x8f,0x8a,0x05,0x8f}, + {0x92,0xad,0x3f,0x92}, {0x9d,0xbc,0x21,0x9d}, {0x38,0x48,0x70,0x38}, {0xf5,0x04,0xf1,0xf5}, + {0xbc,0xdf,0x63,0xbc}, {0xb6,0xc1,0x77,0xb6}, {0xda,0x75,0xaf,0xda}, {0x21,0x63,0x42,0x21}, + {0x10,0x30,0x20,0x10}, {0xff,0x1a,0xe5,0xff}, {0xf3,0x0e,0xfd,0xf3}, {0xd2,0x6d,0xbf,0xd2}, + {0xcd,0x4c,0x81,0xcd}, {0x0c,0x14,0x18,0x0c}, {0x13,0x35,0x26,0x13}, {0xec,0x2f,0xc3,0xec}, + {0x5f,0xe1,0xbe,0x5f}, {0x97,0xa2,0x35,0x97}, {0x44,0xcc,0x88,0x44}, {0x17,0x39,0x2e,0x17}, + {0xc4,0x57,0x93,0xc4}, {0xa7,0xf2,0x55,0xa7}, {0x7e,0x82,0xfc,0x7e}, {0x3d,0x47,0x7a,0x3d}, + {0x64,0xac,0xc8,0x64}, {0x5d,0xe7,0xba,0x5d}, {0x19,0x2b,0x32,0x19}, {0x73,0x95,0xe6,0x73}, + {0x60,0xa0,0xc0,0x60}, {0x81,0x98,0x19,0x81}, {0x4f,0xd1,0x9e,0x4f}, {0xdc,0x7f,0xa3,0xdc}, + {0x22,0x66,0x44,0x22}, {0x2a,0x7e,0x54,0x2a}, {0x90,0xab,0x3b,0x90}, {0x88,0x83,0x0b,0x88}, + {0x46,0xca,0x8c,0x46}, {0xee,0x29,0xc7,0xee}, {0xb8,0xd3,0x6b,0xb8}, {0x14,0x3c,0x28,0x14}, + {0xde,0x79,0xa7,0xde}, {0x5e,0xe2,0xbc,0x5e}, {0x0b,0x1d,0x16,0x0b}, {0xdb,0x76,0xad,0xdb}, + {0xe0,0x3b,0xdb,0xe0}, {0x32,0x56,0x64,0x32}, {0x3a,0x4e,0x74,0x3a}, {0x0a,0x1e,0x14,0x0a}, + {0x49,0xdb,0x92,0x49}, {0x06,0x0a,0x0c,0x06}, {0x24,0x6c,0x48,0x24}, {0x5c,0xe4,0xb8,0x5c}, + {0xc2,0x5d,0x9f,0xc2}, {0xd3,0x6e,0xbd,0xd3}, {0xac,0xef,0x43,0xac}, {0x62,0xa6,0xc4,0x62}, + {0x91,0xa8,0x39,0x91}, {0x95,0xa4,0x31,0x95}, {0xe4,0x37,0xd3,0xe4}, {0x79,0x8b,0xf2,0x79}, + {0xe7,0x32,0xd5,0xe7}, {0xc8,0x43,0x8b,0xc8}, {0x37,0x59,0x6e,0x37}, {0x6d,0xb7,0xda,0x6d}, + {0x8d,0x8c,0x01,0x8d}, {0xd5,0x64,0xb1,0xd5}, {0x4e,0xd2,0x9c,0x4e}, {0xa9,0xe0,0x49,0xa9}, + {0x6c,0xb4,0xd8,0x6c}, {0x56,0xfa,0xac,0x56}, {0xf4,0x07,0xf3,0xf4}, {0xea,0x25,0xcf,0xea}, + {0x65,0xaf,0xca,0x65}, {0x7a,0x8e,0xf4,0x7a}, {0xae,0xe9,0x47,0xae}, {0x08,0x18,0x10,0x08}, + {0xba,0xd5,0x6f,0xba}, {0x78,0x88,0xf0,0x78}, {0x25,0x6f,0x4a,0x25}, {0x2e,0x72,0x5c,0x2e}, + {0x1c,0x24,0x38,0x1c}, {0xa6,0xf1,0x57,0xa6}, {0xb4,0xc7,0x73,0xb4}, {0xc6,0x51,0x97,0xc6}, + {0xe8,0x23,0xcb,0xe8}, {0xdd,0x7c,0xa1,0xdd}, {0x74,0x9c,0xe8,0x74}, {0x1f,0x21,0x3e,0x1f}, + {0x4b,0xdd,0x96,0x4b}, {0xbd,0xdc,0x61,0xbd}, {0x8b,0x86,0x0d,0x8b}, {0x8a,0x85,0x0f,0x8a}, + {0x70,0x90,0xe0,0x70}, {0x3e,0x42,0x7c,0x3e}, {0xb5,0xc4,0x71,0xb5}, {0x66,0xaa,0xcc,0x66}, + {0x48,0xd8,0x90,0x48}, {0x03,0x05,0x06,0x03}, {0xf6,0x01,0xf7,0xf6}, {0x0e,0x12,0x1c,0x0e}, + {0x61,0xa3,0xc2,0x61}, {0x35,0x5f,0x6a,0x35}, {0x57,0xf9,0xae,0x57}, {0xb9,0xd0,0x69,0xb9}, + {0x86,0x91,0x17,0x86}, {0xc1,0x58,0x99,0xc1}, {0x1d,0x27,0x3a,0x1d}, {0x9e,0xb9,0x27,0x9e}, + {0xe1,0x38,0xd9,0xe1}, {0xf8,0x13,0xeb,0xf8}, {0x98,0xb3,0x2b,0x98}, {0x11,0x33,0x22,0x11}, + {0x69,0xbb,0xd2,0x69}, {0xd9,0x70,0xa9,0xd9}, {0x8e,0x89,0x07,0x8e}, {0x94,0xa7,0x33,0x94}, + {0x9b,0xb6,0x2d,0x9b}, {0x1e,0x22,0x3c,0x1e}, {0x87,0x92,0x15,0x87}, {0xe9,0x20,0xc9,0xe9}, + {0xce,0x49,0x87,0xce}, {0x55,0xff,0xaa,0x55}, {0x28,0x78,0x50,0x28}, {0xdf,0x7a,0xa5,0xdf}, + {0x8c,0x8f,0x03,0x8c}, {0xa1,0xf8,0x59,0xa1}, {0x89,0x80,0x09,0x89}, {0x0d,0x17,0x1a,0x0d}, + {0xbf,0xda,0x65,0xbf}, {0xe6,0x31,0xd7,0xe6}, {0x42,0xc6,0x84,0x42}, {0x68,0xb8,0xd0,0x68}, + {0x41,0xc3,0x82,0x41}, {0x99,0xb0,0x29,0x99}, {0x2d,0x77,0x5a,0x2d}, {0x0f,0x11,0x1e,0x0f}, {0xb0,0xcb,0x7b,0xb0}, {0x54,0xfc,0xa8,0x54}, {0xbb,0xd6,0x6d,0xbb}, {0x16,0x3a,0x2c,0x16} }; static UINT8 T4[256][4]= { - {0x63,0x63,0xa5,0xc6}, {0x7c,0x7c,0x84,0xf8}, {0x77,0x77,0x99,0xee}, {0x7b,0x7b,0x8d,0xf6}, - {0xf2,0xf2,0x0d,0xff}, {0x6b,0x6b,0xbd,0xd6}, {0x6f,0x6f,0xb1,0xde}, {0xc5,0xc5,0x54,0x91}, - {0x30,0x30,0x50,0x60}, {0x01,0x01,0x03,0x02}, {0x67,0x67,0xa9,0xce}, {0x2b,0x2b,0x7d,0x56}, - {0xfe,0xfe,0x19,0xe7}, {0xd7,0xd7,0x62,0xb5}, {0xab,0xab,0xe6,0x4d}, {0x76,0x76,0x9a,0xec}, - {0xca,0xca,0x45,0x8f}, {0x82,0x82,0x9d,0x1f}, {0xc9,0xc9,0x40,0x89}, {0x7d,0x7d,0x87,0xfa}, - {0xfa,0xfa,0x15,0xef}, {0x59,0x59,0xeb,0xb2}, {0x47,0x47,0xc9,0x8e}, {0xf0,0xf0,0x0b,0xfb}, - {0xad,0xad,0xec,0x41}, {0xd4,0xd4,0x67,0xb3}, {0xa2,0xa2,0xfd,0x5f}, {0xaf,0xaf,0xea,0x45}, - {0x9c,0x9c,0xbf,0x23}, {0xa4,0xa4,0xf7,0x53}, {0x72,0x72,0x96,0xe4}, {0xc0,0xc0,0x5b,0x9b}, - {0xb7,0xb7,0xc2,0x75}, {0xfd,0xfd,0x1c,0xe1}, {0x93,0x93,0xae,0x3d}, {0x26,0x26,0x6a,0x4c}, - {0x36,0x36,0x5a,0x6c}, {0x3f,0x3f,0x41,0x7e}, {0xf7,0xf7,0x02,0xf5}, {0xcc,0xcc,0x4f,0x83}, - {0x34,0x34,0x5c,0x68}, {0xa5,0xa5,0xf4,0x51}, {0xe5,0xe5,0x34,0xd1}, {0xf1,0xf1,0x08,0xf9}, - {0x71,0x71,0x93,0xe2}, {0xd8,0xd8,0x73,0xab}, {0x31,0x31,0x53,0x62}, {0x15,0x15,0x3f,0x2a}, - {0x04,0x04,0x0c,0x08}, {0xc7,0xc7,0x52,0x95}, {0x23,0x23,0x65,0x46}, {0xc3,0xc3,0x5e,0x9d}, - {0x18,0x18,0x28,0x30}, {0x96,0x96,0xa1,0x37}, {0x05,0x05,0x0f,0x0a}, {0x9a,0x9a,0xb5,0x2f}, - {0x07,0x07,0x09,0x0e}, {0x12,0x12,0x36,0x24}, {0x80,0x80,0x9b,0x1b}, {0xe2,0xe2,0x3d,0xdf}, - {0xeb,0xeb,0x26,0xcd}, {0x27,0x27,0x69,0x4e}, {0xb2,0xb2,0xcd,0x7f}, {0x75,0x75,0x9f,0xea}, - {0x09,0x09,0x1b,0x12}, {0x83,0x83,0x9e,0x1d}, {0x2c,0x2c,0x74,0x58}, {0x1a,0x1a,0x2e,0x34}, - {0x1b,0x1b,0x2d,0x36}, {0x6e,0x6e,0xb2,0xdc}, {0x5a,0x5a,0xee,0xb4}, {0xa0,0xa0,0xfb,0x5b}, - {0x52,0x52,0xf6,0xa4}, {0x3b,0x3b,0x4d,0x76}, {0xd6,0xd6,0x61,0xb7}, {0xb3,0xb3,0xce,0x7d}, - {0x29,0x29,0x7b,0x52}, {0xe3,0xe3,0x3e,0xdd}, {0x2f,0x2f,0x71,0x5e}, {0x84,0x84,0x97,0x13}, - {0x53,0x53,0xf5,0xa6}, {0xd1,0xd1,0x68,0xb9}, {0x00,0x00,0x00,0x00}, {0xed,0xed,0x2c,0xc1}, - {0x20,0x20,0x60,0x40}, {0xfc,0xfc,0x1f,0xe3}, {0xb1,0xb1,0xc8,0x79}, {0x5b,0x5b,0xed,0xb6}, - {0x6a,0x6a,0xbe,0xd4}, {0xcb,0xcb,0x46,0x8d}, {0xbe,0xbe,0xd9,0x67}, {0x39,0x39,0x4b,0x72}, - {0x4a,0x4a,0xde,0x94}, {0x4c,0x4c,0xd4,0x98}, {0x58,0x58,0xe8,0xb0}, {0xcf,0xcf,0x4a,0x85}, - {0xd0,0xd0,0x6b,0xbb}, {0xef,0xef,0x2a,0xc5}, {0xaa,0xaa,0xe5,0x4f}, {0xfb,0xfb,0x16,0xed}, - {0x43,0x43,0xc5,0x86}, {0x4d,0x4d,0xd7,0x9a}, {0x33,0x33,0x55,0x66}, {0x85,0x85,0x94,0x11}, - {0x45,0x45,0xcf,0x8a}, {0xf9,0xf9,0x10,0xe9}, {0x02,0x02,0x06,0x04}, {0x7f,0x7f,0x81,0xfe}, - {0x50,0x50,0xf0,0xa0}, {0x3c,0x3c,0x44,0x78}, {0x9f,0x9f,0xba,0x25}, {0xa8,0xa8,0xe3,0x4b}, - {0x51,0x51,0xf3,0xa2}, {0xa3,0xa3,0xfe,0x5d}, {0x40,0x40,0xc0,0x80}, {0x8f,0x8f,0x8a,0x05}, - {0x92,0x92,0xad,0x3f}, {0x9d,0x9d,0xbc,0x21}, {0x38,0x38,0x48,0x70}, {0xf5,0xf5,0x04,0xf1}, - {0xbc,0xbc,0xdf,0x63}, {0xb6,0xb6,0xc1,0x77}, {0xda,0xda,0x75,0xaf}, {0x21,0x21,0x63,0x42}, - {0x10,0x10,0x30,0x20}, {0xff,0xff,0x1a,0xe5}, {0xf3,0xf3,0x0e,0xfd}, {0xd2,0xd2,0x6d,0xbf}, - {0xcd,0xcd,0x4c,0x81}, {0x0c,0x0c,0x14,0x18}, {0x13,0x13,0x35,0x26}, {0xec,0xec,0x2f,0xc3}, - {0x5f,0x5f,0xe1,0xbe}, {0x97,0x97,0xa2,0x35}, {0x44,0x44,0xcc,0x88}, {0x17,0x17,0x39,0x2e}, - {0xc4,0xc4,0x57,0x93}, {0xa7,0xa7,0xf2,0x55}, {0x7e,0x7e,0x82,0xfc}, {0x3d,0x3d,0x47,0x7a}, - {0x64,0x64,0xac,0xc8}, {0x5d,0x5d,0xe7,0xba}, {0x19,0x19,0x2b,0x32}, {0x73,0x73,0x95,0xe6}, - {0x60,0x60,0xa0,0xc0}, {0x81,0x81,0x98,0x19}, {0x4f,0x4f,0xd1,0x9e}, {0xdc,0xdc,0x7f,0xa3}, - {0x22,0x22,0x66,0x44}, {0x2a,0x2a,0x7e,0x54}, {0x90,0x90,0xab,0x3b}, {0x88,0x88,0x83,0x0b}, - {0x46,0x46,0xca,0x8c}, {0xee,0xee,0x29,0xc7}, {0xb8,0xb8,0xd3,0x6b}, {0x14,0x14,0x3c,0x28}, - {0xde,0xde,0x79,0xa7}, {0x5e,0x5e,0xe2,0xbc}, {0x0b,0x0b,0x1d,0x16}, {0xdb,0xdb,0x76,0xad}, - {0xe0,0xe0,0x3b,0xdb}, {0x32,0x32,0x56,0x64}, {0x3a,0x3a,0x4e,0x74}, {0x0a,0x0a,0x1e,0x14}, - {0x49,0x49,0xdb,0x92}, {0x06,0x06,0x0a,0x0c}, {0x24,0x24,0x6c,0x48}, {0x5c,0x5c,0xe4,0xb8}, - {0xc2,0xc2,0x5d,0x9f}, {0xd3,0xd3,0x6e,0xbd}, {0xac,0xac,0xef,0x43}, {0x62,0x62,0xa6,0xc4}, - {0x91,0x91,0xa8,0x39}, {0x95,0x95,0xa4,0x31}, {0xe4,0xe4,0x37,0xd3}, {0x79,0x79,0x8b,0xf2}, - {0xe7,0xe7,0x32,0xd5}, {0xc8,0xc8,0x43,0x8b}, {0x37,0x37,0x59,0x6e}, {0x6d,0x6d,0xb7,0xda}, - {0x8d,0x8d,0x8c,0x01}, {0xd5,0xd5,0x64,0xb1}, {0x4e,0x4e,0xd2,0x9c}, {0xa9,0xa9,0xe0,0x49}, - {0x6c,0x6c,0xb4,0xd8}, {0x56,0x56,0xfa,0xac}, {0xf4,0xf4,0x07,0xf3}, {0xea,0xea,0x25,0xcf}, - {0x65,0x65,0xaf,0xca}, {0x7a,0x7a,0x8e,0xf4}, {0xae,0xae,0xe9,0x47}, {0x08,0x08,0x18,0x10}, - {0xba,0xba,0xd5,0x6f}, {0x78,0x78,0x88,0xf0}, {0x25,0x25,0x6f,0x4a}, {0x2e,0x2e,0x72,0x5c}, - {0x1c,0x1c,0x24,0x38}, {0xa6,0xa6,0xf1,0x57}, {0xb4,0xb4,0xc7,0x73}, {0xc6,0xc6,0x51,0x97}, - {0xe8,0xe8,0x23,0xcb}, {0xdd,0xdd,0x7c,0xa1}, {0x74,0x74,0x9c,0xe8}, {0x1f,0x1f,0x21,0x3e}, - {0x4b,0x4b,0xdd,0x96}, {0xbd,0xbd,0xdc,0x61}, {0x8b,0x8b,0x86,0x0d}, {0x8a,0x8a,0x85,0x0f}, - {0x70,0x70,0x90,0xe0}, {0x3e,0x3e,0x42,0x7c}, {0xb5,0xb5,0xc4,0x71}, {0x66,0x66,0xaa,0xcc}, - {0x48,0x48,0xd8,0x90}, {0x03,0x03,0x05,0x06}, {0xf6,0xf6,0x01,0xf7}, {0x0e,0x0e,0x12,0x1c}, - {0x61,0x61,0xa3,0xc2}, {0x35,0x35,0x5f,0x6a}, {0x57,0x57,0xf9,0xae}, {0xb9,0xb9,0xd0,0x69}, - {0x86,0x86,0x91,0x17}, {0xc1,0xc1,0x58,0x99}, {0x1d,0x1d,0x27,0x3a}, {0x9e,0x9e,0xb9,0x27}, - {0xe1,0xe1,0x38,0xd9}, {0xf8,0xf8,0x13,0xeb}, {0x98,0x98,0xb3,0x2b}, {0x11,0x11,0x33,0x22}, - {0x69,0x69,0xbb,0xd2}, {0xd9,0xd9,0x70,0xa9}, {0x8e,0x8e,0x89,0x07}, {0x94,0x94,0xa7,0x33}, - {0x9b,0x9b,0xb6,0x2d}, {0x1e,0x1e,0x22,0x3c}, {0x87,0x87,0x92,0x15}, {0xe9,0xe9,0x20,0xc9}, - {0xce,0xce,0x49,0x87}, {0x55,0x55,0xff,0xaa}, {0x28,0x28,0x78,0x50}, {0xdf,0xdf,0x7a,0xa5}, - {0x8c,0x8c,0x8f,0x03}, {0xa1,0xa1,0xf8,0x59}, {0x89,0x89,0x80,0x09}, {0x0d,0x0d,0x17,0x1a}, - {0xbf,0xbf,0xda,0x65}, {0xe6,0xe6,0x31,0xd7}, {0x42,0x42,0xc6,0x84}, {0x68,0x68,0xb8,0xd0}, - {0x41,0x41,0xc3,0x82}, {0x99,0x99,0xb0,0x29}, {0x2d,0x2d,0x77,0x5a}, {0x0f,0x0f,0x11,0x1e}, + {0x63,0x63,0xa5,0xc6}, {0x7c,0x7c,0x84,0xf8}, {0x77,0x77,0x99,0xee}, {0x7b,0x7b,0x8d,0xf6}, + {0xf2,0xf2,0x0d,0xff}, {0x6b,0x6b,0xbd,0xd6}, {0x6f,0x6f,0xb1,0xde}, {0xc5,0xc5,0x54,0x91}, + {0x30,0x30,0x50,0x60}, {0x01,0x01,0x03,0x02}, {0x67,0x67,0xa9,0xce}, {0x2b,0x2b,0x7d,0x56}, + {0xfe,0xfe,0x19,0xe7}, {0xd7,0xd7,0x62,0xb5}, {0xab,0xab,0xe6,0x4d}, {0x76,0x76,0x9a,0xec}, + {0xca,0xca,0x45,0x8f}, {0x82,0x82,0x9d,0x1f}, {0xc9,0xc9,0x40,0x89}, {0x7d,0x7d,0x87,0xfa}, + {0xfa,0xfa,0x15,0xef}, {0x59,0x59,0xeb,0xb2}, {0x47,0x47,0xc9,0x8e}, {0xf0,0xf0,0x0b,0xfb}, + {0xad,0xad,0xec,0x41}, {0xd4,0xd4,0x67,0xb3}, {0xa2,0xa2,0xfd,0x5f}, {0xaf,0xaf,0xea,0x45}, + {0x9c,0x9c,0xbf,0x23}, {0xa4,0xa4,0xf7,0x53}, {0x72,0x72,0x96,0xe4}, {0xc0,0xc0,0x5b,0x9b}, + {0xb7,0xb7,0xc2,0x75}, {0xfd,0xfd,0x1c,0xe1}, {0x93,0x93,0xae,0x3d}, {0x26,0x26,0x6a,0x4c}, + {0x36,0x36,0x5a,0x6c}, {0x3f,0x3f,0x41,0x7e}, {0xf7,0xf7,0x02,0xf5}, {0xcc,0xcc,0x4f,0x83}, + {0x34,0x34,0x5c,0x68}, {0xa5,0xa5,0xf4,0x51}, {0xe5,0xe5,0x34,0xd1}, {0xf1,0xf1,0x08,0xf9}, + {0x71,0x71,0x93,0xe2}, {0xd8,0xd8,0x73,0xab}, {0x31,0x31,0x53,0x62}, {0x15,0x15,0x3f,0x2a}, + {0x04,0x04,0x0c,0x08}, {0xc7,0xc7,0x52,0x95}, {0x23,0x23,0x65,0x46}, {0xc3,0xc3,0x5e,0x9d}, + {0x18,0x18,0x28,0x30}, {0x96,0x96,0xa1,0x37}, {0x05,0x05,0x0f,0x0a}, {0x9a,0x9a,0xb5,0x2f}, + {0x07,0x07,0x09,0x0e}, {0x12,0x12,0x36,0x24}, {0x80,0x80,0x9b,0x1b}, {0xe2,0xe2,0x3d,0xdf}, + {0xeb,0xeb,0x26,0xcd}, {0x27,0x27,0x69,0x4e}, {0xb2,0xb2,0xcd,0x7f}, {0x75,0x75,0x9f,0xea}, + {0x09,0x09,0x1b,0x12}, {0x83,0x83,0x9e,0x1d}, {0x2c,0x2c,0x74,0x58}, {0x1a,0x1a,0x2e,0x34}, + {0x1b,0x1b,0x2d,0x36}, {0x6e,0x6e,0xb2,0xdc}, {0x5a,0x5a,0xee,0xb4}, {0xa0,0xa0,0xfb,0x5b}, + {0x52,0x52,0xf6,0xa4}, {0x3b,0x3b,0x4d,0x76}, {0xd6,0xd6,0x61,0xb7}, {0xb3,0xb3,0xce,0x7d}, + {0x29,0x29,0x7b,0x52}, {0xe3,0xe3,0x3e,0xdd}, {0x2f,0x2f,0x71,0x5e}, {0x84,0x84,0x97,0x13}, + {0x53,0x53,0xf5,0xa6}, {0xd1,0xd1,0x68,0xb9}, {0x00,0x00,0x00,0x00}, {0xed,0xed,0x2c,0xc1}, + {0x20,0x20,0x60,0x40}, {0xfc,0xfc,0x1f,0xe3}, {0xb1,0xb1,0xc8,0x79}, {0x5b,0x5b,0xed,0xb6}, + {0x6a,0x6a,0xbe,0xd4}, {0xcb,0xcb,0x46,0x8d}, {0xbe,0xbe,0xd9,0x67}, {0x39,0x39,0x4b,0x72}, + {0x4a,0x4a,0xde,0x94}, {0x4c,0x4c,0xd4,0x98}, {0x58,0x58,0xe8,0xb0}, {0xcf,0xcf,0x4a,0x85}, + {0xd0,0xd0,0x6b,0xbb}, {0xef,0xef,0x2a,0xc5}, {0xaa,0xaa,0xe5,0x4f}, {0xfb,0xfb,0x16,0xed}, + {0x43,0x43,0xc5,0x86}, {0x4d,0x4d,0xd7,0x9a}, {0x33,0x33,0x55,0x66}, {0x85,0x85,0x94,0x11}, + {0x45,0x45,0xcf,0x8a}, {0xf9,0xf9,0x10,0xe9}, {0x02,0x02,0x06,0x04}, {0x7f,0x7f,0x81,0xfe}, + {0x50,0x50,0xf0,0xa0}, {0x3c,0x3c,0x44,0x78}, {0x9f,0x9f,0xba,0x25}, {0xa8,0xa8,0xe3,0x4b}, + {0x51,0x51,0xf3,0xa2}, {0xa3,0xa3,0xfe,0x5d}, {0x40,0x40,0xc0,0x80}, {0x8f,0x8f,0x8a,0x05}, + {0x92,0x92,0xad,0x3f}, {0x9d,0x9d,0xbc,0x21}, {0x38,0x38,0x48,0x70}, {0xf5,0xf5,0x04,0xf1}, + {0xbc,0xbc,0xdf,0x63}, {0xb6,0xb6,0xc1,0x77}, {0xda,0xda,0x75,0xaf}, {0x21,0x21,0x63,0x42}, + {0x10,0x10,0x30,0x20}, {0xff,0xff,0x1a,0xe5}, {0xf3,0xf3,0x0e,0xfd}, {0xd2,0xd2,0x6d,0xbf}, + {0xcd,0xcd,0x4c,0x81}, {0x0c,0x0c,0x14,0x18}, {0x13,0x13,0x35,0x26}, {0xec,0xec,0x2f,0xc3}, + {0x5f,0x5f,0xe1,0xbe}, {0x97,0x97,0xa2,0x35}, {0x44,0x44,0xcc,0x88}, {0x17,0x17,0x39,0x2e}, + {0xc4,0xc4,0x57,0x93}, {0xa7,0xa7,0xf2,0x55}, {0x7e,0x7e,0x82,0xfc}, {0x3d,0x3d,0x47,0x7a}, + {0x64,0x64,0xac,0xc8}, {0x5d,0x5d,0xe7,0xba}, {0x19,0x19,0x2b,0x32}, {0x73,0x73,0x95,0xe6}, + {0x60,0x60,0xa0,0xc0}, {0x81,0x81,0x98,0x19}, {0x4f,0x4f,0xd1,0x9e}, {0xdc,0xdc,0x7f,0xa3}, + {0x22,0x22,0x66,0x44}, {0x2a,0x2a,0x7e,0x54}, {0x90,0x90,0xab,0x3b}, {0x88,0x88,0x83,0x0b}, + {0x46,0x46,0xca,0x8c}, {0xee,0xee,0x29,0xc7}, {0xb8,0xb8,0xd3,0x6b}, {0x14,0x14,0x3c,0x28}, + {0xde,0xde,0x79,0xa7}, {0x5e,0x5e,0xe2,0xbc}, {0x0b,0x0b,0x1d,0x16}, {0xdb,0xdb,0x76,0xad}, + {0xe0,0xe0,0x3b,0xdb}, {0x32,0x32,0x56,0x64}, {0x3a,0x3a,0x4e,0x74}, {0x0a,0x0a,0x1e,0x14}, + {0x49,0x49,0xdb,0x92}, {0x06,0x06,0x0a,0x0c}, {0x24,0x24,0x6c,0x48}, {0x5c,0x5c,0xe4,0xb8}, + {0xc2,0xc2,0x5d,0x9f}, {0xd3,0xd3,0x6e,0xbd}, {0xac,0xac,0xef,0x43}, {0x62,0x62,0xa6,0xc4}, + {0x91,0x91,0xa8,0x39}, {0x95,0x95,0xa4,0x31}, {0xe4,0xe4,0x37,0xd3}, {0x79,0x79,0x8b,0xf2}, + {0xe7,0xe7,0x32,0xd5}, {0xc8,0xc8,0x43,0x8b}, {0x37,0x37,0x59,0x6e}, {0x6d,0x6d,0xb7,0xda}, + {0x8d,0x8d,0x8c,0x01}, {0xd5,0xd5,0x64,0xb1}, {0x4e,0x4e,0xd2,0x9c}, {0xa9,0xa9,0xe0,0x49}, + {0x6c,0x6c,0xb4,0xd8}, {0x56,0x56,0xfa,0xac}, {0xf4,0xf4,0x07,0xf3}, {0xea,0xea,0x25,0xcf}, + {0x65,0x65,0xaf,0xca}, {0x7a,0x7a,0x8e,0xf4}, {0xae,0xae,0xe9,0x47}, {0x08,0x08,0x18,0x10}, + {0xba,0xba,0xd5,0x6f}, {0x78,0x78,0x88,0xf0}, {0x25,0x25,0x6f,0x4a}, {0x2e,0x2e,0x72,0x5c}, + {0x1c,0x1c,0x24,0x38}, {0xa6,0xa6,0xf1,0x57}, {0xb4,0xb4,0xc7,0x73}, {0xc6,0xc6,0x51,0x97}, + {0xe8,0xe8,0x23,0xcb}, {0xdd,0xdd,0x7c,0xa1}, {0x74,0x74,0x9c,0xe8}, {0x1f,0x1f,0x21,0x3e}, + {0x4b,0x4b,0xdd,0x96}, {0xbd,0xbd,0xdc,0x61}, {0x8b,0x8b,0x86,0x0d}, {0x8a,0x8a,0x85,0x0f}, + {0x70,0x70,0x90,0xe0}, {0x3e,0x3e,0x42,0x7c}, {0xb5,0xb5,0xc4,0x71}, {0x66,0x66,0xaa,0xcc}, + {0x48,0x48,0xd8,0x90}, {0x03,0x03,0x05,0x06}, {0xf6,0xf6,0x01,0xf7}, {0x0e,0x0e,0x12,0x1c}, + {0x61,0x61,0xa3,0xc2}, {0x35,0x35,0x5f,0x6a}, {0x57,0x57,0xf9,0xae}, {0xb9,0xb9,0xd0,0x69}, + {0x86,0x86,0x91,0x17}, {0xc1,0xc1,0x58,0x99}, {0x1d,0x1d,0x27,0x3a}, {0x9e,0x9e,0xb9,0x27}, + {0xe1,0xe1,0x38,0xd9}, {0xf8,0xf8,0x13,0xeb}, {0x98,0x98,0xb3,0x2b}, {0x11,0x11,0x33,0x22}, + {0x69,0x69,0xbb,0xd2}, {0xd9,0xd9,0x70,0xa9}, {0x8e,0x8e,0x89,0x07}, {0x94,0x94,0xa7,0x33}, + {0x9b,0x9b,0xb6,0x2d}, {0x1e,0x1e,0x22,0x3c}, {0x87,0x87,0x92,0x15}, {0xe9,0xe9,0x20,0xc9}, + {0xce,0xce,0x49,0x87}, {0x55,0x55,0xff,0xaa}, {0x28,0x28,0x78,0x50}, {0xdf,0xdf,0x7a,0xa5}, + {0x8c,0x8c,0x8f,0x03}, {0xa1,0xa1,0xf8,0x59}, {0x89,0x89,0x80,0x09}, {0x0d,0x0d,0x17,0x1a}, + {0xbf,0xbf,0xda,0x65}, {0xe6,0xe6,0x31,0xd7}, {0x42,0x42,0xc6,0x84}, {0x68,0x68,0xb8,0xd0}, + {0x41,0x41,0xc3,0x82}, {0x99,0x99,0xb0,0x29}, {0x2d,0x2d,0x77,0x5a}, {0x0f,0x0f,0x11,0x1e}, {0xb0,0xb0,0xcb,0x7b}, {0x54,0x54,0xfc,0xa8}, {0xbb,0xbb,0xd6,0x6d}, {0x16,0x16,0x3a,0x2c} }; static UINT8 T5[256][4]= { - {0x51,0xf4,0xa7,0x50}, {0x7e,0x41,0x65,0x53}, {0x1a,0x17,0xa4,0xc3}, {0x3a,0x27,0x5e,0x96}, - {0x3b,0xab,0x6b,0xcb}, {0x1f,0x9d,0x45,0xf1}, {0xac,0xfa,0x58,0xab}, {0x4b,0xe3,0x03,0x93}, - {0x20,0x30,0xfa,0x55}, {0xad,0x76,0x6d,0xf6}, {0x88,0xcc,0x76,0x91}, {0xf5,0x02,0x4c,0x25}, - {0x4f,0xe5,0xd7,0xfc}, {0xc5,0x2a,0xcb,0xd7}, {0x26,0x35,0x44,0x80}, {0xb5,0x62,0xa3,0x8f}, - {0xde,0xb1,0x5a,0x49}, {0x25,0xba,0x1b,0x67}, {0x45,0xea,0x0e,0x98}, {0x5d,0xfe,0xc0,0xe1}, - {0xc3,0x2f,0x75,0x02}, {0x81,0x4c,0xf0,0x12}, {0x8d,0x46,0x97,0xa3}, {0x6b,0xd3,0xf9,0xc6}, - {0x03,0x8f,0x5f,0xe7}, {0x15,0x92,0x9c,0x95}, {0xbf,0x6d,0x7a,0xeb}, {0x95,0x52,0x59,0xda}, - {0xd4,0xbe,0x83,0x2d}, {0x58,0x74,0x21,0xd3}, {0x49,0xe0,0x69,0x29}, {0x8e,0xc9,0xc8,0x44}, - {0x75,0xc2,0x89,0x6a}, {0xf4,0x8e,0x79,0x78}, {0x99,0x58,0x3e,0x6b}, {0x27,0xb9,0x71,0xdd}, - {0xbe,0xe1,0x4f,0xb6}, {0xf0,0x88,0xad,0x17}, {0xc9,0x20,0xac,0x66}, {0x7d,0xce,0x3a,0xb4}, - {0x63,0xdf,0x4a,0x18}, {0xe5,0x1a,0x31,0x82}, {0x97,0x51,0x33,0x60}, {0x62,0x53,0x7f,0x45}, - {0xb1,0x64,0x77,0xe0}, {0xbb,0x6b,0xae,0x84}, {0xfe,0x81,0xa0,0x1c}, {0xf9,0x08,0x2b,0x94}, - {0x70,0x48,0x68,0x58}, {0x8f,0x45,0xfd,0x19}, {0x94,0xde,0x6c,0x87}, {0x52,0x7b,0xf8,0xb7}, - {0xab,0x73,0xd3,0x23}, {0x72,0x4b,0x02,0xe2}, {0xe3,0x1f,0x8f,0x57}, {0x66,0x55,0xab,0x2a}, - {0xb2,0xeb,0x28,0x07}, {0x2f,0xb5,0xc2,0x03}, {0x86,0xc5,0x7b,0x9a}, {0xd3,0x37,0x08,0xa5}, - {0x30,0x28,0x87,0xf2}, {0x23,0xbf,0xa5,0xb2}, {0x02,0x03,0x6a,0xba}, {0xed,0x16,0x82,0x5c}, - {0x8a,0xcf,0x1c,0x2b}, {0xa7,0x79,0xb4,0x92}, {0xf3,0x07,0xf2,0xf0}, {0x4e,0x69,0xe2,0xa1}, - {0x65,0xda,0xf4,0xcd}, {0x06,0x05,0xbe,0xd5}, {0xd1,0x34,0x62,0x1f}, {0xc4,0xa6,0xfe,0x8a}, - {0x34,0x2e,0x53,0x9d}, {0xa2,0xf3,0x55,0xa0}, {0x05,0x8a,0xe1,0x32}, {0xa4,0xf6,0xeb,0x75}, - {0x0b,0x83,0xec,0x39}, {0x40,0x60,0xef,0xaa}, {0x5e,0x71,0x9f,0x06}, {0xbd,0x6e,0x10,0x51}, - {0x3e,0x21,0x8a,0xf9}, {0x96,0xdd,0x06,0x3d}, {0xdd,0x3e,0x05,0xae}, {0x4d,0xe6,0xbd,0x46}, - {0x91,0x54,0x8d,0xb5}, {0x71,0xc4,0x5d,0x05}, {0x04,0x06,0xd4,0x6f}, {0x60,0x50,0x15,0xff}, - {0x19,0x98,0xfb,0x24}, {0xd6,0xbd,0xe9,0x97}, {0x89,0x40,0x43,0xcc}, {0x67,0xd9,0x9e,0x77}, - {0xb0,0xe8,0x42,0xbd}, {0x07,0x89,0x8b,0x88}, {0xe7,0x19,0x5b,0x38}, {0x79,0xc8,0xee,0xdb}, - {0xa1,0x7c,0x0a,0x47}, {0x7c,0x42,0x0f,0xe9}, {0xf8,0x84,0x1e,0xc9}, {0x00,0x00,0x00,0x00}, - {0x09,0x80,0x86,0x83}, {0x32,0x2b,0xed,0x48}, {0x1e,0x11,0x70,0xac}, {0x6c,0x5a,0x72,0x4e}, - {0xfd,0x0e,0xff,0xfb}, {0x0f,0x85,0x38,0x56}, {0x3d,0xae,0xd5,0x1e}, {0x36,0x2d,0x39,0x27}, - {0x0a,0x0f,0xd9,0x64}, {0x68,0x5c,0xa6,0x21}, {0x9b,0x5b,0x54,0xd1}, {0x24,0x36,0x2e,0x3a}, - {0x0c,0x0a,0x67,0xb1}, {0x93,0x57,0xe7,0x0f}, {0xb4,0xee,0x96,0xd2}, {0x1b,0x9b,0x91,0x9e}, - {0x80,0xc0,0xc5,0x4f}, {0x61,0xdc,0x20,0xa2}, {0x5a,0x77,0x4b,0x69}, {0x1c,0x12,0x1a,0x16}, - {0xe2,0x93,0xba,0x0a}, {0xc0,0xa0,0x2a,0xe5}, {0x3c,0x22,0xe0,0x43}, {0x12,0x1b,0x17,0x1d}, - {0x0e,0x09,0x0d,0x0b}, {0xf2,0x8b,0xc7,0xad}, {0x2d,0xb6,0xa8,0xb9}, {0x14,0x1e,0xa9,0xc8}, - {0x57,0xf1,0x19,0x85}, {0xaf,0x75,0x07,0x4c}, {0xee,0x99,0xdd,0xbb}, {0xa3,0x7f,0x60,0xfd}, - {0xf7,0x01,0x26,0x9f}, {0x5c,0x72,0xf5,0xbc}, {0x44,0x66,0x3b,0xc5}, {0x5b,0xfb,0x7e,0x34}, - {0x8b,0x43,0x29,0x76}, {0xcb,0x23,0xc6,0xdc}, {0xb6,0xed,0xfc,0x68}, {0xb8,0xe4,0xf1,0x63}, - {0xd7,0x31,0xdc,0xca}, {0x42,0x63,0x85,0x10}, {0x13,0x97,0x22,0x40}, {0x84,0xc6,0x11,0x20}, - {0x85,0x4a,0x24,0x7d}, {0xd2,0xbb,0x3d,0xf8}, {0xae,0xf9,0x32,0x11}, {0xc7,0x29,0xa1,0x6d}, - {0x1d,0x9e,0x2f,0x4b}, {0xdc,0xb2,0x30,0xf3}, {0x0d,0x86,0x52,0xec}, {0x77,0xc1,0xe3,0xd0}, - {0x2b,0xb3,0x16,0x6c}, {0xa9,0x70,0xb9,0x99}, {0x11,0x94,0x48,0xfa}, {0x47,0xe9,0x64,0x22}, - {0xa8,0xfc,0x8c,0xc4}, {0xa0,0xf0,0x3f,0x1a}, {0x56,0x7d,0x2c,0xd8}, {0x22,0x33,0x90,0xef}, - {0x87,0x49,0x4e,0xc7}, {0xd9,0x38,0xd1,0xc1}, {0x8c,0xca,0xa2,0xfe}, {0x98,0xd4,0x0b,0x36}, - {0xa6,0xf5,0x81,0xcf}, {0xa5,0x7a,0xde,0x28}, {0xda,0xb7,0x8e,0x26}, {0x3f,0xad,0xbf,0xa4}, - {0x2c,0x3a,0x9d,0xe4}, {0x50,0x78,0x92,0x0d}, {0x6a,0x5f,0xcc,0x9b}, {0x54,0x7e,0x46,0x62}, - {0xf6,0x8d,0x13,0xc2}, {0x90,0xd8,0xb8,0xe8}, {0x2e,0x39,0xf7,0x5e}, {0x82,0xc3,0xaf,0xf5}, - {0x9f,0x5d,0x80,0xbe}, {0x69,0xd0,0x93,0x7c}, {0x6f,0xd5,0x2d,0xa9}, {0xcf,0x25,0x12,0xb3}, - {0xc8,0xac,0x99,0x3b}, {0x10,0x18,0x7d,0xa7}, {0xe8,0x9c,0x63,0x6e}, {0xdb,0x3b,0xbb,0x7b}, - {0xcd,0x26,0x78,0x09}, {0x6e,0x59,0x18,0xf4}, {0xec,0x9a,0xb7,0x01}, {0x83,0x4f,0x9a,0xa8}, - {0xe6,0x95,0x6e,0x65}, {0xaa,0xff,0xe6,0x7e}, {0x21,0xbc,0xcf,0x08}, {0xef,0x15,0xe8,0xe6}, - {0xba,0xe7,0x9b,0xd9}, {0x4a,0x6f,0x36,0xce}, {0xea,0x9f,0x09,0xd4}, {0x29,0xb0,0x7c,0xd6}, - {0x31,0xa4,0xb2,0xaf}, {0x2a,0x3f,0x23,0x31}, {0xc6,0xa5,0x94,0x30}, {0x35,0xa2,0x66,0xc0}, - {0x74,0x4e,0xbc,0x37}, {0xfc,0x82,0xca,0xa6}, {0xe0,0x90,0xd0,0xb0}, {0x33,0xa7,0xd8,0x15}, - {0xf1,0x04,0x98,0x4a}, {0x41,0xec,0xda,0xf7}, {0x7f,0xcd,0x50,0x0e}, {0x17,0x91,0xf6,0x2f}, - {0x76,0x4d,0xd6,0x8d}, {0x43,0xef,0xb0,0x4d}, {0xcc,0xaa,0x4d,0x54}, {0xe4,0x96,0x04,0xdf}, - {0x9e,0xd1,0xb5,0xe3}, {0x4c,0x6a,0x88,0x1b}, {0xc1,0x2c,0x1f,0xb8}, {0x46,0x65,0x51,0x7f}, - {0x9d,0x5e,0xea,0x04}, {0x01,0x8c,0x35,0x5d}, {0xfa,0x87,0x74,0x73}, {0xfb,0x0b,0x41,0x2e}, - {0xb3,0x67,0x1d,0x5a}, {0x92,0xdb,0xd2,0x52}, {0xe9,0x10,0x56,0x33}, {0x6d,0xd6,0x47,0x13}, - {0x9a,0xd7,0x61,0x8c}, {0x37,0xa1,0x0c,0x7a}, {0x59,0xf8,0x14,0x8e}, {0xeb,0x13,0x3c,0x89}, - {0xce,0xa9,0x27,0xee}, {0xb7,0x61,0xc9,0x35}, {0xe1,0x1c,0xe5,0xed}, {0x7a,0x47,0xb1,0x3c}, - {0x9c,0xd2,0xdf,0x59}, {0x55,0xf2,0x73,0x3f}, {0x18,0x14,0xce,0x79}, {0x73,0xc7,0x37,0xbf}, - {0x53,0xf7,0xcd,0xea}, {0x5f,0xfd,0xaa,0x5b}, {0xdf,0x3d,0x6f,0x14}, {0x78,0x44,0xdb,0x86}, - {0xca,0xaf,0xf3,0x81}, {0xb9,0x68,0xc4,0x3e}, {0x38,0x24,0x34,0x2c}, {0xc2,0xa3,0x40,0x5f}, - {0x16,0x1d,0xc3,0x72}, {0xbc,0xe2,0x25,0x0c}, {0x28,0x3c,0x49,0x8b}, {0xff,0x0d,0x95,0x41}, - {0x39,0xa8,0x01,0x71}, {0x08,0x0c,0xb3,0xde}, {0xd8,0xb4,0xe4,0x9c}, {0x64,0x56,0xc1,0x90}, + {0x51,0xf4,0xa7,0x50}, {0x7e,0x41,0x65,0x53}, {0x1a,0x17,0xa4,0xc3}, {0x3a,0x27,0x5e,0x96}, + {0x3b,0xab,0x6b,0xcb}, {0x1f,0x9d,0x45,0xf1}, {0xac,0xfa,0x58,0xab}, {0x4b,0xe3,0x03,0x93}, + {0x20,0x30,0xfa,0x55}, {0xad,0x76,0x6d,0xf6}, {0x88,0xcc,0x76,0x91}, {0xf5,0x02,0x4c,0x25}, + {0x4f,0xe5,0xd7,0xfc}, {0xc5,0x2a,0xcb,0xd7}, {0x26,0x35,0x44,0x80}, {0xb5,0x62,0xa3,0x8f}, + {0xde,0xb1,0x5a,0x49}, {0x25,0xba,0x1b,0x67}, {0x45,0xea,0x0e,0x98}, {0x5d,0xfe,0xc0,0xe1}, + {0xc3,0x2f,0x75,0x02}, {0x81,0x4c,0xf0,0x12}, {0x8d,0x46,0x97,0xa3}, {0x6b,0xd3,0xf9,0xc6}, + {0x03,0x8f,0x5f,0xe7}, {0x15,0x92,0x9c,0x95}, {0xbf,0x6d,0x7a,0xeb}, {0x95,0x52,0x59,0xda}, + {0xd4,0xbe,0x83,0x2d}, {0x58,0x74,0x21,0xd3}, {0x49,0xe0,0x69,0x29}, {0x8e,0xc9,0xc8,0x44}, + {0x75,0xc2,0x89,0x6a}, {0xf4,0x8e,0x79,0x78}, {0x99,0x58,0x3e,0x6b}, {0x27,0xb9,0x71,0xdd}, + {0xbe,0xe1,0x4f,0xb6}, {0xf0,0x88,0xad,0x17}, {0xc9,0x20,0xac,0x66}, {0x7d,0xce,0x3a,0xb4}, + {0x63,0xdf,0x4a,0x18}, {0xe5,0x1a,0x31,0x82}, {0x97,0x51,0x33,0x60}, {0x62,0x53,0x7f,0x45}, + {0xb1,0x64,0x77,0xe0}, {0xbb,0x6b,0xae,0x84}, {0xfe,0x81,0xa0,0x1c}, {0xf9,0x08,0x2b,0x94}, + {0x70,0x48,0x68,0x58}, {0x8f,0x45,0xfd,0x19}, {0x94,0xde,0x6c,0x87}, {0x52,0x7b,0xf8,0xb7}, + {0xab,0x73,0xd3,0x23}, {0x72,0x4b,0x02,0xe2}, {0xe3,0x1f,0x8f,0x57}, {0x66,0x55,0xab,0x2a}, + {0xb2,0xeb,0x28,0x07}, {0x2f,0xb5,0xc2,0x03}, {0x86,0xc5,0x7b,0x9a}, {0xd3,0x37,0x08,0xa5}, + {0x30,0x28,0x87,0xf2}, {0x23,0xbf,0xa5,0xb2}, {0x02,0x03,0x6a,0xba}, {0xed,0x16,0x82,0x5c}, + {0x8a,0xcf,0x1c,0x2b}, {0xa7,0x79,0xb4,0x92}, {0xf3,0x07,0xf2,0xf0}, {0x4e,0x69,0xe2,0xa1}, + {0x65,0xda,0xf4,0xcd}, {0x06,0x05,0xbe,0xd5}, {0xd1,0x34,0x62,0x1f}, {0xc4,0xa6,0xfe,0x8a}, + {0x34,0x2e,0x53,0x9d}, {0xa2,0xf3,0x55,0xa0}, {0x05,0x8a,0xe1,0x32}, {0xa4,0xf6,0xeb,0x75}, + {0x0b,0x83,0xec,0x39}, {0x40,0x60,0xef,0xaa}, {0x5e,0x71,0x9f,0x06}, {0xbd,0x6e,0x10,0x51}, + {0x3e,0x21,0x8a,0xf9}, {0x96,0xdd,0x06,0x3d}, {0xdd,0x3e,0x05,0xae}, {0x4d,0xe6,0xbd,0x46}, + {0x91,0x54,0x8d,0xb5}, {0x71,0xc4,0x5d,0x05}, {0x04,0x06,0xd4,0x6f}, {0x60,0x50,0x15,0xff}, + {0x19,0x98,0xfb,0x24}, {0xd6,0xbd,0xe9,0x97}, {0x89,0x40,0x43,0xcc}, {0x67,0xd9,0x9e,0x77}, + {0xb0,0xe8,0x42,0xbd}, {0x07,0x89,0x8b,0x88}, {0xe7,0x19,0x5b,0x38}, {0x79,0xc8,0xee,0xdb}, + {0xa1,0x7c,0x0a,0x47}, {0x7c,0x42,0x0f,0xe9}, {0xf8,0x84,0x1e,0xc9}, {0x00,0x00,0x00,0x00}, + {0x09,0x80,0x86,0x83}, {0x32,0x2b,0xed,0x48}, {0x1e,0x11,0x70,0xac}, {0x6c,0x5a,0x72,0x4e}, + {0xfd,0x0e,0xff,0xfb}, {0x0f,0x85,0x38,0x56}, {0x3d,0xae,0xd5,0x1e}, {0x36,0x2d,0x39,0x27}, + {0x0a,0x0f,0xd9,0x64}, {0x68,0x5c,0xa6,0x21}, {0x9b,0x5b,0x54,0xd1}, {0x24,0x36,0x2e,0x3a}, + {0x0c,0x0a,0x67,0xb1}, {0x93,0x57,0xe7,0x0f}, {0xb4,0xee,0x96,0xd2}, {0x1b,0x9b,0x91,0x9e}, + {0x80,0xc0,0xc5,0x4f}, {0x61,0xdc,0x20,0xa2}, {0x5a,0x77,0x4b,0x69}, {0x1c,0x12,0x1a,0x16}, + {0xe2,0x93,0xba,0x0a}, {0xc0,0xa0,0x2a,0xe5}, {0x3c,0x22,0xe0,0x43}, {0x12,0x1b,0x17,0x1d}, + {0x0e,0x09,0x0d,0x0b}, {0xf2,0x8b,0xc7,0xad}, {0x2d,0xb6,0xa8,0xb9}, {0x14,0x1e,0xa9,0xc8}, + {0x57,0xf1,0x19,0x85}, {0xaf,0x75,0x07,0x4c}, {0xee,0x99,0xdd,0xbb}, {0xa3,0x7f,0x60,0xfd}, + {0xf7,0x01,0x26,0x9f}, {0x5c,0x72,0xf5,0xbc}, {0x44,0x66,0x3b,0xc5}, {0x5b,0xfb,0x7e,0x34}, + {0x8b,0x43,0x29,0x76}, {0xcb,0x23,0xc6,0xdc}, {0xb6,0xed,0xfc,0x68}, {0xb8,0xe4,0xf1,0x63}, + {0xd7,0x31,0xdc,0xca}, {0x42,0x63,0x85,0x10}, {0x13,0x97,0x22,0x40}, {0x84,0xc6,0x11,0x20}, + {0x85,0x4a,0x24,0x7d}, {0xd2,0xbb,0x3d,0xf8}, {0xae,0xf9,0x32,0x11}, {0xc7,0x29,0xa1,0x6d}, + {0x1d,0x9e,0x2f,0x4b}, {0xdc,0xb2,0x30,0xf3}, {0x0d,0x86,0x52,0xec}, {0x77,0xc1,0xe3,0xd0}, + {0x2b,0xb3,0x16,0x6c}, {0xa9,0x70,0xb9,0x99}, {0x11,0x94,0x48,0xfa}, {0x47,0xe9,0x64,0x22}, + {0xa8,0xfc,0x8c,0xc4}, {0xa0,0xf0,0x3f,0x1a}, {0x56,0x7d,0x2c,0xd8}, {0x22,0x33,0x90,0xef}, + {0x87,0x49,0x4e,0xc7}, {0xd9,0x38,0xd1,0xc1}, {0x8c,0xca,0xa2,0xfe}, {0x98,0xd4,0x0b,0x36}, + {0xa6,0xf5,0x81,0xcf}, {0xa5,0x7a,0xde,0x28}, {0xda,0xb7,0x8e,0x26}, {0x3f,0xad,0xbf,0xa4}, + {0x2c,0x3a,0x9d,0xe4}, {0x50,0x78,0x92,0x0d}, {0x6a,0x5f,0xcc,0x9b}, {0x54,0x7e,0x46,0x62}, + {0xf6,0x8d,0x13,0xc2}, {0x90,0xd8,0xb8,0xe8}, {0x2e,0x39,0xf7,0x5e}, {0x82,0xc3,0xaf,0xf5}, + {0x9f,0x5d,0x80,0xbe}, {0x69,0xd0,0x93,0x7c}, {0x6f,0xd5,0x2d,0xa9}, {0xcf,0x25,0x12,0xb3}, + {0xc8,0xac,0x99,0x3b}, {0x10,0x18,0x7d,0xa7}, {0xe8,0x9c,0x63,0x6e}, {0xdb,0x3b,0xbb,0x7b}, + {0xcd,0x26,0x78,0x09}, {0x6e,0x59,0x18,0xf4}, {0xec,0x9a,0xb7,0x01}, {0x83,0x4f,0x9a,0xa8}, + {0xe6,0x95,0x6e,0x65}, {0xaa,0xff,0xe6,0x7e}, {0x21,0xbc,0xcf,0x08}, {0xef,0x15,0xe8,0xe6}, + {0xba,0xe7,0x9b,0xd9}, {0x4a,0x6f,0x36,0xce}, {0xea,0x9f,0x09,0xd4}, {0x29,0xb0,0x7c,0xd6}, + {0x31,0xa4,0xb2,0xaf}, {0x2a,0x3f,0x23,0x31}, {0xc6,0xa5,0x94,0x30}, {0x35,0xa2,0x66,0xc0}, + {0x74,0x4e,0xbc,0x37}, {0xfc,0x82,0xca,0xa6}, {0xe0,0x90,0xd0,0xb0}, {0x33,0xa7,0xd8,0x15}, + {0xf1,0x04,0x98,0x4a}, {0x41,0xec,0xda,0xf7}, {0x7f,0xcd,0x50,0x0e}, {0x17,0x91,0xf6,0x2f}, + {0x76,0x4d,0xd6,0x8d}, {0x43,0xef,0xb0,0x4d}, {0xcc,0xaa,0x4d,0x54}, {0xe4,0x96,0x04,0xdf}, + {0x9e,0xd1,0xb5,0xe3}, {0x4c,0x6a,0x88,0x1b}, {0xc1,0x2c,0x1f,0xb8}, {0x46,0x65,0x51,0x7f}, + {0x9d,0x5e,0xea,0x04}, {0x01,0x8c,0x35,0x5d}, {0xfa,0x87,0x74,0x73}, {0xfb,0x0b,0x41,0x2e}, + {0xb3,0x67,0x1d,0x5a}, {0x92,0xdb,0xd2,0x52}, {0xe9,0x10,0x56,0x33}, {0x6d,0xd6,0x47,0x13}, + {0x9a,0xd7,0x61,0x8c}, {0x37,0xa1,0x0c,0x7a}, {0x59,0xf8,0x14,0x8e}, {0xeb,0x13,0x3c,0x89}, + {0xce,0xa9,0x27,0xee}, {0xb7,0x61,0xc9,0x35}, {0xe1,0x1c,0xe5,0xed}, {0x7a,0x47,0xb1,0x3c}, + {0x9c,0xd2,0xdf,0x59}, {0x55,0xf2,0x73,0x3f}, {0x18,0x14,0xce,0x79}, {0x73,0xc7,0x37,0xbf}, + {0x53,0xf7,0xcd,0xea}, {0x5f,0xfd,0xaa,0x5b}, {0xdf,0x3d,0x6f,0x14}, {0x78,0x44,0xdb,0x86}, + {0xca,0xaf,0xf3,0x81}, {0xb9,0x68,0xc4,0x3e}, {0x38,0x24,0x34,0x2c}, {0xc2,0xa3,0x40,0x5f}, + {0x16,0x1d,0xc3,0x72}, {0xbc,0xe2,0x25,0x0c}, {0x28,0x3c,0x49,0x8b}, {0xff,0x0d,0x95,0x41}, + {0x39,0xa8,0x01,0x71}, {0x08,0x0c,0xb3,0xde}, {0xd8,0xb4,0xe4,0x9c}, {0x64,0x56,0xc1,0x90}, {0x7b,0xcb,0x84,0x61}, {0xd5,0x32,0xb6,0x70}, {0x48,0x6c,0x5c,0x74}, {0xd0,0xb8,0x57,0x42} }; static UINT8 T6[256][4]= { - {0x50,0x51,0xf4,0xa7}, {0x53,0x7e,0x41,0x65}, {0xc3,0x1a,0x17,0xa4}, {0x96,0x3a,0x27,0x5e}, - {0xcb,0x3b,0xab,0x6b}, {0xf1,0x1f,0x9d,0x45}, {0xab,0xac,0xfa,0x58}, {0x93,0x4b,0xe3,0x03}, - {0x55,0x20,0x30,0xfa}, {0xf6,0xad,0x76,0x6d}, {0x91,0x88,0xcc,0x76}, {0x25,0xf5,0x02,0x4c}, - {0xfc,0x4f,0xe5,0xd7}, {0xd7,0xc5,0x2a,0xcb}, {0x80,0x26,0x35,0x44}, {0x8f,0xb5,0x62,0xa3}, - {0x49,0xde,0xb1,0x5a}, {0x67,0x25,0xba,0x1b}, {0x98,0x45,0xea,0x0e}, {0xe1,0x5d,0xfe,0xc0}, - {0x02,0xc3,0x2f,0x75}, {0x12,0x81,0x4c,0xf0}, {0xa3,0x8d,0x46,0x97}, {0xc6,0x6b,0xd3,0xf9}, - {0xe7,0x03,0x8f,0x5f}, {0x95,0x15,0x92,0x9c}, {0xeb,0xbf,0x6d,0x7a}, {0xda,0x95,0x52,0x59}, - {0x2d,0xd4,0xbe,0x83}, {0xd3,0x58,0x74,0x21}, {0x29,0x49,0xe0,0x69}, {0x44,0x8e,0xc9,0xc8}, - {0x6a,0x75,0xc2,0x89}, {0x78,0xf4,0x8e,0x79}, {0x6b,0x99,0x58,0x3e}, {0xdd,0x27,0xb9,0x71}, - {0xb6,0xbe,0xe1,0x4f}, {0x17,0xf0,0x88,0xad}, {0x66,0xc9,0x20,0xac}, {0xb4,0x7d,0xce,0x3a}, - {0x18,0x63,0xdf,0x4a}, {0x82,0xe5,0x1a,0x31}, {0x60,0x97,0x51,0x33}, {0x45,0x62,0x53,0x7f}, - {0xe0,0xb1,0x64,0x77}, {0x84,0xbb,0x6b,0xae}, {0x1c,0xfe,0x81,0xa0}, {0x94,0xf9,0x08,0x2b}, - {0x58,0x70,0x48,0x68}, {0x19,0x8f,0x45,0xfd}, {0x87,0x94,0xde,0x6c}, {0xb7,0x52,0x7b,0xf8}, - {0x23,0xab,0x73,0xd3}, {0xe2,0x72,0x4b,0x02}, {0x57,0xe3,0x1f,0x8f}, {0x2a,0x66,0x55,0xab}, - {0x07,0xb2,0xeb,0x28}, {0x03,0x2f,0xb5,0xc2}, {0x9a,0x86,0xc5,0x7b}, {0xa5,0xd3,0x37,0x08}, - {0xf2,0x30,0x28,0x87}, {0xb2,0x23,0xbf,0xa5}, {0xba,0x02,0x03,0x6a}, {0x5c,0xed,0x16,0x82}, - {0x2b,0x8a,0xcf,0x1c}, {0x92,0xa7,0x79,0xb4}, {0xf0,0xf3,0x07,0xf2}, {0xa1,0x4e,0x69,0xe2}, - {0xcd,0x65,0xda,0xf4}, {0xd5,0x06,0x05,0xbe}, {0x1f,0xd1,0x34,0x62}, {0x8a,0xc4,0xa6,0xfe}, - {0x9d,0x34,0x2e,0x53}, {0xa0,0xa2,0xf3,0x55}, {0x32,0x05,0x8a,0xe1}, {0x75,0xa4,0xf6,0xeb}, - {0x39,0x0b,0x83,0xec}, {0xaa,0x40,0x60,0xef}, {0x06,0x5e,0x71,0x9f}, {0x51,0xbd,0x6e,0x10}, - {0xf9,0x3e,0x21,0x8a}, {0x3d,0x96,0xdd,0x06}, {0xae,0xdd,0x3e,0x05}, {0x46,0x4d,0xe6,0xbd}, - {0xb5,0x91,0x54,0x8d}, {0x05,0x71,0xc4,0x5d}, {0x6f,0x04,0x06,0xd4}, {0xff,0x60,0x50,0x15}, - {0x24,0x19,0x98,0xfb}, {0x97,0xd6,0xbd,0xe9}, {0xcc,0x89,0x40,0x43}, {0x77,0x67,0xd9,0x9e}, - {0xbd,0xb0,0xe8,0x42}, {0x88,0x07,0x89,0x8b}, {0x38,0xe7,0x19,0x5b}, {0xdb,0x79,0xc8,0xee}, - {0x47,0xa1,0x7c,0x0a}, {0xe9,0x7c,0x42,0x0f}, {0xc9,0xf8,0x84,0x1e}, {0x00,0x00,0x00,0x00}, - {0x83,0x09,0x80,0x86}, {0x48,0x32,0x2b,0xed}, {0xac,0x1e,0x11,0x70}, {0x4e,0x6c,0x5a,0x72}, - {0xfb,0xfd,0x0e,0xff}, {0x56,0x0f,0x85,0x38}, {0x1e,0x3d,0xae,0xd5}, {0x27,0x36,0x2d,0x39}, - {0x64,0x0a,0x0f,0xd9}, {0x21,0x68,0x5c,0xa6}, {0xd1,0x9b,0x5b,0x54}, {0x3a,0x24,0x36,0x2e}, - {0xb1,0x0c,0x0a,0x67}, {0x0f,0x93,0x57,0xe7}, {0xd2,0xb4,0xee,0x96}, {0x9e,0x1b,0x9b,0x91}, - {0x4f,0x80,0xc0,0xc5}, {0xa2,0x61,0xdc,0x20}, {0x69,0x5a,0x77,0x4b}, {0x16,0x1c,0x12,0x1a}, - {0x0a,0xe2,0x93,0xba}, {0xe5,0xc0,0xa0,0x2a}, {0x43,0x3c,0x22,0xe0}, {0x1d,0x12,0x1b,0x17}, - {0x0b,0x0e,0x09,0x0d}, {0xad,0xf2,0x8b,0xc7}, {0xb9,0x2d,0xb6,0xa8}, {0xc8,0x14,0x1e,0xa9}, - {0x85,0x57,0xf1,0x19}, {0x4c,0xaf,0x75,0x07}, {0xbb,0xee,0x99,0xdd}, {0xfd,0xa3,0x7f,0x60}, - {0x9f,0xf7,0x01,0x26}, {0xbc,0x5c,0x72,0xf5}, {0xc5,0x44,0x66,0x3b}, {0x34,0x5b,0xfb,0x7e}, - {0x76,0x8b,0x43,0x29}, {0xdc,0xcb,0x23,0xc6}, {0x68,0xb6,0xed,0xfc}, {0x63,0xb8,0xe4,0xf1}, - {0xca,0xd7,0x31,0xdc}, {0x10,0x42,0x63,0x85}, {0x40,0x13,0x97,0x22}, {0x20,0x84,0xc6,0x11}, - {0x7d,0x85,0x4a,0x24}, {0xf8,0xd2,0xbb,0x3d}, {0x11,0xae,0xf9,0x32}, {0x6d,0xc7,0x29,0xa1}, - {0x4b,0x1d,0x9e,0x2f}, {0xf3,0xdc,0xb2,0x30}, {0xec,0x0d,0x86,0x52}, {0xd0,0x77,0xc1,0xe3}, - {0x6c,0x2b,0xb3,0x16}, {0x99,0xa9,0x70,0xb9}, {0xfa,0x11,0x94,0x48}, {0x22,0x47,0xe9,0x64}, - {0xc4,0xa8,0xfc,0x8c}, {0x1a,0xa0,0xf0,0x3f}, {0xd8,0x56,0x7d,0x2c}, {0xef,0x22,0x33,0x90}, - {0xc7,0x87,0x49,0x4e}, {0xc1,0xd9,0x38,0xd1}, {0xfe,0x8c,0xca,0xa2}, {0x36,0x98,0xd4,0x0b}, - {0xcf,0xa6,0xf5,0x81}, {0x28,0xa5,0x7a,0xde}, {0x26,0xda,0xb7,0x8e}, {0xa4,0x3f,0xad,0xbf}, - {0xe4,0x2c,0x3a,0x9d}, {0x0d,0x50,0x78,0x92}, {0x9b,0x6a,0x5f,0xcc}, {0x62,0x54,0x7e,0x46}, - {0xc2,0xf6,0x8d,0x13}, {0xe8,0x90,0xd8,0xb8}, {0x5e,0x2e,0x39,0xf7}, {0xf5,0x82,0xc3,0xaf}, - {0xbe,0x9f,0x5d,0x80}, {0x7c,0x69,0xd0,0x93}, {0xa9,0x6f,0xd5,0x2d}, {0xb3,0xcf,0x25,0x12}, - {0x3b,0xc8,0xac,0x99}, {0xa7,0x10,0x18,0x7d}, {0x6e,0xe8,0x9c,0x63}, {0x7b,0xdb,0x3b,0xbb}, - {0x09,0xcd,0x26,0x78}, {0xf4,0x6e,0x59,0x18}, {0x01,0xec,0x9a,0xb7}, {0xa8,0x83,0x4f,0x9a}, - {0x65,0xe6,0x95,0x6e}, {0x7e,0xaa,0xff,0xe6}, {0x08,0x21,0xbc,0xcf}, {0xe6,0xef,0x15,0xe8}, - {0xd9,0xba,0xe7,0x9b}, {0xce,0x4a,0x6f,0x36}, {0xd4,0xea,0x9f,0x09}, {0xd6,0x29,0xb0,0x7c}, - {0xaf,0x31,0xa4,0xb2}, {0x31,0x2a,0x3f,0x23}, {0x30,0xc6,0xa5,0x94}, {0xc0,0x35,0xa2,0x66}, - {0x37,0x74,0x4e,0xbc}, {0xa6,0xfc,0x82,0xca}, {0xb0,0xe0,0x90,0xd0}, {0x15,0x33,0xa7,0xd8}, - {0x4a,0xf1,0x04,0x98}, {0xf7,0x41,0xec,0xda}, {0x0e,0x7f,0xcd,0x50}, {0x2f,0x17,0x91,0xf6}, - {0x8d,0x76,0x4d,0xd6}, {0x4d,0x43,0xef,0xb0}, {0x54,0xcc,0xaa,0x4d}, {0xdf,0xe4,0x96,0x04}, - {0xe3,0x9e,0xd1,0xb5}, {0x1b,0x4c,0x6a,0x88}, {0xb8,0xc1,0x2c,0x1f}, {0x7f,0x46,0x65,0x51}, - {0x04,0x9d,0x5e,0xea}, {0x5d,0x01,0x8c,0x35}, {0x73,0xfa,0x87,0x74}, {0x2e,0xfb,0x0b,0x41}, - {0x5a,0xb3,0x67,0x1d}, {0x52,0x92,0xdb,0xd2}, {0x33,0xe9,0x10,0x56}, {0x13,0x6d,0xd6,0x47}, - {0x8c,0x9a,0xd7,0x61}, {0x7a,0x37,0xa1,0x0c}, {0x8e,0x59,0xf8,0x14}, {0x89,0xeb,0x13,0x3c}, - {0xee,0xce,0xa9,0x27}, {0x35,0xb7,0x61,0xc9}, {0xed,0xe1,0x1c,0xe5}, {0x3c,0x7a,0x47,0xb1}, - {0x59,0x9c,0xd2,0xdf}, {0x3f,0x55,0xf2,0x73}, {0x79,0x18,0x14,0xce}, {0xbf,0x73,0xc7,0x37}, - {0xea,0x53,0xf7,0xcd}, {0x5b,0x5f,0xfd,0xaa}, {0x14,0xdf,0x3d,0x6f}, {0x86,0x78,0x44,0xdb}, - {0x81,0xca,0xaf,0xf3}, {0x3e,0xb9,0x68,0xc4}, {0x2c,0x38,0x24,0x34}, {0x5f,0xc2,0xa3,0x40}, - {0x72,0x16,0x1d,0xc3}, {0x0c,0xbc,0xe2,0x25}, {0x8b,0x28,0x3c,0x49}, {0x41,0xff,0x0d,0x95}, - {0x71,0x39,0xa8,0x01}, {0xde,0x08,0x0c,0xb3}, {0x9c,0xd8,0xb4,0xe4}, {0x90,0x64,0x56,0xc1}, + {0x50,0x51,0xf4,0xa7}, {0x53,0x7e,0x41,0x65}, {0xc3,0x1a,0x17,0xa4}, {0x96,0x3a,0x27,0x5e}, + {0xcb,0x3b,0xab,0x6b}, {0xf1,0x1f,0x9d,0x45}, {0xab,0xac,0xfa,0x58}, {0x93,0x4b,0xe3,0x03}, + {0x55,0x20,0x30,0xfa}, {0xf6,0xad,0x76,0x6d}, {0x91,0x88,0xcc,0x76}, {0x25,0xf5,0x02,0x4c}, + {0xfc,0x4f,0xe5,0xd7}, {0xd7,0xc5,0x2a,0xcb}, {0x80,0x26,0x35,0x44}, {0x8f,0xb5,0x62,0xa3}, + {0x49,0xde,0xb1,0x5a}, {0x67,0x25,0xba,0x1b}, {0x98,0x45,0xea,0x0e}, {0xe1,0x5d,0xfe,0xc0}, + {0x02,0xc3,0x2f,0x75}, {0x12,0x81,0x4c,0xf0}, {0xa3,0x8d,0x46,0x97}, {0xc6,0x6b,0xd3,0xf9}, + {0xe7,0x03,0x8f,0x5f}, {0x95,0x15,0x92,0x9c}, {0xeb,0xbf,0x6d,0x7a}, {0xda,0x95,0x52,0x59}, + {0x2d,0xd4,0xbe,0x83}, {0xd3,0x58,0x74,0x21}, {0x29,0x49,0xe0,0x69}, {0x44,0x8e,0xc9,0xc8}, + {0x6a,0x75,0xc2,0x89}, {0x78,0xf4,0x8e,0x79}, {0x6b,0x99,0x58,0x3e}, {0xdd,0x27,0xb9,0x71}, + {0xb6,0xbe,0xe1,0x4f}, {0x17,0xf0,0x88,0xad}, {0x66,0xc9,0x20,0xac}, {0xb4,0x7d,0xce,0x3a}, + {0x18,0x63,0xdf,0x4a}, {0x82,0xe5,0x1a,0x31}, {0x60,0x97,0x51,0x33}, {0x45,0x62,0x53,0x7f}, + {0xe0,0xb1,0x64,0x77}, {0x84,0xbb,0x6b,0xae}, {0x1c,0xfe,0x81,0xa0}, {0x94,0xf9,0x08,0x2b}, + {0x58,0x70,0x48,0x68}, {0x19,0x8f,0x45,0xfd}, {0x87,0x94,0xde,0x6c}, {0xb7,0x52,0x7b,0xf8}, + {0x23,0xab,0x73,0xd3}, {0xe2,0x72,0x4b,0x02}, {0x57,0xe3,0x1f,0x8f}, {0x2a,0x66,0x55,0xab}, + {0x07,0xb2,0xeb,0x28}, {0x03,0x2f,0xb5,0xc2}, {0x9a,0x86,0xc5,0x7b}, {0xa5,0xd3,0x37,0x08}, + {0xf2,0x30,0x28,0x87}, {0xb2,0x23,0xbf,0xa5}, {0xba,0x02,0x03,0x6a}, {0x5c,0xed,0x16,0x82}, + {0x2b,0x8a,0xcf,0x1c}, {0x92,0xa7,0x79,0xb4}, {0xf0,0xf3,0x07,0xf2}, {0xa1,0x4e,0x69,0xe2}, + {0xcd,0x65,0xda,0xf4}, {0xd5,0x06,0x05,0xbe}, {0x1f,0xd1,0x34,0x62}, {0x8a,0xc4,0xa6,0xfe}, + {0x9d,0x34,0x2e,0x53}, {0xa0,0xa2,0xf3,0x55}, {0x32,0x05,0x8a,0xe1}, {0x75,0xa4,0xf6,0xeb}, + {0x39,0x0b,0x83,0xec}, {0xaa,0x40,0x60,0xef}, {0x06,0x5e,0x71,0x9f}, {0x51,0xbd,0x6e,0x10}, + {0xf9,0x3e,0x21,0x8a}, {0x3d,0x96,0xdd,0x06}, {0xae,0xdd,0x3e,0x05}, {0x46,0x4d,0xe6,0xbd}, + {0xb5,0x91,0x54,0x8d}, {0x05,0x71,0xc4,0x5d}, {0x6f,0x04,0x06,0xd4}, {0xff,0x60,0x50,0x15}, + {0x24,0x19,0x98,0xfb}, {0x97,0xd6,0xbd,0xe9}, {0xcc,0x89,0x40,0x43}, {0x77,0x67,0xd9,0x9e}, + {0xbd,0xb0,0xe8,0x42}, {0x88,0x07,0x89,0x8b}, {0x38,0xe7,0x19,0x5b}, {0xdb,0x79,0xc8,0xee}, + {0x47,0xa1,0x7c,0x0a}, {0xe9,0x7c,0x42,0x0f}, {0xc9,0xf8,0x84,0x1e}, {0x00,0x00,0x00,0x00}, + {0x83,0x09,0x80,0x86}, {0x48,0x32,0x2b,0xed}, {0xac,0x1e,0x11,0x70}, {0x4e,0x6c,0x5a,0x72}, + {0xfb,0xfd,0x0e,0xff}, {0x56,0x0f,0x85,0x38}, {0x1e,0x3d,0xae,0xd5}, {0x27,0x36,0x2d,0x39}, + {0x64,0x0a,0x0f,0xd9}, {0x21,0x68,0x5c,0xa6}, {0xd1,0x9b,0x5b,0x54}, {0x3a,0x24,0x36,0x2e}, + {0xb1,0x0c,0x0a,0x67}, {0x0f,0x93,0x57,0xe7}, {0xd2,0xb4,0xee,0x96}, {0x9e,0x1b,0x9b,0x91}, + {0x4f,0x80,0xc0,0xc5}, {0xa2,0x61,0xdc,0x20}, {0x69,0x5a,0x77,0x4b}, {0x16,0x1c,0x12,0x1a}, + {0x0a,0xe2,0x93,0xba}, {0xe5,0xc0,0xa0,0x2a}, {0x43,0x3c,0x22,0xe0}, {0x1d,0x12,0x1b,0x17}, + {0x0b,0x0e,0x09,0x0d}, {0xad,0xf2,0x8b,0xc7}, {0xb9,0x2d,0xb6,0xa8}, {0xc8,0x14,0x1e,0xa9}, + {0x85,0x57,0xf1,0x19}, {0x4c,0xaf,0x75,0x07}, {0xbb,0xee,0x99,0xdd}, {0xfd,0xa3,0x7f,0x60}, + {0x9f,0xf7,0x01,0x26}, {0xbc,0x5c,0x72,0xf5}, {0xc5,0x44,0x66,0x3b}, {0x34,0x5b,0xfb,0x7e}, + {0x76,0x8b,0x43,0x29}, {0xdc,0xcb,0x23,0xc6}, {0x68,0xb6,0xed,0xfc}, {0x63,0xb8,0xe4,0xf1}, + {0xca,0xd7,0x31,0xdc}, {0x10,0x42,0x63,0x85}, {0x40,0x13,0x97,0x22}, {0x20,0x84,0xc6,0x11}, + {0x7d,0x85,0x4a,0x24}, {0xf8,0xd2,0xbb,0x3d}, {0x11,0xae,0xf9,0x32}, {0x6d,0xc7,0x29,0xa1}, + {0x4b,0x1d,0x9e,0x2f}, {0xf3,0xdc,0xb2,0x30}, {0xec,0x0d,0x86,0x52}, {0xd0,0x77,0xc1,0xe3}, + {0x6c,0x2b,0xb3,0x16}, {0x99,0xa9,0x70,0xb9}, {0xfa,0x11,0x94,0x48}, {0x22,0x47,0xe9,0x64}, + {0xc4,0xa8,0xfc,0x8c}, {0x1a,0xa0,0xf0,0x3f}, {0xd8,0x56,0x7d,0x2c}, {0xef,0x22,0x33,0x90}, + {0xc7,0x87,0x49,0x4e}, {0xc1,0xd9,0x38,0xd1}, {0xfe,0x8c,0xca,0xa2}, {0x36,0x98,0xd4,0x0b}, + {0xcf,0xa6,0xf5,0x81}, {0x28,0xa5,0x7a,0xde}, {0x26,0xda,0xb7,0x8e}, {0xa4,0x3f,0xad,0xbf}, + {0xe4,0x2c,0x3a,0x9d}, {0x0d,0x50,0x78,0x92}, {0x9b,0x6a,0x5f,0xcc}, {0x62,0x54,0x7e,0x46}, + {0xc2,0xf6,0x8d,0x13}, {0xe8,0x90,0xd8,0xb8}, {0x5e,0x2e,0x39,0xf7}, {0xf5,0x82,0xc3,0xaf}, + {0xbe,0x9f,0x5d,0x80}, {0x7c,0x69,0xd0,0x93}, {0xa9,0x6f,0xd5,0x2d}, {0xb3,0xcf,0x25,0x12}, + {0x3b,0xc8,0xac,0x99}, {0xa7,0x10,0x18,0x7d}, {0x6e,0xe8,0x9c,0x63}, {0x7b,0xdb,0x3b,0xbb}, + {0x09,0xcd,0x26,0x78}, {0xf4,0x6e,0x59,0x18}, {0x01,0xec,0x9a,0xb7}, {0xa8,0x83,0x4f,0x9a}, + {0x65,0xe6,0x95,0x6e}, {0x7e,0xaa,0xff,0xe6}, {0x08,0x21,0xbc,0xcf}, {0xe6,0xef,0x15,0xe8}, + {0xd9,0xba,0xe7,0x9b}, {0xce,0x4a,0x6f,0x36}, {0xd4,0xea,0x9f,0x09}, {0xd6,0x29,0xb0,0x7c}, + {0xaf,0x31,0xa4,0xb2}, {0x31,0x2a,0x3f,0x23}, {0x30,0xc6,0xa5,0x94}, {0xc0,0x35,0xa2,0x66}, + {0x37,0x74,0x4e,0xbc}, {0xa6,0xfc,0x82,0xca}, {0xb0,0xe0,0x90,0xd0}, {0x15,0x33,0xa7,0xd8}, + {0x4a,0xf1,0x04,0x98}, {0xf7,0x41,0xec,0xda}, {0x0e,0x7f,0xcd,0x50}, {0x2f,0x17,0x91,0xf6}, + {0x8d,0x76,0x4d,0xd6}, {0x4d,0x43,0xef,0xb0}, {0x54,0xcc,0xaa,0x4d}, {0xdf,0xe4,0x96,0x04}, + {0xe3,0x9e,0xd1,0xb5}, {0x1b,0x4c,0x6a,0x88}, {0xb8,0xc1,0x2c,0x1f}, {0x7f,0x46,0x65,0x51}, + {0x04,0x9d,0x5e,0xea}, {0x5d,0x01,0x8c,0x35}, {0x73,0xfa,0x87,0x74}, {0x2e,0xfb,0x0b,0x41}, + {0x5a,0xb3,0x67,0x1d}, {0x52,0x92,0xdb,0xd2}, {0x33,0xe9,0x10,0x56}, {0x13,0x6d,0xd6,0x47}, + {0x8c,0x9a,0xd7,0x61}, {0x7a,0x37,0xa1,0x0c}, {0x8e,0x59,0xf8,0x14}, {0x89,0xeb,0x13,0x3c}, + {0xee,0xce,0xa9,0x27}, {0x35,0xb7,0x61,0xc9}, {0xed,0xe1,0x1c,0xe5}, {0x3c,0x7a,0x47,0xb1}, + {0x59,0x9c,0xd2,0xdf}, {0x3f,0x55,0xf2,0x73}, {0x79,0x18,0x14,0xce}, {0xbf,0x73,0xc7,0x37}, + {0xea,0x53,0xf7,0xcd}, {0x5b,0x5f,0xfd,0xaa}, {0x14,0xdf,0x3d,0x6f}, {0x86,0x78,0x44,0xdb}, + {0x81,0xca,0xaf,0xf3}, {0x3e,0xb9,0x68,0xc4}, {0x2c,0x38,0x24,0x34}, {0x5f,0xc2,0xa3,0x40}, + {0x72,0x16,0x1d,0xc3}, {0x0c,0xbc,0xe2,0x25}, {0x8b,0x28,0x3c,0x49}, {0x41,0xff,0x0d,0x95}, + {0x71,0x39,0xa8,0x01}, {0xde,0x08,0x0c,0xb3}, {0x9c,0xd8,0xb4,0xe4}, {0x90,0x64,0x56,0xc1}, {0x61,0x7b,0xcb,0x84}, {0x70,0xd5,0x32,0xb6}, {0x74,0x48,0x6c,0x5c}, {0x42,0xd0,0xb8,0x57} }; static UINT8 T7[256][4]= { - {0xa7,0x50,0x51,0xf4}, {0x65,0x53,0x7e,0x41}, {0xa4,0xc3,0x1a,0x17}, {0x5e,0x96,0x3a,0x27}, - {0x6b,0xcb,0x3b,0xab}, {0x45,0xf1,0x1f,0x9d}, {0x58,0xab,0xac,0xfa}, {0x03,0x93,0x4b,0xe3}, - {0xfa,0x55,0x20,0x30}, {0x6d,0xf6,0xad,0x76}, {0x76,0x91,0x88,0xcc}, {0x4c,0x25,0xf5,0x02}, - {0xd7,0xfc,0x4f,0xe5}, {0xcb,0xd7,0xc5,0x2a}, {0x44,0x80,0x26,0x35}, {0xa3,0x8f,0xb5,0x62}, - {0x5a,0x49,0xde,0xb1}, {0x1b,0x67,0x25,0xba}, {0x0e,0x98,0x45,0xea}, {0xc0,0xe1,0x5d,0xfe}, - {0x75,0x02,0xc3,0x2f}, {0xf0,0x12,0x81,0x4c}, {0x97,0xa3,0x8d,0x46}, {0xf9,0xc6,0x6b,0xd3}, - {0x5f,0xe7,0x03,0x8f}, {0x9c,0x95,0x15,0x92}, {0x7a,0xeb,0xbf,0x6d}, {0x59,0xda,0x95,0x52}, - {0x83,0x2d,0xd4,0xbe}, {0x21,0xd3,0x58,0x74}, {0x69,0x29,0x49,0xe0}, {0xc8,0x44,0x8e,0xc9}, - {0x89,0x6a,0x75,0xc2}, {0x79,0x78,0xf4,0x8e}, {0x3e,0x6b,0x99,0x58}, {0x71,0xdd,0x27,0xb9}, - {0x4f,0xb6,0xbe,0xe1}, {0xad,0x17,0xf0,0x88}, {0xac,0x66,0xc9,0x20}, {0x3a,0xb4,0x7d,0xce}, - {0x4a,0x18,0x63,0xdf}, {0x31,0x82,0xe5,0x1a}, {0x33,0x60,0x97,0x51}, {0x7f,0x45,0x62,0x53}, - {0x77,0xe0,0xb1,0x64}, {0xae,0x84,0xbb,0x6b}, {0xa0,0x1c,0xfe,0x81}, {0x2b,0x94,0xf9,0x08}, - {0x68,0x58,0x70,0x48}, {0xfd,0x19,0x8f,0x45}, {0x6c,0x87,0x94,0xde}, {0xf8,0xb7,0x52,0x7b}, - {0xd3,0x23,0xab,0x73}, {0x02,0xe2,0x72,0x4b}, {0x8f,0x57,0xe3,0x1f}, {0xab,0x2a,0x66,0x55}, - {0x28,0x07,0xb2,0xeb}, {0xc2,0x03,0x2f,0xb5}, {0x7b,0x9a,0x86,0xc5}, {0x08,0xa5,0xd3,0x37}, - {0x87,0xf2,0x30,0x28}, {0xa5,0xb2,0x23,0xbf}, {0x6a,0xba,0x02,0x03}, {0x82,0x5c,0xed,0x16}, - {0x1c,0x2b,0x8a,0xcf}, {0xb4,0x92,0xa7,0x79}, {0xf2,0xf0,0xf3,0x07}, {0xe2,0xa1,0x4e,0x69}, - {0xf4,0xcd,0x65,0xda}, {0xbe,0xd5,0x06,0x05}, {0x62,0x1f,0xd1,0x34}, {0xfe,0x8a,0xc4,0xa6}, - {0x53,0x9d,0x34,0x2e}, {0x55,0xa0,0xa2,0xf3}, {0xe1,0x32,0x05,0x8a}, {0xeb,0x75,0xa4,0xf6}, - {0xec,0x39,0x0b,0x83}, {0xef,0xaa,0x40,0x60}, {0x9f,0x06,0x5e,0x71}, {0x10,0x51,0xbd,0x6e}, - {0x8a,0xf9,0x3e,0x21}, {0x06,0x3d,0x96,0xdd}, {0x05,0xae,0xdd,0x3e}, {0xbd,0x46,0x4d,0xe6}, - {0x8d,0xb5,0x91,0x54}, {0x5d,0x05,0x71,0xc4}, {0xd4,0x6f,0x04,0x06}, {0x15,0xff,0x60,0x50}, - {0xfb,0x24,0x19,0x98}, {0xe9,0x97,0xd6,0xbd}, {0x43,0xcc,0x89,0x40}, {0x9e,0x77,0x67,0xd9}, - {0x42,0xbd,0xb0,0xe8}, {0x8b,0x88,0x07,0x89}, {0x5b,0x38,0xe7,0x19}, {0xee,0xdb,0x79,0xc8}, - {0x0a,0x47,0xa1,0x7c}, {0x0f,0xe9,0x7c,0x42}, {0x1e,0xc9,0xf8,0x84}, {0x00,0x00,0x00,0x00}, - {0x86,0x83,0x09,0x80}, {0xed,0x48,0x32,0x2b}, {0x70,0xac,0x1e,0x11}, {0x72,0x4e,0x6c,0x5a}, - {0xff,0xfb,0xfd,0x0e}, {0x38,0x56,0x0f,0x85}, {0xd5,0x1e,0x3d,0xae}, {0x39,0x27,0x36,0x2d}, - {0xd9,0x64,0x0a,0x0f}, {0xa6,0x21,0x68,0x5c}, {0x54,0xd1,0x9b,0x5b}, {0x2e,0x3a,0x24,0x36}, - {0x67,0xb1,0x0c,0x0a}, {0xe7,0x0f,0x93,0x57}, {0x96,0xd2,0xb4,0xee}, {0x91,0x9e,0x1b,0x9b}, - {0xc5,0x4f,0x80,0xc0}, {0x20,0xa2,0x61,0xdc}, {0x4b,0x69,0x5a,0x77}, {0x1a,0x16,0x1c,0x12}, - {0xba,0x0a,0xe2,0x93}, {0x2a,0xe5,0xc0,0xa0}, {0xe0,0x43,0x3c,0x22}, {0x17,0x1d,0x12,0x1b}, - {0x0d,0x0b,0x0e,0x09}, {0xc7,0xad,0xf2,0x8b}, {0xa8,0xb9,0x2d,0xb6}, {0xa9,0xc8,0x14,0x1e}, - {0x19,0x85,0x57,0xf1}, {0x07,0x4c,0xaf,0x75}, {0xdd,0xbb,0xee,0x99}, {0x60,0xfd,0xa3,0x7f}, - {0x26,0x9f,0xf7,0x01}, {0xf5,0xbc,0x5c,0x72}, {0x3b,0xc5,0x44,0x66}, {0x7e,0x34,0x5b,0xfb}, - {0x29,0x76,0x8b,0x43}, {0xc6,0xdc,0xcb,0x23}, {0xfc,0x68,0xb6,0xed}, {0xf1,0x63,0xb8,0xe4}, - {0xdc,0xca,0xd7,0x31}, {0x85,0x10,0x42,0x63}, {0x22,0x40,0x13,0x97}, {0x11,0x20,0x84,0xc6}, - {0x24,0x7d,0x85,0x4a}, {0x3d,0xf8,0xd2,0xbb}, {0x32,0x11,0xae,0xf9}, {0xa1,0x6d,0xc7,0x29}, - {0x2f,0x4b,0x1d,0x9e}, {0x30,0xf3,0xdc,0xb2}, {0x52,0xec,0x0d,0x86}, {0xe3,0xd0,0x77,0xc1}, - {0x16,0x6c,0x2b,0xb3}, {0xb9,0x99,0xa9,0x70}, {0x48,0xfa,0x11,0x94}, {0x64,0x22,0x47,0xe9}, - {0x8c,0xc4,0xa8,0xfc}, {0x3f,0x1a,0xa0,0xf0}, {0x2c,0xd8,0x56,0x7d}, {0x90,0xef,0x22,0x33}, - {0x4e,0xc7,0x87,0x49}, {0xd1,0xc1,0xd9,0x38}, {0xa2,0xfe,0x8c,0xca}, {0x0b,0x36,0x98,0xd4}, - {0x81,0xcf,0xa6,0xf5}, {0xde,0x28,0xa5,0x7a}, {0x8e,0x26,0xda,0xb7}, {0xbf,0xa4,0x3f,0xad}, - {0x9d,0xe4,0x2c,0x3a}, {0x92,0x0d,0x50,0x78}, {0xcc,0x9b,0x6a,0x5f}, {0x46,0x62,0x54,0x7e}, - {0x13,0xc2,0xf6,0x8d}, {0xb8,0xe8,0x90,0xd8}, {0xf7,0x5e,0x2e,0x39}, {0xaf,0xf5,0x82,0xc3}, - {0x80,0xbe,0x9f,0x5d}, {0x93,0x7c,0x69,0xd0}, {0x2d,0xa9,0x6f,0xd5}, {0x12,0xb3,0xcf,0x25}, - {0x99,0x3b,0xc8,0xac}, {0x7d,0xa7,0x10,0x18}, {0x63,0x6e,0xe8,0x9c}, {0xbb,0x7b,0xdb,0x3b}, - {0x78,0x09,0xcd,0x26}, {0x18,0xf4,0x6e,0x59}, {0xb7,0x01,0xec,0x9a}, {0x9a,0xa8,0x83,0x4f}, - {0x6e,0x65,0xe6,0x95}, {0xe6,0x7e,0xaa,0xff}, {0xcf,0x08,0x21,0xbc}, {0xe8,0xe6,0xef,0x15}, - {0x9b,0xd9,0xba,0xe7}, {0x36,0xce,0x4a,0x6f}, {0x09,0xd4,0xea,0x9f}, {0x7c,0xd6,0x29,0xb0}, - {0xb2,0xaf,0x31,0xa4}, {0x23,0x31,0x2a,0x3f}, {0x94,0x30,0xc6,0xa5}, {0x66,0xc0,0x35,0xa2}, - {0xbc,0x37,0x74,0x4e}, {0xca,0xa6,0xfc,0x82}, {0xd0,0xb0,0xe0,0x90}, {0xd8,0x15,0x33,0xa7}, - {0x98,0x4a,0xf1,0x04}, {0xda,0xf7,0x41,0xec}, {0x50,0x0e,0x7f,0xcd}, {0xf6,0x2f,0x17,0x91}, - {0xd6,0x8d,0x76,0x4d}, {0xb0,0x4d,0x43,0xef}, {0x4d,0x54,0xcc,0xaa}, {0x04,0xdf,0xe4,0x96}, - {0xb5,0xe3,0x9e,0xd1}, {0x88,0x1b,0x4c,0x6a}, {0x1f,0xb8,0xc1,0x2c}, {0x51,0x7f,0x46,0x65}, - {0xea,0x04,0x9d,0x5e}, {0x35,0x5d,0x01,0x8c}, {0x74,0x73,0xfa,0x87}, {0x41,0x2e,0xfb,0x0b}, - {0x1d,0x5a,0xb3,0x67}, {0xd2,0x52,0x92,0xdb}, {0x56,0x33,0xe9,0x10}, {0x47,0x13,0x6d,0xd6}, - {0x61,0x8c,0x9a,0xd7}, {0x0c,0x7a,0x37,0xa1}, {0x14,0x8e,0x59,0xf8}, {0x3c,0x89,0xeb,0x13}, - {0x27,0xee,0xce,0xa9}, {0xc9,0x35,0xb7,0x61}, {0xe5,0xed,0xe1,0x1c}, {0xb1,0x3c,0x7a,0x47}, - {0xdf,0x59,0x9c,0xd2}, {0x73,0x3f,0x55,0xf2}, {0xce,0x79,0x18,0x14}, {0x37,0xbf,0x73,0xc7}, - {0xcd,0xea,0x53,0xf7}, {0xaa,0x5b,0x5f,0xfd}, {0x6f,0x14,0xdf,0x3d}, {0xdb,0x86,0x78,0x44}, - {0xf3,0x81,0xca,0xaf}, {0xc4,0x3e,0xb9,0x68}, {0x34,0x2c,0x38,0x24}, {0x40,0x5f,0xc2,0xa3}, - {0xc3,0x72,0x16,0x1d}, {0x25,0x0c,0xbc,0xe2}, {0x49,0x8b,0x28,0x3c}, {0x95,0x41,0xff,0x0d}, - {0x01,0x71,0x39,0xa8}, {0xb3,0xde,0x08,0x0c}, {0xe4,0x9c,0xd8,0xb4}, {0xc1,0x90,0x64,0x56}, + {0xa7,0x50,0x51,0xf4}, {0x65,0x53,0x7e,0x41}, {0xa4,0xc3,0x1a,0x17}, {0x5e,0x96,0x3a,0x27}, + {0x6b,0xcb,0x3b,0xab}, {0x45,0xf1,0x1f,0x9d}, {0x58,0xab,0xac,0xfa}, {0x03,0x93,0x4b,0xe3}, + {0xfa,0x55,0x20,0x30}, {0x6d,0xf6,0xad,0x76}, {0x76,0x91,0x88,0xcc}, {0x4c,0x25,0xf5,0x02}, + {0xd7,0xfc,0x4f,0xe5}, {0xcb,0xd7,0xc5,0x2a}, {0x44,0x80,0x26,0x35}, {0xa3,0x8f,0xb5,0x62}, + {0x5a,0x49,0xde,0xb1}, {0x1b,0x67,0x25,0xba}, {0x0e,0x98,0x45,0xea}, {0xc0,0xe1,0x5d,0xfe}, + {0x75,0x02,0xc3,0x2f}, {0xf0,0x12,0x81,0x4c}, {0x97,0xa3,0x8d,0x46}, {0xf9,0xc6,0x6b,0xd3}, + {0x5f,0xe7,0x03,0x8f}, {0x9c,0x95,0x15,0x92}, {0x7a,0xeb,0xbf,0x6d}, {0x59,0xda,0x95,0x52}, + {0x83,0x2d,0xd4,0xbe}, {0x21,0xd3,0x58,0x74}, {0x69,0x29,0x49,0xe0}, {0xc8,0x44,0x8e,0xc9}, + {0x89,0x6a,0x75,0xc2}, {0x79,0x78,0xf4,0x8e}, {0x3e,0x6b,0x99,0x58}, {0x71,0xdd,0x27,0xb9}, + {0x4f,0xb6,0xbe,0xe1}, {0xad,0x17,0xf0,0x88}, {0xac,0x66,0xc9,0x20}, {0x3a,0xb4,0x7d,0xce}, + {0x4a,0x18,0x63,0xdf}, {0x31,0x82,0xe5,0x1a}, {0x33,0x60,0x97,0x51}, {0x7f,0x45,0x62,0x53}, + {0x77,0xe0,0xb1,0x64}, {0xae,0x84,0xbb,0x6b}, {0xa0,0x1c,0xfe,0x81}, {0x2b,0x94,0xf9,0x08}, + {0x68,0x58,0x70,0x48}, {0xfd,0x19,0x8f,0x45}, {0x6c,0x87,0x94,0xde}, {0xf8,0xb7,0x52,0x7b}, + {0xd3,0x23,0xab,0x73}, {0x02,0xe2,0x72,0x4b}, {0x8f,0x57,0xe3,0x1f}, {0xab,0x2a,0x66,0x55}, + {0x28,0x07,0xb2,0xeb}, {0xc2,0x03,0x2f,0xb5}, {0x7b,0x9a,0x86,0xc5}, {0x08,0xa5,0xd3,0x37}, + {0x87,0xf2,0x30,0x28}, {0xa5,0xb2,0x23,0xbf}, {0x6a,0xba,0x02,0x03}, {0x82,0x5c,0xed,0x16}, + {0x1c,0x2b,0x8a,0xcf}, {0xb4,0x92,0xa7,0x79}, {0xf2,0xf0,0xf3,0x07}, {0xe2,0xa1,0x4e,0x69}, + {0xf4,0xcd,0x65,0xda}, {0xbe,0xd5,0x06,0x05}, {0x62,0x1f,0xd1,0x34}, {0xfe,0x8a,0xc4,0xa6}, + {0x53,0x9d,0x34,0x2e}, {0x55,0xa0,0xa2,0xf3}, {0xe1,0x32,0x05,0x8a}, {0xeb,0x75,0xa4,0xf6}, + {0xec,0x39,0x0b,0x83}, {0xef,0xaa,0x40,0x60}, {0x9f,0x06,0x5e,0x71}, {0x10,0x51,0xbd,0x6e}, + {0x8a,0xf9,0x3e,0x21}, {0x06,0x3d,0x96,0xdd}, {0x05,0xae,0xdd,0x3e}, {0xbd,0x46,0x4d,0xe6}, + {0x8d,0xb5,0x91,0x54}, {0x5d,0x05,0x71,0xc4}, {0xd4,0x6f,0x04,0x06}, {0x15,0xff,0x60,0x50}, + {0xfb,0x24,0x19,0x98}, {0xe9,0x97,0xd6,0xbd}, {0x43,0xcc,0x89,0x40}, {0x9e,0x77,0x67,0xd9}, + {0x42,0xbd,0xb0,0xe8}, {0x8b,0x88,0x07,0x89}, {0x5b,0x38,0xe7,0x19}, {0xee,0xdb,0x79,0xc8}, + {0x0a,0x47,0xa1,0x7c}, {0x0f,0xe9,0x7c,0x42}, {0x1e,0xc9,0xf8,0x84}, {0x00,0x00,0x00,0x00}, + {0x86,0x83,0x09,0x80}, {0xed,0x48,0x32,0x2b}, {0x70,0xac,0x1e,0x11}, {0x72,0x4e,0x6c,0x5a}, + {0xff,0xfb,0xfd,0x0e}, {0x38,0x56,0x0f,0x85}, {0xd5,0x1e,0x3d,0xae}, {0x39,0x27,0x36,0x2d}, + {0xd9,0x64,0x0a,0x0f}, {0xa6,0x21,0x68,0x5c}, {0x54,0xd1,0x9b,0x5b}, {0x2e,0x3a,0x24,0x36}, + {0x67,0xb1,0x0c,0x0a}, {0xe7,0x0f,0x93,0x57}, {0x96,0xd2,0xb4,0xee}, {0x91,0x9e,0x1b,0x9b}, + {0xc5,0x4f,0x80,0xc0}, {0x20,0xa2,0x61,0xdc}, {0x4b,0x69,0x5a,0x77}, {0x1a,0x16,0x1c,0x12}, + {0xba,0x0a,0xe2,0x93}, {0x2a,0xe5,0xc0,0xa0}, {0xe0,0x43,0x3c,0x22}, {0x17,0x1d,0x12,0x1b}, + {0x0d,0x0b,0x0e,0x09}, {0xc7,0xad,0xf2,0x8b}, {0xa8,0xb9,0x2d,0xb6}, {0xa9,0xc8,0x14,0x1e}, + {0x19,0x85,0x57,0xf1}, {0x07,0x4c,0xaf,0x75}, {0xdd,0xbb,0xee,0x99}, {0x60,0xfd,0xa3,0x7f}, + {0x26,0x9f,0xf7,0x01}, {0xf5,0xbc,0x5c,0x72}, {0x3b,0xc5,0x44,0x66}, {0x7e,0x34,0x5b,0xfb}, + {0x29,0x76,0x8b,0x43}, {0xc6,0xdc,0xcb,0x23}, {0xfc,0x68,0xb6,0xed}, {0xf1,0x63,0xb8,0xe4}, + {0xdc,0xca,0xd7,0x31}, {0x85,0x10,0x42,0x63}, {0x22,0x40,0x13,0x97}, {0x11,0x20,0x84,0xc6}, + {0x24,0x7d,0x85,0x4a}, {0x3d,0xf8,0xd2,0xbb}, {0x32,0x11,0xae,0xf9}, {0xa1,0x6d,0xc7,0x29}, + {0x2f,0x4b,0x1d,0x9e}, {0x30,0xf3,0xdc,0xb2}, {0x52,0xec,0x0d,0x86}, {0xe3,0xd0,0x77,0xc1}, + {0x16,0x6c,0x2b,0xb3}, {0xb9,0x99,0xa9,0x70}, {0x48,0xfa,0x11,0x94}, {0x64,0x22,0x47,0xe9}, + {0x8c,0xc4,0xa8,0xfc}, {0x3f,0x1a,0xa0,0xf0}, {0x2c,0xd8,0x56,0x7d}, {0x90,0xef,0x22,0x33}, + {0x4e,0xc7,0x87,0x49}, {0xd1,0xc1,0xd9,0x38}, {0xa2,0xfe,0x8c,0xca}, {0x0b,0x36,0x98,0xd4}, + {0x81,0xcf,0xa6,0xf5}, {0xde,0x28,0xa5,0x7a}, {0x8e,0x26,0xda,0xb7}, {0xbf,0xa4,0x3f,0xad}, + {0x9d,0xe4,0x2c,0x3a}, {0x92,0x0d,0x50,0x78}, {0xcc,0x9b,0x6a,0x5f}, {0x46,0x62,0x54,0x7e}, + {0x13,0xc2,0xf6,0x8d}, {0xb8,0xe8,0x90,0xd8}, {0xf7,0x5e,0x2e,0x39}, {0xaf,0xf5,0x82,0xc3}, + {0x80,0xbe,0x9f,0x5d}, {0x93,0x7c,0x69,0xd0}, {0x2d,0xa9,0x6f,0xd5}, {0x12,0xb3,0xcf,0x25}, + {0x99,0x3b,0xc8,0xac}, {0x7d,0xa7,0x10,0x18}, {0x63,0x6e,0xe8,0x9c}, {0xbb,0x7b,0xdb,0x3b}, + {0x78,0x09,0xcd,0x26}, {0x18,0xf4,0x6e,0x59}, {0xb7,0x01,0xec,0x9a}, {0x9a,0xa8,0x83,0x4f}, + {0x6e,0x65,0xe6,0x95}, {0xe6,0x7e,0xaa,0xff}, {0xcf,0x08,0x21,0xbc}, {0xe8,0xe6,0xef,0x15}, + {0x9b,0xd9,0xba,0xe7}, {0x36,0xce,0x4a,0x6f}, {0x09,0xd4,0xea,0x9f}, {0x7c,0xd6,0x29,0xb0}, + {0xb2,0xaf,0x31,0xa4}, {0x23,0x31,0x2a,0x3f}, {0x94,0x30,0xc6,0xa5}, {0x66,0xc0,0x35,0xa2}, + {0xbc,0x37,0x74,0x4e}, {0xca,0xa6,0xfc,0x82}, {0xd0,0xb0,0xe0,0x90}, {0xd8,0x15,0x33,0xa7}, + {0x98,0x4a,0xf1,0x04}, {0xda,0xf7,0x41,0xec}, {0x50,0x0e,0x7f,0xcd}, {0xf6,0x2f,0x17,0x91}, + {0xd6,0x8d,0x76,0x4d}, {0xb0,0x4d,0x43,0xef}, {0x4d,0x54,0xcc,0xaa}, {0x04,0xdf,0xe4,0x96}, + {0xb5,0xe3,0x9e,0xd1}, {0x88,0x1b,0x4c,0x6a}, {0x1f,0xb8,0xc1,0x2c}, {0x51,0x7f,0x46,0x65}, + {0xea,0x04,0x9d,0x5e}, {0x35,0x5d,0x01,0x8c}, {0x74,0x73,0xfa,0x87}, {0x41,0x2e,0xfb,0x0b}, + {0x1d,0x5a,0xb3,0x67}, {0xd2,0x52,0x92,0xdb}, {0x56,0x33,0xe9,0x10}, {0x47,0x13,0x6d,0xd6}, + {0x61,0x8c,0x9a,0xd7}, {0x0c,0x7a,0x37,0xa1}, {0x14,0x8e,0x59,0xf8}, {0x3c,0x89,0xeb,0x13}, + {0x27,0xee,0xce,0xa9}, {0xc9,0x35,0xb7,0x61}, {0xe5,0xed,0xe1,0x1c}, {0xb1,0x3c,0x7a,0x47}, + {0xdf,0x59,0x9c,0xd2}, {0x73,0x3f,0x55,0xf2}, {0xce,0x79,0x18,0x14}, {0x37,0xbf,0x73,0xc7}, + {0xcd,0xea,0x53,0xf7}, {0xaa,0x5b,0x5f,0xfd}, {0x6f,0x14,0xdf,0x3d}, {0xdb,0x86,0x78,0x44}, + {0xf3,0x81,0xca,0xaf}, {0xc4,0x3e,0xb9,0x68}, {0x34,0x2c,0x38,0x24}, {0x40,0x5f,0xc2,0xa3}, + {0xc3,0x72,0x16,0x1d}, {0x25,0x0c,0xbc,0xe2}, {0x49,0x8b,0x28,0x3c}, {0x95,0x41,0xff,0x0d}, + {0x01,0x71,0x39,0xa8}, {0xb3,0xde,0x08,0x0c}, {0xe4,0x9c,0xd8,0xb4}, {0xc1,0x90,0x64,0x56}, {0x84,0x61,0x7b,0xcb}, {0xb6,0x70,0xd5,0x32}, {0x5c,0x74,0x48,0x6c}, {0x57,0x42,0xd0,0xb8} }; static UINT8 T8[256][4]= { - {0xf4,0xa7,0x50,0x51}, {0x41,0x65,0x53,0x7e}, {0x17,0xa4,0xc3,0x1a}, {0x27,0x5e,0x96,0x3a}, - {0xab,0x6b,0xcb,0x3b}, {0x9d,0x45,0xf1,0x1f}, {0xfa,0x58,0xab,0xac}, {0xe3,0x03,0x93,0x4b}, - {0x30,0xfa,0x55,0x20}, {0x76,0x6d,0xf6,0xad}, {0xcc,0x76,0x91,0x88}, {0x02,0x4c,0x25,0xf5}, - {0xe5,0xd7,0xfc,0x4f}, {0x2a,0xcb,0xd7,0xc5}, {0x35,0x44,0x80,0x26}, {0x62,0xa3,0x8f,0xb5}, - {0xb1,0x5a,0x49,0xde}, {0xba,0x1b,0x67,0x25}, {0xea,0x0e,0x98,0x45}, {0xfe,0xc0,0xe1,0x5d}, - {0x2f,0x75,0x02,0xc3}, {0x4c,0xf0,0x12,0x81}, {0x46,0x97,0xa3,0x8d}, {0xd3,0xf9,0xc6,0x6b}, - {0x8f,0x5f,0xe7,0x03}, {0x92,0x9c,0x95,0x15}, {0x6d,0x7a,0xeb,0xbf}, {0x52,0x59,0xda,0x95}, - {0xbe,0x83,0x2d,0xd4}, {0x74,0x21,0xd3,0x58}, {0xe0,0x69,0x29,0x49}, {0xc9,0xc8,0x44,0x8e}, - {0xc2,0x89,0x6a,0x75}, {0x8e,0x79,0x78,0xf4}, {0x58,0x3e,0x6b,0x99}, {0xb9,0x71,0xdd,0x27}, - {0xe1,0x4f,0xb6,0xbe}, {0x88,0xad,0x17,0xf0}, {0x20,0xac,0x66,0xc9}, {0xce,0x3a,0xb4,0x7d}, - {0xdf,0x4a,0x18,0x63}, {0x1a,0x31,0x82,0xe5}, {0x51,0x33,0x60,0x97}, {0x53,0x7f,0x45,0x62}, - {0x64,0x77,0xe0,0xb1}, {0x6b,0xae,0x84,0xbb}, {0x81,0xa0,0x1c,0xfe}, {0x08,0x2b,0x94,0xf9}, - {0x48,0x68,0x58,0x70}, {0x45,0xfd,0x19,0x8f}, {0xde,0x6c,0x87,0x94}, {0x7b,0xf8,0xb7,0x52}, - {0x73,0xd3,0x23,0xab}, {0x4b,0x02,0xe2,0x72}, {0x1f,0x8f,0x57,0xe3}, {0x55,0xab,0x2a,0x66}, - {0xeb,0x28,0x07,0xb2}, {0xb5,0xc2,0x03,0x2f}, {0xc5,0x7b,0x9a,0x86}, {0x37,0x08,0xa5,0xd3}, - {0x28,0x87,0xf2,0x30}, {0xbf,0xa5,0xb2,0x23}, {0x03,0x6a,0xba,0x02}, {0x16,0x82,0x5c,0xed}, - {0xcf,0x1c,0x2b,0x8a}, {0x79,0xb4,0x92,0xa7}, {0x07,0xf2,0xf0,0xf3}, {0x69,0xe2,0xa1,0x4e}, - {0xda,0xf4,0xcd,0x65}, {0x05,0xbe,0xd5,0x06}, {0x34,0x62,0x1f,0xd1}, {0xa6,0xfe,0x8a,0xc4}, - {0x2e,0x53,0x9d,0x34}, {0xf3,0x55,0xa0,0xa2}, {0x8a,0xe1,0x32,0x05}, {0xf6,0xeb,0x75,0xa4}, - {0x83,0xec,0x39,0x0b}, {0x60,0xef,0xaa,0x40}, {0x71,0x9f,0x06,0x5e}, {0x6e,0x10,0x51,0xbd}, - {0x21,0x8a,0xf9,0x3e}, {0xdd,0x06,0x3d,0x96}, {0x3e,0x05,0xae,0xdd}, {0xe6,0xbd,0x46,0x4d}, - {0x54,0x8d,0xb5,0x91}, {0xc4,0x5d,0x05,0x71}, {0x06,0xd4,0x6f,0x04}, {0x50,0x15,0xff,0x60}, - {0x98,0xfb,0x24,0x19}, {0xbd,0xe9,0x97,0xd6}, {0x40,0x43,0xcc,0x89}, {0xd9,0x9e,0x77,0x67}, - {0xe8,0x42,0xbd,0xb0}, {0x89,0x8b,0x88,0x07}, {0x19,0x5b,0x38,0xe7}, {0xc8,0xee,0xdb,0x79}, - {0x7c,0x0a,0x47,0xa1}, {0x42,0x0f,0xe9,0x7c}, {0x84,0x1e,0xc9,0xf8}, {0x00,0x00,0x00,0x00}, - {0x80,0x86,0x83,0x09}, {0x2b,0xed,0x48,0x32}, {0x11,0x70,0xac,0x1e}, {0x5a,0x72,0x4e,0x6c}, - {0x0e,0xff,0xfb,0xfd}, {0x85,0x38,0x56,0x0f}, {0xae,0xd5,0x1e,0x3d}, {0x2d,0x39,0x27,0x36}, - {0x0f,0xd9,0x64,0x0a}, {0x5c,0xa6,0x21,0x68}, {0x5b,0x54,0xd1,0x9b}, {0x36,0x2e,0x3a,0x24}, - {0x0a,0x67,0xb1,0x0c}, {0x57,0xe7,0x0f,0x93}, {0xee,0x96,0xd2,0xb4}, {0x9b,0x91,0x9e,0x1b}, - {0xc0,0xc5,0x4f,0x80}, {0xdc,0x20,0xa2,0x61}, {0x77,0x4b,0x69,0x5a}, {0x12,0x1a,0x16,0x1c}, - {0x93,0xba,0x0a,0xe2}, {0xa0,0x2a,0xe5,0xc0}, {0x22,0xe0,0x43,0x3c}, {0x1b,0x17,0x1d,0x12}, - {0x09,0x0d,0x0b,0x0e}, {0x8b,0xc7,0xad,0xf2}, {0xb6,0xa8,0xb9,0x2d}, {0x1e,0xa9,0xc8,0x14}, - {0xf1,0x19,0x85,0x57}, {0x75,0x07,0x4c,0xaf}, {0x99,0xdd,0xbb,0xee}, {0x7f,0x60,0xfd,0xa3}, - {0x01,0x26,0x9f,0xf7}, {0x72,0xf5,0xbc,0x5c}, {0x66,0x3b,0xc5,0x44}, {0xfb,0x7e,0x34,0x5b}, - {0x43,0x29,0x76,0x8b}, {0x23,0xc6,0xdc,0xcb}, {0xed,0xfc,0x68,0xb6}, {0xe4,0xf1,0x63,0xb8}, - {0x31,0xdc,0xca,0xd7}, {0x63,0x85,0x10,0x42}, {0x97,0x22,0x40,0x13}, {0xc6,0x11,0x20,0x84}, - {0x4a,0x24,0x7d,0x85}, {0xbb,0x3d,0xf8,0xd2}, {0xf9,0x32,0x11,0xae}, {0x29,0xa1,0x6d,0xc7}, - {0x9e,0x2f,0x4b,0x1d}, {0xb2,0x30,0xf3,0xdc}, {0x86,0x52,0xec,0x0d}, {0xc1,0xe3,0xd0,0x77}, - {0xb3,0x16,0x6c,0x2b}, {0x70,0xb9,0x99,0xa9}, {0x94,0x48,0xfa,0x11}, {0xe9,0x64,0x22,0x47}, - {0xfc,0x8c,0xc4,0xa8}, {0xf0,0x3f,0x1a,0xa0}, {0x7d,0x2c,0xd8,0x56}, {0x33,0x90,0xef,0x22}, - {0x49,0x4e,0xc7,0x87}, {0x38,0xd1,0xc1,0xd9}, {0xca,0xa2,0xfe,0x8c}, {0xd4,0x0b,0x36,0x98}, - {0xf5,0x81,0xcf,0xa6}, {0x7a,0xde,0x28,0xa5}, {0xb7,0x8e,0x26,0xda}, {0xad,0xbf,0xa4,0x3f}, - {0x3a,0x9d,0xe4,0x2c}, {0x78,0x92,0x0d,0x50}, {0x5f,0xcc,0x9b,0x6a}, {0x7e,0x46,0x62,0x54}, - {0x8d,0x13,0xc2,0xf6}, {0xd8,0xb8,0xe8,0x90}, {0x39,0xf7,0x5e,0x2e}, {0xc3,0xaf,0xf5,0x82}, - {0x5d,0x80,0xbe,0x9f}, {0xd0,0x93,0x7c,0x69}, {0xd5,0x2d,0xa9,0x6f}, {0x25,0x12,0xb3,0xcf}, - {0xac,0x99,0x3b,0xc8}, {0x18,0x7d,0xa7,0x10}, {0x9c,0x63,0x6e,0xe8}, {0x3b,0xbb,0x7b,0xdb}, - {0x26,0x78,0x09,0xcd}, {0x59,0x18,0xf4,0x6e}, {0x9a,0xb7,0x01,0xec}, {0x4f,0x9a,0xa8,0x83}, - {0x95,0x6e,0x65,0xe6}, {0xff,0xe6,0x7e,0xaa}, {0xbc,0xcf,0x08,0x21}, {0x15,0xe8,0xe6,0xef}, - {0xe7,0x9b,0xd9,0xba}, {0x6f,0x36,0xce,0x4a}, {0x9f,0x09,0xd4,0xea}, {0xb0,0x7c,0xd6,0x29}, - {0xa4,0xb2,0xaf,0x31}, {0x3f,0x23,0x31,0x2a}, {0xa5,0x94,0x30,0xc6}, {0xa2,0x66,0xc0,0x35}, - {0x4e,0xbc,0x37,0x74}, {0x82,0xca,0xa6,0xfc}, {0x90,0xd0,0xb0,0xe0}, {0xa7,0xd8,0x15,0x33}, - {0x04,0x98,0x4a,0xf1}, {0xec,0xda,0xf7,0x41}, {0xcd,0x50,0x0e,0x7f}, {0x91,0xf6,0x2f,0x17}, - {0x4d,0xd6,0x8d,0x76}, {0xef,0xb0,0x4d,0x43}, {0xaa,0x4d,0x54,0xcc}, {0x96,0x04,0xdf,0xe4}, - {0xd1,0xb5,0xe3,0x9e}, {0x6a,0x88,0x1b,0x4c}, {0x2c,0x1f,0xb8,0xc1}, {0x65,0x51,0x7f,0x46}, - {0x5e,0xea,0x04,0x9d}, {0x8c,0x35,0x5d,0x01}, {0x87,0x74,0x73,0xfa}, {0x0b,0x41,0x2e,0xfb}, - {0x67,0x1d,0x5a,0xb3}, {0xdb,0xd2,0x52,0x92}, {0x10,0x56,0x33,0xe9}, {0xd6,0x47,0x13,0x6d}, - {0xd7,0x61,0x8c,0x9a}, {0xa1,0x0c,0x7a,0x37}, {0xf8,0x14,0x8e,0x59}, {0x13,0x3c,0x89,0xeb}, - {0xa9,0x27,0xee,0xce}, {0x61,0xc9,0x35,0xb7}, {0x1c,0xe5,0xed,0xe1}, {0x47,0xb1,0x3c,0x7a}, - {0xd2,0xdf,0x59,0x9c}, {0xf2,0x73,0x3f,0x55}, {0x14,0xce,0x79,0x18}, {0xc7,0x37,0xbf,0x73}, - {0xf7,0xcd,0xea,0x53}, {0xfd,0xaa,0x5b,0x5f}, {0x3d,0x6f,0x14,0xdf}, {0x44,0xdb,0x86,0x78}, - {0xaf,0xf3,0x81,0xca}, {0x68,0xc4,0x3e,0xb9}, {0x24,0x34,0x2c,0x38}, {0xa3,0x40,0x5f,0xc2}, - {0x1d,0xc3,0x72,0x16}, {0xe2,0x25,0x0c,0xbc}, {0x3c,0x49,0x8b,0x28}, {0x0d,0x95,0x41,0xff}, - {0xa8,0x01,0x71,0x39}, {0x0c,0xb3,0xde,0x08}, {0xb4,0xe4,0x9c,0xd8}, {0x56,0xc1,0x90,0x64}, + {0xf4,0xa7,0x50,0x51}, {0x41,0x65,0x53,0x7e}, {0x17,0xa4,0xc3,0x1a}, {0x27,0x5e,0x96,0x3a}, + {0xab,0x6b,0xcb,0x3b}, {0x9d,0x45,0xf1,0x1f}, {0xfa,0x58,0xab,0xac}, {0xe3,0x03,0x93,0x4b}, + {0x30,0xfa,0x55,0x20}, {0x76,0x6d,0xf6,0xad}, {0xcc,0x76,0x91,0x88}, {0x02,0x4c,0x25,0xf5}, + {0xe5,0xd7,0xfc,0x4f}, {0x2a,0xcb,0xd7,0xc5}, {0x35,0x44,0x80,0x26}, {0x62,0xa3,0x8f,0xb5}, + {0xb1,0x5a,0x49,0xde}, {0xba,0x1b,0x67,0x25}, {0xea,0x0e,0x98,0x45}, {0xfe,0xc0,0xe1,0x5d}, + {0x2f,0x75,0x02,0xc3}, {0x4c,0xf0,0x12,0x81}, {0x46,0x97,0xa3,0x8d}, {0xd3,0xf9,0xc6,0x6b}, + {0x8f,0x5f,0xe7,0x03}, {0x92,0x9c,0x95,0x15}, {0x6d,0x7a,0xeb,0xbf}, {0x52,0x59,0xda,0x95}, + {0xbe,0x83,0x2d,0xd4}, {0x74,0x21,0xd3,0x58}, {0xe0,0x69,0x29,0x49}, {0xc9,0xc8,0x44,0x8e}, + {0xc2,0x89,0x6a,0x75}, {0x8e,0x79,0x78,0xf4}, {0x58,0x3e,0x6b,0x99}, {0xb9,0x71,0xdd,0x27}, + {0xe1,0x4f,0xb6,0xbe}, {0x88,0xad,0x17,0xf0}, {0x20,0xac,0x66,0xc9}, {0xce,0x3a,0xb4,0x7d}, + {0xdf,0x4a,0x18,0x63}, {0x1a,0x31,0x82,0xe5}, {0x51,0x33,0x60,0x97}, {0x53,0x7f,0x45,0x62}, + {0x64,0x77,0xe0,0xb1}, {0x6b,0xae,0x84,0xbb}, {0x81,0xa0,0x1c,0xfe}, {0x08,0x2b,0x94,0xf9}, + {0x48,0x68,0x58,0x70}, {0x45,0xfd,0x19,0x8f}, {0xde,0x6c,0x87,0x94}, {0x7b,0xf8,0xb7,0x52}, + {0x73,0xd3,0x23,0xab}, {0x4b,0x02,0xe2,0x72}, {0x1f,0x8f,0x57,0xe3}, {0x55,0xab,0x2a,0x66}, + {0xeb,0x28,0x07,0xb2}, {0xb5,0xc2,0x03,0x2f}, {0xc5,0x7b,0x9a,0x86}, {0x37,0x08,0xa5,0xd3}, + {0x28,0x87,0xf2,0x30}, {0xbf,0xa5,0xb2,0x23}, {0x03,0x6a,0xba,0x02}, {0x16,0x82,0x5c,0xed}, + {0xcf,0x1c,0x2b,0x8a}, {0x79,0xb4,0x92,0xa7}, {0x07,0xf2,0xf0,0xf3}, {0x69,0xe2,0xa1,0x4e}, + {0xda,0xf4,0xcd,0x65}, {0x05,0xbe,0xd5,0x06}, {0x34,0x62,0x1f,0xd1}, {0xa6,0xfe,0x8a,0xc4}, + {0x2e,0x53,0x9d,0x34}, {0xf3,0x55,0xa0,0xa2}, {0x8a,0xe1,0x32,0x05}, {0xf6,0xeb,0x75,0xa4}, + {0x83,0xec,0x39,0x0b}, {0x60,0xef,0xaa,0x40}, {0x71,0x9f,0x06,0x5e}, {0x6e,0x10,0x51,0xbd}, + {0x21,0x8a,0xf9,0x3e}, {0xdd,0x06,0x3d,0x96}, {0x3e,0x05,0xae,0xdd}, {0xe6,0xbd,0x46,0x4d}, + {0x54,0x8d,0xb5,0x91}, {0xc4,0x5d,0x05,0x71}, {0x06,0xd4,0x6f,0x04}, {0x50,0x15,0xff,0x60}, + {0x98,0xfb,0x24,0x19}, {0xbd,0xe9,0x97,0xd6}, {0x40,0x43,0xcc,0x89}, {0xd9,0x9e,0x77,0x67}, + {0xe8,0x42,0xbd,0xb0}, {0x89,0x8b,0x88,0x07}, {0x19,0x5b,0x38,0xe7}, {0xc8,0xee,0xdb,0x79}, + {0x7c,0x0a,0x47,0xa1}, {0x42,0x0f,0xe9,0x7c}, {0x84,0x1e,0xc9,0xf8}, {0x00,0x00,0x00,0x00}, + {0x80,0x86,0x83,0x09}, {0x2b,0xed,0x48,0x32}, {0x11,0x70,0xac,0x1e}, {0x5a,0x72,0x4e,0x6c}, + {0x0e,0xff,0xfb,0xfd}, {0x85,0x38,0x56,0x0f}, {0xae,0xd5,0x1e,0x3d}, {0x2d,0x39,0x27,0x36}, + {0x0f,0xd9,0x64,0x0a}, {0x5c,0xa6,0x21,0x68}, {0x5b,0x54,0xd1,0x9b}, {0x36,0x2e,0x3a,0x24}, + {0x0a,0x67,0xb1,0x0c}, {0x57,0xe7,0x0f,0x93}, {0xee,0x96,0xd2,0xb4}, {0x9b,0x91,0x9e,0x1b}, + {0xc0,0xc5,0x4f,0x80}, {0xdc,0x20,0xa2,0x61}, {0x77,0x4b,0x69,0x5a}, {0x12,0x1a,0x16,0x1c}, + {0x93,0xba,0x0a,0xe2}, {0xa0,0x2a,0xe5,0xc0}, {0x22,0xe0,0x43,0x3c}, {0x1b,0x17,0x1d,0x12}, + {0x09,0x0d,0x0b,0x0e}, {0x8b,0xc7,0xad,0xf2}, {0xb6,0xa8,0xb9,0x2d}, {0x1e,0xa9,0xc8,0x14}, + {0xf1,0x19,0x85,0x57}, {0x75,0x07,0x4c,0xaf}, {0x99,0xdd,0xbb,0xee}, {0x7f,0x60,0xfd,0xa3}, + {0x01,0x26,0x9f,0xf7}, {0x72,0xf5,0xbc,0x5c}, {0x66,0x3b,0xc5,0x44}, {0xfb,0x7e,0x34,0x5b}, + {0x43,0x29,0x76,0x8b}, {0x23,0xc6,0xdc,0xcb}, {0xed,0xfc,0x68,0xb6}, {0xe4,0xf1,0x63,0xb8}, + {0x31,0xdc,0xca,0xd7}, {0x63,0x85,0x10,0x42}, {0x97,0x22,0x40,0x13}, {0xc6,0x11,0x20,0x84}, + {0x4a,0x24,0x7d,0x85}, {0xbb,0x3d,0xf8,0xd2}, {0xf9,0x32,0x11,0xae}, {0x29,0xa1,0x6d,0xc7}, + {0x9e,0x2f,0x4b,0x1d}, {0xb2,0x30,0xf3,0xdc}, {0x86,0x52,0xec,0x0d}, {0xc1,0xe3,0xd0,0x77}, + {0xb3,0x16,0x6c,0x2b}, {0x70,0xb9,0x99,0xa9}, {0x94,0x48,0xfa,0x11}, {0xe9,0x64,0x22,0x47}, + {0xfc,0x8c,0xc4,0xa8}, {0xf0,0x3f,0x1a,0xa0}, {0x7d,0x2c,0xd8,0x56}, {0x33,0x90,0xef,0x22}, + {0x49,0x4e,0xc7,0x87}, {0x38,0xd1,0xc1,0xd9}, {0xca,0xa2,0xfe,0x8c}, {0xd4,0x0b,0x36,0x98}, + {0xf5,0x81,0xcf,0xa6}, {0x7a,0xde,0x28,0xa5}, {0xb7,0x8e,0x26,0xda}, {0xad,0xbf,0xa4,0x3f}, + {0x3a,0x9d,0xe4,0x2c}, {0x78,0x92,0x0d,0x50}, {0x5f,0xcc,0x9b,0x6a}, {0x7e,0x46,0x62,0x54}, + {0x8d,0x13,0xc2,0xf6}, {0xd8,0xb8,0xe8,0x90}, {0x39,0xf7,0x5e,0x2e}, {0xc3,0xaf,0xf5,0x82}, + {0x5d,0x80,0xbe,0x9f}, {0xd0,0x93,0x7c,0x69}, {0xd5,0x2d,0xa9,0x6f}, {0x25,0x12,0xb3,0xcf}, + {0xac,0x99,0x3b,0xc8}, {0x18,0x7d,0xa7,0x10}, {0x9c,0x63,0x6e,0xe8}, {0x3b,0xbb,0x7b,0xdb}, + {0x26,0x78,0x09,0xcd}, {0x59,0x18,0xf4,0x6e}, {0x9a,0xb7,0x01,0xec}, {0x4f,0x9a,0xa8,0x83}, + {0x95,0x6e,0x65,0xe6}, {0xff,0xe6,0x7e,0xaa}, {0xbc,0xcf,0x08,0x21}, {0x15,0xe8,0xe6,0xef}, + {0xe7,0x9b,0xd9,0xba}, {0x6f,0x36,0xce,0x4a}, {0x9f,0x09,0xd4,0xea}, {0xb0,0x7c,0xd6,0x29}, + {0xa4,0xb2,0xaf,0x31}, {0x3f,0x23,0x31,0x2a}, {0xa5,0x94,0x30,0xc6}, {0xa2,0x66,0xc0,0x35}, + {0x4e,0xbc,0x37,0x74}, {0x82,0xca,0xa6,0xfc}, {0x90,0xd0,0xb0,0xe0}, {0xa7,0xd8,0x15,0x33}, + {0x04,0x98,0x4a,0xf1}, {0xec,0xda,0xf7,0x41}, {0xcd,0x50,0x0e,0x7f}, {0x91,0xf6,0x2f,0x17}, + {0x4d,0xd6,0x8d,0x76}, {0xef,0xb0,0x4d,0x43}, {0xaa,0x4d,0x54,0xcc}, {0x96,0x04,0xdf,0xe4}, + {0xd1,0xb5,0xe3,0x9e}, {0x6a,0x88,0x1b,0x4c}, {0x2c,0x1f,0xb8,0xc1}, {0x65,0x51,0x7f,0x46}, + {0x5e,0xea,0x04,0x9d}, {0x8c,0x35,0x5d,0x01}, {0x87,0x74,0x73,0xfa}, {0x0b,0x41,0x2e,0xfb}, + {0x67,0x1d,0x5a,0xb3}, {0xdb,0xd2,0x52,0x92}, {0x10,0x56,0x33,0xe9}, {0xd6,0x47,0x13,0x6d}, + {0xd7,0x61,0x8c,0x9a}, {0xa1,0x0c,0x7a,0x37}, {0xf8,0x14,0x8e,0x59}, {0x13,0x3c,0x89,0xeb}, + {0xa9,0x27,0xee,0xce}, {0x61,0xc9,0x35,0xb7}, {0x1c,0xe5,0xed,0xe1}, {0x47,0xb1,0x3c,0x7a}, + {0xd2,0xdf,0x59,0x9c}, {0xf2,0x73,0x3f,0x55}, {0x14,0xce,0x79,0x18}, {0xc7,0x37,0xbf,0x73}, + {0xf7,0xcd,0xea,0x53}, {0xfd,0xaa,0x5b,0x5f}, {0x3d,0x6f,0x14,0xdf}, {0x44,0xdb,0x86,0x78}, + {0xaf,0xf3,0x81,0xca}, {0x68,0xc4,0x3e,0xb9}, {0x24,0x34,0x2c,0x38}, {0xa3,0x40,0x5f,0xc2}, + {0x1d,0xc3,0x72,0x16}, {0xe2,0x25,0x0c,0xbc}, {0x3c,0x49,0x8b,0x28}, {0x0d,0x95,0x41,0xff}, + {0xa8,0x01,0x71,0x39}, {0x0c,0xb3,0xde,0x08}, {0xb4,0xe4,0x9c,0xd8}, {0x56,0xc1,0x90,0x64}, {0xcb,0x84,0x61,0x7b}, {0x32,0xb6,0x70,0xd5}, {0x6c,0x5c,0x74,0x48}, {0xb8,0x57,0x42,0xd0} }; @@ -699,278 +699,278 @@ static UINT8 S5[256]= static UINT8 U1[256][4]= { - {0x00,0x00,0x00,0x00}, {0x0e,0x09,0x0d,0x0b}, {0x1c,0x12,0x1a,0x16}, {0x12,0x1b,0x17,0x1d}, - {0x38,0x24,0x34,0x2c}, {0x36,0x2d,0x39,0x27}, {0x24,0x36,0x2e,0x3a}, {0x2a,0x3f,0x23,0x31}, - {0x70,0x48,0x68,0x58}, {0x7e,0x41,0x65,0x53}, {0x6c,0x5a,0x72,0x4e}, {0x62,0x53,0x7f,0x45}, - {0x48,0x6c,0x5c,0x74}, {0x46,0x65,0x51,0x7f}, {0x54,0x7e,0x46,0x62}, {0x5a,0x77,0x4b,0x69}, - {0xe0,0x90,0xd0,0xb0}, {0xee,0x99,0xdd,0xbb}, {0xfc,0x82,0xca,0xa6}, {0xf2,0x8b,0xc7,0xad}, - {0xd8,0xb4,0xe4,0x9c}, {0xd6,0xbd,0xe9,0x97}, {0xc4,0xa6,0xfe,0x8a}, {0xca,0xaf,0xf3,0x81}, - {0x90,0xd8,0xb8,0xe8}, {0x9e,0xd1,0xb5,0xe3}, {0x8c,0xca,0xa2,0xfe}, {0x82,0xc3,0xaf,0xf5}, - {0xa8,0xfc,0x8c,0xc4}, {0xa6,0xf5,0x81,0xcf}, {0xb4,0xee,0x96,0xd2}, {0xba,0xe7,0x9b,0xd9}, - {0xdb,0x3b,0xbb,0x7b}, {0xd5,0x32,0xb6,0x70}, {0xc7,0x29,0xa1,0x6d}, {0xc9,0x20,0xac,0x66}, - {0xe3,0x1f,0x8f,0x57}, {0xed,0x16,0x82,0x5c}, {0xff,0x0d,0x95,0x41}, {0xf1,0x04,0x98,0x4a}, - {0xab,0x73,0xd3,0x23}, {0xa5,0x7a,0xde,0x28}, {0xb7,0x61,0xc9,0x35}, {0xb9,0x68,0xc4,0x3e}, - {0x93,0x57,0xe7,0x0f}, {0x9d,0x5e,0xea,0x04}, {0x8f,0x45,0xfd,0x19}, {0x81,0x4c,0xf0,0x12}, - {0x3b,0xab,0x6b,0xcb}, {0x35,0xa2,0x66,0xc0}, {0x27,0xb9,0x71,0xdd}, {0x29,0xb0,0x7c,0xd6}, - {0x03,0x8f,0x5f,0xe7}, {0x0d,0x86,0x52,0xec}, {0x1f,0x9d,0x45,0xf1}, {0x11,0x94,0x48,0xfa}, - {0x4b,0xe3,0x03,0x93}, {0x45,0xea,0x0e,0x98}, {0x57,0xf1,0x19,0x85}, {0x59,0xf8,0x14,0x8e}, - {0x73,0xc7,0x37,0xbf}, {0x7d,0xce,0x3a,0xb4}, {0x6f,0xd5,0x2d,0xa9}, {0x61,0xdc,0x20,0xa2}, - {0xad,0x76,0x6d,0xf6}, {0xa3,0x7f,0x60,0xfd}, {0xb1,0x64,0x77,0xe0}, {0xbf,0x6d,0x7a,0xeb}, - {0x95,0x52,0x59,0xda}, {0x9b,0x5b,0x54,0xd1}, {0x89,0x40,0x43,0xcc}, {0x87,0x49,0x4e,0xc7}, - {0xdd,0x3e,0x05,0xae}, {0xd3,0x37,0x08,0xa5}, {0xc1,0x2c,0x1f,0xb8}, {0xcf,0x25,0x12,0xb3}, - {0xe5,0x1a,0x31,0x82}, {0xeb,0x13,0x3c,0x89}, {0xf9,0x08,0x2b,0x94}, {0xf7,0x01,0x26,0x9f}, - {0x4d,0xe6,0xbd,0x46}, {0x43,0xef,0xb0,0x4d}, {0x51,0xf4,0xa7,0x50}, {0x5f,0xfd,0xaa,0x5b}, - {0x75,0xc2,0x89,0x6a}, {0x7b,0xcb,0x84,0x61}, {0x69,0xd0,0x93,0x7c}, {0x67,0xd9,0x9e,0x77}, - {0x3d,0xae,0xd5,0x1e}, {0x33,0xa7,0xd8,0x15}, {0x21,0xbc,0xcf,0x08}, {0x2f,0xb5,0xc2,0x03}, - {0x05,0x8a,0xe1,0x32}, {0x0b,0x83,0xec,0x39}, {0x19,0x98,0xfb,0x24}, {0x17,0x91,0xf6,0x2f}, - {0x76,0x4d,0xd6,0x8d}, {0x78,0x44,0xdb,0x86}, {0x6a,0x5f,0xcc,0x9b}, {0x64,0x56,0xc1,0x90}, - {0x4e,0x69,0xe2,0xa1}, {0x40,0x60,0xef,0xaa}, {0x52,0x7b,0xf8,0xb7}, {0x5c,0x72,0xf5,0xbc}, - {0x06,0x05,0xbe,0xd5}, {0x08,0x0c,0xb3,0xde}, {0x1a,0x17,0xa4,0xc3}, {0x14,0x1e,0xa9,0xc8}, - {0x3e,0x21,0x8a,0xf9}, {0x30,0x28,0x87,0xf2}, {0x22,0x33,0x90,0xef}, {0x2c,0x3a,0x9d,0xe4}, - {0x96,0xdd,0x06,0x3d}, {0x98,0xd4,0x0b,0x36}, {0x8a,0xcf,0x1c,0x2b}, {0x84,0xc6,0x11,0x20}, - {0xae,0xf9,0x32,0x11}, {0xa0,0xf0,0x3f,0x1a}, {0xb2,0xeb,0x28,0x07}, {0xbc,0xe2,0x25,0x0c}, - {0xe6,0x95,0x6e,0x65}, {0xe8,0x9c,0x63,0x6e}, {0xfa,0x87,0x74,0x73}, {0xf4,0x8e,0x79,0x78}, - {0xde,0xb1,0x5a,0x49}, {0xd0,0xb8,0x57,0x42}, {0xc2,0xa3,0x40,0x5f}, {0xcc,0xaa,0x4d,0x54}, - {0x41,0xec,0xda,0xf7}, {0x4f,0xe5,0xd7,0xfc}, {0x5d,0xfe,0xc0,0xe1}, {0x53,0xf7,0xcd,0xea}, - {0x79,0xc8,0xee,0xdb}, {0x77,0xc1,0xe3,0xd0}, {0x65,0xda,0xf4,0xcd}, {0x6b,0xd3,0xf9,0xc6}, - {0x31,0xa4,0xb2,0xaf}, {0x3f,0xad,0xbf,0xa4}, {0x2d,0xb6,0xa8,0xb9}, {0x23,0xbf,0xa5,0xb2}, - {0x09,0x80,0x86,0x83}, {0x07,0x89,0x8b,0x88}, {0x15,0x92,0x9c,0x95}, {0x1b,0x9b,0x91,0x9e}, - {0xa1,0x7c,0x0a,0x47}, {0xaf,0x75,0x07,0x4c}, {0xbd,0x6e,0x10,0x51}, {0xb3,0x67,0x1d,0x5a}, - {0x99,0x58,0x3e,0x6b}, {0x97,0x51,0x33,0x60}, {0x85,0x4a,0x24,0x7d}, {0x8b,0x43,0x29,0x76}, - {0xd1,0x34,0x62,0x1f}, {0xdf,0x3d,0x6f,0x14}, {0xcd,0x26,0x78,0x09}, {0xc3,0x2f,0x75,0x02}, - {0xe9,0x10,0x56,0x33}, {0xe7,0x19,0x5b,0x38}, {0xf5,0x02,0x4c,0x25}, {0xfb,0x0b,0x41,0x2e}, - {0x9a,0xd7,0x61,0x8c}, {0x94,0xde,0x6c,0x87}, {0x86,0xc5,0x7b,0x9a}, {0x88,0xcc,0x76,0x91}, - {0xa2,0xf3,0x55,0xa0}, {0xac,0xfa,0x58,0xab}, {0xbe,0xe1,0x4f,0xb6}, {0xb0,0xe8,0x42,0xbd}, - {0xea,0x9f,0x09,0xd4}, {0xe4,0x96,0x04,0xdf}, {0xf6,0x8d,0x13,0xc2}, {0xf8,0x84,0x1e,0xc9}, - {0xd2,0xbb,0x3d,0xf8}, {0xdc,0xb2,0x30,0xf3}, {0xce,0xa9,0x27,0xee}, {0xc0,0xa0,0x2a,0xe5}, - {0x7a,0x47,0xb1,0x3c}, {0x74,0x4e,0xbc,0x37}, {0x66,0x55,0xab,0x2a}, {0x68,0x5c,0xa6,0x21}, - {0x42,0x63,0x85,0x10}, {0x4c,0x6a,0x88,0x1b}, {0x5e,0x71,0x9f,0x06}, {0x50,0x78,0x92,0x0d}, - {0x0a,0x0f,0xd9,0x64}, {0x04,0x06,0xd4,0x6f}, {0x16,0x1d,0xc3,0x72}, {0x18,0x14,0xce,0x79}, - {0x32,0x2b,0xed,0x48}, {0x3c,0x22,0xe0,0x43}, {0x2e,0x39,0xf7,0x5e}, {0x20,0x30,0xfa,0x55}, - {0xec,0x9a,0xb7,0x01}, {0xe2,0x93,0xba,0x0a}, {0xf0,0x88,0xad,0x17}, {0xfe,0x81,0xa0,0x1c}, - {0xd4,0xbe,0x83,0x2d}, {0xda,0xb7,0x8e,0x26}, {0xc8,0xac,0x99,0x3b}, {0xc6,0xa5,0x94,0x30}, - {0x9c,0xd2,0xdf,0x59}, {0x92,0xdb,0xd2,0x52}, {0x80,0xc0,0xc5,0x4f}, {0x8e,0xc9,0xc8,0x44}, - {0xa4,0xf6,0xeb,0x75}, {0xaa,0xff,0xe6,0x7e}, {0xb8,0xe4,0xf1,0x63}, {0xb6,0xed,0xfc,0x68}, - {0x0c,0x0a,0x67,0xb1}, {0x02,0x03,0x6a,0xba}, {0x10,0x18,0x7d,0xa7}, {0x1e,0x11,0x70,0xac}, - {0x34,0x2e,0x53,0x9d}, {0x3a,0x27,0x5e,0x96}, {0x28,0x3c,0x49,0x8b}, {0x26,0x35,0x44,0x80}, - {0x7c,0x42,0x0f,0xe9}, {0x72,0x4b,0x02,0xe2}, {0x60,0x50,0x15,0xff}, {0x6e,0x59,0x18,0xf4}, - {0x44,0x66,0x3b,0xc5}, {0x4a,0x6f,0x36,0xce}, {0x58,0x74,0x21,0xd3}, {0x56,0x7d,0x2c,0xd8}, - {0x37,0xa1,0x0c,0x7a}, {0x39,0xa8,0x01,0x71}, {0x2b,0xb3,0x16,0x6c}, {0x25,0xba,0x1b,0x67}, - {0x0f,0x85,0x38,0x56}, {0x01,0x8c,0x35,0x5d}, {0x13,0x97,0x22,0x40}, {0x1d,0x9e,0x2f,0x4b}, - {0x47,0xe9,0x64,0x22}, {0x49,0xe0,0x69,0x29}, {0x5b,0xfb,0x7e,0x34}, {0x55,0xf2,0x73,0x3f}, - {0x7f,0xcd,0x50,0x0e}, {0x71,0xc4,0x5d,0x05}, {0x63,0xdf,0x4a,0x18}, {0x6d,0xd6,0x47,0x13}, - {0xd7,0x31,0xdc,0xca}, {0xd9,0x38,0xd1,0xc1}, {0xcb,0x23,0xc6,0xdc}, {0xc5,0x2a,0xcb,0xd7}, - {0xef,0x15,0xe8,0xe6}, {0xe1,0x1c,0xe5,0xed}, {0xf3,0x07,0xf2,0xf0}, {0xfd,0x0e,0xff,0xfb}, - {0xa7,0x79,0xb4,0x92}, {0xa9,0x70,0xb9,0x99}, {0xbb,0x6b,0xae,0x84}, {0xb5,0x62,0xa3,0x8f}, + {0x00,0x00,0x00,0x00}, {0x0e,0x09,0x0d,0x0b}, {0x1c,0x12,0x1a,0x16}, {0x12,0x1b,0x17,0x1d}, + {0x38,0x24,0x34,0x2c}, {0x36,0x2d,0x39,0x27}, {0x24,0x36,0x2e,0x3a}, {0x2a,0x3f,0x23,0x31}, + {0x70,0x48,0x68,0x58}, {0x7e,0x41,0x65,0x53}, {0x6c,0x5a,0x72,0x4e}, {0x62,0x53,0x7f,0x45}, + {0x48,0x6c,0x5c,0x74}, {0x46,0x65,0x51,0x7f}, {0x54,0x7e,0x46,0x62}, {0x5a,0x77,0x4b,0x69}, + {0xe0,0x90,0xd0,0xb0}, {0xee,0x99,0xdd,0xbb}, {0xfc,0x82,0xca,0xa6}, {0xf2,0x8b,0xc7,0xad}, + {0xd8,0xb4,0xe4,0x9c}, {0xd6,0xbd,0xe9,0x97}, {0xc4,0xa6,0xfe,0x8a}, {0xca,0xaf,0xf3,0x81}, + {0x90,0xd8,0xb8,0xe8}, {0x9e,0xd1,0xb5,0xe3}, {0x8c,0xca,0xa2,0xfe}, {0x82,0xc3,0xaf,0xf5}, + {0xa8,0xfc,0x8c,0xc4}, {0xa6,0xf5,0x81,0xcf}, {0xb4,0xee,0x96,0xd2}, {0xba,0xe7,0x9b,0xd9}, + {0xdb,0x3b,0xbb,0x7b}, {0xd5,0x32,0xb6,0x70}, {0xc7,0x29,0xa1,0x6d}, {0xc9,0x20,0xac,0x66}, + {0xe3,0x1f,0x8f,0x57}, {0xed,0x16,0x82,0x5c}, {0xff,0x0d,0x95,0x41}, {0xf1,0x04,0x98,0x4a}, + {0xab,0x73,0xd3,0x23}, {0xa5,0x7a,0xde,0x28}, {0xb7,0x61,0xc9,0x35}, {0xb9,0x68,0xc4,0x3e}, + {0x93,0x57,0xe7,0x0f}, {0x9d,0x5e,0xea,0x04}, {0x8f,0x45,0xfd,0x19}, {0x81,0x4c,0xf0,0x12}, + {0x3b,0xab,0x6b,0xcb}, {0x35,0xa2,0x66,0xc0}, {0x27,0xb9,0x71,0xdd}, {0x29,0xb0,0x7c,0xd6}, + {0x03,0x8f,0x5f,0xe7}, {0x0d,0x86,0x52,0xec}, {0x1f,0x9d,0x45,0xf1}, {0x11,0x94,0x48,0xfa}, + {0x4b,0xe3,0x03,0x93}, {0x45,0xea,0x0e,0x98}, {0x57,0xf1,0x19,0x85}, {0x59,0xf8,0x14,0x8e}, + {0x73,0xc7,0x37,0xbf}, {0x7d,0xce,0x3a,0xb4}, {0x6f,0xd5,0x2d,0xa9}, {0x61,0xdc,0x20,0xa2}, + {0xad,0x76,0x6d,0xf6}, {0xa3,0x7f,0x60,0xfd}, {0xb1,0x64,0x77,0xe0}, {0xbf,0x6d,0x7a,0xeb}, + {0x95,0x52,0x59,0xda}, {0x9b,0x5b,0x54,0xd1}, {0x89,0x40,0x43,0xcc}, {0x87,0x49,0x4e,0xc7}, + {0xdd,0x3e,0x05,0xae}, {0xd3,0x37,0x08,0xa5}, {0xc1,0x2c,0x1f,0xb8}, {0xcf,0x25,0x12,0xb3}, + {0xe5,0x1a,0x31,0x82}, {0xeb,0x13,0x3c,0x89}, {0xf9,0x08,0x2b,0x94}, {0xf7,0x01,0x26,0x9f}, + {0x4d,0xe6,0xbd,0x46}, {0x43,0xef,0xb0,0x4d}, {0x51,0xf4,0xa7,0x50}, {0x5f,0xfd,0xaa,0x5b}, + {0x75,0xc2,0x89,0x6a}, {0x7b,0xcb,0x84,0x61}, {0x69,0xd0,0x93,0x7c}, {0x67,0xd9,0x9e,0x77}, + {0x3d,0xae,0xd5,0x1e}, {0x33,0xa7,0xd8,0x15}, {0x21,0xbc,0xcf,0x08}, {0x2f,0xb5,0xc2,0x03}, + {0x05,0x8a,0xe1,0x32}, {0x0b,0x83,0xec,0x39}, {0x19,0x98,0xfb,0x24}, {0x17,0x91,0xf6,0x2f}, + {0x76,0x4d,0xd6,0x8d}, {0x78,0x44,0xdb,0x86}, {0x6a,0x5f,0xcc,0x9b}, {0x64,0x56,0xc1,0x90}, + {0x4e,0x69,0xe2,0xa1}, {0x40,0x60,0xef,0xaa}, {0x52,0x7b,0xf8,0xb7}, {0x5c,0x72,0xf5,0xbc}, + {0x06,0x05,0xbe,0xd5}, {0x08,0x0c,0xb3,0xde}, {0x1a,0x17,0xa4,0xc3}, {0x14,0x1e,0xa9,0xc8}, + {0x3e,0x21,0x8a,0xf9}, {0x30,0x28,0x87,0xf2}, {0x22,0x33,0x90,0xef}, {0x2c,0x3a,0x9d,0xe4}, + {0x96,0xdd,0x06,0x3d}, {0x98,0xd4,0x0b,0x36}, {0x8a,0xcf,0x1c,0x2b}, {0x84,0xc6,0x11,0x20}, + {0xae,0xf9,0x32,0x11}, {0xa0,0xf0,0x3f,0x1a}, {0xb2,0xeb,0x28,0x07}, {0xbc,0xe2,0x25,0x0c}, + {0xe6,0x95,0x6e,0x65}, {0xe8,0x9c,0x63,0x6e}, {0xfa,0x87,0x74,0x73}, {0xf4,0x8e,0x79,0x78}, + {0xde,0xb1,0x5a,0x49}, {0xd0,0xb8,0x57,0x42}, {0xc2,0xa3,0x40,0x5f}, {0xcc,0xaa,0x4d,0x54}, + {0x41,0xec,0xda,0xf7}, {0x4f,0xe5,0xd7,0xfc}, {0x5d,0xfe,0xc0,0xe1}, {0x53,0xf7,0xcd,0xea}, + {0x79,0xc8,0xee,0xdb}, {0x77,0xc1,0xe3,0xd0}, {0x65,0xda,0xf4,0xcd}, {0x6b,0xd3,0xf9,0xc6}, + {0x31,0xa4,0xb2,0xaf}, {0x3f,0xad,0xbf,0xa4}, {0x2d,0xb6,0xa8,0xb9}, {0x23,0xbf,0xa5,0xb2}, + {0x09,0x80,0x86,0x83}, {0x07,0x89,0x8b,0x88}, {0x15,0x92,0x9c,0x95}, {0x1b,0x9b,0x91,0x9e}, + {0xa1,0x7c,0x0a,0x47}, {0xaf,0x75,0x07,0x4c}, {0xbd,0x6e,0x10,0x51}, {0xb3,0x67,0x1d,0x5a}, + {0x99,0x58,0x3e,0x6b}, {0x97,0x51,0x33,0x60}, {0x85,0x4a,0x24,0x7d}, {0x8b,0x43,0x29,0x76}, + {0xd1,0x34,0x62,0x1f}, {0xdf,0x3d,0x6f,0x14}, {0xcd,0x26,0x78,0x09}, {0xc3,0x2f,0x75,0x02}, + {0xe9,0x10,0x56,0x33}, {0xe7,0x19,0x5b,0x38}, {0xf5,0x02,0x4c,0x25}, {0xfb,0x0b,0x41,0x2e}, + {0x9a,0xd7,0x61,0x8c}, {0x94,0xde,0x6c,0x87}, {0x86,0xc5,0x7b,0x9a}, {0x88,0xcc,0x76,0x91}, + {0xa2,0xf3,0x55,0xa0}, {0xac,0xfa,0x58,0xab}, {0xbe,0xe1,0x4f,0xb6}, {0xb0,0xe8,0x42,0xbd}, + {0xea,0x9f,0x09,0xd4}, {0xe4,0x96,0x04,0xdf}, {0xf6,0x8d,0x13,0xc2}, {0xf8,0x84,0x1e,0xc9}, + {0xd2,0xbb,0x3d,0xf8}, {0xdc,0xb2,0x30,0xf3}, {0xce,0xa9,0x27,0xee}, {0xc0,0xa0,0x2a,0xe5}, + {0x7a,0x47,0xb1,0x3c}, {0x74,0x4e,0xbc,0x37}, {0x66,0x55,0xab,0x2a}, {0x68,0x5c,0xa6,0x21}, + {0x42,0x63,0x85,0x10}, {0x4c,0x6a,0x88,0x1b}, {0x5e,0x71,0x9f,0x06}, {0x50,0x78,0x92,0x0d}, + {0x0a,0x0f,0xd9,0x64}, {0x04,0x06,0xd4,0x6f}, {0x16,0x1d,0xc3,0x72}, {0x18,0x14,0xce,0x79}, + {0x32,0x2b,0xed,0x48}, {0x3c,0x22,0xe0,0x43}, {0x2e,0x39,0xf7,0x5e}, {0x20,0x30,0xfa,0x55}, + {0xec,0x9a,0xb7,0x01}, {0xe2,0x93,0xba,0x0a}, {0xf0,0x88,0xad,0x17}, {0xfe,0x81,0xa0,0x1c}, + {0xd4,0xbe,0x83,0x2d}, {0xda,0xb7,0x8e,0x26}, {0xc8,0xac,0x99,0x3b}, {0xc6,0xa5,0x94,0x30}, + {0x9c,0xd2,0xdf,0x59}, {0x92,0xdb,0xd2,0x52}, {0x80,0xc0,0xc5,0x4f}, {0x8e,0xc9,0xc8,0x44}, + {0xa4,0xf6,0xeb,0x75}, {0xaa,0xff,0xe6,0x7e}, {0xb8,0xe4,0xf1,0x63}, {0xb6,0xed,0xfc,0x68}, + {0x0c,0x0a,0x67,0xb1}, {0x02,0x03,0x6a,0xba}, {0x10,0x18,0x7d,0xa7}, {0x1e,0x11,0x70,0xac}, + {0x34,0x2e,0x53,0x9d}, {0x3a,0x27,0x5e,0x96}, {0x28,0x3c,0x49,0x8b}, {0x26,0x35,0x44,0x80}, + {0x7c,0x42,0x0f,0xe9}, {0x72,0x4b,0x02,0xe2}, {0x60,0x50,0x15,0xff}, {0x6e,0x59,0x18,0xf4}, + {0x44,0x66,0x3b,0xc5}, {0x4a,0x6f,0x36,0xce}, {0x58,0x74,0x21,0xd3}, {0x56,0x7d,0x2c,0xd8}, + {0x37,0xa1,0x0c,0x7a}, {0x39,0xa8,0x01,0x71}, {0x2b,0xb3,0x16,0x6c}, {0x25,0xba,0x1b,0x67}, + {0x0f,0x85,0x38,0x56}, {0x01,0x8c,0x35,0x5d}, {0x13,0x97,0x22,0x40}, {0x1d,0x9e,0x2f,0x4b}, + {0x47,0xe9,0x64,0x22}, {0x49,0xe0,0x69,0x29}, {0x5b,0xfb,0x7e,0x34}, {0x55,0xf2,0x73,0x3f}, + {0x7f,0xcd,0x50,0x0e}, {0x71,0xc4,0x5d,0x05}, {0x63,0xdf,0x4a,0x18}, {0x6d,0xd6,0x47,0x13}, + {0xd7,0x31,0xdc,0xca}, {0xd9,0x38,0xd1,0xc1}, {0xcb,0x23,0xc6,0xdc}, {0xc5,0x2a,0xcb,0xd7}, + {0xef,0x15,0xe8,0xe6}, {0xe1,0x1c,0xe5,0xed}, {0xf3,0x07,0xf2,0xf0}, {0xfd,0x0e,0xff,0xfb}, + {0xa7,0x79,0xb4,0x92}, {0xa9,0x70,0xb9,0x99}, {0xbb,0x6b,0xae,0x84}, {0xb5,0x62,0xa3,0x8f}, {0x9f,0x5d,0x80,0xbe}, {0x91,0x54,0x8d,0xb5}, {0x83,0x4f,0x9a,0xa8}, {0x8d,0x46,0x97,0xa3} }; - + static UINT8 U2[256][4]= { - {0x00,0x00,0x00,0x00}, {0x0b,0x0e,0x09,0x0d}, {0x16,0x1c,0x12,0x1a}, {0x1d,0x12,0x1b,0x17}, - {0x2c,0x38,0x24,0x34}, {0x27,0x36,0x2d,0x39}, {0x3a,0x24,0x36,0x2e}, {0x31,0x2a,0x3f,0x23}, - {0x58,0x70,0x48,0x68}, {0x53,0x7e,0x41,0x65}, {0x4e,0x6c,0x5a,0x72}, {0x45,0x62,0x53,0x7f}, - {0x74,0x48,0x6c,0x5c}, {0x7f,0x46,0x65,0x51}, {0x62,0x54,0x7e,0x46}, {0x69,0x5a,0x77,0x4b}, - {0xb0,0xe0,0x90,0xd0}, {0xbb,0xee,0x99,0xdd}, {0xa6,0xfc,0x82,0xca}, {0xad,0xf2,0x8b,0xc7}, - {0x9c,0xd8,0xb4,0xe4}, {0x97,0xd6,0xbd,0xe9}, {0x8a,0xc4,0xa6,0xfe}, {0x81,0xca,0xaf,0xf3}, - {0xe8,0x90,0xd8,0xb8}, {0xe3,0x9e,0xd1,0xb5}, {0xfe,0x8c,0xca,0xa2}, {0xf5,0x82,0xc3,0xaf}, - {0xc4,0xa8,0xfc,0x8c}, {0xcf,0xa6,0xf5,0x81}, {0xd2,0xb4,0xee,0x96}, {0xd9,0xba,0xe7,0x9b}, - {0x7b,0xdb,0x3b,0xbb}, {0x70,0xd5,0x32,0xb6}, {0x6d,0xc7,0x29,0xa1}, {0x66,0xc9,0x20,0xac}, - {0x57,0xe3,0x1f,0x8f}, {0x5c,0xed,0x16,0x82}, {0x41,0xff,0x0d,0x95}, {0x4a,0xf1,0x04,0x98}, - {0x23,0xab,0x73,0xd3}, {0x28,0xa5,0x7a,0xde}, {0x35,0xb7,0x61,0xc9}, {0x3e,0xb9,0x68,0xc4}, - {0x0f,0x93,0x57,0xe7}, {0x04,0x9d,0x5e,0xea}, {0x19,0x8f,0x45,0xfd}, {0x12,0x81,0x4c,0xf0}, - {0xcb,0x3b,0xab,0x6b}, {0xc0,0x35,0xa2,0x66}, {0xdd,0x27,0xb9,0x71}, {0xd6,0x29,0xb0,0x7c}, - {0xe7,0x03,0x8f,0x5f}, {0xec,0x0d,0x86,0x52}, {0xf1,0x1f,0x9d,0x45}, {0xfa,0x11,0x94,0x48}, - {0x93,0x4b,0xe3,0x03}, {0x98,0x45,0xea,0x0e}, {0x85,0x57,0xf1,0x19}, {0x8e,0x59,0xf8,0x14}, - {0xbf,0x73,0xc7,0x37}, {0xb4,0x7d,0xce,0x3a}, {0xa9,0x6f,0xd5,0x2d}, {0xa2,0x61,0xdc,0x20}, - {0xf6,0xad,0x76,0x6d}, {0xfd,0xa3,0x7f,0x60}, {0xe0,0xb1,0x64,0x77}, {0xeb,0xbf,0x6d,0x7a}, - {0xda,0x95,0x52,0x59}, {0xd1,0x9b,0x5b,0x54}, {0xcc,0x89,0x40,0x43}, {0xc7,0x87,0x49,0x4e}, - {0xae,0xdd,0x3e,0x05}, {0xa5,0xd3,0x37,0x08}, {0xb8,0xc1,0x2c,0x1f}, {0xb3,0xcf,0x25,0x12}, - {0x82,0xe5,0x1a,0x31}, {0x89,0xeb,0x13,0x3c}, {0x94,0xf9,0x08,0x2b}, {0x9f,0xf7,0x01,0x26}, - {0x46,0x4d,0xe6,0xbd}, {0x4d,0x43,0xef,0xb0}, {0x50,0x51,0xf4,0xa7}, {0x5b,0x5f,0xfd,0xaa}, - {0x6a,0x75,0xc2,0x89}, {0x61,0x7b,0xcb,0x84}, {0x7c,0x69,0xd0,0x93}, {0x77,0x67,0xd9,0x9e}, - {0x1e,0x3d,0xae,0xd5}, {0x15,0x33,0xa7,0xd8}, {0x08,0x21,0xbc,0xcf}, {0x03,0x2f,0xb5,0xc2}, - {0x32,0x05,0x8a,0xe1}, {0x39,0x0b,0x83,0xec}, {0x24,0x19,0x98,0xfb}, {0x2f,0x17,0x91,0xf6}, - {0x8d,0x76,0x4d,0xd6}, {0x86,0x78,0x44,0xdb}, {0x9b,0x6a,0x5f,0xcc}, {0x90,0x64,0x56,0xc1}, - {0xa1,0x4e,0x69,0xe2}, {0xaa,0x40,0x60,0xef}, {0xb7,0x52,0x7b,0xf8}, {0xbc,0x5c,0x72,0xf5}, - {0xd5,0x06,0x05,0xbe}, {0xde,0x08,0x0c,0xb3}, {0xc3,0x1a,0x17,0xa4}, {0xc8,0x14,0x1e,0xa9}, - {0xf9,0x3e,0x21,0x8a}, {0xf2,0x30,0x28,0x87}, {0xef,0x22,0x33,0x90}, {0xe4,0x2c,0x3a,0x9d}, - {0x3d,0x96,0xdd,0x06}, {0x36,0x98,0xd4,0x0b}, {0x2b,0x8a,0xcf,0x1c}, {0x20,0x84,0xc6,0x11}, - {0x11,0xae,0xf9,0x32}, {0x1a,0xa0,0xf0,0x3f}, {0x07,0xb2,0xeb,0x28}, {0x0c,0xbc,0xe2,0x25}, - {0x65,0xe6,0x95,0x6e}, {0x6e,0xe8,0x9c,0x63}, {0x73,0xfa,0x87,0x74}, {0x78,0xf4,0x8e,0x79}, - {0x49,0xde,0xb1,0x5a}, {0x42,0xd0,0xb8,0x57}, {0x5f,0xc2,0xa3,0x40}, {0x54,0xcc,0xaa,0x4d}, - {0xf7,0x41,0xec,0xda}, {0xfc,0x4f,0xe5,0xd7}, {0xe1,0x5d,0xfe,0xc0}, {0xea,0x53,0xf7,0xcd}, - {0xdb,0x79,0xc8,0xee}, {0xd0,0x77,0xc1,0xe3}, {0xcd,0x65,0xda,0xf4}, {0xc6,0x6b,0xd3,0xf9}, - {0xaf,0x31,0xa4,0xb2}, {0xa4,0x3f,0xad,0xbf}, {0xb9,0x2d,0xb6,0xa8}, {0xb2,0x23,0xbf,0xa5}, - {0x83,0x09,0x80,0x86}, {0x88,0x07,0x89,0x8b}, {0x95,0x15,0x92,0x9c}, {0x9e,0x1b,0x9b,0x91}, - {0x47,0xa1,0x7c,0x0a}, {0x4c,0xaf,0x75,0x07}, {0x51,0xbd,0x6e,0x10}, {0x5a,0xb3,0x67,0x1d}, - {0x6b,0x99,0x58,0x3e}, {0x60,0x97,0x51,0x33}, {0x7d,0x85,0x4a,0x24}, {0x76,0x8b,0x43,0x29}, - {0x1f,0xd1,0x34,0x62}, {0x14,0xdf,0x3d,0x6f}, {0x09,0xcd,0x26,0x78}, {0x02,0xc3,0x2f,0x75}, - {0x33,0xe9,0x10,0x56}, {0x38,0xe7,0x19,0x5b}, {0x25,0xf5,0x02,0x4c}, {0x2e,0xfb,0x0b,0x41}, - {0x8c,0x9a,0xd7,0x61}, {0x87,0x94,0xde,0x6c}, {0x9a,0x86,0xc5,0x7b}, {0x91,0x88,0xcc,0x76}, - {0xa0,0xa2,0xf3,0x55}, {0xab,0xac,0xfa,0x58}, {0xb6,0xbe,0xe1,0x4f}, {0xbd,0xb0,0xe8,0x42}, - {0xd4,0xea,0x9f,0x09}, {0xdf,0xe4,0x96,0x04}, {0xc2,0xf6,0x8d,0x13}, {0xc9,0xf8,0x84,0x1e}, - {0xf8,0xd2,0xbb,0x3d}, {0xf3,0xdc,0xb2,0x30}, {0xee,0xce,0xa9,0x27}, {0xe5,0xc0,0xa0,0x2a}, - {0x3c,0x7a,0x47,0xb1}, {0x37,0x74,0x4e,0xbc}, {0x2a,0x66,0x55,0xab}, {0x21,0x68,0x5c,0xa6}, - {0x10,0x42,0x63,0x85}, {0x1b,0x4c,0x6a,0x88}, {0x06,0x5e,0x71,0x9f}, {0x0d,0x50,0x78,0x92}, - {0x64,0x0a,0x0f,0xd9}, {0x6f,0x04,0x06,0xd4}, {0x72,0x16,0x1d,0xc3}, {0x79,0x18,0x14,0xce}, - {0x48,0x32,0x2b,0xed}, {0x43,0x3c,0x22,0xe0}, {0x5e,0x2e,0x39,0xf7}, {0x55,0x20,0x30,0xfa}, - {0x01,0xec,0x9a,0xb7}, {0x0a,0xe2,0x93,0xba}, {0x17,0xf0,0x88,0xad}, {0x1c,0xfe,0x81,0xa0}, - {0x2d,0xd4,0xbe,0x83}, {0x26,0xda,0xb7,0x8e}, {0x3b,0xc8,0xac,0x99}, {0x30,0xc6,0xa5,0x94}, - {0x59,0x9c,0xd2,0xdf}, {0x52,0x92,0xdb,0xd2}, {0x4f,0x80,0xc0,0xc5}, {0x44,0x8e,0xc9,0xc8}, - {0x75,0xa4,0xf6,0xeb}, {0x7e,0xaa,0xff,0xe6}, {0x63,0xb8,0xe4,0xf1}, {0x68,0xb6,0xed,0xfc}, - {0xb1,0x0c,0x0a,0x67}, {0xba,0x02,0x03,0x6a}, {0xa7,0x10,0x18,0x7d}, {0xac,0x1e,0x11,0x70}, - {0x9d,0x34,0x2e,0x53}, {0x96,0x3a,0x27,0x5e}, {0x8b,0x28,0x3c,0x49}, {0x80,0x26,0x35,0x44}, - {0xe9,0x7c,0x42,0x0f}, {0xe2,0x72,0x4b,0x02}, {0xff,0x60,0x50,0x15}, {0xf4,0x6e,0x59,0x18}, - {0xc5,0x44,0x66,0x3b}, {0xce,0x4a,0x6f,0x36}, {0xd3,0x58,0x74,0x21}, {0xd8,0x56,0x7d,0x2c}, - {0x7a,0x37,0xa1,0x0c}, {0x71,0x39,0xa8,0x01}, {0x6c,0x2b,0xb3,0x16}, {0x67,0x25,0xba,0x1b}, - {0x56,0x0f,0x85,0x38}, {0x5d,0x01,0x8c,0x35}, {0x40,0x13,0x97,0x22}, {0x4b,0x1d,0x9e,0x2f}, - {0x22,0x47,0xe9,0x64}, {0x29,0x49,0xe0,0x69}, {0x34,0x5b,0xfb,0x7e}, {0x3f,0x55,0xf2,0x73}, - {0x0e,0x7f,0xcd,0x50}, {0x05,0x71,0xc4,0x5d}, {0x18,0x63,0xdf,0x4a}, {0x13,0x6d,0xd6,0x47}, - {0xca,0xd7,0x31,0xdc}, {0xc1,0xd9,0x38,0xd1}, {0xdc,0xcb,0x23,0xc6}, {0xd7,0xc5,0x2a,0xcb}, - {0xe6,0xef,0x15,0xe8}, {0xed,0xe1,0x1c,0xe5}, {0xf0,0xf3,0x07,0xf2}, {0xfb,0xfd,0x0e,0xff}, - {0x92,0xa7,0x79,0xb4}, {0x99,0xa9,0x70,0xb9}, {0x84,0xbb,0x6b,0xae}, {0x8f,0xb5,0x62,0xa3}, + {0x00,0x00,0x00,0x00}, {0x0b,0x0e,0x09,0x0d}, {0x16,0x1c,0x12,0x1a}, {0x1d,0x12,0x1b,0x17}, + {0x2c,0x38,0x24,0x34}, {0x27,0x36,0x2d,0x39}, {0x3a,0x24,0x36,0x2e}, {0x31,0x2a,0x3f,0x23}, + {0x58,0x70,0x48,0x68}, {0x53,0x7e,0x41,0x65}, {0x4e,0x6c,0x5a,0x72}, {0x45,0x62,0x53,0x7f}, + {0x74,0x48,0x6c,0x5c}, {0x7f,0x46,0x65,0x51}, {0x62,0x54,0x7e,0x46}, {0x69,0x5a,0x77,0x4b}, + {0xb0,0xe0,0x90,0xd0}, {0xbb,0xee,0x99,0xdd}, {0xa6,0xfc,0x82,0xca}, {0xad,0xf2,0x8b,0xc7}, + {0x9c,0xd8,0xb4,0xe4}, {0x97,0xd6,0xbd,0xe9}, {0x8a,0xc4,0xa6,0xfe}, {0x81,0xca,0xaf,0xf3}, + {0xe8,0x90,0xd8,0xb8}, {0xe3,0x9e,0xd1,0xb5}, {0xfe,0x8c,0xca,0xa2}, {0xf5,0x82,0xc3,0xaf}, + {0xc4,0xa8,0xfc,0x8c}, {0xcf,0xa6,0xf5,0x81}, {0xd2,0xb4,0xee,0x96}, {0xd9,0xba,0xe7,0x9b}, + {0x7b,0xdb,0x3b,0xbb}, {0x70,0xd5,0x32,0xb6}, {0x6d,0xc7,0x29,0xa1}, {0x66,0xc9,0x20,0xac}, + {0x57,0xe3,0x1f,0x8f}, {0x5c,0xed,0x16,0x82}, {0x41,0xff,0x0d,0x95}, {0x4a,0xf1,0x04,0x98}, + {0x23,0xab,0x73,0xd3}, {0x28,0xa5,0x7a,0xde}, {0x35,0xb7,0x61,0xc9}, {0x3e,0xb9,0x68,0xc4}, + {0x0f,0x93,0x57,0xe7}, {0x04,0x9d,0x5e,0xea}, {0x19,0x8f,0x45,0xfd}, {0x12,0x81,0x4c,0xf0}, + {0xcb,0x3b,0xab,0x6b}, {0xc0,0x35,0xa2,0x66}, {0xdd,0x27,0xb9,0x71}, {0xd6,0x29,0xb0,0x7c}, + {0xe7,0x03,0x8f,0x5f}, {0xec,0x0d,0x86,0x52}, {0xf1,0x1f,0x9d,0x45}, {0xfa,0x11,0x94,0x48}, + {0x93,0x4b,0xe3,0x03}, {0x98,0x45,0xea,0x0e}, {0x85,0x57,0xf1,0x19}, {0x8e,0x59,0xf8,0x14}, + {0xbf,0x73,0xc7,0x37}, {0xb4,0x7d,0xce,0x3a}, {0xa9,0x6f,0xd5,0x2d}, {0xa2,0x61,0xdc,0x20}, + {0xf6,0xad,0x76,0x6d}, {0xfd,0xa3,0x7f,0x60}, {0xe0,0xb1,0x64,0x77}, {0xeb,0xbf,0x6d,0x7a}, + {0xda,0x95,0x52,0x59}, {0xd1,0x9b,0x5b,0x54}, {0xcc,0x89,0x40,0x43}, {0xc7,0x87,0x49,0x4e}, + {0xae,0xdd,0x3e,0x05}, {0xa5,0xd3,0x37,0x08}, {0xb8,0xc1,0x2c,0x1f}, {0xb3,0xcf,0x25,0x12}, + {0x82,0xe5,0x1a,0x31}, {0x89,0xeb,0x13,0x3c}, {0x94,0xf9,0x08,0x2b}, {0x9f,0xf7,0x01,0x26}, + {0x46,0x4d,0xe6,0xbd}, {0x4d,0x43,0xef,0xb0}, {0x50,0x51,0xf4,0xa7}, {0x5b,0x5f,0xfd,0xaa}, + {0x6a,0x75,0xc2,0x89}, {0x61,0x7b,0xcb,0x84}, {0x7c,0x69,0xd0,0x93}, {0x77,0x67,0xd9,0x9e}, + {0x1e,0x3d,0xae,0xd5}, {0x15,0x33,0xa7,0xd8}, {0x08,0x21,0xbc,0xcf}, {0x03,0x2f,0xb5,0xc2}, + {0x32,0x05,0x8a,0xe1}, {0x39,0x0b,0x83,0xec}, {0x24,0x19,0x98,0xfb}, {0x2f,0x17,0x91,0xf6}, + {0x8d,0x76,0x4d,0xd6}, {0x86,0x78,0x44,0xdb}, {0x9b,0x6a,0x5f,0xcc}, {0x90,0x64,0x56,0xc1}, + {0xa1,0x4e,0x69,0xe2}, {0xaa,0x40,0x60,0xef}, {0xb7,0x52,0x7b,0xf8}, {0xbc,0x5c,0x72,0xf5}, + {0xd5,0x06,0x05,0xbe}, {0xde,0x08,0x0c,0xb3}, {0xc3,0x1a,0x17,0xa4}, {0xc8,0x14,0x1e,0xa9}, + {0xf9,0x3e,0x21,0x8a}, {0xf2,0x30,0x28,0x87}, {0xef,0x22,0x33,0x90}, {0xe4,0x2c,0x3a,0x9d}, + {0x3d,0x96,0xdd,0x06}, {0x36,0x98,0xd4,0x0b}, {0x2b,0x8a,0xcf,0x1c}, {0x20,0x84,0xc6,0x11}, + {0x11,0xae,0xf9,0x32}, {0x1a,0xa0,0xf0,0x3f}, {0x07,0xb2,0xeb,0x28}, {0x0c,0xbc,0xe2,0x25}, + {0x65,0xe6,0x95,0x6e}, {0x6e,0xe8,0x9c,0x63}, {0x73,0xfa,0x87,0x74}, {0x78,0xf4,0x8e,0x79}, + {0x49,0xde,0xb1,0x5a}, {0x42,0xd0,0xb8,0x57}, {0x5f,0xc2,0xa3,0x40}, {0x54,0xcc,0xaa,0x4d}, + {0xf7,0x41,0xec,0xda}, {0xfc,0x4f,0xe5,0xd7}, {0xe1,0x5d,0xfe,0xc0}, {0xea,0x53,0xf7,0xcd}, + {0xdb,0x79,0xc8,0xee}, {0xd0,0x77,0xc1,0xe3}, {0xcd,0x65,0xda,0xf4}, {0xc6,0x6b,0xd3,0xf9}, + {0xaf,0x31,0xa4,0xb2}, {0xa4,0x3f,0xad,0xbf}, {0xb9,0x2d,0xb6,0xa8}, {0xb2,0x23,0xbf,0xa5}, + {0x83,0x09,0x80,0x86}, {0x88,0x07,0x89,0x8b}, {0x95,0x15,0x92,0x9c}, {0x9e,0x1b,0x9b,0x91}, + {0x47,0xa1,0x7c,0x0a}, {0x4c,0xaf,0x75,0x07}, {0x51,0xbd,0x6e,0x10}, {0x5a,0xb3,0x67,0x1d}, + {0x6b,0x99,0x58,0x3e}, {0x60,0x97,0x51,0x33}, {0x7d,0x85,0x4a,0x24}, {0x76,0x8b,0x43,0x29}, + {0x1f,0xd1,0x34,0x62}, {0x14,0xdf,0x3d,0x6f}, {0x09,0xcd,0x26,0x78}, {0x02,0xc3,0x2f,0x75}, + {0x33,0xe9,0x10,0x56}, {0x38,0xe7,0x19,0x5b}, {0x25,0xf5,0x02,0x4c}, {0x2e,0xfb,0x0b,0x41}, + {0x8c,0x9a,0xd7,0x61}, {0x87,0x94,0xde,0x6c}, {0x9a,0x86,0xc5,0x7b}, {0x91,0x88,0xcc,0x76}, + {0xa0,0xa2,0xf3,0x55}, {0xab,0xac,0xfa,0x58}, {0xb6,0xbe,0xe1,0x4f}, {0xbd,0xb0,0xe8,0x42}, + {0xd4,0xea,0x9f,0x09}, {0xdf,0xe4,0x96,0x04}, {0xc2,0xf6,0x8d,0x13}, {0xc9,0xf8,0x84,0x1e}, + {0xf8,0xd2,0xbb,0x3d}, {0xf3,0xdc,0xb2,0x30}, {0xee,0xce,0xa9,0x27}, {0xe5,0xc0,0xa0,0x2a}, + {0x3c,0x7a,0x47,0xb1}, {0x37,0x74,0x4e,0xbc}, {0x2a,0x66,0x55,0xab}, {0x21,0x68,0x5c,0xa6}, + {0x10,0x42,0x63,0x85}, {0x1b,0x4c,0x6a,0x88}, {0x06,0x5e,0x71,0x9f}, {0x0d,0x50,0x78,0x92}, + {0x64,0x0a,0x0f,0xd9}, {0x6f,0x04,0x06,0xd4}, {0x72,0x16,0x1d,0xc3}, {0x79,0x18,0x14,0xce}, + {0x48,0x32,0x2b,0xed}, {0x43,0x3c,0x22,0xe0}, {0x5e,0x2e,0x39,0xf7}, {0x55,0x20,0x30,0xfa}, + {0x01,0xec,0x9a,0xb7}, {0x0a,0xe2,0x93,0xba}, {0x17,0xf0,0x88,0xad}, {0x1c,0xfe,0x81,0xa0}, + {0x2d,0xd4,0xbe,0x83}, {0x26,0xda,0xb7,0x8e}, {0x3b,0xc8,0xac,0x99}, {0x30,0xc6,0xa5,0x94}, + {0x59,0x9c,0xd2,0xdf}, {0x52,0x92,0xdb,0xd2}, {0x4f,0x80,0xc0,0xc5}, {0x44,0x8e,0xc9,0xc8}, + {0x75,0xa4,0xf6,0xeb}, {0x7e,0xaa,0xff,0xe6}, {0x63,0xb8,0xe4,0xf1}, {0x68,0xb6,0xed,0xfc}, + {0xb1,0x0c,0x0a,0x67}, {0xba,0x02,0x03,0x6a}, {0xa7,0x10,0x18,0x7d}, {0xac,0x1e,0x11,0x70}, + {0x9d,0x34,0x2e,0x53}, {0x96,0x3a,0x27,0x5e}, {0x8b,0x28,0x3c,0x49}, {0x80,0x26,0x35,0x44}, + {0xe9,0x7c,0x42,0x0f}, {0xe2,0x72,0x4b,0x02}, {0xff,0x60,0x50,0x15}, {0xf4,0x6e,0x59,0x18}, + {0xc5,0x44,0x66,0x3b}, {0xce,0x4a,0x6f,0x36}, {0xd3,0x58,0x74,0x21}, {0xd8,0x56,0x7d,0x2c}, + {0x7a,0x37,0xa1,0x0c}, {0x71,0x39,0xa8,0x01}, {0x6c,0x2b,0xb3,0x16}, {0x67,0x25,0xba,0x1b}, + {0x56,0x0f,0x85,0x38}, {0x5d,0x01,0x8c,0x35}, {0x40,0x13,0x97,0x22}, {0x4b,0x1d,0x9e,0x2f}, + {0x22,0x47,0xe9,0x64}, {0x29,0x49,0xe0,0x69}, {0x34,0x5b,0xfb,0x7e}, {0x3f,0x55,0xf2,0x73}, + {0x0e,0x7f,0xcd,0x50}, {0x05,0x71,0xc4,0x5d}, {0x18,0x63,0xdf,0x4a}, {0x13,0x6d,0xd6,0x47}, + {0xca,0xd7,0x31,0xdc}, {0xc1,0xd9,0x38,0xd1}, {0xdc,0xcb,0x23,0xc6}, {0xd7,0xc5,0x2a,0xcb}, + {0xe6,0xef,0x15,0xe8}, {0xed,0xe1,0x1c,0xe5}, {0xf0,0xf3,0x07,0xf2}, {0xfb,0xfd,0x0e,0xff}, + {0x92,0xa7,0x79,0xb4}, {0x99,0xa9,0x70,0xb9}, {0x84,0xbb,0x6b,0xae}, {0x8f,0xb5,0x62,0xa3}, {0xbe,0x9f,0x5d,0x80}, {0xb5,0x91,0x54,0x8d}, {0xa8,0x83,0x4f,0x9a}, {0xa3,0x8d,0x46,0x97} }; static UINT8 U3[256][4]= { - {0x00,0x00,0x00,0x00}, {0x0d,0x0b,0x0e,0x09}, {0x1a,0x16,0x1c,0x12}, {0x17,0x1d,0x12,0x1b}, - {0x34,0x2c,0x38,0x24}, {0x39,0x27,0x36,0x2d}, {0x2e,0x3a,0x24,0x36}, {0x23,0x31,0x2a,0x3f}, - {0x68,0x58,0x70,0x48}, {0x65,0x53,0x7e,0x41}, {0x72,0x4e,0x6c,0x5a}, {0x7f,0x45,0x62,0x53}, - {0x5c,0x74,0x48,0x6c}, {0x51,0x7f,0x46,0x65}, {0x46,0x62,0x54,0x7e}, {0x4b,0x69,0x5a,0x77}, - {0xd0,0xb0,0xe0,0x90}, {0xdd,0xbb,0xee,0x99}, {0xca,0xa6,0xfc,0x82}, {0xc7,0xad,0xf2,0x8b}, - {0xe4,0x9c,0xd8,0xb4}, {0xe9,0x97,0xd6,0xbd}, {0xfe,0x8a,0xc4,0xa6}, {0xf3,0x81,0xca,0xaf}, - {0xb8,0xe8,0x90,0xd8}, {0xb5,0xe3,0x9e,0xd1}, {0xa2,0xfe,0x8c,0xca}, {0xaf,0xf5,0x82,0xc3}, - {0x8c,0xc4,0xa8,0xfc}, {0x81,0xcf,0xa6,0xf5}, {0x96,0xd2,0xb4,0xee}, {0x9b,0xd9,0xba,0xe7}, - {0xbb,0x7b,0xdb,0x3b}, {0xb6,0x70,0xd5,0x32}, {0xa1,0x6d,0xc7,0x29}, {0xac,0x66,0xc9,0x20}, - {0x8f,0x57,0xe3,0x1f}, {0x82,0x5c,0xed,0x16}, {0x95,0x41,0xff,0x0d}, {0x98,0x4a,0xf1,0x04}, - {0xd3,0x23,0xab,0x73}, {0xde,0x28,0xa5,0x7a}, {0xc9,0x35,0xb7,0x61}, {0xc4,0x3e,0xb9,0x68}, - {0xe7,0x0f,0x93,0x57}, {0xea,0x04,0x9d,0x5e}, {0xfd,0x19,0x8f,0x45}, {0xf0,0x12,0x81,0x4c}, - {0x6b,0xcb,0x3b,0xab}, {0x66,0xc0,0x35,0xa2}, {0x71,0xdd,0x27,0xb9}, {0x7c,0xd6,0x29,0xb0}, - {0x5f,0xe7,0x03,0x8f}, {0x52,0xec,0x0d,0x86}, {0x45,0xf1,0x1f,0x9d}, {0x48,0xfa,0x11,0x94}, - {0x03,0x93,0x4b,0xe3}, {0x0e,0x98,0x45,0xea}, {0x19,0x85,0x57,0xf1}, {0x14,0x8e,0x59,0xf8}, - {0x37,0xbf,0x73,0xc7}, {0x3a,0xb4,0x7d,0xce}, {0x2d,0xa9,0x6f,0xd5}, {0x20,0xa2,0x61,0xdc}, - {0x6d,0xf6,0xad,0x76}, {0x60,0xfd,0xa3,0x7f}, {0x77,0xe0,0xb1,0x64}, {0x7a,0xeb,0xbf,0x6d}, - {0x59,0xda,0x95,0x52}, {0x54,0xd1,0x9b,0x5b}, {0x43,0xcc,0x89,0x40}, {0x4e,0xc7,0x87,0x49}, - {0x05,0xae,0xdd,0x3e}, {0x08,0xa5,0xd3,0x37}, {0x1f,0xb8,0xc1,0x2c}, {0x12,0xb3,0xcf,0x25}, - {0x31,0x82,0xe5,0x1a}, {0x3c,0x89,0xeb,0x13}, {0x2b,0x94,0xf9,0x08}, {0x26,0x9f,0xf7,0x01}, - {0xbd,0x46,0x4d,0xe6}, {0xb0,0x4d,0x43,0xef}, {0xa7,0x50,0x51,0xf4}, {0xaa,0x5b,0x5f,0xfd}, - {0x89,0x6a,0x75,0xc2}, {0x84,0x61,0x7b,0xcb}, {0x93,0x7c,0x69,0xd0}, {0x9e,0x77,0x67,0xd9}, - {0xd5,0x1e,0x3d,0xae}, {0xd8,0x15,0x33,0xa7}, {0xcf,0x08,0x21,0xbc}, {0xc2,0x03,0x2f,0xb5}, - {0xe1,0x32,0x05,0x8a}, {0xec,0x39,0x0b,0x83}, {0xfb,0x24,0x19,0x98}, {0xf6,0x2f,0x17,0x91}, - {0xd6,0x8d,0x76,0x4d}, {0xdb,0x86,0x78,0x44}, {0xcc,0x9b,0x6a,0x5f}, {0xc1,0x90,0x64,0x56}, - {0xe2,0xa1,0x4e,0x69}, {0xef,0xaa,0x40,0x60}, {0xf8,0xb7,0x52,0x7b}, {0xf5,0xbc,0x5c,0x72}, - {0xbe,0xd5,0x06,0x05}, {0xb3,0xde,0x08,0x0c}, {0xa4,0xc3,0x1a,0x17}, {0xa9,0xc8,0x14,0x1e}, - {0x8a,0xf9,0x3e,0x21}, {0x87,0xf2,0x30,0x28}, {0x90,0xef,0x22,0x33}, {0x9d,0xe4,0x2c,0x3a}, - {0x06,0x3d,0x96,0xdd}, {0x0b,0x36,0x98,0xd4}, {0x1c,0x2b,0x8a,0xcf}, {0x11,0x20,0x84,0xc6}, - {0x32,0x11,0xae,0xf9}, {0x3f,0x1a,0xa0,0xf0}, {0x28,0x07,0xb2,0xeb}, {0x25,0x0c,0xbc,0xe2}, - {0x6e,0x65,0xe6,0x95}, {0x63,0x6e,0xe8,0x9c}, {0x74,0x73,0xfa,0x87}, {0x79,0x78,0xf4,0x8e}, - {0x5a,0x49,0xde,0xb1}, {0x57,0x42,0xd0,0xb8}, {0x40,0x5f,0xc2,0xa3}, {0x4d,0x54,0xcc,0xaa}, - {0xda,0xf7,0x41,0xec}, {0xd7,0xfc,0x4f,0xe5}, {0xc0,0xe1,0x5d,0xfe}, {0xcd,0xea,0x53,0xf7}, - {0xee,0xdb,0x79,0xc8}, {0xe3,0xd0,0x77,0xc1}, {0xf4,0xcd,0x65,0xda}, {0xf9,0xc6,0x6b,0xd3}, - {0xb2,0xaf,0x31,0xa4}, {0xbf,0xa4,0x3f,0xad}, {0xa8,0xb9,0x2d,0xb6}, {0xa5,0xb2,0x23,0xbf}, - {0x86,0x83,0x09,0x80}, {0x8b,0x88,0x07,0x89}, {0x9c,0x95,0x15,0x92}, {0x91,0x9e,0x1b,0x9b}, - {0x0a,0x47,0xa1,0x7c}, {0x07,0x4c,0xaf,0x75}, {0x10,0x51,0xbd,0x6e}, {0x1d,0x5a,0xb3,0x67}, - {0x3e,0x6b,0x99,0x58}, {0x33,0x60,0x97,0x51}, {0x24,0x7d,0x85,0x4a}, {0x29,0x76,0x8b,0x43}, - {0x62,0x1f,0xd1,0x34}, {0x6f,0x14,0xdf,0x3d}, {0x78,0x09,0xcd,0x26}, {0x75,0x02,0xc3,0x2f}, - {0x56,0x33,0xe9,0x10}, {0x5b,0x38,0xe7,0x19}, {0x4c,0x25,0xf5,0x02}, {0x41,0x2e,0xfb,0x0b}, - {0x61,0x8c,0x9a,0xd7}, {0x6c,0x87,0x94,0xde}, {0x7b,0x9a,0x86,0xc5}, {0x76,0x91,0x88,0xcc}, - {0x55,0xa0,0xa2,0xf3}, {0x58,0xab,0xac,0xfa}, {0x4f,0xb6,0xbe,0xe1}, {0x42,0xbd,0xb0,0xe8}, - {0x09,0xd4,0xea,0x9f}, {0x04,0xdf,0xe4,0x96}, {0x13,0xc2,0xf6,0x8d}, {0x1e,0xc9,0xf8,0x84}, - {0x3d,0xf8,0xd2,0xbb}, {0x30,0xf3,0xdc,0xb2}, {0x27,0xee,0xce,0xa9}, {0x2a,0xe5,0xc0,0xa0}, - {0xb1,0x3c,0x7a,0x47}, {0xbc,0x37,0x74,0x4e}, {0xab,0x2a,0x66,0x55}, {0xa6,0x21,0x68,0x5c}, - {0x85,0x10,0x42,0x63}, {0x88,0x1b,0x4c,0x6a}, {0x9f,0x06,0x5e,0x71}, {0x92,0x0d,0x50,0x78}, - {0xd9,0x64,0x0a,0x0f}, {0xd4,0x6f,0x04,0x06}, {0xc3,0x72,0x16,0x1d}, {0xce,0x79,0x18,0x14}, - {0xed,0x48,0x32,0x2b}, {0xe0,0x43,0x3c,0x22}, {0xf7,0x5e,0x2e,0x39}, {0xfa,0x55,0x20,0x30}, - {0xb7,0x01,0xec,0x9a}, {0xba,0x0a,0xe2,0x93}, {0xad,0x17,0xf0,0x88}, {0xa0,0x1c,0xfe,0x81}, - {0x83,0x2d,0xd4,0xbe}, {0x8e,0x26,0xda,0xb7}, {0x99,0x3b,0xc8,0xac}, {0x94,0x30,0xc6,0xa5}, - {0xdf,0x59,0x9c,0xd2}, {0xd2,0x52,0x92,0xdb}, {0xc5,0x4f,0x80,0xc0}, {0xc8,0x44,0x8e,0xc9}, - {0xeb,0x75,0xa4,0xf6}, {0xe6,0x7e,0xaa,0xff}, {0xf1,0x63,0xb8,0xe4}, {0xfc,0x68,0xb6,0xed}, - {0x67,0xb1,0x0c,0x0a}, {0x6a,0xba,0x02,0x03}, {0x7d,0xa7,0x10,0x18}, {0x70,0xac,0x1e,0x11}, - {0x53,0x9d,0x34,0x2e}, {0x5e,0x96,0x3a,0x27}, {0x49,0x8b,0x28,0x3c}, {0x44,0x80,0x26,0x35}, - {0x0f,0xe9,0x7c,0x42}, {0x02,0xe2,0x72,0x4b}, {0x15,0xff,0x60,0x50}, {0x18,0xf4,0x6e,0x59}, - {0x3b,0xc5,0x44,0x66}, {0x36,0xce,0x4a,0x6f}, {0x21,0xd3,0x58,0x74}, {0x2c,0xd8,0x56,0x7d}, - {0x0c,0x7a,0x37,0xa1}, {0x01,0x71,0x39,0xa8}, {0x16,0x6c,0x2b,0xb3}, {0x1b,0x67,0x25,0xba}, - {0x38,0x56,0x0f,0x85}, {0x35,0x5d,0x01,0x8c}, {0x22,0x40,0x13,0x97}, {0x2f,0x4b,0x1d,0x9e}, - {0x64,0x22,0x47,0xe9}, {0x69,0x29,0x49,0xe0}, {0x7e,0x34,0x5b,0xfb}, {0x73,0x3f,0x55,0xf2}, - {0x50,0x0e,0x7f,0xcd}, {0x5d,0x05,0x71,0xc4}, {0x4a,0x18,0x63,0xdf}, {0x47,0x13,0x6d,0xd6}, - {0xdc,0xca,0xd7,0x31}, {0xd1,0xc1,0xd9,0x38}, {0xc6,0xdc,0xcb,0x23}, {0xcb,0xd7,0xc5,0x2a}, - {0xe8,0xe6,0xef,0x15}, {0xe5,0xed,0xe1,0x1c}, {0xf2,0xf0,0xf3,0x07}, {0xff,0xfb,0xfd,0x0e}, - {0xb4,0x92,0xa7,0x79}, {0xb9,0x99,0xa9,0x70}, {0xae,0x84,0xbb,0x6b}, {0xa3,0x8f,0xb5,0x62}, + {0x00,0x00,0x00,0x00}, {0x0d,0x0b,0x0e,0x09}, {0x1a,0x16,0x1c,0x12}, {0x17,0x1d,0x12,0x1b}, + {0x34,0x2c,0x38,0x24}, {0x39,0x27,0x36,0x2d}, {0x2e,0x3a,0x24,0x36}, {0x23,0x31,0x2a,0x3f}, + {0x68,0x58,0x70,0x48}, {0x65,0x53,0x7e,0x41}, {0x72,0x4e,0x6c,0x5a}, {0x7f,0x45,0x62,0x53}, + {0x5c,0x74,0x48,0x6c}, {0x51,0x7f,0x46,0x65}, {0x46,0x62,0x54,0x7e}, {0x4b,0x69,0x5a,0x77}, + {0xd0,0xb0,0xe0,0x90}, {0xdd,0xbb,0xee,0x99}, {0xca,0xa6,0xfc,0x82}, {0xc7,0xad,0xf2,0x8b}, + {0xe4,0x9c,0xd8,0xb4}, {0xe9,0x97,0xd6,0xbd}, {0xfe,0x8a,0xc4,0xa6}, {0xf3,0x81,0xca,0xaf}, + {0xb8,0xe8,0x90,0xd8}, {0xb5,0xe3,0x9e,0xd1}, {0xa2,0xfe,0x8c,0xca}, {0xaf,0xf5,0x82,0xc3}, + {0x8c,0xc4,0xa8,0xfc}, {0x81,0xcf,0xa6,0xf5}, {0x96,0xd2,0xb4,0xee}, {0x9b,0xd9,0xba,0xe7}, + {0xbb,0x7b,0xdb,0x3b}, {0xb6,0x70,0xd5,0x32}, {0xa1,0x6d,0xc7,0x29}, {0xac,0x66,0xc9,0x20}, + {0x8f,0x57,0xe3,0x1f}, {0x82,0x5c,0xed,0x16}, {0x95,0x41,0xff,0x0d}, {0x98,0x4a,0xf1,0x04}, + {0xd3,0x23,0xab,0x73}, {0xde,0x28,0xa5,0x7a}, {0xc9,0x35,0xb7,0x61}, {0xc4,0x3e,0xb9,0x68}, + {0xe7,0x0f,0x93,0x57}, {0xea,0x04,0x9d,0x5e}, {0xfd,0x19,0x8f,0x45}, {0xf0,0x12,0x81,0x4c}, + {0x6b,0xcb,0x3b,0xab}, {0x66,0xc0,0x35,0xa2}, {0x71,0xdd,0x27,0xb9}, {0x7c,0xd6,0x29,0xb0}, + {0x5f,0xe7,0x03,0x8f}, {0x52,0xec,0x0d,0x86}, {0x45,0xf1,0x1f,0x9d}, {0x48,0xfa,0x11,0x94}, + {0x03,0x93,0x4b,0xe3}, {0x0e,0x98,0x45,0xea}, {0x19,0x85,0x57,0xf1}, {0x14,0x8e,0x59,0xf8}, + {0x37,0xbf,0x73,0xc7}, {0x3a,0xb4,0x7d,0xce}, {0x2d,0xa9,0x6f,0xd5}, {0x20,0xa2,0x61,0xdc}, + {0x6d,0xf6,0xad,0x76}, {0x60,0xfd,0xa3,0x7f}, {0x77,0xe0,0xb1,0x64}, {0x7a,0xeb,0xbf,0x6d}, + {0x59,0xda,0x95,0x52}, {0x54,0xd1,0x9b,0x5b}, {0x43,0xcc,0x89,0x40}, {0x4e,0xc7,0x87,0x49}, + {0x05,0xae,0xdd,0x3e}, {0x08,0xa5,0xd3,0x37}, {0x1f,0xb8,0xc1,0x2c}, {0x12,0xb3,0xcf,0x25}, + {0x31,0x82,0xe5,0x1a}, {0x3c,0x89,0xeb,0x13}, {0x2b,0x94,0xf9,0x08}, {0x26,0x9f,0xf7,0x01}, + {0xbd,0x46,0x4d,0xe6}, {0xb0,0x4d,0x43,0xef}, {0xa7,0x50,0x51,0xf4}, {0xaa,0x5b,0x5f,0xfd}, + {0x89,0x6a,0x75,0xc2}, {0x84,0x61,0x7b,0xcb}, {0x93,0x7c,0x69,0xd0}, {0x9e,0x77,0x67,0xd9}, + {0xd5,0x1e,0x3d,0xae}, {0xd8,0x15,0x33,0xa7}, {0xcf,0x08,0x21,0xbc}, {0xc2,0x03,0x2f,0xb5}, + {0xe1,0x32,0x05,0x8a}, {0xec,0x39,0x0b,0x83}, {0xfb,0x24,0x19,0x98}, {0xf6,0x2f,0x17,0x91}, + {0xd6,0x8d,0x76,0x4d}, {0xdb,0x86,0x78,0x44}, {0xcc,0x9b,0x6a,0x5f}, {0xc1,0x90,0x64,0x56}, + {0xe2,0xa1,0x4e,0x69}, {0xef,0xaa,0x40,0x60}, {0xf8,0xb7,0x52,0x7b}, {0xf5,0xbc,0x5c,0x72}, + {0xbe,0xd5,0x06,0x05}, {0xb3,0xde,0x08,0x0c}, {0xa4,0xc3,0x1a,0x17}, {0xa9,0xc8,0x14,0x1e}, + {0x8a,0xf9,0x3e,0x21}, {0x87,0xf2,0x30,0x28}, {0x90,0xef,0x22,0x33}, {0x9d,0xe4,0x2c,0x3a}, + {0x06,0x3d,0x96,0xdd}, {0x0b,0x36,0x98,0xd4}, {0x1c,0x2b,0x8a,0xcf}, {0x11,0x20,0x84,0xc6}, + {0x32,0x11,0xae,0xf9}, {0x3f,0x1a,0xa0,0xf0}, {0x28,0x07,0xb2,0xeb}, {0x25,0x0c,0xbc,0xe2}, + {0x6e,0x65,0xe6,0x95}, {0x63,0x6e,0xe8,0x9c}, {0x74,0x73,0xfa,0x87}, {0x79,0x78,0xf4,0x8e}, + {0x5a,0x49,0xde,0xb1}, {0x57,0x42,0xd0,0xb8}, {0x40,0x5f,0xc2,0xa3}, {0x4d,0x54,0xcc,0xaa}, + {0xda,0xf7,0x41,0xec}, {0xd7,0xfc,0x4f,0xe5}, {0xc0,0xe1,0x5d,0xfe}, {0xcd,0xea,0x53,0xf7}, + {0xee,0xdb,0x79,0xc8}, {0xe3,0xd0,0x77,0xc1}, {0xf4,0xcd,0x65,0xda}, {0xf9,0xc6,0x6b,0xd3}, + {0xb2,0xaf,0x31,0xa4}, {0xbf,0xa4,0x3f,0xad}, {0xa8,0xb9,0x2d,0xb6}, {0xa5,0xb2,0x23,0xbf}, + {0x86,0x83,0x09,0x80}, {0x8b,0x88,0x07,0x89}, {0x9c,0x95,0x15,0x92}, {0x91,0x9e,0x1b,0x9b}, + {0x0a,0x47,0xa1,0x7c}, {0x07,0x4c,0xaf,0x75}, {0x10,0x51,0xbd,0x6e}, {0x1d,0x5a,0xb3,0x67}, + {0x3e,0x6b,0x99,0x58}, {0x33,0x60,0x97,0x51}, {0x24,0x7d,0x85,0x4a}, {0x29,0x76,0x8b,0x43}, + {0x62,0x1f,0xd1,0x34}, {0x6f,0x14,0xdf,0x3d}, {0x78,0x09,0xcd,0x26}, {0x75,0x02,0xc3,0x2f}, + {0x56,0x33,0xe9,0x10}, {0x5b,0x38,0xe7,0x19}, {0x4c,0x25,0xf5,0x02}, {0x41,0x2e,0xfb,0x0b}, + {0x61,0x8c,0x9a,0xd7}, {0x6c,0x87,0x94,0xde}, {0x7b,0x9a,0x86,0xc5}, {0x76,0x91,0x88,0xcc}, + {0x55,0xa0,0xa2,0xf3}, {0x58,0xab,0xac,0xfa}, {0x4f,0xb6,0xbe,0xe1}, {0x42,0xbd,0xb0,0xe8}, + {0x09,0xd4,0xea,0x9f}, {0x04,0xdf,0xe4,0x96}, {0x13,0xc2,0xf6,0x8d}, {0x1e,0xc9,0xf8,0x84}, + {0x3d,0xf8,0xd2,0xbb}, {0x30,0xf3,0xdc,0xb2}, {0x27,0xee,0xce,0xa9}, {0x2a,0xe5,0xc0,0xa0}, + {0xb1,0x3c,0x7a,0x47}, {0xbc,0x37,0x74,0x4e}, {0xab,0x2a,0x66,0x55}, {0xa6,0x21,0x68,0x5c}, + {0x85,0x10,0x42,0x63}, {0x88,0x1b,0x4c,0x6a}, {0x9f,0x06,0x5e,0x71}, {0x92,0x0d,0x50,0x78}, + {0xd9,0x64,0x0a,0x0f}, {0xd4,0x6f,0x04,0x06}, {0xc3,0x72,0x16,0x1d}, {0xce,0x79,0x18,0x14}, + {0xed,0x48,0x32,0x2b}, {0xe0,0x43,0x3c,0x22}, {0xf7,0x5e,0x2e,0x39}, {0xfa,0x55,0x20,0x30}, + {0xb7,0x01,0xec,0x9a}, {0xba,0x0a,0xe2,0x93}, {0xad,0x17,0xf0,0x88}, {0xa0,0x1c,0xfe,0x81}, + {0x83,0x2d,0xd4,0xbe}, {0x8e,0x26,0xda,0xb7}, {0x99,0x3b,0xc8,0xac}, {0x94,0x30,0xc6,0xa5}, + {0xdf,0x59,0x9c,0xd2}, {0xd2,0x52,0x92,0xdb}, {0xc5,0x4f,0x80,0xc0}, {0xc8,0x44,0x8e,0xc9}, + {0xeb,0x75,0xa4,0xf6}, {0xe6,0x7e,0xaa,0xff}, {0xf1,0x63,0xb8,0xe4}, {0xfc,0x68,0xb6,0xed}, + {0x67,0xb1,0x0c,0x0a}, {0x6a,0xba,0x02,0x03}, {0x7d,0xa7,0x10,0x18}, {0x70,0xac,0x1e,0x11}, + {0x53,0x9d,0x34,0x2e}, {0x5e,0x96,0x3a,0x27}, {0x49,0x8b,0x28,0x3c}, {0x44,0x80,0x26,0x35}, + {0x0f,0xe9,0x7c,0x42}, {0x02,0xe2,0x72,0x4b}, {0x15,0xff,0x60,0x50}, {0x18,0xf4,0x6e,0x59}, + {0x3b,0xc5,0x44,0x66}, {0x36,0xce,0x4a,0x6f}, {0x21,0xd3,0x58,0x74}, {0x2c,0xd8,0x56,0x7d}, + {0x0c,0x7a,0x37,0xa1}, {0x01,0x71,0x39,0xa8}, {0x16,0x6c,0x2b,0xb3}, {0x1b,0x67,0x25,0xba}, + {0x38,0x56,0x0f,0x85}, {0x35,0x5d,0x01,0x8c}, {0x22,0x40,0x13,0x97}, {0x2f,0x4b,0x1d,0x9e}, + {0x64,0x22,0x47,0xe9}, {0x69,0x29,0x49,0xe0}, {0x7e,0x34,0x5b,0xfb}, {0x73,0x3f,0x55,0xf2}, + {0x50,0x0e,0x7f,0xcd}, {0x5d,0x05,0x71,0xc4}, {0x4a,0x18,0x63,0xdf}, {0x47,0x13,0x6d,0xd6}, + {0xdc,0xca,0xd7,0x31}, {0xd1,0xc1,0xd9,0x38}, {0xc6,0xdc,0xcb,0x23}, {0xcb,0xd7,0xc5,0x2a}, + {0xe8,0xe6,0xef,0x15}, {0xe5,0xed,0xe1,0x1c}, {0xf2,0xf0,0xf3,0x07}, {0xff,0xfb,0xfd,0x0e}, + {0xb4,0x92,0xa7,0x79}, {0xb9,0x99,0xa9,0x70}, {0xae,0x84,0xbb,0x6b}, {0xa3,0x8f,0xb5,0x62}, {0x80,0xbe,0x9f,0x5d}, {0x8d,0xb5,0x91,0x54}, {0x9a,0xa8,0x83,0x4f}, {0x97,0xa3,0x8d,0x46} }; static UINT8 U4[256][4]= { - {0x00,0x00,0x00,0x00}, {0x09,0x0d,0x0b,0x0e}, {0x12,0x1a,0x16,0x1c}, {0x1b,0x17,0x1d,0x12}, - {0x24,0x34,0x2c,0x38}, {0x2d,0x39,0x27,0x36}, {0x36,0x2e,0x3a,0x24}, {0x3f,0x23,0x31,0x2a}, - {0x48,0x68,0x58,0x70}, {0x41,0x65,0x53,0x7e}, {0x5a,0x72,0x4e,0x6c}, {0x53,0x7f,0x45,0x62}, - {0x6c,0x5c,0x74,0x48}, {0x65,0x51,0x7f,0x46}, {0x7e,0x46,0x62,0x54}, {0x77,0x4b,0x69,0x5a}, - {0x90,0xd0,0xb0,0xe0}, {0x99,0xdd,0xbb,0xee}, {0x82,0xca,0xa6,0xfc}, {0x8b,0xc7,0xad,0xf2}, - {0xb4,0xe4,0x9c,0xd8}, {0xbd,0xe9,0x97,0xd6}, {0xa6,0xfe,0x8a,0xc4}, {0xaf,0xf3,0x81,0xca}, - {0xd8,0xb8,0xe8,0x90}, {0xd1,0xb5,0xe3,0x9e}, {0xca,0xa2,0xfe,0x8c}, {0xc3,0xaf,0xf5,0x82}, - {0xfc,0x8c,0xc4,0xa8}, {0xf5,0x81,0xcf,0xa6}, {0xee,0x96,0xd2,0xb4}, {0xe7,0x9b,0xd9,0xba}, - {0x3b,0xbb,0x7b,0xdb}, {0x32,0xb6,0x70,0xd5}, {0x29,0xa1,0x6d,0xc7}, {0x20,0xac,0x66,0xc9}, - {0x1f,0x8f,0x57,0xe3}, {0x16,0x82,0x5c,0xed}, {0x0d,0x95,0x41,0xff}, {0x04,0x98,0x4a,0xf1}, - {0x73,0xd3,0x23,0xab}, {0x7a,0xde,0x28,0xa5}, {0x61,0xc9,0x35,0xb7}, {0x68,0xc4,0x3e,0xb9}, - {0x57,0xe7,0x0f,0x93}, {0x5e,0xea,0x04,0x9d}, {0x45,0xfd,0x19,0x8f}, {0x4c,0xf0,0x12,0x81}, - {0xab,0x6b,0xcb,0x3b}, {0xa2,0x66,0xc0,0x35}, {0xb9,0x71,0xdd,0x27}, {0xb0,0x7c,0xd6,0x29}, - {0x8f,0x5f,0xe7,0x03}, {0x86,0x52,0xec,0x0d}, {0x9d,0x45,0xf1,0x1f}, {0x94,0x48,0xfa,0x11}, - {0xe3,0x03,0x93,0x4b}, {0xea,0x0e,0x98,0x45}, {0xf1,0x19,0x85,0x57}, {0xf8,0x14,0x8e,0x59}, - {0xc7,0x37,0xbf,0x73}, {0xce,0x3a,0xb4,0x7d}, {0xd5,0x2d,0xa9,0x6f}, {0xdc,0x20,0xa2,0x61}, - {0x76,0x6d,0xf6,0xad}, {0x7f,0x60,0xfd,0xa3}, {0x64,0x77,0xe0,0xb1}, {0x6d,0x7a,0xeb,0xbf}, - {0x52,0x59,0xda,0x95}, {0x5b,0x54,0xd1,0x9b}, {0x40,0x43,0xcc,0x89}, {0x49,0x4e,0xc7,0x87}, - {0x3e,0x05,0xae,0xdd}, {0x37,0x08,0xa5,0xd3}, {0x2c,0x1f,0xb8,0xc1}, {0x25,0x12,0xb3,0xcf}, - {0x1a,0x31,0x82,0xe5}, {0x13,0x3c,0x89,0xeb}, {0x08,0x2b,0x94,0xf9}, {0x01,0x26,0x9f,0xf7}, - {0xe6,0xbd,0x46,0x4d}, {0xef,0xb0,0x4d,0x43}, {0xf4,0xa7,0x50,0x51}, {0xfd,0xaa,0x5b,0x5f}, - {0xc2,0x89,0x6a,0x75}, {0xcb,0x84,0x61,0x7b}, {0xd0,0x93,0x7c,0x69}, {0xd9,0x9e,0x77,0x67}, - {0xae,0xd5,0x1e,0x3d}, {0xa7,0xd8,0x15,0x33}, {0xbc,0xcf,0x08,0x21}, {0xb5,0xc2,0x03,0x2f}, - {0x8a,0xe1,0x32,0x05}, {0x83,0xec,0x39,0x0b}, {0x98,0xfb,0x24,0x19}, {0x91,0xf6,0x2f,0x17}, - {0x4d,0xd6,0x8d,0x76}, {0x44,0xdb,0x86,0x78}, {0x5f,0xcc,0x9b,0x6a}, {0x56,0xc1,0x90,0x64}, - {0x69,0xe2,0xa1,0x4e}, {0x60,0xef,0xaa,0x40}, {0x7b,0xf8,0xb7,0x52}, {0x72,0xf5,0xbc,0x5c}, - {0x05,0xbe,0xd5,0x06}, {0x0c,0xb3,0xde,0x08}, {0x17,0xa4,0xc3,0x1a}, {0x1e,0xa9,0xc8,0x14}, - {0x21,0x8a,0xf9,0x3e}, {0x28,0x87,0xf2,0x30}, {0x33,0x90,0xef,0x22}, {0x3a,0x9d,0xe4,0x2c}, - {0xdd,0x06,0x3d,0x96}, {0xd4,0x0b,0x36,0x98}, {0xcf,0x1c,0x2b,0x8a}, {0xc6,0x11,0x20,0x84}, - {0xf9,0x32,0x11,0xae}, {0xf0,0x3f,0x1a,0xa0}, {0xeb,0x28,0x07,0xb2}, {0xe2,0x25,0x0c,0xbc}, - {0x95,0x6e,0x65,0xe6}, {0x9c,0x63,0x6e,0xe8}, {0x87,0x74,0x73,0xfa}, {0x8e,0x79,0x78,0xf4}, - {0xb1,0x5a,0x49,0xde}, {0xb8,0x57,0x42,0xd0}, {0xa3,0x40,0x5f,0xc2}, {0xaa,0x4d,0x54,0xcc}, - {0xec,0xda,0xf7,0x41}, {0xe5,0xd7,0xfc,0x4f}, {0xfe,0xc0,0xe1,0x5d}, {0xf7,0xcd,0xea,0x53}, - {0xc8,0xee,0xdb,0x79}, {0xc1,0xe3,0xd0,0x77}, {0xda,0xf4,0xcd,0x65}, {0xd3,0xf9,0xc6,0x6b}, - {0xa4,0xb2,0xaf,0x31}, {0xad,0xbf,0xa4,0x3f}, {0xb6,0xa8,0xb9,0x2d}, {0xbf,0xa5,0xb2,0x23}, - {0x80,0x86,0x83,0x09}, {0x89,0x8b,0x88,0x07}, {0x92,0x9c,0x95,0x15}, {0x9b,0x91,0x9e,0x1b}, - {0x7c,0x0a,0x47,0xa1}, {0x75,0x07,0x4c,0xaf}, {0x6e,0x10,0x51,0xbd}, {0x67,0x1d,0x5a,0xb3}, - {0x58,0x3e,0x6b,0x99}, {0x51,0x33,0x60,0x97}, {0x4a,0x24,0x7d,0x85}, {0x43,0x29,0x76,0x8b}, - {0x34,0x62,0x1f,0xd1}, {0x3d,0x6f,0x14,0xdf}, {0x26,0x78,0x09,0xcd}, {0x2f,0x75,0x02,0xc3}, - {0x10,0x56,0x33,0xe9}, {0x19,0x5b,0x38,0xe7}, {0x02,0x4c,0x25,0xf5}, {0x0b,0x41,0x2e,0xfb}, - {0xd7,0x61,0x8c,0x9a}, {0xde,0x6c,0x87,0x94}, {0xc5,0x7b,0x9a,0x86}, {0xcc,0x76,0x91,0x88}, - {0xf3,0x55,0xa0,0xa2}, {0xfa,0x58,0xab,0xac}, {0xe1,0x4f,0xb6,0xbe}, {0xe8,0x42,0xbd,0xb0}, - {0x9f,0x09,0xd4,0xea}, {0x96,0x04,0xdf,0xe4}, {0x8d,0x13,0xc2,0xf6}, {0x84,0x1e,0xc9,0xf8}, - {0xbb,0x3d,0xf8,0xd2}, {0xb2,0x30,0xf3,0xdc}, {0xa9,0x27,0xee,0xce}, {0xa0,0x2a,0xe5,0xc0}, - {0x47,0xb1,0x3c,0x7a}, {0x4e,0xbc,0x37,0x74}, {0x55,0xab,0x2a,0x66}, {0x5c,0xa6,0x21,0x68}, - {0x63,0x85,0x10,0x42}, {0x6a,0x88,0x1b,0x4c}, {0x71,0x9f,0x06,0x5e}, {0x78,0x92,0x0d,0x50}, - {0x0f,0xd9,0x64,0x0a}, {0x06,0xd4,0x6f,0x04}, {0x1d,0xc3,0x72,0x16}, {0x14,0xce,0x79,0x18}, - {0x2b,0xed,0x48,0x32}, {0x22,0xe0,0x43,0x3c}, {0x39,0xf7,0x5e,0x2e}, {0x30,0xfa,0x55,0x20}, - {0x9a,0xb7,0x01,0xec}, {0x93,0xba,0x0a,0xe2}, {0x88,0xad,0x17,0xf0}, {0x81,0xa0,0x1c,0xfe}, - {0xbe,0x83,0x2d,0xd4}, {0xb7,0x8e,0x26,0xda}, {0xac,0x99,0x3b,0xc8}, {0xa5,0x94,0x30,0xc6}, - {0xd2,0xdf,0x59,0x9c}, {0xdb,0xd2,0x52,0x92}, {0xc0,0xc5,0x4f,0x80}, {0xc9,0xc8,0x44,0x8e}, - {0xf6,0xeb,0x75,0xa4}, {0xff,0xe6,0x7e,0xaa}, {0xe4,0xf1,0x63,0xb8}, {0xed,0xfc,0x68,0xb6}, - {0x0a,0x67,0xb1,0x0c}, {0x03,0x6a,0xba,0x02}, {0x18,0x7d,0xa7,0x10}, {0x11,0x70,0xac,0x1e}, - {0x2e,0x53,0x9d,0x34}, {0x27,0x5e,0x96,0x3a}, {0x3c,0x49,0x8b,0x28}, {0x35,0x44,0x80,0x26}, - {0x42,0x0f,0xe9,0x7c}, {0x4b,0x02,0xe2,0x72}, {0x50,0x15,0xff,0x60}, {0x59,0x18,0xf4,0x6e}, - {0x66,0x3b,0xc5,0x44}, {0x6f,0x36,0xce,0x4a}, {0x74,0x21,0xd3,0x58}, {0x7d,0x2c,0xd8,0x56}, - {0xa1,0x0c,0x7a,0x37}, {0xa8,0x01,0x71,0x39}, {0xb3,0x16,0x6c,0x2b}, {0xba,0x1b,0x67,0x25}, - {0x85,0x38,0x56,0x0f}, {0x8c,0x35,0x5d,0x01}, {0x97,0x22,0x40,0x13}, {0x9e,0x2f,0x4b,0x1d}, - {0xe9,0x64,0x22,0x47}, {0xe0,0x69,0x29,0x49}, {0xfb,0x7e,0x34,0x5b}, {0xf2,0x73,0x3f,0x55}, - {0xcd,0x50,0x0e,0x7f}, {0xc4,0x5d,0x05,0x71}, {0xdf,0x4a,0x18,0x63}, {0xd6,0x47,0x13,0x6d}, - {0x31,0xdc,0xca,0xd7}, {0x38,0xd1,0xc1,0xd9}, {0x23,0xc6,0xdc,0xcb}, {0x2a,0xcb,0xd7,0xc5}, - {0x15,0xe8,0xe6,0xef}, {0x1c,0xe5,0xed,0xe1}, {0x07,0xf2,0xf0,0xf3}, {0x0e,0xff,0xfb,0xfd}, - {0x79,0xb4,0x92,0xa7}, {0x70,0xb9,0x99,0xa9}, {0x6b,0xae,0x84,0xbb}, {0x62,0xa3,0x8f,0xb5}, + {0x00,0x00,0x00,0x00}, {0x09,0x0d,0x0b,0x0e}, {0x12,0x1a,0x16,0x1c}, {0x1b,0x17,0x1d,0x12}, + {0x24,0x34,0x2c,0x38}, {0x2d,0x39,0x27,0x36}, {0x36,0x2e,0x3a,0x24}, {0x3f,0x23,0x31,0x2a}, + {0x48,0x68,0x58,0x70}, {0x41,0x65,0x53,0x7e}, {0x5a,0x72,0x4e,0x6c}, {0x53,0x7f,0x45,0x62}, + {0x6c,0x5c,0x74,0x48}, {0x65,0x51,0x7f,0x46}, {0x7e,0x46,0x62,0x54}, {0x77,0x4b,0x69,0x5a}, + {0x90,0xd0,0xb0,0xe0}, {0x99,0xdd,0xbb,0xee}, {0x82,0xca,0xa6,0xfc}, {0x8b,0xc7,0xad,0xf2}, + {0xb4,0xe4,0x9c,0xd8}, {0xbd,0xe9,0x97,0xd6}, {0xa6,0xfe,0x8a,0xc4}, {0xaf,0xf3,0x81,0xca}, + {0xd8,0xb8,0xe8,0x90}, {0xd1,0xb5,0xe3,0x9e}, {0xca,0xa2,0xfe,0x8c}, {0xc3,0xaf,0xf5,0x82}, + {0xfc,0x8c,0xc4,0xa8}, {0xf5,0x81,0xcf,0xa6}, {0xee,0x96,0xd2,0xb4}, {0xe7,0x9b,0xd9,0xba}, + {0x3b,0xbb,0x7b,0xdb}, {0x32,0xb6,0x70,0xd5}, {0x29,0xa1,0x6d,0xc7}, {0x20,0xac,0x66,0xc9}, + {0x1f,0x8f,0x57,0xe3}, {0x16,0x82,0x5c,0xed}, {0x0d,0x95,0x41,0xff}, {0x04,0x98,0x4a,0xf1}, + {0x73,0xd3,0x23,0xab}, {0x7a,0xde,0x28,0xa5}, {0x61,0xc9,0x35,0xb7}, {0x68,0xc4,0x3e,0xb9}, + {0x57,0xe7,0x0f,0x93}, {0x5e,0xea,0x04,0x9d}, {0x45,0xfd,0x19,0x8f}, {0x4c,0xf0,0x12,0x81}, + {0xab,0x6b,0xcb,0x3b}, {0xa2,0x66,0xc0,0x35}, {0xb9,0x71,0xdd,0x27}, {0xb0,0x7c,0xd6,0x29}, + {0x8f,0x5f,0xe7,0x03}, {0x86,0x52,0xec,0x0d}, {0x9d,0x45,0xf1,0x1f}, {0x94,0x48,0xfa,0x11}, + {0xe3,0x03,0x93,0x4b}, {0xea,0x0e,0x98,0x45}, {0xf1,0x19,0x85,0x57}, {0xf8,0x14,0x8e,0x59}, + {0xc7,0x37,0xbf,0x73}, {0xce,0x3a,0xb4,0x7d}, {0xd5,0x2d,0xa9,0x6f}, {0xdc,0x20,0xa2,0x61}, + {0x76,0x6d,0xf6,0xad}, {0x7f,0x60,0xfd,0xa3}, {0x64,0x77,0xe0,0xb1}, {0x6d,0x7a,0xeb,0xbf}, + {0x52,0x59,0xda,0x95}, {0x5b,0x54,0xd1,0x9b}, {0x40,0x43,0xcc,0x89}, {0x49,0x4e,0xc7,0x87}, + {0x3e,0x05,0xae,0xdd}, {0x37,0x08,0xa5,0xd3}, {0x2c,0x1f,0xb8,0xc1}, {0x25,0x12,0xb3,0xcf}, + {0x1a,0x31,0x82,0xe5}, {0x13,0x3c,0x89,0xeb}, {0x08,0x2b,0x94,0xf9}, {0x01,0x26,0x9f,0xf7}, + {0xe6,0xbd,0x46,0x4d}, {0xef,0xb0,0x4d,0x43}, {0xf4,0xa7,0x50,0x51}, {0xfd,0xaa,0x5b,0x5f}, + {0xc2,0x89,0x6a,0x75}, {0xcb,0x84,0x61,0x7b}, {0xd0,0x93,0x7c,0x69}, {0xd9,0x9e,0x77,0x67}, + {0xae,0xd5,0x1e,0x3d}, {0xa7,0xd8,0x15,0x33}, {0xbc,0xcf,0x08,0x21}, {0xb5,0xc2,0x03,0x2f}, + {0x8a,0xe1,0x32,0x05}, {0x83,0xec,0x39,0x0b}, {0x98,0xfb,0x24,0x19}, {0x91,0xf6,0x2f,0x17}, + {0x4d,0xd6,0x8d,0x76}, {0x44,0xdb,0x86,0x78}, {0x5f,0xcc,0x9b,0x6a}, {0x56,0xc1,0x90,0x64}, + {0x69,0xe2,0xa1,0x4e}, {0x60,0xef,0xaa,0x40}, {0x7b,0xf8,0xb7,0x52}, {0x72,0xf5,0xbc,0x5c}, + {0x05,0xbe,0xd5,0x06}, {0x0c,0xb3,0xde,0x08}, {0x17,0xa4,0xc3,0x1a}, {0x1e,0xa9,0xc8,0x14}, + {0x21,0x8a,0xf9,0x3e}, {0x28,0x87,0xf2,0x30}, {0x33,0x90,0xef,0x22}, {0x3a,0x9d,0xe4,0x2c}, + {0xdd,0x06,0x3d,0x96}, {0xd4,0x0b,0x36,0x98}, {0xcf,0x1c,0x2b,0x8a}, {0xc6,0x11,0x20,0x84}, + {0xf9,0x32,0x11,0xae}, {0xf0,0x3f,0x1a,0xa0}, {0xeb,0x28,0x07,0xb2}, {0xe2,0x25,0x0c,0xbc}, + {0x95,0x6e,0x65,0xe6}, {0x9c,0x63,0x6e,0xe8}, {0x87,0x74,0x73,0xfa}, {0x8e,0x79,0x78,0xf4}, + {0xb1,0x5a,0x49,0xde}, {0xb8,0x57,0x42,0xd0}, {0xa3,0x40,0x5f,0xc2}, {0xaa,0x4d,0x54,0xcc}, + {0xec,0xda,0xf7,0x41}, {0xe5,0xd7,0xfc,0x4f}, {0xfe,0xc0,0xe1,0x5d}, {0xf7,0xcd,0xea,0x53}, + {0xc8,0xee,0xdb,0x79}, {0xc1,0xe3,0xd0,0x77}, {0xda,0xf4,0xcd,0x65}, {0xd3,0xf9,0xc6,0x6b}, + {0xa4,0xb2,0xaf,0x31}, {0xad,0xbf,0xa4,0x3f}, {0xb6,0xa8,0xb9,0x2d}, {0xbf,0xa5,0xb2,0x23}, + {0x80,0x86,0x83,0x09}, {0x89,0x8b,0x88,0x07}, {0x92,0x9c,0x95,0x15}, {0x9b,0x91,0x9e,0x1b}, + {0x7c,0x0a,0x47,0xa1}, {0x75,0x07,0x4c,0xaf}, {0x6e,0x10,0x51,0xbd}, {0x67,0x1d,0x5a,0xb3}, + {0x58,0x3e,0x6b,0x99}, {0x51,0x33,0x60,0x97}, {0x4a,0x24,0x7d,0x85}, {0x43,0x29,0x76,0x8b}, + {0x34,0x62,0x1f,0xd1}, {0x3d,0x6f,0x14,0xdf}, {0x26,0x78,0x09,0xcd}, {0x2f,0x75,0x02,0xc3}, + {0x10,0x56,0x33,0xe9}, {0x19,0x5b,0x38,0xe7}, {0x02,0x4c,0x25,0xf5}, {0x0b,0x41,0x2e,0xfb}, + {0xd7,0x61,0x8c,0x9a}, {0xde,0x6c,0x87,0x94}, {0xc5,0x7b,0x9a,0x86}, {0xcc,0x76,0x91,0x88}, + {0xf3,0x55,0xa0,0xa2}, {0xfa,0x58,0xab,0xac}, {0xe1,0x4f,0xb6,0xbe}, {0xe8,0x42,0xbd,0xb0}, + {0x9f,0x09,0xd4,0xea}, {0x96,0x04,0xdf,0xe4}, {0x8d,0x13,0xc2,0xf6}, {0x84,0x1e,0xc9,0xf8}, + {0xbb,0x3d,0xf8,0xd2}, {0xb2,0x30,0xf3,0xdc}, {0xa9,0x27,0xee,0xce}, {0xa0,0x2a,0xe5,0xc0}, + {0x47,0xb1,0x3c,0x7a}, {0x4e,0xbc,0x37,0x74}, {0x55,0xab,0x2a,0x66}, {0x5c,0xa6,0x21,0x68}, + {0x63,0x85,0x10,0x42}, {0x6a,0x88,0x1b,0x4c}, {0x71,0x9f,0x06,0x5e}, {0x78,0x92,0x0d,0x50}, + {0x0f,0xd9,0x64,0x0a}, {0x06,0xd4,0x6f,0x04}, {0x1d,0xc3,0x72,0x16}, {0x14,0xce,0x79,0x18}, + {0x2b,0xed,0x48,0x32}, {0x22,0xe0,0x43,0x3c}, {0x39,0xf7,0x5e,0x2e}, {0x30,0xfa,0x55,0x20}, + {0x9a,0xb7,0x01,0xec}, {0x93,0xba,0x0a,0xe2}, {0x88,0xad,0x17,0xf0}, {0x81,0xa0,0x1c,0xfe}, + {0xbe,0x83,0x2d,0xd4}, {0xb7,0x8e,0x26,0xda}, {0xac,0x99,0x3b,0xc8}, {0xa5,0x94,0x30,0xc6}, + {0xd2,0xdf,0x59,0x9c}, {0xdb,0xd2,0x52,0x92}, {0xc0,0xc5,0x4f,0x80}, {0xc9,0xc8,0x44,0x8e}, + {0xf6,0xeb,0x75,0xa4}, {0xff,0xe6,0x7e,0xaa}, {0xe4,0xf1,0x63,0xb8}, {0xed,0xfc,0x68,0xb6}, + {0x0a,0x67,0xb1,0x0c}, {0x03,0x6a,0xba,0x02}, {0x18,0x7d,0xa7,0x10}, {0x11,0x70,0xac,0x1e}, + {0x2e,0x53,0x9d,0x34}, {0x27,0x5e,0x96,0x3a}, {0x3c,0x49,0x8b,0x28}, {0x35,0x44,0x80,0x26}, + {0x42,0x0f,0xe9,0x7c}, {0x4b,0x02,0xe2,0x72}, {0x50,0x15,0xff,0x60}, {0x59,0x18,0xf4,0x6e}, + {0x66,0x3b,0xc5,0x44}, {0x6f,0x36,0xce,0x4a}, {0x74,0x21,0xd3,0x58}, {0x7d,0x2c,0xd8,0x56}, + {0xa1,0x0c,0x7a,0x37}, {0xa8,0x01,0x71,0x39}, {0xb3,0x16,0x6c,0x2b}, {0xba,0x1b,0x67,0x25}, + {0x85,0x38,0x56,0x0f}, {0x8c,0x35,0x5d,0x01}, {0x97,0x22,0x40,0x13}, {0x9e,0x2f,0x4b,0x1d}, + {0xe9,0x64,0x22,0x47}, {0xe0,0x69,0x29,0x49}, {0xfb,0x7e,0x34,0x5b}, {0xf2,0x73,0x3f,0x55}, + {0xcd,0x50,0x0e,0x7f}, {0xc4,0x5d,0x05,0x71}, {0xdf,0x4a,0x18,0x63}, {0xd6,0x47,0x13,0x6d}, + {0x31,0xdc,0xca,0xd7}, {0x38,0xd1,0xc1,0xd9}, {0x23,0xc6,0xdc,0xcb}, {0x2a,0xcb,0xd7,0xc5}, + {0x15,0xe8,0xe6,0xef}, {0x1c,0xe5,0xed,0xe1}, {0x07,0xf2,0xf0,0xf3}, {0x0e,0xff,0xfb,0xfd}, + {0x79,0xb4,0x92,0xa7}, {0x70,0xb9,0x99,0xa9}, {0x6b,0xae,0x84,0xbb}, {0x62,0xa3,0x8f,0xb5}, {0x5d,0x80,0xbe,0x9f}, {0x54,0x8d,0xb5,0x91}, {0x4f,0x9a,0xa8,0x83}, {0x46,0x97,0xa3,0x8d} }; static UINT32 rcon[30]= -{ +{ 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36, 0x6c, 0xd8, 0xab, 0x4d, 0x9a, 0x2f, 0x5e, 0xbc, @@ -1051,7 +1051,7 @@ int Rijndael::init(Mode mode,Direction dir,const UINT8 * key,KeyLength keyLen,UI UINT8 keyMatrix[_MAX_KEY_COLUMNS][4]; - for(UINT32 i = 0;i < uKeyLenInBytes;i++)keyMatrix[i >> 2][i & 3] = key[i]; + for(UINT32 i = 0;i < uKeyLenInBytes;i++)keyMatrix[i >> 2][i & 3] = key[i]; keySched(keyMatrix); @@ -1073,9 +1073,9 @@ int Rijndael::blockEncrypt(const UINT8 *input,int inputLen,UINT8 *outBuffer) if(input == 0 || inputLen <= 0)return 0; numBlocks = inputLen/128; - + switch(m_mode){ - case ECB: + case ECB: for(i = numBlocks;i > 0;i--) { encrypt(input,outBuffer); @@ -1102,8 +1102,8 @@ int Rijndael::blockEncrypt(const UINT8 *input,int inputLen,UINT8 *outBuffer) } break; case CFB1: -#if STRICT_ALIGN - kvi_memmove(iv,m_initVector,16); +#if STRICT_ALIGN + kvi_memmove(iv,m_initVector,16); #else /* !STRICT_ALIGN */ *((UINT32*)iv[0]) = *((UINT32*)(m_initVector )); *((UINT32*)iv[1]) = *((UINT32*)(m_initVector + 4)); @@ -1143,7 +1143,7 @@ int Rijndael::blockEncrypt(const UINT8 *input,int inputLen,UINT8 *outBuffer) return -1; break; } - + return 128 * numBlocks; } @@ -1161,7 +1161,7 @@ int Rijndael::padEncrypt(const UINT8 *input, int inputOctets, UINT8 *outBuffer) switch(m_mode) { - case ECB: + case ECB: for(i = numBlocks; i > 0; i--) { encrypt(input, outBuffer); @@ -1201,10 +1201,10 @@ int Rijndael::padEncrypt(const UINT8 *input, int inputOctets, UINT8 *outBuffer) return -1; break; } - + return 16*(numBlocks + 1); } - + int Rijndael::blockDecrypt(const UINT8 *input, int inputLen, UINT8 *outBuffer) { int i, k, numBlocks; @@ -1219,7 +1219,7 @@ int Rijndael::blockDecrypt(const UINT8 *input, int inputLen, UINT8 *outBuffer) switch(m_mode) { - case ECB: + case ECB: for (i = numBlocks; i > 0; i--) { decrypt(input,outBuffer); @@ -1228,8 +1228,8 @@ int Rijndael::blockDecrypt(const UINT8 *input, int inputLen, UINT8 *outBuffer) } break; case CBC: -#if STRICT_ALIGN - kvi_memmove(iv,m_initVector,16); +#if STRICT_ALIGN + kvi_memmove(iv,m_initVector,16); #else *((UINT32*)iv[0]) = *((UINT32*)(m_initVector )); *((UINT32*)iv[1]) = *((UINT32*)(m_initVector+ 4)); @@ -1257,8 +1257,8 @@ int Rijndael::blockDecrypt(const UINT8 *input, int inputLen, UINT8 *outBuffer) } break; case CFB1: -#if STRICT_ALIGN - kvi_memmove(iv, m_initVector, 16); +#if STRICT_ALIGN + kvi_memmove(iv, m_initVector, 16); #else *((UINT32*)iv[0]) = *((UINT32*)(m_initVector)); *((UINT32*)iv[1]) = *((UINT32*)(m_initVector+ 4)); @@ -1298,7 +1298,7 @@ int Rijndael::blockDecrypt(const UINT8 *input, int inputLen, UINT8 *outBuffer) return -1; break; } - + return 128*numBlocks; } @@ -1334,7 +1334,7 @@ int Rijndael::padDecrypt(const UINT8 *input, int inputOctets, UINT8 *outBuffer) if(block[i] != padLen)return RIJNDAEL_CORRUPTED_DATA; } kvi_memmove(outBuffer, block, 16 - padLen); - break; + break; case CBC: kvi_memmove(iv, m_initVector, 16); /* all blocks but last */ @@ -1364,12 +1364,12 @@ int Rijndael::padDecrypt(const UINT8 *input, int inputOctets, UINT8 *outBuffer) } kvi_memmove(outBuffer, block, 16 - padLen); break; - + default: return -1; break; } - + return 16*numBlocks - padLen; } @@ -1413,7 +1413,7 @@ void Rijndael::keySched(UINT8 key[_MAX_KEY_COLUMNS][4]) t = 0; } } - + while(r <= m_uRounds) { tempKey[0][0] ^= S[tempKey[uKeyColumns-1][1]]; @@ -1454,7 +1454,7 @@ void Rijndael::keySched(UINT8 key[_MAX_KEY_COLUMNS][4]) t = 0; } } - } + } } void Rijndael::keyEncToDec() @@ -1472,7 +1472,7 @@ void Rijndael::keyEncToDec() w = m_expandedKey[r][3]; *((UINT32*)w) = *((UINT32*)U1[w[0]]) ^ *((UINT32*)U2[w[1]]) ^ *((UINT32*)U3[w[2]]) ^ *((UINT32*)U4[w[3]]); } -} +} void Rijndael::encrypt(const UINT8 a[16], UINT8 b[16]) { @@ -1485,19 +1485,19 @@ void Rijndael::encrypt(const UINT8 a[16], UINT8 b[16]) *((UINT32*)temp[3]) = *((UINT32*)(a+12)) ^ *((UINT32*)m_expandedKey[0][3]); *((UINT32*)(b )) = *((UINT32*)T1[temp[0][0]]) ^ *((UINT32*)T2[temp[1][1]]) - ^ *((UINT32*)T3[temp[2][2]]) + ^ *((UINT32*)T3[temp[2][2]]) ^ *((UINT32*)T4[temp[3][3]]); *((UINT32*)(b + 4)) = *((UINT32*)T1[temp[1][0]]) ^ *((UINT32*)T2[temp[2][1]]) - ^ *((UINT32*)T3[temp[3][2]]) + ^ *((UINT32*)T3[temp[3][2]]) ^ *((UINT32*)T4[temp[0][3]]); *((UINT32*)(b + 8)) = *((UINT32*)T1[temp[2][0]]) ^ *((UINT32*)T2[temp[3][1]]) - ^ *((UINT32*)T3[temp[0][2]]) + ^ *((UINT32*)T3[temp[0][2]]) ^ *((UINT32*)T4[temp[1][3]]); *((UINT32*)(b +12)) = *((UINT32*)T1[temp[3][0]]) ^ *((UINT32*)T2[temp[0][1]]) - ^ *((UINT32*)T3[temp[1][2]]) + ^ *((UINT32*)T3[temp[1][2]]) ^ *((UINT32*)T4[temp[2][3]]); for(r = 1; r < m_uRounds-1; r++) { @@ -1508,19 +1508,19 @@ void Rijndael::encrypt(const UINT8 a[16], UINT8 b[16]) *((UINT32*)(b )) = *((UINT32*)T1[temp[0][0]]) ^ *((UINT32*)T2[temp[1][1]]) - ^ *((UINT32*)T3[temp[2][2]]) + ^ *((UINT32*)T3[temp[2][2]]) ^ *((UINT32*)T4[temp[3][3]]); *((UINT32*)(b + 4)) = *((UINT32*)T1[temp[1][0]]) ^ *((UINT32*)T2[temp[2][1]]) - ^ *((UINT32*)T3[temp[3][2]]) + ^ *((UINT32*)T3[temp[3][2]]) ^ *((UINT32*)T4[temp[0][3]]); *((UINT32*)(b + 8)) = *((UINT32*)T1[temp[2][0]]) ^ *((UINT32*)T2[temp[3][1]]) - ^ *((UINT32*)T3[temp[0][2]]) + ^ *((UINT32*)T3[temp[0][2]]) ^ *((UINT32*)T4[temp[1][3]]); *((UINT32*)(b +12)) = *((UINT32*)T1[temp[3][0]]) ^ *((UINT32*)T2[temp[0][1]]) - ^ *((UINT32*)T3[temp[1][2]]) + ^ *((UINT32*)T3[temp[1][2]]) ^ *((UINT32*)T4[temp[2][3]]); } *((UINT32*)temp[0]) = *((UINT32*)(b )) ^ *((UINT32*)m_expandedKey[m_uRounds-1][0]); @@ -1553,7 +1553,7 @@ void Rijndael::decrypt(const UINT8 a[16], UINT8 b[16]) { int r; UINT8 temp[4][4]; - + *((UINT32*)temp[0]) = *((UINT32*)(a )) ^ *((UINT32*)m_expandedKey[m_uRounds][0]); *((UINT32*)temp[1]) = *((UINT32*)(a+ 4)) ^ *((UINT32*)m_expandedKey[m_uRounds][1]); *((UINT32*)temp[2]) = *((UINT32*)(a+ 8)) ^ *((UINT32*)m_expandedKey[m_uRounds][2]); @@ -1561,19 +1561,19 @@ void Rijndael::decrypt(const UINT8 a[16], UINT8 b[16]) *((UINT32*)(b )) = *((UINT32*)T5[temp[0][0]]) ^ *((UINT32*)T6[temp[3][1]]) - ^ *((UINT32*)T7[temp[2][2]]) + ^ *((UINT32*)T7[temp[2][2]]) ^ *((UINT32*)T8[temp[1][3]]); *((UINT32*)(b+ 4)) = *((UINT32*)T5[temp[1][0]]) ^ *((UINT32*)T6[temp[0][1]]) - ^ *((UINT32*)T7[temp[3][2]]) + ^ *((UINT32*)T7[temp[3][2]]) ^ *((UINT32*)T8[temp[2][3]]); *((UINT32*)(b+ 8)) = *((UINT32*)T5[temp[2][0]]) ^ *((UINT32*)T6[temp[1][1]]) - ^ *((UINT32*)T7[temp[0][2]]) + ^ *((UINT32*)T7[temp[0][2]]) ^ *((UINT32*)T8[temp[3][3]]); *((UINT32*)(b+12)) = *((UINT32*)T5[temp[3][0]]) ^ *((UINT32*)T6[temp[2][1]]) - ^ *((UINT32*)T7[temp[1][2]]) + ^ *((UINT32*)T7[temp[1][2]]) ^ *((UINT32*)T8[temp[0][3]]); for(r = m_uRounds-1; r > 1; r--) { @@ -1583,22 +1583,22 @@ void Rijndael::decrypt(const UINT8 a[16], UINT8 b[16]) *((UINT32*)temp[3]) = *((UINT32*)(b+12)) ^ *((UINT32*)m_expandedKey[r][3]); *((UINT32*)(b )) = *((UINT32*)T5[temp[0][0]]) ^ *((UINT32*)T6[temp[3][1]]) - ^ *((UINT32*)T7[temp[2][2]]) + ^ *((UINT32*)T7[temp[2][2]]) ^ *((UINT32*)T8[temp[1][3]]); *((UINT32*)(b+ 4)) = *((UINT32*)T5[temp[1][0]]) ^ *((UINT32*)T6[temp[0][1]]) - ^ *((UINT32*)T7[temp[3][2]]) + ^ *((UINT32*)T7[temp[3][2]]) ^ *((UINT32*)T8[temp[2][3]]); *((UINT32*)(b+ 8)) = *((UINT32*)T5[temp[2][0]]) ^ *((UINT32*)T6[temp[1][1]]) - ^ *((UINT32*)T7[temp[0][2]]) + ^ *((UINT32*)T7[temp[0][2]]) ^ *((UINT32*)T8[temp[3][3]]); *((UINT32*)(b+12)) = *((UINT32*)T5[temp[3][0]]) ^ *((UINT32*)T6[temp[2][1]]) - ^ *((UINT32*)T7[temp[1][2]]) + ^ *((UINT32*)T7[temp[1][2]]) ^ *((UINT32*)T8[temp[0][3]]); } - + *((UINT32*)temp[0]) = *((UINT32*)(b )) ^ *((UINT32*)m_expandedKey[1][0]); *((UINT32*)temp[1]) = *((UINT32*)(b+ 4)) ^ *((UINT32*)m_expandedKey[1][1]); *((UINT32*)temp[2]) = *((UINT32*)(b+ 8)) ^ *((UINT32*)m_expandedKey[1][2]); diff --git a/src/modules/rijndael/rijndael.h b/src/modules/rijndael/rijndael.h index 1bbef17b1..9ad685c20 100644 --- a/src/modules/rijndael/rijndael.h +++ b/src/modules/rijndael/rijndael.h @@ -89,7 +89,7 @@ //#define BITSPERBLOCK 128 /* Default number of bits in a cipher block */ #define MAX_IV_SIZE 16 -// We assume that unsigned int is 32 bits long.... +// We assume that unsigned int is 32 bits long.... typedef unsigned char UINT8; typedef unsigned int UINT32; typedef unsigned short UINT16; diff --git a/src/modules/setup/setupwizard.cpp b/src/modules/setup/setupwizard.cpp index 3ad3ee858..411ffe1fc 100644 --- a/src/modules/setup/setupwizard.cpp +++ b/src/modules/setup/setupwizard.cpp @@ -105,7 +105,7 @@ KviSetupPage::KviSetupPage(KviSetupWizard * w) //m_pVBox->setBackgroundColor(QColor(0,80,0)); //m_pVBox->setMaximumHeight(450); g->addWidget(m_pVBox,0,1); - + g->setColumnStretch(1,1); QLabel * l = new QLabel(m_pVBox); @@ -120,9 +120,9 @@ KviSetupPage::KviSetupPage(KviSetupWizard * w) l->setFrameStyle(QFrame::Sunken | QFrame::StyledPanel); l->setAlignment(Qt::AlignLeft | Qt::AlignVCenter); l->setMargin(0); - QPalette p = l->palette(); - p.setColor(backgroundRole(), QColor(48,48,48)); - l->setPalette(p); + QPalette p = l->palette(); + p.setColor(backgroundRole(), QColor(48,48,48)); + l->setPalette(p); m_pTextLabel = new QLabel(m_pVBox); m_pTextLabel->setWordWrap(true); @@ -203,7 +203,7 @@ KviSetupWizard::KviSetupWizard() "Please report to <pragma at kvirc dot net>"); } ed->setText(szLicense); - + m_pLicense->m_pVBox->setStretchFactor(ed,1); addPage(m_pLicense,__tr2qs("Dreaded License Agreement")); @@ -235,25 +235,25 @@ KviSetupWizard::KviSetupWizard() m_pDirButtonGroup = new KviTalGroupBox(Qt::Horizontal,__tr2qs("Store configuration in folder"),m_pDirectory->m_pVBox); m_pDirUsePrev = new QRadioButton(__tr2qs("Use settings folder from previous installation"),m_pDirButtonGroup); connect(m_pDirUsePrev,SIGNAL(clicked()),this,SLOT(oldDirClicked())); - + m_pOldPathBox = new KviTalHBox(m_pDirButtonGroup); m_pOldDataPathEdit = new QLineEdit(m_pOldPathBox); connect(m_pOldDataPathEdit,SIGNAL(textChanged ( const QString & )),this,SLOT(oldDataTextChanged ( const QString & ))); - + QPushButton * pb = new QPushButton(__tr2qs("&Browse..."),m_pOldPathBox); connect(pb,SIGNAL(clicked()),this,SLOT(chooseOldDataPath())); m_pOldPathBox->setSpacing(3); m_pOldPathBox->setStretchFactor(m_pOldDataPathEdit,1); - + m_pDirUseNew = new QRadioButton(__tr2qs("Use new settings folder"),m_pDirButtonGroup); connect(m_pDirUseNew,SIGNAL(clicked()),this,SLOT(newDirClicked())); - + QLabel* l = new QLabel(m_pDirButtonGroup); l->setText(__tr2qs("Settings folder:")); m_pNewPathBox = new KviTalHBox(m_pDirButtonGroup); m_pDataPathEdit = new QLineEdit(m_pNewPathBox); - + pb = new QPushButton(__tr2qs("&Browse..."),m_pNewPathBox); connect(pb,SIGNAL(clicked()),this,SLOT(chooseDataPath())); @@ -264,7 +264,7 @@ KviSetupWizard::KviSetupWizard() tmp = QTextCodec::codecForLocale()->toUnicode(getenv( "APPDATA" )); if(tmp.isEmpty()) tmp = QDir::homePath(); -#else +#else tmp = QDir::homePath(); #endif //COMPILE_ON_WINDOWS KviQString::ensureLastCharIs(tmp,KVI_PATH_SEPARATOR_CHAR); @@ -281,7 +281,7 @@ KviSetupWizard::KviSetupWizard() m_pNewIncomingBox = new KviTalHBox(m_pDirButtonGroup); m_pIncomingPathEdit = new QLineEdit(m_pNewIncomingBox); - + pb = new QPushButton(__tr2qs("&Browse..."),m_pNewIncomingBox); connect(pb,SIGNAL(clicked()),this,SLOT(chooseIncomingPath())); @@ -293,7 +293,7 @@ KviSetupWizard::KviSetupWizard() tmp.append(KVI_DEFAULT_INCOMING_SUBDIRECTORY_NAME); KviFileUtils::adjustFilePath(tmp); m_pIncomingPathEdit->setText(tmp); - + m_pDirUseNew->toggle(); #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) @@ -303,7 +303,7 @@ KviSetupWizard::KviSetupWizard() // Pragma: Unused, takes only space. //m_pDirRestore = new QRadioButton(__tr2qs("Restore from backup archive"),m_pDirButtonGroup); //m_pDirRestore->setEnabled(FALSE); - + //l = new QLabel(m_pDirectory->m_pVBox,"<b> </b>"); //m_pDirectory->m_pVBox->setStretchFactor(m_pDirectory->m_pTextLabel,1); @@ -339,7 +339,7 @@ KviSetupWizard::KviSetupWizard() m_pNickSelector = new KviStringSelector(gbox,__tr2qs("Nickname:"),&(KVI_OPTION_STRING(KviOption_stringNickname1)),true); m_pNickSelector->setMinimumLabelWidth(120); m_pNickSelector->setMargin(0); - + QValidator * v = new QRegExpValidator(QRegExp("[^-0-9 ][^ ]*"),gbox); m_pNickSelector->setValidator(v); @@ -357,12 +357,12 @@ KviSetupWizard::KviSetupWizard() KviTalHBox* hb = new KviTalHBox(gbox); hb->setSpacing(4); hb->setMargin(0); - + l = new QLabel(__tr2qs("Age:"),hb); l->setMinimumWidth(120); - + m_pAgeCombo = new QComboBox(hb); - + m_pAgeCombo->insertItem(0,__tr2qs("Unspecified")); unsigned int i; for(i=1;i<120;i++) @@ -384,7 +384,7 @@ KviSetupWizard::KviSetupWizard() hb = new KviTalHBox(gbox); hb->setSpacing(4); hb->setMargin(0); - + l = new QLabel(__tr2qs("Gender:"),hb); l->setMinimumWidth(120); @@ -420,7 +420,7 @@ KviSetupWizard::KviSetupWizard() setHelpEnabled(m_pIdentity,false); - + ///////////////////////////////////////////////////////////////////////////////////////////////////////////// // Default theme /* m_pTheme = new KviSetupPage(this); @@ -434,30 +434,30 @@ KviSetupWizard::KviSetupWizard() "If you don't know what to choose, just use the default.</p>")); m_pThemeButtonGroup = new KviTalVButtonGroup(m_pTheme->m_pVBox); - + KviTalHBox* pThemesHb = new KviTalHBox(m_pThemeButtonGroup); KviTalVBox* pThemesVb = new KviTalVBox(pThemesHb); - + QString szThemeImagePath; g_pApp->getGlobalKvircDirectory(szThemeImagePath,KviApp::Pics,"kvi_setup_theme_hires.png"); - + QPixmap* pHiResPixmap = new QPixmap(szThemeImagePath); if(pHiResPixmap->isNull()) { delete pHiResPixmap; pHiResPixmap= new QPixmap(250,200); } - + QLabel* pPixmapLabelHiRes = new QLabel(pThemesVb); pPixmapLabelHiRes->setPixmap(*pHiResPixmap); pPixmapLabelHiRes->setFixedSize(pHiResPixmap->size()); pPixmapLabelHiRes->setFrameStyle(QFrame::Sunken | QFrame::StyledPanel); pPixmapLabelHiRes->setMargin(0); - + m_pThemeHiRes = new QRadioButton(__tr2qs("&Fancy Theme"),pThemesVb); - + pThemesVb = new KviTalVBox(pThemesHb); g_pApp->getGlobalKvircDirectory(szThemeImagePath,KviApp::Pics,"kvi_setup_theme_lowres.png"); QPixmap* pLowResPixmap = new QPixmap(szThemeImagePath); @@ -466,19 +466,19 @@ KviSetupWizard::KviSetupWizard() delete pLowResPixmap; pLowResPixmap= new QPixmap(250,200); } - + QLabel* pPixmapLabelLowRes = new QLabel(pThemesVb); pPixmapLabelLowRes->setPixmap(*pLowResPixmap); pPixmapLabelLowRes->setFixedSize(pLowResPixmap->size()); pPixmapLabelLowRes->setFrameStyle(QFrame::Sunken | QFrame::StyledPanel); pPixmapLabelLowRes->setMargin(0); - + m_pThemeLoRes = new QRadioButton(__tr2qs("&Minimalist Theme"),pThemesVb); m_pThemeNone = new QRadioButton(__tr2qs("&Don't apply any theme"),m_pThemeButtonGroup); m_pThemeButtonGroup->insert(m_pThemeHiRes); m_pThemeButtonGroup->insert(m_pThemeLoRes); - + m_pThemeHiRes->setChecked(true); addPage(m_pTheme,__tr2qs("Default Theme")); @@ -529,17 +529,17 @@ KviSetupWizard::KviSetupWizard() m_pServersButtonGroup = new KviTalVButtonGroup(__tr2qs("Choose a server to connect"),m_pServers->m_pVBox); - + m_pServersChooseFromList = new QRadioButton(__tr2qs("Choose from built-in server list"),m_pServersButtonGroup); - + m_pServersSpecifyManually = new QRadioButton(__tr2qs("Specify server manually"),m_pServersButtonGroup); hb = new KviTalHBox(m_pServersButtonGroup); - + m_uServerPort=6667; m_pServerHostSelector = new KviStringSelector(hb,__tr2qs("Server:"),&m_szServerHost,true); m_pServerPortSelector = new KviUIntSelector(hb,__tr2qs("Port:"),&m_uServerPort,1,65536,6667,true,false); - - + + m_pServersOpenIrcUrl = new QRadioButton(__tr2qs("Open irc:// or irc6:// URL"),m_pServersButtonGroup); m_szServerUrl="irc://"; m_pServerUrlSelector = new KviStringSelector(m_pServersButtonGroup,__tr2qs("URL:"),&m_szServerUrl,true); @@ -625,9 +625,9 @@ KviSetupWizard::KviSetupWizard() cfg.setGroup("mirc"); m_pNickSelector->setText(cfg.readQStringEntry("nick",KVI_OPTION_STRING(KviOption_stringNickname1))); m_pRealNameSelector->setText(cfg.readQStringEntry("user",KVI_OPTION_STRING(KviOption_stringRealname))); - KVI_OPTION_STRING(KviOption_stringNickname2) = + KVI_OPTION_STRING(KviOption_stringNickname2) = cfg.readQStringEntry("anick",KVI_OPTION_STRING(KviOption_stringNickname2)); - KVI_OPTION_STRING(KviOption_stringUsername) = + KVI_OPTION_STRING(KviOption_stringUsername) = cfg.readQStringEntry("email",KVI_OPTION_STRING(KviOption_stringUsername)).section('@',0,0); if(cfg.hasGroup("files")) @@ -666,7 +666,7 @@ void KviSetupWizard::showEvent(QShowEvent *e) { int primary_screen = g_pApp->desktop()->primaryScreen(); QRect r = g_pApp->desktop()->screenGeometry(primary_screen); - + int w = r.width(); int h = r.height(); @@ -680,7 +680,7 @@ void KviSetupWizard::showEvent(QShowEvent *e) } else { if(ww < 770)ww = 770; } - + setGeometry(r.left() + (w - ww) / 2, r.top() + (h - wh) / 2,ww,wh); KviTalWizard::showEvent(e); @@ -691,11 +691,11 @@ void KviSetupWizard::oldDirClicked() m_pOldPathBox->setEnabled(true); m_pNewPathBox->setEnabled(false); m_pNewIncomingBox->setEnabled(false); - + if(m_pIdentity) setPageEnabled(m_pIdentity,false); // if(m_pTheme) setPageEnabled(m_pTheme,false); if(m_pServers) setPageEnabled(m_pServers,false); - + if(m_pOldDataPathEdit->text().isEmpty()) setNextEnabled(m_pDirectory,false); else setNextEnabled(m_pDirectory,true); } @@ -720,11 +720,11 @@ void KviSetupWizard::newDirClicked() m_pOldPathBox->setEnabled(false); m_pNewPathBox->setEnabled(true); m_pNewIncomingBox->setEnabled(true); - + if(m_pIdentity) setPageEnabled(m_pIdentity,true); // if(m_pTheme) setPageEnabled(m_pTheme,true); if(m_pServers) setPageEnabled(m_pServers,true); - + if(m_pDataPathEdit->text().isEmpty() || m_pIncomingPathEdit->text().isEmpty()) setNextEnabled(m_pDirectory,false); else setNextEnabled(m_pDirectory,true); } @@ -782,7 +782,7 @@ void KviSetupWizard::makeLink() // You need this horrible snippet of code to create a shortcut!!!! // // you have to: - // - dig in the registry , + // - dig in the registry , // - trigger the entire COM subsystem // - bring up a couple of OLE interfaces.... // - use some obscure functions like MultiByteToWideChar @@ -801,7 +801,7 @@ void KviSetupWizard::makeLink() // Dig in the registry looking up the Desktop path if(RegOpenKeyEx(HKEY_CURRENT_USER, - "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders", + "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders", 0,KEY_QUERY_VALUE,&hCU) == ERROR_SUCCESS) { RegQueryValueEx(hCU,"Desktop",NULL,&lpType, @@ -830,7 +830,7 @@ void KviSetupWizard::makeLink() IPersistFile* ppf; - // Query IShellLink for the IPersistFile interface for + // Query IShellLink for the IPersistFile interface for // saving the shell link in persistent storage. if(psl->QueryInterface(IID_IPersistFile,(void **)&ppf) == S_OK) { @@ -842,7 +842,7 @@ void KviSetupWizard::makeLink() // Ensure string is ANSI. MultiByteToWideChar(CP_ACP,0,QTextCodec::codecForLocale()->fromUnicode(szLinkTarget).data(),-1,(LPWSTR)wsz,MAX_PATH); // Save the link via the IPersistFile::Save method. - ppf->Save((LPCOLESTR)wsz,true); + ppf->Save((LPCOLESTR)wsz,true); ppf->Release(); } psl->Release(); @@ -946,7 +946,7 @@ void KviSetupWizard::reject() void KviSetupWizard::accept() { QString szDir; - + if(m_pDirUsePrev->isChecked()) { bNeedToApplyDefaults=false; @@ -981,7 +981,7 @@ void KviSetupWizard::accept() "If you experience any problems try deleting the old directory:\n" \ "the setup program will be started automatically again."),szDir.ptr()); }*/ - + g_pApp->m_szLocalKvircDir = szDir; KviFileUtils::adjustFilePath(g_pApp->m_szLocalKvircDir); @@ -1008,24 +1008,24 @@ void KviSetupWizard::accept() } g_szChoosenIncomingDirectory = szDir; - + #if !defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MINGW) // Make local->global link QString localPath = QString("%1/global").arg(g_pApp->m_szLocalKvircDir); unlink(QTextCodec::codecForLocale()->fromUnicode(localPath).data()); symlink(QTextCodec::codecForLocale()->fromUnicode(g_pApp->m_szGlobalKvircDir).data(),QTextCodec::codecForLocale()->fromUnicode(localPath).data()); #endif - + #ifdef COMPILE_KDE_SUPPORT if(m_pCreateDesktopShortcut->isChecked()) makeLink(); #endif - + #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) if(m_pCreateUrlHandlers->isChecked()) setUrlHandlers(); #endif - + /* if(m_pTheme) { if(m_pThemeButtonGroup->selected() == m_pThemeHiRes) @@ -1038,7 +1038,7 @@ void KviSetupWizard::accept() g_iThemeToApply = THEME_APPLY_NONE; } } -*/ +*/ if(m_pIdentity) { m_pNickSelector->commit(); @@ -1046,18 +1046,18 @@ void KviSetupWizard::accept() m_pLocationSelector->commit(); m_pLanguagesSelector->commit(); //m_pOtherInfoSelector->commit(); - + KVI_OPTION_STRING(KviOption_stringNickname1).trimmed(); KVI_OPTION_STRING(KviOption_stringNickname1).replace(" ",""); - + if(KVI_OPTION_STRING(KviOption_stringNickname1).length() > 32) { QString tmp = KVI_OPTION_STRING(KviOption_stringNickname1).left(32); KVI_OPTION_STRING(KviOption_stringNickname1) = tmp; } - + if(KVI_OPTION_STRING(KviOption_stringNickname1).isEmpty())KVI_OPTION_STRING(KviOption_stringNickname1) = "newbie"; - + QString szNickPart; if(KVI_OPTION_STRING(KviOption_stringNickname1).length() < 31) { @@ -1065,7 +1065,7 @@ void KviSetupWizard::accept() } else { szNickPart = KVI_OPTION_STRING(KviOption_stringNickname1).left(30); } - + QString alt = szNickPart; alt.prepend("|"); // <-- this is an erroneous nickname on IrcNet :/ alt.append("|"); @@ -1078,13 +1078,13 @@ void KviSetupWizard::accept() alt = szNickPart; alt.append("2"); KVI_OPTION_STRING(KviOption_stringNickname4) = alt; - + int i = m_pAgeCombo->currentIndex(); if(i < 0)i = 0; if(i > 120)i = 120; if(i <= 0)KVI_OPTION_STRING(KviOption_stringCtcpUserInfoAge) = ""; else KVI_OPTION_STRING(KviOption_stringCtcpUserInfoAge).setNum(i); - + switch(m_pGenderCombo->currentIndex()) { case 1: @@ -1104,7 +1104,7 @@ void KviSetupWizard::accept() m_pServerUrlSelector->commit(); //m_pServerConfigSelector->commit(); m_pServerPortSelector->commit(); - + if(m_pServersSpecifyManually->isOn()) { KVI_OPTION_BOOL(KviOption_boolShowServersConnectDialogOnStart) = FALSE; diff --git a/src/modules/setup/setupwizard.h b/src/modules/setup/setupwizard.h index 1d8e6cd9f..a4394303c 100644 --- a/src/modules/setup/setupwizard.h +++ b/src/modules/setup/setupwizard.h @@ -77,18 +77,18 @@ public: // KviSetupPage * m_pTheme; KviSetupPage * m_pDesktopIntegration; KviSetupPage * m_pServers; - + // Theme //KviTalGroupBox * m_pThemeButtonGroup; QRadioButton * m_pThemeHiRes; QRadioButton * m_pThemeLoRes; QRadioButton * m_pThemeNone; - + // Welcome QCheckBox * m_pCreateUrlHandlers; QCheckBox * m_pCreateDesktopShortcut; - + //Dir QLineEdit * m_pDataPathEdit; QLineEdit * m_pIncomingPathEdit; @@ -103,17 +103,17 @@ public: KviTalHBox * m_pOldPathBox; KviTalHBox * m_pNewPathBox; KviTalHBox * m_pNewIncomingBox; - + //Identify QComboBox * m_pAgeCombo; QComboBox * m_pGenderCombo; - + KviStringSelector * m_pNickSelector; KviStringSelector * m_pRealNameSelector; KviStringSelector * m_pLocationSelector; KviStringSelector * m_pLanguagesSelector; //KviStringSelector * m_pOtherInfoSelector; - + //Servers //KviTalVButtonGroup * m_pServersButtonGroup; //QRadioButton * m_pServersChooseFromList; @@ -124,17 +124,17 @@ public: QString m_szMircServerIniFile; QRadioButton * m_pUseMircServerList; #endif - + QString m_szServerConfigFile; QString m_szServerUrl; QString m_szServerHost; unsigned int m_uServerPort; - + KviStringSelector * m_pServerHostSelector; KviStringSelector * m_pServerUrlSelector; //KviFileSelector * m_pServerConfigSelector; KviUIntSelector *m_pServerPortSelector; - + protected: void makeLink(); void setUrlHandlers(); @@ -145,10 +145,10 @@ public slots: void chooseIncomingPath(); virtual void accept(); virtual void reject(); - + void oldDirClicked(); void newDirClicked(); - + void oldDataTextChanged ( const QString & ); void newDataTextChanged ( const QString & ); void newIncomingTextChanged ( const QString & ); diff --git a/src/modules/spaste/controller.h b/src/modules/spaste/controller.h index 3dffbedab..d428e22a9 100644 --- a/src/modules/spaste/controller.h +++ b/src/modules/spaste/controller.h @@ -39,7 +39,7 @@ class SPasteController : public QObject public: SPasteController(KviWindow * w,int id); ~SPasteController(); - + //bool pasteFileInit(KviStr * fileName); bool pasteFileInit(QString &fileName); bool pasteClipboardInit(void); diff --git a/src/modules/system/libkvisystem.cpp b/src/modules/system/libkvisystem.cpp index fd27085b8..ebf378a9e 100644 --- a/src/modules/system/libkvisystem.cpp +++ b/src/modules/system/libkvisystem.cpp @@ -467,7 +467,7 @@ static bool system_kvs_fnc_dbus(KviKvsModuleFunctionCall *c) if(!remoteApp.isValid()) { c->warning(__tr2qs("Invalid DBus interface")); - return false; + return false; } QList<QVariant> ds; @@ -523,7 +523,7 @@ static bool system_kvs_fnc_dbus(KviKvsModuleFunctionCall *c) } QDBusMessage reply = remoteApp.callWithArgumentList(QDBus::Block, szMethod, ds); - + if (reply.type() == QDBusMessage::ErrorMessage) { QDBusError err = reply; diff --git a/src/modules/theme/themefunctions.cpp b/src/modules/theme/themefunctions.cpp index 446d6797c..9c4c04ad6 100644 --- a/src/modules/theme/themefunctions.cpp +++ b/src/modules/theme/themefunctions.cpp @@ -58,7 +58,7 @@ namespace KviThemeFunctions KviHtmlDialogData hd; const char * check_fields[] = { "Name", "Version", "Author", "Description", "Date", "Application" }; - + // check if it is a valid theme file KviPackageReader r; if(!r.readHeader(szThemePackageFileName)) @@ -67,37 +67,37 @@ namespace KviThemeFunctions KviQString::sprintf(szError,__tr2qs_ctx("The selected file does not seem to be a valid KVIrc package: %Q","theme"),&szErr); return false; } - + pInfoFields = r.stringInfoFields(); - + pValue = pInfoFields->find("PackageType"); if(!pValue)return notAValidThemePackage(szError); if(!KviQString::equalCI(*pValue,"ThemePack"))return notAValidThemePackage(szError); pValue = pInfoFields->find("ThemePackVersion"); if(!pValue)return notAValidThemePackage(szError); if(!KviQString::equalCI(*pValue,"1"))return notAValidThemePackage(szError); - + // make sure the default fields exist for(int i=0;i<6;i++) { pValue = pInfoFields->find(check_fields[i]); if(!pValue)return notAValidThemePackage(szError); } - + pValue = pInfoFields->find("ThemeCount"); if(!pValue)return notAValidThemePackage(szError); bool bOk; int iThemeCount = pValue->toInt(&bOk); if(!bOk)return notAValidThemePackage(szError); if(iThemeCount < 1)return notAValidThemePackage(szError); - + // ok.. it should be really valid at this point - + // load its picture pByteArray = r.binaryInfoFields()->find("Image"); if(pByteArray) pix.loadFromData(*pByteArray,0,0); - + if(pix.isNull()) { // load the default icon @@ -129,11 +129,11 @@ namespace KviThemeFunctions int iIdx = 0; int iValidThemeCount = iThemeCount; - + while(iIdx < iThemeCount) { bool bValid = true; - + QString szThemeName; QString szThemeVersion; QString szThemeDescription; @@ -256,7 +256,7 @@ namespace KviThemeFunctions &szWarnings, &szShowDetails ); - + hd.addImageResource("theme_dialog_pack_image",pix); hd.addHtmlResource("theme_dialog_details",szDetails); hd.addHtmlResource("theme_dialog_main",hd.szHtmlText); @@ -277,7 +277,7 @@ namespace KviThemeFunctions hd.iFlags = KviHtmlDialogData::ForceMinimumSize; bInstall = KviHtmlDialog::display(pDialogParent,&hd) == 2; - + if(bInstall) { QString szUnpackPath; @@ -373,13 +373,13 @@ namespace KviThemeFunctions if(g_pFrame->isMaximized()) bMaximizeFrame = false; } - + if(bMaximizeFrame) g_pFrame->showMaximized(); - + QPixmap pix = QPixmap::grabWidget(g_pFrame); bool bResult = true; - + if(pix.isNull()) bResult = false; else { diff --git a/src/modules/theme/themefunctions.h b/src/modules/theme/themefunctions.h index f7b357e5b..dd29fe4bd 100644 --- a/src/modules/theme/themefunctions.h +++ b/src/modules/theme/themefunctions.h @@ -47,7 +47,7 @@ namespace KviThemeFunctions const QPixmap &pixScreenshot, int iUniqueIndexInDocument = 0, KviHtmlDialogData *hd=0 - + ); bool makeKVIrcScreenshot(const QString &szSavePngFilePath,bool bMaximizeFrame = false); } diff --git a/src/modules/tip/libkvitip_cs.kvc b/src/modules/tip/libkvitip_cs.kvc index ab169fe71..76e76c9b6 100644 --- a/src/modules/tip/libkvitip_cs.kvc +++ b/src/modules/tip/libkvitip_cs.kvc @@ -1,4 +1,4 @@ -[KVIrc] +[KVIrc] uNextTip=0 uNumTips=25 Encoding=UTF8 diff --git a/src/modules/tmphighlight/libkvitmphighlight.cpp b/src/modules/tmphighlight/libkvitmphighlight.cpp index c8d5361ca..248ab2c65 100644 --- a/src/modules/tmphighlight/libkvitmphighlight.cpp +++ b/src/modules/tmphighlight/libkvitmphighlight.cpp @@ -117,7 +117,7 @@ static bool tmphighlight_kvs_cmd_removenick(KviKvsModuleCommandCall * c) tmphighlight.addChannel [window_id:integer] @description: This command adds a channel to the irc context temporary highlight list, so that every user message - from that channel will be highlighted until you close that irc context. This is useful when you want + from that channel will be highlighted until you close that irc context. This is useful when you want to follow every message in a low traffic channel. If you don't specify a channel, the current one is used. @seealso: diff --git a/src/modules/toolbareditor/toolbareditor.cpp b/src/modules/toolbareditor/toolbareditor.cpp index 236ba4805..54229a5f4 100644 --- a/src/modules/toolbareditor/toolbareditor.cpp +++ b/src/modules/toolbareditor/toolbareditor.cpp @@ -96,12 +96,12 @@ void KviTrashcanLabel::heartbeat() m_uFlashCount++; if(m_uFlashCount % 2){ QPalette p = palette(); - p.setColor(backgroundRole(),QColor(0,0,0)); + p.setColor(backgroundRole(),QColor(0,0,0)); setPalette(p); } else{ QPalette p = palette(); - p.setColor(backgroundRole(),m_clrOriginal); + p.setColor(backgroundRole(),m_clrOriginal); setPalette(p); } update(); @@ -133,9 +133,9 @@ KviCustomToolBarPropertiesDialog::KviCustomToolBarPropertiesDialog(QWidget * p,c setWindowTitle(__tr2qs_ctx("ToolBar Properties","editor")); setWindowIcon(QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TOOLBAR)))); - + QGridLayout * g = new QGridLayout(this); - + QLabel * l = new QLabel(szText,this); g->addWidget(l,0,0,1,6); @@ -146,14 +146,14 @@ KviCustomToolBarPropertiesDialog::KviCustomToolBarPropertiesDialog(QWidget * p,c g->addWidget(m_pLabelEdit,1,1,1,5); m_pLabelEdit->setText(szLabel); connect(m_pLabelEdit,SIGNAL(textChanged(const QString &)),this,SLOT(labelTextChanged(const QString &))); - + l = new QLabel(__tr2qs_ctx("Icon","editor") + ":",this); g->addWidget(l,2,0); - + m_pIconEdit = new QLineEdit(this); m_pIconEdit->setReadOnly(true); g->addWidget(m_pIconEdit,2,1,1,4); - + m_pIconButton = new QPushButton(this); g->addWidget(m_pIconButton,2,5,1,1); connect(m_pIconButton,SIGNAL(clicked()),this,SLOT(iconButtonClicked())); @@ -177,22 +177,22 @@ KviCustomToolBarPropertiesDialog::KviCustomToolBarPropertiesDialog(QWidget * p,c m_pAdvanced->hide(); m_pLabelEdit->setFocus(); - + QPushButton * pb = new QPushButton(__tr2qs_ctx("OK","editor"),this); connect(pb,SIGNAL(clicked()),this,SLOT(okClicked())); pb->setMinimumWidth(80); g->addWidget(pb,4,4,1,2); - + pb = new QPushButton(__tr2qs_ctx("Cancel","editor"),this); connect(pb,SIGNAL(clicked()),this,SLOT(reject())); pb->setMinimumWidth(80); g->addWidget(pb,4,3); - + m_pAdvancedButton = new QPushButton(__tr2qs_ctx("Advanced...","editor"),this); connect(m_pAdvancedButton,SIGNAL(clicked()),this,SLOT(advancedClicked())); m_pAdvancedButton->setMinimumWidth(100); g->addWidget(m_pAdvancedButton,4,0,1,2); - + g->setRowStretch(0,1); g->setColumnStretch(2,1); } @@ -245,12 +245,12 @@ void KviCustomToolBarPropertiesDialog::okClicked() QMessageBox::information(this,__tr2qs_ctx("Invalid ToolBar Label","editor"),__tr2qs_ctx("The ToolBar Label can't be empty!","editor"),__tr2qs_ctx("OK","editor")); return; } - + if(m_szId.isEmpty()) { m_szId = KviCustomToolBarManager::instance()->idForNewToolBar(m_szLabel); } - + if(KviCustomToolBarManager::instance()->find(m_szId)) { if(m_szId != m_szOriginalId) @@ -311,7 +311,7 @@ KviCustomizeToolBarsDialog::KviCustomizeToolBarsDialog(QWidget * p) QFrame * f = new QFrame(this); f->setFrameStyle(QFrame::HLine | QFrame::Sunken); g->addWidget(f,3,1); - + m_pExportToolBarButton = new QPushButton(__tr2qs_ctx("Export ToolBar","editor"),this); connect(m_pExportToolBarButton,SIGNAL(clicked()),this,SLOT(exportToolBar())); g->addWidget(m_pExportToolBarButton,4,1); @@ -325,12 +325,12 @@ KviCustomizeToolBarsDialog::KviCustomizeToolBarsDialog(QWidget * p) g->setRowStretch(5,1); g->setColumnStretch(0,1); - + m_pDrawer->fill(); connect(KviActionManager::instance(),SIGNAL(currentToolBarChanged()),this,SLOT(currentToolBarChanged())); KviActionManager::instance()->customizeToolBarsDialogCreated(); - + currentToolBarChanged(); if(g_rectToolBarEditorDialogGeometry.y() < 5) @@ -387,9 +387,9 @@ void KviCustomizeToolBarsDialog::exportToolBar() if(!szName.endsWith(QString(KVI_PATH_SEPARATOR)))szName += KVI_PATH_SEPARATOR; szName += t->descriptor()->id(); szName += ".kvs"; - + QString szFile; - + if(!KviFileDialog::askForSaveFileName(szFile,__tr2qs_ctx("Choose a Filename - KVIrc","editor"),szName,"*.kvs",true,true,true))return; QString szCode; diff --git a/src/win32registrar/Resource.h b/src/win32registrar/Resource.h index 045cc84e9..db4f1a628 100644 --- a/src/win32registrar/Resource.h +++ b/src/win32registrar/Resource.h @@ -7,7 +7,7 @@ #define IDR_WIN32REGISTRAR 101 // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 201 diff --git a/src/win32registrar/win32registrar.cpp b/src/win32registrar/win32registrar.cpp index ce6ff8d95..f6e59a98a 100644 --- a/src/win32registrar/win32registrar.cpp +++ b/src/win32registrar/win32registrar.cpp @@ -20,12 +20,12 @@ int APIENTRY WinMain(HINSTANCE hInst, HINSTANCE hPrevInstance, wcscpy(szModuleName+iFilePos+1,_TEXT("kvirc.exe")); wcsncpy(szModulePath,szModuleName,iFilePos); szModulePath[iFilePos]=0; - - + + //IRC:// SHDeleteKey(HKEY_CLASSES_ROOT,_T("irc")); - + err=RegCreateKeyEx(HKEY_CLASSES_ROOT,_T("irc"),0,0,0,KEY_WRITE,0,&hKey,0); RegSetValueEx( hKey,0,0,REG_SZ,(LPBYTE)(_T("URL:IRC Protocol")),16*2); RegSetValueEx( hKey,_T("URL Protocol"),0,REG_SZ,(LPBYTE)"",0); @@ -36,14 +36,14 @@ int APIENTRY WinMain(HINSTANCE hInst, HINSTANCE hPrevInstance, RegCreateKeyEx(HKEY_CLASSES_ROOT,_T("irc\\Shell\\open"),0,0,0,KEY_WRITE,0,&hKey,0); RegSetValueEx( hKey,0,0,REG_SZ,(LPBYTE)(_T("Open with KVIrc")),strlen("Open with KVIrc")*2); - + RegCreateKeyEx(HKEY_CLASSES_ROOT,_T("irc\\Shell\\open\\command"),0,0,0,KEY_WRITE,0,&hKey,0); wsprintf(szBuffer,_T("%s --external \"%%1\""),szModuleName); RegSetValueEx( hKey,0,0,REG_SZ,(LPBYTE)szBuffer,wcslen(szBuffer)*2); //IRCS:// SHDeleteKey(HKEY_CLASSES_ROOT,_T("ircs")); - + err=RegCreateKeyEx(HKEY_CLASSES_ROOT,_T("ircs"),0,0,0,KEY_WRITE,0,&hKey,0); RegSetValueEx( hKey,0,0,REG_SZ,(LPBYTE)(_T("URL:IRC Protocol")),16*2); RegSetValueEx( hKey,_T("URL Protocol"),0,REG_SZ,(LPBYTE)"",0); @@ -54,14 +54,14 @@ int APIENTRY WinMain(HINSTANCE hInst, HINSTANCE hPrevInstance, RegCreateKeyEx(HKEY_CLASSES_ROOT,_T("ircs\\Shell\\open"),0,0,0,KEY_WRITE,0,&hKey,0); RegSetValueEx( hKey,0,0,REG_SZ,(LPBYTE)(_T("Open with KVIrc")),strlen("Open with KVIrc")*2); - + RegCreateKeyEx(HKEY_CLASSES_ROOT,_T("ircs\\Shell\\open\\command"),0,0,0,KEY_WRITE,0,&hKey,0); wsprintf(szBuffer,_T("%s --external \"%%1\""),szModuleName); RegSetValueEx( hKey,0,0,REG_SZ,(LPBYTE)szBuffer,wcslen(szBuffer)*2); //IRC6:// SHDeleteKey(HKEY_CLASSES_ROOT,_T("irc6")); - + err=RegCreateKeyEx(HKEY_CLASSES_ROOT,_T("irc6"),0,0,0,KEY_WRITE,0,&hKey,0); RegSetValueEx( hKey,0,0,REG_SZ,(LPBYTE)(_T("URL:IRC Protocol")),16*2); RegSetValueEx( hKey,_T("URL Protocol"),0,REG_SZ,(LPBYTE)"",0); @@ -72,14 +72,14 @@ int APIENTRY WinMain(HINSTANCE hInst, HINSTANCE hPrevInstance, RegCreateKeyEx(HKEY_CLASSES_ROOT,_T("irc6\\Shell\\open"),0,0,0,KEY_WRITE,0,&hKey,0); RegSetValueEx( hKey,0,0,REG_SZ,(LPBYTE)(_T("Open with KVIrc")),strlen("Open with KVIrc")*2); - + RegCreateKeyEx(HKEY_CLASSES_ROOT,_T("irc6\\Shell\\open\\command"),0,0,0,KEY_WRITE,0,&hKey,0); wsprintf(szBuffer,_T("%s --external \"%%1\""),szModuleName); RegSetValueEx( hKey,0,0,REG_SZ,(LPBYTE)szBuffer,wcslen(szBuffer)*2); //IRCS6:// SHDeleteKey(HKEY_CLASSES_ROOT,_T("ircs6")); - + err=RegCreateKeyEx(HKEY_CLASSES_ROOT,_T("ircs6"),0,0,0,KEY_WRITE,0,&hKey,0); RegSetValueEx( hKey,0,0,REG_SZ,(LPBYTE)(_T("URL:IRC Protocol")),16*2); RegSetValueEx( hKey,_T("URL Protocol"),0,REG_SZ,(LPBYTE)"",0); @@ -90,7 +90,7 @@ int APIENTRY WinMain(HINSTANCE hInst, HINSTANCE hPrevInstance, RegCreateKeyEx(HKEY_CLASSES_ROOT,_T("ircs6\\Shell\\open"),0,0,0,KEY_WRITE,0,&hKey,0); RegSetValueEx( hKey,0,0,REG_SZ,(LPBYTE)(_T("Open with KVIrc")),strlen("Open with KVIrc")*2); - + RegCreateKeyEx(HKEY_CLASSES_ROOT,_T("ircs6\\Shell\\open\\command"),0,0,0,KEY_WRITE,0,&hKey,0); wsprintf(szBuffer,_T("%s --external \"%%1\""),szModuleName); RegSetValueEx( hKey,0,0,REG_SZ,(LPBYTE)szBuffer,wcslen(szBuffer)*2); @@ -102,7 +102,7 @@ int APIENTRY WinMain(HINSTANCE hInst, HINSTANCE hPrevInstance, err=RegCreateKeyEx(HKEY_CLASSES_ROOT,_T(".kvs"),0,0,0,KEY_WRITE,0,&hKey,0); RegSetValueEx( hKey,0,0,REG_SZ,(LPBYTE)_T("KVIrcScript"),11*2); - + SHDeleteKey(HKEY_CLASSES_ROOT,_T("KVIrcScript")); RegCreateKeyEx(HKEY_CLASSES_ROOT,_T("KVIrcScript"),0,0,0,KEY_WRITE,0,&hKey,0); @@ -114,7 +114,7 @@ int APIENTRY WinMain(HINSTANCE hInst, HINSTANCE hPrevInstance, RegCreateKeyEx(HKEY_CLASSES_ROOT,_T("KVIrcScript\\Shell\\Parse"),0,0,0,KEY_WRITE,0,&hKey,0); RegSetValueEx( hKey,0,0,REG_SZ,(LPBYTE)_T("Run KVS Script"),wcslen(_T("Run KVS Script"))*2); - + RegCreateKeyEx(HKEY_CLASSES_ROOT,_T("KVIrcScript\\Shell\\Parse\\command"),0,0,0,KEY_WRITE,0,&hKey,0); wsprintf(szBuffer,_T("%s \"%%1\""),szModuleName); RegSetValueEx( hKey,0,0,REG_SZ,(LPBYTE)szBuffer,wcslen(szBuffer)*2); @@ -124,7 +124,7 @@ int APIENTRY WinMain(HINSTANCE hInst, HINSTANCE hPrevInstance, err=RegCreateKeyEx(HKEY_CLASSES_ROOT,_T(".kvc"),0,0,0,KEY_WRITE,0,&hKey,0); RegSetValueEx( hKey,0,0,REG_SZ,(LPBYTE)_T("KVIrcConfig"),11*2); - + SHDeleteKey(HKEY_CLASSES_ROOT,_T("KVIrcConfig")); RegCreateKeyEx(HKEY_CLASSES_ROOT,_T("KVIrcConfig"),0,0,0,KEY_WRITE,0,&hKey,0); @@ -135,12 +135,12 @@ int APIENTRY WinMain(HINSTANCE hInst, HINSTANCE hPrevInstance, RegSetValueEx( hKey,0,0,REG_SZ,(LPBYTE)szBuffer,wcslen(szBuffer)*2); // Themes - + SHDeleteKey(HKEY_CLASSES_ROOT,_T(".kvt")); err=RegCreateKeyEx(HKEY_CLASSES_ROOT,_T(".kvt"),0,0,0,KEY_WRITE,0,&hKey,0); RegSetValueEx( hKey,0,0,REG_SZ,(LPBYTE)_T("KVIrcTheme"),11*2); - + SHDeleteKey(HKEY_CLASSES_ROOT,_T("KVIrcTheme")); RegCreateKeyEx(HKEY_CLASSES_ROOT,_T("KVIrcTheme"),0,0,0,KEY_WRITE,0,&hKey,0); @@ -152,7 +152,7 @@ int APIENTRY WinMain(HINSTANCE hInst, HINSTANCE hPrevInstance, RegCreateKeyEx(HKEY_CLASSES_ROOT,_T("KVIrcTheme\\Shell\\Install"),0,0,0,KEY_WRITE,0,&hKey,0); RegSetValueEx( hKey,0,0,REG_SZ,(LPBYTE)_T("Install Theme Package"),wcslen(_T("Install Theme Package"))*2); - + RegCreateKeyEx(HKEY_CLASSES_ROOT,_T("KVIrcTheme\\Shell\\Install\\command"),0,0,0,KEY_WRITE,0,&hKey,0); wsprintf(szBuffer,_T("%s \"%%1\""),szModuleName); RegSetValueEx( hKey,0,0,REG_SZ,(LPBYTE)szBuffer,wcslen(szBuffer)*2); @@ -163,7 +163,7 @@ int APIENTRY WinMain(HINSTANCE hInst, HINSTANCE hPrevInstance, err=RegCreateKeyEx(HKEY_CLASSES_ROOT,_T(".kva"),0,0,0,KEY_WRITE,0,&hKey,0); RegSetValueEx( hKey,0,0,REG_SZ,(LPBYTE)_T("KVIrcAddon"),11*2); - + SHDeleteKey(HKEY_CLASSES_ROOT,_T("KVIrcAddon")); RegCreateKeyEx(HKEY_CLASSES_ROOT,_T("KVIrcAddon"),0,0,0,KEY_WRITE,0,&hKey,0); @@ -175,7 +175,7 @@ int APIENTRY WinMain(HINSTANCE hInst, HINSTANCE hPrevInstance, RegCreateKeyEx(HKEY_CLASSES_ROOT,_T("KVIrcAddon\\Shell\\Install"),0,0,0,KEY_WRITE,0,&hKey,0); RegSetValueEx( hKey,0,0,REG_SZ,(LPBYTE)_T("Install Package"),wcslen(_T("Install Package"))*2); - + RegCreateKeyEx(HKEY_CLASSES_ROOT,_T("KVIrcAddon\\Shell\\Install\\command"),0,0,0,KEY_WRITE,0,&hKey,0); wsprintf(szBuffer,_T("%s \"%%1\""),szModuleName); RegSetValueEx( hKey,0,0,REG_SZ,(LPBYTE)szBuffer,wcslen(szBuffer)*2); diff --git a/src/win32registrar/win32registrar.h b/src/win32registrar/win32registrar.h index b0d41a210..a7339eaa4 100644 --- a/src/win32registrar/win32registrar.h +++ b/src/win32registrar/win32registrar.h @@ -9,8 +9,8 @@ /* Compiler settings for .\win32registrar.idl: Oicf, W1, Zp8, env=Win32 (32b run) protocol : dce , ms_ext, c_ext - error checks: allocation ref bounds_check enum stub_data - VC __declspec() decoration level: + error checks: allocation ref bounds_check enum stub_data + VC __declspec() decoration level: __declspec(uuid()), __declspec(selectany), __declspec(novtable) DECLSPEC_UUID(), MIDL_INTERFACE() */ @@ -34,7 +34,7 @@ #pragma once #endif -/* Forward Declarations */ +/* Forward Declarations */ /* header files for imported files */ #include "oaidl.h" @@ -42,17 +42,17 @@ #ifdef __cplusplus extern "C"{ -#endif +#endif void * __RPC_USER MIDL_user_allocate(size_t); -void __RPC_USER MIDL_user_free( void * ); +void __RPC_USER MIDL_user_free( void * ); #ifndef __win32registrarLib_LIBRARY_DEFINED__ #define __win32registrarLib_LIBRARY_DEFINED__ /* library win32registrarLib */ -/* [helpstring][version][uuid] */ +/* [helpstring][version][uuid] */ EXTERN_C const IID LIBID_win32registrarLib; diff --git a/src/win32registrar/win32registrar.rc b/src/win32registrar/win32registrar.rc index b5b41bf40..76266136b 100644 --- a/src/win32registrar/win32registrar.rc +++ b/src/win32registrar/win32registrar.rc @@ -27,18 +27,18 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT // TEXTINCLUDE // -1 TEXTINCLUDE +1 TEXTINCLUDE BEGIN "resource.h\0" END -2 TEXTINCLUDE +2 TEXTINCLUDE BEGIN "#include ""winres.h""\r\n" "\0" END -3 TEXTINCLUDE +3 TEXTINCLUDE BEGIN "1 TYPELIB ""win32registrar.tlb""\r\n" "\0" @@ -98,7 +98,7 @@ IDR_WIN32REGISTRAR REGISTRY "win32registrar.rgs" // String Table // -STRINGTABLE +STRINGTABLE BEGIN IDS_PROJNAME "win32registrar" END diff --git a/win32build/KVIrc.nsi b/win32build/KVIrc.nsi index 50b4a940d..fbd4538f6 100644 --- a/win32build/KVIrc.nsi +++ b/win32build/KVIrc.nsi @@ -29,8 +29,8 @@ Var LocalDir !define MUI_ICON ..\data\resources_win32\icon1.ico !define MUI_UNICON ..\data\resources_win32\icon1.ico -!define MUI_LANGDLL_REGISTRY_ROOT "HKCU" -!define MUI_LANGDLL_REGISTRY_KEY "Software\KVIrc" +!define MUI_LANGDLL_REGISTRY_ROOT "HKCU" +!define MUI_LANGDLL_REGISTRY_KEY "Software\KVIrc" !define MUI_LANGDLL_REGISTRY_VALUENAME "Installer Language" !define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\README.txt" !define MUI_FINISHPAGE_RUN "$INSTDIR\kvirc.exe" @@ -41,7 +41,7 @@ Var LocalDir !insertmacro MUI_PAGE_DIRECTORY !insertmacro MUI_PAGE_INSTFILES !insertmacro MUI_PAGE_FINISH - + !insertmacro MUI_UNPAGE_CONFIRM !insertmacro MUI_UNPAGE_COMPONENTS !insertmacro MUI_UNPAGE_INSTFILES @@ -103,7 +103,7 @@ Section !$(KVIrc) KVIrc_IDX SectionIn RO SetDetailsPrint textonly DetailPrint $(KVIrcDescr) - SetDetailsPrint listonly + SetDetailsPrint listonly SetOutPath "$INSTDIR" File release\*.* @@ -132,10 +132,10 @@ Section !$(KVIrc) KVIrc_IDX SetOutPath "$INSTDIR\themes" File /r release\themes\*.* - + ; Write the installation path into the registry WriteRegStr HKLM SOFTWARE\KVIrc "Install_Dir" "$INSTDIR" - + ; Write the uninstall keys for Windows WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\KVIrc" "DisplayName" "KVIrc" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\KVIrc" "UninstallString" '"$INSTDIR\uninstall.exe"' @@ -147,9 +147,9 @@ Section !$(KVIrc) KVIrc_IDX WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\KVIrc" "NoRepair" 1 WriteUninstaller "uninstall.exe" - + ExecWait "$INSTDIR\win32registrar.exe" - + SectionEnd ; Optional section (can be disabled by the user) @@ -158,7 +158,7 @@ Section $(StartMenuSection) StartMenuSection_IDX CreateDirectory "$SMPROGRAMS\KVIrc" CreateShortCut "$SMPROGRAMS\KVIrc\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0 CreateShortCut "$SMPROGRAMS\KVIrc\KVIrc.lnk" "$INSTDIR\KVIrc.exe" "" "$INSTDIR\KVIrc.exe" 0 "" "" $(ProgramDescription) - + SectionEnd Section $(DesktopSection) DesktopSection_IDX @@ -207,10 +207,10 @@ Function .onInit Call CloseKVIrcInstances ReadRegStr $R0 HKCU Software\Winamp "" - IfFileExists "$R0\winamp.exe" continue 0 + IfFileExists "$R0\winamp.exe" continue 0 SectionSetFlags ${WinampSection_IDX} 16 # 10000 in binary: disabled+unchecked continue: - + FunctionEnd ;Function .onInstSuccess @@ -224,7 +224,7 @@ Section !un.$(UnGeneralFiles) ; Remove registry keys DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\KVIrc" DeleteRegKey HKLM SOFTWARE\KVIrc - + ; Remove autostart entry Call un.RemoveAutostart @@ -234,7 +234,7 @@ Section !un.$(UnGeneralFiles) ; Remove directories used RMDir "$SMPROGRAMS\KVIrc" RMDir /r "$INSTDIR" - + ReadRegStr $R0 HKCU Software\Winamp "" IfFileExists "$R0\Plugins\gen_kvirc.dll" 0 +2 Delete "$R0\Plugins\gen_kvirc.dll" @@ -249,7 +249,7 @@ Section /o un.$(UnLocalData) ${un.WordReplace} $LocalDir "%20" " " "+" "$LocalDir" ${un.WordReplace} $LocalDir "/" "\" "+" "$LocalDir" RMDir /r "$LocalDir" - Delete "$PROFILE\kvirc.ini" + Delete "$PROFILE\kvirc.ini" SectionEnd |